Skip to content
Permalink
Browse files
Rename API::TypedObject to API::ObjectImpl
https://bugs.webkit.org/show_bug.cgi?id=125539

Reviewed by Tim Horton.

All API::Objects are by definition typed, so ObjectImpl makes more sense as a name.

* Shared/APIArray.h:
* Shared/APIFrameHandle.h:
* Shared/APIObject.h:
(API::ObjectImpl::~ObjectImpl):
(API::ObjectImpl::ObjectImpl):
* Shared/APIPageHandle.h:
* Shared/ImmutableDictionary.h:
* Shared/WebArchive.h:
* Shared/WebArchiveResource.h:
* Shared/WebBackForwardListItem.h:
* Shared/WebCertificateInfo.h:
* Shared/WebConnection.h:
* Shared/WebContextMenuItem.h:
* Shared/WebData.h:
* Shared/WebError.h:
* Shared/WebGeolocationPosition.h:
* Shared/WebGeometry.h:
* Shared/WebHitTestResult.h:
* Shared/WebImage.h:
* Shared/WebNumber.h:
* Shared/WebOpenPanelParameters.h:
* Shared/WebRenderLayer.h:
* Shared/WebRenderObject.h:
* Shared/WebSecurityOrigin.h:
* Shared/WebSerializedScriptValue.h:
* Shared/WebString.h:
* Shared/WebURL.h:
* Shared/WebURLRequest.h:
* Shared/WebURLResponse.h:
* Shared/WebUserContentURLPattern.h:
* Shared/mac/ObjCObjectGraph.h:
* UIProcess/APINavigationData.h:
* UIProcess/Authentication/AuthenticationChallengeProxy.h:
* UIProcess/Authentication/AuthenticationDecisionListener.h:
* UIProcess/Authentication/WebCredential.h:
* UIProcess/Authentication/WebProtectionSpace.h:
* UIProcess/Downloads/DownloadProxy.h:
* UIProcess/GeolocationPermissionRequestProxy.h:
* UIProcess/Notifications/NotificationPermissionRequest.h:
* UIProcess/Notifications/WebNotification.h:
* UIProcess/Notifications/WebNotificationManagerProxy.h:
* UIProcess/Plugins/WebPluginSiteDataManager.h:
* UIProcess/WebApplicationCacheManagerProxy.h:
* UIProcess/WebBackForwardList.h:
* UIProcess/WebColorPickerResultListenerProxy.h:
* UIProcess/WebContext.h:
* UIProcess/WebCookieManagerProxy.h:
* UIProcess/WebDatabaseManagerProxy.h:
* UIProcess/WebEditCommandProxy.h:
* UIProcess/WebFrameProxy.h:
* UIProcess/WebGeolocationManagerProxy.h:
* UIProcess/WebGrammarDetail.h:
* UIProcess/WebIconDatabase.h:
* UIProcess/WebInspectorProxy.h:
* UIProcess/WebKeyValueStorageManager.h:
* UIProcess/WebMediaCacheManagerProxy.h:
* UIProcess/WebOpenPanelResultListenerProxy.h:
* UIProcess/WebOriginDataManagerProxy.h:
* UIProcess/WebPageGroup.h:
* UIProcess/WebPageProxy.h:
* UIProcess/WebPreferences.h:
* UIProcess/WebResourceCacheManagerProxy.h:
* WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h:
* WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.h:
* WebProcess/InjectedBundle/InjectedBundle.h:
* WebProcess/InjectedBundle/InjectedBundleBackForwardList.h:
* WebProcess/InjectedBundle/InjectedBundleBackForwardListItem.h:
* WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.h:
* WebProcess/InjectedBundle/InjectedBundleHitTestResult.h:
* WebProcess/InjectedBundle/InjectedBundleNavigationAction.h:
* WebProcess/InjectedBundle/InjectedBundleScriptWorld.h:
* WebProcess/WebPage/PageBanner.h:
* WebProcess/WebPage/PageOverlay.h:
* WebProcess/WebPage/WebFrame.h:
* WebProcess/WebPage/WebInspector.h:
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPageGroupProxy.h:

