Changeset 159988 in webkit


Ignore:
Timestamp:
Dec 2, 2013 6:36:08 PM (10 years ago)
Author:
andersca@apple.com
Message:

Replace uses of WebKit::APIClient with API::Client
https://bugs.webkit.org/show_bug.cgi?id=125129

Reviewed by Andreas Kling.

  • Shared/API/c/WKConnectionRef.cpp:

(WKConnectionSetConnectionClient):

  • Shared/WebConnection.cpp:

(WebKit::WebConnection::initializeConnectionClient):

  • Shared/WebConnection.h:
  • Shared/WebConnectionClient.cpp:

(WebKit::WebConnectionClient::didReceiveMessage):
(WebKit::WebConnectionClient::didClose):

  • Shared/WebConnectionClient.h:
  • UIProcess/API/C/WKContext.cpp:

(WKContextSetClient):
(WKContextSetInjectedBundleClient):
(WKContextSetHistoryClient):
(WKContextSetDownloadClient):
(WKContextSetConnectionClient):

  • UIProcess/API/C/WKCookieManager.cpp:

(WKCookieManagerSetClient):

  • UIProcess/API/C/WKDatabaseManager.cpp:

(WKDatabaseManagerSetClient):

  • UIProcess/API/C/WKGeolocationManager.cpp:

(WKGeolocationManagerSetProvider):

  • UIProcess/API/C/WKIconDatabase.cpp:

(WKIconDatabaseSetIconDatabaseClient):

  • UIProcess/API/C/WKNotificationManager.cpp:

(WKNotificationManagerSetProvider):

  • UIProcess/API/C/WKOriginDataManager.cpp:

(WKOriginDataManagerSetChangeClient):

  • UIProcess/API/C/WKPage.cpp:

(WKPageSetPageContextMenuClient):
(WKPageSetPageFindClient):
(WKPageSetPageFindMatchesClient):
(WKPageSetPageFormClient):
(WKPageSetPagePolicyClient):
(WKPageSetPageUIClient):

  • UIProcess/API/Cocoa/WKBrowsingContextController.mm:

(setUpPagePolicyClient):

  • UIProcess/Notifications/WebNotificationManagerProxy.cpp:

(WebKit::WebNotificationManagerProxy::initializeProvider):

  • UIProcess/Notifications/WebNotificationManagerProxy.h:
  • UIProcess/Notifications/WebNotificationProvider.cpp:

(WebKit::WebNotificationProvider::show):
(WebKit::WebNotificationProvider::cancel):
(WebKit::WebNotificationProvider::didDestroyNotification):
(WebKit::WebNotificationProvider::clearNotifications):
(WebKit::WebNotificationProvider::addNotificationManager):
(WebKit::WebNotificationProvider::removeNotificationManager):
(WebKit::WebNotificationProvider::notificationPermissions):

  • UIProcess/Notifications/WebNotificationProvider.h:
  • UIProcess/WebContext.cpp:

(WebKit::WebContext::initializeClient):
(WebKit::WebContext::initializeInjectedBundleClient):
(WebKit::WebContext::initializeConnectionClient):
(WebKit::WebContext::initializeHistoryClient):
(WebKit::WebContext::initializeDownloadClient):

  • UIProcess/WebContext.h:
  • UIProcess/WebContextClient.cpp:

(WebKit::WebContextClient::plugInAutoStartOriginHashesChanged):
(WebKit::WebContextClient::networkProcessDidCrash):
(WebKit::WebContextClient::plugInInformationBecameAvailable):

  • UIProcess/WebContextClient.h:
  • UIProcess/WebContextConnectionClient.cpp:

(WebKit::WebContextConnectionClient::didCreateConnection):

  • UIProcess/WebContextConnectionClient.h:
  • UIProcess/WebContextInjectedBundleClient.cpp:

(WebKit::WebContextInjectedBundleClient::didReceiveMessageFromInjectedBundle):
(WebKit::WebContextInjectedBundleClient::didReceiveSynchronousMessageFromInjectedBundle):
(WebKit::WebContextInjectedBundleClient::getInjectedBundleInitializationUserData):

  • UIProcess/WebContextInjectedBundleClient.h:
  • UIProcess/WebCookieManagerProxy.cpp:

(WebKit::WebCookieManagerProxy::initializeClient):

  • UIProcess/WebCookieManagerProxy.h:
  • UIProcess/WebCookieManagerProxyClient.cpp:

(WebKit::WebCookieManagerProxyClient::cookiesDidChange):

  • UIProcess/WebCookieManagerProxyClient.h:
  • UIProcess/WebDatabaseManagerProxy.cpp:

(WebKit::WebDatabaseManagerProxy::initializeClient):

  • UIProcess/WebDatabaseManagerProxy.h:
  • UIProcess/WebDatabaseManagerProxyClient.cpp:

(WebKit::WebDatabaseManagerProxyClient::didModifyOrigin):
(WebKit::WebDatabaseManagerProxyClient::didModifyDatabase):

  • UIProcess/WebDatabaseManagerProxyClient.h:
  • UIProcess/WebDownloadClient.cpp:

(WebKit::WebDownloadClient::didStart):
(WebKit::WebDownloadClient::didReceiveAuthenticationChallenge):
(WebKit::WebDownloadClient::didReceiveResponse):
(WebKit::WebDownloadClient::didReceiveData):
(WebKit::WebDownloadClient::shouldDecodeSourceDataOfMIMEType):
(WebKit::WebDownloadClient::decideDestinationWithSuggestedFilename):
(WebKit::WebDownloadClient::didCreateDestination):
(WebKit::WebDownloadClient::didFinish):
(WebKit::WebDownloadClient::didFail):
(WebKit::WebDownloadClient::didCancel):
(WebKit::WebDownloadClient::processDidCrash):

  • UIProcess/WebDownloadClient.h:
  • UIProcess/WebFindClient.cpp:

(WebKit::WebFindClient::didFindString):
(WebKit::WebFindClient::didFailToFindString):
(WebKit::WebFindClient::didCountStringMatches):
(WebKit::WebFindMatchesClient::didFindStringMatches):
(WebKit::WebFindMatchesClient::didGetImageForMatchResult):

  • UIProcess/WebFindClient.h:
  • UIProcess/WebFormClient.cpp:

(WebKit::WebFormClient::willSubmitForm):

  • UIProcess/WebFormClient.h:
  • UIProcess/WebGeolocationManagerProxy.cpp:

(WebKit::WebGeolocationManagerProxy::initializeProvider):

  • UIProcess/WebGeolocationManagerProxy.h:
  • UIProcess/WebGeolocationProvider.cpp:

(WebKit::WebGeolocationProvider::startUpdating):
(WebKit::WebGeolocationProvider::stopUpdating):
(WebKit::WebGeolocationProvider::setEnableHighAccuracy):

  • UIProcess/WebGeolocationProvider.h:
  • UIProcess/WebHistoryClient.cpp:

(WebKit::WebHistoryClient::didNavigateWithNavigationData):
(WebKit::WebHistoryClient::didPerformClientRedirect):
(WebKit::WebHistoryClient::didPerformServerRedirect):
(WebKit::WebHistoryClient::didUpdateHistoryTitle):
(WebKit::WebHistoryClient::populateVisitedLinks):

  • UIProcess/WebHistoryClient.h:
  • UIProcess/WebIconDatabase.cpp:

(WebKit::WebIconDatabase::initializeIconDatabaseClient):

  • UIProcess/WebIconDatabase.h:
  • UIProcess/WebIconDatabaseClient.cpp:

(WebKit::WebIconDatabaseClient::didChangeIconForPageURL):
(WebKit::WebIconDatabaseClient::didRemoveAllIcons):
(WebKit::WebIconDatabaseClient::iconDataReadyForPageURL):

  • UIProcess/WebIconDatabaseClient.h:
  • UIProcess/WebInspectorProxy.cpp:

(WebKit::WebInspectorProxy::createInspectorPage):

  • UIProcess/WebLoaderClient.h:
  • UIProcess/WebOriginDataManagerProxy.cpp:

(WebKit::WebOriginDataManagerProxy::setChangeClient):

  • UIProcess/WebOriginDataManagerProxy.h:
  • UIProcess/WebOriginDataManagerProxyChangeClient.cpp:

(WebKit::WebOriginDataManagerProxyChangeClient::didChange):

  • UIProcess/WebOriginDataManagerProxyChangeClient.h:
  • UIProcess/WebPageContextMenuClient.cpp:

(WebKit::WebPageContextMenuClient::getContextMenuFromProposedMenu):
(WebKit::WebPageContextMenuClient::customContextMenuItemSelected):
(WebKit::WebPageContextMenuClient::contextMenuDismissed):
(WebKit::WebPageContextMenuClient::showContextMenu):
(WebKit::WebPageContextMenuClient::hideContextMenu):

  • UIProcess/WebPageContextMenuClient.h:
  • UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::initializePolicyClient):
(WebKit::WebPageProxy::initializeFormClient):
(WebKit::WebPageProxy::initializeUIClient):
(WebKit::WebPageProxy::initializeFindClient):
(WebKit::WebPageProxy::initializeFindMatchesClient):
(WebKit::WebPageProxy::initializeContextMenuClient):

  • UIProcess/WebPageProxy.h:
  • UIProcess/WebPolicyClient.cpp:

(WebKit::WebPolicyClient::decidePolicyForNavigationAction):
(WebKit::WebPolicyClient::decidePolicyForNewWindowAction):
(WebKit::WebPolicyClient::decidePolicyForResponse):
(WebKit::WebPolicyClient::unableToImplementPolicy):

  • UIProcess/WebPolicyClient.h:
  • UIProcess/WebUIClient.cpp:

(WebKit::WebUIClient::createNewPage):
(WebKit::WebUIClient::showPage):
(WebKit::WebUIClient::close):
(WebKit::WebUIClient::takeFocus):
(WebKit::WebUIClient::focus):
(WebKit::WebUIClient::unfocus):
(WebKit::WebUIClient::runJavaScriptAlert):
(WebKit::WebUIClient::runJavaScriptConfirm):
(WebKit::WebUIClient::runJavaScriptPrompt):
(WebKit::WebUIClient::setStatusText):
(WebKit::WebUIClient::mouseDidMoveOverElement):
(WebKit::WebUIClient::unavailablePluginButtonClicked):
(WebKit::WebUIClient::didNotHandleKeyEvent):
(WebKit::WebUIClient::didNotHandleWheelEvent):
(WebKit::WebUIClient::toolbarsAreVisible):
(WebKit::WebUIClient::setToolbarsAreVisible):
(WebKit::WebUIClient::menuBarIsVisible):
(WebKit::WebUIClient::setMenuBarIsVisible):
(WebKit::WebUIClient::statusBarIsVisible):
(WebKit::WebUIClient::setStatusBarIsVisible):
(WebKit::WebUIClient::isResizable):
(WebKit::WebUIClient::setIsResizable):
(WebKit::WebUIClient::setWindowFrame):
(WebKit::WebUIClient::windowFrame):
(WebKit::WebUIClient::runBeforeUnloadConfirmPanel):
(WebKit::WebUIClient::didDraw):
(WebKit::WebUIClient::pageDidScroll):
(WebKit::WebUIClient::exceededDatabaseQuota):
(WebKit::WebUIClient::runOpenPanel):
(WebKit::WebUIClient::decidePolicyForGeolocationPermissionRequest):
(WebKit::WebUIClient::decidePolicyForNotificationPermissionRequest):
(WebKit::WebUIClient::headerHeight):
(WebKit::WebUIClient::footerHeight):
(WebKit::WebUIClient::drawHeader):
(WebKit::WebUIClient::drawFooter):
(WebKit::WebUIClient::printFrame):
(WebKit::WebUIClient::runModal):
(WebKit::WebUIClient::saveDataToFileInDownloadsFolder):
(WebKit::WebUIClient::shouldInterruptJavaScript):
(WebKit::WebUIClient::showColorPicker):
(WebKit::WebUIClient::hideColorPicker):

  • UIProcess/WebUIClient.h:
  • UIProcess/mac/WebInspectorProxyMac.mm:

(WebKit::WebInspectorProxy::platformCreateInspectorPage):

  • WebProcess/InjectedBundle/API/c/WKBundle.cpp:

(WKBundleSetClient):

  • WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:

(WKBundlePageSetContextMenuClient):
(WKBundlePageSetEditorClient):
(WKBundlePageSetFormClient):
(WKBundlePageSetPageLoaderClient):
(WKBundlePageSetResourceLoadClient):
(WKBundlePageSetPolicyClient):
(WKBundlePageSetUIClient):
(WKBundlePageSetFullScreenClient):
(WKBundlePageSetDiagnosticLoggingClient):

  • WebProcess/InjectedBundle/InjectedBundle.cpp:

(WebKit::InjectedBundle::initializeClient):

  • WebProcess/InjectedBundle/InjectedBundle.h:
  • WebProcess/InjectedBundle/InjectedBundleClient.cpp:

