Modified: trunk/Source/WebKit/gtk/tests/testwebsettings.c (89287 => 89288)
--- trunk/Source/WebKit/gtk/tests/testwebsettings.c 2011-06-20 20:53:35 UTC (rev 89287)
+++ trunk/Source/WebKit/gtk/tests/testwebsettings.c 2011-06-20 21:18:31 UTC (rev 89288)
@@ -23,6 +23,36 @@
#if GTK_CHECK_VERSION(2, 14, 0)
+static void test_webkit_web_settings_copy(void)
+{
+ WebKitWebSettings* settings = webkit_web_settings_new();
+
+ // Set some non-default settings to verify that settings are properly copied.
+ g_object_set(settings,
+ "enable-webgl", TRUE,
+ "enable-fullscreen", TRUE,
+ "auto-load-images", FALSE,
+ "default-encoding", "utf-8", NULL);
+
+ WebKitWebSettings* copy = webkit_web_settings_copy(settings);
+
+ gboolean enableWebGL = FALSE;
+ gboolean enableFullscreen = FALSE;
+ gboolean autoLoadImages = FALSE;
+ char* defaultEncoding = NULL;
+ g_object_get(copy,
+ "enable-fullscreen", &enableFullscreen,
+ "enable-webgl", &enableWebGL,
+ "auto-load-images", &autoLoadImages,
+ "default-encoding", &defaultEncoding, NULL);
+
+ g_assert(enableWebGL);
+ g_assert(enableFullscreen);
+ g_assert(!autoLoadImages);
+ g_assert_cmpstr(defaultEncoding, ==, "utf-8");
+ g_free(defaultEncoding);
+}
+
static void test_webkit_web_settings_user_agent(void)
{
WebKitWebSettings* settings;
@@ -68,6 +98,7 @@
g_test_bug_base("https://bugs.webkit.org/");
g_test_add_func("/webkit/websettings/user_agent", test_webkit_web_settings_user_agent);
+ g_test_add_func("/webkit/websettings/copy", test_webkit_web_settings_copy);
return g_test_run ();
}
Modified: trunk/Source/WebKit/gtk/webkit/webkitwebsettings.cpp (89287 => 89288)
--- trunk/Source/WebKit/gtk/webkit/webkitwebsettings.cpp 2011-06-20 20:53:35 UTC (rev 89287)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebsettings.cpp 2011-06-20 21:18:31 UTC (rev 89288)
@@ -1245,53 +1245,25 @@
**/
WebKitWebSettings* webkit_web_settings_copy(WebKitWebSettings* original)
{
- WebKitWebSettingsPrivate* priv = original->priv;
- return WEBKIT_WEB_SETTINGS(g_object_new(WEBKIT_TYPE_WEB_SETTINGS,
- "default-encoding", priv->defaultEncoding.data(),
- "cursive-font-family", priv->cursiveFontFamily.data(),
- "default-font-family", priv->defaultFontFamily.data(),
- "fantasy-font-family", priv->fantasyFontFamily.data(),
- "monospace-font-family", priv->monospaceFontFamily.data(),
- "sans-serif-font-family", priv->sansSerifFontFamily.data(),
- "serif-font-family", priv->serifFontFamily.data(),
- "default-font-size", priv->defaultFontSize,
- "default-monospace-font-size", priv->defaultMonospaceFontSize,
- "minimum-font-size", priv->minimumFontSize,
- "minimum-logical-font-size", priv->minimumLogicalFontSize,
- "auto-load-images", priv->autoLoadImages,
- "auto-shrink-images", priv->autoShrinkImages,
- "print-backgrounds", priv->printBackgrounds,
- "enable-scripts", priv->enableScripts,
- "enable-plugins", priv->enablePlugins,
- "resizable-text-areas", priv->resizableTextAreas,
- "user-stylesheet-uri", priv->userStylesheetURI.data(),
- "zoom-step", priv->zoomStep,
- "enable-developer-extras", priv->enableDeveloperExtras,
- "spell-checking-languages", priv->spellCheckingLanguages.data(),
- "enable-caret-browsing", priv->enableCaretBrowsing,
- "enable-html5-database", priv->enableHTML5Database,
- "enable-html5-local-storage", priv->enableHTML5LocalStorage,
- "enable-xss-auditor", priv->enableXSSAuditor,
- "enable-spatial-navigation", priv->enableSpatialNavigation,
- "enable-frame-flattening", priv->enableFrameFlattening,
- "user-agent", webkit_web_settings_get_user_agent(original),
- "_javascript_-can-open-windows-automatically", priv->_javascript_CanOpenWindowsAutomatically,
- "_javascript_-can-access-clipboard", priv->_javascript_CanAccessClipboard,
- "enable-offline-web-application-cache", priv->enableOfflineWebApplicationCache,
- "editing-behavior", priv->editingBehavior,
- "enable-universal-access-from-file-uris", priv->enableUniversalAccessFromFileURIs,
- "enable-file-access-from-file-uris", priv->enableFileAccessFromFileURIs,
- "enable-dom-paste", priv->enableDOMPaste,
- "tab-key-cycles-through-elements", priv->tabKeyCyclesThroughElements,
- "enable-default-context-menu", priv->enableDefaultContextMenu,
- "enable-site-specific-quirks", priv->enableSiteSpecificQuirks,
- "enable-page-cache", priv->enablePageCache,
- "auto-resize-window", priv->autoResizeWindow,
- "enable-java-applet", priv->enableJavaApplet,
- "enable-hyperlink-auditing", priv->enableHyperlinkAuditing,
- "enable-fullscreen", priv->enableFullscreen,
- "enable-dns-prefetching", priv->enableDNSPrefetching,
- NULL));
+ unsigned numberOfProperties = 0;
+ GOwnPtr<GParamSpec*> properties(g_object_class_list_properties(
+ G_OBJECT_CLASS(WEBKIT_WEB_SETTINGS_GET_CLASS(original)), &numberOfProperties));
+ GOwnPtr<GParameter> parameters(g_new0(GParameter, numberOfProperties));
+
+ for (size_t i = 0; i < numberOfProperties; i++) {
+ GParamSpec* property = properties.get()[i];
+ GParameter* parameter = parameters.get() + i;
+
+ if (!(property->flags & (G_PARAM_CONSTRUCT | G_PARAM_READWRITE)))
+ continue;
+
+ parameter->name = property->name;
+ g_value_init(¶meter->value, property->value_type);
+ g_object_get_property(G_OBJECT(original), property->name, ¶meter->value);
+ }
+
+ return WEBKIT_WEB_SETTINGS(g_object_newv(WEBKIT_TYPE_WEB_SETTINGS, numberOfProperties, parameters.get()));
+
}
/**