Canonical link: https://commits.webkit.org/143590@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@160384 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Anders Carlsson committed Dec 10, 2013
1 parent 8dbba87 commit cbde234c1681c5efd6e716830d9c212b7a31a64d
Showing with 166 additions and 80 deletions.
  1. +87 −0 Source/WebKit2/ChangeLog
  2. +1 −1 Source/WebKit2/Shared/APIArray.h
  3. +1 −1 Source/WebKit2/Shared/APIFrameHandle.h
  4. +3 −3 Source/WebKit2/Shared/APIObject.h
  5. +1 −2 Source/WebKit2/Shared/APIPageHandle.h
  6. +1 −1 Source/WebKit2/Shared/ImmutableDictionary.h
  7. +1 −1 Source/WebKit2/Shared/WebArchive.h
  8. +1 −1 Source/WebKit2/Shared/WebArchiveResource.h
  9. +1 −1 Source/WebKit2/Shared/WebBackForwardListItem.h
  10. +1 −1 Source/WebKit2/Shared/WebCertificateInfo.h
  11. +1 −1 Source/WebKit2/Shared/WebConnection.h
  12. +1 −1 Source/WebKit2/Shared/WebContextMenuItem.h
  13. +1 −1 Source/WebKit2/Shared/WebData.h
  14. +1 −1 Source/WebKit2/Shared/WebError.h
  15. +1 −1 Source/WebKit2/Shared/WebGeolocationPosition.h
  16. +3 −3 Source/WebKit2/Shared/WebGeometry.h
  17. +1 −1 Source/WebKit2/Shared/WebHitTestResult.h
  18. +1 −1 Source/WebKit2/Shared/WebImage.h
  19. +1 −1 Source/WebKit2/Shared/WebNumber.h
  20. +1 −1 Source/WebKit2/Shared/WebOpenPanelParameters.h
  21. +1 −1 Source/WebKit2/Shared/WebRenderLayer.h
  22. +1 −1 Source/WebKit2/Shared/WebRenderObject.h
  23. +1 −1 Source/WebKit2/Shared/WebSecurityOrigin.h
  24. +1 −1 Source/WebKit2/Shared/WebSerializedScriptValue.h
  25. +1 −1 Source/WebKit2/Shared/WebString.h
  26. +1 −1 Source/WebKit2/Shared/WebURL.h
  27. +1 −1 Source/WebKit2/Shared/WebURLRequest.h
  28. +1 −1 Source/WebKit2/Shared/WebURLResponse.h
  29. +1 −1 Source/WebKit2/Shared/WebUserContentURLPattern.h
  30. +1 −1 Source/WebKit2/Shared/mac/ObjCObjectGraph.h
  31. +1 −1 Source/WebKit2/UIProcess/APINavigationData.h
  32. +1 −1 Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.h
  33. +1 −1 Source/WebKit2/UIProcess/Authentication/AuthenticationDecisionListener.h
  34. +1 −1 Source/WebKit2/UIProcess/Authentication/WebCredential.h
  35. +1 −1 Source/WebKit2/UIProcess/Authentication/WebProtectionSpace.h
  36. +1 −1 Source/WebKit2/UIProcess/Downloads/DownloadProxy.h
  37. +1 −1 Source/WebKit2/UIProcess/GeolocationPermissionRequestProxy.h
  38. +1 −1 Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequest.h
  39. +1 −1 Source/WebKit2/UIProcess/Notifications/WebNotification.h
  40. +1 −1 Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h
  41. +1 −1 Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h
  42. +1 −1 Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h
  43. +1 −1 Source/WebKit2/UIProcess/WebBackForwardList.h
  44. +1 −1 Source/WebKit2/UIProcess/WebColorPickerResultListenerProxy.h
  45. +1 −1 Source/WebKit2/UIProcess/WebContext.h
  46. +1 −1 Source/WebKit2/UIProcess/WebCookieManagerProxy.h
  47. +1 −1 Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h
  48. +1 −1 Source/WebKit2/UIProcess/WebEditCommandProxy.h
  49. +1 −1 Source/WebKit2/UIProcess/WebFrameProxy.h
  50. +1 −1 Source/WebKit2/UIProcess/WebGeolocationManagerProxy.h
  51. +1 −1 Source/WebKit2/UIProcess/WebGrammarDetail.h
  52. +1 −1 Source/WebKit2/UIProcess/WebIconDatabase.h
  53. +1 −1 Source/WebKit2/UIProcess/WebInspectorProxy.h
  54. +1 −1 Source/WebKit2/UIProcess/WebKeyValueStorageManager.h
  55. +1 −1 Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.h
  56. +1 −1 Source/WebKit2/UIProcess/WebOpenPanelResultListenerProxy.h
  57. +1 −1 Source/WebKit2/UIProcess/WebOriginDataManagerProxy.h
  58. +1 −1 Source/WebKit2/UIProcess/WebPageGroup.h
  59. +1 −1 Source/WebKit2/UIProcess/WebPageProxy.h
  60. +1 −1 Source/WebKit2/UIProcess/WebPreferences.h
  61. +1 −1 Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.h
  62. +1 −1 Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h
  63. +1 −1 Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.h
  64. +1 −1 Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h
  65. +1 −1 Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleBackForwardList.h
  66. +1 −1 Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleBackForwardListItem.h
  67. +1 −1 Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.h
  68. +1 −1 Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h
  69. +1 −1 Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleNavigationAction.h
  70. +1 −1 Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleScriptWorld.h
  71. +1 −1 Source/WebKit2/WebProcess/WebPage/PageBanner.h
  72. +1 −1 Source/WebKit2/WebProcess/WebPage/PageOverlay.h
  73. +1 −1 Source/WebKit2/WebProcess/WebPage/WebFrame.h
  74. +1 −1 Source/WebKit2/WebProcess/WebPage/WebInspector.h
  75. +1 −1 Source/WebKit2/WebProcess/WebPage/WebPage.h
  76. +1 −1 Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.h
