Changeset 108190 in webkit

Timestamp:

Feb 19, 2012 11:16:25 AM (12 years ago)

Author:

kov@webkit.org

Message:

[GTK] Remove unused GSettings stuff
​https://bugs.webkit.org/show_bug.cgi?id=78995

Reviewed by Martin Robinson.

.:

• configure.ac: remove gsettings schema file creation.

Source/WebKit/gtk:

• GNUmakefile.am: remove GSettings-related stuff.
• WebCoreSupport/InspectorClientGtk.cpp:

(WebKit): Remove unused code.

• org.webkitgtk.gschema.xml.in: Removed.
• webkit/webkitwebinspector.cpp:

(webkit_web_inspector_execute_script): remove gsettings-related helper.

• webkit/webkitwebinspectorprivate.h: Ditto.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebKit/gtk/ChangeLog (modified) (1 diff)
• Source/WebKit/gtk/GNUmakefile.am (modified) (1 diff)
• Source/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp (modified) (2 diffs)
• Source/WebKit/gtk/org.webkitgtk.gschema.xml.in (deleted)
• Source/WebKit/gtk/webkit/webkitwebinspector.cpp (modified) (1 diff)
• Source/WebKit/gtk/webkit/webkitwebinspectorprivate.h (modified) (1 diff)
• configure.ac (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2012-02-19  Gustavo Noronha Silva  <gns@gnome.org>
+
+        [GTK] Remove unused GSettings stuff
+        https://bugs.webkit.org/show_bug.cgi?id=78995
+
+        Reviewed by Martin Robinson.
+
+        * configure.ac: remove gsettings schema file creation.
+
 2012-02-19  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2012-02-19  Gustavo Noronha Silva  <gns@gnome.org>
+
+        [GTK] Remove unused GSettings stuff
+        https://bugs.webkit.org/show_bug.cgi?id=78995
+
+        Reviewed by Martin Robinson.
+
+        * GNUmakefile.am: remove GSettings-related stuff.
+        * WebCoreSupport/InspectorClientGtk.cpp:
+        (WebKit): Remove unused code.
+        * org.webkitgtk.gschema.xml.in: Removed.
+        * webkit/webkitwebinspector.cpp:
+        (webkit_web_inspector_execute_script): remove gsettings-related helper.
+        * webkit/webkitwebinspectorprivate.h: Ditto.
+
 2012-02-17  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

trunk/Source/WebKit/gtk/GNUmakefile.am

@@ -386 +386 @@
         && rm -f xgen-gtc
 
-# GSettings
-gsettings_SCHEMAS = $(top_builddir)/Source/WebKit/gtk/org.webkitgtk-@WEBKITGTK_API_VERSION@.gschema.xml
-@GSETTINGS_RULES@
-
 EXTRA_DIST += \
         $(WebKit)/ChangeLog \

trunk/Source/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp

@@ -49 +49 @@
 
 private:
-#ifdef HAVE_GSETTINGS
-    static bool shouldIgnoreSetting(const String& key)
-    {
-        // GSettings considers trying to fetch or set a setting that is
-        // not backed by a schema as programmer error, and aborts the
-        // program's execution. We check here to avoid having an unhandled
-        // setting as a fatal error.
-        LOG_VERBOSE(NotYetImplemented, "Unknown key ignored: %s", key.ascii().data());
-        return true;
-    }
-
     virtual String getProperty(const String& name)
-    {
-        if (shouldIgnoreSetting(name))
-            return String();
-
-        GSettings* settings = inspectorGSettings();
-        if (!settings)
-            return String();
-
-        GRefPtr<GVariant> variant = adoptGRef(g_settings_get_value(settings, name.utf8().data()));
-        return String(g_variant_get_string(variant.get(), 0));
-    }
-
-    virtual void setProperty(const String& name, const String& value)
-    {
-        // Avoid setting unknown keys to avoid aborting the execution.
-        if (shouldIgnoreSetting(name))
-            return;
-
-        GSettings* settings = inspectorGSettings();
-        if (!settings)
-            return;
-
-        GRefPtr<GVariant> variant = adoptGRef(g_variant_new_string(value.utf8().data()));
-        g_settings_set_value(settings, name.utf8().data(), variant.get());
-    }
-#else
-    virtual String getProperty(const String&)
     {
         notImplemented();
@@ -93 +55 @@
     }
 
-    virtual void setProperty(const String&, const String&)
+    virtual void setProperty(const String& name, const String& value)
     {
         notImplemented();
     }
-#endif // HAVE_GSETTINGS
 };
 

trunk/Source/WebKit/gtk/webkit/webkitwebinspector.cpp

@@ -578 +578 @@
     priv->page->inspectorController()->evaluateForTestInFrontend(callId, script);
 }
-
-#ifdef HAVE_GSETTINGS
-static bool isSchemaAvailable(const char* schemaID)
-{
-    const char* const* availableSchemas = g_settings_list_schemas();
-    char* const* iter = const_cast<char* const*>(availableSchemas);
-
-    while (*iter) {
-        if (g_str_equal(schemaID, *iter))
-            return true;
-        iter++;
-    }
-
-    return false;
-}
-
-GSettings* inspectorGSettings()
-{
-    static GSettings* settings = 0;
-    if (settings)
-        return settings;
-
-    // Unfortunately GSettings will abort the process execution if the schema is not
-    // installed, which is the case for when running tests, or even the introspection dump
-    // at build time, so check if we have the schema before trying to initialize it.
-    const gchar* schemaID = "org.webkitgtk-"WEBKITGTK_API_VERSION_STRING".inspector";
-    if (!isSchemaAvailable(schemaID)) {
-
-        // This warning is very common on the build bots, which hides valid warnings.
-        // Skip printing it if we are running inside DumpRenderTree.
-        if (!DumpRenderTreeSupportGtk::dumpRenderTreeModeEnabled())
-            g_warning("GSettings schema not found - settings will not be used or saved.");
-        return 0;
-    }
-
-    settings = g_settings_new(schemaID);
-    return settings;
-}
-#endif

trunk/Source/WebKit/gtk/webkit/webkitwebinspectorprivate.h

@@ -26 +26 @@
 extern "C" {
 
-#ifdef HAVE_GSETTINGS
-GSettings* inspectorGSettings();
-#endif
-
 void webkit_web_inspector_set_inspector_client(WebKitWebInspector*, WebCore::Page*);
 

trunk/configure.ac

@@ -1390 +1390 @@
 Source/WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:Source/WebKit/gtk/webkit.pc.in
 Source/WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:Source/WebKit/gtk/JSCore.gir.in
-Source/WebKit/gtk/org.webkitgtk-${WEBKITGTK_API_VERSION}.gschema.xml:Source/WebKit/gtk/org.webkitgtk.gschema.xml.in
 Source/JavaScriptCore/javascriptcoregtk-${WEBKITGTK_API_VERSION}.pc:Source/JavaScriptCore/javascriptcoregtk.pc.in
 ]