Changeset 159988 in webkit
- Timestamp:
- Dec 2, 2013 6:36:08 PM (10 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 91 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r159985 r159988 1 2013-12-02 Anders Carlsson <andersca@apple.com> 2 3 Replace uses of WebKit::APIClient with API::Client 4 https://bugs.webkit.org/show_bug.cgi?id=125129 5 6 Reviewed by Andreas Kling. 7 8 * Shared/API/c/WKConnectionRef.cpp: 9 (WKConnectionSetConnectionClient): 10 * Shared/WebConnection.cpp: 11 (WebKit::WebConnection::initializeConnectionClient): 12 * Shared/WebConnection.h: 13 * Shared/WebConnectionClient.cpp: 14 (WebKit::WebConnectionClient::didReceiveMessage): 15 (WebKit::WebConnectionClient::didClose): 16 * Shared/WebConnectionClient.h: 17 * UIProcess/API/C/WKContext.cpp: 18 (WKContextSetClient): 19 (WKContextSetInjectedBundleClient): 20 (WKContextSetHistoryClient): 21 (WKContextSetDownloadClient): 22 (WKContextSetConnectionClient): 23 * UIProcess/API/C/WKCookieManager.cpp: 24 (WKCookieManagerSetClient): 25 * UIProcess/API/C/WKDatabaseManager.cpp: 26 (WKDatabaseManagerSetClient): 27 * UIProcess/API/C/WKGeolocationManager.cpp: 28 (WKGeolocationManagerSetProvider): 29 * UIProcess/API/C/WKIconDatabase.cpp: 30 (WKIconDatabaseSetIconDatabaseClient): 31 * UIProcess/API/C/WKNotificationManager.cpp: 32 (WKNotificationManagerSetProvider): 33 * UIProcess/API/C/WKOriginDataManager.cpp: 34 (WKOriginDataManagerSetChangeClient): 35 * UIProcess/API/C/WKPage.cpp: 36 (WKPageSetPageContextMenuClient): 37 (WKPageSetPageFindClient): 38 (WKPageSetPageFindMatchesClient): 39 (WKPageSetPageFormClient): 40 (WKPageSetPagePolicyClient): 41 (WKPageSetPageUIClient): 42 * UIProcess/API/Cocoa/WKBrowsingContextController.mm: 43 (setUpPagePolicyClient): 44 * UIProcess/Notifications/WebNotificationManagerProxy.cpp: 45 (WebKit::WebNotificationManagerProxy::initializeProvider): 46 * UIProcess/Notifications/WebNotificationManagerProxy.h: 47 * UIProcess/Notifications/WebNotificationProvider.cpp: 48 (WebKit::WebNotificationProvider::show): 49 (WebKit::WebNotificationProvider::cancel): 50 (WebKit::WebNotificationProvider::didDestroyNotification): 51 (WebKit::WebNotificationProvider::clearNotifications): 52 (WebKit::WebNotificationProvider::addNotificationManager): 53 (WebKit::WebNotificationProvider::removeNotificationManager): 54 (WebKit::WebNotificationProvider::notificationPermissions): 55 * UIProcess/Notifications/WebNotificationProvider.h: 56 * UIProcess/WebContext.cpp: 57 (WebKit::WebContext::initializeClient): 58 (WebKit::WebContext::initializeInjectedBundleClient): 59 (WebKit::WebContext::initializeConnectionClient): 60 (WebKit::WebContext::initializeHistoryClient): 61 (WebKit::WebContext::initializeDownloadClient): 62 * UIProcess/WebContext.h: 63 * UIProcess/WebContextClient.cpp: 64 (WebKit::WebContextClient::plugInAutoStartOriginHashesChanged): 65 (WebKit::WebContextClient::networkProcessDidCrash): 66 (WebKit::WebContextClient::plugInInformationBecameAvailable): 67 * UIProcess/WebContextClient.h: 68 * UIProcess/WebContextConnectionClient.cpp: 69 (WebKit::WebContextConnectionClient::didCreateConnection): 70 * UIProcess/WebContextConnectionClient.h: 71 * UIProcess/WebContextInjectedBundleClient.cpp: 72 (WebKit::WebContextInjectedBundleClient::didReceiveMessageFromInjectedBundle): 73 (WebKit::WebContextInjectedBundleClient::didReceiveSynchronousMessageFromInjectedBundle): 74 (WebKit::WebContextInjectedBundleClient::getInjectedBundleInitializationUserData): 75 * UIProcess/WebContextInjectedBundleClient.h: 76 * UIProcess/WebCookieManagerProxy.cpp: 77 (WebKit::WebCookieManagerProxy::initializeClient): 78 * UIProcess/WebCookieManagerProxy.h: 79 * UIProcess/WebCookieManagerProxyClient.cpp: 80 (WebKit::WebCookieManagerProxyClient::cookiesDidChange): 81 * UIProcess/WebCookieManagerProxyClient.h: 82 * UIProcess/WebDatabaseManagerProxy.cpp: 83 (WebKit::WebDatabaseManagerProxy::initializeClient): 84 * UIProcess/WebDatabaseManagerProxy.h: 85 * UIProcess/WebDatabaseManagerProxyClient.cpp: 86 (WebKit::WebDatabaseManagerProxyClient::didModifyOrigin): 87 (WebKit::WebDatabaseManagerProxyClient::didModifyDatabase): 88 * UIProcess/WebDatabaseManagerProxyClient.h: 89 * UIProcess/WebDownloadClient.cpp: 90 (WebKit::WebDownloadClient::didStart): 91 (WebKit::WebDownloadClient::didReceiveAuthenticationChallenge): 92 (WebKit::WebDownloadClient::didReceiveResponse): 93 (WebKit::WebDownloadClient::didReceiveData): 94 (WebKit::WebDownloadClient::shouldDecodeSourceDataOfMIMEType): 95 (WebKit::WebDownloadClient::decideDestinationWithSuggestedFilename): 96 (WebKit::WebDownloadClient::didCreateDestination): 97 (WebKit::WebDownloadClient::didFinish): 98 (WebKit::WebDownloadClient::didFail): 99 (WebKit::WebDownloadClient::didCancel): 100 (WebKit::WebDownloadClient::processDidCrash): 101 * UIProcess/WebDownloadClient.h: 102 * UIProcess/WebFindClient.cpp: 103 (WebKit::WebFindClient::didFindString): 104 (WebKit::WebFindClient::didFailToFindString): 105 (WebKit::WebFindClient::didCountStringMatches): 106 (WebKit::WebFindMatchesClient::didFindStringMatches): 107 (WebKit::WebFindMatchesClient::didGetImageForMatchResult): 108 * UIProcess/WebFindClient.h: 109 * UIProcess/WebFormClient.cpp: 110 (WebKit::WebFormClient::willSubmitForm): 111 * UIProcess/WebFormClient.h: 112 * UIProcess/WebGeolocationManagerProxy.cpp: 113 (WebKit::WebGeolocationManagerProxy::initializeProvider): 114 * UIProcess/WebGeolocationManagerProxy.h: 115 * UIProcess/WebGeolocationProvider.cpp: 116 (WebKit::WebGeolocationProvider::startUpdating): 117 (WebKit::WebGeolocationProvider::stopUpdating): 118 (WebKit::WebGeolocationProvider::setEnableHighAccuracy): 119 * UIProcess/WebGeolocationProvider.h: 120 * UIProcess/WebHistoryClient.cpp: 121 (WebKit::WebHistoryClient::didNavigateWithNavigationData): 122 (WebKit::WebHistoryClient::didPerformClientRedirect): 123 (WebKit::WebHistoryClient::didPerformServerRedirect): 124 (WebKit::WebHistoryClient::didUpdateHistoryTitle): 125 (WebKit::WebHistoryClient::populateVisitedLinks): 126 * UIProcess/WebHistoryClient.h: 127 * UIProcess/WebIconDatabase.cpp: 128 (WebKit::WebIconDatabase::initializeIconDatabaseClient): 129 * UIProcess/WebIconDatabase.h: 130 * UIProcess/WebIconDatabaseClient.cpp: 131 (WebKit::WebIconDatabaseClient::didChangeIconForPageURL): 132 (WebKit::WebIconDatabaseClient::didRemoveAllIcons): 133 (WebKit::WebIconDatabaseClient::iconDataReadyForPageURL): 134 * UIProcess/WebIconDatabaseClient.h: 135 * UIProcess/WebInspectorProxy.cpp: 136 (WebKit::WebInspectorProxy::createInspectorPage): 137 * UIProcess/WebLoaderClient.h: 138 * UIProcess/WebOriginDataManagerProxy.cpp: 139 (WebKit::WebOriginDataManagerProxy::setChangeClient): 140 * UIProcess/WebOriginDataManagerProxy.h: 141 * UIProcess/WebOriginDataManagerProxyChangeClient.cpp: 142 (WebKit::WebOriginDataManagerProxyChangeClient::didChange): 143 * UIProcess/WebOriginDataManagerProxyChangeClient.h: 144 * UIProcess/WebPageContextMenuClient.cpp: 145 (WebKit::WebPageContextMenuClient::getContextMenuFromProposedMenu): 146 (WebKit::WebPageContextMenuClient::customContextMenuItemSelected): 147 (WebKit::WebPageContextMenuClient::contextMenuDismissed): 148 (WebKit::WebPageContextMenuClient::showContextMenu): 149 (WebKit::WebPageContextMenuClient::hideContextMenu): 150 * UIProcess/WebPageContextMenuClient.h: 151 * UIProcess/WebPageProxy.cpp: 152 (WebKit::WebPageProxy::initializePolicyClient): 153 (WebKit::WebPageProxy::initializeFormClient): 154 (WebKit::WebPageProxy::initializeUIClient): 155 (WebKit::WebPageProxy::initializeFindClient): 156 (WebKit::WebPageProxy::initializeFindMatchesClient): 157 (WebKit::WebPageProxy::initializeContextMenuClient): 158 * UIProcess/WebPageProxy.h: 159 * UIProcess/WebPolicyClient.cpp: 160 (WebKit::WebPolicyClient::decidePolicyForNavigationAction): 161 (WebKit::WebPolicyClient::decidePolicyForNewWindowAction): 162 (WebKit::WebPolicyClient::decidePolicyForResponse): 163 (WebKit::WebPolicyClient::unableToImplementPolicy): 164 * UIProcess/WebPolicyClient.h: 165 * UIProcess/WebUIClient.cpp: 166 (WebKit::WebUIClient::createNewPage): 167 (WebKit::WebUIClient::showPage): 168 (WebKit::WebUIClient::close): 169 (WebKit::WebUIClient::takeFocus): 170 (WebKit::WebUIClient::focus): 171 (WebKit::WebUIClient::unfocus): 172 (WebKit::WebUIClient::runJavaScriptAlert): 173 (WebKit::WebUIClient::runJavaScriptConfirm): 174 (WebKit::WebUIClient::runJavaScriptPrompt): 175 (WebKit::WebUIClient::setStatusText): 176 (WebKit::WebUIClient::mouseDidMoveOverElement): 177 (WebKit::WebUIClient::unavailablePluginButtonClicked): 178 (WebKit::WebUIClient::didNotHandleKeyEvent): 179 (WebKit::WebUIClient::didNotHandleWheelEvent): 180 (WebKit::WebUIClient::toolbarsAreVisible): 181 (WebKit::WebUIClient::setToolbarsAreVisible): 182 (WebKit::WebUIClient::menuBarIsVisible): 183 (WebKit::WebUIClient::setMenuBarIsVisible): 184 (WebKit::WebUIClient::statusBarIsVisible): 185 (WebKit::WebUIClient::setStatusBarIsVisible): 186 (WebKit::WebUIClient::isResizable): 187 (WebKit::WebUIClient::setIsResizable): 188 (WebKit::WebUIClient::setWindowFrame): 189 (WebKit::WebUIClient::windowFrame): 190 (WebKit::WebUIClient::runBeforeUnloadConfirmPanel): 191 (WebKit::WebUIClient::didDraw): 192 (WebKit::WebUIClient::pageDidScroll): 193 (WebKit::WebUIClient::exceededDatabaseQuota): 194 (WebKit::WebUIClient::runOpenPanel): 195 (WebKit::WebUIClient::decidePolicyForGeolocationPermissionRequest): 196 (WebKit::WebUIClient::decidePolicyForNotificationPermissionRequest): 197 (WebKit::WebUIClient::headerHeight): 198 (WebKit::WebUIClient::footerHeight): 199 (WebKit::WebUIClient::drawHeader): 200 (WebKit::WebUIClient::drawFooter): 201 (WebKit::WebUIClient::printFrame): 202 (WebKit::WebUIClient::runModal): 203 (WebKit::WebUIClient::saveDataToFileInDownloadsFolder): 204 (WebKit::WebUIClient::shouldInterruptJavaScript): 205 (WebKit::WebUIClient::showColorPicker): 206 (WebKit::WebUIClient::hideColorPicker): 207 * UIProcess/WebUIClient.h: 208 * UIProcess/mac/WebInspectorProxyMac.mm: 209 (WebKit::WebInspectorProxy::platformCreateInspectorPage): 210 * WebProcess/InjectedBundle/API/c/WKBundle.cpp: 211 (WKBundleSetClient): 212 * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp: 213 (WKBundlePageSetContextMenuClient): 214 (WKBundlePageSetEditorClient): 215 (WKBundlePageSetFormClient): 216 (WKBundlePageSetPageLoaderClient): 217 (WKBundlePageSetResourceLoadClient): 218 (WKBundlePageSetPolicyClient): 219 (WKBundlePageSetUIClient): 220 (WKBundlePageSetFullScreenClient): 221 (WKBundlePageSetDiagnosticLoggingClient): 222 * WebProcess/InjectedBundle/InjectedBundle.cpp: 223 (WebKit::InjectedBundle::initializeClient): 224 * WebProcess/InjectedBundle/InjectedBundle.h: 225 * WebProcess/InjectedBundle/InjectedBundleClient.cpp: 226 (WebKit::InjectedBundleClient::didCreatePage): 227 (WebKit::InjectedBundleClient::willDestroyPage): 228 (WebKit::InjectedBundleClient::didInitializePageGroup): 229 (WebKit::InjectedBundleClient::didReceiveMessage): 230 (WebKit::InjectedBundleClient::didReceiveMessageToPage): 231 * WebProcess/InjectedBundle/InjectedBundleClient.h: 232 * WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp: 233 (WebKit::InjectedBundlePageContextMenuClient::getCustomMenuFromDefaultItems): 234 * WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.h: 235 * WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp: 236 (WebKit::InjectedBundlePageDiagnosticLoggingClient::logDiagnosticMessage): 237 * WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.h: 238 * WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp: 239 (WebKit::InjectedBundlePageEditorClient::shouldBeginEditing): 240 (WebKit::InjectedBundlePageEditorClient::shouldEndEditing): 241 (WebKit::InjectedBundlePageEditorClient::shouldInsertNode): 242 (WebKit::InjectedBundlePageEditorClient::shouldInsertText): 243 (WebKit::InjectedBundlePageEditorClient::shouldDeleteRange): 244 (WebKit::InjectedBundlePageEditorClient::shouldChangeSelectedRange): 245 (WebKit::InjectedBundlePageEditorClient::shouldApplyStyle): 246 (WebKit::InjectedBundlePageEditorClient::didBeginEditing): 247 (WebKit::InjectedBundlePageEditorClient::didEndEditing): 248 (WebKit::InjectedBundlePageEditorClient::didChange): 249 (WebKit::InjectedBundlePageEditorClient::didChangeSelection): 250 (WebKit::InjectedBundlePageEditorClient::willWriteToPasteboard): 251 (WebKit::InjectedBundlePageEditorClient::getPasteboardDataForRange): 252 (WebKit::InjectedBundlePageEditorClient::didWriteToPasteboard): 253 * WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h: 254 * WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp: 255 (WebKit::InjectedBundlePageFormClient::didFocusTextField): 256 (WebKit::InjectedBundlePageFormClient::textFieldDidBeginEditing): 257 (WebKit::InjectedBundlePageFormClient::textFieldDidEndEditing): 258 (WebKit::InjectedBundlePageFormClient::textDidChangeInTextField): 259 (WebKit::InjectedBundlePageFormClient::textDidChangeInTextArea): 260 (WebKit::InjectedBundlePageFormClient::shouldPerformActionInTextField): 261 (WebKit::InjectedBundlePageFormClient::willSendSubmitEvent): 262 (WebKit::InjectedBundlePageFormClient::willSubmitForm): 263 (WebKit::InjectedBundlePageFormClient::didAssociateFormControls): 264 (WebKit::InjectedBundlePageFormClient::shouldNotifyOnFormChanges): 265 * WebProcess/InjectedBundle/InjectedBundlePageFormClient.h: 266 * WebProcess/InjectedBundle/InjectedBundlePageFullScreenClient.h: 267 * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp: 268 (WebKit::InjectedBundlePageLoaderClient::willLoadURLRequest): 269 (WebKit::InjectedBundlePageLoaderClient::willLoadDataRequest): 270 (WebKit::InjectedBundlePageLoaderClient::shouldGoToBackForwardListItem): 271 (WebKit::InjectedBundlePageLoaderClient::didStartProvisionalLoadForFrame): 272 (WebKit::InjectedBundlePageLoaderClient::didReceiveServerRedirectForProvisionalLoadForFrame): 273 (WebKit::InjectedBundlePageLoaderClient::didFailProvisionalLoadWithErrorForFrame): 274 (WebKit::InjectedBundlePageLoaderClient::didCommitLoadForFrame): 275 (WebKit::InjectedBundlePageLoaderClient::didFinishDocumentLoadForFrame): 276 (WebKit::InjectedBundlePageLoaderClient::didFinishLoadForFrame): 277 (WebKit::InjectedBundlePageLoaderClient::didFinishProgress): 278 (WebKit::InjectedBundlePageLoaderClient::didFailLoadWithErrorForFrame): 279 (WebKit::InjectedBundlePageLoaderClient::didSameDocumentNavigationForFrame): 280 (WebKit::InjectedBundlePageLoaderClient::didReceiveTitleForFrame): 281 (WebKit::InjectedBundlePageLoaderClient::didRemoveFrameFromHierarchy): 282 (WebKit::InjectedBundlePageLoaderClient::didDisplayInsecureContentForFrame): 283 (WebKit::InjectedBundlePageLoaderClient::didRunInsecureContentForFrame): 284 (WebKit::InjectedBundlePageLoaderClient::didDetectXSSForFrame): 285 (WebKit::InjectedBundlePageLoaderClient::didFirstLayoutForFrame): 286 (WebKit::InjectedBundlePageLoaderClient::didFirstVisuallyNonEmptyLayoutForFrame): 287 (WebKit::InjectedBundlePageLoaderClient::didLayoutForFrame): 288 (WebKit::InjectedBundlePageLoaderClient::didLayout): 289 (WebKit::InjectedBundlePageLoaderClient::didClearWindowObjectForFrame): 290 (WebKit::InjectedBundlePageLoaderClient::didCancelClientRedirectForFrame): 291 (WebKit::InjectedBundlePageLoaderClient::willPerformClientRedirectForFrame): 292 (WebKit::InjectedBundlePageLoaderClient::didHandleOnloadEventsForFrame): 293 (WebKit::InjectedBundlePageLoaderClient::globalObjectIsAvailableForFrame): 294 (WebKit::InjectedBundlePageLoaderClient::willDisconnectDOMWindowExtensionFromGlobalObject): 295 (WebKit::InjectedBundlePageLoaderClient::didReconnectDOMWindowExtensionToGlobalObject): 296 (WebKit::InjectedBundlePageLoaderClient::willDestroyGlobalObjectForDOMWindowExtension): 297 (WebKit::InjectedBundlePageLoaderClient::shouldForceUniversalAccessFromLocalURL): 298 (WebKit::InjectedBundlePageLoaderClient::featuresUsedInPage): 299 (WebKit::InjectedBundlePageLoaderClient::willDestroyFrame): 300 * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h: 301 * WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.cpp: 302 (WebKit::InjectedBundlePagePolicyClient::decidePolicyForNavigationAction): 303 (WebKit::InjectedBundlePagePolicyClient::decidePolicyForNewWindowAction): 304 (WebKit::InjectedBundlePagePolicyClient::decidePolicyForResponse): 305 (WebKit::InjectedBundlePagePolicyClient::unableToImplementPolicy): 306 * WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.h: 307 * WebProcess/InjectedBundle/InjectedBundlePageResourceLoadClient.cpp: 308 (WebKit::InjectedBundlePageResourceLoadClient::didInitiateLoadForResource): 309 (WebKit::InjectedBundlePageResourceLoadClient::willSendRequestForFrame): 310 (WebKit::InjectedBundlePageResourceLoadClient::didReceiveResponseForResource): 311 (WebKit::InjectedBundlePageResourceLoadClient::didReceiveContentLengthForResource): 312 (WebKit::InjectedBundlePageResourceLoadClient::didFinishLoadForResource): 313 (WebKit::InjectedBundlePageResourceLoadClient::didFailLoadForResource): 314 (WebKit::InjectedBundlePageResourceLoadClient::shouldCacheResponse): 315 (WebKit::InjectedBundlePageResourceLoadClient::shouldUseCredentialStorage): 316 * WebProcess/InjectedBundle/InjectedBundlePageResourceLoadClient.h: 317 * WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp: 318 (WebKit::InjectedBundlePageUIClient::willAddMessageToConsole): 319 (WebKit::InjectedBundlePageUIClient::willSetStatusbarText): 320 (WebKit::InjectedBundlePageUIClient::willRunJavaScriptAlert): 321 (WebKit::InjectedBundlePageUIClient::willRunJavaScriptConfirm): 322 (WebKit::InjectedBundlePageUIClient::willRunJavaScriptPrompt): 323 (WebKit::InjectedBundlePageUIClient::mouseDidMoveOverElement): 324 (WebKit::InjectedBundlePageUIClient::pageDidScroll): 325 (WebKit::InjectedBundlePageUIClient::shouldGenerateFileForUpload): 326 (WebKit::InjectedBundlePageUIClient::generateFileForUpload): 327 (WebKit::InjectedBundlePageUIClient::statusBarIsVisible): 328 (WebKit::InjectedBundlePageUIClient::menuBarIsVisible): 329 (WebKit::InjectedBundlePageUIClient::toolbarsAreVisible): 330 (WebKit::InjectedBundlePageUIClient::didReachApplicationCacheOriginQuota): 331 (WebKit::InjectedBundlePageUIClient::didExceedDatabaseQuota): 332 (WebKit::InjectedBundlePageUIClient::plugInStartLabelTitle): 333 (WebKit::InjectedBundlePageUIClient::plugInStartLabelSubtitle): 334 (WebKit::InjectedBundlePageUIClient::plugInExtraStyleSheet): 335 (WebKit::InjectedBundlePageUIClient::plugInExtraScript): 336 * WebProcess/InjectedBundle/InjectedBundlePageUIClient.h: 337 * WebProcess/WebPage/WebPage.cpp: 338 (WebKit::WebPage::initializeInjectedBundleContextMenuClient): 339 (WebKit::WebPage::initializeInjectedBundleEditorClient): 340 (WebKit::WebPage::initializeInjectedBundleFormClient): 341 (WebKit::WebPage::initializeInjectedBundleLoaderClient): 342 (WebKit::WebPage::initializeInjectedBundlePolicyClient): 343 (WebKit::WebPage::initializeInjectedBundleResourceLoadClient): 344 (WebKit::WebPage::initializeInjectedBundleUIClient): 345 (WebKit::WebPage::initializeInjectedBundleFullScreenClient): 346 (WebKit::WebPage::initializeInjectedBundleDiagnosticLoggingClient): 347 * WebProcess/WebPage/WebPage.h: 348 1 349 2013-12-02 Enrica Casucci <enrica@apple.com> 2 350 -
trunk/Source/WebKit2/Shared/API/c/WKConnectionRef.cpp
r100336 r159988 39 39 void WKConnectionSetConnectionClient(WKConnectionRef connectionRef, const WKConnectionClient* wkClient) 40 40 { 41 toImpl(connectionRef)->initializeConnectionClient( wkClient);41 toImpl(connectionRef)->initializeConnectionClient(reinterpret_cast<const WKConnectionClientBase*>(wkClient)); 42 42 } 43 43 -
trunk/Source/WebKit2/Shared/WebConnection.cpp
r159163 r159988 42 42 } 43 43 44 void WebConnection::initializeConnectionClient(const WKConnectionClient * client)44 void WebConnection::initializeConnectionClient(const WKConnectionClientBase* client) 45 45 { 46 46 m_client.initialize(client); -
trunk/Source/WebKit2/Shared/WebConnection.h
r159197 r159988 39 39 virtual ~WebConnection(); 40 40 41 void initializeConnectionClient(const WKConnectionClient *);41 void initializeConnectionClient(const WKConnectionClientBase*); 42 42 void postMessage(const String&, API::Object*); 43 43 void didClose(); -
trunk/Source/WebKit2/Shared/WebConnectionClient.cpp
r159163 r159988 38 38 return; 39 39 40 m_client.didReceiveMessage(toAPI(connection), toAPI(messageName.impl()), toAPI(messageBody), m_client. clientInfo);40 m_client.didReceiveMessage(toAPI(connection), toAPI(messageName.impl()), toAPI(messageBody), m_client.base.clientInfo); 41 41 } 42 42 … … 46 46 return; 47 47 48 m_client.didClose(toAPI(connection), m_client. clientInfo);48 m_client.didClose(toAPI(connection), m_client.base.clientInfo); 49 49 } 50 50 -
trunk/Source/WebKit2/Shared/WebConnectionClient.h
r159163 r159988 31 31 #include <wtf/Forward.h> 32 32 33 template<> struct API::ClientTraits<WKConnectionClientBase> { 34 typedef std::tuple<WKConnectionClientV0> Versions; 35 }; 36 33 37 namespace API { 34 38 class Object; … … 39 43 class WebConnection; 40 44 41 class WebConnectionClient : public API Client<WKConnectionClient, WKConnectionClientCurrentVersion> {45 class WebConnectionClient : public API::Client<WKConnectionClientBase> { 42 46 public: 43 47 void didReceiveMessage(WebConnection*, const String&, API::Object*); -
trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp
r159333 r159988 83 83 void WKContextSetClient(WKContextRef contextRef, const WKContextClient* wkClient) 84 84 { 85 toImpl(contextRef)->initializeClient( wkClient);85 toImpl(contextRef)->initializeClient(reinterpret_cast<const WKContextClientBase*>(wkClient)); 86 86 } 87 87 88 88 void WKContextSetInjectedBundleClient(WKContextRef contextRef, const WKContextInjectedBundleClient* wkClient) 89 89 { 90 toImpl(contextRef)->initializeInjectedBundleClient( wkClient);90 toImpl(contextRef)->initializeInjectedBundleClient(reinterpret_cast<const WKContextInjectedBundleClientBase*>(wkClient)); 91 91 } 92 92 93 93 void WKContextSetHistoryClient(WKContextRef contextRef, const WKContextHistoryClient* wkClient) 94 94 { 95 toImpl(contextRef)->initializeHistoryClient( wkClient);95 toImpl(contextRef)->initializeHistoryClient(reinterpret_cast<const WKContextHistoryClientBase*>(wkClient)); 96 96 } 97 97 98 98 void WKContextSetDownloadClient(WKContextRef contextRef, const WKContextDownloadClient* wkClient) 99 99 { 100 toImpl(contextRef)->initializeDownloadClient( wkClient);100 toImpl(contextRef)->initializeDownloadClient(reinterpret_cast<const WKContextDownloadClientBase*>(wkClient)); 101 101 } 102 102 103 103 void WKContextSetConnectionClient(WKContextRef contextRef, const WKContextConnectionClient* wkClient) 104 104 { 105 toImpl(contextRef)->initializeConnectionClient( wkClient);105 toImpl(contextRef)->initializeConnectionClient(reinterpret_cast<const WKContextConnectionClientBase*>(wkClient)); 106 106 } 107 107 -
trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.cpp
r95901 r159988 39 39 void WKCookieManagerSetClient(WKCookieManagerRef cookieManagerRef, const WKCookieManagerClient* wkClient) 40 40 { 41 toImpl(cookieManagerRef)->initializeClient( wkClient);41 toImpl(cookieManagerRef)->initializeClient(reinterpret_cast<const WKCookieManagerClientBase*>(wkClient)); 42 42 } 43 43 -
trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.cpp
r159333 r159988 126 126 if (wkClient && wkClient->version) 127 127 return; 128 toImpl(databaseManagerRef)->initializeClient( wkClient);128 toImpl(databaseManagerRef)->initializeClient(reinterpret_cast<const WKDatabaseManagerClientBase*>(wkClient)); 129 129 #else 130 130 UNUSED_PARAM(databaseManagerRef); -
trunk/Source/WebKit2/UIProcess/API/C/WKGeolocationManager.cpp
r129536 r159988 39 39 void WKGeolocationManagerSetProvider(WKGeolocationManagerRef geolocationManagerRef, const WKGeolocationProvider* wkProvider) 40 40 { 41 toImpl(geolocationManagerRef)->initializeProvider( wkProvider);41 toImpl(geolocationManagerRef)->initializeProvider(reinterpret_cast<const WKGeolocationProviderBase*>(wkProvider)); 42 42 } 43 43 -
trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.cpp
r95901 r159988 39 39 void WKIconDatabaseSetIconDatabaseClient(WKIconDatabaseRef iconDatabaseRef, const WKIconDatabaseClient* wkClient) 40 40 { 41 toImpl(iconDatabaseRef)->initializeIconDatabaseClient( wkClient);41 toImpl(iconDatabaseRef)->initializeIconDatabaseClient(reinterpret_cast<const WKIconDatabaseClientBase*>(wkClient)); 42 42 } 43 43 -
trunk/Source/WebKit2/UIProcess/API/C/WKNotificationManager.cpp
r105364 r159988 39 39 void WKNotificationManagerSetProvider(WKNotificationManagerRef managerRef, const WKNotificationProvider* wkProvider) 40 40 { 41 toImpl(managerRef)->initializeProvider( wkProvider);41 toImpl(managerRef)->initializeProvider(reinterpret_cast<const WKNotificationProviderBase*>(wkProvider)); 42 42 } 43 43 -
trunk/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.cpp
r157595 r159988 64 64 void WKOriginDataManagerSetChangeClient(WKOriginDataManagerRef originDataManagerRef, const WKOriginDataManagerChangeClient *client) 65 65 { 66 toImpl(originDataManagerRef)->setChangeClient( client);66 toImpl(originDataManagerRef)->setChangeClient(reinterpret_cast<const WKOriginDataManagerChangeClientBase*>(client)); 67 67 } -
trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp
r159965 r159988 633 633 { 634 634 #if ENABLE(CONTEXT_MENUS) 635 toImpl(pageRef)->initializeContextMenuClient( wkClient);635 toImpl(pageRef)->initializeContextMenuClient(reinterpret_cast<const WKPageContextMenuClientBase*>(wkClient)); 636 636 #endif 637 637 } … … 639 639 void WKPageSetPageFindClient(WKPageRef pageRef, const WKPageFindClient* wkClient) 640 640 { 641 toImpl(pageRef)->initializeFindClient( wkClient);641 toImpl(pageRef)->initializeFindClient(reinterpret_cast<const WKPageFindClientBase*>(wkClient)); 642 642 } 643 643 644 644 void WKPageSetPageFindMatchesClient(WKPageRef pageRef, const WKPageFindMatchesClient* wkClient) 645 645 { 646 toImpl(pageRef)->initializeFindMatchesClient( wkClient);646 toImpl(pageRef)->initializeFindMatchesClient(reinterpret_cast<const WKPageFindMatchesClientBase*>(wkClient)); 647 647 } 648 648 649 649 void WKPageSetPageFormClient(WKPageRef pageRef, const WKPageFormClient* wkClient) 650 650 { 651 toImpl(pageRef)->initializeFormClient( wkClient);651 toImpl(pageRef)->initializeFormClient(reinterpret_cast<const WKPageFormClientBase*>(wkClient)); 652 652 } 653 653 … … 659 659 void WKPageSetPagePolicyClient(WKPageRef pageRef, const WKPagePolicyClient* wkClient) 660 660 { 661 toImpl(pageRef)->initializePolicyClient( wkClient);661 toImpl(pageRef)->initializePolicyClient(reinterpret_cast<const WKPagePolicyClientBase*>(wkClient)); 662 662 } 663 663 664 664 void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClient* wkClient) 665 665 { 666 toImpl(pageRef)->initializeUIClient( wkClient);666 toImpl(pageRef)->initializeUIClient(reinterpret_cast<const WKPageUIClientBase*>(wkClient)); 667 667 } 668 668 -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm
r159965 r159988 543 543 }; 544 544 545 page.initializePolicyClient( &policyClient);545 page.initializePolicyClient(reinterpret_cast<const WKPagePolicyClientBase*>(&policyClient)); 546 546 } 547 547 -
trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp
r159903 r159988 63 63 } 64 64 65 void WebNotificationManagerProxy::initializeProvider(const WKNotificationProvider *provider)65 void WebNotificationManagerProxy::initializeProvider(const WKNotificationProviderBase* provider) 66 66 { 67 67 m_provider.initialize(provider); -
trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h
r159234 r159988 54 54 static PassRefPtr<WebNotificationManagerProxy> create(WebContext*); 55 55 56 void initializeProvider(const WKNotificationProvider *);56 void initializeProvider(const WKNotificationProviderBase*); 57 57 void populateCopyOfNotificationPermissions(HashMap<String, bool>&); 58 58 -
trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.cpp
r159234 r159988 42 42 return; 43 43 44 m_client.show(toAPI(page), toAPI(notification), m_client. clientInfo);44 m_client.show(toAPI(page), toAPI(notification), m_client.base.clientInfo); 45 45 } 46 46 … … 50 50 return; 51 51 52 m_client.cancel(toAPI(notification), m_client. clientInfo);52 m_client.cancel(toAPI(notification), m_client.base.clientInfo); 53 53 } 54 54 … … 58 58 return; 59 59 60 m_client.didDestroyNotification(toAPI(notification), m_client. clientInfo);60 m_client.didDestroyNotification(toAPI(notification), m_client.base.clientInfo); 61 61 } 62 62 … … 72 72 arrayIDs.uncheckedAppend(WebUInt64::create(notificationID)); 73 73 74 m_client.clearNotifications(toAPI(API::Array::create(std::move(arrayIDs)).get()), m_client. clientInfo);74 m_client.clearNotifications(toAPI(API::Array::create(std::move(arrayIDs)).get()), m_client.base.clientInfo); 75 75 } 76 76 … … 80 80 return; 81 81 82 m_client.addNotificationManager(toAPI(manager), m_client. clientInfo);82 m_client.addNotificationManager(toAPI(manager), m_client.base.clientInfo); 83 83 } 84 84 … … 88 88 return; 89 89 90 m_client.removeNotificationManager(toAPI(manager), m_client. clientInfo);90 m_client.removeNotificationManager(toAPI(manager), m_client.base.clientInfo); 91 91 } 92 92 … … 96 96 return ImmutableDictionary::create(); 97 97 98 return adoptRef(toImpl(m_client.notificationPermissions(m_client. clientInfo)));98 return adoptRef(toImpl(m_client.notificationPermissions(m_client.base.clientInfo))); 99 99 } 100 100 -
trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.h
r106592 r159988 32 32 #include <wtf/Vector.h> 33 33 34 template<> struct API::ClientTraits<WKNotificationProviderBase> { 35 typedef std::tuple<WKNotificationProviderV0> Versions; 36 }; 37 34 38 namespace WebKit { 35 39 … … 40 44 class WebSecurityOrigin; 41 45 42 class WebNotificationProvider : public API Client<WKNotificationProvider, kWKNotificationProviderCurrentVersion> {46 class WebNotificationProvider : public API::Client<WKNotificationProviderBase> { 43 47 public: 44 48 void show(WebPageProxy*, WebNotification*); -
trunk/Source/WebKit2/UIProcess/WebContext.cpp
r159908 r159988 256 256 } 257 257 258 void WebContext::initializeClient(const WKContextClient * client)258 void WebContext::initializeClient(const WKContextClientBase* client) 259 259 { 260 260 m_client.initialize(client); 261 261 } 262 262 263 void WebContext::initializeInjectedBundleClient(const WKContextInjectedBundleClient * client)263 void WebContext::initializeInjectedBundleClient(const WKContextInjectedBundleClientBase* client) 264 264 { 265 265 m_injectedBundleClient.initialize(client); 266 266 } 267 267 268 void WebContext::initializeConnectionClient(const WKContextConnectionClient * client)268 void WebContext::initializeConnectionClient(const WKContextConnectionClientBase* client) 269 269 { 270 270 m_connectionClient.initialize(client); 271 271 } 272 272 273 void WebContext::initializeHistoryClient(const WKContextHistoryClient * client)273 void WebContext::initializeHistoryClient(const WKContextHistoryClientBase* client) 274 274 { 275 275 m_historyClient.initialize(client); … … 278 278 } 279 279 280 void WebContext::initializeDownloadClient(const WKContextDownloadClient * client)280 void WebContext::initializeDownloadClient(const WKContextDownloadClientBase* client) 281 281 { 282 282 m_downloadClient.initialize(client); -
trunk/Source/WebKit2/UIProcess/WebContext.h
r159903 r159988 127 127 bool dispatchSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&); 128 128 129 void initializeClient(const WKContextClient *);130 void initializeInjectedBundleClient(const WKContextInjectedBundleClient *);131 void initializeConnectionClient(const WKContextConnectionClient *);132 void initializeHistoryClient(const WKContextHistoryClient *);133 void initializeDownloadClient(const WKContextDownloadClient *);129 void initializeClient(const WKContextClientBase*); 130 void initializeInjectedBundleClient(const WKContextInjectedBundleClientBase*); 131 void initializeConnectionClient(const WKContextConnectionClientBase*); 132 void initializeHistoryClient(const WKContextHistoryClientBase*); 133 void initializeDownloadClient(const WKContextDownloadClientBase*); 134 134 135 135 void setProcessModel(ProcessModel); // Can only be called when there are no processes running. -
trunk/Source/WebKit2/UIProcess/WebContextClient.cpp
r159234 r159988 37 37 return; 38 38 39 m_client.plugInAutoStartOriginHashesChanged(toAPI(context), m_client. clientInfo);39 m_client.plugInAutoStartOriginHashesChanged(toAPI(context), m_client.base.clientInfo); 40 40 } 41 41 … … 45 45 return; 46 46 47 m_client.networkProcessDidCrash(toAPI(context), m_client. clientInfo);47 m_client.networkProcessDidCrash(toAPI(context), m_client.base.clientInfo); 48 48 } 49 49 … … 56 56 plugInInfo->ref(); 57 57 58 m_client.plugInInformationBecameAvailable(toAPI(context), toAPI(plugInInfo), m_client. clientInfo);58 m_client.plugInInformationBecameAvailable(toAPI(context), toAPI(plugInInfo), m_client.base.clientInfo); 59 59 } 60 60 -
trunk/Source/WebKit2/UIProcess/WebContextClient.h
r159234 r159988 30 30 #include "WKContext.h" 31 31 32 template<> struct API::ClientTraits<WKContextClientBase> { 33 typedef std::tuple<WKContextClientV0> Versions; 34 }; 35 32 36 namespace API { 33 37 class Array; … … 38 42 class WebContext; 39 43 40 class WebContextClient : public API Client<WKContextClient, kWKContextClientCurrentVersion> {44 class WebContextClient : public API::Client<WKContextClientBase> { 41 45 public: 42 46 void plugInAutoStartOriginHashesChanged(WebContext*); -
trunk/Source/WebKit2/UIProcess/WebContextConnectionClient.cpp
r100378 r159988 36 36 return; 37 37 38 m_client.didCreateConnection(toAPI(context), toAPI(connection), m_client. clientInfo);38 m_client.didCreateConnection(toAPI(context), toAPI(connection), m_client.base.clientInfo); 39 39 } 40 40 -
trunk/Source/WebKit2/UIProcess/WebContextConnectionClient.h
r100378 r159988 30 30 #include "WKContext.h" 31 31 32 template<> struct API::ClientTraits<WKContextConnectionClientBase> { 33 typedef std::tuple<WKContextConnectionClientV0> Versions; 34 }; 35 32 36 namespace WebKit { 33 37 … … 35 39 class WebContext; 36 40 37 class WebContextConnectionClient : public API Client<WKContextConnectionClient, kWKContextConnectionClientCurrentVersion> {41 class WebContextConnectionClient : public API::Client<WKContextConnectionClientBase> { 38 42 public: 39 43 void didCreateConnection(WebContext*, WebConnection*); -
trunk/Source/WebKit2/UIProcess/WebContextInjectedBundleClient.cpp
r159163 r159988 39 39 return; 40 40 41 m_client.didReceiveMessageFromInjectedBundle(toAPI(context), toAPI(messageName.impl()), toAPI(messageBody), m_client. clientInfo);41 m_client.didReceiveMessageFromInjectedBundle(toAPI(context), toAPI(messageName.impl()), toAPI(messageBody), m_client.base.clientInfo); 42 42 } 43 43 … … 48 48 49 49 WKTypeRef returnDataRef = 0; 50 m_client.didReceiveSynchronousMessageFromInjectedBundle(toAPI(context), toAPI(messageName.impl()), toAPI(messageBody), &returnDataRef, m_client. clientInfo);50 m_client.didReceiveSynchronousMessageFromInjectedBundle(toAPI(context), toAPI(messageName.impl()), toAPI(messageBody), &returnDataRef, m_client.base.clientInfo); 51 51 returnData = adoptRef(toImpl(returnDataRef)); 52 52 } … … 57 57 return 0; 58 58 59 return toImpl(m_client.getInjectedBundleInitializationUserData(toAPI(context), m_client. clientInfo));59 return toImpl(m_client.getInjectedBundleInitializationUserData(toAPI(context), m_client.base.clientInfo)); 60 60 } 61 61 -
trunk/Source/WebKit2/UIProcess/WebContextInjectedBundleClient.h
r159163 r159988 31 31 #include <wtf/Forward.h> 32 32 33 template<> struct API::ClientTraits<WKContextInjectedBundleClientBase> { 34 typedef std::tuple<WKContextInjectedBundleClientV0, WKContextInjectedBundleClientV1> Versions; 35 }; 36 33 37 namespace API { 34 38 class Object; … … 39 43 class WebContext; 40 44 41 class WebContextInjectedBundleClient : public API Client<WKContextInjectedBundleClient, kWKContextInjectedBundleClientCurrentVersion> {45 class WebContextInjectedBundleClient : public API::Client<WKContextInjectedBundleClientBase> { 42 46 public: 43 47 void didReceiveMessageFromInjectedBundle(WebContext*, const String&, API::Object*); -
trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp
r159234 r159988 59 59 } 60 60 61 void WebCookieManagerProxy::initializeClient(const WKCookieManagerClient * client)61 void WebCookieManagerProxy::initializeClient(const WKCookieManagerClientBase* client) 62 62 { 63 63 m_client.initialize(client); -
trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.h
r159234 r159988 59 59 virtual ~WebCookieManagerProxy(); 60 60 61 void initializeClient(const WKCookieManagerClient *);61 void initializeClient(const WKCookieManagerClientBase*); 62 62 63 63 void getHostnamesWithCookies(PassRefPtr<ArrayCallback>); -
trunk/Source/WebKit2/UIProcess/WebCookieManagerProxyClient.cpp
r95901 r159988 36 36 return; 37 37 38 m_client.cookiesDidChange(toAPI(cookieManager), m_client. clientInfo);38 m_client.cookiesDidChange(toAPI(cookieManager), m_client.base.clientInfo); 39 39 } 40 40 -
trunk/Source/WebKit2/UIProcess/WebCookieManagerProxyClient.h
r95901 r159988 31 31 #include <wtf/Forward.h> 32 32 33 template<> struct API::ClientTraits<WKCookieManagerClientBase> { 34 typedef std::tuple<WKCookieManagerClientV0> Versions; 35 }; 36 33 37 namespace WebKit { 34 38 35 39 class WebCookieManagerProxy; 36 40 37 class WebCookieManagerProxyClient : public API Client<WKCookieManagerClient, kWKCookieManagerClientCurrentVersion> {41 class WebCookieManagerProxyClient : public API::Client<WKCookieManagerClientBase> { 38 42 public: 39 43 void cookiesDidChange(WebCookieManagerProxy*); -
trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp
r159234 r159988 108 108 } 109 109 110 void WebDatabaseManagerProxy::initializeClient(const WKDatabaseManagerClient * client)110 void WebDatabaseManagerProxy::initializeClient(const WKDatabaseManagerClientBase* client) 111 111 { 112 112 m_client.initialize(client); -
trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h
r159197 r159988 54 54 virtual ~WebDatabaseManagerProxy(); 55 55 56 void initializeClient(const WKDatabaseManagerClient *);56 void initializeClient(const WKDatabaseManagerClientBase*); 57 57 58 58 void getDatabasesByOrigin(PassRefPtr<ArrayCallback>); -
trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxyClient.cpp
r95901 r159988 36 36 return; 37 37 38 m_client.didModifyOrigin(toAPI(databaseManager), toAPI(origin), m_client. clientInfo);38 m_client.didModifyOrigin(toAPI(databaseManager), toAPI(origin), m_client.base.clientInfo); 39 39 } 40 40 … … 44 44 return; 45 45 46 m_client.didModifyDatabase(toAPI(databaseManager), toAPI(origin), toAPI(databaseIdentifier.impl()), m_client. clientInfo);46 m_client.didModifyDatabase(toAPI(databaseManager), toAPI(origin), toAPI(databaseIdentifier.impl()), m_client.base.clientInfo); 47 47 } 48 48 -
trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxyClient.h
r95901 r159988 31 31 #include <wtf/Forward.h> 32 32 33 template<> struct API::ClientTraits<WKDatabaseManagerClientBase> { 34 typedef std::tuple<WKDatabaseManagerClientV0> Versions; 35 }; 36 33 37 namespace WebKit { 34 38 … … 36 40 class WebSecurityOrigin; 37 41 38 class WebDatabaseManagerProxyClient : public API Client<WKDatabaseManagerClient, kWKDatabaseManagerClientCurrentVersion> {42 class WebDatabaseManagerProxyClient : public API::Client<WKDatabaseManagerClientBase> { 39 43 public: 40 44 void didModifyOrigin(WebDatabaseManagerProxy*, WebSecurityOrigin*); -
trunk/Source/WebKit2/UIProcess/WebDownloadClient.cpp
r95901 r159988 40 40 return; 41 41 42 m_client.didStart(toAPI(webContext), toAPI(downloadProxy), m_client. clientInfo);42 m_client.didStart(toAPI(webContext), toAPI(downloadProxy), m_client.base.clientInfo); 43 43 } 44 44 … … 48 48 return; 49 49 50 m_client.didReceiveAuthenticationChallenge(toAPI(webContext), toAPI(downloadProxy), toAPI(authenticationChallengeProxy), m_client. clientInfo);50 m_client.didReceiveAuthenticationChallenge(toAPI(webContext), toAPI(downloadProxy), toAPI(authenticationChallengeProxy), m_client.base.clientInfo); 51 51 } 52 52 … … 56 56 return; 57 57 58 m_client.didReceiveResponse(toAPI(webContext), toAPI(downloadProxy), toAPI(WebURLResponse::create(response).get()), m_client. clientInfo);58 m_client.didReceiveResponse(toAPI(webContext), toAPI(downloadProxy), toAPI(WebURLResponse::create(response).get()), m_client.base.clientInfo); 59 59 } 60 60 … … 64 64 return; 65 65 66 m_client.didReceiveData(toAPI(webContext), toAPI(downloadProxy), length, m_client. clientInfo);66 m_client.didReceiveData(toAPI(webContext), toAPI(downloadProxy), length, m_client.base.clientInfo); 67 67 } 68 68 … … 72 72 return true; 73 73 74 return m_client.shouldDecodeSourceDataOfMIMEType(toAPI(webContext), toAPI(downloadProxy), toAPI(mimeType.impl()), m_client. clientInfo);74 return m_client.shouldDecodeSourceDataOfMIMEType(toAPI(webContext), toAPI(downloadProxy), toAPI(mimeType.impl()), m_client.base.clientInfo); 75 75 } 76 76 … … 80 80 return String(); 81 81 82 WKRetainPtr<WKStringRef> destination(AdoptWK, m_client.decideDestinationWithSuggestedFilename(toAPI(webContext), toAPI(downloadProxy), toAPI(filename.impl()), &allowOverwrite, m_client. clientInfo));82 WKRetainPtr<WKStringRef> destination(AdoptWK, m_client.decideDestinationWithSuggestedFilename(toAPI(webContext), toAPI(downloadProxy), toAPI(filename.impl()), &allowOverwrite, m_client.base.clientInfo)); 83 83 return toWTFString(destination.get()); 84 84 } … … 89 89 return; 90 90 91 m_client.didCreateDestination(toAPI(webContext), toAPI(downloadProxy), toAPI(path.impl()), m_client. clientInfo);91 m_client.didCreateDestination(toAPI(webContext), toAPI(downloadProxy), toAPI(path.impl()), m_client.base.clientInfo); 92 92 } 93 93 … … 97 97 return; 98 98 99 m_client.didFinish(toAPI(webContext), toAPI(downloadProxy), m_client. clientInfo);99 m_client.didFinish(toAPI(webContext), toAPI(downloadProxy), m_client.base.clientInfo); 100 100 } 101 101 … … 105 105 return; 106 106 107 m_client.didFail(toAPI(webContext), toAPI(downloadProxy), toAPI(error), m_client. clientInfo);107 m_client.didFail(toAPI(webContext), toAPI(downloadProxy), toAPI(error), m_client.base.clientInfo); 108 108 } 109 109 … … 113 113 return; 114 114 115 m_client.didCancel(toAPI(webContext), toAPI(downloadProxy), m_client. clientInfo);115 m_client.didCancel(toAPI(webContext), toAPI(downloadProxy), m_client.base.clientInfo); 116 116 } 117 117 … … 121 121 return; 122 122 123 m_client.processDidCrash(toAPI(webContext), toAPI(downloadProxy), m_client. clientInfo);123 m_client.processDidCrash(toAPI(webContext), toAPI(downloadProxy), m_client.base.clientInfo); 124 124 } 125 125 -
trunk/Source/WebKit2/UIProcess/WebDownloadClient.h
r95901 r159988 31 31 #include <wtf/Forward.h> 32 32 33 template<> struct API::ClientTraits<WKContextDownloadClientBase> { 34 typedef std::tuple<WKContextDownloadClientV0> Versions; 35 }; 36 33 37 namespace WebCore { 34 38 class ResourceError; … … 42 46 class WebContext; 43 47 44 class WebDownloadClient : public API Client<WKContextDownloadClient, kWKContextDownloadClientCurrentVersion> {48 class WebDownloadClient : public API::Client<WKContextDownloadClientBase> { 45 49 public: 46 50 void didStart(WebContext*, DownloadProxy*); -
trunk/Source/WebKit2/UIProcess/WebFindClient.cpp
r159234 r159988 36 36 return; 37 37 38 m_client.didFindString(toAPI(page), toAPI(string.impl()), matchCount, m_client. clientInfo);38 m_client.didFindString(toAPI(page), toAPI(string.impl()), matchCount, m_client.base.clientInfo); 39 39 40 40 } … … 45 45 return; 46 46 47 m_client.didFailToFindString(toAPI(page), toAPI(string.impl()), m_client. clientInfo);47 m_client.didFailToFindString(toAPI(page), toAPI(string.impl()), m_client.base.clientInfo); 48 48 } 49 49 … … 53 53 return; 54 54 55 m_client.didCountStringMatches(toAPI(page), toAPI(string.impl()), matchCount, m_client. clientInfo);55 m_client.didCountStringMatches(toAPI(page), toAPI(string.impl()), matchCount, m_client.base.clientInfo); 56 56 } 57 57 … … 61 61 return; 62 62 63 m_client.didFindStringMatches(toAPI(page), toAPI(string.impl()), toAPI(matches), firstIndex, m_client. clientInfo);63 m_client.didFindStringMatches(toAPI(page), toAPI(string.impl()), toAPI(matches), firstIndex, m_client.base.clientInfo); 64 64 } 65 65 … … 68 68 if (!m_client.didGetImageForMatchResult) 69 69 return; 70 m_client.didGetImageForMatchResult(toAPI(page), toAPI(image), index, m_client. clientInfo);70 m_client.didGetImageForMatchResult(toAPI(page), toAPI(image), index, m_client.base.clientInfo); 71 71 } 72 72 -
trunk/Source/WebKit2/UIProcess/WebFindClient.h
r159234 r159988 31 31 #include <wtf/Forward.h> 32 32 33 template<> struct API::ClientTraits<WKPageFindClientBase> { 34 typedef std::tuple<WKPageFindClientV0> Versions; 35 }; 36 37 template<> struct API::ClientTraits<WKPageFindMatchesClientBase> { 38 typedef std::tuple<WKPageFindMatchesClientV0> Versions; 39 }; 40 33 41 namespace API { 34 42 class Array; … … 40 48 class WebImage; 41 49 42 class WebFindClient : public API Client<WKPageFindClient, kWKPageFindClientCurrentVersion> {50 class WebFindClient : public API::Client<WKPageFindClientBase> { 43 51 public: 44 52 void didFindString(WebPageProxy*, const String&, uint32_t matchCount); … … 47 55 }; 48 56 49 class WebFindMatchesClient : public API Client<WKPageFindMatchesClient, kWKPageFindMatchesClientCurrentVersion> {57 class WebFindMatchesClient : public API::Client<WKPageFindMatchesClientBase> { 50 58 public: 51 59 void didFindStringMatches(WebPageProxy*, const String&, API::Array*, int); -
trunk/Source/WebKit2/UIProcess/WebFormClient.cpp
r159163 r159988 44 44 RefPtr<ImmutableDictionary> textFieldsMap = ImmutableDictionary::adopt(map); 45 45 46 m_client.willSubmitForm(toAPI(page), toAPI(frame), toAPI(sourceFrame), toAPI(textFieldsMap.get()), toAPI(userData), toAPI(listener), m_client. clientInfo);46 m_client.willSubmitForm(toAPI(page), toAPI(frame), toAPI(sourceFrame), toAPI(textFieldsMap.get()), toAPI(userData), toAPI(listener), m_client.base.clientInfo); 47 47 return true; 48 48 } -
trunk/Source/WebKit2/UIProcess/WebFormClient.h
r159163 r159988 33 33 #include <wtf/Vector.h> 34 34 35 template<> struct API::ClientTraits<WKPageFormClientBase> { 36 typedef std::tuple<WKPageFormClientV0> Versions; 37 }; 38 35 39 namespace API { 36 40 class Object; … … 43 47 class WebFormSubmissionListenerProxy; 44 48 45 class WebFormClient : public API Client<WKPageFormClient, kWKPageFormClientCurrentVersion> {49 class WebFormClient : public API::Client<WKPageFormClientBase> { 46 50 public: 47 51 bool willSubmitForm(WebPageProxy*, WebFrameProxy*, WebFrameProxy*, const Vector<std::pair<String, String>>& textFieldValues, API::Object* userData, WebFormSubmissionListenerProxy*); -
trunk/Source/WebKit2/UIProcess/WebGeolocationManagerProxy.cpp
r159724 r159988 49 49 } 50 50 51 void WebGeolocationManagerProxy::initializeProvider(const WKGeolocationProvider * provider)51 void WebGeolocationManagerProxy::initializeProvider(const WKGeolocationProviderBase* provider) 52 52 { 53 53 m_provider.initialize(provider); -
trunk/Source/WebKit2/UIProcess/WebGeolocationManagerProxy.h
r159724 r159988 46 46 static PassRefPtr<WebGeolocationManagerProxy> create(WebContext*); 47 47 48 void initializeProvider(const WKGeolocationProvider *);48 void initializeProvider(const WKGeolocationProviderBase*); 49 49 50 50 void providerDidChangePosition(WebGeolocationPosition*); -
trunk/Source/WebKit2/UIProcess/WebGeolocationProvider.cpp
r158689 r159988 37 37 return; 38 38 39 m_client.startUpdating(toAPI(geolocationManager), m_client. clientInfo);39 m_client.startUpdating(toAPI(geolocationManager), m_client.base.clientInfo); 40 40 } 41 41 … … 45 45 return; 46 46 47 m_client.stopUpdating(toAPI(geolocationManager), m_client. clientInfo);47 m_client.stopUpdating(toAPI(geolocationManager), m_client.base.clientInfo); 48 48 } 49 49 … … 53 53 return; 54 54 55 m_client.setEnableHighAccuracy(toAPI(geolocationManager), enabled, m_client. clientInfo);55 m_client.setEnableHighAccuracy(toAPI(geolocationManager), enabled, m_client.base.clientInfo); 56 56 } 57 57 -
trunk/Source/WebKit2/UIProcess/WebGeolocationProvider.h
r158689 r159988 31 31 #include <wtf/Forward.h> 32 32 33 template<> struct API::ClientTraits<WKGeolocationProviderBase> { 34 typedef std::tuple<WKGeolocationProviderV0, WKGeolocationProviderV1> Versions; 35 }; 36 33 37 namespace WebKit { 34 38 35 39 class WebGeolocationManagerProxy; 36 40 37 class WebGeolocationProvider : public API Client<WKGeolocationProvider, kWKGeolocationProviderCurrentVersion> {41 class WebGeolocationProvider : public API::Client<WKGeolocationProviderBase> { 38 42 public: 39 43 void startUpdating(WebGeolocationManagerProxy*); -
trunk/Source/WebKit2/UIProcess/WebHistoryClient.cpp
r159461 r159988 41 41 42 42 RefPtr<API::NavigationData> navigationData = API::NavigationData::create(navigationDataStore); 43 m_client.didNavigateWithNavigationData(toAPI(context), toAPI(page), toAPI(navigationData.get()), toAPI(frame), m_client. clientInfo);43 m_client.didNavigateWithNavigationData(toAPI(context), toAPI(page), toAPI(navigationData.get()), toAPI(frame), m_client.base.clientInfo); 44 44 } 45 45 … … 49 49 return; 50 50 51 m_client.didPerformClientRedirect(toAPI(context), toAPI(page), toURLRef(sourceURL.impl()), toURLRef(destinationURL.impl()), toAPI(frame), m_client. clientInfo);51 m_client.didPerformClientRedirect(toAPI(context), toAPI(page), toURLRef(sourceURL.impl()), toURLRef(destinationURL.impl()), toAPI(frame), m_client.base.clientInfo); 52 52 } 53 53 … … 57 57 return; 58 58 59 m_client.didPerformServerRedirect(toAPI(context), toAPI(page), toURLRef(sourceURL.impl()), toURLRef(destinationURL.impl()), toAPI(frame), m_client. clientInfo);59 m_client.didPerformServerRedirect(toAPI(context), toAPI(page), toURLRef(sourceURL.impl()), toURLRef(destinationURL.impl()), toAPI(frame), m_client.base.clientInfo); 60 60 } 61 61 … … 65 65 return; 66 66 67 m_client.didUpdateHistoryTitle(toAPI(context), toAPI(page), toAPI(title.impl()), toURLRef(url.impl()), toAPI(frame), m_client. clientInfo);67 m_client.didUpdateHistoryTitle(toAPI(context), toAPI(page), toAPI(title.impl()), toURLRef(url.impl()), toAPI(frame), m_client.base.clientInfo); 68 68 } 69 69 … … 73 73 return; 74 74 75 m_client.populateVisitedLinks(toAPI(context), m_client. clientInfo);75 m_client.populateVisitedLinks(toAPI(context), m_client.base.clientInfo); 76 76 } 77 77 -
trunk/Source/WebKit2/UIProcess/WebHistoryClient.h
r95901 r159988 31 31 #include <wtf/Forward.h> 32 32 33 template<> struct API::ClientTraits<WKContextHistoryClientBase> { 34 typedef std::tuple<WKContextHistoryClientV0> Versions; 35 }; 36 33 37 namespace WebKit { 34 38 … … 38 42 struct WebNavigationDataStore; 39 43 40 class WebHistoryClient : public API Client<WKContextHistoryClient, kWKContextHistoryClientCurrentVersion> {44 class WebHistoryClient : public API::Client<WKContextHistoryClientBase> { 41 45 public: 42 46 void didNavigateWithNavigationData(WebContext*, WebPageProxy*, const WebNavigationDataStore&, WebFrameProxy*); -
trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp
r158101 r159988 239 239 } 240 240 241 void WebIconDatabase::initializeIconDatabaseClient(const WKIconDatabaseClient * client)241 void WebIconDatabase::initializeIconDatabaseClient(const WKIconDatabaseClientBase* client) 242 242 { 243 243 m_iconDatabaseClient.initialize(client); -
trunk/Source/WebKit2/UIProcess/WebIconDatabase.h
r159197 r159988 86 86 void close(); 87 87 88 void initializeIconDatabaseClient(const WKIconDatabaseClient *);88 void initializeIconDatabaseClient(const WKIconDatabaseClientBase*); 89 89 90 90 void setPrivateBrowsingEnabled(bool); -
trunk/Source/WebKit2/UIProcess/WebIconDatabaseClient.cpp
r129742 r159988 37 37 return; 38 38 39 m_client.didChangeIconForPageURL(toAPI(iconDatabase), toAPI(url), m_client. clientInfo);39 m_client.didChangeIconForPageURL(toAPI(iconDatabase), toAPI(url), m_client.base.clientInfo); 40 40 } 41 41 … … 45 45 return; 46 46 47 m_client.didRemoveAllIcons(toAPI(iconDatabase), m_client. clientInfo);47 m_client.didRemoveAllIcons(toAPI(iconDatabase), m_client.base.clientInfo); 48 48 } 49 49 … … 53 53 return; 54 54 55 m_client.iconDataReadyForPageURL(toAPI(iconDatabase), toAPI(url), m_client. clientInfo);55 m_client.iconDataReadyForPageURL(toAPI(iconDatabase), toAPI(url), m_client.base.clientInfo); 56 56 } 57 57 -
trunk/Source/WebKit2/UIProcess/WebIconDatabaseClient.h
r159163 r159988 30 30 #include "WKIconDatabase.h" 31 31 32 template<> struct API::ClientTraits<WKIconDatabaseClientBase> { 33 typedef std::tuple<WKIconDatabaseClientV0, WKIconDatabaseClientV1> Versions; 34 }; 35 32 36 namespace WebKit { 33 37 … … 35 39 class WebURL; 36 40 37 class WebIconDatabaseClient : public API Client<WKIconDatabaseClient, kWKIconDatabaseClientCurrentVersion> {41 class WebIconDatabaseClient : public API::Client<WKIconDatabaseClientBase> { 38 42 public: 39 43 void didChangeIconForPageURL(WebIconDatabase*, WebURL*); -
trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp
r159903 r159988 450 450 }; 451 451 452 inspectorPage->initializePolicyClient( &policyClient);452 inspectorPage->initializePolicyClient(reinterpret_cast<const WKPagePolicyClientBase*>(&policyClient)); 453 453 454 454 String url = inspectorPageURL(); -
trunk/Source/WebKit2/UIProcess/WebLoaderClient.h
r159965 r159988 36 36 #include <wtf/Vector.h> 37 37 38 namespace API { 39 class Object; 40 41 template<> struct ClientTraits<WKPageLoaderClientBase> { 38 template<> struct API::ClientTraits<WKPageLoaderClientBase> { 42 39 typedef std::tuple<WKPageLoaderClientV0, WKPageLoaderClientV1, WKPageLoaderClientV2, WKPageLoaderClientV3> Versions; 43 40 }; 44 41 42 namespace API { 43 class Object; 45 44 } 46 45 -
trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.cpp
r159163 r159988 140 140 } 141 141 142 void WebOriginDataManagerProxy::setChangeClient(const WKOriginDataManagerChangeClient *client)142 void WebOriginDataManagerProxy::setChangeClient(const WKOriginDataManagerChangeClientBase *client) 143 143 { 144 144 m_client.initialize(client); -
trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.h
r159234 r159988 61 61 void startObservingChanges(WKOriginDataTypes); 62 62 void stopObservingChanges(WKOriginDataTypes); 63 void setChangeClient(const WKOriginDataManagerChangeClient *);63 void setChangeClient(const WKOriginDataManagerChangeClientBase*); 64 64 65 65 using API::Object::ref; -
trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxyChangeClient.cpp
r157595 r159988 36 36 return; 37 37 38 m_client.didChange(toAPI(originDataManager), m_client. clientInfo);38 m_client.didChange(toAPI(originDataManager), m_client.base.clientInfo); 39 39 } 40 40 -
trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxyChangeClient.h
r157595 r159988 31 31 #include <wtf/Forward.h> 32 32 33 template<> struct API::ClientTraits<WKOriginDataManagerChangeClientBase> { 34 typedef std::tuple<WKOriginDataManagerChangeClientV0> Versions; 35 }; 36 33 37 namespace WebKit { 34 38 35 39 class WebOriginDataManagerProxy; 36 40 37 class WebOriginDataManagerProxyChangeClient : public API Client<WKOriginDataManagerChangeClient, kWKOriginDataManagerChangeClientVersion> {41 class WebOriginDataManagerProxyChangeClient : public API::Client<WKOriginDataManagerChangeClientBase> { 38 42 public: 39 43 void didChange(WebOriginDataManagerProxy*); -
trunk/Source/WebKit2/UIProcess/WebPageContextMenuClient.cpp
r159234 r159988 43 43 return false; 44 44 45 if (m_client. version >= 2 && !m_client.getContextMenuFromProposedMenu)45 if (m_client.base.version >= 2 && !m_client.getContextMenuFromProposedMenu) 46 46 return false; 47 47 … … 53 53 54 54 WKArrayRef newMenu = nullptr; 55 if (m_client. version >= 2) {55 if (m_client.base.version >= 2) { 56 56 RefPtr<WebHitTestResult> webHitTestResult = WebHitTestResult::create(hitTestResultData); 57 m_client.getContextMenuFromProposedMenu(toAPI(page), toAPI(API::Array::create(std::move(proposedMenuItems)).get()), &newMenu, toAPI(webHitTestResult.get()), toAPI(userData), m_client. clientInfo);57 m_client.getContextMenuFromProposedMenu(toAPI(page), toAPI(API::Array::create(std::move(proposedMenuItems)).get()), &newMenu, toAPI(webHitTestResult.get()), toAPI(userData), m_client.base.clientInfo); 58 58 } else 59 m_client.getContextMenuFromProposedMenu_deprecatedForUseWithV0(toAPI(page), toAPI(API::Array::create(std::move(proposedMenuItems)).get()), &newMenu, toAPI(userData), m_client. clientInfo);59 m_client.getContextMenuFromProposedMenu_deprecatedForUseWithV0(toAPI(page), toAPI(API::Array::create(std::move(proposedMenuItems)).get()), &newMenu, toAPI(userData), m_client.base.clientInfo); 60 60 61 61 RefPtr<API::Array> array = adoptRef(toImpl(newMenu)); … … 83 83 84 84 RefPtr<WebContextMenuItem> item = WebContextMenuItem::create(itemData); 85 m_client.customContextMenuItemSelected(toAPI(page), toAPI(item.get()), m_client. clientInfo);85 m_client.customContextMenuItemSelected(toAPI(page), toAPI(item.get()), m_client.base.clientInfo); 86 86 } 87 87 … … 91 91 return; 92 92 93 m_client.contextMenuDismissed(toAPI(page), m_client. clientInfo);93 m_client.contextMenuDismissed(toAPI(page), m_client.base.clientInfo); 94 94 } 95 95 … … 105 105 menuItems.uncheckedAppend(WebContextMenuItem::create(menuItem)); 106 106 107 m_client.showContextMenu(toAPI(page), toAPI(menuLocation), toAPI(API::Array::create(std::move(menuItems)).get()), m_client. clientInfo);107 m_client.showContextMenu(toAPI(page), toAPI(menuLocation), toAPI(API::Array::create(std::move(menuItems)).get()), m_client.base.clientInfo); 108 108 109 109 return true; … … 115 115 return false; 116 116 117 m_client.hideContextMenu(toAPI(page), m_client. clientInfo);117 m_client.hideContextMenu(toAPI(page), m_client.base.clientInfo); 118 118 119 119 return true; -
trunk/Source/WebKit2/UIProcess/WebPageContextMenuClient.h
r159163 r159988 35 35 #include <wtf/Vector.h> 36 36 37 template<> struct API::ClientTraits<WKPageContextMenuClientBase> { 38 typedef std::tuple<WKPageContextMenuClientV0, WKPageContextMenuClientV1, WKPageContextMenuClientV2, WKPageContextMenuClientV3> Versions; 39 }; 40 37 41 namespace WebKit { 38 42 … … 40 44 class WebPageProxy; 41 45 42 class WebPageContextMenuClient : public API Client<WKPageContextMenuClient, kWKPageContextMenuClientCurrentVersion> {46 class WebPageContextMenuClient : public API::Client<WKPageContextMenuClientBase> { 43 47 public: 44 48 bool getContextMenuFromProposedMenu(WebPageProxy*, const Vector<WebContextMenuItemData>& proposedMenu, Vector<WebContextMenuItemData>& customMenu, const WebHitTestResult::Data&, API::Object* userData); -
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
r159982 r159988 421 421 } 422 422 423 void WebPageProxy::initializePolicyClient(const WKPagePolicyClient * policyClient)423 void WebPageProxy::initializePolicyClient(const WKPagePolicyClientBase* policyClient) 424 424 { 425 425 m_policyClient.initialize(policyClient); 426 426 } 427 427 428 void WebPageProxy::initializeFormClient(const WKPageFormClient * formClient)428 void WebPageProxy::initializeFormClient(const WKPageFormClientBase* formClient) 429 429 { 430 430 m_formClient.initialize(formClient); 431 431 } 432 432 433 void WebPageProxy::initializeUIClient(const WKPageUIClient * client)433 void WebPageProxy::initializeUIClient(const WKPageUIClientBase* client) 434 434 { 435 435 if (!isValid()) … … 442 442 } 443 443 444 void WebPageProxy::initializeFindClient(const WKPageFindClient * client)444 void WebPageProxy::initializeFindClient(const WKPageFindClientBase* client) 445 445 { 446 446 m_findClient.initialize(client); 447 447 } 448 448 449 void WebPageProxy::initializeFindMatchesClient(const WKPageFindMatchesClient * client)449 void WebPageProxy::initializeFindMatchesClient(const WKPageFindMatchesClientBase* client) 450 450 { 451 451 m_findMatchesClient.initialize(client); … … 453 453 454 454 #if ENABLE(CONTEXT_MENUS) 455 void WebPageProxy::initializeContextMenuClient(const WKPageContextMenuClient * client)455 void WebPageProxy::initializeContextMenuClient(const WKPageContextMenuClientBase* client) 456 456 { 457 457 m_contextMenuClient.initialize(client); -
trunk/Source/WebKit2/UIProcess/WebPageProxy.h
r159965 r159988 349 349 350 350 #if ENABLE(CONTEXT_MENUS) 351 void initializeContextMenuClient(const WKPageContextMenuClient *);352 #endif 353 void initializeFindClient(const WKPageFindClient *);354 void initializeFindMatchesClient(const WKPageFindMatchesClient *);355 void initializeFormClient(const WKPageFormClient *);351 void initializeContextMenuClient(const WKPageContextMenuClientBase*); 352 #endif 353 void initializeFindClient(const WKPageFindClientBase*); 354 void initializeFindMatchesClient(const WKPageFindMatchesClientBase*); 355 void initializeFormClient(const WKPageFormClientBase*); 356 356 void initializeLoaderClient(const WKPageLoaderClientBase*); 357 void initializePolicyClient(const WKPagePolicyClient *);358 void initializeUIClient(const WKPageUIClient *);357 void initializePolicyClient(const WKPagePolicyClientBase*); 358 void initializeUIClient(const WKPageUIClientBase*); 359 359 #if PLATFORM(EFL) 360 360 void initializeUIPopupMenuClient(const WKPageUIPopupMenuClient*); -
trunk/Source/WebKit2/UIProcess/WebPolicyClient.cpp
r159387 r159988 43 43 44 44 if (m_client.decidePolicyForNavigationAction_deprecatedForUseWithV0) 45 m_client.decidePolicyForNavigationAction_deprecatedForUseWithV0(toAPI(page), toAPI(frame), toAPI(type), toAPI(modifiers), toAPI(mouseButton), toAPI(request.get()), toAPI(listener), toAPI(userData), m_client. clientInfo);45 m_client.decidePolicyForNavigationAction_deprecatedForUseWithV0(toAPI(page), toAPI(frame), toAPI(type), toAPI(modifiers), toAPI(mouseButton), toAPI(request.get()), toAPI(listener), toAPI(userData), m_client.base.clientInfo); 46 46 else 47 m_client.decidePolicyForNavigationAction(toAPI(page), toAPI(frame), toAPI(type), toAPI(modifiers), toAPI(mouseButton), toAPI(originatingFrame), toAPI(request.get()), toAPI(listener), toAPI(userData), m_client. clientInfo);47 m_client.decidePolicyForNavigationAction(toAPI(page), toAPI(frame), toAPI(type), toAPI(modifiers), toAPI(mouseButton), toAPI(originatingFrame), toAPI(request.get()), toAPI(listener), toAPI(userData), m_client.base.clientInfo); 48 48 49 49 return true; … … 57 57 RefPtr<WebURLRequest> request = WebURLRequest::create(resourceRequest); 58 58 59 m_client.decidePolicyForNewWindowAction(toAPI(page), toAPI(frame), toAPI(type), toAPI(modifiers), toAPI(mouseButton), toAPI(request.get()), toAPI(frameName.impl()), toAPI(listener), toAPI(userData), m_client. clientInfo);59 m_client.decidePolicyForNewWindowAction(toAPI(page), toAPI(frame), toAPI(type), toAPI(modifiers), toAPI(mouseButton), toAPI(request.get()), toAPI(frameName.impl()), toAPI(listener), toAPI(userData), m_client.base.clientInfo); 60 60 return true; 61 61 } … … 70 70 71 71 if (m_client.decidePolicyForResponse_deprecatedForUseWithV0) 72 m_client.decidePolicyForResponse_deprecatedForUseWithV0(toAPI(page), toAPI(frame), toAPI(response.get()), toAPI(request.get()), toAPI(listener), toAPI(userData), m_client. clientInfo);72 m_client.decidePolicyForResponse_deprecatedForUseWithV0(toAPI(page), toAPI(frame), toAPI(response.get()), toAPI(request.get()), toAPI(listener), toAPI(userData), m_client.base.clientInfo); 73 73 else 74 m_client.decidePolicyForResponse(toAPI(page), toAPI(frame), toAPI(response.get()), toAPI(request.get()), canShowMIMEType, toAPI(listener), toAPI(userData), m_client. clientInfo);74 m_client.decidePolicyForResponse(toAPI(page), toAPI(frame), toAPI(response.get()), toAPI(request.get()), canShowMIMEType, toAPI(listener), toAPI(userData), m_client.base.clientInfo); 75 75 76 76 return true; … … 82 82 return; 83 83 84 m_client.unableToImplementPolicy(toAPI(page), toAPI(frame), toAPI(error), toAPI(userData), m_client. clientInfo);84 m_client.unableToImplementPolicy(toAPI(page), toAPI(frame), toAPI(error), toAPI(userData), m_client.base.clientInfo); 85 85 } 86 86 -
trunk/Source/WebKit2/UIProcess/WebPolicyClient.h
r159387 r159988 33 33 #include <wtf/Forward.h> 34 34 35 template<> struct API::ClientTraits<WKPagePolicyClientBase> { 36 typedef std::tuple<WKPagePolicyClientV0, WKPagePolicyClientV1> Versions; 37 }; 38 35 39 namespace API { 36 40 class Object; … … 38 42 39 43 namespace WebCore { 40 41 42 44 class ResourceError; 45 class ResourceRequest; 46 class ResourceResponse; 43 47 } 44 48 … … 49 53 class WebFramePolicyListenerProxy; 50 54 51 class WebPolicyClient : public API Client<WKPagePolicyClient, kWKPagePolicyClientCurrentVersion> {55 class WebPolicyClient : public API::Client<WKPagePolicyClientBase> { 52 56 public: 53 57 bool decidePolicyForNavigationAction(WebPageProxy*, WebFrameProxy*, WebCore::NavigationType, WebEvent::Modifiers, WebMouseEvent::Button, WebFrameProxy* originatingFrame, const WebCore::ResourceRequest&, WebFramePolicyListenerProxy*, API::Object* userData); -
trunk/Source/WebKit2/UIProcess/WebUIClient.cpp
r159724 r159988 49 49 PassRefPtr<WebPageProxy> WebUIClient::createNewPage(WebPageProxy* page, const ResourceRequest& resourceRequest, const WindowFeatures& windowFeatures, WebEvent::Modifiers modifiers, WebMouseEvent::Button button) 50 50 { 51 if (!m_client. version && !m_client.createNewPage_deprecatedForUseWithV0)51 if (!m_client.base.version && !m_client.createNewPage_deprecatedForUseWithV0) 52 52 return 0; 53 53 54 if (m_client. version == kWKPageUIClientCurrentVersion && !m_client.createNewPage)54 if (m_client.base.version == kWKPageUIClientCurrentVersion && !m_client.createNewPage) 55 55 return 0; 56 56 … … 74 74 RefPtr<ImmutableDictionary> featuresMap = ImmutableDictionary::adopt(map); 75 75 76 if (!m_client. version)77 return adoptRef(toImpl(m_client.createNewPage_deprecatedForUseWithV0(toAPI(page), toAPI(featuresMap.get()), toAPI(modifiers), toAPI(button), m_client. clientInfo)));76 if (!m_client.base.version) 77 return adoptRef(toImpl(m_client.createNewPage_deprecatedForUseWithV0(toAPI(page), toAPI(featuresMap.get()), toAPI(modifiers), toAPI(button), m_client.base.clientInfo))); 78 78 79 79 RefPtr<WebURLRequest> request = WebURLRequest::create(resourceRequest); 80 return adoptRef(toImpl(m_client.createNewPage(toAPI(page), toAPI(request.get()), toAPI(featuresMap.get()), toAPI(modifiers), toAPI(button), m_client. clientInfo)));80 return adoptRef(toImpl(m_client.createNewPage(toAPI(page), toAPI(request.get()), toAPI(featuresMap.get()), toAPI(modifiers), toAPI(button), m_client.base.clientInfo))); 81 81 } 82 82 … … 86 86 return; 87 87 88 m_client.showPage(toAPI(page), m_client. clientInfo);88 m_client.showPage(toAPI(page), m_client.base.clientInfo); 89 89 } 90 90 … … 94 94 return; 95 95 96 m_client.close(toAPI(page), m_client. clientInfo);96 m_client.close(toAPI(page), m_client.base.clientInfo); 97 97 } 98 98 … … 102 102 return; 103 103 104 m_client.takeFocus(toAPI(page), direction, m_client. clientInfo);104 m_client.takeFocus(toAPI(page), direction, m_client.base.clientInfo); 105 105 } 106 106 … … 110 110 return; 111 111 112 m_client.focus(toAPI(page), m_client. clientInfo);112 m_client.focus(toAPI(page), m_client.base.clientInfo); 113 113 } 114 114 … … 118 118 return; 119 119 120 m_client.unfocus(toAPI(page), m_client. clientInfo);120 m_client.unfocus(toAPI(page), m_client.base.clientInfo); 121 121 } 122 122 … … 126 126 return; 127 127 128 m_client.runJavaScriptAlert(toAPI(page), toAPI(message.impl()), toAPI(frame), m_client. clientInfo);128 m_client.runJavaScriptAlert(toAPI(page), toAPI(message.impl()), toAPI(frame), m_client.base.clientInfo); 129 129 } 130 130 … … 134 134 return false; 135 135 136 return m_client.runJavaScriptConfirm(toAPI(page), toAPI(message.impl()), toAPI(frame), m_client. clientInfo);136 return m_client.runJavaScriptConfirm(toAPI(page), toAPI(message.impl()), toAPI(frame), m_client.base.clientInfo); 137 137 } 138 138 … … 142 142 return String(); 143 143 144 WebString* string = toImpl(m_client.runJavaScriptPrompt(toAPI(page), toAPI(message.impl()), toAPI(defaultValue.impl()), toAPI(frame), m_client. clientInfo));144 WebString* string = toImpl(m_client.runJavaScriptPrompt(toAPI(page), toAPI(message.impl()), toAPI(defaultValue.impl()), toAPI(frame), m_client.base.clientInfo)); 145 145 if (!string) 146 146 return String(); … … 157 157 return; 158 158 159 m_client.setStatusText(toAPI(page), toAPI(text.impl()), m_client. clientInfo);159 m_client.setStatusText(toAPI(page), toAPI(text.impl()), m_client.base.clientInfo); 160 160 } 161 161 … … 165 165 return; 166 166 167 if (m_client. version == kWKPageUIClientCurrentVersion && !m_client.mouseDidMoveOverElement)168 return; 169 170 if (!m_client. version) {171 m_client.mouseDidMoveOverElement_deprecatedForUseWithV0(toAPI(page), toAPI(modifiers), toAPI(userData), m_client. clientInfo);167 if (m_client.base.version == kWKPageUIClientCurrentVersion && !m_client.mouseDidMoveOverElement) 168 return; 169 170 if (!m_client.base.version) { 171 m_client.mouseDidMoveOverElement_deprecatedForUseWithV0(toAPI(page), toAPI(modifiers), toAPI(userData), m_client.base.clientInfo); 172 172 return; 173 173 } 174 174 175 175 RefPtr<WebHitTestResult> webHitTestResult = WebHitTestResult::create(data); 176 m_client.mouseDidMoveOverElement(toAPI(page), toAPI(webHitTestResult.get()), toAPI(modifiers), toAPI(userData), m_client. clientInfo);176 m_client.mouseDidMoveOverElement(toAPI(page), toAPI(webHitTestResult.get()), toAPI(modifiers), toAPI(userData), m_client.base.clientInfo); 177 177 } 178 178 … … 187 187 toAPI(pluginInformation->get<WebString>(pluginInformationPluginURLKey())), 188 188 toAPI(pluginInformation->get<WebString>(pluginInformationPluginspageAttributeURLKey())), 189 m_client. clientInfo);189 m_client.base.clientInfo); 190 190 } 191 191 … … 197 197 toAPI(pluginInformation->get<WebString>(pluginInformationPluginURLKey())), 198 198 toAPI(pluginInformation->get<WebString>(pluginInformationPluginspageAttributeURLKey())), 199 m_client. clientInfo);199 m_client.base.clientInfo); 200 200 201 201 if (m_client.unavailablePluginButtonClicked) … … 204 204 pluginUnavailabilityReason, 205 205 toAPI(pluginInformation), 206 m_client. clientInfo);206 m_client.base.clientInfo); 207 207 } 208 208 #endif // ENABLE(NETSCAPE_PLUGIN_API) … … 217 217 if (!m_client.didNotHandleKeyEvent) 218 218 return; 219 m_client.didNotHandleKeyEvent(toAPI(page), event.nativeEvent(), m_client. clientInfo);219 m_client.didNotHandleKeyEvent(toAPI(page), event.nativeEvent(), m_client.base.clientInfo); 220 220 } 221 221 … … 229 229 if (!m_client.didNotHandleWheelEvent) 230 230 return; 231 m_client.didNotHandleWheelEvent(toAPI(page), event.nativeEvent(), m_client. clientInfo);231 m_client.didNotHandleWheelEvent(toAPI(page), event.nativeEvent(), m_client.base.clientInfo); 232 232 } 233 233 … … 236 236 if (!m_client.toolbarsAreVisible) 237 237 return true; 238 return m_client.toolbarsAreVisible(toAPI(page), m_client. clientInfo);238 return m_client.toolbarsAreVisible(toAPI(page), m_client.base.clientInfo); 239 239 240 240 } … … 243 243 if (!m_client.setToolbarsAreVisible) 244 244 return; 245 m_client.setToolbarsAreVisible(toAPI(page), visible, m_client. clientInfo);245 m_client.setToolbarsAreVisible(toAPI(page), visible, m_client.base.clientInfo); 246 246 } 247 247 … … 250 250 if (!m_client.menuBarIsVisible) 251 251 return true; 252 return m_client.menuBarIsVisible(toAPI(page), m_client. clientInfo);252 return m_client.menuBarIsVisible(toAPI(page), m_client.base.clientInfo); 253 253 } 254 254 … … 257 257 if (!m_client.setMenuBarIsVisible) 258 258 return; 259 m_client.setMenuBarIsVisible(toAPI(page), visible, m_client. clientInfo);259 m_client.setMenuBarIsVisible(toAPI(page), visible, m_client.base.clientInfo); 260 260 } 261 261 … … 264 264 if (!m_client.statusBarIsVisible) 265 265 return true; 266 return m_client.statusBarIsVisible(toAPI(page), m_client. clientInfo);266 return m_client.statusBarIsVisible(toAPI(page), m_client.base.clientInfo); 267 267 } 268 268 … … 271 271 if (!m_client.setStatusBarIsVisible) 272 272 return; 273 m_client.setStatusBarIsVisible(toAPI(page), visible, m_client. clientInfo);273 m_client.setStatusBarIsVisible(toAPI(page), visible, m_client.base.clientInfo); 274 274 } 275 275 … … 278 278 if (!m_client.isResizable) 279 279 return true; 280 return m_client.isResizable(toAPI(page), m_client. clientInfo);280 return m_client.isResizable(toAPI(page), m_client.base.clientInfo); 281 281 } 282 282 … … 285 285 if (!m_client.setIsResizable) 286 286 return; 287 m_client.setIsResizable(toAPI(page), resizable, m_client. clientInfo);287 m_client.setIsResizable(toAPI(page), resizable, m_client.base.clientInfo); 288 288 } 289 289 … … 293 293 return; 294 294 295 m_client.setWindowFrame(toAPI(page), toAPI(frame), m_client. clientInfo);295 m_client.setWindowFrame(toAPI(page), toAPI(frame), m_client.base.clientInfo); 296 296 } 297 297 … … 301 301 return FloatRect(); 302 302 303 return toFloatRect(m_client.getWindowFrame(toAPI(page), m_client. clientInfo));303 return toFloatRect(m_client.getWindowFrame(toAPI(page), m_client.base.clientInfo)); 304 304 } 305 305 … … 314 314 return true; 315 315 316 return m_client.runBeforeUnloadConfirmPanel(toAPI(page), toAPI(message.impl()), toAPI(frame), m_client. clientInfo);316 return m_client.runBeforeUnloadConfirmPanel(toAPI(page), toAPI(message.impl()), toAPI(frame), m_client.base.clientInfo); 317 317 } 318 318 … … 322 322 return; 323 323 324 m_client.didDraw(toAPI(page), m_client. clientInfo);324 m_client.didDraw(toAPI(page), m_client.base.clientInfo); 325 325 } 326 326 … … 330 330 return; 331 331 332 m_client.pageDidScroll(toAPI(page), m_client. clientInfo);332 m_client.pageDidScroll(toAPI(page), m_client.base.clientInfo); 333 333 } 334 334 … … 338 338 return currentQuota; 339 339 340 return m_client.exceededDatabaseQuota(toAPI(page), toAPI(frame), toAPI(origin), toAPI(databaseName.impl()), toAPI(databaseDisplayName.impl()), currentQuota, currentOriginUsage, currentDatabaseUsage, expectedUsage, m_client. clientInfo);340 return m_client.exceededDatabaseQuota(toAPI(page), toAPI(frame), toAPI(origin), toAPI(databaseName.impl()), toAPI(databaseDisplayName.impl()), currentQuota, currentOriginUsage, currentDatabaseUsage, expectedUsage, m_client.base.clientInfo); 341 341 } 342 342 … … 346 346 return false; 347 347 348 m_client.runOpenPanel(toAPI(page), toAPI(frame), toAPI(parameters), toAPI(listener), m_client. clientInfo);348 m_client.runOpenPanel(toAPI(page), toAPI(frame), toAPI(parameters), toAPI(listener), m_client.base.clientInfo); 349 349 return true; 350 350 } … … 355 355 return false; 356 356 357 m_client.decidePolicyForGeolocationPermissionRequest(toAPI(page), toAPI(frame), toAPI(origin), toAPI(permissionRequest), m_client. clientInfo);357 m_client.decidePolicyForGeolocationPermissionRequest(toAPI(page), toAPI(frame), toAPI(origin), toAPI(permissionRequest), m_client.base.clientInfo); 358 358 return true; 359 359 } … … 364 364 return false; 365 365 366 m_client.decidePolicyForNotificationPermissionRequest(toAPI(page), toAPI(origin), toAPI(permissionRequest), m_client. clientInfo);366 m_client.decidePolicyForNotificationPermissionRequest(toAPI(page), toAPI(origin), toAPI(permissionRequest), m_client.base.clientInfo); 367 367 return true; 368 368 } … … 373 373 return 0; 374 374 375 return m_client.headerHeight(toAPI(page), toAPI(frame), m_client. clientInfo);375 return m_client.headerHeight(toAPI(page), toAPI(frame), m_client.base.clientInfo); 376 376 } 377 377 … … 381 381 return 0; 382 382 383 return m_client.footerHeight(toAPI(page), toAPI(frame), m_client. clientInfo);383 return m_client.footerHeight(toAPI(page), toAPI(frame), m_client.base.clientInfo); 384 384 } 385 385 … … 389 389 return; 390 390 391 m_client.drawHeader(toAPI(page), toAPI(frame), toAPI(rect), m_client. clientInfo);391 m_client.drawHeader(toAPI(page), toAPI(frame), toAPI(rect), m_client.base.clientInfo); 392 392 } 393 393 … … 397 397 return; 398 398 399 m_client.drawFooter(toAPI(page), toAPI(frame), toAPI(rect), m_client. clientInfo);399 m_client.drawFooter(toAPI(page), toAPI(frame), toAPI(rect), m_client.base.clientInfo); 400 400 } 401 401 … … 405 405 return; 406 406 407 m_client.printFrame(toAPI(page), toAPI(frame), m_client. clientInfo);407 m_client.printFrame(toAPI(page), toAPI(frame), m_client.base.clientInfo); 408 408 } 409 409 … … 418 418 return; 419 419 420 m_client.runModal(toAPI(page), m_client. clientInfo);420 m_client.runModal(toAPI(page), m_client.base.clientInfo); 421 421 } 422 422 … … 426 426 return; 427 427 428 m_client.saveDataToFileInDownloadsFolder(toAPI(page), toAPI(suggestedFilename.impl()), toAPI(mimeType.impl()), toURLRef(originatingURLString.impl()), toAPI(data), m_client. clientInfo);428 m_client.saveDataToFileInDownloadsFolder(toAPI(page), toAPI(suggestedFilename.impl()), toAPI(mimeType.impl()), toURLRef(originatingURLString.impl()), toAPI(data), m_client.base.clientInfo); 429 429 } 430 430 … … 434 434 return false; 435 435 436 return m_client.shouldInterruptJavaScript(toAPI(page), m_client. clientInfo);436 return m_client.shouldInterruptJavaScript(toAPI(page), m_client.base.clientInfo); 437 437 } 438 438 … … 443 443 return false; 444 444 445 m_client.showColorPicker(toAPI(page), toAPI(initialColor.impl()), toAPI(listener), m_client. clientInfo);445 m_client.showColorPicker(toAPI(page), toAPI(initialColor.impl()), toAPI(listener), m_client.base.clientInfo); 446 446 return true; 447 447 } … … 452 452 return false; 453 453 454 m_client.hideColorPicker(toAPI(page), m_client. clientInfo);454 m_client.hideColorPicker(toAPI(page), m_client.base.clientInfo); 455 455 return true; 456 456 } -
trunk/Source/WebKit2/UIProcess/WebUIClient.h
r159724 r159988 35 35 #include <wtf/PassRefPtr.h> 36 36 37 template<> struct API::ClientTraits<WKPageUIClientBase> { 38 typedef std::tuple<WKPageUIClientV0, WKPageUIClientV1, WKPageUIClientV2> Versions; 39 }; 40 37 41 namespace WebCore { 38 42 class FloatRect; … … 56 60 class WebOpenPanelResultListenerProxy; 57 61 58 class WebUIClient : public API Client<WKPageUIClient, kWKPageUIClientCurrentVersion> {62 class WebUIClient : public API::Client<WKPageUIClientBase> { 59 63 public: 60 64 PassRefPtr<WebPageProxy> createNewPage(WebPageProxy*, const WebCore::ResourceRequest&, const WebCore::WindowFeatures&, WebEvent::Modifiers, WebMouseEvent::Button); -
trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm
r159903 r159988 451 451 }; 452 452 453 inspectorPage->initializeUIClient( &uiClient);453 inspectorPage->initializeUIClient(reinterpret_cast<const WKPageUIClientBase*>(&uiClient)); 454 454 455 455 return inspectorPage; -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp
r159234 r159988 41 41 } 42 42 43 void WKBundleSetClient(WKBundleRef bundleRef, WKBundleClient * 44 { 45 toImpl(bundleRef)->initializeClient( wkClient);43 void WKBundleSetClient(WKBundleRef bundleRef, WKBundleClient *wkClient) 44 { 45 toImpl(bundleRef)->initializeClient(reinterpret_cast<WKBundleClientBase*>(wkClient)); 46 46 } 47 47 -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
r159985 r159988 65 65 { 66 66 #if ENABLE(CONTEXT_MENUS) 67 toImpl(pageRef)->initializeInjectedBundleContextMenuClient( wkClient);67 toImpl(pageRef)->initializeInjectedBundleContextMenuClient(reinterpret_cast<WKBundlePageContextMenuClientBase*>(wkClient)); 68 68 #endif 69 69 } … … 71 71 void WKBundlePageSetEditorClient(WKBundlePageRef pageRef, WKBundlePageEditorClient* wkClient) 72 72 { 73 toImpl(pageRef)->initializeInjectedBundleEditorClient( wkClient);73 toImpl(pageRef)->initializeInjectedBundleEditorClient(reinterpret_cast<WKBundlePageEditorClientBase*>(wkClient)); 74 74 } 75 75 76 76 void WKBundlePageSetFormClient(WKBundlePageRef pageRef, WKBundlePageFormClient* wkClient) 77 77 { 78 toImpl(pageRef)->initializeInjectedBundleFormClient( wkClient);78 toImpl(pageRef)->initializeInjectedBundleFormClient(reinterpret_cast<WKBundlePageFormClientBase*>(wkClient)); 79 79 } 80 80 81 81 void WKBundlePageSetPageLoaderClient(WKBundlePageRef pageRef, WKBundlePageLoaderClient* wkClient) 82 82 { 83 toImpl(pageRef)->initializeInjectedBundleLoaderClient( wkClient);83 toImpl(pageRef)->initializeInjectedBundleLoaderClient(reinterpret_cast<WKBundlePageLoaderClientBase*>(wkClient)); 84 84 } 85 85 86 86 void WKBundlePageSetResourceLoadClient(WKBundlePageRef pageRef, WKBundlePageResourceLoadClient* wkClient) 87 87 { 88 toImpl(pageRef)->initializeInjectedBundleResourceLoadClient( wkClient);88 toImpl(pageRef)->initializeInjectedBundleResourceLoadClient(reinterpret_cast<WKBundlePageResourceLoadClientBase*>(wkClient)); 89 89 } 90 90 91 91 void WKBundlePageSetPolicyClient(WKBundlePageRef pageRef, WKBundlePagePolicyClient* wkClient) 92 92 { 93 toImpl(pageRef)->initializeInjectedBundlePolicyClient( wkClient);93 toImpl(pageRef)->initializeInjectedBundlePolicyClient(reinterpret_cast<WKBundlePagePolicyClientBase*>(wkClient)); 94 94 } 95 95 96 96 void WKBundlePageSetUIClient(WKBundlePageRef pageRef, WKBundlePageUIClient* wkClient) 97 97 { 98 toImpl(pageRef)->initializeInjectedBundleUIClient( wkClient);98 toImpl(pageRef)->initializeInjectedBundleUIClient(reinterpret_cast<WKBundlePageUIClientBase*>(wkClient)); 99 99 } 100 100 … … 102 102 { 103 103 #if defined(ENABLE_FULLSCREEN_API) && ENABLE_FULLSCREEN_API 104 toImpl(pageRef)->initializeInjectedBundleFullScreenClient( wkClient);104 toImpl(pageRef)->initializeInjectedBundleFullScreenClient(reinterpret_cast<WKBundlePageFullScreenClientBase*>(wkClient)); 105 105 #else 106 106 UNUSED_PARAM(pageRef); … … 147 147 void WKBundlePageSetDiagnosticLoggingClient(WKBundlePageRef pageRef, WKBundlePageDiagnosticLoggingClient* client) 148 148 { 149 toImpl(pageRef)->initializeInjectedBundleDiagnosticLoggingClient( client);149 toImpl(pageRef)->initializeInjectedBundleDiagnosticLoggingClient(reinterpret_cast<WKBundlePageDiagnosticLoggingClientBase*>(client)); 150 150 } 151 151 -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
r159333 r159988 95 95 } 96 96 97 void InjectedBundle::initializeClient( WKBundleClient* client)97 void InjectedBundle::initializeClient(const WKBundleClientBase* client) 98 98 { 99 99 m_client.initialize(client); -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h
r159234 r159988 87 87 88 88 // API 89 void initializeClient( WKBundleClient*);89 void initializeClient(const WKBundleClientBase*); 90 90 void postMessage(const String&, API::Object*); 91 91 void postSynchronousMessage(const String&, API::Object*, RefPtr<API::Object>& returnData); -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleClient.cpp
r159163 r159988 36 36 return; 37 37 38 m_client.didCreatePage(toAPI(bundle), toAPI(page), m_client. clientInfo);38 m_client.didCreatePage(toAPI(bundle), toAPI(page), m_client.base.clientInfo); 39 39 } 40 40 … … 44 44 return; 45 45 46 m_client.willDestroyPage(toAPI(bundle), toAPI(page), m_client. clientInfo);46 m_client.willDestroyPage(toAPI(bundle), toAPI(page), m_client.base.clientInfo); 47 47 } 48 48 … … 52 52 return; 53 53 54 m_client.didInitializePageGroup(toAPI(bundle), toAPI(pageGroup), m_client. clientInfo);54 m_client.didInitializePageGroup(toAPI(bundle), toAPI(pageGroup), m_client.base.clientInfo); 55 55 } 56 56 … … 60 60 return; 61 61 62 m_client.didReceiveMessage(toAPI(bundle), toAPI(messageName.impl()), toAPI(messageBody), m_client. clientInfo);62 m_client.didReceiveMessage(toAPI(bundle), toAPI(messageName.impl()), toAPI(messageBody), m_client.base.clientInfo); 63 63 } 64 64 … … 68 68 return; 69 69 70 m_client.didReceiveMessageToPage(toAPI(bundle), toAPI(page), toAPI(messageName.impl()), toAPI(messageBody), m_client. clientInfo);70 m_client.didReceiveMessageToPage(toAPI(bundle), toAPI(page), toAPI(messageName.impl()), toAPI(messageBody), m_client.base.clientInfo); 71 71 } 72 72 -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleClient.h
r159163 r159988 31 31 #include <wtf/Forward.h> 32 32 33 template<> struct API::ClientTraits<WKBundleClientBase> { 34 typedef std::tuple<WKBundleClientV0, WKBundleClientV1> Versions; 35 }; 36 33 37 namespace API { 34 38 class Object; … … 41 45 class WebPageGroupProxy; 42 46 43 class InjectedBundleClient : public API Client<WKBundleClient, kWKBundleClientCurrentVersion> {47 class InjectedBundleClient : public API::Client<WKBundleClientBase> { 44 48 public: 45 49 void didCreatePage(InjectedBundle*, WebPage*); -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp
r159234 r159988 54 54 WKArrayRef newMenuWK = 0; 55 55 WKTypeRef userDataToPass = 0; 56 m_client.getContextMenuFromDefaultMenu(toAPI(page), toAPI(hitTestResult), toAPI(API::Array::create(std::move(defaultMenuItems)).get()), &newMenuWK, &userDataToPass, m_client. clientInfo);56 m_client.getContextMenuFromDefaultMenu(toAPI(page), toAPI(hitTestResult), toAPI(API::Array::create(std::move(defaultMenuItems)).get()), &newMenuWK, &userDataToPass, m_client.base.clientInfo); 57 57 RefPtr<API::Array> array = adoptRef(toImpl(newMenuWK)); 58 58 userData = adoptRef(toImpl(userDataToPass)); -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.h
r159163 r159988 33 33 #include <wtf/Vector.h> 34 34 35 template<> struct API::ClientTraits<WKBundlePageContextMenuClientBase> { 36 typedef std::tuple<WKBundlePageContextMenuClientV0> Versions; 37 }; 38 35 39 namespace API { 36 40 class Object; … … 47 51 class WebPage; 48 52 49 class InjectedBundlePageContextMenuClient : public API Client<WKBundlePageContextMenuClient, kWKBundlePageContextMenuClientCurrentVersion> {53 class InjectedBundlePageContextMenuClient : public API::Client<WKBundlePageContextMenuClientBase> { 50 54 public: 51 55 bool getCustomMenuFromDefaultItems(WebPage*, InjectedBundleHitTestResult*, const Vector<WebContextMenuItemData>& defaultMenu, Vector<WebContextMenuItemData>& newMenu, RefPtr<API::Object>& userData); -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp
r123778 r159988 36 36 if (!m_client.logDiagnosticMessage) 37 37 return; 38 m_client.logDiagnosticMessage(toAPI(page), toCopiedAPI(message), toCopiedAPI(description), toCopiedAPI(success), m_client. clientInfo);38 m_client.logDiagnosticMessage(toAPI(page), toCopiedAPI(message), toCopiedAPI(description), toCopiedAPI(success), m_client.base.clientInfo); 39 39 } 40 40 -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.h
r159163 r159988 32 32 #include <wtf/Forward.h> 33 33 34 template<> struct API::ClientTraits<WKBundlePageDiagnosticLoggingClientBase> { 35 typedef std::tuple<WKBundlePageDiagnosticLoggingClientV0> Versions; 36 }; 37 34 38 namespace WebKit { 35 39 … … 38 42 class WebPage; 39 43 40 class InjectedBundlePageDiagnosticLoggingClient : public API Client<WKBundlePageDiagnosticLoggingClient, kWKBundlePageDiagnosticLoggingClientCurrentVersion> {44 class InjectedBundlePageDiagnosticLoggingClient : public API::Client<WKBundlePageDiagnosticLoggingClientBase> { 41 45 public: 42 46 void logDiagnosticMessage(WebPage*, const String& message, const String& description, const String& success); -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp
r159234 r159988 44 44 if (m_client.shouldBeginEditing) { 45 45 RefPtr<InjectedBundleRangeHandle> rangeHandle = InjectedBundleRangeHandle::getOrCreate(range); 46 return m_client.shouldBeginEditing(toAPI(page), toAPI(rangeHandle.get()), m_client. clientInfo);46 return m_client.shouldBeginEditing(toAPI(page), toAPI(rangeHandle.get()), m_client.base.clientInfo); 47 47 } 48 48 return true; … … 53 53 if (m_client.shouldEndEditing) { 54 54 RefPtr<InjectedBundleRangeHandle> rangeHandle = InjectedBundleRangeHandle::getOrCreate(range); 55 return m_client.shouldEndEditing(toAPI(page), toAPI(rangeHandle.get()), m_client. clientInfo);55 return m_client.shouldEndEditing(toAPI(page), toAPI(rangeHandle.get()), m_client.base.clientInfo); 56 56 } 57 57 return true; … … 63 63 RefPtr<InjectedBundleNodeHandle> nodeHandle = InjectedBundleNodeHandle::getOrCreate(node); 64 64 RefPtr<InjectedBundleRangeHandle> rangeToReplaceHandle = InjectedBundleRangeHandle::getOrCreate(rangeToReplace); 65 return m_client.shouldInsertNode(toAPI(page), toAPI(nodeHandle.get()), toAPI(rangeToReplaceHandle.get()), toAPI(action), m_client. clientInfo);65 return m_client.shouldInsertNode(toAPI(page), toAPI(nodeHandle.get()), toAPI(rangeToReplaceHandle.get()), toAPI(action), m_client.base.clientInfo); 66 66 } 67 67 return true; … … 72 72 if (m_client.shouldInsertText) { 73 73 RefPtr<InjectedBundleRangeHandle> rangeToReplaceHandle = InjectedBundleRangeHandle::getOrCreate(rangeToReplace); 74 return m_client.shouldInsertText(toAPI(page), toAPI(text), toAPI(rangeToReplaceHandle.get()), toAPI(action), m_client. clientInfo);74 return m_client.shouldInsertText(toAPI(page), toAPI(text), toAPI(rangeToReplaceHandle.get()), toAPI(action), m_client.base.clientInfo); 75 75 } 76 76 return true; … … 81 81 if (m_client.shouldDeleteRange) { 82 82 RefPtr<InjectedBundleRangeHandle> rangeHandle = InjectedBundleRangeHandle::getOrCreate(range); 83 return m_client.shouldDeleteRange(toAPI(page), toAPI(rangeHandle.get()), m_client. clientInfo);83 return m_client.shouldDeleteRange(toAPI(page), toAPI(rangeHandle.get()), m_client.base.clientInfo); 84 84 } 85 85 return true; … … 91 91 RefPtr<InjectedBundleRangeHandle> fromRangeHandle = InjectedBundleRangeHandle::getOrCreate(fromRange); 92 92 RefPtr<InjectedBundleRangeHandle> toRangeHandle = InjectedBundleRangeHandle::getOrCreate(toRange); 93 return m_client.shouldChangeSelectedRange(toAPI(page), toAPI(fromRangeHandle.get()), toAPI(toRangeHandle.get()), toAPI(affinity), stillSelecting, m_client. clientInfo);93 return m_client.shouldChangeSelectedRange(toAPI(page), toAPI(fromRangeHandle.get()), toAPI(toRangeHandle.get()), toAPI(affinity), stillSelecting, m_client.base.clientInfo); 94 94 } 95 95 return true; … … 100 100 if (m_client.shouldApplyStyle) { 101 101 RefPtr<InjectedBundleRangeHandle> rangeHandle = InjectedBundleRangeHandle::getOrCreate(range); 102 return m_client.shouldApplyStyle(toAPI(page), toAPI(style), toAPI(rangeHandle.get()), m_client. clientInfo);102 return m_client.shouldApplyStyle(toAPI(page), toAPI(style), toAPI(rangeHandle.get()), m_client.base.clientInfo); 103 103 } 104 104 return true; … … 108 108 { 109 109 if (m_client.didBeginEditing) 110 m_client.didBeginEditing(toAPI(page), toAPI(notificationName), m_client. clientInfo);110 m_client.didBeginEditing(toAPI(page), toAPI(notificationName), m_client.base.clientInfo); 111 111 } 112 112 … … 114 114 { 115 115 if (m_client.didEndEditing) 116 m_client.didEndEditing(toAPI(page), toAPI(notificationName), m_client. clientInfo);116 m_client.didEndEditing(toAPI(page), toAPI(notificationName), m_client.base.clientInfo); 117 117 } 118 118 … … 120 120 { 121 121 if (m_client.didChange) 122 m_client.didChange(toAPI(page), toAPI(notificationName), m_client. clientInfo);122 m_client.didChange(toAPI(page), toAPI(notificationName), m_client.base.clientInfo); 123 123 } 124 124 … … 126 126 { 127 127 if (m_client.didChangeSelection) 128 m_client.didChangeSelection(toAPI(page), toAPI(notificationName), m_client. clientInfo);128 m_client.didChangeSelection(toAPI(page), toAPI(notificationName), m_client.base.clientInfo); 129 129 } 130 130 … … 133 133 if (m_client.willWriteToPasteboard) { 134 134 RefPtr<InjectedBundleRangeHandle> rangeHandle = InjectedBundleRangeHandle::getOrCreate(range); 135 m_client.willWriteToPasteboard(toAPI(page), toAPI(rangeHandle.get()), m_client. clientInfo);135 m_client.willWriteToPasteboard(toAPI(page), toAPI(rangeHandle.get()), m_client.base.clientInfo); 136 136 } 137 137 } … … 143 143 WKArrayRef types = 0; 144 144 WKArrayRef data = 0; 145 m_client.getPasteboardDataForRange(toAPI(page), toAPI(rangeHandle.get()), &types, &data, m_client. clientInfo);145 m_client.getPasteboardDataForRange(toAPI(page), toAPI(rangeHandle.get()), &types, &data, m_client.base.clientInfo); 146 146 RefPtr<API::Array> typesArray = adoptRef(toImpl(types)); 147 147 RefPtr<API::Array> dataArray = adoptRef(toImpl(data)); … … 176 176 { 177 177 if (m_client.didWriteToPasteboard) 178 m_client.didWriteToPasteboard(toAPI(page), m_client. clientInfo);178 m_client.didWriteToPasteboard(toAPI(page), m_client.base.clientInfo); 179 179 } 180 180 -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h
r149848 r159988 34 34 #include <wtf/Forward.h> 35 35 36 template<> struct API::ClientTraits<WKBundlePageEditorClientBase> { 37 typedef std::tuple<WKBundlePageEditorClientV0, WKBundlePageEditorClientV1> Versions; 38 }; 39 36 40 namespace WebCore { 37 41 class CSSStyleDeclaration; … … 46 50 class WebPage; 47 51 48 class InjectedBundlePageEditorClient : public API Client<WKBundlePageEditorClient, kWKBundlePageEditorClientCurrentVersion> {52 class InjectedBundlePageEditorClient : public API::Client<WKBundlePageEditorClientBase> { 49 53 public: 50 54 bool shouldBeginEditing(WebPage*, WebCore::Range*); -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp
r159234 r159988 46 46 47 47 RefPtr<InjectedBundleNodeHandle> nodeHandle = InjectedBundleNodeHandle::getOrCreate(inputElement); 48 m_client.didFocusTextField(toAPI(page), toAPI(nodeHandle.get()), toAPI(frame), m_client. clientInfo);48 m_client.didFocusTextField(toAPI(page), toAPI(nodeHandle.get()), toAPI(frame), m_client.base.clientInfo); 49 49 } 50 50 … … 55 55 56 56 RefPtr<InjectedBundleNodeHandle> nodeHandle = InjectedBundleNodeHandle::getOrCreate(inputElement); 57 m_client.textFieldDidBeginEditing(toAPI(page), toAPI(nodeHandle.get()), toAPI(frame), m_client. clientInfo);57 m_client.textFieldDidBeginEditing(toAPI(page), toAPI(nodeHandle.get()), toAPI(frame), m_client.base.clientInfo); 58 58 } 59 59 … … 64 64 65 65 RefPtr<InjectedBundleNodeHandle> nodeHandle = InjectedBundleNodeHandle::getOrCreate(inputElement); 66 m_client.textFieldDidEndEditing(toAPI(page), toAPI(nodeHandle.get()), toAPI(frame), m_client. clientInfo);66 m_client.textFieldDidEndEditing(toAPI(page), toAPI(nodeHandle.get()), toAPI(frame), m_client.base.clientInfo); 67 67 } 68 68 … … 73 73 74 74 RefPtr<InjectedBundleNodeHandle> nodeHandle = InjectedBundleNodeHandle::getOrCreate(inputElement); 75 m_client.textDidChangeInTextField(toAPI(page), toAPI(nodeHandle.get()), toAPI(frame), m_client. clientInfo);75 m_client.textDidChangeInTextField(toAPI(page), toAPI(nodeHandle.get()), toAPI(frame), m_client.base.clientInfo); 76 76 } 77 77 … … 82 82 83 83 RefPtr<InjectedBundleNodeHandle> nodeHandle = InjectedBundleNodeHandle::getOrCreate(textAreaElement); 84 m_client.textDidChangeInTextArea(toAPI(page), toAPI(nodeHandle.get()), toAPI(frame), m_client. clientInfo);84 m_client.textDidChangeInTextArea(toAPI(page), toAPI(nodeHandle.get()), toAPI(frame), m_client.base.clientInfo); 85 85 } 86 86 … … 91 91 92 92 RefPtr<InjectedBundleNodeHandle> nodeHandle = InjectedBundleNodeHandle::getOrCreate(inputElement); 93 return m_client.shouldPerformActionInTextField(toAPI(page), toAPI(nodeHandle.get()), actionType, toAPI(frame), m_client. clientInfo);93 return m_client.shouldPerformActionInTextField(toAPI(page), toAPI(nodeHandle.get()), actionType, toAPI(frame), m_client.base.clientInfo); 94 94 } 95 95 … … 106 106 RefPtr<ImmutableDictionary> textFieldsMap = ImmutableDictionary::adopt(map); 107 107 108 m_client.willSendSubmitEvent(toAPI(page), toAPI(nodeHandle.get()), toAPI(frame), toAPI(sourceFrame), toAPI(textFieldsMap.get()), m_client. clientInfo);108 m_client.willSendSubmitEvent(toAPI(page), toAPI(nodeHandle.get()), toAPI(frame), toAPI(sourceFrame), toAPI(textFieldsMap.get()), m_client.base.clientInfo); 109 109 } 110 110 … … 122 122 123 123 WKTypeRef userDataToPass = 0; 124 m_client.willSubmitForm(toAPI(page), toAPI(nodeHandle.get()), toAPI(frame), toAPI(sourceFrame), toAPI(textFieldsMap.get()), &userDataToPass, m_client. clientInfo);124 m_client.willSubmitForm(toAPI(page), toAPI(nodeHandle.get()), toAPI(frame), toAPI(sourceFrame), toAPI(textFieldsMap.get()), &userDataToPass, m_client.base.clientInfo); 125 125 userData = adoptRef(toImpl(userDataToPass)); 126 126 } … … 137 137 elementHandles.uncheckedAppend(InjectedBundleNodeHandle::getOrCreate(element.get())); 138 138 139 m_client.didAssociateFormControls(toAPI(page), toAPI(API::Array::create(std::move(elementHandles)).get()), m_client. clientInfo);139 m_client.didAssociateFormControls(toAPI(page), toAPI(API::Array::create(std::move(elementHandles)).get()), m_client.base.clientInfo); 140 140 } 141 141 … … 145 145 return false; 146 146 147 return m_client.shouldNotifyOnFormChanges(toAPI(page), m_client. clientInfo);147 return m_client.shouldNotifyOnFormChanges(toAPI(page), m_client.base.clientInfo); 148 148 } 149 149 -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.h
r159163 r159988 33 33 #include <wtf/Vector.h> 34 34 35 template<> struct API::ClientTraits<WKBundlePageFormClientBase> { 36 typedef std::tuple<WKBundlePageFormClientV0, WKBundlePageFormClientV1, WKBundlePageFormClientV2> Versions; 37 }; 38 35 39 namespace API { 36 40 class Object; … … 50 54 class WebPage; 51 55 52 class InjectedBundlePageFormClient : public API Client<WKBundlePageFormClient, kWKBundlePageFormClientCurrentVersion> {56 class InjectedBundlePageFormClient : public API::Client<WKBundlePageFormClientBase> { 53 57 public: 54 58 void didFocusTextField(WebPage*, WebCore::HTMLInputElement*, WebFrame*); -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFullScreenClient.h
r116165 r159988 34 34 #include <wtf/Forward.h> 35 35 36 template<> struct API::ClientTraits<WKBundlePageFullScreenClientBase> { 37 typedef std::tuple<WKBundlePageFullScreenClientV0, WKBundlePageFullScreenClientV1> Versions; 38 }; 39 36 40 namespace WebCore { 37 41 class Element; … … 43 47 class WebPage; 44 48 45 class InjectedBundlePageFullScreenClient : public API Client<WKBundlePageFullScreenClient, kWKBundlePageFullScreenClientCurrentVersion> {49 class InjectedBundlePageFullScreenClient : public API::Client<WKBundlePageFullScreenClientBase> { 46 50 public: 47 51 bool supportsFullScreen(WebPage*, bool withKeyboard); -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp
r159234 r159988 47 47 return; 48 48 49 m_client.willLoadURLRequest(toAPI(page), toAPI(request), toAPI(userData), m_client. clientInfo);49 m_client.willLoadURLRequest(toAPI(page), toAPI(request), toAPI(userData), m_client.base.clientInfo); 50 50 } 51 51 … … 67 67 } 68 68 69 m_client.willLoadDataRequest(toAPI(page), toAPI(request), toAPI(webData.get()), toAPI(MIMEType.impl()), toAPI(encodingName.impl()), toURLRef(unreachableURL.string().impl()), toAPI(userData), m_client. clientInfo);69 m_client.willLoadDataRequest(toAPI(page), toAPI(request), toAPI(webData.get()), toAPI(MIMEType.impl()), toAPI(encodingName.impl()), toURLRef(unreachableURL.string().impl()), toAPI(userData), m_client.base.clientInfo); 70 70 } 71 71 … … 76 76 77 77 WKTypeRef userDataToPass = 0; 78 bool result = m_client.shouldGoToBackForwardListItem(toAPI(page), toAPI(item), &userDataToPass, m_client. clientInfo);78 bool result = m_client.shouldGoToBackForwardListItem(toAPI(page), toAPI(item), &userDataToPass, m_client.base.clientInfo); 79 79 userData = adoptRef(toImpl(userDataToPass)); 80 80 … … 88 88 89 89 WKTypeRef userDataToPass = 0; 90 m_client.didStartProvisionalLoadForFrame(toAPI(page), toAPI(frame), &userDataToPass, m_client. clientInfo);90 m_client.didStartProvisionalLoadForFrame(toAPI(page), toAPI(frame), &userDataToPass, m_client.base.clientInfo); 91 91 userData = adoptRef(toImpl(userDataToPass)); 92 92 } … … 98 98 99 99 WKTypeRef userDataToPass = 0; 100 m_client.didReceiveServerRedirectForProvisionalLoadForFrame(toAPI(page), toAPI(frame), &userDataToPass, m_client. clientInfo);100 m_client.didReceiveServerRedirectForProvisionalLoadForFrame(toAPI(page), toAPI(frame), &userDataToPass, m_client.base.clientInfo); 101 101 userData = adoptRef(toImpl(userDataToPass)); 102 102 } … … 108 108 109 109 WKTypeRef userDataToPass = 0; 110 m_client.didFailProvisionalLoadWithErrorForFrame(toAPI(page), toAPI(frame), toAPI(error), &userDataToPass, m_client. clientInfo);110 m_client.didFailProvisionalLoadWithErrorForFrame(toAPI(page), toAPI(frame), toAPI(error), &userDataToPass, m_client.base.clientInfo); 111 111 userData = adoptRef(toImpl(userDataToPass)); 112 112 } … … 118 118 119 119 WKTypeRef userDataToPass = 0; 120 m_client.didCommitLoadForFrame(toAPI(page), toAPI(frame), &userDataToPass, m_client. clientInfo);120 m_client.didCommitLoadForFrame(toAPI(page), toAPI(frame), &userDataToPass, m_client.base.clientInfo); 121 121 userData = adoptRef(toImpl(userDataToPass)); 122 122 } … … 128 128 129 129 WKTypeRef userDataToPass = 0; 130 m_client.didFinishDocumentLoadForFrame(toAPI(page), toAPI(frame), &userDataToPass, m_client. clientInfo);130 m_client.didFinishDocumentLoadForFrame(toAPI(page), toAPI(frame), &userDataToPass, m_client.base.clientInfo); 131 131 userData = adoptRef(toImpl(userDataToPass)); 132 132 } … … 138 138 139 139 WKTypeRef userDataToPass = 0; 140 m_client.didFinishLoadForFrame(toAPI(page), toAPI(frame), &userDataToPass, m_client. clientInfo);140 m_client.didFinishLoadForFrame(toAPI(page), toAPI(frame), &userDataToPass, m_client.base.clientInfo); 141 141 userData = adoptRef(toImpl(userDataToPass)); 142 142 } … … 147 147 return; 148 148 149 m_client.didFinishProgress(toAPI(page), m_client. clientInfo);149 m_client.didFinishProgress(toAPI(page), m_client.base.clientInfo); 150 150 } 151 151 … … 156 156 157 157 WKTypeRef userDataToPass = 0; 158 m_client.didFailLoadWithErrorForFrame(toAPI(page), toAPI(frame), toAPI(error), &userDataToPass, m_client. clientInfo);158 m_client.didFailLoadWithErrorForFrame(toAPI(page), toAPI(frame), toAPI(error), &userDataToPass, m_client.base.clientInfo); 159 159 userData = adoptRef(toImpl(userDataToPass)); 160 160 } … … 166 166 167 167 WKTypeRef userDataToPass = 0; 168 m_client.didSameDocumentNavigationForFrame(toAPI(page), toAPI(frame), toAPI(type), &userDataToPass, m_client. clientInfo);168 m_client.didSameDocumentNavigationForFrame(toAPI(page), toAPI(frame), toAPI(type), &userDataToPass, m_client.base.clientInfo); 169 169 userData = adoptRef(toImpl(userDataToPass)); 170 170 } … … 176 176 177 177 WKTypeRef userDataToPass = 0; 178 m_client.didReceiveTitleForFrame(toAPI(page), toAPI(title.impl()), toAPI(frame), &userDataToPass, m_client. clientInfo);178 m_client.didReceiveTitleForFrame(toAPI(page), toAPI(title.impl()), toAPI(frame), &userDataToPass, m_client.base.clientInfo); 179 179 userData = adoptRef(toImpl(userDataToPass)); 180 180 } … … 186 186 187 187 WKTypeRef userDataToPass = 0; 188 m_client.didRemoveFrameFromHierarchy(toAPI(page), toAPI(frame), &userDataToPass, m_client. clientInfo);188 m_client.didRemoveFrameFromHierarchy(toAPI(page), toAPI(frame), &userDataToPass, m_client.base.clientInfo); 189 189 userData = adoptRef(toImpl(userDataToPass)); 190 190 } … … 196 196 197 197 WKTypeRef userDataToPass = 0; 198 m_client.didDisplayInsecureContentForFrame(toAPI(page), toAPI(frame), &userDataToPass, m_client. clientInfo);198 m_client.didDisplayInsecureContentForFrame(toAPI(page), toAPI(frame), &userDataToPass, m_client.base.clientInfo); 199 199 userData = adoptRef(toImpl(userDataToPass)); 200 200 } … … 206 206 207 207 WKTypeRef userDataToPass = 0; 208 m_client.didRunInsecureContentForFrame(toAPI(page), toAPI(frame), &userDataToPass, m_client. clientInfo);208 m_client.didRunInsecureContentForFrame(toAPI(page), toAPI(frame), &userDataToPass, m_client.base.clientInfo); 209 209 userData = adoptRef(toImpl(userDataToPass)); 210 210 } … … 216 216 217 217 WKTypeRef userDataToPass = 0; 218 m_client.didDetectXSSForFrame(toAPI(page), toAPI(frame), &userDataToPass, m_client. clientInfo);218 m_client.didDetectXSSForFrame(toAPI(page), toAPI(frame), &userDataToPass, m_client.base.clientInfo); 219 219 userData = adoptRef(toImpl(userDataToPass)); 220 220 } … … 226 226 227 227 WKTypeRef userDataToPass = 0; 228 m_client.didFirstLayoutForFrame(toAPI(page), toAPI(frame), &userDataToPass, m_client. clientInfo);228 m_client.didFirstLayoutForFrame(toAPI(page), toAPI(frame), &userDataToPass, m_client.base.clientInfo); 229 229 userData = adoptRef(toImpl(userDataToPass)); 230 230 } … … 236 236 237 237 WKTypeRef userDataToPass = 0; 238 m_client.didFirstVisuallyNonEmptyLayoutForFrame(toAPI(page), toAPI(frame), &userDataToPass, m_client. clientInfo);238 m_client.didFirstVisuallyNonEmptyLayoutForFrame(toAPI(page), toAPI(frame), &userDataToPass, m_client.base.clientInfo); 239 239 userData = adoptRef(toImpl(userDataToPass)); 240 240 } … … 245 245 return; 246 246 247 m_client.didLayoutForFrame(toAPI(page), toAPI(frame), m_client. clientInfo);247 m_client.didLayoutForFrame(toAPI(page), toAPI(frame), m_client.base.clientInfo); 248 248 } 249 249 … … 254 254 255 255 WKTypeRef userDataToPass = 0; 256 m_client.didLayout(toAPI(page), toWKLayoutMilestones(milestones), &userDataToPass, m_client. clientInfo);256 m_client.didLayout(toAPI(page), toWKLayoutMilestones(milestones), &userDataToPass, m_client.base.clientInfo); 257 257 userData = adoptRef(toImpl(userDataToPass)); 258 258 } … … 263 263 return; 264 264 265 m_client.didClearWindowObjectForFrame(toAPI(page), toAPI(frame), toAPI(InjectedBundleScriptWorld::getOrCreate(world).get()), m_client. clientInfo);265 m_client.didClearWindowObjectForFrame(toAPI(page), toAPI(frame), toAPI(InjectedBundleScriptWorld::getOrCreate(world).get()), m_client.base.clientInfo); 266 266 } 267 267 … … 271 271 return; 272 272 273 m_client.didCancelClientRedirectForFrame(toAPI(page), toAPI(frame), m_client. clientInfo);273 m_client.didCancelClientRedirectForFrame(toAPI(page), toAPI(frame), m_client.base.clientInfo); 274 274 } 275 275 … … 279 279 return; 280 280 281 m_client.willPerformClientRedirectForFrame(toAPI(page), toAPI(frame), toURLRef(url.impl()), delay, date, m_client. clientInfo);281 m_client.willPerformClientRedirectForFrame(toAPI(page), toAPI(frame), toURLRef(url.impl()), delay, date, m_client.base.clientInfo); 282 282 } 283 283 … … 287 287 return; 288 288 289 m_client.didHandleOnloadEventsForFrame(toAPI(page), toAPI(frame), m_client. clientInfo);289 m_client.didHandleOnloadEventsForFrame(toAPI(page), toAPI(frame), m_client.base.clientInfo); 290 290 } 291 291 … … 296 296 297 297 RefPtr<InjectedBundleScriptWorld> injectedWorld = InjectedBundleScriptWorld::getOrCreate(world); 298 m_client.globalObjectIsAvailableForFrame(toAPI(page), toAPI(frame), toAPI(injectedWorld.get()), m_client. clientInfo);298 m_client.globalObjectIsAvailableForFrame(toAPI(page), toAPI(frame), toAPI(injectedWorld.get()), m_client.base.clientInfo); 299 299 } 300 300 … … 306 306 RefPtr<InjectedBundleDOMWindowExtension> extension = InjectedBundleDOMWindowExtension::get(coreExtension); 307 307 ASSERT(extension); 308 m_client.willDisconnectDOMWindowExtensionFromGlobalObject(toAPI(page), toAPI(extension.get()), m_client. clientInfo);308 m_client.willDisconnectDOMWindowExtensionFromGlobalObject(toAPI(page), toAPI(extension.get()), m_client.base.clientInfo); 309 309 } 310 310 … … 316 316 RefPtr<InjectedBundleDOMWindowExtension> extension = InjectedBundleDOMWindowExtension::get(coreExtension); 317 317 ASSERT(extension); 318 m_client.didReconnectDOMWindowExtensionToGlobalObject(toAPI(page), toAPI(extension.get()), m_client. clientInfo);318 m_client.didReconnectDOMWindowExtensionToGlobalObject(toAPI(page), toAPI(extension.get()), m_client.base.clientInfo); 319 319 } 320 320 … … 326 326 RefPtr<InjectedBundleDOMWindowExtension> extension = InjectedBundleDOMWindowExtension::get(coreExtension); 327 327 ASSERT(extension); 328 m_client.willDestroyGlobalObjectForDOMWindowExtension(toAPI(page), toAPI(extension.get()), m_client. clientInfo);328 m_client.willDestroyGlobalObjectForDOMWindowExtension(toAPI(page), toAPI(extension.get()), m_client.base.clientInfo); 329 329 } 330 330 … … 334 334 return false; 335 335 336 return m_client.shouldForceUniversalAccessFromLocalURL(toAPI(page), toAPI(url.impl()), m_client. clientInfo);336 return m_client.shouldForceUniversalAccessFromLocalURL(toAPI(page), toAPI(url.impl()), m_client.base.clientInfo); 337 337 } 338 338 … … 342 342 return; 343 343 344 return m_client.featuresUsedInPage(toAPI(page), toAPI(API::Array::createStringArray(features).get()), m_client. clientInfo);344 return m_client.featuresUsedInPage(toAPI(page), toAPI(API::Array::createStringArray(features).get()), m_client.base.clientInfo); 345 345 } 346 346 … … 350 350 return; 351 351 352 m_client.willDestroyFrame(toAPI(page), toAPI(frame), m_client. clientInfo);352 m_client.willDestroyFrame(toAPI(page), toAPI(frame), m_client.base.clientInfo); 353 353 } 354 354 -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h
r159163 r159988 39 39 } 40 40 41 template<> struct API::ClientTraits<WKBundlePageLoaderClientBase> { 42 typedef std::tuple<WKBundlePageLoaderClientV0, WKBundlePageLoaderClientV1, WKBundlePageLoaderClientV2, WKBundlePageLoaderClientV3, WKBundlePageLoaderClientV4, WKBundlePageLoaderClientV5, WKBundlePageLoaderClientV6, WKBundlePageLoaderClientV7> Versions; 43 }; 44 41 45 namespace WebCore { 42 46 class DOMWindowExtension; … … 55 59 class WebFrame; 56 60 57 class InjectedBundlePageLoaderClient : public API Client<WKBundlePageLoaderClient, kWKBundlePageLoaderClientCurrentVersion> {61 class InjectedBundlePageLoaderClient : public API::Client<WKBundlePageLoaderClientBase> { 58 62 public: 59 63 void willLoadURLRequest(WebPage*, const WebCore::ResourceRequest&, API::Object*); -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.cpp
r159163 r159988 43 43 44 44 WKTypeRef userDataToPass = 0; 45 WKBundlePagePolicyAction policy = m_client.decidePolicyForNavigationAction(toAPI(page), toAPI(frame), toAPI(action), toAPI(request.get()), &userDataToPass, m_client. clientInfo);45 WKBundlePagePolicyAction policy = m_client.decidePolicyForNavigationAction(toAPI(page), toAPI(frame), toAPI(action), toAPI(request.get()), &userDataToPass, m_client.base.clientInfo); 46 46 userData = adoptRef(toImpl(userDataToPass)); 47 47 return policy; … … 56 56 57 57 WKTypeRef userDataToPass = 0; 58 WKBundlePagePolicyAction policy = m_client.decidePolicyForNewWindowAction(toAPI(page), toAPI(frame), toAPI(action), toAPI(request.get()), toAPI(frameName.impl()), &userDataToPass, m_client. clientInfo);58 WKBundlePagePolicyAction policy = m_client.decidePolicyForNewWindowAction(toAPI(page), toAPI(frame), toAPI(action), toAPI(request.get()), toAPI(frameName.impl()), &userDataToPass, m_client.base.clientInfo); 59 59 userData = adoptRef(toImpl(userDataToPass)); 60 60 return policy; … … 70 70 71 71 WKTypeRef userDataToPass = 0; 72 WKBundlePagePolicyAction policy = m_client.decidePolicyForResponse(toAPI(page), toAPI(frame), toAPI(response.get()), toAPI(request.get()), &userDataToPass, m_client. clientInfo);72 WKBundlePagePolicyAction policy = m_client.decidePolicyForResponse(toAPI(page), toAPI(frame), toAPI(response.get()), toAPI(request.get()), &userDataToPass, m_client.base.clientInfo); 73 73 userData = adoptRef(toImpl(userDataToPass)); 74 74 return policy; … … 81 81 82 82 WKTypeRef userDataToPass = 0; 83 m_client.unableToImplementPolicy(toAPI(page), toAPI(frame), toAPI(error), &userDataToPass, m_client. clientInfo);83 m_client.unableToImplementPolicy(toAPI(page), toAPI(frame), toAPI(error), &userDataToPass, m_client.base.clientInfo); 84 84 userData = adoptRef(toImpl(userDataToPass)); 85 85 } -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.h
r159163 r159988 32 32 #include <wtf/Forward.h> 33 33 34 template<> struct API::ClientTraits<WKBundlePagePolicyClientBase> { 35 typedef std::tuple<WKBundlePagePolicyClientV0> Versions; 36 }; 37 34 38 namespace WebCore { 35 39 class ResourceError; … … 44 48 class WebPage; 45 49 46 class InjectedBundlePagePolicyClient : public API Client<WKBundlePagePolicyClient, kWKBundlePagePolicyClientCurrentVersion> {50 class InjectedBundlePagePolicyClient : public API::Client<WKBundlePagePolicyClientBase> { 47 51 public: 48 52 WKBundlePagePolicyAction decidePolicyForNavigationAction(WebPage*, WebFrame*, InjectedBundleNavigationAction*, const WebCore::ResourceRequest&, RefPtr<API::Object>& userData); -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageResourceLoadClient.cpp
r144216 r159988 39 39 return; 40 40 41 m_client.didInitiateLoadForResource(toAPI(page), toAPI(frame), identifier, toAPI(request), pageIsProvisionallyLoading, m_client. clientInfo);41 m_client.didInitiateLoadForResource(toAPI(page), toAPI(frame), identifier, toAPI(request), pageIsProvisionallyLoading, m_client.base.clientInfo); 42 42 } 43 43 … … 47 47 return; 48 48 49 RefPtr<WebURLRequest> returnedRequest = adoptRef(toImpl(m_client.willSendRequestForFrame(toAPI(page), toAPI(frame), identifier, toAPI(request), toAPI(redirectResponse), m_client. clientInfo)));49 RefPtr<WebURLRequest> returnedRequest = adoptRef(toImpl(m_client.willSendRequestForFrame(toAPI(page), toAPI(frame), identifier, toAPI(request), toAPI(redirectResponse), m_client.base.clientInfo))); 50 50 if (returnedRequest) 51 51 request.updateFromDelegatePreservingOldHTTPBody(returnedRequest->resourceRequest()); … … 59 59 return; 60 60 61 m_client.didReceiveResponseForResource(toAPI(page), toAPI(frame), identifier, toAPI(response), m_client. clientInfo);61 m_client.didReceiveResponseForResource(toAPI(page), toAPI(frame), identifier, toAPI(response), m_client.base.clientInfo); 62 62 } 63 63 … … 67 67 return; 68 68 69 m_client.didReceiveContentLengthForResource(toAPI(page), toAPI(frame), identifier, contentLength, m_client. clientInfo);69 m_client.didReceiveContentLengthForResource(toAPI(page), toAPI(frame), identifier, contentLength, m_client.base.clientInfo); 70 70 } 71 71 … … 75 75 return; 76 76 77 m_client.didFinishLoadForResource(toAPI(page), toAPI(frame), identifier, m_client. clientInfo);77 m_client.didFinishLoadForResource(toAPI(page), toAPI(frame), identifier, m_client.base.clientInfo); 78 78 } 79 79 … … 83 83 return; 84 84 85 m_client.didFailLoadForResource(toAPI(page), toAPI(frame), identifier, toAPI(error), m_client. clientInfo);85 m_client.didFailLoadForResource(toAPI(page), toAPI(frame), identifier, toAPI(error), m_client.base.clientInfo); 86 86 } 87 87 … … 91 91 return true; 92 92 93 return m_client.shouldCacheResponse(toAPI(page), toAPI(frame), identifier, m_client. clientInfo);93 return m_client.shouldCacheResponse(toAPI(page), toAPI(frame), identifier, m_client.base.clientInfo); 94 94 } 95 95 … … 99 99 return true; 100 100 101 return m_client.shouldUseCredentialStorage(toAPI(page), toAPI(frame), identifier, m_client. clientInfo);101 return m_client.shouldUseCredentialStorage(toAPI(page), toAPI(frame), identifier, m_client.base.clientInfo); 102 102 } 103 103 -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageResourceLoadClient.h
r159163 r159988 33 33 #include <wtf/Forward.h> 34 34 35 template<> struct API::ClientTraits<WKBundlePageResourceLoadClientBase> { 36 typedef std::tuple<WKBundlePageResourceLoadClientV0, WKBundlePageResourceLoadClientV1> Versions; 37 }; 38 35 39 namespace WebCore { 36 40 class ResourceError; … … 44 48 class WebFrame; 45 49 46 class InjectedBundlePageResourceLoadClient : public API Client<WKBundlePageResourceLoadClient, kWKBundlePageResourceLoadClientCurrentVersion> {50 class InjectedBundlePageResourceLoadClient : public API::Client<WKBundlePageResourceLoadClientBase> { 47 51 public: 48 52 void didInitiateLoadForResource(WebPage*, WebFrame*, uint64_t identifier, const WebCore::ResourceRequest&, bool pageIsProvisionallyLoading); -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp
r159222 r159988 40 40 { 41 41 if (m_client.willAddMessageToConsole) 42 m_client.willAddMessageToConsole(toAPI(page), toAPI(message.impl()), lineNumber, m_client. clientInfo);42 m_client.willAddMessageToConsole(toAPI(page), toAPI(message.impl()), lineNumber, m_client.base.clientInfo); 43 43 } 44 44 … … 46 46 { 47 47 if (m_client.willSetStatusbarText) 48 m_client.willSetStatusbarText(toAPI(page), toAPI(statusbarText.impl()), m_client. clientInfo);48 m_client.willSetStatusbarText(toAPI(page), toAPI(statusbarText.impl()), m_client.base.clientInfo); 49 49 } 50 50 … … 52 52 { 53 53 if (m_client.willRunJavaScriptAlert) 54 m_client.willRunJavaScriptAlert(toAPI(page), toAPI(alertText.impl()), toAPI(frame), m_client. clientInfo);54 m_client.willRunJavaScriptAlert(toAPI(page), toAPI(alertText.impl()), toAPI(frame), m_client.base.clientInfo); 55 55 } 56 56 … … 58 58 { 59 59 if (m_client.willRunJavaScriptConfirm) 60 m_client.willRunJavaScriptConfirm(toAPI(page), toAPI(message.impl()), toAPI(frame), m_client. clientInfo);60 m_client.willRunJavaScriptConfirm(toAPI(page), toAPI(message.impl()), toAPI(frame), m_client.base.clientInfo); 61 61 } 62 62 … … 64 64 { 65 65 if (m_client.willRunJavaScriptPrompt) 66 m_client.willRunJavaScriptPrompt(toAPI(page), toAPI(message.impl()), toAPI(defaultValue.impl()), toAPI(frame), m_client. clientInfo);66 m_client.willRunJavaScriptPrompt(toAPI(page), toAPI(message.impl()), toAPI(defaultValue.impl()), toAPI(frame), m_client.base.clientInfo); 67 67 } 68 68 … … 75 75 76 76 WKTypeRef userDataToPass = 0; 77 m_client.mouseDidMoveOverElement(toAPI(page), toAPI(hitTestResult.get()), toAPI(modifiers), &userDataToPass, m_client. clientInfo);77 m_client.mouseDidMoveOverElement(toAPI(page), toAPI(hitTestResult.get()), toAPI(modifiers), &userDataToPass, m_client.base.clientInfo); 78 78 userData = adoptRef(toImpl(userDataToPass)); 79 79 } … … 84 84 return; 85 85 86 m_client.pageDidScroll(toAPI(page), m_client. clientInfo);86 m_client.pageDidScroll(toAPI(page), m_client.base.clientInfo); 87 87 } 88 88 … … 91 91 if (!m_client.shouldGenerateFileForUpload) 92 92 return String(); 93 RefPtr<WebString> generatedFilePath = adoptRef(toImpl(m_client.shouldGenerateFileForUpload(toAPI(page), toAPI(originalFilePath.impl()), m_client. clientInfo)));93 RefPtr<WebString> generatedFilePath = adoptRef(toImpl(m_client.shouldGenerateFileForUpload(toAPI(page), toAPI(originalFilePath.impl()), m_client.base.clientInfo))); 94 94 return generatedFilePath ? generatedFilePath->string() : String(); 95 95 } … … 99 99 if (!m_client.shouldGenerateFileForUpload) 100 100 return String(); 101 RefPtr<WebString> generatedFilePath = adoptRef(toImpl(m_client.generateFileForUpload(toAPI(page), toAPI(originalFilePath.impl()), m_client. clientInfo)));101 RefPtr<WebString> generatedFilePath = adoptRef(toImpl(m_client.generateFileForUpload(toAPI(page), toAPI(originalFilePath.impl()), m_client.base.clientInfo))); 102 102 return generatedFilePath ? generatedFilePath->string() : String(); 103 103 } … … 108 108 return WKBundlePageUIElementVisibilityUnknown; 109 109 110 return m_client.statusBarIsVisible(toAPI(page), m_client. clientInfo);110 return m_client.statusBarIsVisible(toAPI(page), m_client.base.clientInfo); 111 111 } 112 112 … … 116 116 return WKBundlePageUIElementVisibilityUnknown; 117 117 118 return m_client.menuBarIsVisible(toAPI(page), m_client. clientInfo);118 return m_client.menuBarIsVisible(toAPI(page), m_client.base.clientInfo); 119 119 } 120 120 … … 124 124 return WKBundlePageUIElementVisibilityUnknown; 125 125 126 return m_client.toolbarsAreVisible(toAPI(page), m_client. clientInfo);126 return m_client.toolbarsAreVisible(toAPI(page), m_client.base.clientInfo); 127 127 } 128 128 … … 132 132 return; 133 133 134 m_client.didReachApplicationCacheOriginQuota(toAPI(page), toAPI(origin), totalBytesNeeded, m_client. clientInfo);134 m_client.didReachApplicationCacheOriginQuota(toAPI(page), toAPI(origin), totalBytesNeeded, m_client.base.clientInfo); 135 135 } 136 136 … … 140 140 return 0; 141 141 142 return m_client.didExceedDatabaseQuota(toAPI(page), toAPI(origin), toAPI(databaseName.impl()), toAPI(databaseDisplayName.impl()), currentQuotaBytes, currentOriginUsageBytes, currentDatabaseUsageBytes, expectedUsageBytes, m_client. clientInfo);142 return m_client.didExceedDatabaseQuota(toAPI(page), toAPI(origin), toAPI(databaseName.impl()), toAPI(databaseDisplayName.impl()), currentQuotaBytes, currentOriginUsageBytes, currentDatabaseUsageBytes, expectedUsageBytes, m_client.base.clientInfo); 143 143 } 144 144 … … 148 148 return String(); 149 149 150 RefPtr<WebString> title = adoptRef(toImpl(m_client.createPlugInStartLabelTitle(toAPI(mimeType.impl()), m_client. clientInfo)));150 RefPtr<WebString> title = adoptRef(toImpl(m_client.createPlugInStartLabelTitle(toAPI(mimeType.impl()), m_client.base.clientInfo))); 151 151 return title ? title->string() : String(); 152 152 } … … 157 157 return String(); 158 158 159 RefPtr<WebString> subtitle = adoptRef(toImpl(m_client.createPlugInStartLabelSubtitle(toAPI(mimeType.impl()), m_client. clientInfo)));159 RefPtr<WebString> subtitle = adoptRef(toImpl(m_client.createPlugInStartLabelSubtitle(toAPI(mimeType.impl()), m_client.base.clientInfo))); 160 160 return subtitle ? subtitle->string() : String(); 161 161 } … … 166 166 return String(); 167 167 168 RefPtr<WebString> styleSheet = adoptRef(toImpl(m_client.createPlugInExtraStyleSheet(m_client. clientInfo)));168 RefPtr<WebString> styleSheet = adoptRef(toImpl(m_client.createPlugInExtraStyleSheet(m_client.base.clientInfo))); 169 169 return styleSheet ? styleSheet->string() : String(); 170 170 } … … 175 175 return String(); 176 176 177 RefPtr<WebString> script = adoptRef(toImpl(m_client.createPlugInExtraScript(m_client. clientInfo)));177 RefPtr<WebString> script = adoptRef(toImpl(m_client.createPlugInExtraScript(m_client.base.clientInfo))); 178 178 return script ? script->string() : String(); 179 179 } -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h
r159196 r159988 33 33 #include <wtf/Forward.h> 34 34 35 template<> struct API::ClientTraits<WKBundlePageUIClientBase> { 36 typedef std::tuple<WKBundlePageUIClientV0, WKBundlePageUIClientV1, WKBundlePageUIClientV2> Versions; 37 }; 38 35 39 namespace API { 36 40 class Object; … … 49 53 class WebSecurityOrigin; 50 54 51 class InjectedBundlePageUIClient : public API Client<WKBundlePageUIClient, kWKBundlePageUIClientCurrentVersion> {55 class InjectedBundlePageUIClient : public API::Client<WKBundlePageUIClientBase> { 52 56 public: 53 57 void willAddMessageToConsole(WebPage*, const String& message, int32_t lineNumber); -
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
r159985 r159988 483 483 484 484 #if ENABLE(CONTEXT_MENUS) 485 void WebPage::initializeInjectedBundleContextMenuClient(WKBundlePageContextMenuClient * client)485 void WebPage::initializeInjectedBundleContextMenuClient(WKBundlePageContextMenuClientBase* client) 486 486 { 487 487 m_contextMenuClient.initialize(client); … … 489 489 #endif 490 490 491 void WebPage::initializeInjectedBundleEditorClient(WKBundlePageEditorClient * client)491 void WebPage::initializeInjectedBundleEditorClient(WKBundlePageEditorClientBase* client) 492 492 { 493 493 m_editorClient.initialize(client); 494 494 } 495 495 496 void WebPage::initializeInjectedBundleFormClient(WKBundlePageFormClient * client)496 void WebPage::initializeInjectedBundleFormClient(WKBundlePageFormClientBase* client) 497 497 { 498 498 m_formClient.initialize(client); 499 499 } 500 500 501 void WebPage::initializeInjectedBundleLoaderClient(WKBundlePageLoaderClient* client) 502 { 501 void WebPage::initializeInjectedBundleLoaderClient(WKBundlePageLoaderClientBase* client) 502 { 503 m_loaderClient.initialize(client); 504 503 505 // It would be nice to get rid of this code and transition all clients to using didLayout instead of 504 506 // didFirstLayoutInFrame and didFirstVisuallyNonEmptyLayoutInFrame. In the meantime, this is required … … 506 508 LayoutMilestones milestones = 0; 507 509 if (client) { 508 if ( client->didFirstLayoutForFrame)510 if (m_loaderClient.client().didFirstLayoutForFrame) 509 511 milestones |= WebCore::DidFirstLayout; 510 if ( client->didFirstVisuallyNonEmptyLayoutForFrame)512 if (m_loaderClient.client().didFirstVisuallyNonEmptyLayoutForFrame) 511 513 milestones |= WebCore::DidFirstVisuallyNonEmptyLayout; 512 514 } … … 514 516 if (milestones) 515 517 listenForLayoutMilestones(milestones); 516 517 m_loaderClient.initialize(client); 518 } 519 520 void WebPage::initializeInjectedBundlePolicyClient(WKBundlePagePolicyClient* client) 518 } 519 520 void WebPage::initializeInjectedBundlePolicyClient(WKBundlePagePolicyClientBase* client) 521 521 { 522 522 m_policyClient.initialize(client); 523 523 } 524 524 525 void WebPage::initializeInjectedBundleResourceLoadClient(WKBundlePageResourceLoadClient * client)525 void WebPage::initializeInjectedBundleResourceLoadClient(WKBundlePageResourceLoadClientBase* client) 526 526 { 527 527 m_resourceLoadClient.initialize(client); 528 528 } 529 529 530 void WebPage::initializeInjectedBundleUIClient(WKBundlePageUIClient * client)530 void WebPage::initializeInjectedBundleUIClient(WKBundlePageUIClientBase* client) 531 531 { 532 532 m_uiClient.initialize(client); … … 534 534 535 535 #if ENABLE(FULLSCREEN_API) 536 void WebPage::initializeInjectedBundleFullScreenClient(WKBundlePageFullScreenClient * client)536 void WebPage::initializeInjectedBundleFullScreenClient(WKBundlePageFullScreenClientBase* client) 537 537 { 538 538 m_fullScreenClient.initialize(client); … … 540 540 #endif 541 541 542 void WebPage::initializeInjectedBundleDiagnosticLoggingClient(WKBundlePageDiagnosticLoggingClient * client)542 void WebPage::initializeInjectedBundleDiagnosticLoggingClient(WKBundlePageDiagnosticLoggingClientBase* client) 543 543 { 544 544 m_logDiagnosticMessageClient.initialize(client); -
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h
r159876 r159988 243 243 // -- InjectedBundle methods 244 244 #if ENABLE(CONTEXT_MENUS) 245 void initializeInjectedBundleContextMenuClient(WKBundlePageContextMenuClient *);246 #endif 247 void initializeInjectedBundleEditorClient(WKBundlePageEditorClient *);248 void initializeInjectedBundleFormClient(WKBundlePageFormClient *);249 void initializeInjectedBundleLoaderClient(WKBundlePageLoaderClient *);250 void initializeInjectedBundlePolicyClient(WKBundlePagePolicyClient *);251 void initializeInjectedBundleResourceLoadClient(WKBundlePageResourceLoadClient *);252 void initializeInjectedBundleUIClient(WKBundlePageUIClient *);245 void initializeInjectedBundleContextMenuClient(WKBundlePageContextMenuClientBase*); 246 #endif 247 void initializeInjectedBundleEditorClient(WKBundlePageEditorClientBase*); 248 void initializeInjectedBundleFormClient(WKBundlePageFormClientBase*); 249 void initializeInjectedBundleLoaderClient(WKBundlePageLoaderClientBase*); 250 void initializeInjectedBundlePolicyClient(WKBundlePagePolicyClientBase*); 251 void initializeInjectedBundleResourceLoadClient(WKBundlePageResourceLoadClientBase*); 252 void initializeInjectedBundleUIClient(WKBundlePageUIClientBase*); 253 253 #if ENABLE(FULLSCREEN_API) 254 void initializeInjectedBundleFullScreenClient(WKBundlePageFullScreenClient *);255 #endif 256 void initializeInjectedBundleDiagnosticLoggingClient(WKBundlePageDiagnosticLoggingClient *);254 void initializeInjectedBundleFullScreenClient(WKBundlePageFullScreenClientBase*); 255 #endif 256 void initializeInjectedBundleDiagnosticLoggingClient(WKBundlePageDiagnosticLoggingClientBase*); 257 257 258 258 #if ENABLE(CONTEXT_MENUS)
Note: See TracChangeset
for help on using the changeset viewer.