Changeset 28818 in webkit

Timestamp:

Dec 17, 2007 12:54:49 PM (16 years ago)

Author:

alp@webkit.org

Message:

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.

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.pro (modified) (2 diffs)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/WebView/headers.pri (modified) (1 diff)
• WebKit/gtk/WebView/webkit.h (modified) (1 diff)
• WebKit/gtk/WebView/webkitglobal.cpp (deleted)
• WebKit/gtk/WebView/webkitglobal.h (deleted)
• WebKit/gtk/WebView/webkitprivate.cpp (modified) (2 diffs)
• WebKit/gtk/WebView/webkitprivate.h (modified) (2 diffs)
• WebKit/gtk/WebView/webkitwebframe.cpp (modified) (1 diff)
• WebKit/gtk/WebView/webkitwebview.cpp (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp (modified) (1 diff)
• WebKitTools/GtkLauncher/main.c (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/WebCore/WebCore.pro

@@ -954 +954 @@
         ../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 \
@@ -1030 +1029 @@
         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 \

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+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>
 

trunk/WebKit/gtk/WebView/headers.pri

@@ -1 +1 @@
 WEBKIT_API_HEADERS = $$PWD/webkit.h \
                      $$PWD/webkitdefines.h \
-                     $$PWD/webkitglobal.h \
                      $$PWD/webkitnetworkrequest.h \
                      $$PWD/webkitwebframe.h \

trunk/WebKit/gtk/WebView/webkit.h

@@ -22 +22 @@
 
 #include <webkitdefines.h>
-#include <webkitglobal.h>
 #include <webkitnetworkrequest.h>
 #include <webkitwebframe.h>

trunk/WebKit/gtk/WebView/webkitprivate.cpp

@@ -22 +22 @@
 #include "webkitprivate.h"
 #include "ChromeClientGtk.h"
+#include "DatabaseTracker.h"
 #include "FrameLoader.h"
 #include "FrameLoaderClientGtk.h"
+#include "Logging.h"
 #include "NotImplemented.h"
 
@@ -82 +84 @@
     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
+}

trunk/WebKit/gtk/WebView/webkitprivate.h

@@ -50 +50 @@
 
 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;
@@ -85 +87 @@
     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.

trunk/WebKit/gtk/WebView/webkitwebframe.cpp

@@ -73 +73 @@
 static void webkit_web_frame_class_init(WebKitWebFrameClass* frameClass)
 {
+    webkit_init();
+
     g_type_class_add_private(frameClass, sizeof(WebKitWebFramePrivate));
 

trunk/WebKit/gtk/WebView/webkitwebview.cpp

@@ -435 +435 @@
     GtkBindingSet* binding_set;
 
+    webkit_init();
+
     g_type_class_add_private(webViewClass, sizeof(WebKitWebViewPrivate));
 

trunk/WebKitTools/ChangeLog

@@ +1 @@
+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>
 

trunk/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp

@@ -314 +314 @@
 
     gtk_init(&argc, &argv);
-    webkit_init();
 
     GtkWidget* window = gtk_window_new(GTK_WINDOW_POPUP);

trunk/WebKitTools/GtkLauncher/main.c

@@ -184 +184 @@
 {
     gtk_init (&argc, &argv);
-    webkit_init ();
 
     GtkWidget* vbox = gtk_vbox_new (FALSE, 0);