Changeset 171742 in webkit
- Timestamp:
- Jul 29, 2014 5:42:53 AM (10 years ago)
- Location:
- trunk
- Files:
-
- 4 deleted
- 18 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r171740 r171742 1 2014-07-29 Adrian Perez de Castro <aperez@igalia.com> 2 3 [GTK] Remove WebKitWebViewGroup from WebKit2 GTK+ API 4 https://bugs.webkit.org/show_bug.cgi?id=133729 5 6 Reviewed by Carlos Garcia Campos. 7 8 Removes WebKitWebViewGroup, effectively reverting the changes 9 introduced by r149117. The motivation for WebKitWebViewGroup 10 was using the user style sheet injection API, which has been 11 moved into WebKitUserContentManager, rendering it unneeded. 12 13 * PlatformGTK.cmake: Remove WebKitWebViewGroup source files 14 from the build. 15 * UIProcess/API/C/gtk/WKView.cpp: 16 (WKViewCreate): Accomodate for changes in the signature of 17 webkitWebViewBaseCreate(). 18 * UIProcess/API/gtk/WebKitSettings.cpp: Update API documentation. 19 * UIProcess/API/gtk/WebKitWebContext.cpp: Remove the default web 20 view group from WebKitWebContext. 21 (webkitWebContextCreatePageForWebView): Allow passing a 22 WebPreferences object at construction. 23 (webkitWebContextGetDefaultWebViewGroup): Deleted. 24 * UIProcess/API/gtk/WebKitWebContextPrivate.h: Ditto. 25 * UIProcess/API/gtk/WebKitWebView.cpp: 26 (webkitWebViewUpdateSettings): Use WebPageProxy::setPreferences() 27 directly. Handle the case when webkit_web_view_set_settings() 28 is called on construction by doing an early-return. 29 (webkitWebViewConstructed): Call webkitWebViewUpdateSettings() 30 after creating the internal WebPageProxy object. 31 (webkitWebViewSetProperty): Removed "group" property, added 32 "settings" property. 33 (webkitWebViewGetProperty): Ditto. 34 (webkitWebViewDispose): Do not disconnect signal handler for 35 the (now unexistant) WebKitWebViewGroup. 36 (webkit_web_view_class_init): Removed "group" property, added 37 "settings" property. 38 (webkitWebViewHandleAuthenticationChallenge): Access the 39 WebKitWebSettings directly. 40 (webkit_web_view_new_with_related_view): Make new views share 41 settings with their related view. 42 (webkit_web_view_new_with_settings): Added. 43 (webkit_web_view_set_settings): Access the settings directly in 44 the WebKitWebView. 45 (webkit_web_view_get_settings): Ditto. 46 (webkit_web_view_set_zoom_level): Ditto. 47 (webkit_web_view_get_zoom_level): Ditto. 48 (webkitWebViewSettingsChanged): Deleted. 49 (webkitWebViewDisconnectSettingsChangedSignalHandler): Deleted. 50 (webkit_web_view_new_with_group): Deleted. 51 (webkit_web_view_get_group): Deleted. 52 * UIProcess/API/gtk/WebKitWebView.h: Removed API methods related 53 to WebKitWebViewGroup. 54 * UIProcess/API/gtk/WebKitWebViewBase.cpp: 55 (webkitWebViewBaseCreate): Allow passing a WebPreferences object 56 for constructing the WebPageProxy. 57 (webkitWebViewBaseUpdatePreferences): Instead of going through 58 the page group, use WebPageProxy::preferences() directly. 59 (webkitWebViewBaseCreateWebPage): Allow passing a WebPreferences 60 object for constructing the WebPageProxy. 61 * UIProcess/API/gtk/WebKitWebViewBasePrivate.h: Update the 62 prototypes of the internal functions. 63 * UIProcess/API/gtk/WebKitWebViewGroup.cpp: Removed. 64 * UIProcess/API/gtk/WebKitWebViewGroup.h: Removed. 65 * UIProcess/API/gtk/WebKitWebViewGroupPrivate.h: Removed. 66 * UIProcess/API/gtk/docs/webkit2gtk-docs.sgml: Change public API 67 bits in the documentation. 68 * UIProcess/API/gtk/docs/webkit2gtk-sections.txt: Ditto. 69 * UIProcess/API/gtk/docs/webkit2gtk.types: Ditto. 70 * UIProcess/API/gtk/webkit2.h: Removed WebKitWebViewGroup.h header. 71 * UIProcess/gtk/WebInspectorProxyGtk.cpp: 72 (WebKit::WebInspectorProxy::platformCreateInspectorPage): 73 Accomodate for changes in the signature of 74 webkitWebViewBaseCreate(). 75 1 76 2014-07-29 Carlos Garcia Campos <cgarcia@igalia.com> 2 77 -
trunk/Source/WebKit2/PlatformGTK.cmake
r170891 r171742 235 235 UIProcess/API/gtk/WebKitWebViewBaseAccessible.h 236 236 UIProcess/API/gtk/WebKitWebViewBasePrivate.h 237 UIProcess/API/gtk/WebKitWebViewGroup.cpp238 UIProcess/API/gtk/WebKitWebViewGroup.h239 UIProcess/API/gtk/WebKitWebViewGroupPrivate.h240 237 UIProcess/API/gtk/WebKitWebViewPrivate.h 241 238 UIProcess/API/gtk/WebKitWindowProperties.cpp … … 367 364 ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitWebView.h 368 365 ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitWebViewBase.h 369 ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitWebViewGroup.h370 366 ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitWindowProperties.h 371 367 ${WEBKIT2_DIR}/UIProcess/API/gtk/webkit2.h -
trunk/Source/WebKit2/UIProcess/API/C/gtk/WKView.cpp
r170891 r171742 38 38 WKViewRef WKViewCreate(WKContextRef contextRef, WKPageGroupRef pageGroupRef) 39 39 { 40 return toAPI(webkitWebViewBaseCreate(toImpl(contextRef), toImpl(pageGroupRef), nullptr, nullptr));40 return toAPI(webkitWebViewBaseCreate(toImpl(contextRef), nullptr, toImpl(pageGroupRef), nullptr, nullptr)); 41 41 } 42 42 -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp
r170258 r171742 35 35 #include "WebKitPrivate.h" 36 36 #include "WebKitSettingsPrivate.h" 37 #include "WebPageProxy.h" 38 #include "WebPreferences.h" 37 39 #include <WebCore/UserAgentGtk.h> 38 40 #include <glib/gi18n-lib.h> … … 71 73 /** 72 74 * SECTION:WebKitSettings 73 * @short_description: Control the behaviour of #WebKitWebView<!-- -->s 74 * @see_also: #WebKitWebViewGroup, #WebKitWebView 75 * 76 * #WebKitSettings can be applied to a #WebKitWebViewGroup to control text charset, 75 * @short_description: Control the behaviour of a #WebKitWebView 76 * 77 * #WebKitSettings can be applied to a #WebKitWebView to control text charset, 77 78 * color, font sizes, printing mode, script support, loading of images and various 78 * other things on the #WebKitWebView<!-- -->s of the group.79 * After creation, a #WebKitSettings objectcontains default settings.79 * other things on a #WebKitWebView. After creation, a #WebKitSettings object 80 * contains default settings. 80 81 * 81 82 * <informalexample><programlisting> … … 1224 1225 * 1225 1226 * Creates a new #WebKitSettings instance with default values. It must 1226 * be manually attached to a #WebKitWebView Group.1227 * be manually attached to a #WebKitWebView. 1227 1228 * See also webkit_settings_new_with_settings(). 1228 1229 * … … 1241 1242 * 1242 1243 * Creates a new #WebKitSettings instance with the given settings. It must 1243 * be manually attached to a #WebKitWebView Group.1244 * be manually attached to a #WebKitWebView. 1244 1245 * 1245 1246 * Returns: a new #WebKitSettings instance. -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp
r170891 r171742 38 38 #include "WebKitRequestManagerClient.h" 39 39 #include "WebKitSecurityManagerPrivate.h" 40 #include "WebKitSettingsPrivate.h" 40 41 #include "WebKitTextChecker.h" 41 42 #include "WebKitURISchemeRequestPrivate.h" … … 43 44 #include "WebKitWebContextPrivate.h" 44 45 #include "WebKitWebViewBasePrivate.h" 45 #include "WebKitWebView GroupPrivate.h"46 #include "WebKitWebViewPrivate.h" 46 47 #include "WebResourceCacheManagerProxy.h" 47 48 #include <WebCore/FileSystem.h> … … 157 158 158 159 HashMap<uint64_t, WebKitWebView*> webViews; 159 GRefPtr<WebKitWebViewGroup> defaultWebViewGroup;160 160 161 161 CString webExtensionsDirectory; … … 1052 1052 } 1053 1053 1054 void webkitWebContextCreatePageForWebView(WebKitWebContext* context, WebKitWebView* webView, WebKit WebViewGroup* webViewGroup, WebKitUserContentManager* userContentManager, WebKitWebView* relatedView)1054 void webkitWebContextCreatePageForWebView(WebKitWebContext* context, WebKitWebView* webView, WebKitUserContentManager* userContentManager, WebKitWebView* relatedView) 1055 1055 { 1056 1056 WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(webView); 1057 WebPageGroup* pageGroup = webViewGroup ? webkitWebViewGroupGetPageGroup(webViewGroup) : 0;1058 1057 WebPageProxy* relatedPage = relatedView ? webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(relatedView)) : nullptr; 1058 WebPreferences* preferences = webkitSettingsGetPreferences(webkit_web_view_get_settings(webView)); 1059 1059 WebUserContentControllerProxy* userContentControllerProxy = userContentManager ? webkitUserContentManagerGetUserContentControllerProxy(userContentManager) : nullptr; 1060 webkitWebViewBaseCreateWebPage(webViewBase, context->priv->context.get(), p ageGroup, userContentControllerProxy, relatedPage);1060 webkitWebViewBaseCreateWebPage(webViewBase, context->priv->context.get(), preferences, nullptr, userContentControllerProxy, relatedPage); 1061 1061 1062 1062 WebPageProxy* page = webkitWebViewBaseGetPage(webViewBase); 1063 1063 context->priv->webViews.set(page->pageID(), webView); 1064 1065 if (!pageGroup && !context->priv->defaultWebViewGroup)1066 context->priv->defaultWebViewGroup = adoptGRef(webkitWebViewGroupCreate(&page->pageGroup()));1067 1064 } 1068 1065 … … 1077 1074 return page ? context->priv->webViews.get(page->pageID()) : 0; 1078 1075 } 1079 1080 WebKitWebViewGroup* webkitWebContextGetDefaultWebViewGroup(WebKitWebContext* context)1081 {1082 return context->priv->defaultWebViewGroup.get();1083 } -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContextPrivate.h
r170891 r171742 32 32 #include "WebKitUserContentManager.h" 33 33 #include "WebKitWebContext.h" 34 #include "WebKitWebViewGroup.h"35 34 #include "WebSoupCustomProtocolRequestManager.h" 36 35 … … 44 43 void webkitWebContextStopLoadingCustomProtocol(WebKitWebContext*, uint64_t customProtocolID); 45 44 void webkitWebContextDidFinishLoadingCustomProtocol(WebKitWebContext*, uint64_t customProtocolID); 46 void webkitWebContextCreatePageForWebView(WebKitWebContext*, WebKitWebView*, WebKit WebViewGroup*, WebKitUserContentManager*, WebKitWebView*);45 void webkitWebContextCreatePageForWebView(WebKitWebContext*, WebKitWebView*, WebKitUserContentManager*, WebKitWebView*); 47 46 void webkitWebContextWebViewDestroyed(WebKitWebContext*, WebKitWebView*); 48 47 WebKitWebView* webkitWebContextGetWebViewForPage(WebKitWebContext*, WebKit::WebPageProxy*); 49 WebKitWebViewGroup* webkitWebContextGetDefaultWebViewGroup(WebKitWebContext*);50 48 GVariant* webkitWebContextInitializeWebExtensions(WebKitWebContext*); 51 49 -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
r171740 r171742 49 49 #include "WebKitResponsePolicyDecision.h" 50 50 #include "WebKitScriptDialogPrivate.h" 51 #include "WebKitSettingsPrivate.h" 51 52 #include "WebKitUIClient.h" 52 53 #include "WebKitURIRequestPrivate.h" … … 56 57 #include "WebKitWebResourcePrivate.h" 57 58 #include "WebKitWebViewBasePrivate.h" 58 #include "WebKitWebViewGroupPrivate.h"59 59 #include "WebKitWebViewPrivate.h" 60 60 #include "WebKitWindowPropertiesPrivate.h" … … 133 133 PROP_WEB_CONTEXT, 134 134 PROP_RELATED_VIEW, 135 PROP_ GROUP,135 PROP_SETTINGS, 136 136 PROP_USER_CONTENT_MANAGER, 137 137 PROP_TITLE, … … 171 171 GRefPtr<WebKitBackForwardList> backForwardList; 172 172 GRefPtr<WebKitSettings> settings; 173 unsigned long settingsChangedHandlerID;174 GRefPtr<WebKitWebViewGroup> group;175 173 GRefPtr<WebKitUserContentManager> userContentManager; 176 174 GRefPtr<WebKitWindowProperties> windowProperties; … … 377 375 static void webkitWebViewUpdateSettings(WebKitWebView* webView) 378 376 { 379 // We keep a ref of the current settings to disconnect the signals when settings change in the group. 380 webView->priv->settings = webkit_web_view_get_settings(webView); 377 // The "settings" property is set on construction, and in that 378 // case webkit_web_view_set_settings() will be called *before* the 379 // WebPageProxy has been created so we should do an early return. 380 WebPageProxy* page = getPage(webView); 381 if (!page) 382 return; 381 383 382 384 WebKitSettings* settings = webView->priv->settings.get(); 383 WebPageProxy* page = getPage(webView);385 page->setPreferences(*webkitSettingsGetPreferences(settings)); 384 386 page->setCanRunModal(webkit_settings_get_allow_modal_dialogs(settings)); 385 387 page->setCustomUserAgent(String::fromUTF8(webkit_settings_get_user_agent(settings))); … … 398 400 g_signal_handlers_disconnect_by_func(settings, reinterpret_cast<gpointer>(zoomTextOnlyChanged), webView); 399 401 g_signal_handlers_disconnect_by_func(settings, reinterpret_cast<gpointer>(userAgentChanged), webView); 400 }401 402 static void webkitWebViewSettingsChanged(WebKitWebViewGroup*, GParamSpec*, WebKitWebView* webView)403 {404 webkitWebViewDisconnectSettingsSignalHandlers(webView);405 webkitWebViewUpdateSettings(webView);406 }407 408 static void webkitWebViewDisconnectSettingsChangedSignalHandler(WebKitWebView* webView)409 {410 WebKitWebViewPrivate* priv = webView->priv;411 if (priv->settingsChangedHandlerID)412 g_signal_handler_disconnect(webkit_web_view_get_group(webView), priv->settingsChangedHandlerID);413 priv->settingsChangedHandlerID = 0;414 402 } 415 403 … … 504 492 WebKitWebView* webView = WEBKIT_WEB_VIEW(object); 505 493 WebKitWebViewPrivate* priv = webView->priv; 506 webkitWebContextCreatePageForWebView(priv->context, webView, priv->group.get(), priv->userContentManager.get(), priv->relatedView); 494 if (!priv->settings) 495 priv->settings = adoptGRef(webkit_settings_new()); 496 webkitWebContextCreatePageForWebView(priv->context, webView, priv->userContentManager.get(), priv->relatedView); 507 497 // The related view is only valid during the construction. 508 498 priv->relatedView = nullptr; 509 499 500 webkitWebViewUpdateSettings(webView); 510 501 webkitWebViewBaseSetDownloadRequestHandler(WEBKIT_WEB_VIEW_BASE(webView), webkitWebViewHandleDownloadRequest); 511 502 … … 519 510 priv->backForwardList = adoptGRef(webkitBackForwardListCreate(&getPage(webView)->backForwardList())); 520 511 priv->windowProperties = adoptGRef(webkitWindowPropertiesCreate()); 521 522 webkitWebViewUpdateSettings(webView);523 priv->settingsChangedHandlerID =524 g_signal_connect(webkit_web_view_get_group(webView), "notify::settings", G_CALLBACK(webkitWebViewSettingsChanged), webView);525 512 } 526 513 … … 540 527 break; 541 528 } 542 case PROP_ GROUP: {543 gpointer group = g_value_get_object(value);544 webView->priv->group = group ? WEBKIT_WEB_VIEW_GROUP(group) : 0;529 case PROP_SETTINGS: { 530 if (gpointer settings = g_value_get_object(value)) 531 webkit_web_view_set_settings(webView, WEBKIT_SETTINGS(settings)); 545 532 break; 546 533 } … … 566 553 g_value_set_object(value, webView->priv->context); 567 554 break; 568 case PROP_ GROUP:569 g_value_set_object(value, webkit_web_view_get_ group(webView));555 case PROP_SETTINGS: 556 g_value_set_object(value, webkit_web_view_get_settings(webView)); 570 557 break; 571 558 case PROP_USER_CONTENT_MANAGER: … … 600 587 webkitWebViewCancelFaviconRequest(webView); 601 588 webkitWebViewDisconnectMainResourceResponseChangedSignalHandler(webView); 602 webkitWebViewDisconnectSettingsChangedSignalHandler(webView);603 589 webkitWebViewDisconnectSettingsSignalHandlers(webView); 604 590 webkitWebViewDisconnectFaviconDatabaseSignalHandlers(webView); … … 667 653 668 654 /** 669 * WebKitWebView:group: 670 * 671 * The #WebKitWebViewGroup of the view. 655 * WebKitWebView:settings: 656 * 657 * The #WebKitSettings of the view. 658 * 659 * Since: 2.6 672 660 */ 673 661 g_object_class_install_property( 674 662 gObjectClass, 675 PROP_ GROUP,663 PROP_SETTINGS, 676 664 g_param_spec_object( 677 " group",678 _("WebView Group"),679 _("The WebKit WebViewGroupof the view"),680 WEBKIT_TYPE_ WEB_VIEW_GROUP,681 static_cast<GParamFlags>(WEBKIT_PARAM_ READWRITE | G_PARAM_CONSTRUCT_ONLY)));665 "settings", 666 _("WebView settings"), 667 _("The WebKitSettings of the view"), 668 WEBKIT_TYPE_SETTINGS, 669 static_cast<GParamFlags>(WEBKIT_PARAM_WRITABLE | G_PARAM_CONSTRUCT))); 682 670 683 671 /** … … 1898 1886 void webkitWebViewHandleAuthenticationChallenge(WebKitWebView* webView, AuthenticationChallengeProxy* authenticationChallenge) 1899 1887 { 1900 gboolean privateBrowsingEnabled = webkit_settings_get_enable_private_browsing(web kit_web_view_get_settings(webView));1888 gboolean privateBrowsingEnabled = webkit_settings_get_enable_private_browsing(webView->priv->settings.get()); 1901 1889 webView->priv->authenticationRequest = adoptGRef(webkitAuthenticationRequestCreate(authenticationChallenge, privateBrowsingEnabled)); 1902 1890 gboolean returnValue; … … 1912 1900 * webkit_web_view_new: 1913 1901 * 1914 * Creates a new #WebKitWebView with the default #WebKitWebContext and the 1915 * default #WebKitWebViewGroup. 1916 * See also webkit_web_view_new_with_context() and webkit_web_view_new_with_group(). 1902 * Creates a new #WebKitWebView with the default #WebKitWebContext and 1903 * no #WebKitUserContentManager associated with it. 1904 * See also webkit_web_view_new_with_context(), 1905 * webkit_web_view_new_with_user_content_manager(), and 1906 * webkit_web_view_new_with_settings(). 1917 1907 * 1918 1908 * Returns: The newly created #WebKitWebView widget … … 1927 1917 * @context: the #WebKitWebContext to be used by the #WebKitWebView 1928 1918 * 1929 * Creates a new #WebKitWebView with the given #WebKitWebContext and the 1930 * default #WebKitWebViewGroup. 1931 * See also webkit_web_view_new_with_group(). 1919 * Creates a new #WebKitWebView with the given #WebKitWebContext and 1920 * no #WebKitUserContentManager associated with it. 1921 * See also webkit_web_view_new_with_user_content_manager() and 1922 * webkit_web_view_new_with_settings(). 1932 1923 * 1933 1924 * Returns: The newly created #WebKitWebView widget … … 1952 1943 * like for example, sharing the same web process for all the views in the same security domain. 1953 1944 * 1954 * The newly created #WebKitWebView will also have the same #WebKitUserContentManager as @web_view. 1945 * The newly created #WebKitWebView will also have the same #WebKitUserContentManager 1946 * and #WebKitSettings as @web_view. 1955 1947 * 1956 1948 * Returns: (transfer full): The newly created #WebKitWebView widget … … 1964 1956 return GTK_WIDGET(g_object_new(WEBKIT_TYPE_WEB_VIEW, 1965 1957 "user-content-manager", webView->priv->userContentManager.get(), 1958 "settings", webView->priv->settings.get(), 1966 1959 "related-view", webView, 1967 1960 nullptr)); … … 1969 1962 1970 1963 /** 1971 * webkit_web_view_new_with_ group:1972 * @ group: a #WebKitWebViewGroup1973 * 1974 * Creates a new #WebKitWebView with the given #WebKit WebViewGroup.1975 * The view will be part of @group and it will be affected by the1976 * group properties like the settings.1964 * webkit_web_view_new_with_settings: 1965 * @settings: a #WebKitSettings 1966 * 1967 * Creates a new #WebKitWebView with the given #WebKitSettings. 1968 * See also webkit_web_view_new_with_context(), and 1969 * webkit_web_view_new_with_user_content_manager(). 1977 1970 * 1978 1971 * Returns: The newly created #WebKitWebView widget 1979 */ 1980 GtkWidget* webkit_web_view_new_with_group(WebKitWebViewGroup* group) 1981 { 1982 g_return_val_if_fail(WEBKIT_IS_WEB_VIEW_GROUP(group), 0); 1983 1984 return GTK_WIDGET(g_object_new(WEBKIT_TYPE_WEB_VIEW, "group", group, NULL)); 1972 * 1973 * Since: 2.6 1974 */ 1975 GtkWidget* webkit_web_view_new_with_settings(WebKitSettings* settings) 1976 { 1977 g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), nullptr); 1978 return GTK_WIDGET(g_object_new(WEBKIT_TYPE_WEB_VIEW, "settings", settings, nullptr)); 1985 1979 } 1986 1980 … … 2017 2011 2018 2012 return webView->priv->context; 2019 }2020 2021 /**2022 * webkit_web_view_get_group:2023 * @web_view: a #WebKitWebView2024 *2025 * Gets the group @web_view belongs to.2026 *2027 * Returns: (transfer none): the #WebKitWebViewGroup to which the view belongs2028 */2029 WebKitWebViewGroup* webkit_web_view_get_group(WebKitWebView* webView)2030 {2031 g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), 0);2032 2033 if (webView->priv->group)2034 return webView->priv->group.get();2035 2036 return webkitWebContextGetDefaultWebViewGroup(webView->priv->context);2037 2013 } 2038 2014 … … 2531 2507 * @settings: a #WebKitSettings 2532 2508 * 2533 * Sets the #WebKitSettings to be applied to @web_view. 2534 * This is a convenient method to set new settings to the 2535 * #WebKitWebViewGroup @web_view belongs to. 2536 * New settings are applied immediately on all #WebKitWebView<!-- -->s 2537 * in the @web_view group. 2538 * See also webkit_web_view_group_set_settings(). 2509 * Sets the #WebKitSettings to be applied to @web_view. The 2510 * existing #WebKitSettings of @web_view will be replaced by 2511 * @settings. New settings are applied immediately on @web_view. 2512 * The same #WebKitSettings object can be shared 2513 * by multiple #WebKitWebView<!-- -->s. 2539 2514 */ 2540 2515 void webkit_web_view_set_settings(WebKitWebView* webView, WebKitSettings* settings) 2541 2516 { 2542 webkit_web_view_group_set_settings(webkit_web_view_get_group(webView), settings); 2517 g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView)); 2518 g_return_if_fail(WEBKIT_IS_SETTINGS(settings)); 2519 2520 if (webView->priv->settings == settings) 2521 return; 2522 2523 // The "settings" property is set on construction, and in that 2524 // case webkit_web_view_set_settings() will be called *before* 2525 // any settings have been assigned. In that case there are no 2526 // signal handlers to disconnect. 2527 if (webView->priv->settings) 2528 webkitWebViewDisconnectSettingsSignalHandlers(webView); 2529 2530 webView->priv->settings = settings; 2531 webkitWebViewUpdateSettings(webView); 2532 g_object_notify(G_OBJECT(webView), "settings"); 2543 2533 } 2544 2534 … … 2548 2538 * 2549 2539 * Gets the #WebKitSettings currently applied to @web_view. 2550 * This is a convenient method to get the settings of the 2551 * #WebKitWebViewGroup @web_view belongs to. 2552 * #WebKitSettings objects are shared by all the #WebKitWebView<!-- -->s 2553 * in the same #WebKitWebViewGroup, so modifying 2540 * If no other #WebKitSettings have been explicitly applied to 2541 * @web_view with webkit_web_view_set_settings(), the default 2542 * #WebKitSettings will be returned. This method always returns 2543 * a valid #WebKitSettings object. 2544 * To modify any of the @web_view settings, you can either create 2545 * a new #WebKitSettings object with webkit_settings_new(), setting 2546 * the desired preferences, and then replace the existing @web_view 2547 * settings with webkit_web_view_set_settings() or get the existing 2548 * @web_view settings and update it directly. #WebKitSettings objects 2549 * can be shared by multiple #WebKitWebView<!-- -->s, so modifying 2554 2550 * the settings of a #WebKitWebView would affect other 2555 * #WebKitWebView<!-- -->s of the same group. 2556 * See also webkit_web_view_group_get_settings(). 2551 * #WebKitWebView<!-- -->s using the same #WebKitSettings. 2557 2552 * 2558 2553 * Returns: (transfer none): the #WebKitSettings attached to @web_view … … 2560 2555 WebKitSettings* webkit_web_view_get_settings(WebKitWebView* webView) 2561 2556 { 2562 return webkit_web_view_group_get_settings(webkit_web_view_get_group(webView)); 2557 g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), nullptr); 2558 return webView->priv->settings.get(); 2563 2559 } 2564 2560 … … 2595 2591 2596 2592 WebPageProxy* page = getPage(webView); 2597 if (webkit_settings_get_zoom_text_only(web kit_web_view_get_settings(webView)))2593 if (webkit_settings_get_zoom_text_only(webView->priv->settings.get())) 2598 2594 page->setTextZoomFactor(zoomLevel); 2599 2595 else … … 2616 2612 2617 2613 WebPageProxy* page = getPage(webView); 2618 gboolean zoomTextOnly = webkit_settings_get_zoom_text_only(web kit_web_view_get_settings(webView));2614 gboolean zoomTextOnly = webkit_settings_get_zoom_text_only(webView->priv->settings.get()); 2619 2615 return zoomTextOnly ? page->textZoomFactor() : page->pageZoomFactor(); 2620 2616 } -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h
r171740 r171742 50 50 #include <webkit2/WebKitWebResource.h> 51 51 #include <webkit2/WebKitWebViewBase.h> 52 #include <webkit2/WebKitWebViewGroup.h>53 52 #include <webkit2/WebKitWindowProperties.h> 54 53 … … 257 256 258 257 WEBKIT_API GtkWidget * 258 webkit_web_view_new_with_settings (WebKitSettings *settings); 259 260 WEBKIT_API GtkWidget * 259 261 webkit_web_view_new_with_related_view (WebKitWebView *web_view); 260 261 WEBKIT_API GtkWidget *262 webkit_web_view_new_with_group (WebKitWebViewGroup *group);263 262 264 263 WEBKIT_API GtkWidget * … … 267 266 WEBKIT_API WebKitWebContext * 268 267 webkit_web_view_get_context (WebKitWebView *web_view); 269 270 WEBKIT_API WebKitWebViewGroup *271 webkit_web_view_get_group (WebKitWebView *web_view);272 268 273 269 WEBKIT_API void -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp
r170891 r171742 947 947 } 948 948 949 WebKitWebViewBase* webkitWebViewBaseCreate(WebContext* context, WebP ageGroup* pageGroup, WebUserContentControllerProxy* userContentController, WebPageProxy* relatedPage)949 WebKitWebViewBase* webkitWebViewBaseCreate(WebContext* context, WebPreferences* preferences, WebPageGroup* pageGroup, WebUserContentControllerProxy* userContentController, WebPageProxy* relatedPage) 950 950 { 951 951 WebKitWebViewBase* webkitWebViewBase = WEBKIT_WEB_VIEW_BASE(g_object_new(WEBKIT_TYPE_WEB_VIEW_BASE, NULL)); 952 webkitWebViewBaseCreateWebPage(webkitWebViewBase, context, p ageGroup, userContentController, relatedPage);952 webkitWebViewBaseCreateWebPage(webkitWebViewBase, context, preferences, pageGroup, userContentController, relatedPage); 953 953 return webkitWebViewBase; 954 954 } … … 973 973 #endif 974 974 975 priv->pageProxy->p ageGroup().preferences().setAcceleratedCompositingEnabled(false);975 priv->pageProxy->preferences().setAcceleratedCompositingEnabled(false); 976 976 } 977 977 … … 983 983 #endif // HAVE(GTK_SCALE_FACTOR) 984 984 985 void webkitWebViewBaseCreateWebPage(WebKitWebViewBase* webkitWebViewBase, WebContext* context, WebP ageGroup* pageGroup, WebUserContentControllerProxy* userContentController, WebPageProxy* relatedPage)985 void webkitWebViewBaseCreateWebPage(WebKitWebViewBase* webkitWebViewBase, WebContext* context, WebPreferences* preferences, WebPageGroup* pageGroup, WebUserContentControllerProxy* userContentController, WebPageProxy* relatedPage) 986 986 { 987 987 WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv; 988 988 989 989 WebPageConfiguration webPageConfiguration; 990 webPageConfiguration.preferences = preferences; 990 991 webPageConfiguration.pageGroup = pageGroup; 991 992 webPageConfiguration.relatedPage = relatedPage; -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h
r170891 r171742 35 35 #include "WebPageProxy.h" 36 36 37 WebKitWebViewBase* webkitWebViewBaseCreate(WebKit::WebContext*, WebKit::WebP ageGroup*, WebKit::WebUserContentControllerProxy*, WebKit::WebPageProxy*);37 WebKitWebViewBase* webkitWebViewBaseCreate(WebKit::WebContext*, WebKit::WebPreferences*, WebKit::WebPageGroup*, WebKit::WebUserContentControllerProxy*, WebKit::WebPageProxy*); 38 38 GtkIMContext* webkitWebViewBaseGetIMContext(WebKitWebViewBase*); 39 39 WebKit::WebPageProxy* webkitWebViewBaseGetPage(WebKitWebViewBase*); 40 void webkitWebViewBaseCreateWebPage(WebKitWebViewBase*, WebKit::WebContext*, WebKit::WebP ageGroup*, WebKit::WebUserContentControllerProxy*, WebKit::WebPageProxy*);40 void webkitWebViewBaseCreateWebPage(WebKitWebViewBase*, WebKit::WebContext*, WebKit::WebPreferences*, WebKit::WebPageGroup*, WebKit::WebUserContentControllerProxy*, WebKit::WebPageProxy*); 41 41 void webkitWebViewBaseSetTooltipText(WebKitWebViewBase*, const char*); 42 42 void webkitWebViewBaseSetTooltipArea(WebKitWebViewBase*, const WebCore::IntRect&); -
trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml
r171740 r171742 44 44 <xi:include href="xml/WebKitFormSubmissionRequest.xml"/> 45 45 <xi:include href="xml/WebKitSecurityManager.xml"/> 46 <xi:include href="xml/WebKitWebViewGroup.xml"/>47 46 <xi:include href="xml/WebKitCertificateInfo.xml"/> 48 47 </chapter> -
trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt
r171740 r171742 135 135 webkit_web_view_new_with_context 136 136 webkit_web_view_new_with_related_view 137 webkit_web_view_new_with_ group137 webkit_web_view_new_with_settings 138 138 webkit_web_view_new_with_user_content_manager 139 139 webkit_web_view_get_context 140 webkit_web_view_get_group141 140 webkit_web_view_get_user_content_manager 142 141 webkit_web_view_load_uri … … 1061 1060 1062 1061 <SECTION> 1063 <FILE>WebKitWebViewGroup</FILE>1064 WebKitWebViewGroup1065 WebKitInjectedContentFrames1066 webkit_web_view_group_new1067 webkit_web_view_group_get_name1068 webkit_web_view_group_get_settings1069 webkit_web_view_group_set_settings1070 1071 <SUBSECTION Standard>1072 WebKitWebViewGroupClass1073 WEBKIT_TYPE_WEB_VIEW_GROUP1074 WEBKIT_WEB_VIEW_GROUP1075 WEBKIT_IS_WEB_VIEW_GROUP1076 WEBKIT_WEB_VIEW_GROUP_CLASS1077 WEBKIT_IS_WEB_VIEW_GROUP_CLASS1078 WEBKIT_WEB_VIEW_GROUP_GET_CLASS1079 1080 <SUBSECTION Private>1081 WebKitWebViewGroupPrivate1082 webkit_web_view_group_get_type1083 </SECTION>1084 1085 <SECTION>1086 1062 <FILE>WebKitWebExtension</FILE> 1087 1063 WebKitWebExtension -
trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk.types
r157781 r171742 22 22 webkit_context_menu_get_type 23 23 webkit_context_menu_item_get_type 24 webkit_web_view_group_get_type25 24 webkit_web_extension_get_type 26 25 webkit_web_page_get_type -
trunk/Source/WebKit2/UIProcess/API/gtk/webkit2.h
r170891 r171742 70 70 #include <webkit2/WebKitWebView.h> 71 71 #include <webkit2/WebKitWebViewBase.h> 72 #include <webkit2/WebKitWebViewGroup.h>73 72 #include <webkit2/WebKitWindowProperties.h> 74 73 -
trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp
r170891 r171742 63 63 ASSERT(m_page); 64 64 ASSERT(!m_inspectorView); 65 m_inspectorView = GTK_WIDGET(webkitWebViewBaseCreate(&page()->process().context(), inspectorPageGroup(), nullptr, m_page));65 m_inspectorView = GTK_WIDGET(webkitWebViewBaseCreate(&page()->process().context(), nullptr, inspectorPageGroup(), nullptr, m_page)); 66 66 g_object_add_weak_pointer(G_OBJECT(m_inspectorView), reinterpret_cast<void**>(&m_inspectorView)); 67 67 return webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(m_inspectorView)); -
trunk/Tools/ChangeLog
r171740 r171742 1 2014-07-29 Adrian Perez de Castro <aperez@igalia.com> 2 3 [GTK] Remove WebKitWebViewGroup from WebKit2 GTK+ API 4 https://bugs.webkit.org/show_bug.cgi?id=133729 5 6 Reviewed by Carlos Garcia Campos. 7 8 Removes WebKitWebViewGroup, effectively reverting the changes 9 introduced by r149117. The motivation for WebKitWebViewGroup 10 was using the user style sheet injection API, which has been 11 moved into WebKitUserContentManager, rendering it unneeded. 12 13 * TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt: Remove tests 14 for WebKitWebViewGroup. 15 * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp: 16 (testWebViewSettings): 17 Restore the assertions that check that settings objects are 18 released. Add test for webkit_web_view_new_with_settings(). 19 * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebViewGroup.cpp: Removed. 20 1 21 2014-07-29 Carlos Garcia Campos <cgarcia@igalia.com> 2 22 -
trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
r170891 r171742 110 110 ADD_WK2_TEST(TestWebKitVersion TestWebKitVersion.cpp) 111 111 ADD_WK2_TEST(TestWebViewEditor TestWebViewEditor.cpp) 112 ADD_WK2_TEST(TestWebKitWebViewGroup TestWebKitWebViewGroup.cpp)113 112 ADD_WK2_TEST(TestWebKitWebContext TestWebKitWebContext.cpp) 114 113 ADD_WK2_TEST(TestWebKitWebView TestWebKitWebView.cpp) -
trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp
r164634 r171742 47 47 { 48 48 WebKitSettings* defaultSettings = webkit_web_view_get_settings(test->m_webView); 49 test->assertObjectIsDeletedWhenTestFinishes(G_OBJECT(defaultSettings)); 49 50 g_assert(defaultSettings); 50 51 g_assert(webkit_settings_get_enable_javascript(defaultSettings)); 51 52 52 53 GRefPtr<WebKitSettings> newSettings = adoptGRef(webkit_settings_new()); 54 test->assertObjectIsDeletedWhenTestFinishes(G_OBJECT(newSettings.get())); 53 55 g_object_set(G_OBJECT(newSettings.get()), "enable-javascript", FALSE, NULL); 54 56 webkit_web_view_set_settings(test->m_webView, newSettings.get()); … … 64 66 65 67 GRefPtr<WebKitSettings> newSettings2 = adoptGRef(webkit_settings_new()); 68 test->assertObjectIsDeletedWhenTestFinishes(G_OBJECT(newSettings2.get())); 66 69 webkit_web_view_set_settings(WEBKIT_WEB_VIEW(webView2.get()), newSettings2.get()); 67 70 settings = webkit_web_view_get_settings(WEBKIT_WEB_VIEW(webView2.get())); 68 71 g_assert(settings == newSettings2.get()); 69 72 g_assert(webkit_settings_get_enable_javascript(settings)); 73 74 GRefPtr<GtkWidget> webView3 = webkit_web_view_new_with_settings(newSettings2.get()); 75 test->assertObjectIsDeletedWhenTestFinishes(G_OBJECT(webView3.get())); 76 g_assert(webkit_web_view_get_settings(WEBKIT_WEB_VIEW(webView3.get())) == newSettings2.get()); 70 77 } 71 78
Note: See TracChangeset
for help on using the changeset viewer.