Changeset 160125 in webkit


Ignore:
Timestamp:
Dec 4, 2013 2:18:40 PM (10 years ago)
Author:
commit-queue@webkit.org
Message:

[GTK][WK2] Fix build after r160104
https://bugs.webkit.org/show_bug.cgi?id=125240

Patch by Nick Diego Yamane <nick.yamane@openbossa.org> on 2013-12-04
Reviewed by Anders Carlsson.

Using specific version of API client when instantiating them.
Applied that same change to the following files:

  • UIProcess/API/gtk/WebKitContextMenuClient.cpp:
  • UIProcess/API/gtk/WebKitCookieManager.cpp:
  • UIProcess/API/gtk/WebKitDownloadClient.cpp:
  • UIProcess/API/gtk/WebKitFaviconDatabase.cpp:
  • UIProcess/API/gtk/WebKitFindController.cpp:
  • UIProcess/API/gtk/WebKitFormClient.cpp:
  • UIProcess/API/gtk/WebKitGeolocationProvider.cpp:
  • UIProcess/API/gtk/WebKitInjectedBundleClient.cpp:
  • UIProcess/API/gtk/WebKitLoaderClient.cpp:
  • UIProcess/API/gtk/WebKitPolicyClient.cpp:
  • UIProcess/API/gtk/WebKitUIClient.cpp:
  • WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp:
  • WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp:
