Changeset 218098 in webkit
- Timestamp:
- Jun 12, 2017 5:58:50 AM (7 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r218097 r218098 1 2017-06-12 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 [GTK] Prefer to use private WebKitWebView API over WebKitWebViewBase 4 https://bugs.webkit.org/show_bug.cgi?id=173254 5 6 Reviewed by Žan Doberšek. 7 8 WebKitWebViewBase is specific to the GTK+ API, but WebKitWebView should be present in any glib-based API. Add 9 webkitWebViewCreatePage() and webkitWebViewGetPage() and use them when possible instead of the WebKitWebViewBase 10 ones. 11 12 * UIProcess/API/gtk/WebKitAutomationSession.cpp: 13 * UIProcess/API/gtk/WebKitContextMenuClient.cpp: 14 (attachContextMenuClientToView): 15 * UIProcess/API/gtk/WebKitFindController.cpp: 16 (getPage): 17 (webkitFindControllerDispose): 18 (webkitFindControllerConstructed): 19 (webKitFindControllerPerform): 20 (webkit_find_controller_search_finish): 21 * UIProcess/API/gtk/WebKitFormClient.cpp: 22 (attachFormClientToView): 23 * UIProcess/API/gtk/WebKitLoaderClient.cpp: 24 (attachLoaderClientToView): 25 * UIProcess/API/gtk/WebKitPolicyClient.cpp: 26 (attachPolicyClientToView): 27 * UIProcess/API/gtk/WebKitPrintOperation.cpp: 28 (drawPagesForPrintingCompleted): 29 (webkitPrintOperationPrintPagesForFrame): 30 (webkit_print_operation_run_dialog): 31 (webkit_print_operation_print): 32 * UIProcess/API/gtk/WebKitUIClient.cpp: 33 (attachUIClientToView): 34 * UIProcess/API/gtk/WebKitWebContext.cpp: 35 (webkitWebContextCreatePageForWebView): 36 (webkitWebContextWebViewDestroyed): 37 * UIProcess/API/gtk/WebKitWebView.cpp: 38 (webkitWebViewCreatePage): 39 (webkitWebViewGetPage): 40 * UIProcess/API/gtk/WebKitWebViewPrivate.h: 41 1 42 2017-06-12 Carlos Garcia Campos <cgarcia@igalia.com> 2 43 -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitAutomationSession.cpp
r216006 r218098 24 24 #include "WebKitAutomationSessionPrivate.h" 25 25 #include "WebKitPrivate.h" 26 #include "WebKitWebView.h" 27 #include "WebKitWebViewBasePrivate.h" 26 #include "WebKitWebViewPrivate.h" 28 27 #include <glib/gi18n-lib.h> 29 28 #include <wtf/text/CString.h> … … 87 86 return nullptr; 88 87 89 return webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView));88 return &webkitWebViewGetPage(webView); 90 89 } 91 90 -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuClient.cpp
r191491 r218098 23 23 #include "APIContextMenuClient.h" 24 24 #include "WebContextMenuItem.h" 25 #include "WebKitWebViewBasePrivate.h"26 25 #include "WebKitWebViewPrivate.h" 27 26 … … 58 57 void attachContextMenuClientToView(WebKitWebView* webView) 59 58 { 60 WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView)); 61 page->setContextMenuClient(std::make_unique<ContextMenuClient>(webView)); 59 webkitWebViewGetPage(webView).setContextMenuClient(std::make_unique<ContextMenuClient>(webView)); 62 60 } 63 61 -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp
r217961 r218098 24 24 #include "WebKitEnumTypes.h" 25 25 #include "WebKitPrivate.h" 26 #include "WebKitWebView.h" 27 #include "WebKitWebViewBasePrivate.h" 26 #include "WebKitWebViewPrivate.h" 28 27 #include <glib/gi18n-lib.h> 29 28 #include <wtf/glib/GRefPtr.h> … … 103 102 } 104 103 105 static inline WebPageProxy *getPage(WebKitFindController* findController)106 { 107 return webkitWebView BaseGetPage(reinterpret_cast<WebKitWebViewBase*>(findController->priv->webView));104 static inline WebPageProxy& getPage(WebKitFindController* findController) 105 { 106 return webkitWebViewGetPage(findController->priv->webView); 108 107 } 109 108 … … 137 136 { 138 137 WebKitFindController* findController = WEBKIT_FIND_CONTROLLER(object); 139 getPage(findController) ->setFindClient(nullptr);138 getPage(findController).setFindClient(nullptr); 140 139 141 140 G_OBJECT_CLASS(webkit_find_controller_parent_class)->dispose(object); … … 147 146 148 147 WebKitFindController* findController = WEBKIT_FIND_CONTROLLER(object); 149 getPage(findController) ->setFindClient(std::make_unique<FindClient>(findController));148 getPage(findController).setFindClient(std::make_unique<FindClient>(findController)); 150 149 } 151 150 … … 375 374 WebKitFindControllerPrivate* priv = findController->priv; 376 375 if (operation == CountOperation) { 377 getPage(findController) ->countStringMatches(String::fromUTF8(priv->searchText.data()),376 getPage(findController).countStringMatches(String::fromUTF8(priv->searchText.data()), 378 377 static_cast<WebKit::FindOptions>(priv->findOptions), priv->maxMatchCount); 379 378 return; … … 391 390 findOptions |= FindOptionsShowHighlight; 392 391 393 getPage(findController)->findString(String::fromUTF8(priv->searchText.data()), static_cast<WebKit::FindOptions>(findOptions), 394 priv->maxMatchCount); 392 getPage(findController).findString(String::fromUTF8(priv->searchText.data()), static_cast<WebKit::FindOptions>(findOptions), priv->maxMatchCount); 395 393 } 396 394 … … 509 507 g_return_if_fail(WEBKIT_IS_FIND_CONTROLLER(findController)); 510 508 511 getPage(findController) ->hideFindUI();512 } 509 getPage(findController).hideFindUI(); 510 } -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormClient.cpp
r217963 r218098 25 25 #include "WebKitFormSubmissionRequestPrivate.h" 26 26 #include "WebKitPrivate.h" 27 #include "WebKitWebViewBasePrivate.h"28 27 #include "WebKitWebViewPrivate.h" 29 28 #include <wtf/glib/GRefPtr.h> … … 50 49 void attachFormClientToView(WebKitWebView* webView) 51 50 { 52 auto* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView)); 53 page->setFormClient(std::make_unique<FormClient>(webView)); 51 webkitWebViewGetPage(webView).setFormClient(std::make_unique<FormClient>(webView)); 54 52 } -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp
r194419 r218098 26 26 #include "WebKitPrivate.h" 27 27 #include "WebKitURIResponsePrivate.h" 28 #include "WebKitWebViewBasePrivate.h"29 28 #include "WebKitWebViewPrivate.h" 30 29 #include <wtf/glib/GUniquePtr.h> … … 122 121 void attachLoaderClientToView(WebKitWebView* webView) 123 122 { 124 WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView)); 125 page->setLoaderClient(std::make_unique<LoaderClient>(webView)); 123 webkitWebViewGetPage(webView).setLoaderClient(std::make_unique<LoaderClient>(webView)); 126 124 } 127 125 -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp
r209604 r218098 24 24 #include "WebKitNavigationPolicyDecisionPrivate.h" 25 25 #include "WebKitResponsePolicyDecisionPrivate.h" 26 #include "WebKitWebViewBasePrivate.h"27 26 #include "WebKitWebViewPrivate.h" 28 27 #include "WebsitePolicies.h" … … 63 62 void attachPolicyClientToView(WebKitWebView* webView) 64 63 { 65 WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView)); 66 page->setPolicyClient(std::make_unique<PolicyClient>(webView)); 64 webkitWebViewGetPage(webView).setPolicyClient(std::make_unique<PolicyClient>(webView)); 67 65 } -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp
r211481 r218098 24 24 #include "WebKitPrintOperationPrivate.h" 25 25 #include "WebKitPrivate.h" 26 #include "WebKitWebView BasePrivate.h"26 #include "WebKitWebViewPrivate.h" 27 27 #include "WebPageProxy.h" 28 28 #include <WebCore/GtkUtilities.h> … … 308 308 { 309 309 // When running synchronously WebPageProxy::printFrame() calls endPrinting(). 310 if (printOperation->priv->printMode == PrintInfo::PrintModeAsync && printOperation->priv->webView) { 311 WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(printOperation->priv->webView)); 312 page->endPrinting(); 313 } 310 if (printOperation->priv->printMode == PrintInfo::PrintModeAsync && printOperation->priv->webView) 311 webkitWebViewGetPage(printOperation->priv->webView).endPrinting(); 314 312 315 313 const WebCore::ResourceError& resourceError = wkPrintError ? wkPrintError->platformError() : WebCore::ResourceError(); … … 325 323 { 326 324 PrintInfo printInfo(printSettings, pageSetup, printOperation->priv->printMode); 327 WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(printOperation->priv->webView));325 auto& page = webkitWebViewGetPage(printOperation->priv->webView); 328 326 g_object_ref(printOperation); 329 page ->drawPagesForPrinting(webFrame, printInfo, PrintFinishedCallback::create([printOperation](API::Error* printError, CallbackBase::Error) {327 page.drawPagesForPrinting(webFrame, printInfo, PrintFinishedCallback::create([printOperation](API::Error* printError, CallbackBase::Error) { 330 328 drawPagesForPrintingCompleted(printError, adoptGRef(printOperation).get()); 331 329 })); … … 467 465 g_return_val_if_fail(WEBKIT_IS_PRINT_OPERATION(printOperation), WEBKIT_PRINT_OPERATION_RESPONSE_CANCEL); 468 466 469 WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(printOperation->priv->webView));470 return webkitPrintOperationRunDialogForFrame(printOperation, parent, page ->mainFrame());467 auto& page = webkitWebViewGetPage(printOperation->priv->webView); 468 return webkitPrintOperationRunDialogForFrame(printOperation, parent, page.mainFrame()); 471 469 } 472 470 … … 492 490 GRefPtr<GtkPageSetup> pageSetup = priv->pageSetup ? priv->pageSetup : adoptGRef(gtk_page_setup_new()); 493 491 494 WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(printOperation->priv->webView));495 webkitPrintOperationPrintPagesForFrame(printOperation, page ->mainFrame(), printSettings.get(), pageSetup.get());496 } 492 auto& page = webkitWebViewGetPage(printOperation->priv->webView); 493 webkitPrintOperationPrintPagesForFrame(printOperation, page.mainFrame(), printSettings.get(), pageSetup.get()); 494 } -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp
r217571 r218098 29 29 #include "WebKitURIRequestPrivate.h" 30 30 #include "WebKitUserMediaPermissionRequestPrivate.h" 31 #include "WebKitWebViewBasePrivate.h"32 31 #include "WebKitWebViewPrivate.h" 33 32 #include "WebKitWindowPropertiesPrivate.h" … … 218 217 void attachUIClientToView(WebKitWebView* webView) 219 218 { 220 WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView)); 221 page->setUIClient(std::make_unique<UIClient>(webView)); 219 webkitWebViewGetPage(webView).setUIClient(std::make_unique<UIClient>(webView)); 222 220 } 223 221 -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp
r216794 r218098 50 50 #include "WebKitUserContentManagerPrivate.h" 51 51 #include "WebKitWebContextPrivate.h" 52 #include "WebKitWebViewBasePrivate.h"53 52 #include "WebKitWebViewPrivate.h" 54 53 #include "WebKitWebsiteDataManagerPrivate.h" … … 1602 1601 void webkitWebContextCreatePageForWebView(WebKitWebContext* context, WebKitWebView* webView, WebKitUserContentManager* userContentManager, WebKitWebView* relatedView) 1603 1602 { 1604 WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(webView);1605 1606 1603 // FIXME: icon database private mode is global, not per page, so while there are 1607 1604 // pages in private mode we need to enable the private mode in the icon database. … … 1611 1608 pageConfiguration->setProcessPool(context->priv->processPool.get()); 1612 1609 pageConfiguration->setPreferences(webkitSettingsGetPreferences(webkit_web_view_get_settings(webView))); 1613 pageConfiguration->setRelatedPage(relatedView ? webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(relatedView)) : nullptr);1610 pageConfiguration->setRelatedPage(relatedView ? &webkitWebViewGetPage(relatedView) : nullptr); 1614 1611 pageConfiguration->setUserContentController(userContentManager ? webkitUserContentManagerGetUserContentControllerProxy(userContentManager) : nullptr); 1615 1612 pageConfiguration->setControlledByAutomation(webkit_web_view_is_controlled_by_automation(webView)); … … 1620 1617 pageConfiguration->setWebsiteDataStore(&webkitWebsiteDataManagerGetDataStore(manager)); 1621 1618 pageConfiguration->setSessionID(pageConfiguration->websiteDataStore()->websiteDataStore().sessionID()); 1622 webkitWebViewBaseCreateWebPage(webViewBase, WTFMove(pageConfiguration)); 1623 1624 WebPageProxy* page = webkitWebViewBaseGetPage(webViewBase); 1625 context->priv->webViews.set(page->pageID(), webView); 1619 webkitWebViewCreatePage(webView, WTFMove(pageConfiguration)); 1620 1621 context->priv->webViews.set(webkit_web_view_get_page_id(webView), webView); 1626 1622 } 1627 1623 … … 1629 1625 { 1630 1626 webkitWebContextDisableIconDatabasePrivateBrowsingIfNeeded(context, webView); 1631 WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView)); 1632 context->priv->webViews.remove(page->pageID()); 1627 context->priv->webViews.remove(webkit_web_view_get_page_id(webView)); 1633 1628 } 1634 1629 -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
r218097 r218098 1895 1895 } 1896 1896 1897 void webkitWebViewCreatePage(WebKitWebView* webView, Ref<API::PageConfiguration>&& configuration) 1898 { 1899 webkitWebViewBaseCreateWebPage(WEBKIT_WEB_VIEW_BASE(webView), WTFMove(configuration)); 1900 } 1901 1902 WebPageProxy& webkitWebViewGetPage(WebKitWebView* webView) 1903 { 1904 return getPage(webView); 1905 } 1906 1897 1907 void webkitWebViewLoadChanged(WebKitWebView* webView, WebKitLoadEvent loadEvent) 1898 1908 { -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewPrivate.h
r218064 r218098 25 25 */ 26 26 27 #ifndef WebKitWebViewPrivate_h 28 #define WebKitWebViewPrivate_h 27 #pragma once 29 28 29 #include "APIPageConfiguration.h" 30 30 #include "InstallMissingMediaPluginsPermissionRequest.h" 31 31 #include "WebContextMenuItemData.h" 32 32 #include "WebHitTestResultData.h" 33 33 #include "WebImage.h" 34 #include "WebKitPrivate.h" 34 35 #include "WebKitWebView.h" 36 #include "WebPageProxy.h" 35 37 #include <wtf/text/CString.h> 36 38 39 void webkitWebViewCreatePage(WebKitWebView*, Ref<API::PageConfiguration>&&); 40 WebKit::WebPageProxy& webkitWebViewGetPage(WebKitWebView*); 37 41 void webkitWebViewLoadChanged(WebKitWebView*, WebKitLoadEvent); 38 42 void webkitWebViewLoadFailed(WebKitWebView*, WebKitLoadEvent, const char* failingURI, GError*); … … 69 73 void webkitWebViewRequestInstallMissingMediaPlugins(WebKitWebView*, WebKit::InstallMissingMediaPluginsPermissionRequest&); 70 74 WebKitWebsiteDataManager* webkitWebViewGetWebsiteDataManager(WebKitWebView*); 71 72 #endif // WebKitWebViewPrivate_h
Note: See TracChangeset
for help on using the changeset viewer.