@@ -1,3 +1,90 @@
2013-12-10 Anders Carlsson <andersca@apple.com>

Rename API::TypedObject to API::ObjectImpl
https://bugs.webkit.org/show_bug.cgi?id=125539

Reviewed by Tim Horton.

All API::Objects are by definition typed, so ObjectImpl makes more sense as a name.

* Shared/APIArray.h:
* Shared/APIFrameHandle.h:
* Shared/APIObject.h:
(API::ObjectImpl::~ObjectImpl):
(API::ObjectImpl::ObjectImpl):
* Shared/APIPageHandle.h:
* Shared/ImmutableDictionary.h:
* Shared/WebArchive.h:
* Shared/WebArchiveResource.h:
* Shared/WebBackForwardListItem.h:
* Shared/WebCertificateInfo.h:
* Shared/WebConnection.h:
* Shared/WebContextMenuItem.h:
* Shared/WebData.h:
* Shared/WebError.h:
* Shared/WebGeolocationPosition.h:
* Shared/WebGeometry.h:
* Shared/WebHitTestResult.h:
* Shared/WebImage.h:
* Shared/WebNumber.h:
* Shared/WebOpenPanelParameters.h:
* Shared/WebRenderLayer.h:
* Shared/WebRenderObject.h:
* Shared/WebSecurityOrigin.h:
* Shared/WebSerializedScriptValue.h:
* Shared/WebString.h:
* Shared/WebURL.h:
* Shared/WebURLRequest.h:
* Shared/WebURLResponse.h:
* Shared/WebUserContentURLPattern.h:
* Shared/mac/ObjCObjectGraph.h:
* UIProcess/APINavigationData.h:
* UIProcess/Authentication/AuthenticationChallengeProxy.h:
* UIProcess/Authentication/AuthenticationDecisionListener.h:
* UIProcess/Authentication/WebCredential.h:
* UIProcess/Authentication/WebProtectionSpace.h:
* UIProcess/Downloads/DownloadProxy.h:
* UIProcess/GeolocationPermissionRequestProxy.h:
* UIProcess/Notifications/NotificationPermissionRequest.h:
* UIProcess/Notifications/WebNotification.h:
* UIProcess/Notifications/WebNotificationManagerProxy.h:
* UIProcess/Plugins/WebPluginSiteDataManager.h:
* UIProcess/WebApplicationCacheManagerProxy.h:
* UIProcess/WebBackForwardList.h:
* UIProcess/WebColorPickerResultListenerProxy.h:
* UIProcess/WebContext.h:
* UIProcess/WebCookieManagerProxy.h:
* UIProcess/WebDatabaseManagerProxy.h:
* UIProcess/WebEditCommandProxy.h:
* UIProcess/WebFrameProxy.h:
* UIProcess/WebGeolocationManagerProxy.h:
* UIProcess/WebGrammarDetail.h:
* UIProcess/WebIconDatabase.h:
* UIProcess/WebInspectorProxy.h:
* UIProcess/WebKeyValueStorageManager.h:
* UIProcess/WebMediaCacheManagerProxy.h:
* UIProcess/WebOpenPanelResultListenerProxy.h:
* UIProcess/WebOriginDataManagerProxy.h:
* UIProcess/WebPageGroup.h:
* UIProcess/WebPageProxy.h:
* UIProcess/WebPreferences.h:
* UIProcess/WebResourceCacheManagerProxy.h:
* WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h:
* WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.h:
* WebProcess/InjectedBundle/InjectedBundle.h:
* WebProcess/InjectedBundle/InjectedBundleBackForwardList.h:
* WebProcess/InjectedBundle/InjectedBundleBackForwardListItem.h:
* WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.h:
* WebProcess/InjectedBundle/InjectedBundleHitTestResult.h:
* WebProcess/InjectedBundle/InjectedBundleNavigationAction.h:
* WebProcess/InjectedBundle/InjectedBundleScriptWorld.h:
* WebProcess/WebPage/PageBanner.h:
* WebProcess/WebPage/PageOverlay.h:
* WebProcess/WebPage/WebFrame.h:
* WebProcess/WebPage/WebInspector.h:
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPageGroupProxy.h:

