Changeset 73702 in webkit

Timestamp:

Dec 10, 2010 2:27:03 AM (13 years ago)

Author:

kov@webkit.org

Message:

2010-12-09 Gustavo Noronha Silva <​gustavo.noronha@collabora.co.uk>

Reviewed by Martin Robinson.

[GTK] Split webkitprivate.{cpp,h} in more manageable chunks
​https://bugs.webkit.org/show_bug.cgi?id=50698

Split private bits of WebKitWebInspector to its own private
header, and to its implementation file.

• WebCoreSupport/InspectorClientGtk.cpp:
• webkit/webkitprivate.cpp:
• webkit/webkitprivate.h:
• webkit/webkitwebinspector.cpp: (isSchemaAvailable): (inspectorGSettings):
• webkit/webkitwebinspectorprivate.h: Added.
• webkit/webkitwebview.cpp:

Location:

trunk/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/InspectorClientGtk.cpp (modified) (1 diff)
• webkit/webkitprivate.cpp (modified) (1 diff)
• webkit/webkitprivate.h (modified) (3 diffs)
• webkit/webkitwebinspector.cpp (modified) (3 diffs)
• webkit/webkitwebinspectorprivate.h (added)
• webkit/webkitwebview.cpp (modified) (1 diff)

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2010-12-09  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Split webkitprivate.{cpp,h} in more manageable chunks
+        https://bugs.webkit.org/show_bug.cgi?id=50698
+
+        Split private bits of WebKitWebInspector to its own private
+        header, and to its implementation file.
+
+        * WebCoreSupport/InspectorClientGtk.cpp:
+        * webkit/webkitprivate.cpp:
+        * webkit/webkitprivate.h:
+        * webkit/webkitwebinspector.cpp:
+        (isSchemaAvailable):
+        (inspectorGSettings):
+        * webkit/webkitwebinspectorprivate.h: Added.
+        * webkit/webkitwebview.cpp:
+
 2010-12-09  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
 

trunk/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp

@@ -28 +28 @@
 #include "webkitversion.h"
 #include "webkitwebinspector.h"
+#include "webkitwebinspectorprivate.h"
 #include "webkitwebview.h"
 #include "webkitwebviewprivate.h"

trunk/WebKit/gtk/webkit/webkitprivate.cpp

@@ -172 +172 @@
 }
 
-#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;
-
-    const gchar* schemaID = "org.webkitgtk-"WEBKITGTK_API_VERSION_STRING".inspector";
-
-    // 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.
-    if (!isSchemaAvailable(schemaID)) {
-        g_warning("GSettings schema not found - settings will not be used or saved.");
-        return 0;
-    }
-
-    settings = g_settings_new(schemaID);
-
-    return settings;
-}
-#endif
-
 void webkit_init()
 {

trunk/WebKit/gtk/webkit/webkitprivate.h

@@ -55 +55 @@
 #include "Geolocation.h"
 #include "HistoryItem.h"
-#include "InspectorClientGtk.h"
 #include "IntPoint.h"
 #include "IntRect.h"
@@ -106 +105 @@
     void webkit_init();
 
-#ifdef HAVE_GSETTINGS
-    GSettings* inspectorGSettings();
-#endif
-
 #define WEBKIT_PARAM_READABLE ((GParamFlags)(G_PARAM_READABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB))
 #define WEBKIT_PARAM_READWRITE ((GParamFlags)(G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB))
@@ -179 +174 @@
     // end WebKitWebResource private
 
-    void
-    webkit_web_inspector_set_inspector_client(WebKitWebInspector*, WebCore::Page*);
-
-    void
-    webkit_web_inspector_set_web_view(WebKitWebInspector *web_inspector, WebKitWebView *web_view);
-
-    void
-    webkit_web_inspector_set_inspected_uri(WebKitWebInspector* web_inspector, const gchar* inspected_uri);
-
-    WEBKIT_API void
-    webkit_web_inspector_execute_script(WebKitWebInspector* inspector, long callId, const gchar* script);
-
 
     WebKitWebWindowFeatures*

trunk/WebKit/gtk/webkit/webkitwebinspector.cpp

@@ -25 +25 @@
 #include "FocusController.h"
 #include "Frame.h"
-#include <glib/gi18n-lib.h>
 #include "HitTestRequest.h"
 #include "HitTestResult.h"
@@ -36 +35 @@
 #include "webkitmarshal.h"
 #include "webkitprivate.h"
+#include "webkitwebinspectorprivate.h"
+#include <glib/gi18n-lib.h>
 
 /**
@@ -579 +580 @@
     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;
+
+    const gchar* schemaID = "org.webkitgtk-"WEBKITGTK_API_VERSION_STRING".inspector";
+
+    // 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.
+    if (!isSchemaAvailable(schemaID)) {
+        g_warning("GSettings schema not found - settings will not be used or saved.");
+        return 0;
+    }
+
+    settings = g_settings_new(schemaID);
+
+    return settings;
+}
+#endif

trunk/WebKit/gtk/webkit/webkitwebview.cpp

@@ -89 +89 @@
 #include "webkitwebhistoryitem.h"
 #include "webkitwebinspector.h"
+#include "webkitwebinspectorprivate.h"
 #include "webkitwebviewprivate.h"
 #include <gdk/gdkkeysyms.h>