2007-12-14 Juan A. Suarez Romero <jasuarez@igalia.com>

        Reviewed by Alp Toker.

        http://bugs.webkit.org/show_bug.cgi?id=16042
        [GTK] Eliminate webkit_init()

        Move webkit initialization to WebView class init.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@28818 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 937c39c9f396cc9b8d860751c44b9d8d04e75083..af3689ea3510a31e70f2ed793b8ab5a2d367c9f6 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2007-12-14  Juan A. Suarez Romero  <jasuarez@igalia.com>
+
+        Reviewed by Alp Toker.
+
+        http://bugs.webkit.org/show_bug.cgi?id=16042
+        [GTK] Eliminate webkit_init()
+
+        Move webkit initialization to WebView class init.
+
+        * WebCore.pro:
+
 2007-12-17  Jon Honeycutt  <jhoneycutt@apple.com>
 
         Reviewed by Darin.

diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index c086ef30354f7ce489c984ca684949134d418f45..5f12da38956d0950bef07b0e5e4ba3e49edc77a8 100644 (file)
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -953,7 +953,6 @@ gtk-port {
         ../WebCore/platform/gtk/ClipboardGtk.h \
         ../WebKit/gtk/WebView/webkit.h \
         ../WebKit/gtk/WebView/webkitdefines.h \
-        ../WebKit/gtk/WebView/webkitglobal.h \
         ../WebKit/gtk/WebView/webkitnetworkrequest.h \
         ../WebKit/gtk/WebView/webkitprivate.h \
         ../WebKit/gtk/WebView/webkitsettings.h \
@@ -1029,7 +1028,6 @@ gtk-port {
         platform/image-decoders/bmp/BMPImageDecoder.cpp \
         platform/image-decoders/ico/ICOImageDecoder.cpp \
         platform/image-decoders/xbm/XBMImageDecoder.cpp \
-        ../WebKit/gtk/WebView/webkitglobal.cpp \
         ../WebKit/gtk/WebView/webkitnetworkrequest.cpp \
         ../WebKit/gtk/WebView/webkitprivate.cpp \
         ../WebKit/gtk/WebView/webkitsettings.cpp \

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index d8d22c3b275d9991aef579ad935c56c3038eb4dc..421133cfc61f12b8637cc62a3448451f975e8634 100644 (file)
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,22 @@
+2007-12-14  Juan A. Suarez Romero  <jasuarez@igalia.com>
+
+        Reviewed by Alp Toker.
+
+        http://bugs.webkit.org/show_bug.cgi?id=16042
+        [GTK] Eliminate webkit_init()
+
+        Move webkit initialization to WebView class init.
+
+        * WebView/headers.pri:
+        * WebView/webkit.h:
+        * WebView/webkitglobal.cpp: Removed.
+        * WebView/webkitglobal.h: Removed.
+        * WebView/webkitprivate.cpp:
+        (WebKit::webkit_init):
+        * WebView/webkitprivate.h:
+        * WebView/webkitwebframe.cpp:
+        * WebView/webkitwebview.cpp:
+
 2007-12-17  Luca Bruno  <lethalman88@gmail.com>
 
         Reviewed by Alp Toker.

diff --git a/WebKit/gtk/WebView/headers.pri b/WebKit/gtk/WebView/headers.pri
index db0cc5a5e2fa323fccf0bad5c7c46947341df8c9..4b2eb21ba62be0853070a2e5ec3a8ffc762614f3 100644 (file)
--- a/WebKit/gtk/WebView/headers.pri
+++ b/WebKit/gtk/WebView/headers.pri
@@ -1,6 +1,5 @@
 WEBKIT_API_HEADERS = $$PWD/webkit.h \
                      $$PWD/webkitdefines.h \
-                     $$PWD/webkitglobal.h \
                      $$PWD/webkitnetworkrequest.h \
                      $$PWD/webkitwebframe.h \
                      $$PWD/webkitwebview.h

diff --git a/WebKit/gtk/WebView/webkit.h b/WebKit/gtk/WebView/webkit.h
index c117de4f9ed0ccc9bff13f8191c6d9dcd884ad24..b6a3c0e638d15866be7ea479c8b3e74b39bbfd0f 100644 (file)
--- a/WebKit/gtk/WebView/webkit.h
+++ b/WebKit/gtk/WebView/webkit.h
@@ -21,7 +21,6 @@
 #define __WEBKIT_H__
 
 #include <webkitdefines.h>
-#include <webkitglobal.h>
 #include <webkitnetworkrequest.h>
 #include <webkitwebframe.h>
 #include <webkitwebview.h>

diff --git a/WebKit/gtk/WebView/webkitglobal.cpp b/WebKit/gtk/WebView/webkitglobal.cpp
deleted file mode 100644 (file)
index e7837be..0000000
--- a/WebKit/gtk/WebView/webkitglobal.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2007 Holger Hans Peter Freyther
- *
- * 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.
- */
-
-#include "config.h"
-#include "webkitglobal.h"
-
-#include "Logging.h"
-#include "DatabaseTracker.h"
-
-#include <glib.h>
-
-extern "C" {
-void webkit_init(void)
-{
-    WebCore::InitializeLoggingChannelsIfNecessary();
-
-    WebCore::initializeThreading();
-
-#if ENABLE(DATABASE)
-    // FIXME: It should be possible for client applications to override this default location
-    gchar* databaseDirectory = g_build_filename(g_get_user_data_dir(), "webkit", "databases", NULL);
-    WebCore::DatabaseTracker::tracker().setDatabasePath(databaseDirectory);
-    g_free(databaseDirectory);
-#endif
-}
-}

diff --git a/WebKit/gtk/WebView/webkitglobal.h b/WebKit/gtk/WebView/webkitglobal.h
deleted file mode 100644 (file)
index a7e1976..0000000
--- a/WebKit/gtk/WebView/webkitglobal.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2007 Holger Hans Peter Freyther
- *
- * 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 WEBKIT_GLOBAL_H
-#define WEBKIT_GLOBAL_H
-
-#include "webkitdefines.h"
-
-G_BEGIN_DECLS
-
-WEBKIT_API void
-webkit_init (void);
-
-G_END_DECLS
-
-#endif

diff --git a/WebKit/gtk/WebView/webkitprivate.cpp b/WebKit/gtk/WebView/webkitprivate.cpp
index 88f4ec4717701e994a8eb26951e82063fc693ad2..2d2e24bb8c8e4af744f40be69df7c76a7096e909 100644 (file)
--- a/WebKit/gtk/WebView/webkitprivate.cpp
+++ b/WebKit/gtk/WebView/webkitprivate.cpp
@@ -21,8 +21,10 @@
 
 #include "webkitprivate.h"
 #include "ChromeClientGtk.h"
+#include "DatabaseTracker.h"
 #include "FrameLoader.h"
 #include "FrameLoaderClientGtk.h"
+#include "Logging.h"
 #include "NotImplemented.h"
 
 using namespace WebCore;
@@ -81,4 +83,23 @@ WebKitWebView* kit(WebCore::Page* corePage)
     WebKit::ChromeClient* client = static_cast<WebKit::ChromeClient*>(corePage->chrome()->client());
     return client ? client->webView() : 0;
 }
+
+}
+
+void webkit_init()
+{
+    static bool isInitialized = false;
+    if (isInitialized)
+        return;
+    isInitialized = true;
+
+    WebCore::initializeThreading();
+    WebCore::InitializeLoggingChannelsIfNecessary();
+
+#if ENABLE(DATABASE)
+    // FIXME: It should be possible for client applications to override this default location
+    gchar* databaseDirectory = g_build_filename(g_get_user_data_dir(), "webkit", "databases", NULL);
+    WebCore::DatabaseTracker::tracker().setDatabasePath(databaseDirectory);
+    g_free(databaseDirectory);
+#endif
 }

