2007-12-01 Alp Toker <alp@atoker.com>

        Reviewed by Adam Roben.

        http://bugs.webkit.org/show_bug.cgi?id=15687
        [Gtk] Allow API clients to interact with JavaScript in web pages

        Include the necessary JavaScriptCore headers directly in the public
        API headers.

        This is the last of a series of changes needed to allow GTK+
        applications to access the JS API.

        Until http://bugs.webkit.org/show_bug.cgi?id=16029 is resolved,
        developers will still have to include the individual JS API headers
        individually if they want to use it in their applications.

        Patch also removes some old legacy use of GDK that was in
        WebKitWebFrame. No ABI change.

        * WebView/webkitdefines.h:
        * WebView/webkitwebframe.h:
        * WebView/webkitwebview.h:

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

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index e73cb6179d9c87e8fea84219733e71c69c6c7b19..25ce7a56813dd970ca4f62ab74849c9da5a9e384 100644 (file)
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,27 @@
+2007-12-01  Alp Toker  <alp@atoker.com>
+
+        Reviewed by Adam Roben.
+
+        http://bugs.webkit.org/show_bug.cgi?id=15687
+        [Gtk] Allow API clients to interact with JavaScript in web pages
+
+        Include the necessary JavaScriptCore headers directly in the public
+        API headers.
+
+        This is the last of a series of changes needed to allow GTK+
+        applications to access the JS API.
+
+        Until http://bugs.webkit.org/show_bug.cgi?id=16029 is resolved,
+        developers will still have to include the individual JS API headers
+        individually if they want to use it in their applications.
+
+        Patch also removes some old legacy use of GDK that was in
+        WebKitWebFrame. No ABI change.
+
+        * WebView/webkitdefines.h:
+        * WebView/webkitwebframe.h:
+        * WebView/webkitwebview.h:
+
 2007-11-30  Jan Michael Alonzo  <jmalonzo@unpluggable.com>
 
         Fix for GTK+ Debug build breakage introduced in r28273.

diff --git a/WebKit/gtk/WebView/webkitdefines.h b/WebKit/gtk/WebView/webkitdefines.h
index ea058e85e1fa36e32e3d0b75cb79098cc7e42d38..43b5a5fb8715dc396a27814bfd74dd47fcd2e1c1 100644 (file)
--- a/WebKit/gtk/WebView/webkitdefines.h
+++ b/WebKit/gtk/WebView/webkitdefines.h
@@ -42,9 +42,6 @@ typedef struct _WebKitWebViewClass WebKitWebViewClass;
 typedef struct _WebKitNetworkRequest WebKitNetworkRequest;
 typedef struct _WebKitNetworkRequestClass WebKitNetworkRequestClass;
 
-typedef struct OpaqueJSContext* JSGlobalContextRef;
-typedef struct OpaqueJSValue* JSObjectRef;
-
 #ifdef G_OS_WIN32
     #ifdef BUILDING_WEBKIT
         #define WEBKIT_API __declspec(dllexport)

diff --git a/WebKit/gtk/WebView/webkitwebframe.h b/WebKit/gtk/WebView/webkitwebframe.h
index cf766f42bd1fadb01c2fa59d87a7a31bd2828bc6..c072e0814e8c8b98458393737dcbcd1a80a1623b 100644 (file)
--- a/WebKit/gtk/WebView/webkitwebframe.h
+++ b/WebKit/gtk/WebView/webkitwebframe.h
@@ -31,7 +31,7 @@
 #define WEBKIT_WEB_FRAME_H
 
 #include <glib-object.h>
-#include <gdk/gdk.h>
+#include <JavaScriptCore/JSBase.h>
 
 #include "webkitdefines.h"
 
@@ -54,14 +54,11 @@ struct _WebKitWebFrameClass {
 
     void (*title_changed) (WebKitWebFrame* frame, gchar* title, gchar* location);
 
-    /*
-     * protected virtual methods
-     */
-    void (*mouse_move_event)  (WebKitWebFrame* frame, GdkEvent* move_event);
-    void (*mouse_press_event) (WebKitWebFrame* frame, GdkEvent* press_event);
-    void (*mouse_release_event) (WebKitWebFrame* frame, GdkEvent* mouse_release_event);
-    void (*mouse_double_click_event) (WebKitWebFrame* frame, GdkEvent* double_click_event);
-    void (*mouse_wheel_event) (WebKitWebFrame* frame, GdkEvent* wheel_event);
+    void (*_webkit_reserved1) (void);
+    void (*_webkit_reserved2) (void);
+    void (*_webkit_reserved3) (void);
+    void (*_webkit_reserved4) (void);
+    void (*_webkit_reserved5) (void);
 };
 
 WEBKIT_API GType

diff --git a/WebKit/gtk/WebView/webkitwebview.h b/WebKit/gtk/WebView/webkitwebview.h
index 0fdd3dadda7095ff5772037781788403896bebd4..9708419a4724699597233871ef956a671202c9aa 100644 (file)
--- a/WebKit/gtk/WebView/webkitwebview.h
+++ b/WebKit/gtk/WebView/webkitwebview.h
@@ -30,9 +30,9 @@
 #define WEBKIT_WEB_VIEW_H
 
 #include <gtk/gtk.h>
+#include <JavaScriptCore/JSBase.h>
 
 #include "webkitdefines.h"
-#include "webkitsettings.h"
 
 G_BEGIN_DECLS