Changeset 160104 in webkit


Ignore:
Timestamp:
Dec 4, 2013 10:49:49 AM (10 years ago)
Author:
andersca@apple.com
Message:

Deprecate all unversioned client structs in favor of having explicit versioned structs
​https://bugs.webkit.org/show_bug.cgi?id=125203

Reviewed by Dan Bernstein.

Source/WebKit2:

Deprecate all the "current version" enums and unversioned client structs.

  • Shared/API/c/WKConnectionRef.cpp:

(WKConnectionSetConnectionClient):

  • Shared/API/c/WKConnectionRef.h:
  • UIProcess/API/C/WKContext.cpp:

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

  • UIProcess/API/C/WKContext.h:
  • UIProcess/API/C/WKContextConnectionClient.h:
  • UIProcess/API/C/WKContextDownloadClient.h:
  • UIProcess/API/C/WKContextHistoryClient.h:
  • UIProcess/API/C/WKContextInjectedBundleClient.h:
  • UIProcess/API/C/WKCookieManager.cpp:

(WKCookieManagerSetClient):

  • UIProcess/API/C/WKCookieManager.h:
  • UIProcess/API/C/WKDatabaseManager.cpp:

(WKDatabaseManagerSetClient):

  • UIProcess/API/C/WKDatabaseManager.h:
  • UIProcess/API/C/WKGeolocationManager.cpp:

(WKGeolocationManagerSetProvider):

  • UIProcess/API/C/WKGeolocationManager.h:
  • UIProcess/API/C/WKIconDatabase.cpp:

(WKIconDatabaseSetIconDatabaseClient):

  • UIProcess/API/C/WKIconDatabase.h:
  • UIProcess/API/C/WKOriginDataManager.cpp:

(WKOriginDataManagerSetChangeClient):

  • UIProcess/API/C/WKOriginDataManager.h:
  • UIProcess/API/C/WKPage.cpp:

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

  • UIProcess/API/C/WKPage.h:
  • UIProcess/API/C/WKPageContextMenuClient.h:
  • UIProcess/API/C/WKPageFindClient.h:
  • UIProcess/API/C/WKPageFindMatchesClient.h:
  • UIProcess/API/C/WKPageFormClient.h:
  • UIProcess/API/C/WKPageLoaderClient.h:
  • UIProcess/API/C/WKPagePolicyClient.h:
  • UIProcess/API/C/WKPageUIClient.h:
  • UIProcess/API/Cocoa/WKBrowsingContextController.mm:

(setUpPagePolicyClient):

  • UIProcess/API/Cocoa/WKConnection.mm:

(setUpClient):

  • UIProcess/API/Cocoa/WKProcessGroup.mm:

(setUpConnectionClient):
(setUpInectedBundleClient):
(setUpHistoryClient):

  • UIProcess/WebInspectorProxy.cpp:

(WebKit::WebInspectorProxy::createInspectorPage):

  • UIProcess/WebUIClient.cpp:

(WebKit::WebUIClient::createNewPage):
(WebKit::WebUIClient::mouseDidMoveOverElement):

  • UIProcess/mac/WebInspectorProxyMac.mm:

(WebKit::WebInspectorProxy::platformCreateInspectorPage):

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

(WKBundleSetClient):

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

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

  • WebProcess/InjectedBundle/API/c/WKBundlePage.h:
  • WebProcess/InjectedBundle/API/c/WKBundlePageBanner.h:
  • WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h:
  • WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h:
  • WebProcess/InjectedBundle/API/c/WKBundlePageEditorClient.h:
  • WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h:
  • WebProcess/InjectedBundle/API/c/WKBundlePageFullScreenClient.h:
  • WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h:
  • WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp:

(WKBundlePageOverlayCreate):
(WKBundlePageOverlaySetAccessibilityClient):

  • WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h:
  • WebProcess/InjectedBundle/API/c/WKBundlePagePolicyClient.h:
  • WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h:
  • WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h:
  • WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.h:
  • WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm:

(WKBundlePageBannerCreateBannerWithCALayer):

  • WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm:

(setUpBundleClient):

Tools:

Update for WebKit2 API changes.

  • MiniBrowser/mac/AppDelegate.m:

(-[BrowserAppDelegate init]):

  • MiniBrowser/mac/WK2BrowserWindowController.m:

(-[WK2BrowserWindowController awakeFromNib]):

  • TestWebKitAPI/InjectedBundleController.cpp:

(TestWebKitAPI::InjectedBundleController::initialize):

  • TestWebKitAPI/Tests/WebKit2/AboutBlankLoad.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/CanHandleRequest.cpp:

(TestWebKitAPI::setInjectedBundleClient):

  • TestWebKitAPI/Tests/WebKit2/CloseThenTerminate.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/CookieManager.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionBasic.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionBasic_Bundle.cpp:

(TestWebKitAPI::DOMWindowExtensionBasic::didCreatePage):

  • TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache_Bundle.cpp:

(TestWebKitAPI::DOMWindowExtensionNoCache::didCreatePage):

  • TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls.cpp:

(TestWebKitAPI::setInjectedBundleClient):

  • TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls_Bundle.cpp:

(TestWebKitAPI::DidAssociateFormControlsTest::didCreatePage):

  • TestWebKitAPI/Tests/WebKit2/DidNotHandleKeyDown.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/DownloadDecideDestinationCrash.cpp:

(TestWebKitAPI::setContextDownloadClient):
(TestWebKitAPI::setPagePolicyClient):

  • TestWebKitAPI/Tests/WebKit2/FailedLoad.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/Find.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/FindMatches.mm:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/ForceRepaint.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/FrameMIMETypeHTML.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/FrameMIMETypePNG.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/Geolocation.cpp:

(TestWebKitAPI::setupGeolocationProvider):
(TestWebKitAPI::setupView):
(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/GetInjectedBundleInitializationUserDataCallback.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle.cpp:

(TestWebKitAPI::setPageLoaderClient):
(TestWebKitAPI::setInjectedBundleClient):

  • TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle_Bundle.cpp:

(TestWebKitAPI::HitTestResultNodeHandleTest::didCreatePage):

  • TestWebKitAPI/Tests/WebKit2/InjectedBundleBasic.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/InjectedBundleFrameHitTest.cpp:

(TestWebKitAPI::setInjectedBundleClient):

  • TestWebKitAPI/Tests/WebKit2/InjectedBundleFrameHitTest_Bundle.cpp:

(TestWebKitAPI::InjectedBundleFrameHitTestTest::didCreatePage):

  • TestWebKitAPI/Tests/WebKit2/InjectedBundleInitializationUserDataCallbackWins.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/LayoutMilestonesWithAllContentInFrame.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/LoadAlternateHTMLStringWithNonDirectoryURL.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback_Bundle.cpp:

(TestWebKitAPI::LoadCanceledNoServerRedirectCallbackTest::didCreatePage):

  • TestWebKitAPI/Tests/WebKit2/LoadPageOnCrash.cpp:

(TestWebKitAPI::WebKit2CrashLoader::WebKit2CrashLoader):

  • TestWebKitAPI/Tests/WebKit2/MouseMoveAfterCrash.cpp:

(TestWebKitAPI::setPageLoaderClient):

  • TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayout.cpp:

(TestWebKitAPI::setPageLoaderClient):

  • TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFails.cpp:

(TestWebKitAPI::setPageLoaderClient):

  • TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutForImages.cpp:

(TestWebKitAPI::setPageLoaderClient):

  • TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames.cpp:

(TestWebKitAPI::setPageLoaderClient):

  • TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/PageLoadDidChangeLocationWithinPageForFrame.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/ParentFrame.cpp:

(TestWebKitAPI::setInjectedBundleClient):

  • TestWebKitAPI/Tests/WebKit2/ParentFrame_Bundle.cpp:

(TestWebKitAPI::ParentFrameTest::didCreatePage):

  • TestWebKitAPI/Tests/WebKit2/PasteboardNotifications.mm:

(TestWebKitAPI::setInjectedBundleClient):

  • TestWebKitAPI/Tests/WebKit2/PasteboardNotifications_Bundle.cpp:

(TestWebKitAPI::PasteboardNotificationsTest::didCreatePage):

  • TestWebKitAPI/Tests/WebKit2/PrivateBrowsingPushStateNoHistoryCallback.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/ReloadPageAfterCrash.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/ResizeReversePaginatedWebView.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/ResizeWindowAfterCrash.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/ResponsivenessTimerDoesntFireEarly.cpp:

(TestWebKitAPI::setInjectedBundleClient):
(TestWebKitAPI::setPageLoaderClient):

  • TestWebKitAPI/Tests/WebKit2/RestoreSessionStateContainingFormData.cpp:

(TestWebKitAPI::setPageLoaderClient):

  • TestWebKitAPI/Tests/WebKit2/ScrollPinningBehaviors.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/ShouldGoToBackForwardListItem.cpp:

(TestWebKitAPI::setPageLoaderClient):

  • TestWebKitAPI/Tests/WebKit2/ShouldGoToBackForwardListItem_Bundle.cpp:

(TestWebKitAPI::ShouldGoToBackForwardListItemTest::didCreatePage):

  • TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/TerminateTwice.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/UserMessage.cpp:

(TestWebKitAPI::WebKit2UserMessageRoundTripTest::setInjectedBundleClient):
(TestWebKitAPI::WebKit2UserMessageRoundTripTest::setPageLoaderClient):

  • TestWebKitAPI/Tests/WebKit2/WKConnection.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/WKConnection_Bundle.cpp:

(TestWebKitAPI::WKConnectionTest::initialize):

  • TestWebKitAPI/Tests/WebKit2/WKPageGetScaleFactorNotZero.cpp:

(TestWebKitAPI::setPageLoaderClient):

  • TestWebKitAPI/Tests/WebKit2/WebArchive.cpp:

(TestWebKitAPI::setInjectedBundleClient):
(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/WillLoad.cpp:

(TestWebKitAPI::WebKit2WillLoadTest::setInjectedBundleClient):

  • TestWebKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp:
  • TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent.cpp:

(TestWebKitAPI::setInjectedBundleClient):

  • TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent_Bundle.cpp:

(TestWebKitAPI::WillSendSubmitEventTest::didCreatePage):

  • TestWebKitAPI/Tests/WebKit2/mac/EditorCommands.mm:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/mac/GetBackingScaleFactor.mm:

(TestWebKitAPI::setInjectedBundleClient):

  • TestWebKitAPI/Tests/WebKit2/mac/GetPIDAfterAbortedProcessLaunch.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsInvalidScheme_Bundle.cpp:
  • TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing_Bundle.cpp:

(TestWebKitAPI::DenyWillSendRequestTest::didCreatePage):

  • TestWebKitAPI/Tests/WebKit2ObjC/WKRemoteObjectRegistry.mm:

(TestWebKitAPI::didCreateConnection):
(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/mac/PageVisibilityStateWithWindowChanges.mm:

(TestWebKitAPI::PageVisibilityStateWithWindowChanges::initializeView):

  • TestWebKitAPI/Tests/mac/WKRemoteObjectRegistry_Bundle.mm:
  • TestWebKitAPI/mac/WebKitAgnosticTest.mm:

(TestWebKitAPI::setPageLoaderClient):

  • WebKitTestRunner/GeolocationProviderMock.cpp:

(WTR::GeolocationProviderMock::GeolocationProviderMock):

  • WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:

(WTR::InjectedBundle::initialize):

  • WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:

(WTR::InjectedBundlePage::InjectedBundlePage):

  • WebKitTestRunner/TestController.cpp:

(WTR::TestController::createOtherPage):
(WTR::TestController::initialize):
(WTR::TestController::createWebViewWithOptions):

Location:
trunk
Files:
133 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r160101 r160104  
     12013-12-03  Anders Carlsson  <andersca@apple.com>
     2
     3        Deprecate all unversioned client structs in favor of having explicit versioned structs
     4        https://bugs.webkit.org/show_bug.cgi?id=125203
     5
     6        Reviewed by Dan Bernstein.
     7
     8        Deprecate all the "current version" enums and unversioned client structs.
     9
     10        * Shared/API/c/WKConnectionRef.cpp:
     11        (WKConnectionSetConnectionClient):
     12        * Shared/API/c/WKConnectionRef.h:
     13        * UIProcess/API/C/WKContext.cpp:
     14        (WKContextSetClient):
     15        (WKContextSetInjectedBundleClient):
     16        (WKContextSetHistoryClient):
     17        (WKContextSetDownloadClient):
     18        (WKContextSetConnectionClient):
     19        * UIProcess/API/C/WKContext.h:
     20        * UIProcess/API/C/WKContextConnectionClient.h:
     21        * UIProcess/API/C/WKContextDownloadClient.h:
     22        * UIProcess/API/C/WKContextHistoryClient.h:
     23        * UIProcess/API/C/WKContextInjectedBundleClient.h:
     24        * UIProcess/API/C/WKCookieManager.cpp:
     25        (WKCookieManagerSetClient):
     26        * UIProcess/API/C/WKCookieManager.h:
     27        * UIProcess/API/C/WKDatabaseManager.cpp:
     28        (WKDatabaseManagerSetClient):
     29        * UIProcess/API/C/WKDatabaseManager.h:
     30        * UIProcess/API/C/WKGeolocationManager.cpp:
     31        (WKGeolocationManagerSetProvider):
     32        * UIProcess/API/C/WKGeolocationManager.h:
     33        * UIProcess/API/C/WKIconDatabase.cpp:
     34        (WKIconDatabaseSetIconDatabaseClient):
     35        * UIProcess/API/C/WKIconDatabase.h:
     36        * UIProcess/API/C/WKOriginDataManager.cpp:
     37        (WKOriginDataManagerSetChangeClient):
     38        * UIProcess/API/C/WKOriginDataManager.h:
     39        * UIProcess/API/C/WKPage.cpp:
     40        (WKPageSetPageContextMenuClient):
     41        (WKPageSetPageFindClient):
     42        (WKPageSetPageFindMatchesClient):
     43        (WKPageSetPageFormClient):
     44        (WKPageSetPageLoaderClient):
     45        (WKPageSetPagePolicyClient):
     46        (WKPageSetPageUIClient):
     47        * UIProcess/API/C/WKPage.h:
     48        * UIProcess/API/C/WKPageContextMenuClient.h:
     49        * UIProcess/API/C/WKPageFindClient.h:
     50        * UIProcess/API/C/WKPageFindMatchesClient.h:
     51        * UIProcess/API/C/WKPageFormClient.h:
     52        * UIProcess/API/C/WKPageLoaderClient.h:
     53        * UIProcess/API/C/WKPagePolicyClient.h:
     54        * UIProcess/API/C/WKPageUIClient.h:
     55        * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
     56        (setUpPagePolicyClient):
     57        * UIProcess/API/Cocoa/WKConnection.mm:
     58        (setUpClient):
     59        * UIProcess/API/Cocoa/WKProcessGroup.mm:
     60        (setUpConnectionClient):
     61        (setUpInectedBundleClient):
     62        (setUpHistoryClient):
     63        * UIProcess/WebInspectorProxy.cpp:
     64        (WebKit::WebInspectorProxy::createInspectorPage):
     65        * UIProcess/WebUIClient.cpp:
     66        (WebKit::WebUIClient::createNewPage):
     67        (WebKit::WebUIClient::mouseDidMoveOverElement):
     68        * UIProcess/mac/WebInspectorProxyMac.mm:
     69        (WebKit::WebInspectorProxy::platformCreateInspectorPage):
     70        * WebProcess/InjectedBundle/API/c/WKBundle.cpp:
     71        (WKBundleSetClient):
     72        * WebProcess/InjectedBundle/API/c/WKBundle.h:
     73        * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
     74        (WKBundlePageSetContextMenuClient):
     75        (WKBundlePageSetEditorClient):
     76        (WKBundlePageSetFormClient):
     77        (WKBundlePageSetPageLoaderClient):
     78        (WKBundlePageSetResourceLoadClient):
     79        (WKBundlePageSetPolicyClient):
     80        (WKBundlePageSetUIClient):
     81        (WKBundlePageSetFullScreenClient):
     82        (WKBundlePageSetDiagnosticLoggingClient):
     83        * WebProcess/InjectedBundle/API/c/WKBundlePage.h:
     84        * WebProcess/InjectedBundle/API/c/WKBundlePageBanner.h:
     85        * WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h:
     86        * WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h:
     87        * WebProcess/InjectedBundle/API/c/WKBundlePageEditorClient.h:
     88        * WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h:
     89        * WebProcess/InjectedBundle/API/c/WKBundlePageFullScreenClient.h:
     90        * WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h:
     91        * WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp:
     92        (WKBundlePageOverlayCreate):
     93        (WKBundlePageOverlaySetAccessibilityClient):
     94        * WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h:
     95        * WebProcess/InjectedBundle/API/c/WKBundlePagePolicyClient.h:
     96        * WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h:
     97        * WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h:
     98        * WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.h:
     99        * WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm:
     100        (WKBundlePageBannerCreateBannerWithCALayer):
     101        * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm:
     102        (setUpBundleClient):
     103
    11042013-12-04  Tamas Gergely  <tgergely.u-szeged@partner.samsung.com>
    2105

  • trunk/Source/WebKit2/Shared/API/c/WKConnectionRef.cpp

    r159988 r160104  
    3737}
    3838
    39 void WKConnectionSetConnectionClient(WKConnectionRef connectionRef, const WKConnectionClient* wkClient)
     39void WKConnectionSetConnectionClient(WKConnectionRef connectionRef, const WKConnectionClientBase* wkClient)
    4040{
    41     toImpl(connectionRef)->initializeConnectionClient(reinterpret_cast<const WKConnectionClientBase*>(wkClient));
     41    toImpl(connectionRef)->initializeConnectionClient(wkClient);
    4242}
    4343

  • trunk/Source/WebKit2/Shared/API/c/WKConnectionRef.h

    r159981 r160104  
    4949} WKConnectionClientV0;
    5050
    51 // FIXME: Deprecate.
    52 enum { WKConnectionClientCurrentVersion = 0 };
     51enum { WKConnectionClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
    5352typedef struct WKConnectionClient {
    5453    int                                                                 version;
    … …  
    5857    WKConnectionDidReceiveMessageCallback                               didReceiveMessage;
    5958    WKConnectionDidCloseCallback                                        didClose;
    60 } WKConnectionClient;
     59} WKConnectionClient WK_DEPRECATED("Use an explicit versioned struct instead");
    6160
    6261WK_EXPORT WKTypeID WKConnectionGetTypeID();
    6362
    64 WK_EXPORT void WKConnectionSetConnectionClient(WKConnectionRef connection, const WKConnectionClient* client);
     63WK_EXPORT void WKConnectionSetConnectionClient(WKConnectionRef connection, const WKConnectionClientBase* client);
    6564WK_EXPORT void WKConnectionPostMessage(WKConnectionRef connection, WKStringRef messageName, WKTypeRef messageBody);
    6665

  • trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp

    r159988 r160104  
    8181}
    8282
    83 void WKContextSetClient(WKContextRef contextRef, const WKContextClient* wkClient)
    84 {
    85     toImpl(contextRef)->initializeClient(reinterpret_cast<const WKContextClientBase*>(wkClient));
    86 }
    87 
    88 void WKContextSetInjectedBundleClient(WKContextRef contextRef, const WKContextInjectedBundleClient* wkClient)
    89 {
    90     toImpl(contextRef)->initializeInjectedBundleClient(reinterpret_cast<const WKContextInjectedBundleClientBase*>(wkClient));
    91 }
    92 
    93 void WKContextSetHistoryClient(WKContextRef contextRef, const WKContextHistoryClient* wkClient)
    94 {
    95     toImpl(contextRef)->initializeHistoryClient(reinterpret_cast<const WKContextHistoryClientBase*>(wkClient));
    96 }
    97 
    98 void WKContextSetDownloadClient(WKContextRef contextRef, const WKContextDownloadClient* wkClient)
    99 {
    100     toImpl(contextRef)->initializeDownloadClient(reinterpret_cast<const WKContextDownloadClientBase*>(wkClient));
    101 }
    102 
    103 void WKContextSetConnectionClient(WKContextRef contextRef, const WKContextConnectionClient* wkClient)
    104 {
    105     toImpl(contextRef)->initializeConnectionClient(reinterpret_cast<const WKContextConnectionClientBase*>(wkClient));
     83void WKContextSetClient(WKContextRef contextRef, const WKContextClientBase* wkClient)
     84{
     85    toImpl(contextRef)->initializeClient(wkClient);
     86}
     87
     88void WKContextSetInjectedBundleClient(WKContextRef contextRef, const WKContextInjectedBundleClientBase* wkClient)
     89{
     90    toImpl(contextRef)->initializeInjectedBundleClient(wkClient);
     91}
     92
     93void WKContextSetHistoryClient(WKContextRef contextRef, const WKContextHistoryClientBase* wkClient)
     94{
     95    toImpl(contextRef)->initializeHistoryClient(wkClient);
     96}
     97
     98void WKContextSetDownloadClient(WKContextRef contextRef, const WKContextDownloadClientBase* wkClient)
     99{
     100    toImpl(contextRef)->initializeDownloadClient(wkClient);
     101}
     102
     103void WKContextSetConnectionClient(WKContextRef contextRef, const WKContextConnectionClientBase* wkClient)
     104{
     105    toImpl(contextRef)->initializeConnectionClient(wkClient);
    106106}
    107107

  • trunk/Source/WebKit2/UIProcess/API/C/WKContext.h

    r159984 r160104  
    6363} WKContextClientV0;
    6464
    65 // FIXME: Deprecate.
    66 enum { kWKContextClientCurrentVersion = 0 };
     65enum { kWKContextClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
    6766typedef struct WKContextClient {
    6867    int                                                                 version;
    … …  
    7372    WKContextNetworkProcessDidCrashCallback                             networkProcessDidCrash;
    7473    WKContextPlugInInformationBecameAvailableCallback                   plugInInformationBecameAvailable;
    75 } WKContextClient;
     74} WKContextClient WK_DEPRECATED("Use an explicit versioned struct instead");
    7675
    7776enum {
    … …  
    9291WK_EXPORT WKContextRef WKContextCreateWithInjectedBundlePath(WKStringRef path);
    9392
    94 WK_EXPORT void WKContextSetClient(WKContextRef context, const WKContextClient* client);
    95 WK_EXPORT void WKContextSetInjectedBundleClient(WKContextRef context, const WKContextInjectedBundleClient* client);
    96 WK_EXPORT void WKContextSetHistoryClient(WKContextRef context, const WKContextHistoryClient* client);
    97 WK_EXPORT void WKContextSetDownloadClient(WKContextRef context, const WKContextDownloadClient* client);
    98 WK_EXPORT void WKContextSetConnectionClient(WKContextRef context, const WKContextConnectionClient* client);
     93WK_EXPORT void WKContextSetClient(WKContextRef context, const WKContextClientBase* client);
     94WK_EXPORT void WKContextSetInjectedBundleClient(WKContextRef context, const WKContextInjectedBundleClientBase* client);
     95WK_EXPORT void WKContextSetHistoryClient(WKContextRef context, const WKContextHistoryClientBase* client);
     96WK_EXPORT void WKContextSetDownloadClient(WKContextRef context, const WKContextDownloadClientBase* client);
     97WK_EXPORT void WKContextSetConnectionClient(WKContextRef context, const WKContextConnectionClientBase* client);
    9998
    10099WK_EXPORT WKDownloadRef WKContextDownloadURLRequest(WKContextRef context, const WKURLRequestRef request);

  • trunk/Source/WebKit2/UIProcess/API/C/WKContextConnectionClient.h

    r159984 r160104  
    4343} WKContextConnectionClientV0;
    4444
    45 // FIXME: Deprecate.
    46 enum { kWKContextConnectionClientCurrentVersion = 0 };
     45enum { kWKContextConnectionClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
    4746typedef struct WKContextConnectionClient {
    4847    int                                                                 version;
    … …  
    5150    // Version 0.
    5251    WKContextDidCreateConnection                                        didCreateConnection;
    53 } WKContextConnectionClient;
     52} WKContextConnectionClient WK_DEPRECATED("Use an explicit versioned struct instead");
    5453
    5554#endif // WKContextConnectionClient_h

  • trunk/Source/WebKit2/UIProcess/API/C/WKContextDownloadClient.h

    r159984 r160104  
    6363} WKContextDownloadClientV0;
    6464
    65 // FIXME: Deprecate.
    66 enum { kWKContextDownloadClientCurrentVersion = 0 };
     65enum { kWKContextDownloadClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
    6766typedef struct WKContextDownloadClient {
    6867    int                                                                 version;
    … …  
    8180    WKContextDownloadDidCancel                                          didCancel;
    8281    WKContextDownloadProcessDidCrashCallback                            processDidCrash;
    83 } WKContextDownloadClient;
     82} WKContextDownloadClient WK_DEPRECATED("Use an explicit versioned struct instead");
    8483
    8584#endif // WKContextDownloadClient_h

  • trunk/Source/WebKit2/UIProcess/API/C/WKContextHistoryClient.h

    r159984 r160104  
    5151} WKContextHistoryClientV0;
    5252
    53 // FIXME: Deprecate.
    54 enum { kWKContextHistoryClientCurrentVersion = 0 };
     53enum { kWKContextHistoryClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
    5554typedef struct WKContextHistoryClient {
    5655    int                                                                 version;
    … …  
    6362    WKContextDidUpdateHistoryTitleCallback                              didUpdateHistoryTitle;
    6463    WKContextPopulateVisitedLinksCallback                               populateVisitedLinks;
    65 } WKContextHistoryClient;
     64} WKContextHistoryClient WK_DEPRECATED("Use an explicit versioned struct instead");
    6665
    6766#endif // WKContextHistoryClient_h

  • trunk/Source/WebKit2/UIProcess/API/C/WKContextInjectedBundleClient.h

    r159984 r160104  
    5858} WKContextInjectedBundleClientV1;
    5959
     60enum { kWKContextInjectedBundleClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 1 };
    6061typedef struct WKContextInjectedBundleClient {
    6162    int                                                                 version;
    … …  
    6869    // Version 1.
    6970    WKContextGetInjectedBundleInitializationUserDataCallback            getInjectedBundleInitializationUserData;
    70 } WKContextInjectedBundleClient;
    71 
    72 enum { kWKContextInjectedBundleClientCurrentVersion = 1 };
     71} WKContextInjectedBundleClient WK_DEPRECATED("Use an explicit versioned struct instead");
    7372
    7473#endif // WKContextInjectedBundleClient_h

  • trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.cpp

    r159988 r160104  
    3737}
    3838
    39 void WKCookieManagerSetClient(WKCookieManagerRef cookieManagerRef, const WKCookieManagerClient* wkClient)
     39void WKCookieManagerSetClient(WKCookieManagerRef cookieManagerRef, const WKCookieManagerClientBase* wkClient)
    4040{
    41     toImpl(cookieManagerRef)->initializeClient(reinterpret_cast<const WKCookieManagerClientBase*>(wkClient));
     41    toImpl(cookieManagerRef)->initializeClient(wkClient);
    4242}
    4343

  • trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.h

    r159981 r160104  
    5555} WKCookieManagerClientV0;
    5656
    57 // FIXME: Deprecate.
    58 enum { kWKCookieManagerClientCurrentVersion = 0 };
     57enum { kWKCookieManagerClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
    5958typedef struct WKCookieManagerClient {
    6059    int                                                                 version;
    … …  
    6362    // Version 0.
    6463    WKCookieManagerCookiesDidChangeCallback                             cookiesDidChange;
    65 } WKCookieManagerClient;
     64} WKCookieManagerClient WK_DEPRECATED("Use an explicit versioned struct instead");
    6665
    6766WK_EXPORT WKTypeID WKCookieManagerGetTypeID();
    6867
    69 WK_EXPORT void WKCookieManagerSetClient(WKCookieManagerRef cookieManager, const WKCookieManagerClient* client);
     68WK_EXPORT void WKCookieManagerSetClient(WKCookieManagerRef cookieManager, const WKCookieManagerClientBase* client);
    7069
    7170typedef void (*WKCookieManagerGetCookieHostnamesFunction)(WKArrayRef, WKErrorRef, void*);

  • trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.cpp

    r159988 r160104  
    121121}
    122122
    123 void WKDatabaseManagerSetClient(WKDatabaseManagerRef databaseManagerRef, const WKDatabaseManagerClient* wkClient)
     123void WKDatabaseManagerSetClient(WKDatabaseManagerRef databaseManagerRef, const WKDatabaseManagerClientBase* wkClient)
    124124{
    125125#if ENABLE(SQL_DATABASE)
    126126    if (wkClient && wkClient->version)
    127127        return;
    128     toImpl(databaseManagerRef)->initializeClient(reinterpret_cast<const WKDatabaseManagerClientBase*>(wkClient));
     128    toImpl(databaseManagerRef)->initializeClient(wkClient);
    129129#else
    130130    UNUSED_PARAM(databaseManagerRef);

  • trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.h

    r159981 r160104  
    8080} WKDatabaseManagerClientV0;
    8181
    82 // FIXME: Deprecate.
    83 enum { kWKDatabaseManagerClientCurrentVersion = 0 };
     82enum { kWKDatabaseManagerClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
    8483typedef struct WKDatabaseManagerClient {
    8584    int                                                                 version;
    … …  
    8988    WKDatabaseManagerDidModifyOriginCallback                            didModifyOrigin;
    9089    WKDatabaseManagerDidModifyDatabaseCallback                          didModifyDatabase;
    91 } WKDatabaseManagerClient;
     90} WKDatabaseManagerClient WK_DEPRECATED("Use an explicit versioned struct instead");
    9291
    9392WK_EXPORT WKTypeID WKDatabaseManagerGetTypeID();
    9493
    95 WK_EXPORT void WKDatabaseManagerSetClient(WKDatabaseManagerRef databaseManager, const WKDatabaseManagerClient* client);
     94WK_EXPORT void WKDatabaseManagerSetClient(WKDatabaseManagerRef databaseManager, const WKDatabaseManagerClientBase* client);
    9695
    9796typedef void (*WKDatabaseManagerGetDatabasesByOriginFunction)(WKArrayRef, WKErrorRef, void*);

  • trunk/Source/WebKit2/UIProcess/API/C/WKGeolocationManager.cpp

    r159988 r160104  
    3737}
    3838
    39 void WKGeolocationManagerSetProvider(WKGeolocationManagerRef geolocationManagerRef, const WKGeolocationProvider* wkProvider)
     39void WKGeolocationManagerSetProvider(WKGeolocationManagerRef geolocationManagerRef, const WKGeolocationProviderBase* wkProvider)
    4040{
    41     toImpl(geolocationManagerRef)->initializeProvider(reinterpret_cast<const WKGeolocationProviderBase*>(wkProvider));
     41    toImpl(geolocationManagerRef)->initializeProvider(wkProvider);
    4242}
    4343

  • trunk/Source/WebKit2/UIProcess/API/C/WKGeolocationManager.h

    r159981 r160104  
    6262} WKGeolocationProviderV1;
    6363
    64 // FIXME: Deprecate.
    65 enum { kWKGeolocationProviderCurrentVersion = 1 };
     64enum { kWKGeolocationProviderCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 1 };
    6665typedef struct WKGeolocationProvider {
    6766    int                                                                 version;
    … …  
    7271    // Version 1.
    7372    WKGeolocationProviderSetEnableHighAccuracyCallback                  setEnableHighAccuracy;
    74 } WKGeolocationProvider;
     73} WKGeolocationProvider WK_DEPRECATED("Use an explicit versioned struct instead");
    7574
    7675
    7776WK_EXPORT WKTypeID WKGeolocationManagerGetTypeID();
    7877
    79 WK_EXPORT void WKGeolocationManagerSetProvider(WKGeolocationManagerRef geolocationManager, const WKGeolocationProvider* provider);
     78WK_EXPORT void WKGeolocationManagerSetProvider(WKGeolocationManagerRef geolocationManager, const WKGeolocationProviderBase* provider);
    8079
    8180WK_EXPORT void WKGeolocationManagerProviderDidChangePosition(WKGeolocationManagerRef geolocationManager, WKGeolocationPositionRef position);

  • trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.cpp

    r159988 r160104  
    3737}
    3838
    39 void WKIconDatabaseSetIconDatabaseClient(WKIconDatabaseRef iconDatabaseRef, const WKIconDatabaseClient* wkClient)
     39void WKIconDatabaseSetIconDatabaseClient(WKIconDatabaseRef iconDatabaseRef, const WKIconDatabaseClientBase* wkClient)
    4040{
    41     toImpl(iconDatabaseRef)->initializeIconDatabaseClient(reinterpret_cast<const WKIconDatabaseClientBase*>(wkClient));
     41    toImpl(iconDatabaseRef)->initializeIconDatabaseClient(wkClient);
    4242}
    4343

  • trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.h

    r159981 r160104  
    6262} WKIconDatabaseClientV1;
    6363
    64 // FIXME: Deprecate.
    65 enum { kWKIconDatabaseClientCurrentVersion = 1 };
     64enum { kWKIconDatabaseClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 1 };
    6665typedef struct WKIconDatabaseClient {
    6766    int                                                                 version;
    … …  
    7473    // Version 1.
    7574    WKIconDatabaseIconDataReadyForPageURLCallback                       iconDataReadyForPageURL;
    76 } WKIconDatabaseClient;
     75} WKIconDatabaseClient WK_DEPRECATED("Use an explicit versioned struct instead");
    7776
    7877WK_EXPORT WKTypeID WKIconDatabaseGetTypeID();
    7978
    80 WK_EXPORT void WKIconDatabaseSetIconDatabaseClient(WKIconDatabaseRef iconDatabase, const WKIconDatabaseClient* client);
     79WK_EXPORT void WKIconDatabaseSetIconDatabaseClient(WKIconDatabaseRef iconDatabase, const WKIconDatabaseClientBase* client);
    8180
    8281WK_EXPORT void WKIconDatabaseRetainIconForURL(WKIconDatabaseRef iconDatabase, WKURLRef pageURL);

  • trunk/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.cpp

    r159988 r160104  
    6262}
    6363
    64 void WKOriginDataManagerSetChangeClient(WKOriginDataManagerRef originDataManagerRef, const WKOriginDataManagerChangeClient *client)
     64void WKOriginDataManagerSetChangeClient(WKOriginDataManagerRef originDataManagerRef, const WKOriginDataManagerChangeClientBase *client)
    6565{
    66     toImpl(originDataManagerRef)->setChangeClient(reinterpret_cast<const WKOriginDataManagerChangeClientBase*>(client));
     66    toImpl(originDataManagerRef)->setChangeClient(client);
    6767}

  • trunk/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.h

    r159984 r160104  
    6969} WKOriginDataManagerChangeClientV0;
    7070
    71 // FIXME: Deprecate.
    7271enum { kWKOriginDataManagerChangeClientVersion = 0 };
    7372typedef struct WKOriginDataManagerChangeClient {
    … …  
    7776    // Version 0.
    7877    WKOriginDataManagerChangeCallback                                   didChange;
    79 } WKOriginDataManagerChangeClient;
     78} WKOriginDataManagerChangeClient WK_DEPRECATED("Use an explicit versioned struct instead");
    8079
    8180WK_EXPORT void WKOriginDataManagerStartObservingChanges(WKOriginDataManagerRef originDataManager, WKOriginDataTypes types);
    8281WK_EXPORT void WKOriginDataManagerStopObservingChanges(WKOriginDataManagerRef originDataManager, WKOriginDataTypes types);
    83 WK_EXPORT void WKOriginDataManagerSetChangeClient(WKOriginDataManagerRef originDataManger, const WKOriginDataManagerChangeClient* client);
     82WK_EXPORT void WKOriginDataManagerSetChangeClient(WKOriginDataManagerRef originDataManger, const WKOriginDataManagerChangeClientBase* client);
    8483#ifdef __cplusplus
    8584}

  • trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp

    r159988 r160104  
    630630}
    631631
    632 void WKPageSetPageContextMenuClient(WKPageRef pageRef, const WKPageContextMenuClient* wkClient)
     632void WKPageSetPageContextMenuClient(WKPageRef pageRef, const WKPageContextMenuClientBase* wkClient)
    633633{
    634634#if ENABLE(CONTEXT_MENUS)
    635     toImpl(pageRef)->initializeContextMenuClient(reinterpret_cast<const WKPageContextMenuClientBase*>(wkClient));
     635    toImpl(pageRef)->initializeContextMenuClient(wkClient);
    636636#endif
    637637}
    638638
    639 void WKPageSetPageFindClient(WKPageRef pageRef, const WKPageFindClient* wkClient)
    640 {
    641     toImpl(pageRef)->initializeFindClient(reinterpret_cast<const WKPageFindClientBase*>(wkClient));
    642 }
    643 
    644 void WKPageSetPageFindMatchesClient(WKPageRef pageRef, const WKPageFindMatchesClient* wkClient)
    645 {
    646     toImpl(pageRef)->initializeFindMatchesClient(reinterpret_cast<const WKPageFindMatchesClientBase*>(wkClient));
    647 }
    648 
    649 void WKPageSetPageFormClient(WKPageRef pageRef, const WKPageFormClient* wkClient)
    650 {
    651     toImpl(pageRef)->initializeFormClient(reinterpret_cast<const WKPageFormClientBase*>(wkClient));
    652 }
    653 
    654 void WKPageSetPageLoaderClient(WKPageRef pageRef, const WKPageLoaderClient* wkClient)
    655 {
    656     toImpl(pageRef)->initializeLoaderClient(reinterpret_cast<const WKPageLoaderClientBase*>(wkClient));
    657 }
    658 
    659 void WKPageSetPagePolicyClient(WKPageRef pageRef, const WKPagePolicyClient* wkClient)
    660 {
    661     toImpl(pageRef)->initializePolicyClient(reinterpret_cast<const WKPagePolicyClientBase*>(wkClient));
    662 }
    663 
    664 void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClient* wkClient)
    665 {
    666     toImpl(pageRef)->initializeUIClient(reinterpret_cast<const WKPageUIClientBase*>(wkClient));
     639void WKPageSetPageFindClient(WKPageRef pageRef, const WKPageFindClientBase* wkClient)
     640{
     641    toImpl(pageRef)->initializeFindClient(wkClient);
     642}
     643
     644void WKPageSetPageFindMatchesClient(WKPageRef pageRef, const WKPageFindMatchesClientBase* wkClient)
     645{
     646    toImpl(pageRef)->initializeFindMatchesClient(wkClient);
     647}
     648
     649void WKPageSetPageFormClient(WKPageRef pageRef, const WKPageFormClientBase* wkClient)
     650{
     651    toImpl(pageRef)->initializeFormClient(wkClient);
     652}
     653
     654void WKPageSetPageLoaderClient(WKPageRef pageRef, const WKPageLoaderClientBase* wkClient)
     655{
     656    toImpl(pageRef)->initializeLoaderClient(wkClient);
     657}
     658
     659void WKPageSetPagePolicyClient(WKPageRef pageRef, const WKPagePolicyClientBase* wkClient)
     660{
     661    toImpl(pageRef)->initializePolicyClient(wkClient);
     662}
     663
     664void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient)
     665{
     666    toImpl(pageRef)->initializeUIClient(wkClient);
    667667}
    668668

  • trunk/Source/WebKit2/UIProcess/API/C/WKPage.h

    r159715 r160104  
    191191WK_EXPORT void WKPageSelectFindMatch(WKPageRef page, int32_t matchIndex);
    192192
    193 WK_EXPORT void WKPageSetPageContextMenuClient(WKPageRef page, const WKPageContextMenuClient* client);
    194 WK_EXPORT void WKPageSetPageFindClient(WKPageRef page, const WKPageFindClient* client);
    195 WK_EXPORT void WKPageSetPageFindMatchesClient(WKPageRef page, const WKPageFindMatchesClient* client);
    196 WK_EXPORT void WKPageSetPageFormClient(WKPageRef page, const WKPageFormClient* client);
    197 WK_EXPORT void WKPageSetPageLoaderClient(WKPageRef page, const WKPageLoaderClient* client);
    198 WK_EXPORT void WKPageSetPagePolicyClient(WKPageRef page, const WKPagePolicyClient* client);
    199 WK_EXPORT void WKPageSetPageUIClient(WKPageRef page, const WKPageUIClient* client);
     193WK_EXPORT void WKPageSetPageContextMenuClient(WKPageRef page, const WKPageContextMenuClientBase* client);
     194WK_EXPORT void WKPageSetPageFindClient(WKPageRef page, const WKPageFindClientBase* client);
     195WK_EXPORT void WKPageSetPageFindMatchesClient(WKPageRef page, const WKPageFindMatchesClientBase* client);
     196WK_EXPORT void WKPageSetPageFormClient(WKPageRef page, const WKPageFormClientBase* client);
     197WK_EXPORT void WKPageSetPageLoaderClient(WKPageRef page, const WKPageLoaderClientBase* client);
     198WK_EXPORT void WKPageSetPagePolicyClient(WKPageRef page, const WKPagePolicyClientBase* client);
     199WK_EXPORT void WKPageSetPageUIClient(WKPageRef page, const WKPageUIClientBase* client);
    200200
    201201typedef void (*WKPageRunJavaScriptFunction)(WKSerializedScriptValueRef, WKErrorRef, void*);

  • trunk/Source/WebKit2/UIProcess/API/C/WKPageContextMenuClient.h

    r159981 r160104  
    9999} WKPageContextMenuClientV3;
    100100
    101 // FIXME: Deprecate.
    102 enum { kWKPageContextMenuClientCurrentVersion = 3 };
     101enum { kWKPageContextMenuClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 3 };
    103102typedef struct WKPageContextMenuClient {
    104103    int                                                                          version;
    … …  
    118117    WKPageShowContextMenuCallback                                                showContextMenu;
    119118    WKPageHideContextMenuCallback                                                hideContextMenu;
    120 } WKPageContextMenuClient;
     119} WKPageContextMenuClient WK_DEPRECATED("Use an explicit versioned struct instead");
    121120
    122121#ifdef __cplusplus

  • trunk/Source/WebKit2/UIProcess/API/C/WKPageFindClient.h

    r159981 r160104  
    5151} WKPageFindClientV0;
    5252
    53 // FIXME: Deprecate.
    54 enum { kWKPageFindClientCurrentVersion = 0 };
     53enum { kWKPageFindClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
    5554typedef struct WKPageFindClient {
    5655    int                                                                 version;
    … …  
    6160    WKPageDidFailToFindStringCallback                                   didFailToFindString;
    6261    WKPageDidCountStringMatchesCallback                                 didCountStringMatches;
    63 } WKPageFindClient;
     62} WKPageFindClient WK_DEPRECATED("Use an explicit versioned struct instead");
    6463
    6564#ifdef __cplusplus

  • trunk/Source/WebKit2/UIProcess/API/C/WKPageFindMatchesClient.h

    r159981 r160104  
    5454} WKPageFindMatchesClientV0;
    5555
    56 // FIXME: Deprecate.
    57 enum { kWKPageFindMatchesClientCurrentVersion = 0 };
     56enum { kWKPageFindMatchesClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
    5857typedef struct WKPageFindMatchesClient {
    5958    int                                                                 version;
    … …  
    6160    WKPageDidFindStringMatchesCallback                                  didFindStringMatches;
    6261    WKPageDidGetImageForMatchResultCallback                             didGetImageForMatchResult;
    63 } WKPageFindMatchesClient;
     62} WKPageFindMatchesClient WK_DEPRECATED("Use an explicit versioned struct instead");
    6463
    6564#ifdef __cplusplus

  • trunk/Source/WebKit2/UIProcess/API/C/WKPageFormClient.h

    r159981 r160104  
    4848} WKPageFormClientV0;
    4949
    50 // FIXME: Deprecate.
    51 enum { kWKPageFormClientCurrentVersion = 0 };
     50enum { kWKPageFormClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
    5251typedef struct WKPageFormClient {
    5352    int                                                                 version;
    … …  
    5655    // Version 0.
    5756    WKPageWillSubmitFormCallback                                        willSubmitForm;
    58 } WKPageFormClient;
     57} WKPageFormClient WK_DEPRECATED("Use an explicit versioned struct instead");
    5958
    6059#ifdef __cplusplus

  • trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h

    r159981 r160104  
    268268
    269269// FIXME: These should be deprecated.
    270 enum { kWKPageLoaderClientCurrentVersion = 3 };
     270enum { kWKPageLoaderClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 3 };
    271271typedef struct WKPageLoaderClient {
    272272    int                                                                 version;

  • trunk/Source/WebKit2/UIProcess/API/C/WKPagePolicyClient.h

    r159981 r160104  
    7373
    7474// FIXME: These should be deprecated.
    75 enum { kWKPagePolicyClientCurrentVersion = 1 };
     75enum { kWKPagePolicyClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 1 };
    7676typedef struct WKPagePolicyClient {
    7777    int                                                                  version;

  • trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h

    r159981 r160104  
    250250} WKPageUIClientV2;
    251251
    252 // FIXME: Deprecate.
    253 enum { kWKPageUIClientCurrentVersion = 2 };
     252enum { kWKPageUIClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 2 };
    254253typedef struct WKPageUIClient {
    255254    int                                                                 version;
    … …  
    307306    WKPageHideColorPickerCallback                                       hideColorPicker;
    308307    WKPageUnavailablePluginButtonClickedCallback                        unavailablePluginButtonClicked;
    309 } WKPageUIClient;
     308} WKPageUIClient WK_DEPRECATED("Use an explicit versioned struct instead");
    310309
    311310#ifdef __cplusplus

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm

    r160040 r160104  
    481481static void setUpPagePolicyClient(WKBrowsingContextController *browsingContext, WebPageProxy& page)
    482482{
    483     WKPagePolicyClient policyClient;
     483    WKPagePolicyClientV1 policyClient;
    484484    memset(&policyClient, 0, sizeof(policyClient));
    485485
    486     policyClient.version = kWKPagePolicyClientCurrentVersion;
    487     policyClient.clientInfo = browsingContext;
     486    policyClient.base.version = 1;
     487    policyClient.base.clientInfo = browsingContext;
    488488
    489489    policyClient.decidePolicyForNavigationAction = [](WKPageRef page, WKFrameRef frame, WKFrameNavigationType navigationType, WKEventModifiers modifiers, WKEventMouseButton mouseButton, WKFrameRef originatingFrame, WKURLRequestRef request, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo)
    … …  
    543543    };
    544544
    545     page.initializePolicyClient(reinterpret_cast<const WKPagePolicyClientBase*>(&policyClient));
     545    page.initializePolicyClient(&policyClient.base);
    546546}
    547547

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKConnection.mm

    r159874 r160104  
    9494static void setUpClient(WKConnection *connection, WKConnectionRef connectionRef)
    9595{
    96     WKConnectionClient client;
     96    WKConnectionClientV0 client;
    9797    memset(&client, 0, sizeof(client));
    9898
    99     client.version = WKConnectionClientCurrentVersion;
    100     client.clientInfo = connection;
     99    client.base.version = 0;
     100    client.base.clientInfo = connection;
    101101    client.didReceiveMessage = didReceiveMessage;
    102102    client.didClose = didClose;
    103103
    104     WKConnectionSetConnectionClient(connectionRef, &client);
     104    WKConnectionSetConnectionClient(connectionRef, &client.base);
    105105}
    106106

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm

    r159881 r160104  
    7878static void setUpConnectionClient(WKProcessGroup *processGroup, WKContextRef contextRef)
    7979{
    80     WKContextConnectionClient connectionClient;
     80    WKContextConnectionClientV0 connectionClient;
    8181    memset(&connectionClient, 0, sizeof(connectionClient));
    8282
    83     connectionClient.version = kWKContextConnectionClientCurrentVersion;
    84     connectionClient.clientInfo = processGroup;
     83    connectionClient.base.version = 0;
     84    connectionClient.base.clientInfo = processGroup;
    8585    connectionClient.didCreateConnection = didCreateConnection;
    8686
    87     WKContextSetConnectionClient(contextRef, &connectionClient);
     87    WKContextSetConnectionClient(contextRef, &connectionClient.base);
    8888}
    8989
    … …  
    102102static void setUpInectedBundleClient(WKProcessGroup *processGroup, WKContextRef contextRef)
    103103{
    104     WKContextInjectedBundleClient injectedBundleClient;
     104    WKContextInjectedBundleClientV1 injectedBundleClient;
    105105    memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
    106106
    107     injectedBundleClient.version = kWKContextInjectedBundleClientCurrentVersion;
    108     injectedBundleClient.clientInfo = processGroup;
     107    injectedBundleClient.base.version = 1;
     108    injectedBundleClient.base.clientInfo = processGroup;
    109109    injectedBundleClient.getInjectedBundleInitializationUserData = getInjectedBundleInitializationUserData;
    110110
    111     WKContextSetInjectedBundleClient(contextRef, &injectedBundleClient);
     111    WKContextSetInjectedBundleClient(contextRef, &injectedBundleClient.base);
    112112}
    113113
    … …  
    154154static void setUpHistoryClient(WKProcessGroup *processGroup, WKContextRef contextRef)
    155155{
    156     WKContextHistoryClient historyClient;
     156    WKContextHistoryClientV0 historyClient;
    157157    memset(&historyClient, 0, sizeof(historyClient));
    158158
    159     historyClient.version = kWKContextHistoryClientCurrentVersion;
    160     historyClient.clientInfo = processGroup;
     159    historyClient.base.version = 0;
     160    historyClient.base.clientInfo = processGroup;
    161161    historyClient.didNavigateWithNavigationData = didNavigateWithNavigationData;
    162162    historyClient.didPerformClientRedirect = didPerformClientRedirect;
    … …  
    164164    historyClient.didUpdateHistoryTitle = didUpdateHistoryTitle;
    165165
    166     WKContextSetHistoryClient(contextRef, &historyClient);
     166    WKContextSetHistoryClient(contextRef, &historyClient.base);
    167167}
    168168

  • trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp

    r159988 r160104  
    439439    inspectorPageParameters = inspectorPage->creationParameters();
    440440
    441     WKPagePolicyClient policyClient = {
    442         kWKPagePolicyClientCurrentVersion,
    443         this, /* clientInfo */
     441    WKPagePolicyClientV1 policyClient = {
     442        { 1, this },
    444443        0, /* decidePolicyForNavigationAction_deprecatedForUseWithV0 */
    445444        0, /* decidePolicyForNewWindowAction */

  • trunk/Source/WebKit2/UIProcess/WebUIClient.cpp

    r159988 r160104  
    5252        return 0;
    5353   
    54     if (m_client.base.version == kWKPageUIClientCurrentVersion && !m_client.createNewPage)
     54    if (m_client.base.version > 0 && !m_client.createNewPage)
    5555        return 0;
    5656
    … …  
    165165        return;
    166166
    167     if (m_client.base.version == kWKPageUIClientCurrentVersion && !m_client.mouseDidMoveOverElement)
     167    if (m_client.base.version > 0 && !m_client.mouseDidMoveOverElement)
    168168        return;
    169169

  • trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm

    r159988 r160104  
    400400    WebPageProxy* inspectorPage = toImpl(m_inspectorView.get().pageRef);
    401401
    402     WKPageUIClient uiClient = {
    403         kWKPageUIClientCurrentVersion,
    404         this,   /* clientInfo */
     402    WKPageUIClientV2 uiClient = {
     403        { 2, this },
    405404        0, // createNewPage_deprecatedForUseWithV0
    406405        0, // showPage

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp

    r159988 r160104  
    4141}
    4242
    43 void WKBundleSetClient(WKBundleRef bundleRef, WKBundleClient *wkClient)
    44 {
    45     toImpl(bundleRef)->initializeClient(reinterpret_cast<WKBundleClientBase*>(wkClient));
     43void WKBundleSetClient(WKBundleRef bundleRef, WKBundleClientBase *wkClient)
     44{
     45    toImpl(bundleRef)->initializeClient(wkClient);
    4646}
    4747

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.h

    r159981 r160104  
    6969} WKBundleClientV1;
    7070
    71 // FIXME: Deprecate.
    72 enum { kWKBundleClientCurrentVersion = 1 };
     71enum { kWKBundleClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 1 };
    7372typedef struct WKBundleClient {
    7473    int                                                                 version;
    … …  
    8382    // Version 1.
    8483    WKBundleDidReceiveMessageToPageCallback                             didReceiveMessageToPage;
    85 } WKBundleClient;
     84} WKBundleClient WK_DEPRECATED("Use an explicit versioned struct instead");
    8685
    8786WK_EXPORT WKTypeID WKBundleGetTypeID();
    8887
    89 WK_EXPORT void WKBundleSetClient(WKBundleRef bundle, WKBundleClient* client);
     88WK_EXPORT void WKBundleSetClient(WKBundleRef bundle, WKBundleClientBase* client);
    9089
    9190WK_EXPORT void WKBundlePostMessage(WKBundleRef bundle, WKStringRef messageName, WKTypeRef messageBody);

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp

    r159988 r160104  
    6262}
    6363
    64 void WKBundlePageSetContextMenuClient(WKBundlePageRef pageRef, WKBundlePageContextMenuClient* wkClient)
     64void WKBundlePageSetContextMenuClient(WKBundlePageRef pageRef, WKBundlePageContextMenuClientBase* wkClient)
    6565{
    6666#if ENABLE(CONTEXT_MENUS)
    67     toImpl(pageRef)->initializeInjectedBundleContextMenuClient(reinterpret_cast<WKBundlePageContextMenuClientBase*>(wkClient));
    68 #endif
    69 }
    70 
    71 void WKBundlePageSetEditorClient(WKBundlePageRef pageRef, WKBundlePageEditorClient* wkClient)
    72 {
    73     toImpl(pageRef)->initializeInjectedBundleEditorClient(reinterpret_cast<WKBundlePageEditorClientBase*>(wkClient));
    74 }
    75 
    76 void WKBundlePageSetFormClient(WKBundlePageRef pageRef, WKBundlePageFormClient* wkClient)
    77 {
    78     toImpl(pageRef)->initializeInjectedBundleFormClient(reinterpret_cast<WKBundlePageFormClientBase*>(wkClient));
    79 }
    80 
    81 void WKBundlePageSetPageLoaderClient(WKBundlePageRef pageRef, WKBundlePageLoaderClient* wkClient)
    82 {
    83     toImpl(pageRef)->initializeInjectedBundleLoaderClient(reinterpret_cast<WKBundlePageLoaderClientBase*>(wkClient));
    84 }
    85 
    86 void WKBundlePageSetResourceLoadClient(WKBundlePageRef pageRef, WKBundlePageResourceLoadClient* wkClient)
    87 {
    88     toImpl(pageRef)->initializeInjectedBundleResourceLoadClient(reinterpret_cast<WKBundlePageResourceLoadClientBase*>(wkClient));
    89 }
    90 
    91 void WKBundlePageSetPolicyClient(WKBundlePageRef pageRef, WKBundlePagePolicyClient* wkClient)
    92 {
    93     toImpl(pageRef)->initializeInjectedBundlePolicyClient(reinterpret_cast<WKBundlePagePolicyClientBase*>(wkClient));
    94 }
    95 
    96 void WKBundlePageSetUIClient(WKBundlePageRef pageRef, WKBundlePageUIClient* wkClient)
    97 {
    98     toImpl(pageRef)->initializeInjectedBundleUIClient(reinterpret_cast<WKBundlePageUIClientBase*>(wkClient));
    99 }
    100 
    101 void WKBundlePageSetFullScreenClient(WKBundlePageRef pageRef, WKBundlePageFullScreenClient* wkClient)
     67    toImpl(pageRef)->initializeInjectedBundleContextMenuClient(wkClient);
     68#endif
     69}
     70
     71void WKBundlePageSetEditorClient(WKBundlePageRef pageRef, WKBundlePageEditorClientBase* wkClient)
     72{
     73    toImpl(pageRef)->initializeInjectedBundleEditorClient(wkClient);
     74}
     75
     76void WKBundlePageSetFormClient(WKBundlePageRef pageRef, WKBundlePageFormClientBase* wkClient)
     77{
     78    toImpl(pageRef)->initializeInjectedBundleFormClient(wkClient);
     79}
     80
     81void WKBundlePageSetPageLoaderClient(WKBundlePageRef pageRef, WKBundlePageLoaderClientBase* wkClient)
     82{
     83    toImpl(pageRef)->initializeInjectedBundleLoaderClient(wkClient);
     84}
     85
     86void WKBundlePageSetResourceLoadClient(WKBundlePageRef pageRef, WKBundlePageResourceLoadClientBase* wkClient)
     87{
     88    toImpl(pageRef)->initializeInjectedBundleResourceLoadClient(wkClient);
     89}
     90
     91void WKBundlePageSetPolicyClient(WKBundlePageRef pageRef, WKBundlePagePolicyClientBase* wkClient)
     92{
     93    toImpl(pageRef)->initializeInjectedBundlePolicyClient(wkClient);
     94}
     95
     96void WKBundlePageSetUIClient(WKBundlePageRef pageRef, WKBundlePageUIClientBase* wkClient)
     97{
     98    toImpl(pageRef)->initializeInjectedBundleUIClient(wkClient);
     99}
     100
     101void WKBundlePageSetFullScreenClient(WKBundlePageRef pageRef, WKBundlePageFullScreenClientBase* wkClient)
    102102{
    103103#if defined(ENABLE_FULLSCREEN_API) && ENABLE_FULLSCREEN_API
    104     toImpl(pageRef)->initializeInjectedBundleFullScreenClient(reinterpret_cast<WKBundlePageFullScreenClientBase*>(wkClient));
     104    toImpl(pageRef)->initializeInjectedBundleFullScreenClient(wkClient);
    105105#else
    106106    UNUSED_PARAM(pageRef);
    … …  
    145145}
    146146
    147 void WKBundlePageSetDiagnosticLoggingClient(WKBundlePageRef pageRef, WKBundlePageDiagnosticLoggingClient* client)
    148 {
    149     toImpl(pageRef)->initializeInjectedBundleDiagnosticLoggingClient(reinterpret_cast<WKBundlePageDiagnosticLoggingClientBase*>(client));
     147void WKBundlePageSetDiagnosticLoggingClient(WKBundlePageRef pageRef, WKBundlePageDiagnosticLoggingClientBase* client)
     148{
     149    toImpl(pageRef)->initializeInjectedBundleDiagnosticLoggingClient(client);
    150150}
    151151

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h

    r159976 r160104  
    5858WK_EXPORT WKTypeID WKBundlePageGetTypeID();
    5959
    60 WK_EXPORT void WKBundlePageSetContextMenuClient(WKBundlePageRef page, WKBundlePageContextMenuClient* client);
    61 WK_EXPORT void WKBundlePageSetEditorClient(WKBundlePageRef page, WKBundlePageEditorClient* client);
    62 WK_EXPORT void WKBundlePageSetFormClient(WKBundlePageRef page, WKBundlePageFormClient* client);
    63 WK_EXPORT void WKBundlePageSetPageLoaderClient(WKBundlePageRef page, WKBundlePageLoaderClient* client);
    64 WK_EXPORT void WKBundlePageSetResourceLoadClient(WKBundlePageRef page, WKBundlePageResourceLoadClient* client);
    65 WK_EXPORT void WKBundlePageSetPolicyClient(WKBundlePageRef page, WKBundlePagePolicyClient* client);
    66 WK_EXPORT void WKBundlePageSetUIClient(WKBundlePageRef page, WKBundlePageUIClient* client);
    67 WK_EXPORT void WKBundlePageSetFullScreenClient(WKBundlePageRef page, WKBundlePageFullScreenClient* client);
    68 WK_EXPORT void WKBundlePageSetDiagnosticLoggingClient(WKBundlePageRef page, WKBundlePageDiagnosticLoggingClient* client);
     60WK_EXPORT void WKBundlePageSetContextMenuClient(WKBundlePageRef page, WKBundlePageContextMenuClientBase* client);
     61WK_EXPORT void WKBundlePageSetEditorClient(WKBundlePageRef page, WKBundlePageEditorClientBase* client);
     62WK_EXPORT void WKBundlePageSetFormClient(WKBundlePageRef page, WKBundlePageFormClientBase* client);
     63WK_EXPORT void WKBundlePageSetPageLoaderClient(WKBundlePageRef page, WKBundlePageLoaderClientBase* client);
     64WK_EXPORT void WKBundlePageSetResourceLoadClient(WKBundlePageRef page, WKBundlePageResourceLoadClientBase* client);
     65WK_EXPORT void WKBundlePageSetPolicyClient(WKBundlePageRef page, WKBundlePagePolicyClientBase* client);
     66WK_EXPORT void WKBundlePageSetUIClient(WKBundlePageRef page, WKBundlePageUIClientBase* client);
     67WK_EXPORT void WKBundlePageSetFullScreenClient(WKBundlePageRef page, WKBundlePageFullScreenClientBase* client);
     68WK_EXPORT void WKBundlePageSetDiagnosticLoggingClient(WKBundlePageRef page, WKBundlePageDiagnosticLoggingClientBase* client);
    6969
    7070WK_EXPORT WKBundlePageGroupRef WKBundlePageGetPageGroup(WKBundlePageRef page);

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageBanner.h

    r159981 r160104  
    6060} WKBundlePageBannerClientV0;
    6161
    62 // FIXME: Deprecate.
    63 enum { kWKBundlePageBannerClientCurrentVersion = 0 };
     62enum { kWKBundlePageBannerClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
    6463typedef struct WKBundlePageBannerClient {
    6564    int                                                                 version;
    … …  
    7170    WKBundlePageBannerMouseMovedCallback                                mouseMoved;
    7271    WKBundlePageBannerMouseDraggedCallback                              mouseDragged;
    73 } WKBundlePageBannerClient;
     72} WKBundlePageBannerClient WK_DEPRECATED("Use an explicit versioned struct instead");
    7473
    7574

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h

    r159981 r160104  
    4343} WKBundlePageContextMenuClientV0;
    4444
    45 // FIXME: Deprecate.
    46 enum { kWKBundlePageContextMenuClientCurrentVersion = 0 };
     45enum { kWKBundlePageContextMenuClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
    4746typedef struct WKBundlePageContextMenuClient {
    4847    int                                                                 version;
    … …  
    5150    // Version 0.
    5251    WKBundlePageGetContextMenuFromDefaultContextMenuCallback            getContextMenuFromDefaultMenu;
    53 } WKBundlePageContextMenuClient;
     52} WKBundlePageContextMenuClient WK_DEPRECATED("Use an explicit versioned struct instead");
    5453
    5554#endif // WKBundlePageContextMenuClient_h

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h

    r159981 r160104  
    4343} WKBundlePageDiagnosticLoggingClientV0;
    4444
    45 // FIXME: Deprecate.
    46 enum { kWKBundlePageDiagnosticLoggingClientCurrentVersion = 0 };
     45enum { kWKBundlePageDiagnosticLoggingClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
    4746typedef struct WKBundlePageDiagnosticLoggingClient {
    4847    int                                                                 version;
    … …  
    5150    // Version 0.
    5251    WKBundlePageDiagnosticLoggingCallback                               logDiagnosticMessage;
    53 } WKBundlePageDiagnosticLoggingClient;
     52} WKBundlePageDiagnosticLoggingClient WK_DEPRECATED("Use an explicit versioned struct instead");
    5453
    5554#endif // WKBundlePageDiagnosticLoggingClient_h

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageEditorClient.h

    r159981 r160104  
    115115} WKBundlePageEditorClientV1;
    116116
    117 // FIXME: Deprecate.
    118 enum { kWKBundlePageEditorClientCurrentVersion = 1 };
     117enum { kWKBundlePageEditorClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 1 };
    119118typedef struct WKBundlePageEditorClient {
    120119    int                                                                 version;
    … …  
    138137    WKBundlePageGetPasteboardDataForRange                               getPasteboardDataForRange;
    139138    WKBundlePageDidWriteToPasteboard                                    didWriteToPasteboard;
    140 } WKBundlePageEditorClient;
     139} WKBundlePageEditorClient WK_DEPRECATED("Use an explicit versioned struct instead");
    141140
    142141#endif // WKBundlePageEditorClient_h

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h

    r159981 r160104  
    9292} WKBundlePageFormClientV2;
    9393
    94 // FIXME: Deprecate.
    95 enum { kWKBundlePageFormClientCurrentVersion = 2 };
     94enum { kWKBundlePageFormClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 2 };
    9695typedef struct WKBundlePageFormClient {
    9796    int                                                                 version;
    … …  
    113112    WKBundlePageShouldNotifyOnFormChangesCallback                       shouldNotifyOnFormChanges;
    114113    WKBundlePageDidAssociateFormControlsCallback                        didAssociateFormControls;
    115 } WKBundlePageFormClient;
     114} WKBundlePageFormClient WK_DEPRECATED("Use an explicit versioned struct instead");
    116115
    117116#endif // WKBundlePageFormClient_h

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFullScreenClient.h

    r159981 r160104  
    6565} WKBundlePageFullScreenClientV1;
    6666
    67 // FIXME: Deprecate.
    68 enum { kWKBundlePageFullScreenClientCurrentVersion = 1 };
     67enum { kWKBundlePageFullScreenClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 1 };
    6968typedef struct WKBundlePageFullScreenClient {
    7069    int                                                                 version;
    … …  
    8079    WKBundlePageBeganExitFullScreen                                     beganExitFullScreen;
    8180    WKBundlePageCloseFullScreen                                         closeFullScreen;
    82 } WKBundlePageFullScreenClient;
     81} WKBundlePageFullScreenClient WK_DEPRECATED("Use an explicit versioned struct instead");
    8382
    8483#endif // WKBundlePageFullScreenClient_h

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h

    r159981 r160104  
    407407} WKBundlePageLoaderClientV7;
    408408
    409 // FIXME: Deprecate.
    410 enum { kWKBundlePageLoaderClientCurrentVersion = 7 };
     409enum { kWKBundlePageLoaderClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 7 };
    411410typedef struct WKBundlePageLoaderClient {
    412411    int                                                                     version;
    … …  
    463462    // Version 7
    464463    WKBundlePageWillDestroyFrame                                            willDestroyFrame;
    465 } WKBundlePageLoaderClient;
     464} WKBundlePageLoaderClient WK_DEPRECATED("Use an explicit versioned struct instead");
    466465
    467466#endif // WKBundlePageLoaderClient_h

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp

    r160059 r160104  
    148148}
    149149
    150 WKBundlePageOverlayRef WKBundlePageOverlayCreate(WKBundlePageOverlayClient* wkClient)
     150WKBundlePageOverlayRef WKBundlePageOverlayCreate(WKBundlePageOverlayClientBase* wkClient)
    151151{
    152152    if (wkClient && wkClient->version)
    153153        return 0;
    154154
    155     auto clientImpl = std::make_unique<PageOverlayClientImpl>(reinterpret_cast<WKBundlePageOverlayClientBase*>(wkClient));
     155    auto clientImpl = std::make_unique<PageOverlayClientImpl>(wkClient);
    156156
    157157    // FIXME: Looks like this leaks the clientImpl.
    … …  
    159159}
    160160
    161 void WKBundlePageOverlaySetAccessibilityClient(WKBundlePageOverlayRef bundlePageOverlayRef, WKBundlePageOverlayAccessibilityClient* client)
     161void WKBundlePageOverlaySetAccessibilityClient(WKBundlePageOverlayRef bundlePageOverlayRef, WKBundlePageOverlayAccessibilityClientBase* client)
    162162{
    163163    if (client && client->version)
    164164        return;
    165     static_cast<PageOverlayClientImpl*>(toImpl(bundlePageOverlayRef)->client())->setAccessibilityClient(reinterpret_cast<WKBundlePageOverlayAccessibilityClientBase*>(client));
     165    static_cast<PageOverlayClientImpl*>(toImpl(bundlePageOverlayRef)->client())->setAccessibilityClient(client);
    166166}
    167167

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h

    r159981 r160104  
    6868} WKBundlePageOverlayClientV0;
    6969
    70 // FIXME: Deprecate.
    71 enum { kWKBundlePageOverlayClientCurrentVersion = 0 };
     70enum { kWKBundlePageOverlayClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
    7271typedef struct WKBundlePageOverlayClient {
    7372    int                                                                 version;
    … …  
    8281    WKBundlePageOverlayMouseMovedCallback                               mouseMoved;
    8382    WKBundlePageOverlayMouseDraggedCallback                             mouseDragged;
    84 } WKBundlePageOverlayClient;
     83} WKBundlePageOverlayClient WK_DEPRECATED("Use an explicit versioned struct instead");
    8584
    8685typedef WKTypeRef (*WKAccessibilityAttributeValueCallback)(WKBundlePageOverlayRef pageOverlay, WKStringRef attribute, WKTypeRef parameter, const void* clientInfo);
    … …  
    10099} WKBundlePageOverlayAccessibilityClientV0;
    101100
    102 // FIXME: Deprecate.
    103 enum { kWKBundlePageOverlayAccessibilityClientCurrentVersion = 0 };
     101enum { kWKBundlePageOverlayAccessibilityClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
    104102typedef struct WKBundlePageOverlayAccessibilityClient {
    105103    int                                                                 version;
    … …  
    109107    WKAccessibilityAttributeValueCallback                               copyAccessibilityAttributeValue;
    110108    WKAccessibilityAttributeNamesCallback                               copyAccessibilityAttributeNames;
    111 } WKBundlePageOverlayAccessibilityClient;
    112    
     109} WKBundlePageOverlayAccessibilityClient WK_DEPRECATED("Use an explicit versioned struct instead");
     110
    113111WK_EXPORT WKTypeID WKBundlePageOverlayGetTypeID();
    114112
    115 WK_EXPORT WKBundlePageOverlayRef WKBundlePageOverlayCreate(WKBundlePageOverlayClient* client);
     113WK_EXPORT WKBundlePageOverlayRef WKBundlePageOverlayCreate(WKBundlePageOverlayClientBase* client);
    116114WK_EXPORT void WKBundlePageOverlaySetNeedsDisplay(WKBundlePageOverlayRef bundlePageOverlay, WKRect rect);
    117115WK_EXPORT float WKBundlePageOverlayFractionFadedIn(WKBundlePageOverlayRef bundlePageOverlay);
    118 WK_EXPORT void WKBundlePageOverlaySetAccessibilityClient(WKBundlePageOverlayRef bundlePageOverlay, WKBundlePageOverlayAccessibilityClient* client);
     116WK_EXPORT void WKBundlePageOverlaySetAccessibilityClient(WKBundlePageOverlayRef bundlePageOverlay, WKBundlePageOverlayAccessibilityClientBase* client);
    119117
    120118#ifdef __cplusplus

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePolicyClient.h

    r159981 r160104  
    5555} WKBundlePagePolicyClientV0;
    5656
    57 // FIXME: Deprecate.
    58 enum { kWKBundlePagePolicyClientCurrentVersion = 0 };
     57enum { kWKBundlePagePolicyClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
    5958typedef struct WKBundlePagePolicyClient {
    6059    int                                                                 version;
    … …  
    6665    WKBundlePageDecidePolicyForResponseCallback                         decidePolicyForResponse;
    6766    WKBundlePageUnableToImplementPolicyCallback                         unableToImplementPolicy;
    68 } WKBundlePagePolicyClient;
     67} WKBundlePagePolicyClient WK_DEPRECATED("Use an explicit versioned struct instead");
    6968
    7069#endif // WKBundlePagePolicyClient_h

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h

    r159981 r160104  
    7777} WKBundlePageResourceLoadClientV1;
    7878
    79 // FIXME: Deprecate.
    80 enum { kWKBundlePageResourceLoadClientCurrentVersion = 1 };
     79enum { kWKBundlePageResourceLoadClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 1 };
    8180typedef struct WKBundlePageResourceLoadClient {
    8281    int                                                                 version;
    … …  
    9796    WKBundlePageShouldCacheResponseCallback                             shouldCacheResponse;
    9897    WKBundlePageShouldUseCredentialStorageCallback                      shouldUseCredentialStorage;
    99 } WKBundlePageResourceLoadClient;
     98} WKBundlePageResourceLoadClient WK_DEPRECATED("Use an explicit versioned struct instead");
    10099
    101100#endif // WKBundlePageResourceLoadClient_h

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h

    r159981 r160104  
    134134} WKBundlePageUIClientV2;
    135135
    136 // FIXME: Deprecate.
    137 enum { kWKBundlePageUIClientCurrentVersion = 2 };
     136enum { kWKBundlePageUIClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 2 };
    138137typedef struct WKBundlePageUIClient {
    139138    int                                                                 version;
    … …  
    165164    WKBundlePagePlugInCreateExtraStyleSheetCallback                     createPlugInExtraStyleSheet;
    166165    WKBundlePagePlugInCreateExtraScriptCallback                         createPlugInExtraScript;
    167 } WKBundlePageUIClient;
     166} WKBundlePageUIClient WK_DEPRECATED("Use an explicit versioned struct instead");
    168167
    169168#endif // WKBundlePageUIClient_h

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.h

    r149417 r160104  
    3636#endif
    3737
    38 WK_EXPORT WKBundlePageBannerRef WKBundlePageBannerCreateBannerWithCALayer(CALayer *layer, int height, WKBundlePageBannerClient * client);
     38WK_EXPORT WKBundlePageBannerRef WKBundlePageBannerCreateBannerWithCALayer(CALayer *layer, int height, WKBundlePageBannerClientBase* client);
    3939
    4040WK_EXPORT CALayer * WKBundlePageBannerGetLayer(WKBundlePageBannerRef pageBanner);

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm

    r160057 r160104  
    9696};
    9797
    98 WKBundlePageBannerRef WKBundlePageBannerCreateBannerWithCALayer(CALayer *layer, int height, WKBundlePageBannerClient* wkClient)
     98WKBundlePageBannerRef WKBundlePageBannerCreateBannerWithCALayer(CALayer *layer, int height, WKBundlePageBannerClientBase* wkClient)
    9999{
    100100    if (wkClient && wkClient->version)
    101101        return 0;
    102102
    103     auto clientImpl = std::make_unique<PageBannerClientImpl>(reinterpret_cast<WKBundlePageBannerClientBase*>(wkClient));
     103    auto clientImpl = std::make_unique<PageBannerClientImpl>(wkClient);
    104104    return toAPI(PageBanner::create(layer, height, clientImpl.release()).leakRef());
    105105}

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm

    r159775 r160104  
    8585static void setUpBundleClient(WKWebProcessPlugInController *plugInController, WKBundleRef bundleRef)
    8686{
    87     WKBundleClient bundleClient;
     87    WKBundleClientV1 bundleClient;
    8888    memset(&bundleClient, 0, sizeof(bundleClient));
    8989
    90     bundleClient.version = kWKBundleClientCurrentVersion;
    91     bundleClient.clientInfo = plugInController;
     90    bundleClient.base.version = 1;
     91    bundleClient.base.clientInfo = plugInController;
    9292    bundleClient.didCreatePage = didCreatePage;
    9393    bundleClient.willDestroyPage = willDestroyPage;
    9494
    95     WKBundleSetClient(bundleRef, &bundleClient);
     95    WKBundleSetClient(bundleRef, &bundleClient.base);
    9696}
    9797

  • trunk/Tools/ChangeLog

    r160093 r160104  
     12013-12-03  Anders Carlsson  <andersca@apple.com>
     2
     3        Deprecate all unversioned client structs in favor of having explicit versioned structs
     4        https://bugs.webkit.org/show_bug.cgi?id=125203
     5
     6        Reviewed by Dan Bernstein.
     7
     8        Update for WebKit2 API changes.
     9
     10        * MiniBrowser/mac/AppDelegate.m:
     11        (-[BrowserAppDelegate init]):
     12        * MiniBrowser/mac/WK2BrowserWindowController.m:
     13        (-[WK2BrowserWindowController awakeFromNib]):
     14        * TestWebKitAPI/InjectedBundleController.cpp:
     15        (TestWebKitAPI::InjectedBundleController::initialize):
     16        * TestWebKitAPI/Tests/WebKit2/AboutBlankLoad.cpp:
     17        (TestWebKitAPI::TEST):
     18        * TestWebKitAPI/Tests/WebKit2/CanHandleRequest.cpp:
     19        (TestWebKitAPI::setInjectedBundleClient):
     20        * TestWebKitAPI/Tests/WebKit2/CloseThenTerminate.cpp:
     21        (TestWebKitAPI::TEST):
     22        * TestWebKitAPI/Tests/WebKit2/CookieManager.cpp:
     23        (TestWebKitAPI::TEST):
     24        * TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionBasic.cpp:
     25        (TestWebKitAPI::TEST):
     26        * TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionBasic_Bundle.cpp:
     27        (TestWebKitAPI::DOMWindowExtensionBasic::didCreatePage):
     28        * TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache.cpp:
     29        (TestWebKitAPI::TEST):
     30        * TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache_Bundle.cpp:
     31        (TestWebKitAPI::DOMWindowExtensionNoCache::didCreatePage):
     32        * TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls.cpp:
     33        (TestWebKitAPI::setInjectedBundleClient):
     34        * TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls_Bundle.cpp:
     35        (TestWebKitAPI::DidAssociateFormControlsTest::didCreatePage):
     36        * TestWebKitAPI/Tests/WebKit2/DidNotHandleKeyDown.cpp:
     37        (TestWebKitAPI::TEST):
     38        * TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp:
     39        (TestWebKitAPI::TEST):
     40        * TestWebKitAPI/Tests/WebKit2/DownloadDecideDestinationCrash.cpp:
     41        (TestWebKitAPI::setContextDownloadClient):
     42        (TestWebKitAPI::setPagePolicyClient):
     43        * TestWebKitAPI/Tests/WebKit2/FailedLoad.cpp:
     44        (TestWebKitAPI::TEST):
     45        * TestWebKitAPI/Tests/WebKit2/Find.cpp:
     46        (TestWebKitAPI::TEST):
     47        * TestWebKitAPI/Tests/WebKit2/FindMatches.mm:
     48        (TestWebKitAPI::TEST):
     49        * TestWebKitAPI/Tests/WebKit2/ForceRepaint.cpp:
     50        (TestWebKitAPI::TEST):
     51        * TestWebKitAPI/Tests/WebKit2/FrameMIMETypeHTML.cpp:
     52        (TestWebKitAPI::TEST):
     53        * TestWebKitAPI/Tests/WebKit2/FrameMIMETypePNG.cpp:
     54        (TestWebKitAPI::TEST):
     55        * TestWebKitAPI/Tests/WebKit2/Geolocation.cpp:
     56        (TestWebKitAPI::setupGeolocationProvider):
     57        (TestWebKitAPI::setupView):
     58        (TestWebKitAPI::TEST):
     59        * TestWebKitAPI/Tests/WebKit2/GetInjectedBundleInitializationUserDataCallback.cpp:
     60        (TestWebKitAPI::TEST):
     61        * TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle.cpp:
     62        (TestWebKitAPI::setPageLoaderClient):
     63        (TestWebKitAPI::setInjectedBundleClient):
     64        * TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle_Bundle.cpp:
     65        (TestWebKitAPI::HitTestResultNodeHandleTest::didCreatePage):
     66        * TestWebKitAPI/Tests/WebKit2/InjectedBundleBasic.cpp:
     67        (TestWebKitAPI::TEST):
     68        * TestWebKitAPI/Tests/WebKit2/InjectedBundleFrameHitTest.cpp:
     69        (TestWebKitAPI::setInjectedBundleClient):
     70        * TestWebKitAPI/Tests/WebKit2/InjectedBundleFrameHitTest_Bundle.cpp:
     71        (TestWebKitAPI::InjectedBundleFrameHitTestTest::didCreatePage):
     72        * TestWebKitAPI/Tests/WebKit2/InjectedBundleInitializationUserDataCallbackWins.cpp:
     73        (TestWebKitAPI::TEST):
     74        * TestWebKitAPI/Tests/WebKit2/LayoutMilestonesWithAllContentInFrame.cpp:
     75        (TestWebKitAPI::TEST):
     76        * TestWebKitAPI/Tests/WebKit2/LoadAlternateHTMLStringWithNonDirectoryURL.cpp:
     77        (TestWebKitAPI::TEST):
     78        * TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback.cpp:
     79        (TestWebKitAPI::TEST):
     80        * TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback_Bundle.cpp:
     81        (TestWebKitAPI::LoadCanceledNoServerRedirectCallbackTest::didCreatePage):
     82        * TestWebKitAPI/Tests/WebKit2/LoadPageOnCrash.cpp:
     83        (TestWebKitAPI::WebKit2CrashLoader::WebKit2CrashLoader):
     84        * TestWebKitAPI/Tests/WebKit2/MouseMoveAfterCrash.cpp:
     85        (TestWebKitAPI::setPageLoaderClient):
     86        * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayout.cpp:
     87        (TestWebKitAPI::setPageLoaderClient):
     88        * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFails.cpp:
     89        (TestWebKitAPI::setPageLoaderClient):
     90        * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutForImages.cpp:
     91        (TestWebKitAPI::setPageLoaderClient):
     92        * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames.cpp:
     93        (TestWebKitAPI::setPageLoaderClient):
     94        * TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp:
     95        (TestWebKitAPI::TEST):
     96        * TestWebKitAPI/Tests/WebKit2/PageLoadDidChangeLocationWithinPageForFrame.cpp:
     97        (TestWebKitAPI::TEST):
     98        * TestWebKitAPI/Tests/WebKit2/ParentFrame.cpp:
     99        (TestWebKitAPI::setInjectedBundleClient):
     100        * TestWebKitAPI/Tests/WebKit2/ParentFrame_Bundle.cpp:
     101        (TestWebKitAPI::ParentFrameTest::didCreatePage):
     102        * TestWebKitAPI/Tests/WebKit2/PasteboardNotifications.mm:
     103        (TestWebKitAPI::setInjectedBundleClient):
     104        * TestWebKitAPI/Tests/WebKit2/PasteboardNotifications_Bundle.cpp:
     105        (TestWebKitAPI::PasteboardNotificationsTest::didCreatePage):
     106        * TestWebKitAPI/Tests/WebKit2/PrivateBrowsingPushStateNoHistoryCallback.cpp:
     107        (TestWebKitAPI::TEST):
     108        * TestWebKitAPI/Tests/WebKit2/ReloadPageAfterCrash.cpp:
     109        (TestWebKitAPI::TEST):
     110        * TestWebKitAPI/Tests/WebKit2/ResizeReversePaginatedWebView.cpp:
     111        (TestWebKitAPI::TEST):
     112        * TestWebKitAPI/Tests/WebKit2/ResizeWindowAfterCrash.cpp:
     113        (TestWebKitAPI::TEST):
     114        * TestWebKitAPI/Tests/WebKit2/ResponsivenessTimerDoesntFireEarly.cpp:
     115        (TestWebKitAPI::setInjectedBundleClient):
     116        (TestWebKitAPI::setPageLoaderClient):
     117        * TestWebKitAPI/Tests/WebKit2/RestoreSessionStateContainingFormData.cpp:
     118        (TestWebKitAPI::setPageLoaderClient):
     119        * TestWebKitAPI/Tests/WebKit2/ScrollPinningBehaviors.cpp:
     120        (TestWebKitAPI::TEST):
     121        * TestWebKitAPI/Tests/WebKit2/ShouldGoToBackForwardListItem.cpp:
     122        (TestWebKitAPI::setPageLoaderClient):
     123        * TestWebKitAPI/Tests/WebKit2/ShouldGoToBackForwardListItem_Bundle.cpp:
     124        (TestWebKitAPI::ShouldGoToBackForwardListItemTest::didCreatePage):
     125        * TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp:
     126        (TestWebKitAPI::TEST):
     127        * TestWebKitAPI/Tests/WebKit2/TerminateTwice.cpp:
     128        (TestWebKitAPI::TEST):
     129        * TestWebKitAPI/Tests/WebKit2/UserMessage.cpp:
     130        (TestWebKitAPI::WebKit2UserMessageRoundTripTest::setInjectedBundleClient):
     131        (TestWebKitAPI::WebKit2UserMessageRoundTripTest::setPageLoaderClient):
     132        * TestWebKitAPI/Tests/WebKit2/WKConnection.cpp:
     133        (TestWebKitAPI::TEST):
     134        * TestWebKitAPI/Tests/WebKit2/WKConnection_Bundle.cpp:
     135        (TestWebKitAPI::WKConnectionTest::initialize):
     136        * TestWebKitAPI/Tests/WebKit2/WKPageGetScaleFactorNotZero.cpp:
     137        (TestWebKitAPI::setPageLoaderClient):
     138        * TestWebKitAPI/Tests/WebKit2/WebArchive.cpp:
     139        (TestWebKitAPI::setInjectedBundleClient):
     140        (TestWebKitAPI::TEST):
     141        * TestWebKitAPI/Tests/WebKit2/WillLoad.cpp:
     142        (TestWebKitAPI::WebKit2WillLoadTest::setInjectedBundleClient):
     143        * TestWebKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp:
     144        * TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent.cpp:
     145        (TestWebKitAPI::setInjectedBundleClient):
     146        * TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent_Bundle.cpp:
     147        (TestWebKitAPI::WillSendSubmitEventTest::didCreatePage):
     148        * TestWebKitAPI/Tests/WebKit2/mac/EditorCommands.mm:
     149        (TestWebKitAPI::TEST):
     150        * TestWebKitAPI/Tests/WebKit2/mac/GetBackingScaleFactor.mm:
     151        (TestWebKitAPI::setInjectedBundleClient):
     152        * TestWebKitAPI/Tests/WebKit2/mac/GetPIDAfterAbortedProcessLaunch.cpp:
     153        (TestWebKitAPI::TEST):
     154        * TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsInvalidScheme_Bundle.cpp:
     155        * TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing_Bundle.cpp:
     156        (TestWebKitAPI::DenyWillSendRequestTest::didCreatePage):
     157        * TestWebKitAPI/Tests/WebKit2ObjC/WKRemoteObjectRegistry.mm:
     158        (TestWebKitAPI::didCreateConnection):
     159        (TestWebKitAPI::TEST):
     160        * TestWebKitAPI/Tests/mac/PageVisibilityStateWithWindowChanges.mm:
     161        (TestWebKitAPI::PageVisibilityStateWithWindowChanges::initializeView):
     162        * TestWebKitAPI/Tests/mac/WKRemoteObjectRegistry_Bundle.mm:
     163        * TestWebKitAPI/mac/WebKitAgnosticTest.mm:
     164        (TestWebKitAPI::setPageLoaderClient):
     165        * WebKitTestRunner/GeolocationProviderMock.cpp:
     166        (WTR::GeolocationProviderMock::GeolocationProviderMock):
     167        * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
     168        (WTR::InjectedBundle::initialize):
     169        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
     170        (WTR::InjectedBundlePage::InjectedBundlePage):
     171        * WebKitTestRunner/TestController.cpp:
     172        (WTR::TestController::createOtherPage):
     173        (WTR::TestController::initialize):
     174        (WTR::TestController::createWebViewWithOptions):
     175
    11762013-12-04  Tamas Gergely  <tgergely.u-szeged@partner.samsung.com>
    2177

  • trunk/Tools/MiniBrowser/mac/AppDelegate.m

    r159902 r160104  
    9595    self = [super init];
    9696    if (self) {
    97         WKContextHistoryClient historyClient = {
    98             kWKContextHistoryClientCurrentVersion,
    99             self,
     97        WKContextHistoryClientV0 historyClient = {
     98            { 0, self },
    10099            didNavigateWithNavigationData,
    101100            didPerformClientRedirect,
    … …  
    107106        _processContext = WKContextCreate();
    108107
    109         WKContextSetHistoryClient(_processContext, &historyClient);
     108        WKContextSetHistoryClient(_processContext, &historyClient.base);
    110109        WKContextSetCacheModel(_processContext, kWKCacheModelPrimaryWebBrowser);
    111110

  • trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m

    r159902 r160104  
    616616    [containerView addSubview:_webView];
    617617   
    618     WKPageLoaderClient loadClient = {
    619         kWKPageLoaderClientCurrentVersion,
    620         self,   /* clientInfo */
     618    WKPageLoaderClientV3 loadClient = {
     619        { 3, self },
    621620        didStartProvisionalLoadForFrame,
    622621        didReceiveServerRedirectForProvisionalLoadForFrame,
    … …  
    656655        0, // pluginLoadPolicy
    657656    };
    658     WKPageSetPageLoaderClient(_webView.pageRef, &loadClient);
     657    WKPageSetPageLoaderClient(_webView.pageRef, &loadClient.base);
    659658
    660659    _webView.browsingContextController.policyDelegate = self;
    661660
    662     WKPageUIClient uiClient = {
    663         kWKPageUIClientCurrentVersion,
    664         self,       /* clientInfo */
     661    WKPageUIClientV2 uiClient = {
     662        { 2, self },
    665663        0,          /* createNewPage_deprecatedForUseWithV0 */
    666664        showPage,
    … …  
    710708        0, // unavailablePluginButtonClicked
    711709    };
    712     WKPageSetPageUIClient(_webView.pageRef, &uiClient);
     710    WKPageSetPageUIClient(_webView.pageRef, &uiClient.base);
    713711}
    714712

  • trunk/Tools/TestWebKitAPI/InjectedBundleController.cpp

    r129232 r160104  
    5555        return;
    5656
    57     WKBundleClient client = {
    58         0,
    59         this,
     57    WKBundleClientV1 client = {
     58        { 0, this },
    6059        didCreatePage,
    6160        willDestroyPage,
    … …  
    6463        didReceiveMessageToPage
    6564    };
    66     WKBundleSetClient(m_bundle, &client);
     65    WKBundleSetClient(m_bundle, &client.base);
    6766
    6867    // Initialize the test from the "initializationUserData".

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/AboutBlankLoad.cpp

    r136031 r160104  
    4444    PlatformWebView webView(context.get());
    4545
    46     WKPageLoaderClient loaderClient;
    47     memset(&loaderClient, 0 , sizeof(loaderClient));
     46    WKPageLoaderClientV0 loaderClient;
     47    memset(&loaderClient, 0, sizeof(loaderClient));
     48
     49    loaderClient.base.version = 0;
    4850    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    49     WKPageSetPageLoaderClient(webView.page(), &loaderClient);
     51
     52    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
    5053
    5154    WKPageLoadURL(webView.page(), adoptWK(WKURLCreateWithUTF8CString("about:blank")).get());

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/CanHandleRequest.cpp

    r96778 r160104  
    4646static void setInjectedBundleClient(WKContextRef context)
    4747{
    48     WKContextInjectedBundleClient injectedBundleClient;
     48    WKContextInjectedBundleClientV0 injectedBundleClient;
    4949    memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
     50
     51    injectedBundleClient.base.version = 0;
    5052    injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
    5153
    52     WKContextSetInjectedBundleClient(context, &injectedBundleClient);
     54    WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
    5355}
    5456

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/CloseThenTerminate.cpp

    r149573 r160104  
    4545    PlatformWebView webView(context.get());
    4646
    47     WKPageLoaderClient loaderClient;
     47    WKPageLoaderClientV0 loaderClient;
    4848    memset(&loaderClient, 0 , sizeof(loaderClient));
     49
     50    loaderClient.base.version = 0;
    4951    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    50     WKPageSetPageLoaderClient(webView.page(), &loaderClient);
     52   
     53    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
    5154
    5255    WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/CookieManager.cpp

    r95188 r160104  
    7373    PlatformWebView webView(wkContext.get());
    7474
    75     WKPageLoaderClient loaderClient;
     75    WKPageLoaderClientV0 loaderClient;
    7676    memset(&loaderClient, 0, sizeof(loaderClient));
    7777
    78     loaderClient.version = 0;
     78    loaderClient.base.version = 0;
    7979    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    80     WKPageSetPageLoaderClient(webView.page(), &loaderClient);
     80
     81    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
    8182
    8283    WKPageLoadURL(webView.page(), adoptWK(WKURLCreateWithUTF8CString("about:blank")).get());

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionBasic.cpp

    r145981 r160104  
    8484    WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextForInjectedBundleTest("DOMWindowExtensionBasic", pageGroup.get()));
    8585
    86     WKContextInjectedBundleClient injectedBundleClient;
     86    WKContextInjectedBundleClientV0 injectedBundleClient;
    8787    memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
    88     injectedBundleClient.version = 0;
    89     injectedBundleClient.clientInfo = 0;
     88
     89    injectedBundleClient.base.version = 0;
    9090    injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
    91     WKContextSetInjectedBundleClient(context.get(), &injectedBundleClient);
     91
     92    WKContextSetInjectedBundleClient(context.get(), &injectedBundleClient.base);
    9293   
    9394    // The default cache model has a capacity of 0, so it is necessary to switch to a cache

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionBasic_Bundle.cpp

    r130612 r160104  
    153153    m_bundle = bundle;
    154154
    155     WKBundlePageLoaderClient pageLoaderClient;
     155    WKBundlePageLoaderClientV1 pageLoaderClient;
    156156    memset(&pageLoaderClient, 0, sizeof(pageLoaderClient));
    157157   
    158     pageLoaderClient.version = 1;
    159     pageLoaderClient.clientInfo = this;
     158    pageLoaderClient.base.version = 1;
     159    pageLoaderClient.base.clientInfo = this;
    160160    pageLoaderClient.didFinishLoadForFrame = didFinishLoadForFrameCallback;
    161161    pageLoaderClient.globalObjectIsAvailableForFrame = globalObjectIsAvailableForFrameCallback;
    … …  
    164164    pageLoaderClient.willDestroyGlobalObjectForDOMWindowExtension = willDestroyGlobalObjectForDOMWindowExtensionCallback;
    165165   
    166     WKBundlePageSetPageLoaderClient(page, &pageLoaderClient);
     166    WKBundlePageSetPageLoaderClient(page, &pageLoaderClient.base);
    167167}
    168168

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache.cpp

    r150564 r160104  
    8585    WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextForInjectedBundleTest("DOMWindowExtensionNoCache", pageGroup.get()));
    8686
    87     WKContextInjectedBundleClient injectedBundleClient;
     87    WKContextInjectedBundleClientV1 injectedBundleClient;
    8888    memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
    89     injectedBundleClient.version = kWKContextInjectedBundleClientCurrentVersion;
    90     injectedBundleClient.clientInfo = 0;
     89
     90    injectedBundleClient.base.version = 1;
    9191    injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
    92     WKContextSetInjectedBundleClient(context.get(), &injectedBundleClient);
     92
     93    WKContextSetInjectedBundleClient(context.get(), &injectedBundleClient.base);
    9394
    9495    // Disable the page cache.

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache_Bundle.cpp

    r152095 r160104  
    160160    m_bundle = bundle;
    161161
    162     WKBundlePageLoaderClient pageLoaderClient;
     162    WKBundlePageLoaderClientV7 pageLoaderClient;
    163163    memset(&pageLoaderClient, 0, sizeof(pageLoaderClient));
    164164
    165     pageLoaderClient.version = kWKBundlePageLoaderClientCurrentVersion;
    166     pageLoaderClient.clientInfo = this;
     165    pageLoaderClient.base.version = 7;
     166    pageLoaderClient.base.clientInfo = this;
    167167    pageLoaderClient.didFinishLoadForFrame = didFinishLoadForFrameCallback;
    168168    pageLoaderClient.globalObjectIsAvailableForFrame = globalObjectIsAvailableForFrameCallback;
    … …  
    171171    pageLoaderClient.willDestroyGlobalObjectForDOMWindowExtension = willDestroyGlobalObjectForDOMWindowExtensionCallback;
    172172
    173     WKBundlePageSetPageLoaderClient(page, &pageLoaderClient);
     173    WKBundlePageSetPageLoaderClient(page, &pageLoaderClient.base);
    174174}
    175175

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls.cpp

    r150441 r160104  
    6464static void setInjectedBundleClient(WKContextRef context)
    6565{
    66     WKContextInjectedBundleClient injectedBundleClient;
     66    WKContextInjectedBundleClientV0 injectedBundleClient;
    6767    memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
     68
     69    injectedBundleClient.base.version = 0;
    6870    injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
    6971
    70     WKContextSetInjectedBundleClient(context, &injectedBundleClient);
     72    WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
    7173}
    7274

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls_Bundle.cpp

    r150441 r160104  
    6565void DidAssociateFormControlsTest::didCreatePage(WKBundleRef bundle, WKBundlePageRef page)
    6666{
    67     WKBundlePageFormClient formClient;
     67    WKBundlePageFormClientV2 formClient;
    6868    memset(&formClient, 0, sizeof(formClient));
    6969
    70     formClient.version = 2;
    71     formClient.clientInfo = this;
     70    formClient.base.version = 2;
     71    formClient.base.clientInfo = this;
    7272    formClient.shouldNotifyOnFormChanges = shouldNotifyOnFormChanges;
    7373    formClient.didAssociateFormControls = didAssociateFormControls;
    7474
    75     WKBundlePageSetFormClient(page, &formClient);
     75    WKBundlePageSetFormClient(page, &formClient.base);
    7676}
    7777

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/DidNotHandleKeyDown.cpp

    r153907 r160104  
    5151    PlatformWebView webView(context.get());
    5252
    53     WKPageLoaderClient loaderClient;
     53    WKPageLoaderClientV0 loaderClient;
    5454    memset(&loaderClient, 0, sizeof(loaderClient));
    5555   
    56     loaderClient.version = 0;
     56    loaderClient.base.version = 0;
    5757    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    58     WKPageSetPageLoaderClient(webView.page(), &loaderClient);
    5958
    60     WKPageUIClient uiClient;
     59    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     60
     61    WKPageUIClientV0 uiClient;
    6162    memset(&uiClient, 0, sizeof(uiClient));
    6263
     64    uiClient.base.version = 0;
    6365    uiClient.didNotHandleKeyEvent = didNotHandleKeyEventCallback;
    64     WKPageSetPageUIClient(webView.page(), &uiClient);
     66
     67    WKPageSetPageUIClient(webView.page(), &uiClient.base);
    6568
    6669    WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp

    r95188 r160104  
    5151    PlatformWebView webView(context.get(), pageGroup.get());
    5252
    53     WKPageUIClient uiClient;
     53    WKPageUIClientV0 uiClient;
    5454    memset(&uiClient, 0, sizeof(uiClient));
    55     uiClient.version = 0;
    56     uiClient.clientInfo = 0;
     55
     56    uiClient.base.version = 0;
    5757    uiClient.runJavaScriptAlert = runJavaScriptAlert;
    58     WKPageSetPageUIClient(webView.page(), &uiClient);
     58
     59    WKPageSetPageUIClient(webView.page(), &uiClient.base);
    5960
    6061    WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/DownloadDecideDestinationCrash.cpp

    r159358 r160104  
    4747static void setContextDownloadClient(WKContextRef context)
    4848{
    49     WKContextDownloadClient client;
     49    WKContextDownloadClientV0 client;
    5050    memset(&client, 0, sizeof(client));
     51
     52    client.base.version = 0;
    5153    client.decideDestinationWithSuggestedFilename = decideDestinationWithSuggestedFilename;
    5254
    53     WKContextSetDownloadClient(context, &client);
     55    WKContextSetDownloadClient(context, &client.base);
    5456}
    5557
    5658static void setPagePolicyClient(WKPageRef page)
    5759{
    58     WKPagePolicyClient policyClient;
     60    WKPagePolicyClientV1 policyClient;
    5961    memset(&policyClient, 0, sizeof(policyClient));
    60     policyClient.version = 1;
     62
     63    policyClient.base.version = 1;
    6164    policyClient.decidePolicyForNavigationAction = decidePolicyForNavigationAction;
    6265
    63     WKPageSetPagePolicyClient(page, &policyClient);
     66    WKPageSetPagePolicyClient(page, &policyClient.base);
    6467}
    6568

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/FailedLoad.cpp

    r95188 r160104  
    5151    PlatformWebView webView(context.get());
    5252
    53     WKPageLoaderClient loaderClient;
     53    WKPageLoaderClientV0 loaderClient;
    5454    memset(&loaderClient, 0, sizeof(loaderClient));
    5555
    56     loaderClient.version = 0;
    57     loaderClient.clientInfo = 0;
     56    loaderClient.base.version = 0;
    5857    loaderClient.didFailProvisionalLoadWithErrorForFrame = didFailProvisionalLoadWithErrorForFrame;
    59     WKPageSetPageLoaderClient(webView.page(), &loaderClient);
     58
     59    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
    6060
    6161    WKRetainPtr<WKURLRef> url(AdoptWK, Util::URLForNonExistentResource());

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/Find.cpp

    r95188 r160104  
    5252    PlatformWebView webView(context.get());
    5353   
    54     WKPageLoaderClient loaderClient;
     54    WKPageLoaderClientV0 loaderClient;
    5555    memset(&loaderClient, 0, sizeof(loaderClient));
    5656   
    57     loaderClient.version = 0;
     57    loaderClient.base.version = 0;
    5858    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    59     WKPageSetPageLoaderClient(webView.page(), &loaderClient);
    6059
    61     WKPageFindClient findClient;
     60    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     61
     62    WKPageFindClientV0 findClient;
    6263    memset(&findClient, 0, sizeof(findClient));
    6364
    64     findClient.version = 0;
     65    findClient.base.version = 0;
    6566    findClient.didCountStringMatches = didCountStringMatches;
    66     WKPageSetPageFindClient(webView.page(), &findClient);
     67
     68    WKPageSetPageFindClient(webView.page(), &findClient.base);
    6769
    6870    WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("find", "html"));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/FindMatches.mm

    r151607 r160104  
    113113    PlatformWebView webView(context.get());
    114114   
    115     WKPageLoaderClient loaderClient;
     115    WKPageLoaderClientV0 loaderClient;
    116116    memset(&loaderClient, 0, sizeof(loaderClient));
    117117   
    118     loaderClient.version = 0;
     118    loaderClient.base.version = 0;
    119119    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    120     WKPageSetPageLoaderClient(webView.page(), &loaderClient);
    121120
    122     WKPageFindMatchesClient findMatchesClient;
     121    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     122
     123    WKPageFindMatchesClientV0 findMatchesClient;
    123124    memset(&findMatchesClient, 0, sizeof(findMatchesClient));
    124125
    125     findMatchesClient.version = 0;
     126    findMatchesClient.base.version = 0;
    126127    findMatchesClient.didFindStringMatches = didFindStringMatches;
    127128    findMatchesClient.didGetImageForMatchResult = didGetImageForMatchResult;
    128129
    129     WKPageSetPageFindMatchesClient(webView.page(), &findMatchesClient);
     130    WKPageSetPageFindMatchesClient(webView.page(), &findMatchesClient.base);
    130131
    131132    // This HTML file contains 3 occurrences of the word Hello and has the second occurence of the word 'world' selected.

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/ForceRepaint.cpp

    r95188 r160104  
    5252    PlatformWebView webView(context.get());
    5353
    54     WKPageLoaderClient loaderClient;
     54    WKPageLoaderClientV0 loaderClient;
    5555    memset(&loaderClient, 0, sizeof(loaderClient));
    5656
    57     loaderClient.version = 0;
     57    loaderClient.base.version = 0;
    5858    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    59     WKPageSetPageLoaderClient(webView.page(), &loaderClient);
     59
     60    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
    6061
    6162    WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple-accelerated-compositing", "html"));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/FrameMIMETypeHTML.cpp

    r95188 r160104  
    5959    PlatformWebView webView(context.get());
    6060
    61     WKPageLoaderClient loaderClient;
     61    WKPageLoaderClientV0 loaderClient;
    6262    memset(&loaderClient, 0, sizeof(loaderClient));
    6363
    64     loaderClient.version = 0;
    65     loaderClient.clientInfo = 0;
     64    loaderClient.base.version = 0;
    6665    loaderClient.didStartProvisionalLoadForFrame = didStartProvisionalLoadForFrame;
    6766    loaderClient.didCommitLoadForFrame = didCommitLoadForFrame;
    6867    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    69     WKPageSetPageLoaderClient(webView.page(), &loaderClient);
     68
     69    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
    7070
    7171    WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/FrameMIMETypePNG.cpp

    r95188 r160104  
    5858    PlatformWebView webView(context.get());
    5959
    60     WKPageLoaderClient loaderClient;
     60    WKPageLoaderClientV0 loaderClient;
    6161    memset(&loaderClient, 0, sizeof(loaderClient));
    6262
    63     loaderClient.version = 0;
    64     loaderClient.clientInfo = 0;
     63    loaderClient.base.version = 0;
    6564    loaderClient.didStartProvisionalLoadForFrame = didStartProvisionalLoadForFrame;
    6665    loaderClient.didCommitLoadForFrame = didCommitLoadForFrame;
    6766    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    68     WKPageSetPageLoaderClient(webView.page(), &loaderClient);
     67
     68    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
    6969
    7070    WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("icon", "png"));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/Geolocation.cpp

    r158689 r160104  
    103103void setupGeolocationProvider(WKContextRef context, void *clientInfo)
    104104{
    105     WKGeolocationProvider providerCallback;
     105    WKGeolocationProviderV1 providerCallback;
    106106    memset(&providerCallback, 0, sizeof(WKGeolocationProvider));
    107     providerCallback.version = kWKGeolocationProviderCurrentVersion;
    108     providerCallback.clientInfo = clientInfo;
     107
     108    providerCallback.base.version = 1;
     109    providerCallback.base.clientInfo = clientInfo;
    109110    providerCallback.startUpdating = GeolocationStateTracker::startUpdatingCallback;
    110111    providerCallback.stopUpdating = GeolocationStateTracker::stopUpdatingCallback;
    111112    providerCallback.setEnableHighAccuracy = GeolocationStateTracker::setEnableHighAccuracyCallback;
    112     WKGeolocationManagerSetProvider(WKContextGetGeolocationManager(context), &providerCallback);
     113
     114    WKGeolocationManagerSetProvider(WKContextGetGeolocationManager(context), &providerCallback.base);
    113115}
    114116
    115117void setupView(PlatformWebView& webView)
    116118{
    117     WKPageUIClient uiClient;
     119    WKPageUIClientV2 uiClient;
    118120    memset(&uiClient, 0, sizeof(uiClient));
    119     uiClient.version = kWKPageUIClientCurrentVersion;
     121
     122    uiClient.base.version = 2;
    120123    uiClient.decidePolicyForGeolocationPermissionRequest = decidePolicyForGeolocationPermissionRequestCallBack;
    121     WKPageSetPageUIClient(webView.page(), &uiClient);
     124
     125    WKPageSetPageUIClient(webView.page(), &uiClient.base);
    122126}
    123127
    … …  
    312316
    313317    bool finishedSecondStep = false;
    314     WKPageLoaderClient loaderClient;
     318
     319    WKPageLoaderClientV0 loaderClient;
    315320    memset(&loaderClient, 0, sizeof(loaderClient));
    316     loaderClient.clientInfo = &finishedSecondStep;
     321
     322    loaderClient.base.version = 0;
     323    loaderClient.base.clientInfo = &finishedSecondStep;
    317324    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    318     WKPageSetPageLoaderClient(lowAccuracyWebView.page(), &loaderClient);
     325
     326    WKPageSetPageLoaderClient(lowAccuracyWebView.page(), &loaderClient.base);
    319327
    320328    WKRetainPtr<WKURLRef> lowAccuracyURL(AdoptWK, Util::createURLForResource("geolocationWatchPosition", "html"));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/GetInjectedBundleInitializationUserDataCallback.cpp

    r121979 r160104  
    4848    WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextWithInjectedBundle());
    4949
    50     WKContextInjectedBundleClient injectedBundleClient;
     50    WKContextInjectedBundleClientV1 injectedBundleClient;
    5151    memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
    52     injectedBundleClient.version = 1;
    53     injectedBundleClient.clientInfo = 0;
     52
     53    injectedBundleClient.base.version = 1;
    5454    injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
    5555    injectedBundleClient.getInjectedBundleInitializationUserData = getInjectedBundleInitializationUserData;
    56     WKContextSetInjectedBundleClient(context.get(), &injectedBundleClient);
     56
     57    WKContextSetInjectedBundleClient(context.get(), &injectedBundleClient.base);
    5758
    5859    PlatformWebView webView(context.get());

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle.cpp

    r95188 r160104  
    4949static void setPageLoaderClient(WKPageRef page)
    5050{
    51     WKPageLoaderClient loaderClient;
     51    WKPageLoaderClientV0 loaderClient;
    5252    memset(&loaderClient, 0, sizeof(loaderClient));
    53     loaderClient.version = 0;
     53
     54    loaderClient.base.version = 0;
    5455    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    5556
    56     WKPageSetPageLoaderClient(page, &loaderClient);
     57    WKPageSetPageLoaderClient(page, &loaderClient.base);
    5758}
    5859
    5960static void setInjectedBundleClient(WKContextRef context)
    6061{
    61     WKContextInjectedBundleClient injectedBundleClient;
     62    WKContextInjectedBundleClientV0 injectedBundleClient;
    6263    memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
    63     injectedBundleClient.version = 0;
    64     injectedBundleClient.clientInfo = 0;
     64
     65    injectedBundleClient.base.version = 0;
    6566    injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
    66     WKContextSetInjectedBundleClient(context, &injectedBundleClient);
     67
     68    WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
    6769}
    6870

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle_Bundle.cpp

    r95188 r160104  
    5252    virtual void didCreatePage(WKBundleRef bundle, WKBundlePageRef page)
    5353    {
    54         WKBundlePageContextMenuClient contextMenuClient;
     54        WKBundlePageContextMenuClientV0 contextMenuClient;
    5555        memset(&contextMenuClient, 0, sizeof(contextMenuClient));
     56
     57        contextMenuClient.base.version = 0;
    5658        contextMenuClient.getContextMenuFromDefaultMenu = getContextMenuFromDefaultMenu;
    5759   
    58         WKBundlePageSetContextMenuClient(page, &contextMenuClient);
     60        WKBundlePageSetContextMenuClient(page, &contextMenuClient.base);
    5961    }
    6062};

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleBasic.cpp

    r115083 r160104  
    5353    WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextForInjectedBundleTest("InjectedBundleBasicTest"));
    5454
    55     WKContextInjectedBundleClient injectedBundleClient;
     55    WKContextInjectedBundleClientV0 injectedBundleClient;
    5656    memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
    57     injectedBundleClient.version = 0;
    58     injectedBundleClient.clientInfo = 0;
     57
     58    injectedBundleClient.base.version = 0;
    5959    injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
    60     WKContextSetInjectedBundleClient(context.get(), &injectedBundleClient);
     60
     61    WKContextSetInjectedBundleClient(context.get(), &injectedBundleClient.base);
    6162 
    6263    PlatformWebView webView(context.get());
    6364
    64     WKPageLoaderClient loaderClient;
     65    WKPageLoaderClientV0 loaderClient;
    6566    memset(&loaderClient, 0, sizeof(loaderClient));
    66     loaderClient.version = 0;
    67     loaderClient.clientInfo = 0;
     67
     68    loaderClient.base.version = 0;
    6869    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    69     WKPageSetPageLoaderClient(webView.page(), &loaderClient);
     70
     71    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
    7072
    7173    WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleFrameHitTest.cpp

    r131979 r160104  
    4444static void setInjectedBundleClient(WKContextRef context)
    4545{
    46     WKContextInjectedBundleClient injectedBundleClient;
     46    WKContextInjectedBundleClientV0 injectedBundleClient;
    4747    memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
    48     injectedBundleClient.version = 0;
    49     injectedBundleClient.clientInfo = 0;
     48
     49    injectedBundleClient.base.version = 0;
    5050    injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
    51     WKContextSetInjectedBundleClient(context, &injectedBundleClient);
     51
     52    WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
    5253}
    5354

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleFrameHitTest_Bundle.cpp

    r131979 r160104  
    5959    m_bundle = bundle;
    6060
    61     WKBundlePageLoaderClient pageLoaderClient;
     61    WKBundlePageLoaderClientV1 pageLoaderClient;
    6262    memset(&pageLoaderClient, 0, sizeof(pageLoaderClient));
    6363   
    64     pageLoaderClient.version = 1;
    65     pageLoaderClient.clientInfo = this;
     64    pageLoaderClient.base.version = 1;
     65    pageLoaderClient.base.clientInfo = this;
    6666    pageLoaderClient.didFinishLoadForFrame = didFinishLoadForFrameCallback;
    6767
    68     WKBundlePageSetPageLoaderClient(page, &pageLoaderClient);
     68    WKBundlePageSetPageLoaderClient(page, &pageLoaderClient.base);
    6969}
    7070

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleInitializationUserDataCallbackWins.cpp

    r121979 r160104  
    5050    WKContextSetInitializationUserDataForInjectedBundle(context.get(), initializationDictionary.get());
    5151
    52     WKContextInjectedBundleClient injectedBundleClient;
     52    WKContextInjectedBundleClientV1 injectedBundleClient;
    5353    memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
    54     injectedBundleClient.version = 1;
    55     injectedBundleClient.clientInfo = 0;
     54
     55    injectedBundleClient.base.version = 1;
    5656    injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
    5757    injectedBundleClient.getInjectedBundleInitializationUserData = getInjectedBundleInitializationUserData;
    58     WKContextSetInjectedBundleClient(context.get(), &injectedBundleClient);
     58
     59    WKContextSetInjectedBundleClient(context.get(), &injectedBundleClient.base);
    5960
    6061    PlatformWebView webView(context.get());

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/LayoutMilestonesWithAllContentInFrame.cpp

    r153958 r160104  
    4848    PlatformWebView webView(context.get());
    4949
    50     WKPageLoaderClient loaderClient;
     50    WKPageLoaderClientV3 loaderClient;
    5151    memset(&loaderClient, 0, sizeof(loaderClient));
    52     loaderClient.version = kWKPageLoaderClientCurrentVersion;
     52
     53    loaderClient.base.version = 3;
     54    loaderClient.base.clientInfo = &webView;
    5355    loaderClient.didLayout = didLayout;
    54     loaderClient.clientInfo = &webView;
    5556
    56     WKPageSetPageLoaderClient(webView.page(), &loaderClient);
     57    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     58
    5759    WKPageListenForLayoutMilestones(webView.page(), kWKDidFirstVisuallyNonEmptyLayout);
    5860    WKPageLoadURL(webView.page(), adoptWK(Util::createURLForResource("all-content-in-one-iframe", "html")).get());

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/LoadAlternateHTMLStringWithNonDirectoryURL.cpp

    r97633 r160104  
    4747    PlatformWebView webView(context.get());
    4848
    49     WKPageLoaderClient loaderClient;
     49    WKPageLoaderClientV0 loaderClient;
    5050    memset(&loaderClient, 0, sizeof(loaderClient));
    5151   
    52     loaderClient.version = 0;
     52    loaderClient.base.version = 0;
    5353    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    54     WKPageSetPageLoaderClient(webView.page(), &loaderClient);
     54    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
    5555
    5656    WKRetainPtr<WKURLRef> fileURL(AdoptWK, Util::createURLForResource("simple", "html"));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback.cpp

    r95188 r160104  
    6060    WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextForInjectedBundleTest("LoadCanceledNoServerRedirectCallbackTest"));
    6161   
    62     WKContextInjectedBundleClient injectedBundleClient;
     62    WKContextInjectedBundleClientV0 injectedBundleClient;
    6363    memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
    64     injectedBundleClient.version = 0;
    65     injectedBundleClient.clientInfo = 0;
    66     WKContextSetInjectedBundleClient(context.get(), &injectedBundleClient);
     64
     65    injectedBundleClient.base.version = 0;
     66
     67    WKContextSetInjectedBundleClient(context.get(), &injectedBundleClient.base);
    6768
    6869    PlatformWebView webView(context.get());
    6970
    70     WKPageLoaderClient loaderClient;
     71    WKPageLoaderClientV0 loaderClient;
    7172    memset(&loaderClient, 0, sizeof(loaderClient));
    7273   
    73     loaderClient.version = 0;
     74    loaderClient.base.version = 0;
    7475    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    75     WKPageSetPageLoaderClient(webView.page(), &loaderClient);
     76
     77    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
    7678   
    77     WKContextHistoryClient historyClient;
     79    WKContextHistoryClientV0 historyClient;
    7880    memset(&historyClient, 0, sizeof(historyClient));
    7981   
    80     historyClient.version = 0;
     82    historyClient.base.version = 0;
    8183    historyClient.didPerformServerRedirect = didPerformServerRedirect;
    82     WKContextSetHistoryClient(context.get(), &historyClient);
     84
     85    WKContextSetHistoryClient(context.get(), &historyClient.base);
    8386
    8487    WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple-iframe", "html"));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback_Bundle.cpp

    r95188 r160104  
    5757    virtual void didCreatePage(WKBundleRef bundle, WKBundlePageRef page)
    5858    {
    59         WKBundlePageResourceLoadClient resourceLoadClient;
     59        WKBundlePageResourceLoadClientV0 resourceLoadClient;
    6060        memset(&resourceLoadClient, 0, sizeof(resourceLoadClient));
    6161       
    62         resourceLoadClient.version = 0;
     62        resourceLoadClient.base.version = 0;
    6363        resourceLoadClient.willSendRequestForFrame = willSendRequestForFrame;
    6464
    65         WKBundlePageSetResourceLoadClient(page, &resourceLoadClient);
     65        WKBundlePageSetResourceLoadClient(page, &resourceLoadClient.base);
    6666
    6767    }

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/LoadPageOnCrash.cpp

    r148312 r160104  
    4444    {
    4545        memset(&loaderClient, 0, sizeof(loaderClient));
    46         loaderClient.clientInfo = this;
     46
     47        loaderClient.base.version = 0;
     48        loaderClient.base.clientInfo = this;
    4749        loaderClient.didFinishLoadForFrame = didFinishLoad;
    48         WKPageSetPageLoaderClient(webView.page(), &loaderClient);
     50
     51        WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
    4952    }
    5053
    … …  
    6063
    6164    WKRetainPtr<WKContextRef> context;
    62     WKPageLoaderClient loaderClient;
     65    WKPageLoaderClientV0 loaderClient;
    6366    PlatformWebView webView;
    6467    WKRetainPtr<WKURLRef> url;

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/MouseMoveAfterCrash.cpp

    r148312 r160104  
    4040static void setPageLoaderClient(WKPageRef page)
    4141{
    42     WKPageLoaderClient loaderClient;
     42    WKPageLoaderClientV0 loaderClient;
    4343    memset(&loaderClient, 0, sizeof(loaderClient));
    44     loaderClient.version = 0;
    45     loaderClient.clientInfo = 0;
     44
     45    loaderClient.base.version = 0;
    4646    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    4747
    48     WKPageSetPageLoaderClient(page, &loaderClient);
     48    WKPageSetPageLoaderClient(page, &loaderClient.base);
    4949}
    5050

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayout.cpp

    r129545 r160104  
    5858static void setPageLoaderClient(WKPageRef page)
    5959{
    60     WKPageLoaderClient loaderClient;
     60    WKPageLoaderClientV3 loaderClient;
    6161    memset(&loaderClient, 0, sizeof(loaderClient));
    62     loaderClient.version = kWKPageLoaderClientCurrentVersion;
     62
     63    loaderClient.base.version = 3;
    6364    loaderClient.didLayout = didLayout;
    6465
    65     WKPageSetPageLoaderClient(page, &loaderClient);
     66    WKPageSetPageLoaderClient(page, &loaderClient.base);
    6667}
    6768

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFails.cpp

    r129545 r160104  
    5757static void setPageLoaderClient(WKPageRef page)
    5858{
    59     WKPageLoaderClient loaderClient;
     59    WKPageLoaderClientV3 loaderClient;
    6060    memset(&loaderClient, 0, sizeof(loaderClient));
    61     loaderClient.version = kWKPageLoaderClientCurrentVersion;
     61
     62    loaderClient.base.version = 3;
    6263    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    6364    loaderClient.didLayout = didLayout;
    6465
    65     WKPageSetPageLoaderClient(page, &loaderClient);
     66    WKPageSetPageLoaderClient(page, &loaderClient.base);
    6667}
    6768

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutForImages.cpp

    r129545 r160104  
    5858static void setPageLoaderClient(WKPageRef page)
    5959{
    60     WKPageLoaderClient loaderClient;
     60    WKPageLoaderClientV3 loaderClient;
    6161    memset(&loaderClient, 0, sizeof(loaderClient));
    62     loaderClient.version = kWKPageLoaderClientCurrentVersion;
     62
     63    loaderClient.base.version = 3;
    6364    loaderClient.didLayout = didLayout;
    6465
    65     WKPageSetPageLoaderClient(page, &loaderClient);
     66    WKPageSetPageLoaderClient(page, &loaderClient.base);
    6667}
    6768

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames.cpp

    r129545 r160104  
    6262static void setPageLoaderClient(WKPageRef page)
    6363{
    64     WKPageLoaderClient loaderClient;
     64    WKPageLoaderClientV3 loaderClient;
    6565    memset(&loaderClient, 0, sizeof(loaderClient));
    66     loaderClient.version = kWKPageLoaderClientCurrentVersion;
     66
     67    loaderClient.base.version = kWKPageLoaderClientCurrentVersion;
    6768    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    6869    loaderClient.didLayout = didLayout;
    6970
    70     WKPageSetPageLoaderClient(page, &loaderClient);
     71    WKPageSetPageLoaderClient(page, &loaderClient.base);
    7172}
    7273

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp

    r159387 r160104  
    116116    PlatformWebView webView(context.get());
    117117
    118     WKPageLoaderClient loaderClient;
     118    WKPageLoaderClientV0 loaderClient;
    119119    memset(&loaderClient, 0, sizeof(loaderClient));
    120120
    121     loaderClient.version = 0;
    122     loaderClient.clientInfo = &state;
     121    loaderClient.base.version = 0;
     122    loaderClient.base.clientInfo = &state;
    123123    loaderClient.didStartProvisionalLoadForFrame = didStartProvisionalLoadForFrame;
    124124    loaderClient.didCommitLoadForFrame = didCommitLoadForFrame;
    125125    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    126     WKPageSetPageLoaderClient(webView.page(), &loaderClient);
    127126
    128     WKPagePolicyClient policyClient;
     127    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     128
     129    WKPagePolicyClientV1 policyClient;
    129130    memset(&policyClient, 0, sizeof(policyClient));
    130131
    131     policyClient.version = 1;
    132     policyClient.clientInfo = &state;
     132    policyClient.base.version = 1;
     133    policyClient.base.clientInfo = &state;
    133134    policyClient.decidePolicyForNavigationAction = decidePolicyForNavigationAction;
    134135    policyClient.decidePolicyForNewWindowAction = decidePolicyForNewWindowAction;
    135136    policyClient.decidePolicyForResponse = decidePolicyForResponse;
    136     WKPageSetPagePolicyClient(webView.page(), &policyClient);
     137
     138    WKPageSetPagePolicyClient(webView.page(), &policyClient.base);
    137139
    138140    // Before loading anything, the active url should be null

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/PageLoadDidChangeLocationWithinPageForFrame.cpp

    r95188 r160104  
    6161    PlatformWebView webView(context.get());
    6262
    63     WKPageLoaderClient loaderClient;
     63    WKPageLoaderClientV0 loaderClient;
    6464    memset(&loaderClient, 0, sizeof(loaderClient));
     65
     66    loaderClient.base.version = 0;
    6567    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    6668    loaderClient.didSameDocumentNavigationForFrame = didSameDocumentNavigationForFrame;
    67     WKPageSetPageLoaderClient(webView.page(), &loaderClient);
     69
     70    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
    6871
    6972    WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("file-with-anchor", "html"));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/ParentFrame.cpp

    r106139 r160104  
    4646static void setInjectedBundleClient(WKContextRef context)
    4747{
    48     WKContextInjectedBundleClient injectedBundleClient;
     48    WKContextInjectedBundleClientV0 injectedBundleClient;
    4949    memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
     50
     51    injectedBundleClient.base.version = 0;
    5052    injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
    5153
    52     WKContextSetInjectedBundleClient(context, &injectedBundleClient);
     54    WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
    5355}
    5456

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/ParentFrame_Bundle.cpp

    r106139 r160104  
    6868    testBundle = bundle;
    6969   
    70     WKBundlePageLoaderClient pageLoaderClient;
     70    WKBundlePageLoaderClientV1 pageLoaderClient;
    7171    memset(&pageLoaderClient, 0, sizeof(pageLoaderClient));
    7272   
    73     pageLoaderClient.version = 1;
     73    pageLoaderClient.base.version = 1;
    7474    pageLoaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    7575   
    76     WKBundlePageSetPageLoaderClient(page, &pageLoaderClient);
     76    WKBundlePageSetPageLoaderClient(page, &pageLoaderClient.base);
    7777}
    7878

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/PasteboardNotifications.mm

    r141473 r160104  
    4747static void setInjectedBundleClient(WKContextRef context)
    4848{
    49     WKContextInjectedBundleClient injectedBundleClient;
     49    WKContextInjectedBundleClientV0 injectedBundleClient;
    5050    memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
    51     injectedBundleClient.version = 0;
    52     injectedBundleClient.clientInfo = 0;
     51
     52    injectedBundleClient.base.version = 0;
    5353    injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
    54     WKContextSetInjectedBundleClient(context, &injectedBundleClient);
     54
     55    WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
    5556}
    5657

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/PasteboardNotifications_Bundle.cpp

    r141473 r160104  
    7070void PasteboardNotificationsTest::didCreatePage(WKBundleRef bundle, WKBundlePageRef page)
    7171{   
    72     WKBundlePageEditorClient pageEditorClient;
    73 
     72    WKBundlePageEditorClientV1 pageEditorClient;
    7473    memset(&pageEditorClient, 0, sizeof(pageEditorClient));
    7574
    76     pageEditorClient.version = 1;
    77     pageEditorClient.clientInfo = this;
     75    pageEditorClient.base.version = 1;
     76    pageEditorClient.base.clientInfo = this;
    7877    pageEditorClient.willWriteToPasteboard = willWriteToPasteboard;
    7978    pageEditorClient.getPasteboardDataForRange = getPasteboardDataForRange;
    8079    pageEditorClient.didWriteToPasteboard = didWriteToPasteboard;
    8180
    82     WKBundlePageSetEditorClient(page, &pageEditorClient);
     81    WKBundlePageSetEditorClient(page, &pageEditorClient.base);
    8382}
    8483

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/PrivateBrowsingPushStateNoHistoryCallback.cpp

    r95440 r160104  
    4949    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
    5050
    51     WKContextHistoryClient historyClient;
     51    WKContextHistoryClientV0 historyClient;
    5252    memset(&historyClient, 0, sizeof(historyClient));
    5353
    54     historyClient.version = 0;
    55     historyClient.clientInfo = 0;
     54    historyClient.base.version = 0;
    5655    historyClient.didNavigateWithNavigationData = didNavigateWithNavigationData;
    57     WKContextSetHistoryClient(context.get(), &historyClient);
     56
     57    WKContextSetHistoryClient(context.get(), &historyClient.base);
    5858
    5959    PlatformWebView webView(context.get());
    6060
    61     WKPageLoaderClient pageLoaderClient;
     61    WKPageLoaderClientV0 pageLoaderClient;
    6262    memset(&pageLoaderClient, 0, sizeof(pageLoaderClient));
    6363
    64     pageLoaderClient.version = 0;
    65     pageLoaderClient.clientInfo = 0;
     64    pageLoaderClient.base.version = 0;
    6665    pageLoaderClient.didSameDocumentNavigationForFrame = didSameDocumentNavigationForFrame;
    67     WKPageSetPageLoaderClient(webView.page(), &pageLoaderClient);
     66
     67    WKPageSetPageLoaderClient(webView.page(), &pageLoaderClient.base);
    6868
    6969    WKRetainPtr<WKPreferencesRef> preferences(AdoptWK, WKPreferencesCreate());

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/ReloadPageAfterCrash.cpp

    r142704 r160104  
    6666    PlatformWebView webView(context.get());
    6767
    68     WKPageLoaderClient loaderClient;
     68    WKPageLoaderClientV0 loaderClient;
    6969    memset(&loaderClient, 0, sizeof(loaderClient));
     70
     71    loaderClient.base.version = 0;
    7072    loaderClient.didFinishLoadForFrame = didFinishLoad;
    7173    loaderClient.processDidCrash = didCrash;
    72     WKPageSetPageLoaderClient(webView.page(), &loaderClient);
     74
     75    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
    7376
    7477    WKRetainPtr<WKURLRef> url = adoptWK(WKURLCreateWithUTF8CString("about:blank"));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/ResizeReversePaginatedWebView.cpp

    r152936 r160104  
    6262    PlatformWebView webView(context.get());
    6363
    64     WKPageLoaderClient loaderClient;
     64    WKPageLoaderClientV3 loaderClient;
    6565    memset(&loaderClient, 0, sizeof(loaderClient));
    66     loaderClient.version = kWKPageLoaderClientCurrentVersion;
     66
     67    loaderClient.base.version = 3;
     68    loaderClient.base.clientInfo = &webView;
    6769    loaderClient.didLayout = didLayout;
    68     loaderClient.clientInfo = &webView;
    6970
    70     WKPageSetPageLoaderClient(webView.page(), &loaderClient);
     71    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
    7172
    7273    WKPageListenForLayoutMilestones(webView.page(), kWKDidFirstLayoutAfterSuppressedIncrementalRendering);

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/ResizeWindowAfterCrash.cpp

    r143067 r160104  
    7676    TestStatesData states(context.get());
    7777
    78     WKPageLoaderClient loaderClient;
     78    WKPageLoaderClientV0 loaderClient;
    7979    memset(&loaderClient, 0, sizeof(loaderClient));
    80     loaderClient.clientInfo = &states;
     80
     81    loaderClient.base.version = 0;
     82    loaderClient.base.clientInfo = &states;
    8183    loaderClient.didFinishLoadForFrame = didFinishLoad;
    8284    loaderClient.processDidCrash = didCrash;
    83     WKPageSetPageLoaderClient(states.webView.page(), &loaderClient);
     85
     86    WKPageSetPageLoaderClient(states.webView.page(), &loaderClient.base);
    8487
    8588    WKRetainPtr<WKURLRef> url = adoptWK(WKURLCreateWithUTF8CString("about:blank"));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/ResponsivenessTimerDoesntFireEarly.cpp

    r95188 r160104  
    5252static void setInjectedBundleClient(WKContextRef context)
    5353{
    54     WKContextInjectedBundleClient injectedBundleClient;
     54    WKContextInjectedBundleClientV0 injectedBundleClient;
    5555    memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
    56     injectedBundleClient.version = 0;
    57     injectedBundleClient.clientInfo = 0;
     56
     57    injectedBundleClient.base.version = 0;
    5858    injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
    5959
    60     WKContextSetInjectedBundleClient(context, &injectedBundleClient);
     60    WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
    6161}
    6262
    6363static void setPageLoaderClient(WKPageRef page)
    6464{
    65     WKPageLoaderClient loaderClient;
     65    WKPageLoaderClientV0 loaderClient;
    6666    memset(&loaderClient, 0, sizeof(loaderClient));
    67     loaderClient.version = 0;
    68     loaderClient.clientInfo = 0;
     67
     68    loaderClient.base.version = 0;
    6969    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    7070    loaderClient.processDidBecomeUnresponsive = processDidBecomeUnresponsive;
    7171
    72     WKPageSetPageLoaderClient(page, &loaderClient);
     72    WKPageSetPageLoaderClient(page, &loaderClient.base);
    7373}
    7474

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/RestoreSessionStateContainingFormData.cpp

    r95188 r160104  
    4141static void setPageLoaderClient(WKPageRef page)
    4242{
    43     WKPageLoaderClient loaderClient;
     43    WKPageLoaderClientV0 loaderClient;
    4444    memset(&loaderClient, 0, sizeof(loaderClient));
    45     loaderClient.version = 0;
     45
     46    loaderClient.base.version = 0;
    4647    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    4748
    48     WKPageSetPageLoaderClient(page, &loaderClient);
     49    WKPageSetPageLoaderClient(page, &loaderClient.base);
    4950}
    5051

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/ScrollPinningBehaviors.cpp

    r156864 r160104  
    8080    PlatformWebView webView(context.get(), pageGroup.get());
    8181
    82     WKPageLoaderClient loaderClient;
     82    WKPageLoaderClientV3 loaderClient;
    8383    memset(&loaderClient, 0, sizeof(loaderClient));
    84     loaderClient.version = kWKPageLoaderClientCurrentVersion;
     84
     85    loaderClient.base.version = 3;
     86    loaderClient.base.clientInfo = &webView;
    8587    loaderClient.didFinishDocumentLoadForFrame = didFinishDocumentLoadForFrame;
    86     loaderClient.clientInfo = &webView;
    8788
    88     WKPageSetPageLoaderClient(webView.page(), &loaderClient);
     89    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
    8990
    9091    WKPageLoadURL(webView.page(), adoptWK(Util::createURLForResource("simple-tall", "html")).get());

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/ShouldGoToBackForwardListItem.cpp

    r141729 r160104  
    5757static void setPageLoaderClient(WKPageRef page)
    5858{
    59     WKPageLoaderClient loaderClient;
     59    WKPageLoaderClientV1 loaderClient;
    6060    memset(&loaderClient, 0, sizeof(loaderClient));
    61     loaderClient.version = 1;
    62     loaderClient.clientInfo = 0;
     61
     62    loaderClient.base.version = 1;
    6363    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    6464    loaderClient.willGoToBackForwardListItem = willGoToBackForwardListItem;
    6565
    66     WKPageSetPageLoaderClient(page, &loaderClient);
     66    WKPageSetPageLoaderClient(page, &loaderClient.base);
    6767}
    6868

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/ShouldGoToBackForwardListItem_Bundle.cpp

    r114143 r160104  
    5858void ShouldGoToBackForwardListItemTest::didCreatePage(WKBundleRef bundle, WKBundlePageRef page)
    5959{   
    60     WKBundlePageLoaderClient pageLoaderClient;
     60    WKBundlePageLoaderClientV1 pageLoaderClient;
    6161    memset(&pageLoaderClient, 0, sizeof(pageLoaderClient));
    6262   
    63     pageLoaderClient.version = 1;
    64     pageLoaderClient.clientInfo = this;
     63    pageLoaderClient.base.version = 1;
     64    pageLoaderClient.base.clientInfo = this;
    6565    pageLoaderClient.shouldGoToBackForwardListItem = shouldGoToBackForwardListItemCallback;
    6666   
    67     WKBundlePageSetPageLoaderClient(page, &pageLoaderClient);
     67    WKBundlePageSetPageLoaderClient(page, &pageLoaderClient.base);
    6868}
    6969

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp

    r156898 r160104  
    5959    PlatformWebView webView(context.get(), pageGroup.get());
    6060
    61     WKPageLoaderClient loaderClient;
     61    WKPageLoaderClientV0 loaderClient;
    6262    memset(&loaderClient, 0, sizeof(loaderClient));
    6363
    64     loaderClient.version = 0;
     64    loaderClient.base.version = 0;
    6565    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    66     WKPageSetPageLoaderClient(webView.page(), &loaderClient);
    6766
    68     WKPageUIClient uiClient;
     67    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     68
     69    WKPageUIClientV0 uiClient;
    6970    memset(&uiClient, 0, sizeof(uiClient));
    7071
     72    uiClient.base.version = 0;
    7173    uiClient.didNotHandleKeyEvent = didNotHandleKeyEventCallback;
    72     WKPageSetPageUIClient(webView.page(), &uiClient);
     74
     75    WKPageSetPageUIClient(webView.page(), &uiClient.base);
    7376
    7477    WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("spacebar-scrolling", "html"));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/TerminateTwice.cpp

    r149933 r160104  
    4242    PlatformWebView webView(context.get());
    4343
    44     WKPageLoaderClient loaderClient;
     44    WKPageLoaderClientV0 loaderClient;
    4545    memset(&loaderClient, 0, sizeof(loaderClient));
    4646
    47     loaderClient.version = 0;
     47    loaderClient.base.version = 0;
    4848    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    49     WKPageSetPageLoaderClient(webView.page(), &loaderClient);
     49
     50    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
    5051
    5152    WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMessage.cpp

    r106751 r160104  
    6666    static void setInjectedBundleClient(WKContextRef context, const void* clientInfo)
    6767    {
    68         WKContextInjectedBundleClient injectedBundleClient;
     68        WKContextInjectedBundleClientV1 injectedBundleClient;
    6969        memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
    70         injectedBundleClient.version = kWKContextInjectedBundleClientCurrentVersion;
    71         injectedBundleClient.clientInfo = clientInfo;
     70
     71        injectedBundleClient.base.version = 1;
     72        injectedBundleClient.base.clientInfo = clientInfo;
    7273        injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
    7374
    74         WKContextSetInjectedBundleClient(context, &injectedBundleClient);
     75        WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
    7576    }
    7677
    7778    static void setPageLoaderClient(WKPageRef page, const void* clientInfo)
    7879    {
    79         WKPageLoaderClient loaderClient;
     80        WKPageLoaderClientV3 loaderClient;
    8081        memset(&loaderClient, 0, sizeof(loaderClient));
    81         loaderClient.version = kWKPageLoaderClientCurrentVersion;
    82         loaderClient.clientInfo = clientInfo;
     82
     83        loaderClient.base.version = kWKPageLoaderClientCurrentVersion;
     84        loaderClient.base.clientInfo = clientInfo;
    8385        loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    8486
    85         WKPageSetPageLoaderClient(page, &loaderClient);
     87        WKPageSetPageLoaderClient(page, &loaderClient.base);
    8688    }
    8789

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKConnection.cpp

    r102484 r160104  
    7272    // Set up the context's connection client so that we can access the connection when
    7373    // it is created.
    74     WKContextConnectionClient contextConnectionClient;
     74    WKContextConnectionClientV0 contextConnectionClient;
    7575    memset(&contextConnectionClient, 0, sizeof(contextConnectionClient));
    76     contextConnectionClient.version = kWKContextConnectionClientCurrentVersion;
    77     contextConnectionClient.clientInfo = 0;
     76
     77    contextConnectionClient.base.version = kWKContextConnectionClientCurrentVersion;
    7878    contextConnectionClient.didCreateConnection = didCreateConnection;
    79     WKContextSetConnectionClient(context.get(), &contextConnectionClient);
     79
     80    WKContextSetConnectionClient(context.get(), &contextConnectionClient.base);
    8081 
    8182    // Load a simple page to start the WebProcess and establish a connection.
    … …  
    9091    // Setup a client on the connection so we can listen for messages and
    9192    // tear down notifications.
    92     WKConnectionClient connectionClient;
     93    WKConnectionClientV0 connectionClient;
    9394    memset(&connectionClient, 0, sizeof(connectionClient));
    94     connectionClient.version = WKConnectionClientCurrentVersion;
    95     connectionClient.clientInfo = 0;
     95
     96    connectionClient.base.version = 0;
    9697    connectionClient.didReceiveMessage = connectionDidReceiveMessage;
    9798    connectionClient.didClose = connectionDidClose;
    98     WKConnectionSetConnectionClient(connectionToBundle, &connectionClient);
     99
     100    WKConnectionSetConnectionClient(connectionToBundle, &connectionClient.base);
    99101   
    100102    // Post a simple message to the bundle via the connection.

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKConnection_Bundle.cpp

    r102484 r160104  
    4747    virtual void initialize(WKBundleRef bundle, WKTypeRef)
    4848    {
    49         WKConnectionClient connectionClient;
     49        WKConnectionClientV0 connectionClient;
    5050        memset(&connectionClient, 0, sizeof(connectionClient));
    51         connectionClient.version = WKConnectionClientCurrentVersion;
    52         connectionClient.clientInfo = 0;
     51
     52        connectionClient.base.version = WKConnectionClientCurrentVersion;
    5353        connectionClient.didReceiveMessage = connectionDidReceiveMessage;
    54         WKConnectionSetConnectionClient(WKBundleGetApplicationConnection(bundle), &connectionClient);
     54
     55        WKConnectionSetConnectionClient(WKBundleGetApplicationConnection(bundle), &connectionClient.base);
    5556    }
    5657};

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKPageGetScaleFactorNotZero.cpp

    r117870 r160104  
    4040static void setPageLoaderClient(WKPageRef page)
    4141{
    42     WKPageLoaderClient loaderClient;
     42    WKPageLoaderClientV0 loaderClient;
    4343    memset(&loaderClient, 0, sizeof(loaderClient));
    44     loaderClient.version = 0;
     44
     45    loaderClient.base.version = 0;
    4546    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    4647
    47     WKPageSetPageLoaderClient(page, &loaderClient);
     48    WKPageSetPageLoaderClient(page, &loaderClient.base);
    4849}
    4950

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/WebArchive.cpp

    r149716 r160104  
    8989static void setInjectedBundleClient(WKContextRef context)
    9090{
    91     WKContextInjectedBundleClient injectedBundleClient;
     91    WKContextInjectedBundleClientV0 injectedBundleClient;
    9292    memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
     93
     94    injectedBundleClient.base.version = 0;
    9395    injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
    9496
    95     WKContextSetInjectedBundleClient(context, &injectedBundleClient);
     97    WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
    9698}
    9799
    … …  
    108110    PlatformWebView webView(context.get());
    109111
    110     WKPageLoaderClient loaderClient;
     112    WKPageLoaderClientV3 loaderClient;
    111113    memset(&loaderClient, 0, sizeof(loaderClient));
    112114   
    113     loaderClient.version = kWKPageLoaderClientCurrentVersion;
     115    loaderClient.base.version = 3;
    114116    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    115     WKPageSetPageLoaderClient(webView.page(), &loaderClient);
     117
     118    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
    116119
    117120    WKPageLoadURL(webView.page(), adoptWK(Util::createURLForResource("simple", "html")).get());

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad.cpp

    r150242 r160104  
    5757    static void setInjectedBundleClient(WKContextRef context, const void* clientInfo)
    5858    {
    59         WKContextInjectedBundleClient injectedBundleClient;
     59        WKContextInjectedBundleClientV1 injectedBundleClient;
    6060        memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
    61         injectedBundleClient.version = kWKContextInjectedBundleClientCurrentVersion;
    62         injectedBundleClient.clientInfo = clientInfo;
     61
     62        injectedBundleClient.base.version = 1;
     63        injectedBundleClient.base.clientInfo = clientInfo;
    6364        injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
    6465
    65         WKContextSetInjectedBundleClient(context, &injectedBundleClient);
     66        WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
    6667    }
    6768

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp

    r150493 r160104  
    6868    virtual void didCreatePage(WKBundleRef, WKBundlePageRef bundlePage) OVERRIDE
    6969    {
    70         WKBundlePageLoaderClient pageLoaderClient;
     70        WKBundlePageLoaderClientV6 pageLoaderClient;
    7171        memset(&pageLoaderClient, 0, sizeof(pageLoaderClient));
    7272       
    73         pageLoaderClient.version = 6;
    74         pageLoaderClient.clientInfo = this;
     73        pageLoaderClient.base.version = 6;
     74        pageLoaderClient.base.clientInfo = this;
    7575        pageLoaderClient.willLoadURLRequest = willLoadURLRequest;
    7676        pageLoaderClient.willLoadDataRequest = willLoadDataRequest;
    7777       
    78         WKBundlePageSetPageLoaderClient(bundlePage, &pageLoaderClient);
     78        WKBundlePageSetPageLoaderClient(bundlePage, &pageLoaderClient.base);
    7979    }
    8080};

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent.cpp

    r132988 r160104  
    5858static void setInjectedBundleClient(WKContextRef context)
    5959{
    60     WKContextInjectedBundleClient injectedBundleClient;
     60    WKContextInjectedBundleClientV0 injectedBundleClient;
    6161    memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
     62
     63    injectedBundleClient.base.version = 0;
    6264    injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
    6365
    64     WKContextSetInjectedBundleClient(context, &injectedBundleClient);
     66    WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
    6567}
    6668

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent_Bundle.cpp

    r116016 r160104  
    5353void WillSendSubmitEventTest::didCreatePage(WKBundleRef bundle, WKBundlePageRef page)
    5454{
    55     WKBundlePageFormClient formClient;
     55    WKBundlePageFormClientV1 formClient;
    5656    memset(&formClient, 0, sizeof(formClient));
    5757   
    58     formClient.version = 1;
    59     formClient.clientInfo = this;
     58    formClient.base.version = 1;
     59    formClient.base.clientInfo = this;
    6060    formClient.willSendSubmitEvent = willSendSubmitEvent;
    6161   
    62     WKBundlePageSetFormClient(page, &formClient);
     62    WKBundlePageSetFormClient(page, &formClient.base);
    6363}
    6464

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/mac/EditorCommands.mm

    r156898 r160104  
    5353    PlatformWebView webView(context.get(), pageGroup.get());
    5454
    55     WKPageLoaderClient loaderClient;
     55    WKPageLoaderClientV0 loaderClient;
    5656    memset(&loaderClient, 0, sizeof(loaderClient));
    57     loaderClient.version = 0;
     57
     58    loaderClient.base.version = 0;
    5859    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    59     WKPageSetPageLoaderClient(webView.page(), &loaderClient);
     60
     61    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
    6062
    6163    WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple-tall", "html"));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/mac/GetBackingScaleFactor.mm

    r149716 r160104  
    4848static void setInjectedBundleClient(WKContextRef context)
    4949{
    50     WKContextInjectedBundleClient injectedBundleClient;
     50    WKContextInjectedBundleClientV0 injectedBundleClient;
    5151    memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
     52
     53    injectedBundleClient.base.version = 0;
    5254    injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
    53     WKContextSetInjectedBundleClient(context, &injectedBundleClient);
     55
     56    WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
    5457}
    5558

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/mac/GetPIDAfterAbortedProcessLaunch.cpp

    r153107 r160104  
    4747    PlatformWebView webView(context.get());
    4848
    49     WKPageLoaderClient loaderClient;
     49    WKPageLoaderClientV0 loaderClient;
    5050    memset(&loaderClient, 0, sizeof(loaderClient));
    5151
    52     loaderClient.version = 0;
     52    loaderClient.base.version = 0;
    5353    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    54     WKPageSetPageLoaderClient(webView.page(), &loaderClient);
     54
     55    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
    5556
    5657    WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsInvalidScheme_Bundle.cpp

    r149774 r160104  
    4848    virtual void didCreatePage(WKBundleRef, WKBundlePageRef bundlePage) OVERRIDE
    4949    {
    50         WKBundlePagePolicyClient policyClient;
     50        WKBundlePagePolicyClientV0 policyClient;
    5151        memset(&policyClient, 0, sizeof(policyClient));
     52
     53        policyClient.base.version = 0;
    5254        policyClient.decidePolicyForNavigationAction = decidePolicyForNavigationAction;
    53         WKBundlePageSetPolicyClient(bundlePage, &policyClient);
     55       
     56        WKBundlePageSetPolicyClient(bundlePage, &policyClient.base);
    5457    }
    5558};

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing_Bundle.cpp

    r153072 r160104  
    4949    virtual void didCreatePage(WKBundleRef bundle, WKBundlePageRef page)
    5050    {
    51         WKBundlePageResourceLoadClient resourceLoadClient;
     51        WKBundlePageResourceLoadClientV0 resourceLoadClient;
    5252        memset(&resourceLoadClient, 0, sizeof(resourceLoadClient));
    5353       
    54         resourceLoadClient.version = 0;
     54        resourceLoadClient.base.version = 0;
    5555        resourceLoadClient.willSendRequestForFrame = willSendRequestForFrame;
    5656
    57         WKBundlePageSetResourceLoadClient(page, &resourceLoadClient);
     57        WKBundlePageSetResourceLoadClient(page, &resourceLoadClient.base);
    5858
    5959    }

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/WKRemoteObjectRegistry.mm

    r158761 r160104  
    6060    // Setup a client on the connection so we can listen for messages and
    6161    // tear down notifications.
    62     WKConnectionClient connectionClient;
     62    WKConnectionClientV0 connectionClient;
    6363    memset(&connectionClient, 0, sizeof(connectionClient));
    64     connectionClient.version = WKConnectionClientCurrentVersion;
    65     connectionClient.clientInfo = 0;
     64
     65    connectionClient.base.version = 0;
    6666    connectionClient.didReceiveMessage = connectionDidReceiveMessage;
    6767    connectionClient.didClose = connectionDidClose;
    68     WKConnectionSetConnectionClient(connection, &connectionClient);
     68
     69    WKConnectionSetConnectionClient(connection, &connectionClient.base);
    6970
    7071    // Store off the conneciton to use.
    … …  
    7879    // Set up the context's connection client so that we can access the connection when
    7980    // it is created.
    80     WKContextConnectionClient contextConnectionClient;
     81    WKContextConnectionClientV0 contextConnectionClient;
    8182    memset(&contextConnectionClient, 0, sizeof(contextConnectionClient));
    82     contextConnectionClient.version = kWKContextConnectionClientCurrentVersion;
    83     contextConnectionClient.clientInfo = 0;
     83
     84    contextConnectionClient.base.version = 0;
    8485    contextConnectionClient.didCreateConnection = didCreateConnection;
    85     WKContextSetConnectionClient(context.get(), &contextConnectionClient);
     86
     87    WKContextSetConnectionClient(context.get(), &contextConnectionClient.base);
    8688
    8789    // Load a simple page to start the WebProcess and establish a connection.

  • trunk/Tools/TestWebKitAPI/Tests/mac/PageVisibilityStateWithWindowChanges.mm

    r150695 r160104  
    9090void PageVisibilityStateWithWindowChanges::initializeView(WKView *wkView)
    9191{
    92     WKPageUIClient uiClient;
     92    WKPageUIClientV0 uiClient;
    9393    memset(&uiClient, 0, sizeof(uiClient));
    94     uiClient.version = 0;
    95     uiClient.clientInfo = 0;
     94
     95    uiClient.base.version = 0;
    9696    uiClient.runJavaScriptAlert = runJavaScriptAlert;
    97     WKPageSetPageUIClient(wkView.pageRef, &uiClient);
     97
     98    WKPageSetPageUIClient(wkView.pageRef, &uiClient.base);
    9899}
    99100

  • trunk/Tools/TestWebKitAPI/Tests/mac/WKRemoteObjectRegistry_Bundle.mm

    r158685 r160104  
    7676        [m_objectRegistry registerExportedObject:bundleObject interface:bundleInterface];
    7777
    78         WKConnectionClient connectionClient;
     78        WKConnectionClientV0 connectionClient;
    7979        memset(&connectionClient, 0, sizeof(connectionClient));
    80         connectionClient.version = WKConnectionClientCurrentVersion;
    81         connectionClient.clientInfo = this;
     80
     81        connectionClient.base.version = WKConnectionClientCurrentVersion;
     82        connectionClient.base.clientInfo = this;
    8283        connectionClient.didReceiveMessage = [](WKConnectionRef connection, WKStringRef messageName, WKTypeRef messageBody, const void *clientInfo) {
    8384            const WKRemoteObjectRegistryTest* test = static_cast<const WKRemoteObjectRegistryTest*>(clientInfo);
    … …  
    8687        };
    8788
    88         WKConnectionSetConnectionClient(WKBundleGetApplicationConnection(bundle), &connectionClient);
     89        WKConnectionSetConnectionClient(WKBundleGetApplicationConnection(bundle), &connectionClient.base);
    8990    }
    9091

  • trunk/Tools/TestWebKitAPI/mac/WebKitAgnosticTest.mm

    r149716 r160104  
    6767static void setPageLoaderClient(WKPageRef page, bool* didFinishLoad)
    6868{
    69     WKPageLoaderClient loaderClient;
     69    WKPageLoaderClientV0 loaderClient;
    7070    memset(&loaderClient, 0, sizeof(loaderClient));
    71     loaderClient.version = 0;
    72     loaderClient.clientInfo = didFinishLoad;
     71
     72    loaderClient.base.version = 0;
     73    loaderClient.base.clientInfo = didFinishLoad;
    7374    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    7475
    75     WKPageSetPageLoaderClient(page, &loaderClient);
     76    WKPageSetPageLoaderClient(page, &loaderClient.base);
    7677}
    7778

  • trunk/Tools/WebKitTestRunner/GeolocationProviderMock.cpp

    r158689 r160104  
    5252    m_geolocationManager = WKContextGetGeolocationManager(context);
    5353
    54     WKGeolocationProvider providerCallback;
     54    WKGeolocationProviderV1 providerCallback;
    5555    memset(&providerCallback, 0, sizeof(WKGeolocationProvider));
    56     providerCallback.version = 0;
    57     providerCallback.clientInfo = this;
     56    providerCallback.base.version = 1;
     57    providerCallback.base.clientInfo = this;
    5858    providerCallback.startUpdating = startUpdatingCallback;
    5959    providerCallback.stopUpdating = stopUpdatingCallback;
    60     WKGeolocationManagerSetProvider(m_geolocationManager, &providerCallback);
     60    WKGeolocationManagerSetProvider(m_geolocationManager, &providerCallback.base);
    6161}
    6262

  • trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp

    r154144 r160104  
    8989    m_bundle = bundle;
    9090
    91     WKBundleClient client = {
    92         kWKBundleClientCurrentVersion,
    93         this,
     91    WKBundleClientV1 client = {
     92        { 1, this },
    9493        didCreatePage,
    9594        willDestroyPage,
    … …  
    9897        didReceiveMessageToPage
    9998    };
    100     WKBundleSetClient(m_bundle, &client);
     99    WKBundleSetClient(m_bundle, &client.base);
    101100
    102101    platformInitialize(initializationUserData);

  • trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp

    r158447 r160104  
    269269    , m_world(AdoptWK, WKBundleScriptWorldCreateWorld())
    270270{
    271     WKBundlePageLoaderClient loaderClient = {
    272         kWKBundlePageLoaderClientCurrentVersion,
    273         this,
     271    WKBundlePageLoaderClientV7 loaderClient = {
     272        { 7, this },
    274273        didStartProvisionalLoadForFrame,
    275274        didReceiveServerRedirectForProvisionalLoadForFrame,
    … …  
    308307        0, // willDestroyFrame
    309308    };
    310     WKBundlePageSetPageLoaderClient(m_page, &loaderClient);
    311 
    312     WKBundlePageResourceLoadClient resourceLoadClient = {
    313         kWKBundlePageResourceLoadClientCurrentVersion,
    314         this,
     309    WKBundlePageSetPageLoaderClient(m_page, &loaderClient.base);
     310
     311    WKBundlePageResourceLoadClientV1 resourceLoadClient = {
     312        { 1, this },
    315313        didInitiateLoadForResource,
    316314        willSendRequestForFrame,
    … …  
    322320        0 // shouldUseCredentialStorage
    323321    };
    324     WKBundlePageSetResourceLoadClient(m_page, &resourceLoadClient);
    325 
    326     WKBundlePagePolicyClient policyClient = {
    327         kWKBundlePagePolicyClientCurrentVersion,
    328         this,
     322    WKBundlePageSetResourceLoadClient(m_page, &resourceLoadClient.base);
     323
     324    WKBundlePagePolicyClientV0 policyClient = {
     325        { 0, this },
    329326        decidePolicyForNavigationAction,
    330327        decidePolicyForNewWindowAction,
    … …  
    332329        unableToImplementPolicy
    333330    };
    334     WKBundlePageSetPolicyClient(m_page, &policyClient);
    335 
    336     WKBundlePageUIClient uiClient = {
    337         kWKBundlePageUIClientCurrentVersion,
    338         this,
     331    WKBundlePageSetPolicyClient(m_page, &policyClient.base);
     332
     333    WKBundlePageUIClientV2 uiClient = {
     334        { 2, this },
    339335        willAddMessageToConsole,
    340336        willSetStatusbarText,
    … …  
    358354        0, /*plugInExtraScript*/
    359355    };
    360     WKBundlePageSetUIClient(m_page, &uiClient);
    361 
    362     WKBundlePageEditorClient editorClient = {
    363         kWKBundlePageEditorClientCurrentVersion,
    364         this,
     356    WKBundlePageSetUIClient(m_page, &uiClient.base);
     357
     358    WKBundlePageEditorClientV1 editorClient = {
     359        { 1, this },
    365360        shouldBeginEditing,
    366361        shouldEndEditing,
    … …  
    378373        0  /* didWriteToPasteboard */
    379374    };
    380     WKBundlePageSetEditorClient(m_page, &editorClient);
     375    WKBundlePageSetEditorClient(m_page, &editorClient.base);
    381376
    382377#if ENABLE(FULLSCREEN_API)
    383     WKBundlePageFullScreenClient fullScreenClient = {
    384         kWKBundlePageFullScreenClientCurrentVersion,
    385         this,
     378    WKBundlePageFullScreenClientV1 fullScreenClient = {
     379        { 1, this },
    386380        supportsFullScreen,
    387381        enterFullScreenForElement,
    … …  
    391385        closeFullScreen,
    392386    };
    393     WKBundlePageSetFullScreenClient(m_page, &fullScreenClient);
     387    WKBundlePageSetFullScreenClient(m_page, &fullScreenClient.base);
    394388#endif
    395389}

  • trunk/Tools/WebKitTestRunner/TestController.cpp

    r160036 r160104  
    191191    view->resizeTo(800, 600);
    192192
    193     WKPageUIClient otherPageUIClient = {
    194         kWKPageUIClientCurrentVersion,
    195         view,
     193    WKPageUIClientV2 otherPageUIClient = {
     194        { 2, view },
    196195        0, // createNewPage_deprecatedForUseWithV0
    197196        0, // showPage
    … …  
    241240        0, // unavailablePluginButtonClicked
    242241    };
    243     WKPageSetPageUIClient(newPage, &otherPageUIClient);
     242    WKPageSetPageUIClient(newPage, &otherPageUIClient.base);
    244243
    245244    view->didInitializeClients();
    … …  
    367366    platformInitializeContext();
    368367
    369     WKContextInjectedBundleClient injectedBundleClient = {
    370         kWKContextInjectedBundleClientCurrentVersion,
    371         this,
     368    WKContextInjectedBundleClientV1 injectedBundleClient = {
     369        { 1, this },
    372370        didReceiveMessageFromInjectedBundle,
    373371        didReceiveSynchronousMessageFromInjectedBundle,
    374372        0 // getInjectedBundleInitializationUserData
    375373    };
    376     WKContextSetInjectedBundleClient(m_context.get(), &injectedBundleClient);
     374    WKContextSetInjectedBundleClient(m_context.get(), &injectedBundleClient.base);
    377375
    378376    WKNotificationManagerRef notificationManager = WKContextGetNotificationManager(m_context.get());
    … …  
    392390{
    393391    m_mainWebView = adoptPtr(new PlatformWebView(m_context.get(), m_pageGroup.get(), 0, options));
    394     WKPageUIClient pageUIClient = {
    395         kWKPageUIClientCurrentVersion,
    396         m_mainWebView.get(),
     392    WKPageUIClientV2 pageUIClient = {
     393        { 2, m_mainWebView.get() },
    397394        0, // createNewPage_deprecatedForUseWithV0
    398395        0, // showPage
    … …  
    442439        unavailablePluginButtonClicked,
    443440    };
    444     WKPageSetPageUIClient(m_mainWebView->page(), &pageUIClient);
    445 
    446     WKPageLoaderClient pageLoaderClient = {
    447         kWKPageLoaderClientCurrentVersion,
    448         this,
     441    WKPageSetPageUIClient(m_mainWebView->page(), &pageUIClient.base);
     442
     443    WKPageLoaderClientV3 pageLoaderClient = {
     444        { 3, this },
    449445        0, // didStartProvisionalLoadForFrame
    450446        0, // didReceiveServerRedirectForProvisionalLoadForFrame
    … …  
    484480        pluginLoadPolicy, // pluginLoadPolicy
    485481    };
    486     WKPageSetPageLoaderClient(m_mainWebView->page(), &pageLoaderClient);
    487 
    488     WKPagePolicyClient pagePolicyClient = {
    489         kWKPagePolicyClientCurrentVersion,
    490         this,
     482    WKPageSetPageLoaderClient(m_mainWebView->page(), &pageLoaderClient.base);
     483
     484    WKPagePolicyClientV1 pagePolicyClient = {
     485        { 1, this },
    491486        0, // decidePolicyForNavigationAction_deprecatedForUseWithV0
    492487        0, // decidePolicyForNewWindowAction
    … …  
    496491        decidePolicyForResponse,
    497492    };
    498     WKPageSetPagePolicyClient(m_mainWebView->page(), &pagePolicyClient);
     493    WKPageSetPagePolicyClient(m_mainWebView->page(), &pagePolicyClient.base);
    499494
    500495    m_mainWebView->didInitializeClients();
Note: See TracChangeset for help on using the changeset viewer.