Changeset 160125 in webkit
- Timestamp:
- Dec 4, 2013 2:18:40 PM (10 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r160123 r160125 1 2013-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 1 25 2013-12-04 Dan Bernstein <mitz@apple.com> 2 26 -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuClient.cpp
r148420 r160125 34 34 void attachContextMenuClientToView(WebKitWebView* webView) 35 35 { 36 WKPageContextMenuClient wkContextMenuClient = { 37 kWKPageContextMenuClientCurrentVersion, 38 webView, // clientInfo 36 WKPageContextMenuClientV3 wkContextMenuClient = { 37 { 38 3, // version 39 webView, // clientInfo 40 }, 39 41 0, // getContextMenuFromProposedMenu_deprecatedForUseWithV0 40 42 0, // customContextMenuItemSelected … … 45 47 }; 46 48 WKPageRef wkPage = toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView))); 47 WKPageSetPageContextMenuClient(wkPage, &wkContextMenuClient );49 WKPageSetPageContextMenuClient(wkPage, &wkContextMenuClient.base); 48 50 } 49 51 -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp
r159247 r160125 101 101 manager->priv->webCookieManager = webCookieManager; 102 102 103 WKCookieManagerClient wkCookieManagerClient = { 104 kWKCookieManagerClientCurrentVersion, 105 manager, // clientInfo 103 WKCookieManagerClientV0 wkCookieManagerClient = { 104 { 105 0, // version 106 manager, // clientInfo 107 }, 106 108 cookiesDidChange 107 109 }; 108 WKCookieManagerSetClient(toAPI(webCookieManager), &wkCookieManagerClient );110 WKCookieManagerSetClient(toAPI(webCookieManager), &wkCookieManagerClient.base); 109 111 manager->priv->webCookieManager->startObservingCookieChanges(); 110 112 -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp
r130621 r160125 96 96 void attachDownloadClientToContext(WebKitWebContext* webContext) 97 97 { 98 WKContextDownloadClient wkDownloadClient = { 99 kWKContextDownloadClientCurrentVersion, 100 webContext, // ClientInfo 98 WKContextDownloadClientV0 wkDownloadClient = { 99 { 100 0, // version 101 webContext, // ClientInfo 102 }, 101 103 didStart, 102 104 0, // didReceiveAuthenticationChallenge … … 111 113 0, // processDidCrash 112 114 }; 113 WKContextSetDownloadClient(toAPI(webkitWebContextGetContext(webContext)), &wkDownloadClient );115 WKContextSetDownloadClient(toAPI(webkitWebContextGetContext(webContext)), &wkDownloadClient.base); 114 116 } 115 117 -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp
r159001 r160125 215 215 faviconDatabase->priv->iconDatabase = iconDatabase; 216 216 217 WKIconDatabaseClient wkIconDatabaseClient = { 218 kWKIconDatabaseClientCurrentVersion, 219 faviconDatabase, // clientInfo 217 WKIconDatabaseClientV1 wkIconDatabaseClient = { 218 { 219 1, // version 220 faviconDatabase, // clientInfo 221 }, 220 222 didChangeIconForPageURLCallback, 221 223 0, // didRemoveAllIconsCallback 222 224 iconDataReadyForPageURLCallback, 223 225 }; 224 WKIconDatabaseSetIconDatabaseClient(toAPI(iconDatabase), &wkIconDatabaseClient );226 WKIconDatabaseSetIconDatabaseClient(toAPI(iconDatabase), &wkIconDatabaseClient.base); 225 227 return faviconDatabase; 226 228 } -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp
r150018 r160125 112 112 { 113 113 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 }, 117 119 didFindString, 118 120 didFailToFindString, … … 120 122 }; 121 123 122 WKPageSetPageFindClient(toAPI(getPage(findController)), &wkFindClient );124 WKPageSetPageFindClient(toAPI(getPage(findController)), &wkFindClient.base); 123 125 } 124 126 -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormClient.cpp
r131756 r160125 37 37 void attachFormClientToView(WebKitWebView* webView) 38 38 { 39 WKPageFormClient wkFormClient = { 40 kWKPageFormClientCurrentVersion, 41 webView, // clientInfo 39 WKPageFormClientV0 wkFormClient = { 40 { 41 0, // version 42 webView, // clientInfo 43 }, 42 44 willSubmitForm 43 45 }; 44 46 WKPageRef wkPage = toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView))); 45 WKPageSetPageFormClient(wkPage, &wkFormClient );47 WKPageSetPageFormClient(wkPage, &wkFormClient.base); 46 48 } -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitGeolocationProvider.cpp
r131760 r160125 65 65 ASSERT(geolocationManager); 66 66 67 WKGeolocationProvider wkGeolocationProvider = { 68 kWKGeolocationProviderCurrentVersion, 69 this, // clientInfo 67 WKGeolocationProviderV1 wkGeolocationProvider = { 68 { 69 1, // version 70 this, // clientInfo 71 }, 70 72 startUpdatingCallback, 71 stopUpdatingCallback 73 stopUpdatingCallback, 74 0 // setEnableHighAccuracy 72 75 }; 73 WKGeolocationManagerSetProvider(toAPI(geolocationManager), &wkGeolocationProvider );76 WKGeolocationManagerSetProvider(toAPI(geolocationManager), &wkGeolocationProvider.base); 74 77 } 75 78 -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp
r148526 r160125 121 121 void attachInjectedBundleClientToContext(WebKitWebContext* webContext) 122 122 { 123 WKContextInjectedBundleClient wkInjectedBundleClient = { 124 kWKContextInjectedBundleClientCurrentVersion, 125 webContext, // clientInfo 123 WKContextInjectedBundleClientV1 wkInjectedBundleClient = { 124 { 125 0, // version 126 webContext, // clientInfo 127 }, 126 128 didReceiveMessageFromInjectedBundle, 127 129 0, // didReceiveSynchronousMessageFromInjectedBundle 128 130 0 // getInjectedBundleInitializationUserData 129 131 }; 130 WKContextSetInjectedBundleClient(toAPI(webkitWebContextGetContext(webContext)), &wkInjectedBundleClient );132 WKContextSetInjectedBundleClient(toAPI(webkitWebContextGetContext(webContext)), &wkInjectedBundleClient.base); 131 133 } -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp
r157842 r160125 141 141 void attachLoaderClientToView(WebKitWebView* webView) 142 142 { 143 WKPageLoaderClient wkLoaderClient = { 144 kWKPageLoaderClientCurrentVersion, 145 webView, // clientInfo 143 WKPageLoaderClientV3 wkLoaderClient = { 144 { 145 3, // version 146 webView, // clientInfo 147 }, 146 148 didStartProvisionalLoadForFrame, 147 149 didReceiveServerRedirectForProvisionalLoadForFrame, … … 182 184 }; 183 185 WKPageRef wkPage = toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView))); 184 WKPageSetPageLoaderClient(wkPage, &wkLoaderClient );186 WKPageSetPageLoaderClient(wkPage, &wkLoaderClient.base); 185 187 } 186 188 -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp
r159556 r160125 69 69 void attachPolicyClientToView(WebKitWebView* webView) 70 70 { 71 WKPagePolicyClient policyClient = { 72 kWKPagePolicyClientCurrentVersion, 73 webView, // clientInfo 71 WKPagePolicyClientV1 policyClient = { 72 { 73 1, // version 74 webView, // clientInfo 75 }, 74 76 0, // decidePolicyForNavigationAction_deprecatedForUseWithV0 75 77 decidePolicyForNewWindowAction, … … 79 81 decidePolicyForResponse 80 82 }; 81 WKPageSetPagePolicyClient(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView))), &policyClient );83 WKPageSetPagePolicyClient(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView))), &policyClient.base); 82 84 } -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp
r145308 r160125 161 161 void attachUIClientToView(WebKitWebView* webView) 162 162 { 163 WKPageUIClient wkUIClient = { 164 kWKPageUIClientCurrentVersion, 165 webView, // clientInfo 163 WKPageUIClientV2 wkUIClient = { 164 { 165 2, // version 166 webView, // clientInfo 167 }, 166 168 0, // createNewPage_deprecatedForUseWithV0 167 169 showPage, … … 212 214 }; 213 215 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 117 117 WebKitWebExtension* extension = WEBKIT_WEB_EXTENSION(g_object_new(WEBKIT_TYPE_WEB_EXTENSION, NULL)); 118 118 119 WKBundleClient wkBundleClient = { 120 kWKBundleClientCurrentVersion, 121 extension, // clientInfo 119 WKBundleClientV1 wkBundleClient = { 120 { 121 1, // version 122 extension, // clientInfo 123 }, 122 124 didCreatePage, 123 125 willDestroyPage, … … 126 128 didReceiveMessageToPage 127 129 }; 128 WKBundleSetClient(toAPI(bundle), &wkBundleClient );130 WKBundleSetClient(toAPI(bundle), &wkBundleClient.base); 129 131 130 132 return extension; -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp
r154603 r160125 310 310 page->priv->webPage = webPage; 311 311 312 WKBundlePageLoaderClient loaderClient = { 313 kWKBundlePageLoaderClientCurrentVersion, 314 page, 312 WKBundlePageLoaderClientV7 loaderClient = { 313 { 314 7, // version 315 page, // clientInfo 316 }, 315 317 didStartProvisionalLoadForFrame, 316 318 didReceiveServerRedirectForProvisionalLoadForFrame, … … 349 351 willDestroyFrame 350 352 }; 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 }, 356 360 didInitiateLoadForResource, 357 361 willSendRequestForFrame, … … 363 367 0 // shouldUseCredentialStorage 364 368 }; 365 WKBundlePageSetResourceLoadClient(toAPI(webPage), &resourceLoadClient );369 WKBundlePageSetResourceLoadClient(toAPI(webPage), &resourceLoadClient.base); 366 370 367 371 return page;
Note: See TracChangeset
for help on using the changeset viewer.