(WebKit::InjectedBundleClient::didCreatePage):
(WebKit::InjectedBundleClient::willDestroyPage):
(WebKit::InjectedBundleClient::didInitializePageGroup):
(WebKit::InjectedBundleClient::didReceiveMessage):
(WebKit::InjectedBundleClient::didReceiveMessageToPage):

  • WebProcess/InjectedBundle/InjectedBundleClient.h:
  • WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp:

(WebKit::InjectedBundlePageContextMenuClient::getCustomMenuFromDefaultItems):

  • WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.h:
  • WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp:

(WebKit::InjectedBundlePageDiagnosticLoggingClient::logDiagnosticMessage):

  • WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.h:
  • WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp:

(WebKit::InjectedBundlePageEditorClient::shouldBeginEditing):
(WebKit::InjectedBundlePageEditorClient::shouldEndEditing):
(WebKit::InjectedBundlePageEditorClient::shouldInsertNode):
(WebKit::InjectedBundlePageEditorClient::shouldInsertText):
(WebKit::InjectedBundlePageEditorClient::shouldDeleteRange):
(WebKit::InjectedBundlePageEditorClient::shouldChangeSelectedRange):
(WebKit::InjectedBundlePageEditorClient::shouldApplyStyle):
(WebKit::InjectedBundlePageEditorClient::didBeginEditing):
(WebKit::InjectedBundlePageEditorClient::didEndEditing):
(WebKit::InjectedBundlePageEditorClient::didChange):
(WebKit::InjectedBundlePageEditorClient::didChangeSelection):
(WebKit::InjectedBundlePageEditorClient::willWriteToPasteboard):
(WebKit::InjectedBundlePageEditorClient::getPasteboardDataForRange):
(WebKit::InjectedBundlePageEditorClient::didWriteToPasteboard):

  • WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h:
  • WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp:

(WebKit::InjectedBundlePageFormClient::didFocusTextField):
(WebKit::InjectedBundlePageFormClient::textFieldDidBeginEditing):
(WebKit::InjectedBundlePageFormClient::textFieldDidEndEditing):
(WebKit::InjectedBundlePageFormClient::textDidChangeInTextField):
(WebKit::InjectedBundlePageFormClient::textDidChangeInTextArea):
(WebKit::InjectedBundlePageFormClient::shouldPerformActionInTextField):
(WebKit::InjectedBundlePageFormClient::willSendSubmitEvent):
(WebKit::InjectedBundlePageFormClient::willSubmitForm):
(WebKit::InjectedBundlePageFormClient::didAssociateFormControls):
(WebKit::InjectedBundlePageFormClient::shouldNotifyOnFormChanges):

  • WebProcess/InjectedBundle/InjectedBundlePageFormClient.h:
  • WebProcess/InjectedBundle/InjectedBundlePageFullScreenClient.h:
  • WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp:

(WebKit::InjectedBundlePageLoaderClient::willLoadURLRequest):
(WebKit::InjectedBundlePageLoaderClient::willLoadDataRequest):
(WebKit::InjectedBundlePageLoaderClient::shouldGoToBackForwardListItem):
(WebKit::InjectedBundlePageLoaderClient::didStartProvisionalLoadForFrame):
(WebKit::InjectedBundlePageLoaderClient::didReceiveServerRedirectForProvisionalLoadForFrame):
(WebKit::InjectedBundlePageLoaderClient::didFailProvisionalLoadWithErrorForFrame):
(WebKit::InjectedBundlePageLoaderClient::didCommitLoadForFrame):
(WebKit::InjectedBundlePageLoaderClient::didFinishDocumentLoadForFrame):
(WebKit::InjectedBundlePageLoaderClient::didFinishLoadForFrame):
(WebKit::InjectedBundlePageLoaderClient::didFinishProgress):
(WebKit::InjectedBundlePageLoaderClient::didFailLoadWithErrorForFrame):
(WebKit::InjectedBundlePageLoaderClient::didSameDocumentNavigationForFrame):
(WebKit::InjectedBundlePageLoaderClient::didReceiveTitleForFrame):
(WebKit::InjectedBundlePageLoaderClient::didRemoveFrameFromHierarchy):
(WebKit::InjectedBundlePageLoaderClient::didDisplayInsecureContentForFrame):
(WebKit::InjectedBundlePageLoaderClient::didRunInsecureContentForFrame):
(WebKit::InjectedBundlePageLoaderClient::didDetectXSSForFrame):
(WebKit::InjectedBundlePageLoaderClient::didFirstLayoutForFrame):
(WebKit::InjectedBundlePageLoaderClient::didFirstVisuallyNonEmptyLayoutForFrame):
(WebKit::InjectedBundlePageLoaderClient::didLayoutForFrame):
(WebKit::InjectedBundlePageLoaderClient::didLayout):
(WebKit::InjectedBundlePageLoaderClient::didClearWindowObjectForFrame):
(WebKit::InjectedBundlePageLoaderClient::didCancelClientRedirectForFrame):
(WebKit::InjectedBundlePageLoaderClient::willPerformClientRedirectForFrame):
(WebKit::InjectedBundlePageLoaderClient::didHandleOnloadEventsForFrame):
(WebKit::InjectedBundlePageLoaderClient::globalObjectIsAvailableForFrame):
(WebKit::InjectedBundlePageLoaderClient::willDisconnectDOMWindowExtensionFromGlobalObject):
(WebKit::InjectedBundlePageLoaderClient::didReconnectDOMWindowExtensionToGlobalObject):
(WebKit::InjectedBundlePageLoaderClient::willDestroyGlobalObjectForDOMWindowExtension):
(WebKit::InjectedBundlePageLoaderClient::shouldForceUniversalAccessFromLocalURL):
(WebKit::InjectedBundlePageLoaderClient::featuresUsedInPage):
(WebKit::InjectedBundlePageLoaderClient::willDestroyFrame):

  • WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h:
  • WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.cpp:

(WebKit::InjectedBundlePagePolicyClient::decidePolicyForNavigationAction):
(WebKit::InjectedBundlePagePolicyClient::decidePolicyForNewWindowAction):
(WebKit::InjectedBundlePagePolicyClient::decidePolicyForResponse):
(WebKit::InjectedBundlePagePolicyClient::unableToImplementPolicy):

  • WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.h:
  • WebProcess/InjectedBundle/InjectedBundlePageResourceLoadClient.cpp:

(WebKit::InjectedBundlePageResourceLoadClient::didInitiateLoadForResource):
(WebKit::InjectedBundlePageResourceLoadClient::willSendRequestForFrame):
(WebKit::InjectedBundlePageResourceLoadClient::didReceiveResponseForResource):
(WebKit::InjectedBundlePageResourceLoadClient::didReceiveContentLengthForResource):
(WebKit::InjectedBundlePageResourceLoadClient::didFinishLoadForResource):
(WebKit::InjectedBundlePageResourceLoadClient::didFailLoadForResource):
(WebKit::InjectedBundlePageResourceLoadClient::shouldCacheResponse):
(WebKit::InjectedBundlePageResourceLoadClient::shouldUseCredentialStorage):

  • WebProcess/InjectedBundle/InjectedBundlePageResourceLoadClient.h:
  • WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp:

(WebKit::InjectedBundlePageUIClient::willAddMessageToConsole):
(WebKit::InjectedBundlePageUIClient::willSetStatusbarText):
(WebKit::InjectedBundlePageUIClient::willRunJavaScriptAlert):
(WebKit::InjectedBundlePageUIClient::willRunJavaScriptConfirm):
(WebKit::InjectedBundlePageUIClient::willRunJavaScriptPrompt):
(WebKit::InjectedBundlePageUIClient::mouseDidMoveOverElement):
(WebKit::InjectedBundlePageUIClient::pageDidScroll):
(WebKit::InjectedBundlePageUIClient::shouldGenerateFileForUpload):
(WebKit::InjectedBundlePageUIClient::generateFileForUpload):
(WebKit::InjectedBundlePageUIClient::statusBarIsVisible):
(WebKit::InjectedBundlePageUIClient::menuBarIsVisible):
(WebKit::InjectedBundlePageUIClient::toolbarsAreVisible):
(WebKit::InjectedBundlePageUIClient::didReachApplicationCacheOriginQuota):
(WebKit::InjectedBundlePageUIClient::didExceedDatabaseQuota):
(WebKit::InjectedBundlePageUIClient::plugInStartLabelTitle):
(WebKit::InjectedBundlePageUIClient::plugInStartLabelSubtitle):
(WebKit::InjectedBundlePageUIClient::plugInExtraStyleSheet):
(WebKit::InjectedBundlePageUIClient::plugInExtraScript):

  • WebProcess/InjectedBundle/InjectedBundlePageUIClient.h:
  • WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::initializeInjectedBundleContextMenuClient):
(WebKit::WebPage::initializeInjectedBundleEditorClient):
(WebKit::WebPage::initializeInjectedBundleFormClient):
(WebKit::WebPage::initializeInjectedBundleLoaderClient):
(WebKit::WebPage::initializeInjectedBundlePolicyClient):
(WebKit::WebPage::initializeInjectedBundleResourceLoadClient):
(WebKit::WebPage::initializeInjectedBundleUIClient):
(WebKit::WebPage::initializeInjectedBundleFullScreenClient):
(WebKit::WebPage::initializeInjectedBundleDiagnosticLoggingClient):

  • WebProcess/WebPage/WebPage.h:
Location:
trunk/Source/WebKit2
Files:
91 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r159985 r159988  
     12013-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
    13492013-12-02  Enrica Casucci  <enrica@apple.com>
    2350
  • trunk/Source/WebKit2/Shared/API/c/WKConnectionRef.cpp

    r100336 r159988  
    3939void WKConnectionSetConnectionClient(WKConnectionRef connectionRef, const WKConnectionClient* wkClient)
    4040{
    41     toImpl(connectionRef)->initializeConnectionClient(wkClient);
     41    toImpl(connectionRef)->initializeConnectionClient(reinterpret_cast<const WKConnectionClientBase*>(wkClient));
    4242}
    4343
  • trunk/Source/WebKit2/Shared/WebConnection.cpp

    r159163 r159988  
    4242}
    4343
    44 void WebConnection::initializeConnectionClient(const WKConnectionClient* client)
     44void WebConnection::initializeConnectionClient(const WKConnectionClientBase* client)
    4545{
    4646    m_client.initialize(client);
  • trunk/Source/WebKit2/Shared/WebConnection.h

    r159197 r159988  
    3939    virtual ~WebConnection();
    4040
    41     void initializeConnectionClient(const WKConnectionClient*);
     41    void initializeConnectionClient(const WKConnectionClientBase*);
    4242    void postMessage(const String&, API::Object*);
    4343    void didClose();
  • trunk/Source/WebKit2/Shared/WebConnectionClient.cpp

    r159163 r159988  
    3838        return;
    3939   
    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);
    4141}
    4242
     
    4646        return;
    4747   
    48     m_client.didClose(toAPI(connection), m_client.clientInfo);
     48    m_client.didClose(toAPI(connection), m_client.base.clientInfo);
    4949}
    5050
  • trunk/Source/WebKit2/Shared/WebConnectionClient.h

    r159163 r159988  
    3131#include <wtf/Forward.h>
    3232
     33template<> struct API::ClientTraits<WKConnectionClientBase> {
     34    typedef std::tuple<WKConnectionClientV0> Versions;
     35};
     36
    3337namespace API {
    3438class Object;
     
    3943class WebConnection;
    4044
    41 class WebConnectionClient : public APIClient<WKConnectionClient, WKConnectionClientCurrentVersion> {
     45class WebConnectionClient : public API::Client<WKConnectionClientBase> {
    4246public:
    4347    void didReceiveMessage(WebConnection*, const String&, API::Object*);
  • trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp

    r159333 r159988  
    8383void WKContextSetClient(WKContextRef contextRef, const WKContextClient* wkClient)
    8484{
    85     toImpl(contextRef)->initializeClient(wkClient);
     85    toImpl(contextRef)->initializeClient(reinterpret_cast<const WKContextClientBase*>(wkClient));
    8686}
    8787
    8888void WKContextSetInjectedBundleClient(WKContextRef contextRef, const WKContextInjectedBundleClient* wkClient)
    8989{
    90     toImpl(contextRef)->initializeInjectedBundleClient(wkClient);
     90    toImpl(contextRef)->initializeInjectedBundleClient(reinterpret_cast<const WKContextInjectedBundleClientBase*>(wkClient));
    9191}
    9292
    9393void WKContextSetHistoryClient(WKContextRef contextRef, const WKContextHistoryClient* wkClient)
    9494{
    95     toImpl(contextRef)->initializeHistoryClient(wkClient);
     95    toImpl(contextRef)->initializeHistoryClient(reinterpret_cast<const WKContextHistoryClientBase*>(wkClient));
    9696}
    9797
    9898void WKContextSetDownloadClient(WKContextRef contextRef, const WKContextDownloadClient* wkClient)
    9999{
    100     toImpl(contextRef)->initializeDownloadClient(wkClient);
     100    toImpl(contextRef)->initializeDownloadClient(reinterpret_cast<const WKContextDownloadClientBase*>(wkClient));
    101101}
    102102
    103103void WKContextSetConnectionClient(WKContextRef contextRef, const WKContextConnectionClient* wkClient)
    104104{
    105     toImpl(contextRef)->initializeConnectionClient(wkClient);
     105    toImpl(contextRef)->initializeConnectionClient(reinterpret_cast<const WKContextConnectionClientBase*>(wkClient));
    106106}
    107107
  • trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.cpp

    r95901 r159988  
    3939void WKCookieManagerSetClient(WKCookieManagerRef cookieManagerRef, const WKCookieManagerClient* wkClient)
    4040{
    41     toImpl(cookieManagerRef)->initializeClient(wkClient);
     41    toImpl(cookieManagerRef)->initializeClient(reinterpret_cast<const WKCookieManagerClientBase*>(wkClient));
    4242}
    4343
  • trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.cpp

    r159333 r159988  
    126126    if (wkClient && wkClient->version)
    127127        return;
    128     toImpl(databaseManagerRef)->initializeClient(wkClient);
     128    toImpl(databaseManagerRef)->initializeClient(reinterpret_cast<const WKDatabaseManagerClientBase*>(wkClient));
    129129#else
    130130    UNUSED_PARAM(databaseManagerRef);
  • trunk/Source/WebKit2/UIProcess/API/C/WKGeolocationManager.cpp

    r129536 r159988  
    3939void WKGeolocationManagerSetProvider(WKGeolocationManagerRef geolocationManagerRef, const WKGeolocationProvider* wkProvider)
    4040{
    41     toImpl(geolocationManagerRef)->initializeProvider(wkProvider);
     41    toImpl(geolocationManagerRef)->initializeProvider(reinterpret_cast<const WKGeolocationProviderBase*>(wkProvider));
    4242}
    4343
  • trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.cpp

    r95901 r159988  
    3939void WKIconDatabaseSetIconDatabaseClient(WKIconDatabaseRef iconDatabaseRef, const WKIconDatabaseClient* wkClient)
    4040{
    41     toImpl(iconDatabaseRef)->initializeIconDatabaseClient(wkClient);
     41    toImpl(iconDatabaseRef)->initializeIconDatabaseClient(reinterpret_cast<const WKIconDatabaseClientBase*>(wkClient));
    4242}
    4343
  • trunk/Source/WebKit2/UIProcess/API/C/WKNotificationManager.cpp

    r105364 r159988  
    3939void WKNotificationManagerSetProvider(WKNotificationManagerRef managerRef, const WKNotificationProvider* wkProvider)
    4040{
    41     toImpl(managerRef)->initializeProvider(wkProvider);
     41    toImpl(managerRef)->initializeProvider(reinterpret_cast<const WKNotificationProviderBase*>(wkProvider));
    4242}
    4343
  • trunk/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.cpp

    r157595 r159988  
    6464void WKOriginDataManagerSetChangeClient(WKOriginDataManagerRef originDataManagerRef, const WKOriginDataManagerChangeClient *client)
    6565{
    66     toImpl(originDataManagerRef)->setChangeClient(client);
     66    toImpl(originDataManagerRef)->setChangeClient(reinterpret_cast<const WKOriginDataManagerChangeClientBase*>(client));
    6767}
  • trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp

    r159965 r159988  
    633633{
    634634#if ENABLE(CONTEXT_MENUS)
    635     toImpl(pageRef)->initializeContextMenuClient(wkClient);
     635    toImpl(pageRef)->initializeContextMenuClient(reinterpret_cast<const WKPageContextMenuClientBase*>(wkClient));
    636636#endif
    637637}
     
    639639void WKPageSetPageFindClient(WKPageRef pageRef, const WKPageFindClient* wkClient)
    640640{
    641     toImpl(pageRef)->initializeFindClient(wkClient);
     641    toImpl(pageRef)->initializeFindClient(reinterpret_cast<const WKPageFindClientBase*>(wkClient));
    642642}
    643643
    644644void WKPageSetPageFindMatchesClient(WKPageRef pageRef, const WKPageFindMatchesClient* wkClient)
    645645{
    646     toImpl(pageRef)->initializeFindMatchesClient(wkClient);
     646    toImpl(pageRef)->initializeFindMatchesClient(reinterpret_cast<const WKPageFindMatchesClientBase*>(wkClient));
    647647}
    648648
    649649void WKPageSetPageFormClient(WKPageRef pageRef, const WKPageFormClient* wkClient)
    650650{
    651     toImpl(pageRef)->initializeFormClient(wkClient);
     651    toImpl(pageRef)->initializeFormClient(reinterpret_cast<const WKPageFormClientBase*>(wkClient));
    652652}
    653653
     
    659659void WKPageSetPagePolicyClient(WKPageRef pageRef, const WKPagePolicyClient* wkClient)
    660660{
    661     toImpl(pageRef)->initializePolicyClient(wkClient);
     661    toImpl(pageRef)->initializePolicyClient(reinterpret_cast<const WKPagePolicyClientBase*>(wkClient));
    662662}
    663663
    664664void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClient* wkClient)
    665665{
    666     toImpl(pageRef)->initializeUIClient(wkClient);
     666    toImpl(pageRef)->initializeUIClient(reinterpret_cast<const WKPageUIClientBase*>(wkClient));
    667667}
    668668
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm

    r159965 r159988  
    543543    };
    544544
    545     page.initializePolicyClient(&policyClient);
     545    page.initializePolicyClient(reinterpret_cast<const WKPagePolicyClientBase*>(&policyClient));
    546546}
    547547
  • trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp

    r159903 r159988  
    6363}
    6464
    65 void WebNotificationManagerProxy::initializeProvider(const WKNotificationProvider *provider)
     65void WebNotificationManagerProxy::initializeProvider(const WKNotificationProviderBase* provider)
    6666{
    6767    m_provider.initialize(provider);
  • trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h

    r159234 r159988  
    5454    static PassRefPtr<WebNotificationManagerProxy> create(WebContext*);
    5555
    56     void initializeProvider(const WKNotificationProvider*);
     56    void initializeProvider(const WKNotificationProviderBase*);
    5757    void populateCopyOfNotificationPermissions(HashMap<String, bool>&);
    5858
  • trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.cpp

    r159234 r159988  
    4242        return;
    4343   
    44     m_client.show(toAPI(page), toAPI(notification), m_client.clientInfo);
     44    m_client.show(toAPI(page), toAPI(notification), m_client.base.clientInfo);
    4545}
    4646
     
    5050        return;
    5151   
    52     m_client.cancel(toAPI(notification), m_client.clientInfo);
     52    m_client.cancel(toAPI(notification), m_client.base.clientInfo);
    5353}
    5454
     
    5858        return;
    5959   
    60     m_client.didDestroyNotification(toAPI(notification), m_client.clientInfo);
     60    m_client.didDestroyNotification(toAPI(notification), m_client.base.clientInfo);
    6161}
    6262
     
    7272        arrayIDs.uncheckedAppend(WebUInt64::create(notificationID));
    7373
    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);
    7575}
    7676
     
    8080        return;
    8181   
    82     m_client.addNotificationManager(toAPI(manager), m_client.clientInfo);
     82    m_client.addNotificationManager(toAPI(manager), m_client.base.clientInfo);
    8383}
    8484
     
    8888        return;
    8989   
    90     m_client.removeNotificationManager(toAPI(manager), m_client.clientInfo);
     90    m_client.removeNotificationManager(toAPI(manager), m_client.base.clientInfo);
    9191}
    9292
     
    9696        return ImmutableDictionary::create();
    9797
    98     return adoptRef(toImpl(m_client.notificationPermissions(m_client.clientInfo)));
     98    return adoptRef(toImpl(m_client.notificationPermissions(m_client.base.clientInfo)));
    9999}
    100100
  • trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.h

    r106592 r159988  
    3232#include <wtf/Vector.h>
    3333
     34template<> struct API::ClientTraits<WKNotificationProviderBase> {
     35    typedef std::tuple<WKNotificationProviderV0> Versions;
     36};
     37
    3438namespace WebKit {
    3539
     
    4044class WebSecurityOrigin;
    4145   
    42 class WebNotificationProvider : public APIClient<WKNotificationProvider, kWKNotificationProviderCurrentVersion> {
     46class WebNotificationProvider : public API::Client<WKNotificationProviderBase> {
    4347public:
    4448    void show(WebPageProxy*, WebNotification*);
  • trunk/Source/WebKit2/UIProcess/WebContext.cpp

    r159908 r159988  
    256256}
    257257
    258 void WebContext::initializeClient(const WKContextClient* client)
     258void WebContext::initializeClient(const WKContextClientBase* client)
    259259{
    260260    m_client.initialize(client);
    261261}
    262262
    263 void WebContext::initializeInjectedBundleClient(const WKContextInjectedBundleClient* client)
     263void WebContext::initializeInjectedBundleClient(const WKContextInjectedBundleClientBase* client)
    264264{
    265265    m_injectedBundleClient.initialize(client);
    266266}
    267267
    268 void WebContext::initializeConnectionClient(const WKContextConnectionClient* client)
     268void WebContext::initializeConnectionClient(const WKContextConnectionClientBase* client)
    269269{
    270270    m_connectionClient.initialize(client);
    271271}
    272272
    273 void WebContext::initializeHistoryClient(const WKContextHistoryClient* client)
     273void WebContext::initializeHistoryClient(const WKContextHistoryClientBase* client)
    274274{
    275275    m_historyClient.initialize(client);
     
    278278}
    279279
    280 void WebContext::initializeDownloadClient(const WKContextDownloadClient* client)
     280void WebContext::initializeDownloadClient(const WKContextDownloadClientBase* client)
    281281{
    282282    m_downloadClient.initialize(client);
  • trunk/Source/WebKit2/UIProcess/WebContext.h

    r159903 r159988  
    127127    bool dispatchSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&);
    128128
    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*);
    134134
    135135    void setProcessModel(ProcessModel); // Can only be called when there are no processes running.
  • trunk/Source/WebKit2/UIProcess/WebContextClient.cpp

    r159234 r159988  
    3737        return;
    3838
    39     m_client.plugInAutoStartOriginHashesChanged(toAPI(context), m_client.clientInfo);
     39    m_client.plugInAutoStartOriginHashesChanged(toAPI(context), m_client.base.clientInfo);
    4040}
    4141
     
    4545        return;
    4646
    47     m_client.networkProcessDidCrash(toAPI(context), m_client.clientInfo);
     47    m_client.networkProcessDidCrash(toAPI(context), m_client.base.clientInfo);
    4848}
    4949
     
    5656    plugInInfo->ref();
    5757
    58     m_client.plugInInformationBecameAvailable(toAPI(context), toAPI(plugInInfo), m_client.clientInfo);
     58    m_client.plugInInformationBecameAvailable(toAPI(context), toAPI(plugInInfo), m_client.base.clientInfo);
    5959}
    6060
  • trunk/Source/WebKit2/UIProcess/WebContextClient.h

    r159234 r159988  
    3030#include "WKContext.h"
    3131
     32template<> struct API::ClientTraits<WKContextClientBase> {
     33    typedef std::tuple<WKContextClientV0> Versions;
     34};
     35
    3236namespace API {
    3337class Array;
     
    3842class WebContext;
    3943
    40 class WebContextClient : public APIClient<WKContextClient, kWKContextClientCurrentVersion> {
     44class WebContextClient : public API::Client<WKContextClientBase> {
    4145public:
    4246    void plugInAutoStartOriginHashesChanged(WebContext*);
  • trunk/Source/WebKit2/UIProcess/WebContextConnectionClient.cpp

    r100378 r159988  
    3636        return;
    3737
    38     m_client.didCreateConnection(toAPI(context), toAPI(connection), m_client.clientInfo);
     38    m_client.didCreateConnection(toAPI(context), toAPI(connection), m_client.base.clientInfo);
    3939}
    4040
  • trunk/Source/WebKit2/UIProcess/WebContextConnectionClient.h

    r100378 r159988  
    3030#include "WKContext.h"
    3131
     32template<> struct API::ClientTraits<WKContextConnectionClientBase> {
     33    typedef std::tuple<WKContextConnectionClientV0> Versions;
     34};
     35
    3236namespace WebKit {
    3337
     
    3539class WebContext;
    3640
    37 class WebContextConnectionClient : public APIClient<WKContextConnectionClient, kWKContextConnectionClientCurrentVersion> {
     41class WebContextConnectionClient : public API::Client<WKContextConnectionClientBase> {
    3842public:
    3943    void didCreateConnection(WebContext*, WebConnection*);
  • trunk/Source/WebKit2/UIProcess/WebContextInjectedBundleClient.cpp

    r159163 r159988  
    3939        return;
    4040
    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);
    4242}
    4343
     
    4848
    4949    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);
    5151    returnData = adoptRef(toImpl(returnDataRef));
    5252}
     
    5757        return 0;
    5858
    59     return toImpl(m_client.getInjectedBundleInitializationUserData(toAPI(context), m_client.clientInfo));
     59    return toImpl(m_client.getInjectedBundleInitializationUserData(toAPI(context), m_client.base.clientInfo));
    6060}
    6161
  • trunk/Source/WebKit2/UIProcess/WebContextInjectedBundleClient.h

    r159163 r159988  
    3131#include <wtf/Forward.h>
    3232
     33template<> struct API::ClientTraits<WKContextInjectedBundleClientBase> {
     34    typedef std::tuple<WKContextInjectedBundleClientV0, WKContextInjectedBundleClientV1> Versions;
     35};
     36
    3337namespace API {
    3438class Object;
     
    3943class WebContext;
    4044
    41 class WebContextInjectedBundleClient : public APIClient<WKContextInjectedBundleClient, kWKContextInjectedBundleClientCurrentVersion> {
     45class WebContextInjectedBundleClient : public API::Client<WKContextInjectedBundleClientBase> {
    4246public:
    4347    void didReceiveMessageFromInjectedBundle(WebContext*, const String&, API::Object*);
  • trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp

    r159234 r159988  
    5959}
    6060
    61 void WebCookieManagerProxy::initializeClient(const WKCookieManagerClient* client)
     61void WebCookieManagerProxy::initializeClient(const WKCookieManagerClientBase* client)
    6262{
    6363    m_client.initialize(client);
  • trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.h

    r159234 r159988  
    5959    virtual ~WebCookieManagerProxy();
    6060
    61     void initializeClient(const WKCookieManagerClient*);
     61    void initializeClient(const WKCookieManagerClientBase*);
    6262   
    6363    void getHostnamesWithCookies(PassRefPtr<ArrayCallback>);
  • trunk/Source/WebKit2/UIProcess/WebCookieManagerProxyClient.cpp

    r95901 r159988  
    3636        return;
    3737
    38     m_client.cookiesDidChange(toAPI(cookieManager), m_client.clientInfo);
     38    m_client.cookiesDidChange(toAPI(cookieManager), m_client.base.clientInfo);
    3939}
    4040
  • trunk/Source/WebKit2/UIProcess/WebCookieManagerProxyClient.h

    r95901 r159988  
    3131#include <wtf/Forward.h>
    3232
     33template<> struct API::ClientTraits<WKCookieManagerClientBase> {
     34    typedef std::tuple<WKCookieManagerClientV0> Versions;
     35};
     36
    3337namespace WebKit {
    3438
    3539class WebCookieManagerProxy;
    3640
    37 class WebCookieManagerProxyClient : public APIClient<WKCookieManagerClient, kWKCookieManagerClientCurrentVersion> {
     41class WebCookieManagerProxyClient : public API::Client<WKCookieManagerClientBase> {
    3842public:
    3943    void cookiesDidChange(WebCookieManagerProxy*);
  • trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp

    r159234 r159988  
    108108}
    109109
    110 void WebDatabaseManagerProxy::initializeClient(const WKDatabaseManagerClient* client)
     110void WebDatabaseManagerProxy::initializeClient(const WKDatabaseManagerClientBase* client)
    111111{
    112112    m_client.initialize(client);
  • trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h

    r159197 r159988  
    5454    virtual ~WebDatabaseManagerProxy();
    5555
    56     void initializeClient(const WKDatabaseManagerClient*);
     56    void initializeClient(const WKDatabaseManagerClientBase*);
    5757
    5858    void getDatabasesByOrigin(PassRefPtr<ArrayCallback>);
  • trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxyClient.cpp

    r95901 r159988  
    3636        return;
    3737
    38     m_client.didModifyOrigin(toAPI(databaseManager), toAPI(origin), m_client.clientInfo);
     38    m_client.didModifyOrigin(toAPI(databaseManager), toAPI(origin), m_client.base.clientInfo);
    3939}
    4040
     
    4444        return;
    4545
    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);
    4747}
    4848
  • trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxyClient.h

    r95901 r159988  
    3131#include <wtf/Forward.h>
    3232
     33template<> struct API::ClientTraits<WKDatabaseManagerClientBase> {
     34    typedef std::tuple<WKDatabaseManagerClientV0> Versions;
     35};
     36
    3337namespace WebKit {
    3438
     
    3640class WebSecurityOrigin;
    3741
    38 class WebDatabaseManagerProxyClient : public APIClient<WKDatabaseManagerClient, kWKDatabaseManagerClientCurrentVersion> {
     42class WebDatabaseManagerProxyClient : public API::Client<WKDatabaseManagerClientBase> {
    3943public:
    4044    void didModifyOrigin(WebDatabaseManagerProxy*, WebSecurityOrigin*);
  • trunk/Source/WebKit2/UIProcess/WebDownloadClient.cpp

    r95901 r159988  
    4040        return;
    4141
    42     m_client.didStart(toAPI(webContext), toAPI(downloadProxy), m_client.clientInfo);
     42    m_client.didStart(toAPI(webContext), toAPI(downloadProxy), m_client.base.clientInfo);
    4343}
    4444
     
    4848        return;
    4949
    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);
    5151}
    5252
     
    5656        return;
    5757
    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);
    5959}
    6060
     
    6464        return;
    6565
    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);
    6767}
    6868
     
    7272        return true;
    7373
    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);
    7575}
    7676
     
    8080        return String();
    8181
    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));
    8383    return toWTFString(destination.get());
    8484}
     
    8989        return;
    9090
    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);
    9292}
    9393
     
    9797        return;
    9898   
    99     m_client.didFinish(toAPI(webContext), toAPI(downloadProxy), m_client.clientInfo);
     99    m_client.didFinish(toAPI(webContext), toAPI(downloadProxy), m_client.base.clientInfo);
    100100}
    101101
     
    105105        return;
    106106
    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);
    108108}
    109109
     
    113113        return;
    114114
    115     m_client.didCancel(toAPI(webContext), toAPI(downloadProxy), m_client.clientInfo);
     115    m_client.didCancel(toAPI(webContext), toAPI(downloadProxy), m_client.base.clientInfo);
    116116}
    117117
     
    121121        return;
    122122
    123     m_client.processDidCrash(toAPI(webContext), toAPI(downloadProxy), m_client.clientInfo);
     123    m_client.processDidCrash(toAPI(webContext), toAPI(downloadProxy), m_client.base.clientInfo);
    124124}
    125125
  • trunk/Source/WebKit2/UIProcess/WebDownloadClient.h

    r95901 r159988  
    3131#include <wtf/Forward.h>
    3232
     33template<> struct API::ClientTraits<WKContextDownloadClientBase> {
     34    typedef std::tuple<WKContextDownloadClientV0> Versions;
     35};
     36
    3337namespace WebCore {
    3438    class ResourceError;
     
    4246class WebContext;
    4347
    44 class WebDownloadClient : public APIClient<WKContextDownloadClient, kWKContextDownloadClientCurrentVersion> {
     48class WebDownloadClient : public API::Client<WKContextDownloadClientBase> {
    4549public:
    4650    void didStart(WebContext*, DownloadProxy*);
  • trunk/Source/WebKit2/UIProcess/WebFindClient.cpp

    r159234 r159988  
    3636        return;
    3737
    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);
    3939
    4040}
     
    4545        return;
    4646   
    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);
    4848}
    4949
     
    5353        return;
    5454
    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);
    5656}
    5757
     
    6161        return;
    6262
    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);
    6464}
    6565
     
    6868    if (!m_client.didGetImageForMatchResult)
    6969        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);
    7171}
    7272
  • trunk/Source/WebKit2/UIProcess/WebFindClient.h

    r159234 r159988  
    3131#include <wtf/Forward.h>
    3232
     33template<> struct API::ClientTraits<WKPageFindClientBase> {
     34    typedef std::tuple<WKPageFindClientV0> Versions;
     35};
     36
     37template<> struct API::ClientTraits<WKPageFindMatchesClientBase> {
     38    typedef std::tuple<WKPageFindMatchesClientV0> Versions;
     39};
     40
    3341namespace API {
    3442class Array;
     
    4048class WebImage;
    4149
    42 class WebFindClient : public APIClient<WKPageFindClient, kWKPageFindClientCurrentVersion> {
     50class WebFindClient : public API::Client<WKPageFindClientBase> {
    4351public:
    4452    void didFindString(WebPageProxy*, const String&, uint32_t matchCount);
     
    4755};
    4856
    49 class WebFindMatchesClient : public APIClient<WKPageFindMatchesClient, kWKPageFindMatchesClientCurrentVersion> {
     57class WebFindMatchesClient : public API::Client<WKPageFindMatchesClientBase> {
    5058public:
    5159    void didFindStringMatches(WebPageProxy*, const String&, API::Array*, int);
  • trunk/Source/WebKit2/UIProcess/WebFormClient.cpp

    r159163 r159988  
    4444    RefPtr<ImmutableDictionary> textFieldsMap = ImmutableDictionary::adopt(map);
    4545
    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);
    4747    return true;
    4848}
  • trunk/Source/WebKit2/UIProcess/WebFormClient.h

    r159163 r159988  
    3333#include <wtf/Vector.h>
    3434
     35template<> struct API::ClientTraits<WKPageFormClientBase> {
     36    typedef std::tuple<WKPageFormClientV0> Versions;
     37};
     38
    3539namespace API {
    3640class Object;
     
    4347class WebFormSubmissionListenerProxy;
    4448
    45 class WebFormClient : public APIClient<WKPageFormClient, kWKPageFormClientCurrentVersion> {
     49class WebFormClient : public API::Client<WKPageFormClientBase> {
    4650public:
    4751    bool willSubmitForm(WebPageProxy*, WebFrameProxy*, WebFrameProxy*, const Vector<std::pair<String, String>>& textFieldValues, API::Object* userData, WebFormSubmissionListenerProxy*);
  • trunk/Source/WebKit2/UIProcess/WebGeolocationManagerProxy.cpp

    r159724 r159988  
    4949}
    5050
    51 void WebGeolocationManagerProxy::initializeProvider(const WKGeolocationProvider* provider)
     51void WebGeolocationManagerProxy::initializeProvider(const WKGeolocationProviderBase* provider)
    5252{
    5353    m_provider.initialize(provider);
  • trunk/Source/WebKit2/UIProcess/WebGeolocationManagerProxy.h

    r159724 r159988  
    4646    static PassRefPtr<WebGeolocationManagerProxy> create(WebContext*);
    4747
    48     void initializeProvider(const WKGeolocationProvider*);
     48    void initializeProvider(const WKGeolocationProviderBase*);
    4949
    5050    void providerDidChangePosition(WebGeolocationPosition*);
  • trunk/Source/WebKit2/UIProcess/WebGeolocationProvider.cpp

    r158689 r159988  
    3737        return;
    3838
    39     m_client.startUpdating(toAPI(geolocationManager), m_client.clientInfo);
     39    m_client.startUpdating(toAPI(geolocationManager), m_client.base.clientInfo);
    4040}
    4141
     
    4545        return;
    4646
    47     m_client.stopUpdating(toAPI(geolocationManager), m_client.clientInfo);
     47    m_client.stopUpdating(toAPI(geolocationManager), m_client.base.clientInfo);
    4848}
    4949
     
    5353        return;
    5454
    55     m_client.setEnableHighAccuracy(toAPI(geolocationManager), enabled, m_client.clientInfo);
     55    m_client.setEnableHighAccuracy(toAPI(geolocationManager), enabled, m_client.base.clientInfo);
    5656}
    5757
  • trunk/Source/WebKit2/UIProcess/WebGeolocationProvider.h

    r158689 r159988  
    3131#include <wtf/Forward.h>
    3232
     33template<> struct API::ClientTraits<WKGeolocationProviderBase> {
     34    typedef std::tuple<WKGeolocationProviderV0, WKGeolocationProviderV1> Versions;
     35};
     36
    3337namespace WebKit {
    3438
    3539class WebGeolocationManagerProxy;
    3640
    37 class WebGeolocationProvider : public APIClient<WKGeolocationProvider, kWKGeolocationProviderCurrentVersion> {
     41class WebGeolocationProvider : public API::Client<WKGeolocationProviderBase> {
    3842public:
    3943    void startUpdating(WebGeolocationManagerProxy*);
  • trunk/Source/WebKit2/UIProcess/WebHistoryClient.cpp

    r159461 r159988  
    4141
    4242    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);
    4444}
    4545
     
    4949        return;
    5050
    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);
    5252}
    5353
     
    5757        return;
    5858
    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);
    6060}
    6161
     
    6565        return;
    6666
    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);
    6868}
    6969
     
    7373        return;
    7474
    75     m_client.populateVisitedLinks(toAPI(context), m_client.clientInfo);
     75    m_client.populateVisitedLinks(toAPI(context), m_client.base.clientInfo);
    7676}
    7777
  • trunk/Source/WebKit2/UIProcess/WebHistoryClient.h

    r95901 r159988  
    3131#include <wtf/Forward.h>
    3232
     33template<> struct API::ClientTraits<WKContextHistoryClientBase> {
     34    typedef std::tuple<WKContextHistoryClientV0> Versions;
     35};
     36
    3337namespace WebKit {
    3438
     
    3842struct WebNavigationDataStore;
    3943
    40 class WebHistoryClient : public APIClient<WKContextHistoryClient, kWKContextHistoryClientCurrentVersion> {
     44class WebHistoryClient : public API::Client<WKContextHistoryClientBase> {
    4145public:
    4246    void didNavigateWithNavigationData(WebContext*, WebPageProxy*, const WebNavigationDataStore&, WebFrameProxy*);
  • trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp

    r158101 r159988  
    239239}
    240240
    241 void WebIconDatabase::initializeIconDatabaseClient(const WKIconDatabaseClient* client)
     241void WebIconDatabase::initializeIconDatabaseClient(const WKIconDatabaseClientBase* client)
    242242{
    243243    m_iconDatabaseClient.initialize(client);
  • trunk/Source/WebKit2/UIProcess/WebIconDatabase.h

    r159197 r159988  
    8686    void close();
    8787
    88     void initializeIconDatabaseClient(const WKIconDatabaseClient*);
     88    void initializeIconDatabaseClient(const WKIconDatabaseClientBase*);
    8989
    9090    void setPrivateBrowsingEnabled(bool);
  • trunk/Source/WebKit2/UIProcess/WebIconDatabaseClient.cpp

    r129742 r159988  
    3737        return;
    3838   
    39     m_client.didChangeIconForPageURL(toAPI(iconDatabase), toAPI(url), m_client.clientInfo);
     39    m_client.didChangeIconForPageURL(toAPI(iconDatabase), toAPI(url), m_client.base.clientInfo);
    4040}
    4141
     
    4545        return;
    4646   
    47     m_client.didRemoveAllIcons(toAPI(iconDatabase),  m_client.clientInfo);
     47    m_client.didRemoveAllIcons(toAPI(iconDatabase),  m_client.base.clientInfo);
    4848}
    4949
     
    5353        return;
    5454
    55     m_client.iconDataReadyForPageURL(toAPI(iconDatabase), toAPI(url), m_client.clientInfo);
     55    m_client.iconDataReadyForPageURL(toAPI(iconDatabase), toAPI(url), m_client.base.clientInfo);
    5656}
    5757
  • trunk/Source/WebKit2/UIProcess/WebIconDatabaseClient.h

    r159163 r159988  
    3030#include "WKIconDatabase.h"
    3131
     32template<> struct API::ClientTraits<WKIconDatabaseClientBase> {
     33    typedef std::tuple<WKIconDatabaseClientV0, WKIconDatabaseClientV1> Versions;
     34};
     35
    3236namespace WebKit {
    3337
     
    3539class WebURL;
    3640
    37 class WebIconDatabaseClient : public APIClient<WKIconDatabaseClient, kWKIconDatabaseClientCurrentVersion> {
     41class WebIconDatabaseClient : public API::Client<WKIconDatabaseClientBase> {
    3842public:
    3943    void didChangeIconForPageURL(WebIconDatabase*, WebURL*);
  • trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp

    r159903 r159988  
    450450    };
    451451
    452     inspectorPage->initializePolicyClient(&policyClient);
     452    inspectorPage->initializePolicyClient(reinterpret_cast<const WKPagePolicyClientBase*>(&policyClient));
    453453
    454454    String url = inspectorPageURL();
  • trunk/Source/WebKit2/UIProcess/WebLoaderClient.h

    r159965 r159988  
    3636#include <wtf/Vector.h>
    3737
    38 namespace API {
    39 class Object;
    40 
    41 template<> struct ClientTraits<WKPageLoaderClientBase> {
     38template<> struct API::ClientTraits<WKPageLoaderClientBase> {
    4239    typedef std::tuple<WKPageLoaderClientV0, WKPageLoaderClientV1, WKPageLoaderClientV2, WKPageLoaderClientV3> Versions;
    4340};
    4441
     42namespace API {
     43class Object;
    4544}
    4645
  • trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.cpp

    r159163 r159988  
    140140}
    141141
    142 void WebOriginDataManagerProxy::setChangeClient(const WKOriginDataManagerChangeClient *client)
     142void WebOriginDataManagerProxy::setChangeClient(const WKOriginDataManagerChangeClientBase *client)
    143143{
    144144    m_client.initialize(client);
  • trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.h

    r159234 r159988  
    6161    void startObservingChanges(WKOriginDataTypes);
    6262    void stopObservingChanges(WKOriginDataTypes);
    63     void setChangeClient(const WKOriginDataManagerChangeClient*);
     63    void setChangeClient(const WKOriginDataManagerChangeClientBase*);
    6464
    6565    using API::Object::ref;
  • trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxyChangeClient.cpp

    r157595 r159988  
    3636        return;
    3737
    38     m_client.didChange(toAPI(originDataManager), m_client.clientInfo);
     38    m_client.didChange(toAPI(originDataManager), m_client.base.clientInfo);
    3939}
    4040
  • trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxyChangeClient.h

    r157595 r159988  
    3131#include <wtf/Forward.h>
    3232
     33template<> struct API::ClientTraits<WKOriginDataManagerChangeClientBase> {
     34    typedef std::tuple<WKOriginDataManagerChangeClientV0> Versions;
     35};
     36
    3337namespace WebKit {
    3438
    3539class WebOriginDataManagerProxy;
    3640
    37 class WebOriginDataManagerProxyChangeClient : public APIClient<WKOriginDataManagerChangeClient, kWKOriginDataManagerChangeClientVersion> {
     41class WebOriginDataManagerProxyChangeClient : public API::Client<WKOriginDataManagerChangeClientBase> {
    3842public:
    3943    void didChange(WebOriginDataManagerProxy*);
  • trunk/Source/WebKit2/UIProcess/WebPageContextMenuClient.cpp

    r159234 r159988  
    4343        return false;
    4444
    45     if (m_client.version >= 2 && !m_client.getContextMenuFromProposedMenu)
     45    if (m_client.base.version >= 2 && !m_client.getContextMenuFromProposedMenu)
    4646        return false;
    4747
     
    5353
    5454    WKArrayRef newMenu = nullptr;
    55     if (m_client.version >= 2) {
     55    if (m_client.base.version >= 2) {
    5656        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);
    5858    } 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);
    6060
    6161    RefPtr<API::Array> array = adoptRef(toImpl(newMenu));
     
    8383
    8484    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);
    8686}
    8787
     
    9191        return;
    9292   
    93     m_client.contextMenuDismissed(toAPI(page), m_client.clientInfo);
     93    m_client.contextMenuDismissed(toAPI(page), m_client.base.clientInfo);
    9494}
    9595
     
    105105        menuItems.uncheckedAppend(WebContextMenuItem::create(menuItem));
    106106
    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);
    108108
    109109    return true;
     
    115115        return false;
    116116
    117     m_client.hideContextMenu(toAPI(page), m_client.clientInfo);
     117    m_client.hideContextMenu(toAPI(page), m_client.base.clientInfo);
    118118
    119119    return true;
  • trunk/Source/WebKit2/UIProcess/WebPageContextMenuClient.h

    r159163 r159988  
    3535#include <wtf/Vector.h>
    3636
     37template<> struct API::ClientTraits<WKPageContextMenuClientBase> {
     38    typedef std::tuple<WKPageContextMenuClientV0, WKPageContextMenuClientV1, WKPageContextMenuClientV2, WKPageContextMenuClientV3> Versions;
     39};
     40
    3741namespace WebKit {
    3842
     
    4044class WebPageProxy;
    4145
    42 class WebPageContextMenuClient : public APIClient<WKPageContextMenuClient, kWKPageContextMenuClientCurrentVersion> {
     46class WebPageContextMenuClient : public API::Client<WKPageContextMenuClientBase> {
    4347public:
    4448    bool getContextMenuFromProposedMenu(WebPageProxy*, const Vector<WebContextMenuItemData>& proposedMenu, Vector<WebContextMenuItemData>& customMenu, const WebHitTestResult::Data&, API::Object* userData);
  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r159982 r159988  
    421421}
    422422
    423 void WebPageProxy::initializePolicyClient(const WKPagePolicyClient* policyClient)
     423void WebPageProxy::initializePolicyClient(const WKPagePolicyClientBase* policyClient)
    424424{
    425425    m_policyClient.initialize(policyClient);
    426426}
    427427
    428 void WebPageProxy::initializeFormClient(const WKPageFormClient* formClient)
     428void WebPageProxy::initializeFormClient(const WKPageFormClientBase* formClient)
    429429{
    430430    m_formClient.initialize(formClient);
    431431}
    432432
    433 void WebPageProxy::initializeUIClient(const WKPageUIClient* client)
     433void WebPageProxy::initializeUIClient(const WKPageUIClientBase* client)
    434434{
    435435    if (!isValid())
     
    442442}
    443443
    444 void WebPageProxy::initializeFindClient(const WKPageFindClient* client)
     444void WebPageProxy::initializeFindClient(const WKPageFindClientBase* client)
    445445{
    446446    m_findClient.initialize(client);
    447447}
    448448
    449 void WebPageProxy::initializeFindMatchesClient(const WKPageFindMatchesClient* client)
     449void WebPageProxy::initializeFindMatchesClient(const WKPageFindMatchesClientBase* client)
    450450{
    451451    m_findMatchesClient.initialize(client);
     
    453453
    454454#if ENABLE(CONTEXT_MENUS)
    455 void WebPageProxy::initializeContextMenuClient(const WKPageContextMenuClient* client)
     455void WebPageProxy::initializeContextMenuClient(const WKPageContextMenuClientBase* client)
    456456{
    457457    m_contextMenuClient.initialize(client);
  • trunk/Source/WebKit2/UIProcess/WebPageProxy.h

    r159965 r159988  
    349349
    350350#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*);
    356356    void initializeLoaderClient(const WKPageLoaderClientBase*);
    357     void initializePolicyClient(const WKPagePolicyClient*);
    358     void initializeUIClient(const WKPageUIClient*);
     357    void initializePolicyClient(const WKPagePolicyClientBase*);
     358    void initializeUIClient(const WKPageUIClientBase*);
    359359#if PLATFORM(EFL)
    360360    void initializeUIPopupMenuClient(const WKPageUIPopupMenuClient*);
  • trunk/Source/WebKit2/UIProcess/WebPolicyClient.cpp

    r159387 r159988  
    4343
    4444    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);
    4646    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);
    4848
    4949    return true;
     
    5757    RefPtr<WebURLRequest> request = WebURLRequest::create(resourceRequest);
    5858
    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);
    6060    return true;
    6161}
     
    7070
    7171    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);
    7373    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);
    7575
    7676    return true;
     
    8282        return;
    8383
    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);
    8585}
    8686
  • trunk/Source/WebKit2/UIProcess/WebPolicyClient.h

    r159387 r159988  
    3333#include <wtf/Forward.h>
    3434
     35template<> struct API::ClientTraits<WKPagePolicyClientBase> {
     36    typedef std::tuple<WKPagePolicyClientV0, WKPagePolicyClientV1> Versions;
     37};
     38
    3539namespace API {
    3640class Object;
     
    3842
    3943namespace WebCore {
    40     class ResourceError;
    41     class ResourceRequest;
    42     class ResourceResponse;
     44class ResourceError;
     45class ResourceRequest;
     46class ResourceResponse;
    4347}
    4448
     
    4953class WebFramePolicyListenerProxy;
    5054
    51 class WebPolicyClient : public APIClient<WKPagePolicyClient, kWKPagePolicyClientCurrentVersion> {
     55class WebPolicyClient : public API::Client<WKPagePolicyClientBase> {
    5256public:
    5357    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  
    4949PassRefPtr<WebPageProxy> WebUIClient::createNewPage(WebPageProxy* page, const ResourceRequest& resourceRequest, const WindowFeatures& windowFeatures, WebEvent::Modifiers modifiers, WebMouseEvent::Button button)
    5050{
    51     if (!m_client.version && !m_client.createNewPage_deprecatedForUseWithV0)
     51    if (!m_client.base.version && !m_client.createNewPage_deprecatedForUseWithV0)
    5252        return 0;
    5353   
    54     if (m_client.version == kWKPageUIClientCurrentVersion && !m_client.createNewPage)
     54    if (m_client.base.version == kWKPageUIClientCurrentVersion && !m_client.createNewPage)
    5555        return 0;
    5656
     
    7474    RefPtr<ImmutableDictionary> featuresMap = ImmutableDictionary::adopt(map);
    7575
    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)));
    7878
    7979    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)));
    8181}
    8282
     
    8686        return;
    8787   
    88     m_client.showPage(toAPI(page), m_client.clientInfo);
     88    m_client.showPage(toAPI(page), m_client.base.clientInfo);
    8989}
    9090
     
    9494        return;
    9595   
    96     m_client.close(toAPI(page), m_client.clientInfo);
     96    m_client.close(toAPI(page), m_client.base.clientInfo);
    9797}
    9898
     
    102102        return;
    103103   
    104     m_client.takeFocus(toAPI(page), direction, m_client.clientInfo);
     104    m_client.takeFocus(toAPI(page), direction, m_client.base.clientInfo);
    105105}
    106106
     
    110110        return;
    111111   
    112     m_client.focus(toAPI(page), m_client.clientInfo);
     112    m_client.focus(toAPI(page), m_client.base.clientInfo);
    113113}
    114114
     
    118118        return;
    119119
    120     m_client.unfocus(toAPI(page), m_client.clientInfo);
     120    m_client.unfocus(toAPI(page), m_client.base.clientInfo);
    121121}
    122122
     
    126126        return;
    127127   
    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);
    129129}
    130130
     
    134134        return false;
    135135
    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);
    137137}
    138138
     
    142142        return String();
    143143
    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));
    145145    if (!string)
    146146        return String();
     
    157157        return;
    158158
    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);
    160160}
    161161
     
    165165        return;
    166166
    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);
    172172        return;
    173173    }
    174174
    175175    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);
    177177}
    178178
     
    187187                toAPI(pluginInformation->get<WebString>(pluginInformationPluginURLKey())),
    188188                toAPI(pluginInformation->get<WebString>(pluginInformationPluginspageAttributeURLKey())),
    189                 m_client.clientInfo);
     189                m_client.base.clientInfo);
    190190    }
    191191
     
    197197            toAPI(pluginInformation->get<WebString>(pluginInformationPluginURLKey())),
    198198            toAPI(pluginInformation->get<WebString>(pluginInformationPluginspageAttributeURLKey())),
    199             m_client.clientInfo);
     199            m_client.base.clientInfo);
    200200
    201201    if (m_client.unavailablePluginButtonClicked)
     
    204204            pluginUnavailabilityReason,
    205205            toAPI(pluginInformation),
    206             m_client.clientInfo);
     206            m_client.base.clientInfo);
    207207}
    208208#endif // ENABLE(NETSCAPE_PLUGIN_API)
     
    217217    if (!m_client.didNotHandleKeyEvent)
    218218        return;
    219     m_client.didNotHandleKeyEvent(toAPI(page), event.nativeEvent(), m_client.clientInfo);
     219    m_client.didNotHandleKeyEvent(toAPI(page), event.nativeEvent(), m_client.base.clientInfo);
    220220}
    221221
     
    229229    if (!m_client.didNotHandleWheelEvent)
    230230        return;
    231     m_client.didNotHandleWheelEvent(toAPI(page), event.nativeEvent(), m_client.clientInfo);
     231    m_client.didNotHandleWheelEvent(toAPI(page), event.nativeEvent(), m_client.base.clientInfo);
    232232}
    233233
     
    236236    if (!m_client.toolbarsAreVisible)
    237237        return true;
    238     return m_client.toolbarsAreVisible(toAPI(page), m_client.clientInfo);
     238    return m_client.toolbarsAreVisible(toAPI(page), m_client.base.clientInfo);
    239239
    240240}
     
    243243    if (!m_client.setToolbarsAreVisible)
    244244        return;
    245     m_client.setToolbarsAreVisible(toAPI(page), visible, m_client.clientInfo);
     245    m_client.setToolbarsAreVisible(toAPI(page), visible, m_client.base.clientInfo);
    246246}
    247247
     
    250250    if (!m_client.menuBarIsVisible)
    251251        return true;
    252     return m_client.menuBarIsVisible(toAPI(page), m_client.clientInfo);
     252    return m_client.menuBarIsVisible(toAPI(page), m_client.base.clientInfo);
    253253}
    254254
     
    257257    if (!m_client.setMenuBarIsVisible)
    258258        return;
    259     m_client.setMenuBarIsVisible(toAPI(page), visible, m_client.clientInfo);
     259    m_client.setMenuBarIsVisible(toAPI(page), visible, m_client.base.clientInfo);
    260260}
    261261
     
    264264    if (!m_client.statusBarIsVisible)
    265265        return true;
    266     return m_client.statusBarIsVisible(toAPI(page), m_client.clientInfo);
     266    return m_client.statusBarIsVisible(toAPI(page), m_client.base.clientInfo);
    267267}
    268268
     
    271271    if (!m_client.setStatusBarIsVisible)
    272272        return;
    273     m_client.setStatusBarIsVisible(toAPI(page), visible, m_client.clientInfo);
     273    m_client.setStatusBarIsVisible(toAPI(page), visible, m_client.base.clientInfo);
    274274}
    275275
     
    278278    if (!m_client.isResizable)
    279279        return true;
    280     return m_client.isResizable(toAPI(page), m_client.clientInfo);
     280    return m_client.isResizable(toAPI(page), m_client.base.clientInfo);
    281281}
    282282
     
    285285    if (!m_client.setIsResizable)
    286286        return;
    287     m_client.setIsResizable(toAPI(page), resizable, m_client.clientInfo);
     287    m_client.setIsResizable(toAPI(page), resizable, m_client.base.clientInfo);
    288288}
    289289
     
    293293        return;
    294294
    295     m_client.setWindowFrame(toAPI(page), toAPI(frame), m_client.clientInfo);
     295    m_client.setWindowFrame(toAPI(page), toAPI(frame), m_client.base.clientInfo);
    296296}
    297297
     
    301301        return FloatRect();
    302302
    303     return toFloatRect(m_client.getWindowFrame(toAPI(page), m_client.clientInfo));
     303    return toFloatRect(m_client.getWindowFrame(toAPI(page), m_client.base.clientInfo));
    304304}
    305305
     
    314314        return true;
    315315
    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);
    317317}
    318318
     
    322322        return;
    323323
    324     m_client.didDraw(toAPI(page), m_client.clientInfo);
     324    m_client.didDraw(toAPI(page), m_client.base.clientInfo);
    325325}
    326326
     
    330330        return;
    331331
    332     m_client.pageDidScroll(toAPI(page), m_client.clientInfo);
     332    m_client.pageDidScroll(toAPI(page), m_client.base.clientInfo);
    333333}
    334334
     
    338338        return currentQuota;
    339339
    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);
    341341}
    342342
     
    346346        return false;
    347347
    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);
    349349    return true;
    350350}
     
    355355        return false;
    356356
    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);
    358358    return true;
    359359}
     
    364364        return false;
    365365   
    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);
    367367    return true;
    368368}
     
    373373        return 0;
    374374
    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);
    376376}
    377377
     
    381381        return 0;
    382382
    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);
    384384}
    385385
     
    389389        return;
    390390
    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);
    392392}
    393393
     
    397397        return;
    398398
    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);
    400400}
    401401
     
    405405        return;
    406406
    407     m_client.printFrame(toAPI(page), toAPI(frame), m_client.clientInfo);
     407    m_client.printFrame(toAPI(page), toAPI(frame), m_client.base.clientInfo);
    408408}
    409409
     
    418418        return;
    419419
    420     m_client.runModal(toAPI(page), m_client.clientInfo);
     420    m_client.runModal(toAPI(page), m_client.base.clientInfo);
    421421}
    422422
     
    426426        return;
    427427
    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);
    429429}
    430430
     
    434434        return false;
    435435
    436     return m_client.shouldInterruptJavaScript(toAPI(page), m_client.clientInfo);
     436    return m_client.shouldInterruptJavaScript(toAPI(page), m_client.base.clientInfo);
    437437}
    438438
     
    443443        return false;
    444444
    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);
    446446    return true;
    447447}
     
    452452        return false;
    453453
    454     m_client.hideColorPicker(toAPI(page), m_client.clientInfo);
     454    m_client.hideColorPicker(toAPI(page), m_client.base.clientInfo);
    455455    return true;
    456456}
  • trunk/Source/WebKit2/UIProcess/WebUIClient.h

    r159724 r159988  
    3535#include <wtf/PassRefPtr.h>
    3636
     37template<> struct API::ClientTraits<WKPageUIClientBase> {
     38    typedef std::tuple<WKPageUIClientV0, WKPageUIClientV1, WKPageUIClientV2> Versions;
     39};
     40
    3741namespace WebCore {
    3842    class FloatRect;
     
    5660class WebOpenPanelResultListenerProxy;
    5761
    58 class WebUIClient : public APIClient<WKPageUIClient, kWKPageUIClientCurrentVersion> {
     62class WebUIClient : public API::Client<WKPageUIClientBase> {
    5963public:
    6064    PassRefPtr<WebPageProxy> createNewPage(WebPageProxy*, const WebCore::ResourceRequest&, const WebCore::WindowFeatures&, WebEvent::Modifiers, WebMouseEvent::Button);
  • trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm

    r159903 r159988  
    451451    };
    452452
    453     inspectorPage->initializeUIClient(&uiClient);
     453    inspectorPage->initializeUIClient(reinterpret_cast<const WKPageUIClientBase*>(&uiClient));
    454454
    455455    return inspectorPage;
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp

    r159234 r159988  
    4141}
    4242
    43 void WKBundleSetClient(WKBundleRef bundleRef, WKBundleClient * wkClient)
    44 {
    45     toImpl(bundleRef)->initializeClient(wkClient);
     43void WKBundleSetClient(WKBundleRef bundleRef, WKBundleClient *wkClient)
     44{
     45    toImpl(bundleRef)->initializeClient(reinterpret_cast<WKBundleClientBase*>(wkClient));
    4646}
    4747
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp

    r159985 r159988  
    6565{
    6666#if ENABLE(CONTEXT_MENUS)
    67     toImpl(pageRef)->initializeInjectedBundleContextMenuClient(wkClient);
     67    toImpl(pageRef)->initializeInjectedBundleContextMenuClient(reinterpret_cast<WKBundlePageContextMenuClientBase*>(wkClient));
    6868#endif
    6969}
     
    7171void WKBundlePageSetEditorClient(WKBundlePageRef pageRef, WKBundlePageEditorClient* wkClient)
    7272{
    73     toImpl(pageRef)->initializeInjectedBundleEditorClient(wkClient);
     73    toImpl(pageRef)->initializeInjectedBundleEditorClient(reinterpret_cast<WKBundlePageEditorClientBase*>(wkClient));
    7474}
    7575
    7676void WKBundlePageSetFormClient(WKBundlePageRef pageRef, WKBundlePageFormClient* wkClient)
    7777{
    78     toImpl(pageRef)->initializeInjectedBundleFormClient(wkClient);
     78    toImpl(pageRef)->initializeInjectedBundleFormClient(reinterpret_cast<WKBundlePageFormClientBase*>(wkClient));
    7979}
    8080
    8181void WKBundlePageSetPageLoaderClient(WKBundlePageRef pageRef, WKBundlePageLoaderClient* wkClient)
    8282{
    83     toImpl(pageRef)->initializeInjectedBundleLoaderClient(wkClient);
     83    toImpl(pageRef)->initializeInjectedBundleLoaderClient(reinterpret_cast<WKBundlePageLoaderClientBase*>(wkClient));
    8484}
    8585
    8686void WKBundlePageSetResourceLoadClient(WKBundlePageRef pageRef, WKBundlePageResourceLoadClient* wkClient)
    8787{
    88     toImpl(pageRef)->initializeInjectedBundleResourceLoadClient(wkClient);
     88    toImpl(pageRef)->initializeInjectedBundleResourceLoadClient(reinterpret_cast<WKBundlePageResourceLoadClientBase*>(wkClient));
    8989}
    9090
    9191void WKBundlePageSetPolicyClient(WKBundlePageRef pageRef, WKBundlePagePolicyClient* wkClient)
    9292{
    93     toImpl(pageRef)->initializeInjectedBundlePolicyClient(wkClient);
     93    toImpl(pageRef)->initializeInjectedBundlePolicyClient(reinterpret_cast<WKBundlePagePolicyClientBase*>(wkClient));
    9494}
    9595
    9696void WKBundlePageSetUIClient(WKBundlePageRef pageRef, WKBundlePageUIClient* wkClient)
    9797{
    98     toImpl(pageRef)->initializeInjectedBundleUIClient(wkClient);
     98    toImpl(pageRef)->initializeInjectedBundleUIClient(reinterpret_cast<WKBundlePageUIClientBase*>(wkClient));
    9999}
    100100
     
    102102{
    103103#if defined(ENABLE_FULLSCREEN_API) && ENABLE_FULLSCREEN_API
    104     toImpl(pageRef)->initializeInjectedBundleFullScreenClient(wkClient);
     104    toImpl(pageRef)->initializeInjectedBundleFullScreenClient(reinterpret_cast<WKBundlePageFullScreenClientBase*>(wkClient));
    105105#else
    106106    UNUSED_PARAM(pageRef);
     
    147147void WKBundlePageSetDiagnosticLoggingClient(WKBundlePageRef pageRef, WKBundlePageDiagnosticLoggingClient* client)
    148148{
    149     toImpl(pageRef)->initializeInjectedBundleDiagnosticLoggingClient(client);
     149    toImpl(pageRef)->initializeInjectedBundleDiagnosticLoggingClient(reinterpret_cast<WKBundlePageDiagnosticLoggingClientBase*>(client));
    150150}
    151151
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp

    r159333 r159988  
    9595}
    9696
    97 void InjectedBundle::initializeClient(WKBundleClient* client)
     97void InjectedBundle::initializeClient(const WKBundleClientBase* client)
    9898{
    9999    m_client.initialize(client);
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h

    r159234 r159988  
    8787
    8888    // API
    89     void initializeClient(WKBundleClient*);
     89    void initializeClient(const WKBundleClientBase*);
    9090    void postMessage(const String&, API::Object*);
    9191    void postSynchronousMessage(const String&, API::Object*, RefPtr<API::Object>& returnData);
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleClient.cpp

    r159163 r159988  
    3636        return;
    3737
    38     m_client.didCreatePage(toAPI(bundle), toAPI(page), m_client.clientInfo);
     38    m_client.didCreatePage(toAPI(bundle), toAPI(page), m_client.base.clientInfo);
    3939}
    4040
     
    4444        return;
    4545
    46     m_client.willDestroyPage(toAPI(bundle), toAPI(page), m_client.clientInfo);
     46    m_client.willDestroyPage(toAPI(bundle), toAPI(page), m_client.base.clientInfo);
    4747}
    4848
     
    5252        return;
    5353
    54     m_client.didInitializePageGroup(toAPI(bundle), toAPI(pageGroup), m_client.clientInfo);
     54    m_client.didInitializePageGroup(toAPI(bundle), toAPI(pageGroup), m_client.base.clientInfo);
    5555}
    5656
     
    6060        return;
    6161
    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);
    6363}
    6464
     
    6868        return;
    6969
    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);
    7171}
    7272
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleClient.h

    r159163 r159988  
    3131#include <wtf/Forward.h>
    3232
     33template<> struct API::ClientTraits<WKBundleClientBase> {
     34    typedef std::tuple<WKBundleClientV0, WKBundleClientV1> Versions;
     35};
     36
    3337namespace API {
    3438class Object;
     
    4145class WebPageGroupProxy;
    4246
    43 class InjectedBundleClient : public APIClient<WKBundleClient, kWKBundleClientCurrentVersion> {
     47class InjectedBundleClient : public API::Client<WKBundleClientBase> {
    4448public:
    4549    void didCreatePage(InjectedBundle*, WebPage*);
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp

    r159234 r159988  
    5454    WKArrayRef newMenuWK = 0;
    5555    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);
    5757    RefPtr<API::Array> array = adoptRef(toImpl(newMenuWK));
    5858    userData = adoptRef(toImpl(userDataToPass));
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.h

    r159163 r159988  
    3333#include <wtf/Vector.h>
    3434
     35template<> struct API::ClientTraits<WKBundlePageContextMenuClientBase> {
     36    typedef std::tuple<WKBundlePageContextMenuClientV0> Versions;
     37};
     38
    3539namespace API {
    3640class Object;
     
    4751class WebPage;
    4852
    49 class InjectedBundlePageContextMenuClient : public APIClient<WKBundlePageContextMenuClient, kWKBundlePageContextMenuClientCurrentVersion> {
     53class InjectedBundlePageContextMenuClient : public API::Client<WKBundlePageContextMenuClientBase> {
    5054public:
    5155    bool getCustomMenuFromDefaultItems(WebPage*, InjectedBundleHitTestResult*, const Vector<WebContextMenuItemData>& defaultMenu, Vector<WebContextMenuItemData>& newMenu, RefPtr<API::Object>& userData);
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp

    r123778 r159988  
    3636    if (!m_client.logDiagnosticMessage)
    3737        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);
    3939}
    4040
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.h

    r159163 r159988  
    3232#include <wtf/Forward.h>
    3333
     34template<> struct API::ClientTraits<WKBundlePageDiagnosticLoggingClientBase> {
     35    typedef std::tuple<WKBundlePageDiagnosticLoggingClientV0> Versions;
     36};
     37
    3438namespace WebKit {
    3539
     
    3842class WebPage;
    3943
    40 class InjectedBundlePageDiagnosticLoggingClient : public APIClient<WKBundlePageDiagnosticLoggingClient, kWKBundlePageDiagnosticLoggingClientCurrentVersion> {
     44class InjectedBundlePageDiagnosticLoggingClient : public API::Client<WKBundlePageDiagnosticLoggingClientBase> {
    4145public:
    4246    void logDiagnosticMessage(WebPage*, const String& message, const String& description, const String& success);
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp

    r159234 r159988  
    4444    if (m_client.shouldBeginEditing) {
    4545        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);
    4747    }
    4848    return true;
     
    5353    if (m_client.shouldEndEditing) {
    5454        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);
    5656    }
    5757    return true;
     
    6363        RefPtr<InjectedBundleNodeHandle> nodeHandle = InjectedBundleNodeHandle::getOrCreate(node);
    6464        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);
    6666    }
    6767    return true;
     
    7272    if (m_client.shouldInsertText) {
    7373        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);
    7575    }
    7676    return true;
     
    8181    if (m_client.shouldDeleteRange) {
    8282        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);
    8484    }
    8585    return true;
     
    9191        RefPtr<InjectedBundleRangeHandle> fromRangeHandle = InjectedBundleRangeHandle::getOrCreate(fromRange);
    9292        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);
    9494    }
    9595    return true;
     
    100100    if (m_client.shouldApplyStyle) {
    101101        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);
    103103    }
    104104    return true;
     
    108108{
    109109    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);
    111111}
    112112
     
    114114{
    115115    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);
    117117}
    118118
     
    120120{
    121121    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);
    123123}
    124124
     
    126126{
    127127    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);
    129129}
    130130
     
    133133    if (m_client.willWriteToPasteboard) {
    134134        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);
    136136    }
    137137}
     
    143143        WKArrayRef types = 0;
    144144        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);
    146146        RefPtr<API::Array> typesArray = adoptRef(toImpl(types));
    147147        RefPtr<API::Array> dataArray = adoptRef(toImpl(data));
     
    176176{
    177177    if (m_client.didWriteToPasteboard)
    178         m_client.didWriteToPasteboard(toAPI(page), m_client.clientInfo);
     178        m_client.didWriteToPasteboard(toAPI(page), m_client.base.clientInfo);
    179179}
    180180
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h

    r149848 r159988  
    3434#include <wtf/Forward.h>
    3535
     36template<> struct API::ClientTraits<WKBundlePageEditorClientBase> {
     37    typedef std::tuple<WKBundlePageEditorClientV0, WKBundlePageEditorClientV1> Versions;
     38};
     39
    3640namespace WebCore {
    3741    class CSSStyleDeclaration;
     
    4650class WebPage;
    4751
    48 class InjectedBundlePageEditorClient : public APIClient<WKBundlePageEditorClient, kWKBundlePageEditorClientCurrentVersion> {
     52class InjectedBundlePageEditorClient : public API::Client<WKBundlePageEditorClientBase> {
    4953public:
    5054    bool shouldBeginEditing(WebPage*, WebCore::Range*);
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp

    r159234 r159988  
    4646
    4747    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);
    4949}
    5050
     
    5555
    5656    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);
    5858}
    5959
     
    6464
    6565    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);
    6767}
    6868
     
    7373
    7474    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);
    7676}
    7777
     
    8282
    8383    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);
    8585}
    8686
     
    9191
    9292    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);
    9494}
    9595
     
    106106    RefPtr<ImmutableDictionary> textFieldsMap = ImmutableDictionary::adopt(map);
    107107
    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);
    109109}
    110110
     
    122122
    123123    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);
    125125    userData = adoptRef(toImpl(userDataToPass));
    126126}
     
    137137        elementHandles.uncheckedAppend(InjectedBundleNodeHandle::getOrCreate(element.get()));
    138138
    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);
    140140}
    141141
     
    145145        return false;
    146146
    147     return m_client.shouldNotifyOnFormChanges(toAPI(page), m_client.clientInfo);
     147    return m_client.shouldNotifyOnFormChanges(toAPI(page), m_client.base.clientInfo);
    148148}
    149149
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.h

    r159163 r159988  
    3333#include <wtf/Vector.h>
    3434
     35template<> struct API::ClientTraits<WKBundlePageFormClientBase> {
     36    typedef std::tuple<WKBundlePageFormClientV0, WKBundlePageFormClientV1, WKBundlePageFormClientV2> Versions;
     37};
     38
    3539namespace API {
    3640class Object;
     
    5054class WebPage;
    5155
    52 class InjectedBundlePageFormClient : public APIClient<WKBundlePageFormClient, kWKBundlePageFormClientCurrentVersion> {
     56class InjectedBundlePageFormClient : public API::Client<WKBundlePageFormClientBase> {
    5357public:
    5458    void didFocusTextField(WebPage*, WebCore::HTMLInputElement*, WebFrame*);
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFullScreenClient.h

    r116165 r159988  
    3434#include <wtf/Forward.h>
    3535
     36template<> struct API::ClientTraits<WKBundlePageFullScreenClientBase> {
     37    typedef std::tuple<WKBundlePageFullScreenClientV0, WKBundlePageFullScreenClientV1> Versions;
     38};
     39
    3640namespace WebCore {
    3741class Element;
     
    4347class WebPage;
    4448
    45 class InjectedBundlePageFullScreenClient : public APIClient<WKBundlePageFullScreenClient, kWKBundlePageFullScreenClientCurrentVersion> {
     49class InjectedBundlePageFullScreenClient : public API::Client<WKBundlePageFullScreenClientBase> {
    4650public:
    4751    bool supportsFullScreen(WebPage*, bool withKeyboard);
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp

    r159234 r159988  
    4747        return;
    4848
    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);
    5050}
    5151
     
    6767    }
    6868
    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);
    7070}
    7171
     
    7676
    7777    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);
    7979    userData = adoptRef(toImpl(userDataToPass));
    8080   
     
    8888
    8989    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);
    9191    userData = adoptRef(toImpl(userDataToPass));
    9292}
     
    9898
    9999    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);
    101101    userData = adoptRef(toImpl(userDataToPass));
    102102}
     
    108108
    109109    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);
    111111    userData = adoptRef(toImpl(userDataToPass));
    112112}
     
    118118
    119119    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);
    121121    userData = adoptRef(toImpl(userDataToPass));
    122122}
     
    128128
    129129    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);
    131131    userData = adoptRef(toImpl(userDataToPass));
    132132}
     
    138138
    139139    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);
    141141    userData = adoptRef(toImpl(userDataToPass));
    142142}
     
    147147        return;
    148148
    149     m_client.didFinishProgress(toAPI(page), m_client.clientInfo);
     149    m_client.didFinishProgress(toAPI(page), m_client.base.clientInfo);
    150150}
    151151
     
    156156
    157157    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);
    159159    userData = adoptRef(toImpl(userDataToPass));
    160160}
     
    166166
    167167    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);
    169169    userData = adoptRef(toImpl(userDataToPass));
    170170}
     
    176176
    177177    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);
    179179    userData = adoptRef(toImpl(userDataToPass));
    180180}
     
    186186
    187187    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);
    189189    userData = adoptRef(toImpl(userDataToPass));
    190190}
     
    196196
    197197    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);
    199199    userData = adoptRef(toImpl(userDataToPass));
    200200}
     
    206206
    207207    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);
    209209    userData = adoptRef(toImpl(userDataToPass));
    210210}
     
    216216
    217217    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);
    219219    userData = adoptRef(toImpl(userDataToPass));
    220220}
     
    226226
    227227    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);
    229229    userData = adoptRef(toImpl(userDataToPass));
    230230}
     
    236236
    237237    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);
    239239    userData = adoptRef(toImpl(userDataToPass));
    240240}
     
    245245        return;
    246246
    247     m_client.didLayoutForFrame(toAPI(page), toAPI(frame), m_client.clientInfo);
     247    m_client.didLayoutForFrame(toAPI(page), toAPI(frame), m_client.base.clientInfo);
    248248}
    249249
     
    254254
    255255    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);
    257257    userData = adoptRef(toImpl(userDataToPass));
    258258}
     
    263263        return;
    264264
    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);
    266266}
    267267
     
    271271        return;
    272272
    273     m_client.didCancelClientRedirectForFrame(toAPI(page), toAPI(frame), m_client.clientInfo);
     273    m_client.didCancelClientRedirectForFrame(toAPI(page), toAPI(frame), m_client.base.clientInfo);
    274274}
    275275
     
    279279        return;
    280280
    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);
    282282}
    283283
     
    287287        return;
    288288
    289     m_client.didHandleOnloadEventsForFrame(toAPI(page), toAPI(frame), m_client.clientInfo);
     289    m_client.didHandleOnloadEventsForFrame(toAPI(page), toAPI(frame), m_client.base.clientInfo);
    290290}
    291291
     
    296296   
    297297    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);
    299299}
    300300
     
    306306    RefPtr<InjectedBundleDOMWindowExtension> extension = InjectedBundleDOMWindowExtension::get(coreExtension);
    307307    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);
    309309}
    310310
     
    316316    RefPtr<InjectedBundleDOMWindowExtension> extension = InjectedBundleDOMWindowExtension::get(coreExtension);
    317317    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);
    319319}
    320320
     
    326326    RefPtr<InjectedBundleDOMWindowExtension> extension = InjectedBundleDOMWindowExtension::get(coreExtension);
    327327    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);
    329329}
    330330
     
    334334        return false;
    335335
    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);
    337337}
    338338
     
    342342        return;
    343343
    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);
    345345}
    346346
     
    350350        return;
    351351
    352     m_client.willDestroyFrame(toAPI(page), toAPI(frame), m_client.clientInfo);
     352    m_client.willDestroyFrame(toAPI(page), toAPI(frame), m_client.base.clientInfo);
    353353}
    354354
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h

    r159163 r159988  
    3939}
    4040
     41template<> struct API::ClientTraits<WKBundlePageLoaderClientBase> {
     42    typedef std::tuple<WKBundlePageLoaderClientV0, WKBundlePageLoaderClientV1, WKBundlePageLoaderClientV2, WKBundlePageLoaderClientV3, WKBundlePageLoaderClientV4, WKBundlePageLoaderClientV5, WKBundlePageLoaderClientV6, WKBundlePageLoaderClientV7> Versions;
     43};
     44
    4145namespace WebCore {
    4246class DOMWindowExtension;
     
    5559class WebFrame;
    5660
    57 class InjectedBundlePageLoaderClient : public APIClient<WKBundlePageLoaderClient, kWKBundlePageLoaderClientCurrentVersion> {
     61class InjectedBundlePageLoaderClient : public API::Client<WKBundlePageLoaderClientBase> {
    5862public:
    5963    void willLoadURLRequest(WebPage*, const WebCore::ResourceRequest&, API::Object*);
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.cpp

    r159163 r159988  
    4343
    4444    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);
    4646    userData = adoptRef(toImpl(userDataToPass));
    4747    return policy;
     
    5656
    5757    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);
    5959    userData = adoptRef(toImpl(userDataToPass));
    6060    return policy;
     
    7070
    7171    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);
    7373    userData = adoptRef(toImpl(userDataToPass));
    7474    return policy;
     
    8181
    8282    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);
    8484    userData = adoptRef(toImpl(userDataToPass));
    8585}
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.h

    r159163 r159988  
    3232#include <wtf/Forward.h>
    3333
     34template<> struct API::ClientTraits<WKBundlePagePolicyClientBase> {
     35    typedef std::tuple<WKBundlePagePolicyClientV0> Versions;
     36};
     37
    3438namespace WebCore {
    3539    class ResourceError;
     
    4448class WebPage;
    4549
    46 class InjectedBundlePagePolicyClient : public APIClient<WKBundlePagePolicyClient, kWKBundlePagePolicyClientCurrentVersion> {
     50class InjectedBundlePagePolicyClient : public API::Client<WKBundlePagePolicyClientBase> {
    4751public:
    4852    WKBundlePagePolicyAction decidePolicyForNavigationAction(WebPage*, WebFrame*, InjectedBundleNavigationAction*, const WebCore::ResourceRequest&, RefPtr<API::Object>& userData);
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageResourceLoadClient.cpp

    r144216 r159988  
    3939        return;
    4040
    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);
    4242}
    4343
     
    4747        return;
    4848
    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)));
    5050    if (returnedRequest)
    5151        request.updateFromDelegatePreservingOldHTTPBody(returnedRequest->resourceRequest());
     
    5959        return;
    6060
    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);
    6262}
    6363
     
    6767        return;
    6868
    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);
    7070}
    7171
     
    7575        return;
    7676
    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);
    7878}
    7979
     
    8383        return;
    8484
    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);
    8686}
    8787
     
    9191        return true;
    9292
    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);
    9494}
    9595
     
    9999        return true;
    100100
    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);
    102102}
    103103
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageResourceLoadClient.h

    r159163 r159988  
    3333#include <wtf/Forward.h>
    3434
     35template<> struct API::ClientTraits<WKBundlePageResourceLoadClientBase> {
     36    typedef std::tuple<WKBundlePageResourceLoadClientV0, WKBundlePageResourceLoadClientV1> Versions;
     37};
     38
    3539namespace WebCore {
    3640class ResourceError;
     
    4448class WebFrame;
    4549
    46 class InjectedBundlePageResourceLoadClient : public APIClient<WKBundlePageResourceLoadClient, kWKBundlePageResourceLoadClientCurrentVersion> {
     50class InjectedBundlePageResourceLoadClient : public API::Client<WKBundlePageResourceLoadClientBase> {
    4751public:
    4852    void didInitiateLoadForResource(WebPage*, WebFrame*, uint64_t identifier, const WebCore::ResourceRequest&, bool pageIsProvisionallyLoading);
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp

    r159222 r159988  
    4040{
    4141    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);
    4343}
    4444
     
    4646{
    4747    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);
    4949}
    5050
     
    5252{
    5353    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);
    5555}
    5656
     
    5858{
    5959    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);
    6161}
    6262
     
    6464{
    6565    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);
    6767}
    6868
     
    7575
    7676    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);
    7878    userData = adoptRef(toImpl(userDataToPass));
    7979}
     
    8484        return;
    8585
    86     m_client.pageDidScroll(toAPI(page), m_client.clientInfo);
     86    m_client.pageDidScroll(toAPI(page), m_client.base.clientInfo);
    8787}
    8888
     
    9191    if (!m_client.shouldGenerateFileForUpload)
    9292        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)));
    9494    return generatedFilePath ? generatedFilePath->string() : String();
    9595}
     
    9999    if (!m_client.shouldGenerateFileForUpload)
    100100        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)));
    102102    return generatedFilePath ? generatedFilePath->string() : String();
    103103}
     
    108108        return WKBundlePageUIElementVisibilityUnknown;
    109109   
    110     return m_client.statusBarIsVisible(toAPI(page), m_client.clientInfo);
     110    return m_client.statusBarIsVisible(toAPI(page), m_client.base.clientInfo);
    111111}
    112112
     
    116116        return WKBundlePageUIElementVisibilityUnknown;
    117117   
    118     return m_client.menuBarIsVisible(toAPI(page), m_client.clientInfo);
     118    return m_client.menuBarIsVisible(toAPI(page), m_client.base.clientInfo);
    119119}
    120120
     
    124124        return WKBundlePageUIElementVisibilityUnknown;
    125125   
    126     return m_client.toolbarsAreVisible(toAPI(page), m_client.clientInfo);
     126    return m_client.toolbarsAreVisible(toAPI(page), m_client.base.clientInfo);
    127127}
    128128
     
    132132        return;
    133133
    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);
    135135}
    136136
     
    140140        return 0;
    141141
    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);
    143143}
    144144
     
    148148        return String();
    149149
    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)));
    151151    return title ? title->string() : String();
    152152}
     
    157157        return String();
    158158
    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)));
    160160    return subtitle ? subtitle->string() : String();
    161161}
     
    166166        return String();
    167167
    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)));
    169169    return styleSheet ? styleSheet->string() : String();
    170170}
     
    175175        return String();
    176176
    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)));
    178178    return script ? script->string() : String();
    179179}
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h

    r159196 r159988  
    3333#include <wtf/Forward.h>
    3434
     35template<> struct API::ClientTraits<WKBundlePageUIClientBase> {
     36    typedef std::tuple<WKBundlePageUIClientV0, WKBundlePageUIClientV1, WKBundlePageUIClientV2> Versions;
     37};
     38
    3539namespace API {
    3640class Object;
     
    4953class WebSecurityOrigin;
    5054
    51 class InjectedBundlePageUIClient : public APIClient<WKBundlePageUIClient, kWKBundlePageUIClientCurrentVersion> {
     55class InjectedBundlePageUIClient : public API::Client<WKBundlePageUIClientBase> {
    5256public:
    5357    void willAddMessageToConsole(WebPage*, const String& message, int32_t lineNumber);
  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

    r159985 r159988  
    483483
    484484#if ENABLE(CONTEXT_MENUS)
    485 void WebPage::initializeInjectedBundleContextMenuClient(WKBundlePageContextMenuClient* client)
     485void WebPage::initializeInjectedBundleContextMenuClient(WKBundlePageContextMenuClientBase* client)
    486486{
    487487    m_contextMenuClient.initialize(client);
     
    489489#endif
    490490
    491 void WebPage::initializeInjectedBundleEditorClient(WKBundlePageEditorClient* client)
     491void WebPage::initializeInjectedBundleEditorClient(WKBundlePageEditorClientBase* client)
    492492{
    493493    m_editorClient.initialize(client);
    494494}
    495495
    496 void WebPage::initializeInjectedBundleFormClient(WKBundlePageFormClient* client)
     496void WebPage::initializeInjectedBundleFormClient(WKBundlePageFormClientBase* client)
    497497{
    498498    m_formClient.initialize(client);
    499499}
    500500
    501 void WebPage::initializeInjectedBundleLoaderClient(WKBundlePageLoaderClient* client)
    502 {
     501void WebPage::initializeInjectedBundleLoaderClient(WKBundlePageLoaderClientBase* client)
     502{
     503    m_loaderClient.initialize(client);
     504
    503505    // It would be nice to get rid of this code and transition all clients to using didLayout instead of
    504506    // didFirstLayoutInFrame and didFirstVisuallyNonEmptyLayoutInFrame. In the meantime, this is required
     
    506508    LayoutMilestones milestones = 0;
    507509    if (client) {
    508         if (client->didFirstLayoutForFrame)
     510        if (m_loaderClient.client().didFirstLayoutForFrame)
    509511            milestones |= WebCore::DidFirstLayout;
    510         if (client->didFirstVisuallyNonEmptyLayoutForFrame)
     512        if (m_loaderClient.client().didFirstVisuallyNonEmptyLayoutForFrame)
    511513            milestones |= WebCore::DidFirstVisuallyNonEmptyLayout;
    512514    }
     
    514516    if (milestones)
    515517        listenForLayoutMilestones(milestones);
    516 
    517     m_loaderClient.initialize(client);
    518 }
    519 
    520 void WebPage::initializeInjectedBundlePolicyClient(WKBundlePagePolicyClient* client)
     518}
     519
     520void WebPage::initializeInjectedBundlePolicyClient(WKBundlePagePolicyClientBase* client)
    521521{
    522522    m_policyClient.initialize(client);
    523523}
    524524
    525 void WebPage::initializeInjectedBundleResourceLoadClient(WKBundlePageResourceLoadClient* client)
     525void WebPage::initializeInjectedBundleResourceLoadClient(WKBundlePageResourceLoadClientBase* client)
    526526{
    527527    m_resourceLoadClient.initialize(client);
    528528}
    529529
    530 void WebPage::initializeInjectedBundleUIClient(WKBundlePageUIClient* client)
     530void WebPage::initializeInjectedBundleUIClient(WKBundlePageUIClientBase* client)
    531531{
    532532    m_uiClient.initialize(client);
     
    534534
    535535#if ENABLE(FULLSCREEN_API)
    536 void WebPage::initializeInjectedBundleFullScreenClient(WKBundlePageFullScreenClient* client)
     536void WebPage::initializeInjectedBundleFullScreenClient(WKBundlePageFullScreenClientBase* client)
    537537{
    538538    m_fullScreenClient.initialize(client);
     
    540540#endif
    541541
    542 void WebPage::initializeInjectedBundleDiagnosticLoggingClient(WKBundlePageDiagnosticLoggingClient* client)
     542void WebPage::initializeInjectedBundleDiagnosticLoggingClient(WKBundlePageDiagnosticLoggingClientBase* client)
    543543{
    544544    m_logDiagnosticMessageClient.initialize(client);
  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

    r159876 r159988  
    243243    // -- InjectedBundle methods
    244244#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*);
    253253#if ENABLE(FULLSCREEN_API)
    254     void initializeInjectedBundleFullScreenClient(WKBundlePageFullScreenClient*);
    255 #endif
    256     void initializeInjectedBundleDiagnosticLoggingClient(WKBundlePageDiagnosticLoggingClient*);
     254    void initializeInjectedBundleFullScreenClient(WKBundlePageFullScreenClientBase*);
     255#endif
     256    void initializeInjectedBundleDiagnosticLoggingClient(WKBundlePageDiagnosticLoggingClientBase*);
    257257
    258258#if ENABLE(CONTEXT_MENUS)
Note: See TracChangeset for help on using the changeset viewer.