2013-12-10 Nick Diego Yamane <nick.yamane@openbossa.org>

[EFL] Fix WK2 build after r160341
@@ -35,7 +35,7 @@

namespace API {

class Array FINAL : public TypedObject<Object::Type::Array> {
class Array FINAL : public ObjectImpl<Object::Type::Array> {
private:
template<typename T>
static inline const T* getObject(const RefPtr<Object>& object) { return static_cast<const T*>(object.get()); }
@@ -31,7 +31,7 @@

namespace API {

class FrameHandle : public TypedObject<Object::Type::FrameHandle> {
class FrameHandle : public ObjectImpl<Object::Type::FrameHandle> {
public:
static RefPtr<FrameHandle> create(uint64_t frameID);
virtual ~FrameHandle();
@@ -202,18 +202,18 @@ class Object
};

template <Object::Type ArgumentType>
class TypedObject : public Object {
class ObjectImpl : public Object {
public:
static const Type APIType = ArgumentType;

virtual ~TypedObject()
virtual ~ObjectImpl()
{
}

protected:
friend class Object;

TypedObject()
ObjectImpl()
{
}

@@ -31,7 +31,7 @@

namespace API {

class PageHandle : public TypedObject<Object::Type::PageHandle> {
class PageHandle : public ObjectImpl<Object::Type::PageHandle> {
public:
static RefPtr<PageHandle> create(uint64_t pageID);
virtual ~PageHandle();
@@ -46,5 +46,4 @@ class PageHandle : public TypedObject<Object::Type::PageHandle> {

} // namespace API


#endif // APIPageHandle_h
@@ -40,7 +40,7 @@ namespace WebKit {

// ImmutableDictionary - An immutable dictionary type suitable for vending to an API.

class ImmutableDictionary : public API::TypedObject<API::Object::Type::Dictionary> {
class ImmutableDictionary : public API::ObjectImpl<API::Object::Type::Dictionary> {
public:
typedef HashMap<String, RefPtr<API::Object>> MapType;

@@ -46,7 +46,7 @@ namespace WebKit {
class WebArchiveResource;
class WebData;

class WebArchive : public API::TypedObject<API::Object::Type::WebArchive> {
class WebArchive : public API::ObjectImpl<API::Object::Type::WebArchive> {
public:
virtual ~WebArchive();

@@ -43,7 +43,7 @@ class WebData;
class WebString;
class WebURL;

class WebArchiveResource : public API::TypedObject<API::Object::Type::WebArchiveResource> {
class WebArchiveResource : public API::ObjectImpl<API::Object::Type::WebArchiveResource> {
public:
virtual ~WebArchiveResource();

@@ -37,7 +37,7 @@ namespace CoreIPC {

namespace WebKit {

class WebBackForwardListItem : public API::TypedObject<API::Object::Type::BackForwardListItem> {
class WebBackForwardListItem : public API::ObjectImpl<API::Object::Type::BackForwardListItem> {
public:
static PassRefPtr<WebBackForwardListItem> create(const String& originalURL, const String& url, const String& title, const uint8_t* backForwardData, size_t backForwardDataSize, uint64_t itemID)
{
@@ -32,7 +32,7 @@

namespace WebKit {

class WebCertificateInfo : public API::TypedObject<API::Object::Type::CertificateInfo> {
class WebCertificateInfo : public API::ObjectImpl<API::Object::Type::CertificateInfo> {
public:
static PassRefPtr<WebCertificateInfo> create(const CertificateInfo& info)
{
@@ -34,7 +34,7 @@

namespace WebKit {

class WebConnection : public API::TypedObject<API::Object::Type::Connection>, public CoreIPC::MessageReceiver, public CoreIPC::MessageSender {
class WebConnection : public API::ObjectImpl<API::Object::Type::Connection>, public CoreIPC::MessageReceiver, public CoreIPC::MessageSender {
public:
virtual ~WebConnection();

@@ -37,7 +37,7 @@ class Array;

namespace WebKit {

class WebContextMenuItem : public API::TypedObject<API::Object::Type::ContextMenuItem> {
class WebContextMenuItem : public API::ObjectImpl<API::Object::Type::ContextMenuItem> {
public:
static PassRefPtr<WebContextMenuItem> create(const WebContextMenuItemData& data)
{
@@ -35,7 +35,7 @@ namespace WebKit {

// WebData - A data buffer type suitable for vending to an API.

class WebData : public API::TypedObject<API::Object::Type::Data> {
class WebData : public API::ObjectImpl<API::Object::Type::Data> {
public:
typedef void (*FreeDataFunction)(unsigned char*, const void* context);

@@ -34,7 +34,7 @@ namespace WebKit {

// WebError - An error type suitable for vending to an API.

class WebError : public API::TypedObject<API::Object::Type::Error> {
class WebError : public API::ObjectImpl<API::Object::Type::Error> {
public:
static PassRefPtr<WebError> create()
{
@@ -33,7 +33,7 @@

namespace WebKit {

class WebGeolocationPosition : public API::TypedObject<API::Object::Type::GeolocationPosition> {
class WebGeolocationPosition : public API::ObjectImpl<API::Object::Type::GeolocationPosition> {
public:
struct Data {
void encode(CoreIPC::ArgumentEncoder&) const;
@@ -38,7 +38,7 @@ namespace CoreIPC {

namespace WebKit {

class WebSize : public API::TypedObject<API::Object::Type::Size> {
class WebSize : public API::ObjectImpl<API::Object::Type::Size> {
public:
static PassRefPtr<WebSize> create(const WKSize& size)
{
@@ -55,7 +55,7 @@ class WebSize : public API::TypedObject<API::Object::Type::Size> {
WKSize m_size;
};

class WebPoint : public API::TypedObject<API::Object::Type::Point> {
class WebPoint : public API::ObjectImpl<API::Object::Type::Point> {
public:
static PassRefPtr<WebPoint> create(const WKPoint& point)
{
@@ -72,7 +72,7 @@ class WebPoint : public API::TypedObject<API::Object::Type::Point> {
WKPoint m_point;
};

class WebRect : public API::TypedObject<API::Object::Type::Rect> {
class WebRect : public API::ObjectImpl<API::Object::Type::Rect> {
public:
static PassRefPtr<WebRect> create(const WKRect& rect)
{
@@ -40,7 +40,7 @@ namespace WebKit {

class WebFrame;

class WebHitTestResult : public API::TypedObject<API::Object::Type::HitTestResult> {
class WebHitTestResult : public API::ObjectImpl<API::Object::Type::HitTestResult> {
public:
struct Data {
String absoluteImageURL;
@@ -40,7 +40,7 @@ class ShareableBitmap;

// WebImage - An image type suitable for vending to an API.

class WebImage : public API::TypedObject<API::Object::Type::Image> {
class WebImage : public API::ObjectImpl<API::Object::Type::Image> {
public:
static PassRefPtr<WebImage> create(const WebCore::IntSize&, ImageOptions);
static PassRefPtr<WebImage> create(PassRefPtr<ShareableBitmap>);
@@ -32,7 +32,7 @@
namespace WebKit {

template<typename NumberType, API::Object::Type APIObjectType>
class WebNumber : public API::TypedObject<APIObjectType> {
class WebNumber : public API::ObjectImpl<APIObjectType> {
public:
static PassRefPtr<WebNumber> create(NumberType value)
{
@@ -38,7 +38,7 @@ class Array;

namespace WebKit {

class WebOpenPanelParameters : public API::TypedObject<API::Object::Type::OpenPanelParameters> {
class WebOpenPanelParameters : public API::ObjectImpl<API::Object::Type::OpenPanelParameters> {
public:
static PassRefPtr<WebOpenPanelParameters> create(const WebCore::FileChooserSettings&);
~WebOpenPanelParameters();
@@ -36,7 +36,7 @@ namespace WebKit {

class WebPage;

class WebRenderLayer : public API::TypedObject<API::Object::Type::RenderLayer> {
class WebRenderLayer : public API::ObjectImpl<API::Object::Type::RenderLayer> {
public:
enum CompositingLayerType { None, Normal, Tiled, Media, Container };

@@ -43,7 +43,7 @@ namespace WebKit {

class WebPage;

class WebRenderObject : public API::TypedObject<API::Object::Type::RenderObject> {
class WebRenderObject : public API::ObjectImpl<API::Object::Type::RenderObject> {
public:
static PassRefPtr<WebRenderObject> create(WebPage*);
static PassRefPtr<WebRenderObject> create(WebCore::RenderObject* renderer)
@@ -32,7 +32,7 @@

namespace WebKit {

class WebSecurityOrigin : public API::TypedObject<API::Object::Type::SecurityOrigin> {
class WebSecurityOrigin : public API::ObjectImpl<API::Object::Type::SecurityOrigin> {
public:
static PassRefPtr<WebSecurityOrigin> createFromString(const String& string)
{
@@ -34,7 +34,7 @@

namespace WebKit {

class WebSerializedScriptValue : public API::TypedObject<API::Object::Type::SerializedScriptValue> {
class WebSerializedScriptValue : public API::ObjectImpl<API::Object::Type::SerializedScriptValue> {
public:
static PassRefPtr<WebSerializedScriptValue> create(PassRefPtr<WebCore::SerializedScriptValue> serializedValue)
{
@@ -38,7 +38,7 @@ namespace WebKit {

// WebString - A string type suitable for vending to an API.

class WebString : public API::TypedObject<API::Object::Type::String> {
class WebString : public API::ObjectImpl<API::Object::Type::String> {
public:
static PassRefPtr<WebString> createNull()
{
@@ -37,7 +37,7 @@ namespace WebKit {

// WebURL - A URL type suitable for vending to an API.

class WebURL : public API::TypedObject<API::Object::Type::URL> {
class WebURL : public API::ObjectImpl<API::Object::Type::URL> {
public:
static PassRefPtr<WebURL> create(const String& string)
{
@@ -38,7 +38,7 @@ typedef void* PlatformRequest;

namespace WebKit {

class WebURLRequest : public API::TypedObject<API::Object::Type::URLRequest> {
class WebURLRequest : public API::ObjectImpl<API::Object::Type::URLRequest> {
public:
static PassRefPtr<WebURLRequest> create(const WebCore::URL&);

@@ -38,7 +38,7 @@ typedef void* PlatformResponse;

namespace WebKit {

class WebURLResponse : public API::TypedObject<API::Object::Type::URLResponse> {
class WebURLResponse : public API::ObjectImpl<API::Object::Type::URLResponse> {
public:
static PassRefPtr<WebURLResponse> create(const WebCore::ResourceResponse& response)
{
@@ -34,7 +34,7 @@

namespace WebKit {

class WebUserContentURLPattern : public API::TypedObject<API::Object::Type::UserContentURLPattern> {
class WebUserContentURLPattern : public API::ObjectImpl<API::Object::Type::UserContentURLPattern> {
public:
static PassRefPtr<WebUserContentURLPattern> create(const String& pattern)
{
@@ -31,7 +31,7 @@

namespace WebKit {

class ObjCObjectGraph : public API::TypedObject<API::Object::Type::ObjCObjectGraph> {
class ObjCObjectGraph : public API::ObjectImpl<API::Object::Type::ObjCObjectGraph> {
public:
static PassRefPtr<ObjCObjectGraph> create(id rootObject)
{
@@ -32,7 +32,7 @@

namespace API {

class NavigationData : public TypedObject<Object::Type::NavigationData> {
class NavigationData : public ObjectImpl<Object::Type::NavigationData> {
public:
static PassRefPtr<NavigationData> create(const WebKit::WebNavigationDataStore& store)
{

0 comments on commit cbde234

Please sign in to comment.