[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
kov at webkit.org
kov at webkit.org
Wed Dec 22 18:22:43 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 964d7deeaae5cd3230cf1e9f13173bf85407adc3
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 10 10:27:03 2010 +0000
2010-12-09 Gustavo Noronha Silva <gustavo.noronha at 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:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73702 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 53bd0a1..74c9325 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -5,6 +5,25 @@
[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 at 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 WebKitNetworkRequest to its own private
header, and to its implementation file. Also take the opportunity
to use PlatformRefPtr for NetworkRequest where it makes sense, and
diff --git a/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
index 0bdb98f..c269078 100644
--- a/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
@@ -27,6 +27,7 @@
#include "webkitprivate.h"
#include "webkitversion.h"
#include "webkitwebinspector.h"
+#include "webkitwebinspectorprivate.h"
#include "webkitwebview.h"
#include "webkitwebviewprivate.h"
#include <wtf/text/CString.h>
diff --git a/WebKit/gtk/webkit/webkitprivate.cpp b/WebKit/gtk/webkit/webkitprivate.cpp
index 605f5df..3325c32 100644
--- a/WebKit/gtk/webkit/webkitprivate.cpp
+++ b/WebKit/gtk/webkit/webkitprivate.cpp
@@ -171,45 +171,6 @@ static void closeIconDatabaseOnExit()
iconDatabase()->close();
}
-#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()
{
static bool isInitialized = false;
diff --git a/WebKit/gtk/webkit/webkitprivate.h b/WebKit/gtk/webkit/webkitprivate.h
index bed8e49..7d16c67 100644
--- a/WebKit/gtk/webkit/webkitprivate.h
+++ b/WebKit/gtk/webkit/webkitprivate.h
@@ -54,7 +54,6 @@
#include "GOwnPtr.h"
#include "Geolocation.h"
#include "HistoryItem.h"
-#include "InspectorClientGtk.h"
#include "IntPoint.h"
#include "IntRect.h"
#include "FrameLoaderClient.h"
@@ -105,10 +104,6 @@ namespace WebKit {
extern "C" {
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))
@@ -178,18 +173,6 @@ extern "C" {
// 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*
webkit_web_window_features_new_from_core_features (const WebCore::WindowFeatures& features);
diff --git a/WebKit/gtk/webkit/webkitwebinspector.cpp b/WebKit/gtk/webkit/webkitwebinspector.cpp
index 626df32..e7a829f 100644
--- a/WebKit/gtk/webkit/webkitwebinspector.cpp
+++ b/WebKit/gtk/webkit/webkitwebinspector.cpp
@@ -24,7 +24,6 @@
#include "FocusController.h"
#include "Frame.h"
-#include <glib/gi18n-lib.h>
#include "HitTestRequest.h"
#include "HitTestResult.h"
#include "InspectorClientGtk.h"
@@ -35,6 +34,8 @@
#include "webkit/WebKitDOMNodePrivate.h"
#include "webkitmarshal.h"
#include "webkitprivate.h"
+#include "webkitwebinspectorprivate.h"
+#include <glib/gi18n-lib.h>
/**
* SECTION:webkitwebinspector
@@ -578,3 +579,42 @@ void webkit_web_inspector_execute_script(WebKitWebInspector* webInspector, long
WebKitWebInspectorPrivate* priv = webInspector->priv;
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
diff --git a/WebKit/gtk/webkit/webkitwebinspectorprivate.h b/WebKit/gtk/webkit/webkitwebinspectorprivate.h
new file mode 100644
index 0000000..46d57b0
--- /dev/null
+++ b/WebKit/gtk/webkit/webkitwebinspectorprivate.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2007, 2008, 2009 Holger Hans Peter Freyther
+ * Copyright (C) 2008 Jan Michael C. Alonzo
+ * Copyright (C) 2008 Collabora Ltd.
+ * Copyright (C) 2010 Igalia S.L.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef webkitwebinspectorprivate_h
+#define webkitwebinspectorprivate_h
+
+extern "C" {
+
+#ifdef HAVE_GSETTINGS
+GSettings* inspectorGSettings();
+#endif
+
+void webkit_web_inspector_set_inspector_client(WebKitWebInspector*, WebCore::Page*);
+
+void webkit_web_inspector_set_web_view(WebKitWebInspector*, WebKitWebView*);
+
+void webkit_web_inspector_set_inspected_uri(WebKitWebInspector*, const gchar*);
+
+WEBKIT_API void webkit_web_inspector_execute_script(WebKitWebInspector*, long callId, const gchar* script);
+
+}
+
+#endif
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index 5147004..22dbdcc 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -88,6 +88,7 @@
#include "webkitwebframeprivate.h"
#include "webkitwebhistoryitem.h"
#include "webkitwebinspector.h"
+#include "webkitwebinspectorprivate.h"
#include "webkitwebviewprivate.h"
#include <gdk/gdkkeysyms.h>
#include <glib/gi18n-lib.h>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list