Skip to content
Permalink
Browse files
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:


Canonical link: https://commits.webkit.org/22212@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@28313 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Alp Toker committed Dec 2, 2007
1 parent 6a93730 commit e0d16866db96066f7ca442ab0af58e0badc19800
Showing 4 changed files with 31 additions and 13 deletions.
@@ -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.
@@ -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)
@@ -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
@@ -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

0 comments on commit e0d1686

Please sign in to comment.