Changeset 147403 in webkit
- Timestamp:
- Apr 2, 2013 1:32:49 AM (11 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 82 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r147362 r147403 1 2013-04-02 Mikhail Pozdnyakov <mikhail.pozdnyakov@intel.com> 2 3 [WK2] Remove repeating code in declaration of WK2 API classes 4 https://bugs.webkit.org/show_bug.cgi?id=112782 5 6 Reviewed by Benjamin Poulain. 7 8 The following two lines of code had been repeated in every WK2 API 9 object class: 10 1) static const Type APIType = SomeAPIType; 11 2) virtual Type type() const { return APIType; } 12 13 This patch introduces template class 'TypedAPIObject' inherited 14 from WebKit::APIObject and it contains the common functionality. 15 So the new pattern is that API object classes are inherited from 16 TypedAPIObject (rather than from WebKit::APIObject directly) passing 17 the corresponding API object type as a template parameter. 18 19 The existing API object classes are modified accordingly to the 20 proposed pattern. 21 22 * Shared/APIObject.h: 23 (WebKit): 24 (TypedAPIObject): 25 (WebKit::TypedAPIObject::~TypedAPIObject): 26 (WebKit::TypedAPIObject::TypedAPIObject): 27 * Shared/ImmutableArray.h: 28 (ImmutableArray): 29 * Shared/ImmutableDictionary.h: 30 (ImmutableDictionary): 31 * Shared/WebArchive.h: 32 (WebArchive): 33 * Shared/WebArchiveResource.h: 34 (WebArchiveResource): 35 * Shared/WebBackForwardListItem.h: 36 (WebBackForwardListItem): 37 * Shared/WebBatteryStatus.h: 38 (WebBatteryStatus): 39 * Shared/WebCertificateInfo.h: 40 * Shared/WebConnection.h: 41 (WebConnection): 42 * Shared/WebContextMenuItem.h: 43 (WebContextMenuItem): 44 * Shared/WebData.h: 45 * Shared/WebError.h: 46 (WebKit::WebError::errorCode): 47 * Shared/WebGeolocationPosition.h: 48 (WebGeolocationPosition): 49 * Shared/WebGeometry.h: 50 * Shared/WebGraphicsContext.h: 51 (WebGraphicsContext): 52 * Shared/WebHitTestResult.h: 53 * Shared/WebImage.h: 54 (WebImage): 55 * Shared/WebNetworkInfo.h: 56 (WebNetworkInfo): 57 * Shared/WebNumber.h: 58 * Shared/WebOpenPanelParameters.h: 59 (WebOpenPanelParameters): 60 * Shared/WebRenderLayer.h: 61 * Shared/WebRenderObject.h: 62 * Shared/WebSecurityOrigin.h: 63 * Shared/WebSerializedScriptValue.h: 64 (WebSerializedScriptValue): 65 * Shared/WebString.h: 66 * Shared/WebURL.h: 67 * Shared/WebURLRequest.h: 68 (WebURLRequest): 69 * Shared/WebURLResponse.h: 70 (WebURLResponse): 71 * Shared/WebUserContentURLPattern.h: 72 * Shared/mac/ObjCObjectGraph.h: 73 * UIProcess/Authentication/AuthenticationChallengeProxy.h: 74 (AuthenticationChallengeProxy): 75 * UIProcess/Authentication/AuthenticationDecisionListener.h: 76 (AuthenticationDecisionListener): 77 * UIProcess/Authentication/WebCredential.h: 78 (WebCredential): 79 * UIProcess/Authentication/WebProtectionSpace.h: 80 (WebProtectionSpace): 81 * UIProcess/Downloads/DownloadProxy.h: 82 (DownloadProxy): 83 * UIProcess/GeolocationPermissionRequestProxy.h: 84 (GeolocationPermissionRequestProxy): 85 * UIProcess/Notifications/NotificationPermissionRequest.h: 86 (NotificationPermissionRequest): 87 * UIProcess/Notifications/WebNotification.h: 88 (WebNotification): 89 * UIProcess/Notifications/WebNotificationManagerProxy.h: 90 (WebNotificationManagerProxy): 91 * UIProcess/Plugins/WebPluginSiteDataManager.h: 92 (WebPluginSiteDataManager): 93 * UIProcess/WebApplicationCacheManagerProxy.h: 94 (WebApplicationCacheManagerProxy): 95 * UIProcess/WebBackForwardList.h: 96 (WebBackForwardList): 97 * UIProcess/WebBatteryManagerProxy.h: 98 (WebBatteryManagerProxy): 99 * UIProcess/WebContext.h: 100 (WebContext): 101 * UIProcess/WebCookieManagerProxy.h: 102 (WebCookieManagerProxy): 103 * UIProcess/WebDatabaseManagerProxy.h: 104 (WebDatabaseManagerProxy): 105 * UIProcess/WebEditCommandProxy.h: 106 (WebEditCommandProxy): 107 * UIProcess/WebFrameProxy.h: 108 (WebFrameProxy): 109 * UIProcess/WebGeolocationManagerProxy.h: 110 (WebGeolocationManagerProxy): 111 * UIProcess/WebGrammarDetail.h: 112 (WebGrammarDetail): 113 * UIProcess/WebIconDatabase.h: 114 (WebIconDatabase): 115 * UIProcess/WebInspectorProxy.h: 116 (WebInspectorProxy): 117 * UIProcess/WebKeyValueStorageManagerProxy.h: 118 (WebKeyValueStorageManagerProxy): 119 * UIProcess/WebMediaCacheManagerProxy.h: 120 (WebMediaCacheManagerProxy): 121 * UIProcess/WebNavigationData.h: 122 (WebNavigationData): 123 * UIProcess/WebNetworkInfoManagerProxy.h: 124 (WebNetworkInfoManagerProxy): 125 * UIProcess/WebOpenPanelResultListenerProxy.h: 126 (WebOpenPanelResultListenerProxy): 127 * UIProcess/WebPageGroup.h: 128 (WebPageGroup): 129 * UIProcess/WebPageProxy.h: 130 (WebPageProxy): 131 * UIProcess/WebPreferences.cpp: 132 (WebKit::WebPreferences::WebPreferences): 133 * UIProcess/WebPreferences.h: 134 (WebPreferences): 135 * UIProcess/WebResourceCacheManagerProxy.h: 136 (WebResourceCacheManagerProxy): 137 * UIProcess/WebTextChecker.h: 138 (WebTextChecker): 139 * UIProcess/WebVibrationProxy.h: 140 (WebVibrationProxy): 141 * UIProcess/efl/WebPopupItemEfl.h: 142 (WebPopupItemEfl): 143 * UIProcess/efl/WebView.h: 144 * UIProcess/soup/WebSoupRequestManagerProxy.h: 145 (WebSoupRequestManagerProxy): 146 * WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h: 147 (InjectedBundleNodeHandle): 148 * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.h: 149 (InjectedBundleRangeHandle): 150 * WebProcess/InjectedBundle/InjectedBundle.h: 151 (InjectedBundle): 152 * WebProcess/InjectedBundle/InjectedBundleBackForwardList.h: 153 * WebProcess/InjectedBundle/InjectedBundleBackForwardListItem.h: 154 * WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.h: 155 (InjectedBundleDOMWindowExtension): 156 * WebProcess/InjectedBundle/InjectedBundleHitTestResult.h: 157 * WebProcess/InjectedBundle/InjectedBundleNavigationAction.h: 158 (InjectedBundleNavigationAction): 159 * WebProcess/InjectedBundle/InjectedBundleScriptWorld.h: 160 (InjectedBundleScriptWorld): 161 * WebProcess/WebPage/PageOverlay.h: 162 (PageOverlay): 163 * WebProcess/WebPage/WebFrame.h: 164 (WebFrame): 165 * WebProcess/WebPage/WebInspector.h: 166 (WebInspector): 167 * WebProcess/WebPage/WebPage.h: 168 (WebPage): 169 * WebProcess/WebPage/WebPageGroupProxy.h: 170 (WebPageGroupProxy): 171 1 172 2013-04-01 Timothy Hatcher <timothy@apple.com> 2 173 -
trunk/Source/WebKit2/Shared/APIObject.h
r143275 r147403 149 149 }; 150 150 151 template <APIObject::Type ArgumentType> 152 class TypedAPIObject : public APIObject { 153 public: 154 static const Type APIType = ArgumentType; 155 156 virtual ~TypedAPIObject() 157 { 158 } 159 160 protected: 161 TypedAPIObject() 162 { 163 } 164 165 virtual Type type() const OVERRIDE { return APIType; } 166 }; 167 151 168 } // namespace WebKit 152 169 -
trunk/Source/WebKit2/Shared/ImmutableArray.h
r130948 r147403 36 36 // ImmutableArray - An immutable array type suitable for vending to an API. 37 37 38 class ImmutableArray : public APIObject{38 class ImmutableArray : public TypedAPIObject<APIObject::TypeArray> { 39 39 public: 40 static const Type APIType = TypeArray;41 40 enum AdoptTag { Adopt }; 42 41 … … 74 73 ImmutableArray(Vector<RefPtr<APIObject> >& entries); 75 74 76 virtual Type type() const { return APIType; }77 78 75 Vector<RefPtr<APIObject> > m_entries; 79 76 }; -
trunk/Source/WebKit2/Shared/ImmutableDictionary.h
r95901 r147403 39 39 // ImmutableDictionary - An immutable dictionary type suitable for vending to an API. 40 40 41 class ImmutableDictionary : public APIObject{41 class ImmutableDictionary : public TypedAPIObject<APIObject::TypeDictionary> { 42 42 public: 43 static const Type APIType = TypeDictionary;44 45 43 typedef HashMap<String, RefPtr<APIObject> > MapType; 46 44 … … 86 84 ImmutableDictionary(MapType& map); 87 85 88 virtual Type type() const { return APIType; }89 90 86 MapType m_map; 91 87 }; -
trunk/Source/WebKit2/Shared/WebArchive.h
r141473 r147403 44 44 class WebData; 45 45 46 class WebArchive : public APIObject{46 class WebArchive : public TypedAPIObject<APIObject::TypeWebArchive> { 47 47 public: 48 static const Type APIType = TypeWebArchive;49 48 virtual ~WebArchive(); 50 49 … … 67 66 WebArchive(PassRefPtr<WebCore::LegacyWebArchive>); 68 67 69 virtual Type type() const { return APIType; }70 71 68 RefPtr<WebCore::LegacyWebArchive> m_legacyWebArchive; 72 69 RefPtr<WebArchiveResource> m_cachedMainResource; -
trunk/Source/WebKit2/Shared/WebArchiveResource.h
r141473 r147403 44 44 class WebURL; 45 45 46 class WebArchiveResource : public APIObject{46 class WebArchiveResource : public TypedAPIObject<APIObject::TypeWebArchiveResource> { 47 47 public: 48 static const Type APIType = TypeWebArchiveResource;49 48 virtual ~WebArchiveResource(); 50 49 … … 63 62 WebArchiveResource(PassRefPtr<WebCore::ArchiveResource>); 64 63 65 virtual Type type() const { return APIType; }66 67 64 RefPtr<WebCore::ArchiveResource> m_archiveResource; 68 65 }; -
trunk/Source/WebKit2/Shared/WebBackForwardListItem.h
r95901 r147403 38 38 namespace WebKit { 39 39 40 class WebBackForwardListItem : public APIObject{40 class WebBackForwardListItem : public TypedAPIObject<APIObject::TypeBackForwardListItem> { 41 41 public: 42 static const Type APIType = TypeBackForwardListItem;43 44 42 static PassRefPtr<WebBackForwardListItem> create(const String& originalURL, const String& url, const String& title, const uint8_t* backForwardData, size_t backForwardDataSize, uint64_t itemID) 45 43 { … … 71 69 WebBackForwardListItem(const String& originalURL, const String& url, const String& title, const uint8_t* backForwardData, size_t backForwardDataSize, uint64_t itemID); 72 70 73 virtual Type type() const { return APIType; }74 75 71 String m_originalURL; 76 72 String m_url; -
trunk/Source/WebKit2/Shared/WebBatteryStatus.h
r141639 r147403 36 36 namespace WebKit { 37 37 38 class WebBatteryStatus : public APIObject{38 class WebBatteryStatus : public TypedAPIObject<APIObject::TypeBatteryStatus> { 39 39 public: 40 static const Type APIType = TypeBatteryStatus;41 42 40 struct Data { 43 41 void encode(CoreIPC::ArgumentEncoder&) const; … … 66 64 WebBatteryStatus(bool isCharging, double chargingTime, double dischargingTime, double level); 67 65 68 virtual Type type() const { return APIType; }69 70 66 Data m_data; 71 67 }; -
trunk/Source/WebKit2/Shared/WebCertificateInfo.h
r95901 r147403 33 33 namespace WebKit { 34 34 35 class WebCertificateInfo : public APIObject{35 class WebCertificateInfo : public TypedAPIObject<APIObject::TypeCertificateInfo> { 36 36 public: 37 static const Type APIType = TypeCertificateInfo;38 39 37 static PassRefPtr<WebCertificateInfo> create(const PlatformCertificateInfo& info) 40 38 { … … 50 48 } 51 49 52 virtual Type type() const { return APIType; }53 54 50 PlatformCertificateInfo m_platformCertificateInfo; 55 51 }; -
trunk/Source/WebKit2/Shared/WebConnection.h
r141361 r147403 35 35 namespace WebKit { 36 36 37 class WebConnection : public APIObject, public CoreIPC::MessageReceiver, public CoreIPC::MessageSender<WebConnection> {37 class WebConnection : public TypedAPIObject<APIObject::TypeConnection>, public CoreIPC::MessageReceiver, public CoreIPC::MessageSender<WebConnection> { 38 38 public: 39 static const Type APIType = TypeConnection;40 39 virtual ~WebConnection(); 41 40 … … 50 49 protected: 51 50 explicit WebConnection(); 52 53 virtual Type type() const { return APIType; }54 51 55 52 virtual void encodeMessageBody(CoreIPC::ArgumentEncoder&, APIObject*) = 0; -
trunk/Source/WebKit2/Shared/WebContextMenuItem.h
r114367 r147403 36 36 class ImmutableArray; 37 37 38 class WebContextMenuItem : public APIObject{38 class WebContextMenuItem : public TypedAPIObject<APIObject::TypeContextMenuItem> { 39 39 public: 40 static const Type APIType = TypeContextMenuItem;41 42 40 static PassRefPtr<WebContextMenuItem> create(const WebContextMenuItemData& data) 43 41 { … … 56 54 private: 57 55 WebContextMenuItem(const WebContextMenuItemData&); 58 59 virtual Type type() const { return APIType; } 60 56 61 57 WebContextMenuItemData m_webContextMenuItemData; 62 58 }; -
trunk/Source/WebKit2/Shared/WebData.h
r95901 r147403 36 36 // WebData - A data buffer type suitable for vending to an API. 37 37 38 class WebData : public APIObject{38 class WebData : public TypedAPIObject<APIObject::TypeData> { 39 39 public: 40 static const Type APIType = TypeData;41 42 40 typedef void (*FreeDataFunction)(unsigned char*, const void* context); 43 41 … … 89 87 } 90 88 91 virtual Type type() const { return APIType; }92 93 89 const unsigned char* m_bytes; 94 90 size_t m_size; -
trunk/Source/WebKit2/Shared/WebError.h
r95901 r147403 35 35 // WebError - An error type suitable for vending to an API. 36 36 37 class WebError : public APIObject{37 class WebError : public TypedAPIObject<APIObject::TypeError> { 38 38 public: 39 static const Type APIType = TypeError;40 41 39 static PassRefPtr<WebError> create() 42 40 { … … 52 50 53 51 const String& domain() const { return m_platformError.domain(); } 54 int errorCode() const { return m_platformError.errorCode(); ;}52 int errorCode() const { return m_platformError.errorCode(); } 55 53 const String& failingURL() const { return m_platformError.failingURL(); } 56 54 const String& localizedDescription() const { return m_platformError.localizedDescription(); } … … 68 66 } 69 67 70 virtual Type type() const { return APIType; }71 72 68 WebCore::ResourceError m_platformError; 73 69 }; -
trunk/Source/WebKit2/Shared/WebGeolocationPosition.h
r141619 r147403 34 34 namespace WebKit { 35 35 36 class WebGeolocationPosition : public APIObject{36 class WebGeolocationPosition : public TypedAPIObject<APIObject::TypeGeolocationPosition> { 37 37 public: 38 static const Type APIType = TypeGeolocationPosition;39 40 38 struct Data { 41 39 void encode(CoreIPC::ArgumentEncoder&) const; … … 87 85 WebGeolocationPosition(double timestamp, double latitude, double longitude, double accuracy, bool providesAltitude, double altitude, bool providesAltitudeAccuracy, double altitudeAccuracy, bool providesHeading, double heading, bool providesSpeed, double speed); 88 86 89 virtual Type type() const { return APIType; }90 91 87 Data m_data; 92 88 }; -
trunk/Source/WebKit2/Shared/WebGeometry.h
r95759 r147403 39 39 namespace WebKit { 40 40 41 class WebSize : public APIObject{41 class WebSize : public TypedAPIObject<APIObject::TypeSize> { 42 42 public: 43 static const Type APIType = TypeSize;44 45 43 static PassRefPtr<WebSize> create(const WKSize& size) 46 44 { … … 55 53 { } 56 54 57 virtual Type type() const { return APIType; }58 59 55 WKSize m_size; 60 56 }; 61 57 62 class WebPoint : public APIObject{58 class WebPoint : public TypedAPIObject<APIObject::TypePoint> { 63 59 public: 64 static const Type APIType = TypePoint;65 66 60 static PassRefPtr<WebPoint> create(const WKPoint& point) 67 61 { … … 76 70 { } 77 71 78 virtual Type type() const { return APIType; }79 80 72 WKPoint m_point; 81 73 }; 82 74 83 class WebRect : public APIObject{75 class WebRect : public TypedAPIObject<APIObject::TypeRect> { 84 76 public: 85 static const Type APIType = TypeRect;86 87 77 static PassRefPtr<WebRect> create(const WKRect& rect) 88 78 { … … 97 87 { } 98 88 99 virtual Type type() const { return APIType; }100 101 89 WKRect m_rect; 102 90 }; -
trunk/Source/WebKit2/Shared/WebGraphicsContext.h
r104958 r147403 39 39 namespace WebKit { 40 40 41 class WebGraphicsContext : public APIObject{41 class WebGraphicsContext : public TypedAPIObject<APIObject::TypeGraphicsContext> { 42 42 public: 43 static const Type APIType = TypeGraphicsContext;44 45 43 static PassRefPtr<WebGraphicsContext> create(WebCore::GraphicsContext* graphicsContext) 46 44 { … … 58 56 explicit WebGraphicsContext(WebCore::GraphicsContext*); 59 57 60 virtual Type type() const { return APIType; }61 62 58 #if USE(CG) 63 59 RetainPtr<CGContextRef> m_platformContext; -
trunk/Source/WebKit2/Shared/WebHitTestResult.h
r141619 r147403 40 40 class WebFrame; 41 41 42 class WebHitTestResult : public APIObject{42 class WebHitTestResult : public TypedAPIObject<APIObject::TypeHitTestResult> { 43 43 public: 44 static const Type APIType = TypeHitTestResult;45 46 44 struct Data { 47 45 String absoluteImageURL; … … 115 113 } 116 114 117 virtual Type type() const { return APIType; }118 119 115 Data m_data; 120 116 }; -
trunk/Source/WebKit2/Shared/WebImage.h
r95901 r147403 41 41 // WebImage - An image type suitable for vending to an API. 42 42 43 class WebImage : public APIObject{43 class WebImage : public TypedAPIObject<APIObject::TypeImage> { 44 44 public: 45 static const Type APIType = TypeImage;46 47 45 static PassRefPtr<WebImage> create(const WebCore::IntSize&, ImageOptions); 48 46 static PassRefPtr<WebImage> create(PassRefPtr<ShareableBitmap>); … … 56 54 WebImage(PassRefPtr<ShareableBitmap>); 57 55 58 virtual Type type() const { return APIType; }59 60 56 RefPtr<ShareableBitmap> m_bitmap; 61 57 }; -
trunk/Source/WebKit2/Shared/WebNetworkInfo.h
r141639 r147403 36 36 namespace WebKit { 37 37 38 class WebNetworkInfo : public APIObject{38 class WebNetworkInfo : public TypedAPIObject<APIObject::TypeNetworkInfo> { 39 39 public: 40 static const Type APIType = TypeNetworkInfo;41 42 40 struct Data { 43 41 void encode(CoreIPC::ArgumentEncoder&) const; … … 63 61 WebNetworkInfo(double bandwidth, bool metered); 64 62 65 virtual Type type() const { return APIType; }66 67 63 Data m_data; 68 64 }; -
trunk/Source/WebKit2/Shared/WebNumber.h
r95901 r147403 33 33 34 34 template<typename NumberType, APIObject::Type APIObjectType> 35 class WebNumber : public APIObject{35 class WebNumber : public TypedAPIObject<APIObjectType> { 36 36 public: 37 static const Type APIType = APIObjectType;38 39 37 static PassRefPtr<WebNumber> create(NumberType value) 40 38 { … … 50 48 } 51 49 52 virtual Type type() const { return APIType; }53 54 50 const NumberType m_value; 55 51 }; -
trunk/Source/WebKit2/Shared/WebOpenPanelParameters.h
r125512 r147403 37 37 class ImmutableArray; 38 38 39 class WebOpenPanelParameters : public APIObject{39 class WebOpenPanelParameters : public TypedAPIObject<APIObject::TypeOpenPanelParameters> { 40 40 public: 41 static const Type APIType = TypeOpenPanelParameters;42 43 41 static PassRefPtr<WebOpenPanelParameters> create(const WebCore::FileChooserSettings&); 44 42 ~WebOpenPanelParameters(); … … 54 52 explicit WebOpenPanelParameters(const WebCore::FileChooserSettings&); 55 53 56 virtual Type type() const { return APIType; }57 58 54 WebCore::FileChooserSettings m_settings; 59 55 }; -
trunk/Source/WebKit2/Shared/WebRenderLayer.h
r121584 r147403 37 37 class WebPage; 38 38 39 class WebRenderLayer : public APIObject{39 class WebRenderLayer : public TypedAPIObject<APIObject::TypeRenderLayer> { 40 40 public: 41 static const Type APIType = TypeRenderLayer;42 43 41 enum CompositingLayerType { None, Normal, Tiled, Media, Container }; 44 42 … … 77 75 } 78 76 79 virtual Type type() const OVERRIDE { return APIType; }80 81 77 static PassRefPtr<MutableArray> createArrayFromLayerList(Vector<WebCore::RenderLayer*>*); 82 78 -
trunk/Source/WebKit2/Shared/WebRenderObject.h
r121584 r147403 41 41 class WebPage; 42 42 43 class WebRenderObject : public APIObject{43 class WebRenderObject : public TypedAPIObject<APIObject::TypeRenderObject> { 44 44 public: 45 static const Type APIType = TypeRenderObject;46 47 45 static PassRefPtr<WebRenderObject> create(WebPage*); 48 46 static PassRefPtr<WebRenderObject> create(WebCore::RenderObject* renderer) … … 80 78 } 81 79 82 virtual Type type() const OVERRIDE { return APIType; }83 84 80 RefPtr<MutableArray> m_children; 85 81 -
trunk/Source/WebKit2/Shared/WebSecurityOrigin.h
r133425 r147403 33 33 namespace WebKit { 34 34 35 class WebSecurityOrigin : public APIObject{35 class WebSecurityOrigin : public TypedAPIObject<APIObject::TypeSecurityOrigin> { 36 36 public: 37 static const Type APIType = TypeSecurityOrigin;38 39 37 static PassRefPtr<WebSecurityOrigin> createFromString(const String& string) 40 38 { … … 72 70 } 73 71 74 virtual Type type() const { return APIType; }75 76 72 RefPtr<WebCore::SecurityOrigin> m_securityOrigin; 77 73 }; -
trunk/Source/WebKit2/Shared/WebSerializedScriptValue.h
r140902 r147403 35 35 namespace WebKit { 36 36 37 class WebSerializedScriptValue : public APIObject{37 class WebSerializedScriptValue : public TypedAPIObject<APIObject::TypeSerializedScriptValue> { 38 38 public: 39 static const Type APIType = TypeSerializedScriptValue;40 41 39 static PassRefPtr<WebSerializedScriptValue> create(PassRefPtr<WebCore::SerializedScriptValue> serializedValue) 42 40 { … … 71 69 { 72 70 } 73 74 virtual Type type() const { return APIType; } 75 71 76 72 RefPtr<WebCore::SerializedScriptValue> m_serializedScriptValue; 77 73 }; -
trunk/Source/WebKit2/Shared/WebString.h
r131777 r147403 39 39 // WebString - A string type suitable for vending to an API. 40 40 41 class WebString : public APIObject{41 class WebString : public TypedAPIObject<APIObject::TypeString> { 42 42 public: 43 static const Type APIType = TypeString;44 45 43 static PassRefPtr<WebString> createNull() 46 44 { … … 113 111 } 114 112 115 virtual Type type() const { return APIType; }116 117 113 String m_string; 118 114 }; -
trunk/Source/WebKit2/Shared/WebURL.h
r131437 r147403 38 38 // WebURL - A URL type suitable for vending to an API. 39 39 40 class WebURL : public APIObject{40 class WebURL : public TypedAPIObject<APIObject::TypeURL> { 41 41 public: 42 static const Type APIType = TypeURL;43 44 42 static PassRefPtr<WebURL> create(const String& string) 45 43 { … … 106 104 } 107 105 108 virtual Type type() const { return APIType; }109 110 106 String m_string; 111 107 mutable OwnPtr<WebCore::KURL> m_parsedURL; -
trunk/Source/WebKit2/Shared/WebURLRequest.h
r139023 r147403 39 39 namespace WebKit { 40 40 41 class WebURLRequest : public APIObject{41 class WebURLRequest : public TypedAPIObject<APIObject::TypeURLRequest> { 42 42 public: 43 static const Type APIType = TypeURLRequest;44 45 43 static PassRefPtr<WebURLRequest> create(const WebCore::KURL&); 46 44 … … 67 65 explicit WebURLRequest(PlatformRequest); 68 66 69 virtual Type type() const { return APIType; }70 71 67 WebCore::ResourceRequest m_request; 72 68 }; -
trunk/Source/WebKit2/Shared/WebURLResponse.h
r139023 r147403 39 39 namespace WebKit { 40 40 41 class WebURLResponse : public APIObject{41 class WebURLResponse : public TypedAPIObject<APIObject::TypeURLResponse> { 42 42 public: 43 static const Type APIType = TypeURLResponse;44 45 43 static PassRefPtr<WebURLResponse> create(const WebCore::ResourceResponse& response) 46 44 { … … 60 58 explicit WebURLResponse(PlatformResponse); 61 59 62 virtual Type type() const { return APIType; }63 64 60 WebCore::ResourceResponse m_response; 65 61 }; -
trunk/Source/WebKit2/Shared/WebUserContentURLPattern.h
r98894 r147403 35 35 namespace WebKit { 36 36 37 class WebUserContentURLPattern : public APIObject{37 class WebUserContentURLPattern : public TypedAPIObject<APIObject::TypeUserContentURLPattern> { 38 38 public: 39 static const Type APIType = TypeUserContentURLPattern;40 41 39 static PassRefPtr<WebUserContentURLPattern> create(const String& pattern) 42 40 { … … 59 57 } 60 58 61 virtual Type type() const { return APIType; }62 63 59 WebCore::UserContentURLPattern m_pattern; 64 60 String m_patternString; -
trunk/Source/WebKit2/Shared/mac/ObjCObjectGraph.h
r136095 r147403 32 32 namespace WebKit { 33 33 34 class ObjCObjectGraph : public APIObject{34 class ObjCObjectGraph : public TypedAPIObject<APIObject::TypeObjCObjectGraph> { 35 35 public: 36 static const Type APIType = TypeObjCObjectGraph;37 38 36 static PassRefPtr<ObjCObjectGraph> create(id rootObject) 39 37 { … … 49 47 } 50 48 51 virtual Type type() const { return APIType; }52 53 49 RetainPtr<id> m_rootObject; 54 50 }; -
trunk/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.h
r141150 r147403 42 42 class WebProtectionSpace; 43 43 44 class AuthenticationChallengeProxy : public APIObject{44 class AuthenticationChallengeProxy : public TypedAPIObject<APIObject::TypeAuthenticationChallenge> { 45 45 public: 46 static const Type APIType = TypeAuthenticationChallenge;47 48 46 static PassRefPtr<AuthenticationChallengeProxy> create(const WebCore::AuthenticationChallenge& authenticationChallenge, uint64_t challengeID, CoreIPC::Connection* connection) 49 47 { … … 65 63 AuthenticationChallengeProxy(const WebCore::AuthenticationChallenge&, uint64_t challengeID, CoreIPC::Connection*); 66 64 67 virtual Type type() const { return APIType; }68 69 65 WebCore::AuthenticationChallenge m_coreAuthenticationChallenge; 70 66 uint64_t m_challengeID; -
trunk/Source/WebKit2/UIProcess/Authentication/AuthenticationDecisionListener.h
r128683 r147403 36 36 class WebCredential; 37 37 38 class AuthenticationDecisionListener : public APIObject{38 class AuthenticationDecisionListener : public TypedAPIObject<APIObject::TypeAuthenticationDecisionListener> { 39 39 public: 40 static const Type APIType = TypeAuthenticationDecisionListener;41 42 40 static PassRefPtr<AuthenticationDecisionListener> create(AuthenticationChallengeProxy* authenticationChallenge) 43 41 { … … 53 51 explicit AuthenticationDecisionListener(AuthenticationChallengeProxy*); 54 52 55 virtual Type type() const { return APIType; }56 57 53 AuthenticationChallengeProxy* m_challengeProxy; 58 54 }; -
trunk/Source/WebKit2/UIProcess/Authentication/WebCredential.h
r142908 r147403 38 38 class WebCertificateInfo; 39 39 40 class WebCredential : public APIObject{40 class WebCredential : public TypedAPIObject<APIObject::TypeCredential> { 41 41 public: 42 42 ~WebCredential(); 43 44 static const Type APIType = TypeCredential;45 43 46 44 static PassRefPtr<WebCredential> create(const WebCore::Credential& credential) … … 69 67 explicit WebCredential(WebCertificateInfo*); 70 68 71 virtual Type type() const { return APIType; }72 73 69 WebCore::Credential m_coreCredential; 74 70 RefPtr<WebCertificateInfo> m_certificateInfo; -
trunk/Source/WebKit2/UIProcess/Authentication/WebProtectionSpace.h
r128683 r147403 33 33 namespace WebKit { 34 34 35 class WebProtectionSpace : public APIObject{35 class WebProtectionSpace : public TypedAPIObject<APIObject::TypeProtectionSpace> { 36 36 public: 37 static const Type APIType = TypeProtectionSpace;38 39 37 static PassRefPtr<WebProtectionSpace> create(const WebCore::ProtectionSpace& protectionSpace) 40 38 { … … 54 52 explicit WebProtectionSpace(const WebCore::ProtectionSpace&); 55 53 56 virtual Type type() const { return APIType; }57 58 54 WebCore::ProtectionSpace m_coreProtectionSpace; 59 55 }; -
trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.h
r141361 r147403 47 47 class WebPageProxy; 48 48 49 class DownloadProxy : public APIObject, public CoreIPC::MessageReceiver {49 class DownloadProxy : public TypedAPIObject<APIObject::TypeDownload>, public CoreIPC::MessageReceiver { 50 50 public: 51 static const Type APIType = TypeDownload;52 53 51 static PassRefPtr<DownloadProxy> create(DownloadProxyMap&, WebContext*); 54 52 ~DownloadProxy(); … … 72 70 private: 73 71 explicit DownloadProxy(DownloadProxyMap&, WebContext*); 74 75 virtual Type type() const { return APIType; }76 72 77 73 // CoreIPC::MessageReceiver -
trunk/Source/WebKit2/UIProcess/GeolocationPermissionRequestProxy.h
r95901 r147403 34 34 class GeolocationPermissionRequestManagerProxy; 35 35 36 class GeolocationPermissionRequestProxy : public APIObject{36 class GeolocationPermissionRequestProxy : public TypedAPIObject<APIObject::TypeGeolocationPermissionRequest> { 37 37 public: 38 static const Type APIType = TypeGeolocationPermissionRequest;39 40 38 static PassRefPtr<GeolocationPermissionRequestProxy> create(GeolocationPermissionRequestManagerProxy* manager, uint64_t geolocationID) 41 39 { … … 51 49 GeolocationPermissionRequestProxy(GeolocationPermissionRequestManagerProxy*, uint64_t geolocationID); 52 50 53 virtual Type type() const { return APIType; }54 55 51 GeolocationPermissionRequestManagerProxy* m_manager; 56 52 uint64_t m_geolocationID; -
trunk/Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequest.h
r102352 r147403 34 34 class NotificationPermissionRequestManagerProxy; 35 35 36 class NotificationPermissionRequest : public APIObject{36 class NotificationPermissionRequest : public TypedAPIObject<APIObject::TypeNotificationPermissionRequest> { 37 37 public: 38 static const Type APIType = TypeNotificationPermissionRequest;39 40 38 static PassRefPtr<NotificationPermissionRequest> create(NotificationPermissionRequestManagerProxy*, uint64_t notificationID); 41 39 42 40 void allow(); 43 41 void deny(); 44 42 45 43 void invalidate(); 46 44 47 45 private: 48 46 NotificationPermissionRequest(NotificationPermissionRequestManagerProxy*, uint64_t notificationID); 49 50 virtual Type type() const { return APIType; } 51 47 52 48 NotificationPermissionRequestManagerProxy* m_manager; 53 49 uint64_t m_notificationID; -
trunk/Source/WebKit2/UIProcess/Notifications/WebNotification.h
r128113 r147403 42 42 namespace WebKit { 43 43 44 class WebNotification : public APIObject{44 class WebNotification : public TypedAPIObject<APIObject::TypeNotification> { 45 45 public: 46 static const Type APIType = TypeNotification;47 48 46 static PassRefPtr<WebNotification> create(const String& title, const String& body, const String& iconURL, const String& tag, const String& lang, const String& dir, const String& originString, uint64_t notificationID) 49 47 { 50 48 return adoptRef(new WebNotification(title, body, iconURL, tag, lang, dir, originString, notificationID)); 51 49 } 52 50 53 51 const String& title() const { return m_title; } 54 52 const String& body() const { return m_body; } … … 64 62 WebNotification(const String& title, const String& body, const String& iconURL, const String& tag, const String& lang, const String& dir, const String& originString, uint64_t notificationID); 65 63 66 virtual Type type() const { return APIType; }67 68 64 String m_title; 69 65 String m_body; -
trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h
r141658 r147403 44 44 class WebSecurityOrigin; 45 45 46 class WebNotificationManagerProxy : public APIObject, public WebContextSupplement, private CoreIPC::MessageReceiver {46 class WebNotificationManagerProxy : public TypedAPIObject<APIObject::TypeNotificationManager>, public WebContextSupplement, private CoreIPC::MessageReceiver { 47 47 public: 48 static const Type APIType = TypeNotificationManager;49 48 50 49 static const char* supplementName(); … … 68 67 private: 69 68 explicit WebNotificationManagerProxy(WebContext*); 70 71 virtual Type type() const { return APIType; }72 69 73 70 // WebContextSupplement -
trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h
r145328 r147403 42 42 typedef GenericCallback<WKArrayRef> ArrayCallback; 43 43 44 class WebPluginSiteDataManager : public APIObject{44 class WebPluginSiteDataManager : public TypedAPIObject<APIObject::TypePluginSiteDataManager> { 45 45 public: 46 static const Type APIType = TypePluginSiteDataManager;47 48 46 static PassRefPtr<WebPluginSiteDataManager> create(WebContext*); 49 47 virtual ~WebPluginSiteDataManager(); … … 68 66 explicit WebPluginSiteDataManager(WebContext*); 69 67 70 virtual Type type() const { return APIType; }71 72 68 WebContext* m_webContext; 73 69 HashMap<uint64_t, RefPtr<ArrayCallback> > m_arrayCallbacks; -
trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h
r141711 r147403 47 47 typedef GenericCallback<WKArrayRef> ArrayCallback; 48 48 49 class WebApplicationCacheManagerProxy : public APIObject, public WebContextSupplement, private CoreIPC::MessageReceiver {49 class WebApplicationCacheManagerProxy : public TypedAPIObject<APIObject::TypeApplicationCacheManager>, public WebContextSupplement, private CoreIPC::MessageReceiver { 50 50 public: 51 static const Type APIType = TypeApplicationCacheManager;52 53 51 static const char* supplementName(); 54 52 … … 65 63 private: 66 64 explicit WebApplicationCacheManagerProxy(WebContext*); 67 68 virtual Type type() const { return APIType; }69 65 70 66 void didGetApplicationCacheOrigins(const Vector<SecurityOriginData>&, uint64_t callbackID); -
trunk/Source/WebKit2/UIProcess/WebBackForwardList.h
r128683 r147403 48 48 */ 49 49 50 class WebBackForwardList : public APIObject{50 class WebBackForwardList : public TypedAPIObject<APIObject::TypeBackForwardList> { 51 51 public: 52 static const Type APIType = TypeBackForwardList;53 54 52 static PassRefPtr<WebBackForwardList> create(WebPageProxy* page) 55 53 { … … 88 86 explicit WebBackForwardList(WebPageProxy*); 89 87 90 virtual Type type() const { return APIType; }91 92 88 WebPageProxy* m_page; 93 89 BackForwardListItemVector m_entries; -
trunk/Source/WebKit2/UIProcess/WebBatteryManagerProxy.h
r141366 r147403 38 38 class WebContext; 39 39 class WebBatteryStatus; 40 class WebBatteryManagerProxy : public APIObject, private CoreIPC::MessageReceiver {40 class WebBatteryManagerProxy : public TypedAPIObject<APIObject::TypeBatteryManager>, private CoreIPC::MessageReceiver { 41 41 42 42 public: 43 static const Type APIType = TypeBatteryManager;44 45 43 static PassRefPtr<WebBatteryManagerProxy> create(WebContext*); 46 44 virtual ~WebBatteryManagerProxy(); … … 56 54 private: 57 55 explicit WebBatteryManagerProxy(WebContext*); 58 59 virtual Type type() const { return APIType; }60 56 61 57 // CoreIPC::MessageReceiver -
trunk/Source/WebKit2/UIProcess/WebContext.h
r146823 r147403 86 86 #endif 87 87 88 class WebContext : public APIObject, private CoreIPC::MessageReceiver88 class WebContext : public TypedAPIObject<APIObject::TypeContext>, private CoreIPC::MessageReceiver 89 89 #if ENABLE(NETSCAPE_PLUGIN_API) 90 90 , private PluginInfoStoreClient … … 92 92 { 93 93 public: 94 static const Type APIType = TypeContext;95 96 94 static PassRefPtr<WebContext> create(const String& injectedBundlePath); 97 95 virtual ~WebContext(); … … 304 302 WebContext(ProcessModel, const String& injectedBundlePath); 305 303 void platformInitialize(); 306 307 virtual Type type() const { return APIType; }308 304 309 305 void platformInitializeWebProcess(WebProcessCreationParameters&); -
trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.h
r141711 r147403 49 49 typedef GenericCallback<WKHTTPCookieAcceptPolicy, HTTPCookieAcceptPolicy> HTTPCookieAcceptPolicyCallback; 50 50 51 class WebCookieManagerProxy : public APIObject, public WebContextSupplement, private CoreIPC::MessageReceiver {51 class WebCookieManagerProxy : public TypedAPIObject<APIObject::TypeCookieManager>, public WebContextSupplement, private CoreIPC::MessageReceiver { 52 52 public: 53 static const Type APIType = TypeCookieManager;54 55 53 static const char* supplementName(); 56 54 … … 80 78 private: 81 79 WebCookieManagerProxy(WebContext*); 82 83 virtual Type type() const { return APIType; }84 80 85 81 void didGetHostnamesWithCookies(const Vector<String>&, uint64_t callbackID); -
trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h
r141711 r147403 47 47 typedef GenericCallback<WKArrayRef> ArrayCallback; 48 48 49 class WebDatabaseManagerProxy : public APIObject, public WebContextSupplement, private CoreIPC::MessageReceiver {49 class WebDatabaseManagerProxy : public TypedAPIObject<APIObject::TypeDatabaseManager>, public WebContextSupplement, private CoreIPC::MessageReceiver { 50 50 public: 51 static const Type APIType = TypeDatabaseManager;52 53 51 static const char* supplementName(); 54 52 … … 80 78 explicit WebDatabaseManagerProxy(WebContext*); 81 79 82 virtual Type type() const { return APIType; }83 84 80 // WebContextSupplement 85 81 virtual void contextDestroyed() OVERRIDE; -
trunk/Source/WebKit2/UIProcess/WebEditCommandProxy.h
r95901 r147403 37 37 class WebPageProxy; 38 38 39 class WebEditCommandProxy : public APIObject{39 class WebEditCommandProxy : public TypedAPIObject<APIObject::TypeEditCommandProxy> { 40 40 public: 41 41 static PassRefPtr<WebEditCommandProxy> create(uint64_t commandID, WebCore::EditAction editAction, WebPageProxy* page) … … 58 58 WebEditCommandProxy(uint64_t commandID, WebCore::EditAction, WebPageProxy*); 59 59 60 virtual Type type() const { return TypeEditCommandProxy; }61 62 60 uint64_t m_commandID; 63 61 WebCore::EditAction m_editAction; -
trunk/Source/WebKit2/UIProcess/WebFrameProxy.h
r141708 r147403 52 52 typedef GenericCallback<WKDataRef> DataCallback; 53 53 54 class WebFrameProxy : public APIObject{54 class WebFrameProxy : public TypedAPIObject<APIObject::TypeFrame> { 55 55 public: 56 static const Type APIType = TypeFrame;57 58 56 static PassRefPtr<WebFrameProxy> create(WebPageProxy* page, uint64_t frameID) 59 57 { … … 123 121 WebFrameProxy(WebPageProxy* page, uint64_t frameID); 124 122 125 virtual Type type() const { return APIType; }126 127 123 WebPageProxy* m_page; 128 124 LoadState m_loadState; -
trunk/Source/WebKit2/UIProcess/WebGeolocationManagerProxy.h
r141658 r147403 38 38 class WebGeolocationPosition; 39 39 40 class WebGeolocationManagerProxy : public APIObject, public WebContextSupplement, private CoreIPC::MessageReceiver {40 class WebGeolocationManagerProxy : public TypedAPIObject<APIObject::TypeGeolocationManager>, public WebContextSupplement, private CoreIPC::MessageReceiver { 41 41 public: 42 static const Type APIType = TypeGeolocationManager;43 44 42 static const char* supplementName(); 45 43 … … 57 55 private: 58 56 explicit WebGeolocationManagerProxy(WebContext*); 59 60 virtual Type type() const { return APIType; }61 57 62 58 // WebContextSupplement -
trunk/Source/WebKit2/UIProcess/WebGrammarDetail.h
r128683 r147403 36 36 class ImmutableArray; 37 37 38 class WebGrammarDetail : public APIObject{38 class WebGrammarDetail : public TypedAPIObject<APIObject::TypeGrammarDetail> { 39 39 public: 40 static const Type APIType = TypeGrammarDetail;41 40 static PassRefPtr<WebGrammarDetail> create(int location, int length, ImmutableArray* guesses, const String& userDescription); 42 41 static PassRefPtr<WebGrammarDetail> create(const WebCore::GrammarDetail&); … … 53 52 explicit WebGrammarDetail(const WebCore::GrammarDetail&); 54 53 55 virtual Type type() const { return APIType; }56 57 54 WebCore::GrammarDetail m_grammarDetail; 58 55 }; -
trunk/Source/WebKit2/UIProcess/WebIconDatabase.h
r141472 r147403 54 54 class WebContext; 55 55 56 class WebIconDatabase : public APIObject, public WebCore::IconDatabaseClient, private CoreIPC::MessageReceiver {56 class WebIconDatabase : public TypedAPIObject<APIObject::TypeIconDatabase>, public WebCore::IconDatabaseClient, private CoreIPC::MessageReceiver { 57 57 public: 58 static const Type APIType = TypeIconDatabase;59 60 58 static PassRefPtr<WebIconDatabase> create(WebContext*); 61 59 virtual ~WebIconDatabase(); … … 93 91 WebIconDatabase(WebContext*); 94 92 95 virtual Type type() const { return APIType; }96 97 93 // WebCore::IconDatabaseClient 98 94 virtual void didImportIconURLForPageURL(const String&); -
trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h
r147004 r147403 68 68 }; 69 69 70 class WebInspectorProxy : public APIObject, public CoreIPC::MessageReceiver {70 class WebInspectorProxy : public TypedAPIObject<APIObject::TypeInspector>, public CoreIPC::MessageReceiver { 71 71 public: 72 static const Type APIType = TypeInspector;73 74 72 static PassRefPtr<WebInspectorProxy> create(WebPageProxy* page) 75 73 { … … 147 145 private: 148 146 explicit WebInspectorProxy(WebPageProxy*); 149 150 virtual Type type() const { return APIType; }151 147 152 148 // CoreIPC::MessageReceiver -
trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManagerProxy.h
r141658 r147403 45 45 typedef GenericCallback<WKArrayRef> ArrayCallback; 46 46 47 class WebKeyValueStorageManagerProxy : public APIObject, public WebContextSupplement, private CoreIPC::MessageReceiver {47 class WebKeyValueStorageManagerProxy : public TypedAPIObject<APIObject::TypeKeyValueStorageManager>, public WebContextSupplement, private CoreIPC::MessageReceiver { 48 48 public: 49 static const Type APIType = TypeKeyValueStorageManager;50 51 49 static const char* supplementName(); 52 50 … … 63 61 private: 64 62 explicit WebKeyValueStorageManagerProxy(WebContext*); 65 66 virtual Type type() const { return APIType; }67 63 68 64 void didGetKeyValueStorageOrigins(const Vector<SecurityOriginData>&, uint64_t callbackID); -
trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.h
r141658 r147403 43 43 typedef GenericCallback<WKArrayRef> ArrayCallback; 44 44 45 class WebMediaCacheManagerProxy : public APIObject, public WebContextSupplement, private CoreIPC::MessageReceiver {45 class WebMediaCacheManagerProxy : public TypedAPIObject<APIObject::TypeMediaCacheManager>, public WebContextSupplement, private CoreIPC::MessageReceiver { 46 46 public: 47 static const Type APIType = TypeMediaCacheManager;48 49 47 static const char* supplementName(); 50 48 … … 61 59 private: 62 60 explicit WebMediaCacheManagerProxy(WebContext*); 63 64 virtual Type type() const { return APIType; }65 61 66 62 void didGetHostnamesWithMediaCache(const Vector<String>&, uint64_t callbackID); -
trunk/Source/WebKit2/UIProcess/WebNavigationData.h
r128683 r147403 33 33 namespace WebKit { 34 34 35 class WebNavigationData : public APIObject{35 class WebNavigationData : public TypedAPIObject<APIObject::TypeNavigationData> { 36 36 public: 37 static const Type APIType = TypeNavigationData;38 39 37 static PassRefPtr<WebNavigationData> create(const WebNavigationDataStore& store) 40 38 { … … 51 49 explicit WebNavigationData(const WebNavigationDataStore&); 52 50 53 virtual Type type() const { return APIType; }54 55 51 WebNavigationDataStore m_store; 56 52 }; -
trunk/Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.h
r141366 r147403 39 39 class WebNetworkInfo; 40 40 41 class WebNetworkInfoManagerProxy : public APIObject, private CoreIPC::MessageReceiver {41 class WebNetworkInfoManagerProxy : public TypedAPIObject<APIObject::TypeNetworkInfoManager>, private CoreIPC::MessageReceiver { 42 42 public: 43 static const Type APIType = TypeNetworkInfoManager;44 45 43 static PassRefPtr<WebNetworkInfoManagerProxy> create(WebContext*); 46 44 virtual ~WebNetworkInfoManagerProxy(); … … 55 53 private: 56 54 explicit WebNetworkInfoManagerProxy(WebContext*); 57 58 virtual Type type() const { return APIType; }59 55 60 56 // CoreIPC::MessageReceiver -
trunk/Source/WebKit2/UIProcess/WebOpenPanelResultListenerProxy.h
r128683 r147403 36 36 class WebPageProxy; 37 37 38 class WebOpenPanelResultListenerProxy : public APIObject{38 class WebOpenPanelResultListenerProxy : public TypedAPIObject<APIObject::TypeFramePolicyListener> { 39 39 public: 40 static const Type APIType = TypeFramePolicyListener;41 42 40 static PassRefPtr<WebOpenPanelResultListenerProxy> create(WebPageProxy* page) 43 41 { … … 55 53 explicit WebOpenPanelResultListenerProxy(WebPageProxy*); 56 54 57 virtual Type type() const { return APIType; }58 59 55 RefPtr<WebPageProxy> m_page; 60 56 }; -
trunk/Source/WebKit2/UIProcess/WebPageGroup.h
r131281 r147403 39 39 class WebPageProxy; 40 40 41 class WebPageGroup : public APIObject{41 class WebPageGroup : public TypedAPIObject<APIObject::TypePageGroup> { 42 42 public: 43 static const Type APIType = TypePageGroup;44 45 43 static PassRefPtr<WebPageGroup> create(const String& identifier = String(), bool visibleToInjectedBundle = true, bool visibleToHistoryClient = true); 46 44 static WebPageGroup* get(uint64_t pageGroupID); … … 69 67 WebPageGroup(const String& identifier, bool visibleToInjectedBundle, bool visibleToHistoryClient); 70 68 71 virtual Type type() const { return APIType; }72 73 69 template<typename MessageType> void sendToAllProcessesInGroup(const MessageType&, uint64_t destinationID); 74 70 -
trunk/Source/WebKit2/UIProcess/WebPageProxy.h
r146355 r147403 230 230 231 231 class WebPageProxy 232 : public APIObject232 : public TypedAPIObject<APIObject::TypePage> 233 233 #if ENABLE(INPUT_TYPE_COLOR) 234 234 , public WebColorChooserProxy::Client … … 237 237 , public CoreIPC::MessageReceiver { 238 238 public: 239 static const Type APIType = TypePage;240 239 241 240 static PassRefPtr<WebPageProxy> create(PageClient*, PassRefPtr<WebProcessProxy>, WebPageGroup*, uint64_t pageID); … … 778 777 private: 779 778 WebPageProxy(PageClient*, PassRefPtr<WebProcessProxy>, WebPageGroup*, uint64_t pageID); 780 781 virtual Type type() const { return APIType; }782 779 783 780 // CoreIPC::MessageReceiver -
trunk/Source/WebKit2/UIProcess/WebPreferences.cpp
r131825 r147403 43 43 44 44 WebPreferences::WebPreferences(const WebPreferences& other) 45 : APIObject() 46 , m_store(other.m_store) 45 : m_store(other.m_store) 47 46 { 48 47 platformInitializeStore(); -
trunk/Source/WebKit2/UIProcess/WebPreferences.h
r131825 r147403 42 42 class WebPageGroup; 43 43 44 class WebPreferences : public APIObject{44 class WebPreferences : public TypedAPIObject<APIObject::TypePreferences> { 45 45 public: 46 static const Type APIType = TypePreferences;47 48 46 static PassRefPtr<WebPreferences> create() 49 47 { … … 85 83 void platformInitializeStore(); 86 84 87 virtual Type type() const { return APIType; }88 89 85 void update(); 90 86 -
trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.h
r141658 r147403 45 45 typedef GenericCallback<WKArrayRef> ArrayCallback; 46 46 47 class WebResourceCacheManagerProxy : public APIObject, public WebContextSupplement, private CoreIPC::MessageReceiver {47 class WebResourceCacheManagerProxy : public TypedAPIObject<APIObject::TypeCacheManager>, public WebContextSupplement, private CoreIPC::MessageReceiver { 48 48 public: 49 static const Type APIType = TypeCacheManager;50 51 49 static const char* supplementName(); 52 50 … … 63 61 private: 64 62 explicit WebResourceCacheManagerProxy(WebContext*); 65 66 virtual Type type() const { return APIType; }67 63 68 64 // WebContextSupplement -
trunk/Source/WebKit2/UIProcess/WebTextChecker.h
r96858 r147403 36 36 class WebPageProxy; 37 37 38 class WebTextChecker : public APIObject{38 class WebTextChecker : public TypedAPIObject<APIObject::TypeTextChecker> { 39 39 public: 40 static const Type APIType = TypeTextChecker;41 42 40 static WebTextChecker* shared(); 43 41 … … 54 52 WebTextChecker(); 55 53 56 virtual Type type() const { return APIType; }57 58 54 WebTextCheckerClient m_client; 59 55 }; -
trunk/Source/WebKit2/UIProcess/WebVibrationProxy.h
r141366 r147403 38 38 class WebPageProxy; 39 39 40 class WebVibrationProxy : public APIObject, private CoreIPC::MessageReceiver {40 class WebVibrationProxy : public TypedAPIObject<APIObject::TypeVibration>, private CoreIPC::MessageReceiver { 41 41 public: 42 static const Type APIType = TypeVibration;43 44 42 static PassRefPtr<WebVibrationProxy> create(WebPageProxy*); 45 43 virtual ~WebVibrationProxy(); … … 51 49 private: 52 50 explicit WebVibrationProxy(WebPageProxy*); 53 54 virtual Type type() const { return APIType; }55 51 56 52 // CoreIPC::MessageReceiver -
trunk/Source/WebKit2/UIProcess/efl/WebPopupItemEfl.h
r143275 r147403 33 33 namespace WebKit { 34 34 35 class WebPopupItemEfl : public APIObject{35 class WebPopupItemEfl : public TypedAPIObject<APIObject::TypePopupMenuItem> { 36 36 public: 37 static const Type APIType = TypePopupMenuItem;38 39 37 static PassRefPtr<WebPopupItemEfl> create(const WebPopupItem& data) 40 38 { … … 58 56 explicit WebPopupItemEfl(const WebPopupItem&); 59 57 60 virtual Type type() const { return APIType; }61 62 58 WebPopupItem m_data; 63 59 }; -
trunk/Source/WebKit2/UIProcess/efl/WebView.h
r146265 r147403 47 47 namespace WebKit { 48 48 49 class WebView : public APIObject, public PageClient {49 class WebView : public TypedAPIObject<APIObject::TypeView>, public PageClient { 50 50 public: 51 static const Type APIType = TypeView;52 53 51 virtual ~WebView(); 54 52 … … 178 176 179 177 private: 180 virtual Type type() const { return APIType; }181 182 178 WebViewClient m_client; 183 179 EwkView* m_ewkView; -
trunk/Source/WebKit2/UIProcess/soup/WebSoupRequestManagerProxy.h
r141658 r147403 35 35 class WebData; 36 36 37 class WebSoupRequestManagerProxy : public APIObject, public WebContextSupplement, private CoreIPC::MessageReceiver {37 class WebSoupRequestManagerProxy : public TypedAPIObject<APIObject::TypeSoupRequestManager>, public WebContextSupplement, private CoreIPC::MessageReceiver { 38 38 public: 39 static const Type APIType = TypeSoupRequestManager;40 41 39 static const char* supplementName(); 42 40 … … 59 57 WebSoupRequestManagerProxy(WebContext*); 60 58 61 virtual Type type() const { return APIType; }62 63 59 // WebContextSupplement 64 60 virtual void contextDestroyed() OVERRIDE; -
trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h
r146154 r147403 45 45 class WebImage; 46 46 47 class InjectedBundleNodeHandle : public APIObject{47 class InjectedBundleNodeHandle : public TypedAPIObject<APIObject::TypeBundleNodeHandle> { 48 48 public: 49 static const Type APIType = TypeBundleNodeHandle;50 51 49 static PassRefPtr<InjectedBundleNodeHandle> getOrCreate(JSContextRef, JSObjectRef); 52 50 static PassRefPtr<InjectedBundleNodeHandle> getOrCreate(WebCore::Node*); … … 80 78 InjectedBundleNodeHandle(WebCore::Node*); 81 79 82 virtual Type type() const { return APIType; }83 84 80 RefPtr<WebCore::Node> m_node; 85 81 }; -
trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.h
r142900 r147403 40 40 class InjectedBundleScriptWorld; 41 41 42 class InjectedBundleRangeHandle : public APIObject{42 class InjectedBundleRangeHandle : public TypedAPIObject<APIObject::TypeBundleRangeHandle> { 43 43 public: 44 static const Type APIType = TypeBundleRangeHandle;45 46 44 static PassRefPtr<InjectedBundleRangeHandle> getOrCreate(JSContextRef, JSObjectRef); 47 45 static PassRefPtr<InjectedBundleRangeHandle> getOrCreate(WebCore::Range*); … … 55 53 InjectedBundleRangeHandle(WebCore::Range*); 56 54 57 virtual Type type() const { return APIType; }58 59 55 RefPtr<WebCore::Range> m_range; 60 56 }; -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h
r145784 r147403 78 78 class WebPageGroupProxy; 79 79 80 class InjectedBundle : public APIObject{80 class InjectedBundle : public TypedAPIObject<APIObject::TypeBundle> { 81 81 public: 82 static const Type APIType = TypeBundle;83 84 82 static PassRefPtr<InjectedBundle> create(const String& path) 85 83 { … … 180 178 explicit InjectedBundle(const String&); 181 179 182 virtual Type type() const { return APIType; }183 184 180 String m_path; 185 181 PlatformBundle m_platformBundle; // This is leaked right now, since we never unload the bundle/module. -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleBackForwardList.h
r95901 r147403 36 36 class InjectedBundleBackForwardListItem; 37 37 38 class InjectedBundleBackForwardList : public APIObject{38 class InjectedBundleBackForwardList : public TypedAPIObject<APIObject::TypeBundleBackForwardList> { 39 39 public: 40 static const Type APIType = TypeBundleBackForwardList;41 42 40 static PassRefPtr<InjectedBundleBackForwardList> create(WebPage* page) 43 41 { … … 56 54 InjectedBundleBackForwardList(WebPage* page) : m_page(page) { } 57 55 58 virtual Type type() const { return APIType; }59 60 56 WebPage* m_page; 61 57 }; -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleBackForwardListItem.h
r145789 r147403 35 35 class WebPageProxy; 36 36 37 class InjectedBundleBackForwardListItem : public APIObject{37 class InjectedBundleBackForwardListItem : public TypedAPIObject<APIObject::TypeBundleBackForwardListItem> { 38 38 public: 39 static const Type APIType = TypeBundleBackForwardListItem;40 41 39 static PassRefPtr<InjectedBundleBackForwardListItem> create(PassRefPtr<WebCore::HistoryItem> item) 42 40 { … … 62 60 InjectedBundleBackForwardListItem(PassRefPtr<WebCore::HistoryItem> item) : m_item(item) { } 63 61 64 virtual Type type() const { return APIType; }65 66 62 RefPtr<WebCore::HistoryItem> m_item; 67 63 }; -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.h
r115128 r147403 41 41 class WebFrame; 42 42 43 class InjectedBundleDOMWindowExtension : public APIObject{43 class InjectedBundleDOMWindowExtension : public TypedAPIObject<APIObject::TypeBundleDOMWindowExtension> { 44 44 public: 45 static const Type APIType = TypeBundleDOMWindowExtension;46 47 45 static PassRefPtr<InjectedBundleDOMWindowExtension> create(WebFrame*, InjectedBundleScriptWorld*); 48 46 static InjectedBundleDOMWindowExtension* get(WebCore::DOMWindowExtension*); … … 54 52 55 53 private: 56 virtual Type type() const { return APIType; }57 58 54 InjectedBundleDOMWindowExtension(WebFrame*, InjectedBundleScriptWorld*); 59 55 -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h
r97810 r147403 38 38 class WebFrame; 39 39 40 class InjectedBundleHitTestResult : public APIObject{40 class InjectedBundleHitTestResult : public TypedAPIObject<APIObject::TypeBundleHitTestResult> { 41 41 public: 42 static const Type APIType = TypeBundleHitTestResult;43 44 42 static PassRefPtr<InjectedBundleHitTestResult> create(const WebCore::HitTestResult&); 45 43 … … 68 66 } 69 67 70 virtual Type type() const { return APIType; }71 72 68 WebCore::HitTestResult m_hitTestResult; 73 69 }; -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleNavigationAction.h
r95901 r147403 44 44 class WebFrame; 45 45 46 class InjectedBundleNavigationAction : public APIObject{46 class InjectedBundleNavigationAction : public TypedAPIObject<APIObject::TypeBundleNavigationAction> { 47 47 public: 48 static const Type APIType = TypeBundleNavigationAction;49 50 48 static PassRefPtr<InjectedBundleNavigationAction> create(WebFrame*, const WebCore::NavigationAction&, PassRefPtr<WebCore::FormState>); 51 49 … … 62 60 InjectedBundleNavigationAction(WebFrame*, const WebCore::NavigationAction&, PassRefPtr<WebCore::FormState>); 63 61 64 virtual Type type() const { return APIType; }65 66 62 WebCore::NavigationType m_navigationType; 67 63 WebEvent::Modifiers m_modifiers; -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleScriptWorld.h
r95901 r147403 37 37 namespace WebKit { 38 38 39 class InjectedBundleScriptWorld : public APIObject{39 class InjectedBundleScriptWorld : public TypedAPIObject<APIObject::TypeBundleScriptWorld> { 40 40 public: 41 static const Type APIType = TypeBundleScriptWorld;42 43 41 static PassRefPtr<InjectedBundleScriptWorld> create(); 44 42 static PassRefPtr<InjectedBundleScriptWorld> getOrCreate(WebCore::DOMWrapperWorld*); … … 54 52 InjectedBundleScriptWorld(PassRefPtr<WebCore::DOMWrapperWorld>); 55 53 56 virtual Type type() const { return APIType; }57 58 54 RefPtr<WebCore::DOMWrapperWorld> m_world; 59 55 }; -
trunk/Source/WebKit2/WebProcess/WebPage/PageOverlay.h
r145731 r147403 41 41 class WebPage; 42 42 43 class PageOverlay : public APIObject{43 class PageOverlay : public TypedAPIObject<APIObject::TypeBundlePageOverlay> { 44 44 public: 45 45 class Client { … … 54 54 virtual bool mouseEvent(PageOverlay*, const WebMouseEvent&) = 0; 55 55 }; 56 57 static const Type APIType = TypeBundlePageOverlay;58 56 59 57 static PassRefPtr<PageOverlay> create(Client*); … … 77 75 78 76 private: 79 // APIObject80 virtual Type type() const { return APIType; }81 82 77 WebCore::IntRect bounds() const; 83 78 -
trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.h
r145914 r147403 56 56 class WebPage; 57 57 58 class WebFrame : public APIObject{58 class WebFrame : public TypedAPIObject<APIObject::TypeBundleFrame> { 59 59 public: 60 static const Type APIType = TypeBundleFrame;61 62 60 static PassRefPtr<WebFrame> createMainFrame(WebPage*); 63 61 static PassRefPtr<WebFrame> createSubframe(WebPage*, const String& frameName, WebCore::HTMLFrameOwnerElement*); … … 148 146 void init(WebPage*, const String& frameName, WebCore::HTMLFrameOwnerElement*); 149 147 150 virtual Type type() const { return APIType; }151 152 148 WebCore::Frame* m_coreFrame; 153 149 -
trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h
r147004 r147403 44 44 struct WebPageCreationParameters; 45 45 46 class WebInspector : public APIObject{46 class WebInspector : public TypedAPIObject<APIObject::TypeBundleInspector> { 47 47 public: 48 static const Type APIType = TypeBundleInspector;49 50 48 static PassRefPtr<WebInspector> create(WebPage*, WebCore::InspectorFrontendChannel*); 51 49 … … 87 85 88 86 explicit WebInspector(WebPage*, WebCore::InspectorFrontendChannel*); 89 90 virtual Type type() const { return APIType; }91 87 92 88 // Called from WebInspectorClient -
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h
r147260 r147403 167 167 typedef Vector<RefPtr<PageOverlay> > PageOverlayList; 168 168 169 class WebPage : public APIObject, public CoreIPC::MessageReceiver, public CoreIPC::MessageSender<WebPage> {169 class WebPage : public TypedAPIObject<APIObject::TypeBundlePage>, public CoreIPC::MessageReceiver, public CoreIPC::MessageSender<WebPage> { 170 170 public: 171 static const Type APIType = TypeBundlePage;172 173 171 static PassRefPtr<WebPage> create(uint64_t pageID, const WebPageCreationParameters&); 174 172 virtual ~WebPage(); … … 654 652 WebPage(uint64_t pageID, const WebPageCreationParameters&); 655 653 656 virtual Type type() const { return APIType; }657 658 654 void platformInitialize(); 659 655 -
trunk/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.h
r141472 r147403 42 42 namespace WebKit { 43 43 44 class WebPageGroupProxy : public APIObject{44 class WebPageGroupProxy : public TypedAPIObject<APIObject::TypeBundlePageGroup> { 45 45 public: 46 static const Type APIType = TypeBundlePageGroup;47 48 46 static PassRefPtr<WebPageGroupProxy> create(const WebPageGroupData&); 49 47 virtual ~WebPageGroupProxy(); … … 58 56 private: 59 57 WebPageGroupProxy(const WebPageGroupData&); 60 61 virtual Type type() const { return APIType; }62 58 63 59 void addUserStyleSheet(const WebCore::UserStyleSheet&);
Note: See TracChangeset
for help on using the changeset viewer.