Location:
trunk/Source/WebKit2
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r160123 r160125  
     12013-12-04  Nick Diego Yamane  <nick.yamane@openbossa.org>
     2
     3        [GTK][WK2] Fix build after r160104
     4        https://bugs.webkit.org/show_bug.cgi?id=125240
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Using specific version of API client when instantiating them.
     9        Applied that same change to the following files:
     10
     11        * UIProcess/API/gtk/WebKitContextMenuClient.cpp:
     12        * UIProcess/API/gtk/WebKitCookieManager.cpp:
     13        * UIProcess/API/gtk/WebKitDownloadClient.cpp:
     14        * UIProcess/API/gtk/WebKitFaviconDatabase.cpp:
     15        * UIProcess/API/gtk/WebKitFindController.cpp:
     16        * UIProcess/API/gtk/WebKitFormClient.cpp:
     17        * UIProcess/API/gtk/WebKitGeolocationProvider.cpp:
     18        * UIProcess/API/gtk/WebKitInjectedBundleClient.cpp:
     19        * UIProcess/API/gtk/WebKitLoaderClient.cpp:
     20        * UIProcess/API/gtk/WebKitPolicyClient.cpp:
     21        * UIProcess/API/gtk/WebKitUIClient.cpp:
     22        * WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp:
     23        * WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp:
     24
    1252013-12-04  Dan Bernstein  <mitz@apple.com>
    226
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuClient.cpp

    r148420 r160125  
    3434void attachContextMenuClientToView(WebKitWebView* webView)
    3535{
    36     WKPageContextMenuClient wkContextMenuClient = {
    37         kWKPageContextMenuClientCurrentVersion,
    38         webView, // clientInfo
     36    WKPageContextMenuClientV3 wkContextMenuClient = {
     37        {
     38            3, // version
     39            webView, // clientInfo
     40        },
    3941        0, // getContextMenuFromProposedMenu_deprecatedForUseWithV0
    4042        0, // customContextMenuItemSelected
     
    4547    };
    4648    WKPageRef wkPage = toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView)));
    47     WKPageSetPageContextMenuClient(wkPage, &wkContextMenuClient);
     49    WKPageSetPageContextMenuClient(wkPage, &wkContextMenuClient.base);
    4850}
    4951
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp

    r159247 r160125  
    101101    manager->priv->webCookieManager = webCookieManager;
    102102
    103     WKCookieManagerClient wkCookieManagerClient = {
    104         kWKCookieManagerClientCurrentVersion,
    105         manager, // clientInfo
     103    WKCookieManagerClientV0 wkCookieManagerClient = {
     104        {
     105            0, // version
     106            manager, // clientInfo
     107        },
    106108        cookiesDidChange
    107109    };
    108     WKCookieManagerSetClient(toAPI(webCookieManager), &wkCookieManagerClient);
     110    WKCookieManagerSetClient(toAPI(webCookieManager), &wkCookieManagerClient.base);
    109111    manager->priv->webCookieManager->startObservingCookieChanges();
    110112
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp

    r130621 r160125  
    9696void attachDownloadClientToContext(WebKitWebContext* webContext)
    9797{
    98     WKContextDownloadClient wkDownloadClient = {
    99         kWKContextDownloadClientCurrentVersion,
    100         webContext, // ClientInfo
     98    WKContextDownloadClientV0 wkDownloadClient = {
     99        {
     100            0, // version
     101            webContext, // ClientInfo
     102        },
    101103        didStart,
    102104        0, // didReceiveAuthenticationChallenge
     
    111113        0, // processDidCrash
    112114    };
    113     WKContextSetDownloadClient(toAPI(webkitWebContextGetContext(webContext)), &wkDownloadClient);
     115    WKContextSetDownloadClient(toAPI(webkitWebContextGetContext(webContext)), &wkDownloadClient.base);
    114116}
    115117
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp

    r159001 r160125  
    215215    faviconDatabase->priv->iconDatabase = iconDatabase;
    216216
    217     WKIconDatabaseClient wkIconDatabaseClient = {
    218         kWKIconDatabaseClientCurrentVersion,
    219         faviconDatabase, // clientInfo
     217    WKIconDatabaseClientV1 wkIconDatabaseClient = {
     218        {
     219            1, // version
     220            faviconDatabase, // clientInfo
     221        },
    220222        didChangeIconForPageURLCallback,
    221223        0, // didRemoveAllIconsCallback
    222224        iconDataReadyForPageURLCallback,
    223225    };
    224     WKIconDatabaseSetIconDatabaseClient(toAPI(iconDatabase), &wkIconDatabaseClient);
     226    WKIconDatabaseSetIconDatabaseClient(toAPI(iconDatabase), &wkIconDatabaseClient.base);
    225227    return faviconDatabase;
    226228}
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp

    r150018 r160125  
    112112{
    113113    WebKitFindController* findController = WEBKIT_FIND_CONTROLLER(object);
    114     WKPageFindClient wkFindClient = {
    115         kWKPageFindClientCurrentVersion,
    116         findController, // clientInfo
     114    WKPageFindClientV0 wkFindClient = {
     115        {
     116            0, // version
     117            findController, // clientInfo
     118        },
    117119        didFindString,
    118120        didFailToFindString,
     
    120122    };
    121123
    122     WKPageSetPageFindClient(toAPI(getPage(findController)), &wkFindClient);
     124    WKPageSetPageFindClient(toAPI(getPage(findController)), &wkFindClient.base);
    123125}
    124126
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormClient.cpp

    r131756 r160125  
    3737void attachFormClientToView(WebKitWebView* webView)
    3838{
    39     WKPageFormClient wkFormClient = {
    40         kWKPageFormClientCurrentVersion,
    41         webView, // clientInfo
     39    WKPageFormClientV0 wkFormClient = {
     40        {
     41            0, // version
     42            webView, // clientInfo
     43        },
    4244        willSubmitForm
    4345    };
    4446    WKPageRef wkPage = toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView)));
    45     WKPageSetPageFormClient(wkPage, &wkFormClient);
     47    WKPageSetPageFormClient(wkPage, &wkFormClient.base);
    4648}
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitGeolocationProvider.cpp

    r131760 r160125  
    6565    ASSERT(geolocationManager);
    6666
    67     WKGeolocationProvider wkGeolocationProvider = {
    68         kWKGeolocationProviderCurrentVersion,
    69         this, // clientInfo
     67    WKGeolocationProviderV1 wkGeolocationProvider = {
     68        {
     69            1, // version
     70            this, // clientInfo
     71        },
    7072        startUpdatingCallback,
    71         stopUpdatingCallback
     73        stopUpdatingCallback,
     74        0 // setEnableHighAccuracy
    7275    };
    73     WKGeolocationManagerSetProvider(toAPI(geolocationManager), &wkGeolocationProvider);
     76    WKGeolocationManagerSetProvider(toAPI(geolocationManager), &wkGeolocationProvider.base);
    7477}
    7578
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp

    r148526 r160125  
    121121void attachInjectedBundleClientToContext(WebKitWebContext* webContext)
    122122{
    123     WKContextInjectedBundleClient wkInjectedBundleClient = {
    124         kWKContextInjectedBundleClientCurrentVersion,
    125         webContext, // clientInfo
     123    WKContextInjectedBundleClientV1 wkInjectedBundleClient = {
     124        {
     125            0, // version
     126            webContext, // clientInfo
     127        },
    126128        didReceiveMessageFromInjectedBundle,
    127129        0, // didReceiveSynchronousMessageFromInjectedBundle
    128130        0 // getInjectedBundleInitializationUserData
    129131    };
    130     WKContextSetInjectedBundleClient(toAPI(webkitWebContextGetContext(webContext)), &wkInjectedBundleClient);
     132    WKContextSetInjectedBundleClient(toAPI(webkitWebContextGetContext(webContext)), &wkInjectedBundleClient.base);
    131133}
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp

    r157842 r160125  
    141141void attachLoaderClientToView(WebKitWebView* webView)
    142142{
    143     WKPageLoaderClient wkLoaderClient = {
    144         kWKPageLoaderClientCurrentVersion,
    145         webView, // clientInfo
     143    WKPageLoaderClientV3 wkLoaderClient = {
     144        {
     145            3, // version
     146            webView, // clientInfo
     147        },
    146148        didStartProvisionalLoadForFrame,
    147149        didReceiveServerRedirectForProvisionalLoadForFrame,
     
    182184    };
    183185    WKPageRef wkPage = toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView)));
    184     WKPageSetPageLoaderClient(wkPage, &wkLoaderClient);
     186    WKPageSetPageLoaderClient(wkPage, &wkLoaderClient.base);
    185187}
    186188
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp

    r159556 r160125  
    6969void attachPolicyClientToView(WebKitWebView* webView)
    7070{
    71     WKPagePolicyClient policyClient = {
    72         kWKPagePolicyClientCurrentVersion,
    73         webView, // clientInfo
     71    WKPagePolicyClientV1 policyClient = {
     72        {
     73            1, // version
     74            webView, // clientInfo
     75        },
    7476        0, // decidePolicyForNavigationAction_deprecatedForUseWithV0
    7577        decidePolicyForNewWindowAction,
     
    7981        decidePolicyForResponse
    8082    };
    81     WKPageSetPagePolicyClient(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView))), &policyClient);
     83    WKPageSetPagePolicyClient(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView))), &policyClient.base);
    8284}
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp

    r145308 r160125  
    161161void attachUIClientToView(WebKitWebView* webView)
    162162{
    163     WKPageUIClient wkUIClient = {
    164         kWKPageUIClientCurrentVersion,
    165         webView, // clientInfo
     163    WKPageUIClientV2 wkUIClient = {
     164        {
     165            2, // version
     166            webView, // clientInfo
     167        },
    166168        0, // createNewPage_deprecatedForUseWithV0
    167169        showPage,
     
    212214    };
    213215    WKPageRef wkPage = toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView)));
    214     WKPageSetPageUIClient(wkPage, &wkUIClient);
    215 }
    216 
     216    WKPageSetPageUIClient(wkPage, &wkUIClient.base);
     217}
     218
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp

    r148526 r160125  
    117117    WebKitWebExtension* extension = WEBKIT_WEB_EXTENSION(g_object_new(WEBKIT_TYPE_WEB_EXTENSION, NULL));
    118118
    119     WKBundleClient wkBundleClient = {
    120         kWKBundleClientCurrentVersion,
    121         extension, // clientInfo
     119    WKBundleClientV1 wkBundleClient = {
     120        {
     121            1, // version
     122            extension, // clientInfo
     123        },
    122124        didCreatePage,
    123125        willDestroyPage,
     
    126128        didReceiveMessageToPage
    127129    };
    128     WKBundleSetClient(toAPI(bundle), &wkBundleClient);
     130    WKBundleSetClient(toAPI(bundle), &wkBundleClient.base);
    129131
    130132    return extension;
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp

    r154603 r160125  
    310310    page->priv->webPage = webPage;
    311311
    312     WKBundlePageLoaderClient loaderClient = {
    313         kWKBundlePageLoaderClientCurrentVersion,
    314         page,
     312    WKBundlePageLoaderClientV7 loaderClient = {
     313        {
     314            7, // version
     315            page, // clientInfo
     316        },
    315317        didStartProvisionalLoadForFrame,
    316318        didReceiveServerRedirectForProvisionalLoadForFrame,
     
    349351        willDestroyFrame
    350352    };
    351     WKBundlePageSetPageLoaderClient(toAPI(webPage), &loaderClient);
    352 
    353     WKBundlePageResourceLoadClient resourceLoadClient = {
    354         kWKBundlePageResourceLoadClientCurrentVersion,
    355         page,
     353    WKBundlePageSetPageLoaderClient(toAPI(webPage), &loaderClient.base);
     354
     355    WKBundlePageResourceLoadClientV1 resourceLoadClient = {
     356        {
     357            1, // version
     358            page, // clientInfo
     359        },
    356360        didInitiateLoadForResource,
    357361        willSendRequestForFrame,
     
    363367        0 // shouldUseCredentialStorage
    364368    };
    365     WKBundlePageSetResourceLoadClient(toAPI(webPage), &resourceLoadClient);
     369    WKBundlePageSetResourceLoadClient(toAPI(webPage), &resourceLoadClient.base);
    366370
    367371    return page;
Note: See TracChangeset for help on using the changeset viewer.