diff --git a/WebKit/gtk/WebView/webkitprivate.h b/WebKit/gtk/WebView/webkitprivate.h
index 7aef20c305a8f0d544ad4583fe54f4cd96725db1..0bd04ec758f4f7c6820b4fdcd03ebd87fffab84c 100644 (file)
--- a/WebKit/gtk/WebView/webkitprivate.h
+++ b/WebKit/gtk/WebView/webkitprivate.h
@@ -49,6 +49,8 @@ namespace WebKit {
 }
 
 extern "C" {
+    void webkit_init();
+
     #define WEBKIT_WEB_VIEW_GET_PRIVATE(obj)    (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_VIEW, WebKitWebViewPrivate))
     typedef struct _WebKitWebViewPrivate WebKitWebViewPrivate;
     struct _WebKitWebViewPrivate {
@@ -84,7 +86,6 @@ extern "C" {
 
     WebKitWebFrame* webkit_web_frame_init_with_web_view(WebKitWebView*, WebCore::HTMLFrameOwnerElement*);
 
-
     // TODO: Move these to webkitwebframe.h once these functions are fully
     // implemented and their API has been discussed.
 

diff --git a/WebKit/gtk/WebView/webkitwebframe.cpp b/WebKit/gtk/WebView/webkitwebframe.cpp
index cecc1aee5b139b45099c4067ff5f8e1d06db44f0..990e5f4d6fe665de6a30ef167a73eb4c3e86edf9 100644 (file)
--- a/WebKit/gtk/WebView/webkitwebframe.cpp
+++ b/WebKit/gtk/WebView/webkitwebframe.cpp
@@ -72,6 +72,8 @@ static void webkit_web_frame_finalize(GObject* object)
 
 static void webkit_web_frame_class_init(WebKitWebFrameClass* frameClass)
 {
+    webkit_init();
+
     g_type_class_add_private(frameClass, sizeof(WebKitWebFramePrivate));
 
     /*

diff --git a/WebKit/gtk/WebView/webkitwebview.cpp b/WebKit/gtk/WebView/webkitwebview.cpp
index 475838ca48eefa24640d113fb45c2e359c81835d..868c6427559b9217ad6d9f866224087143305d4c 100644 (file)
--- a/WebKit/gtk/WebView/webkitwebview.cpp
+++ b/WebKit/gtk/WebView/webkitwebview.cpp
@@ -434,6 +434,8 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass)
 {
     GtkBindingSet* binding_set;
 
+    webkit_init();
+
     g_type_class_add_private(webViewClass, sizeof(WebKitWebViewPrivate));
 
     /*

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 9ebec88a6f9c6f2d3102f174fa4307872b095f8a..bad3a2283cd103f3653bd4cd643d8a11579f532e 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2007-12-14  Juan A. Suarez Romero  <jasuarez@igalia.com>
+
+        Reviewed by Alp Toker.
+
+        http://bugs.webkit.org/show_bug.cgi?id=16042
+        [GTK] Eliminate webkit_init()
+
+        Moving webkit initialization to WebView class init.
+
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        (main):
+        * GtkLauncher/main.c:
+        (main):
+
 2007-12-17  Luca Bruno  <lethalman88@gmail.com>
 
         Reviewed by Alp Toker.

diff --git a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
index bd348617ad28cf93732c619234ed5b0174b5395d..53d329bf3a425e3de0313476eee18a53fe0262df 100644 (file)
--- a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
@@ -313,7 +313,6 @@ int main(int argc, char* argv[])
         }
 
     gtk_init(&argc, &argv);
-    webkit_init();
 
     GtkWidget* window = gtk_window_new(GTK_WINDOW_POPUP);
     GtkContainer* container = GTK_CONTAINER(gtk_fixed_new());

diff --git a/WebKitTools/GtkLauncher/main.c b/WebKitTools/GtkLauncher/main.c
index 7fe4e0b122e0f1395f305bfd65159ee86777f1f4..fd8627935e01a0cde17fb07acf674b7edd5a96fb 100644 (file)
--- a/WebKitTools/GtkLauncher/main.c
+++ b/WebKitTools/GtkLauncher/main.c
@@ -183,7 +183,6 @@ int
 main (int argc, char* argv[])
 {
     gtk_init (&argc, &argv);
-    webkit_init ();
 
     GtkWidget* vbox = gtk_vbox_new (FALSE, 0);
     gtk_box_pack_start (GTK_BOX (vbox), create_toolbar (), FALSE, FALSE, 0);