+2007-10-03 Alp Toker <alp@atoker.com>
+
+ Reviewed by Adam.
+
+ http://bugs.webkit.org/show_bug.cgi?id=14726
+ [gtk] API design. Mapping the WebView delegates to signals.
+
+ Change the API namespace of the Gtk+ port from 'WebKitGtk' to 'WebKit'.
+
+ * WebCore.pro:
+
2007-10-03 Alp Toker <alp@atoker.com>
Reviewed by Eric.
}
GENMARSHALS = ../WebKit/gtk/Api/webkitgtk-marshal.list
- GENMARSHALS_PREFIX = webkit_gtk_marshal
+ GENMARSHALS_PREFIX = webkit_marshal
#
# integrate glib-genmarshal as additional compiler
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef WEBKIT_GTK_DEFINES_H
-#define WEBKIT_GTK_DEFINES_H
+#ifndef WEBKIT_DEFINES_H
+#define WEBKIT_DEFINES_H
#include <glib.h>
-typedef struct _WebKitGtkFrame WebKitGtkFrame;
-typedef struct _WebKitGtkFrameClass WebKitGtkFrameClass;
+typedef struct _WebKitFrame WebKitFrame;
+typedef struct _WebKitFrameClass WebKitFrameClass;
-typedef struct _WebKitGtkFrameData WebKitGtkFrameData;
-typedef struct _WebKitGtkNetworkRequest WebKitGtkNetworkRequest;
+typedef struct _WebKitFrameData WebKitFrameData;
+typedef struct _WebKitNetworkRequest WebKitNetworkRequest;
-typedef struct _WebKitGtkPage WebKitGtkPage;
-typedef struct _WebKitGtkPageClass WebKitGtkPageClass;
+typedef struct _WebKitPage WebKitPage;
+typedef struct _WebKitPageClass WebKitPageClass;
#ifdef G_OS_WIN32
#ifdef BUILDING_WEBKIT
- #define WEBKIT_GTK_API __declspec(dllexport)
+ #define WEBKIT_API __declspec(dllexport)
#else
- #define WEBKIT_GTK_API __declspec(dllimport)
+ #define WEBKIT_API __declspec(dllimport)
#endif
#else
- #define WEBKIT_GTK_API __attribute__((visibility("default")))
+ #define WEBKIT_API __attribute__((visibility("default")))
#endif
-#ifndef WEBKIT_GTK_API
-#define WEBKIT_GTK_API
+#ifndef WEBKIT_API
+#define WEBKIT_API
#endif
#endif
extern "C" {
-extern void webkit_gtk_marshal_VOID__STRING_STRING (GClosure* closure,
+extern void webkit_marshal_VOID__STRING_STRING (GClosure* closure,
GValue* return_value,
guint n_param_values,
const GValue* param_values,
LAST_SIGNAL
};
-static guint webkit_gtk_frame_signals[LAST_SIGNAL] = { 0, };
+static guint webkit_frame_signals[LAST_SIGNAL] = { 0, };
-static void webkit_gtk_frame_real_title_changed(WebKitGtkFrame* frame, gchar* title, gchar* location);
+static void webkit_frame_real_title_changed(WebKitFrame* frame, gchar* title, gchar* location);
-G_DEFINE_TYPE(WebKitGtkFrame, webkit_gtk_frame, G_TYPE_OBJECT)
+G_DEFINE_TYPE(WebKitFrame, webkit_frame, G_TYPE_OBJECT)
-static void webkit_gtk_frame_finalize(GObject* object)
+static void webkit_frame_finalize(GObject* object)
{
- WebKitGtkFramePrivate* privateData = WEBKIT_GTK_FRAME_GET_PRIVATE(WEBKIT_GTK_FRAME(object));
+ WebKitFramePrivate* privateData = WEBKIT_FRAME_GET_PRIVATE(WEBKIT_FRAME(object));
privateData->frame->loader()->cancelAndClear();
g_free(privateData->title);
g_free(privateData->location);
delete privateData->frame;
- G_OBJECT_CLASS(webkit_gtk_frame_parent_class)->finalize(object);
+ G_OBJECT_CLASS(webkit_frame_parent_class)->finalize(object);
}
-static void webkit_gtk_frame_class_init(WebKitGtkFrameClass* frameClass)
+static void webkit_frame_class_init(WebKitFrameClass* frameClass)
{
- g_type_class_add_private(frameClass, sizeof(WebKitGtkFramePrivate));
+ g_type_class_add_private(frameClass, sizeof(WebKitFramePrivate));
/*
* signals
*/
- webkit_gtk_frame_signals[CLEARED] = g_signal_new("cleared",
+ webkit_frame_signals[CLEARED] = g_signal_new("cleared",
G_TYPE_FROM_CLASS(frameClass),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
0,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
- webkit_gtk_frame_signals[LOAD_DONE] = g_signal_new("load_done",
+ webkit_frame_signals[LOAD_DONE] = g_signal_new("load_done",
G_TYPE_FROM_CLASS(frameClass),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
0,
G_TYPE_NONE, 1,
G_TYPE_BOOLEAN);
- webkit_gtk_frame_signals[TITLE_CHANGED] = g_signal_new("title_changed",
+ webkit_frame_signals[TITLE_CHANGED] = g_signal_new("title_changed",
G_TYPE_FROM_CLASS(frameClass),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
- G_STRUCT_OFFSET(WebKitGtkFrameClass, title_changed),
+ G_STRUCT_OFFSET(WebKitFrameClass, title_changed),
NULL,
NULL,
- webkit_gtk_marshal_VOID__STRING_STRING,
+ webkit_marshal_VOID__STRING_STRING,
G_TYPE_NONE, 2,
G_TYPE_STRING, G_TYPE_STRING);
- webkit_gtk_frame_signals[HOVERING_OVER_LINK] = g_signal_new("hovering_over_link",
+ webkit_frame_signals[HOVERING_OVER_LINK] = g_signal_new("hovering_over_link",
G_TYPE_FROM_CLASS(frameClass),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
0,
NULL,
NULL,
- webkit_gtk_marshal_VOID__STRING_STRING,
+ webkit_marshal_VOID__STRING_STRING,
G_TYPE_NONE, 2,
G_TYPE_STRING, G_TYPE_STRING);
- frameClass->title_changed = webkit_gtk_frame_real_title_changed;
+ frameClass->title_changed = webkit_frame_real_title_changed;
/*
* implementations of virtual methods
*/
- G_OBJECT_CLASS(frameClass)->finalize = webkit_gtk_frame_finalize;
+ G_OBJECT_CLASS(frameClass)->finalize = webkit_frame_finalize;
}
-static void webkit_gtk_frame_real_title_changed(WebKitGtkFrame* frame, gchar* title, gchar* location)
+static void webkit_frame_real_title_changed(WebKitFrame* frame, gchar* title, gchar* location)
{
- WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(frame);
+ WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(frame);
g_free(frameData->title);
g_free(frameData->location);
frameData->title = g_strdup(title);
frameData->location = g_strdup(location);
}
-static void webkit_gtk_frame_init(WebKitGtkFrame* frame)
+static void webkit_frame_init(WebKitFrame* frame)
{
}
-GObject* webkit_gtk_frame_new(WebKitGtkPage* page)
+GObject* webkit_frame_new(WebKitPage* page)
{
- WebKitGtkFrame* frame = WEBKIT_GTK_FRAME(g_object_new(WEBKIT_GTK_TYPE_FRAME, NULL));
- WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(frame);
- WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);
+ WebKitFrame* frame = WEBKIT_FRAME(g_object_new(WEBKIT_TYPE_FRAME, NULL));
+ WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(frame);
+ WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
frameData->client = new WebKit::FrameLoaderClient(frame);
frameData->frame = new Frame(pageData->page, 0, frameData->client);
return G_OBJECT(frame);
}
-GObject* webkit_gtk_frame_init_with_page(WebKitGtkPage* page, HTMLFrameOwnerElement* element)
+GObject* webkit_frame_init_with_page(WebKitPage* page, HTMLFrameOwnerElement* element)
{
- WebKitGtkFrame* frame = WEBKIT_GTK_FRAME(g_object_new(WEBKIT_GTK_TYPE_FRAME, NULL));
- WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(frame);
- WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);
+ WebKitFrame* frame = WEBKIT_FRAME(g_object_new(WEBKIT_TYPE_FRAME, NULL));
+ WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(frame);
+ WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
frameData->client = new WebKit::FrameLoaderClient(frame);
frameData->frame = new Frame(pageData->page, element, frameData->client);
return G_OBJECT(frame);
}
-WebKitGtkPage*
-webkit_gtk_frame_get_page(WebKitGtkFrame* frame)
+WebKitPage*
+webkit_frame_get_page(WebKitFrame* frame)
{
- WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(frame);
+ WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(frame);
return frameData->page;
}
-gchar* webkit_gtk_frame_get_title(WebKitGtkFrame* frame)
+gchar* webkit_frame_get_title(WebKitFrame* frame)
{
- WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(frame);
+ WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(frame);
return frameData->title;
}
-gchar* webkit_gtk_frame_get_location(WebKitGtkFrame* frame)
+gchar* webkit_frame_get_location(WebKitFrame* frame)
{
- WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(frame);
+ WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(frame);
return frameData->location;
}
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef WEBKIT_GTK_FRAME_H
-#define WEBKIT_GTK_FRAME_H
+#ifndef WEBKIT_FRAME_H
+#define WEBKIT_FRAME_H
#include <glib-object.h>
#include <gdk/gdk.h>
G_BEGIN_DECLS
-#define WEBKIT_GTK_TYPE_FRAME (webkit_gtk_frame_get_type())
-#define WEBKIT_GTK_FRAME(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_GTK_TYPE_FRAME, WebKitGtkFrame))
-#define WEBKIT_GTK_FRAME_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), WEBKIT_GTK_TYPE_FRAME, WebKitGtkFrameClass))
-#define WEBKIT_GTK_IS_FRAME(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_GTK_TYPE_FRAME))
-#define WEBKIT_GTK_IS_FRAME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_GTK_TYPE_FRAME))
-#define WEBKIT_GTK_FRAME_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_GTK_TYPE_FRAME, WebKitGtkFrameClass))
+#define WEBKIT_TYPE_FRAME (webkit_frame_get_type())
+#define WEBKIT_FRAME(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_FRAME, WebKitFrame))
+#define WEBKIT_FRAME_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), WEBKIT_TYPE_FRAME, WebKitFrameClass))
+#define WEBKIT_IS_FRAME(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_FRAME))
+#define WEBKIT_IS_FRAME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_TYPE_FRAME))
+#define WEBKIT_FRAME_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_TYPE_FRAME, WebKitFrameClass))
-struct _WebKitGtkFrame {
+struct _WebKitFrame {
GObject parent;
};
-struct _WebKitGtkFrameClass {
+struct _WebKitFrameClass {
GObjectClass parent;
- void (*title_changed) (WebKitGtkFrame* frame, gchar* title, gchar* location);
+ void (*title_changed) (WebKitFrame* frame, gchar* title, gchar* location);
/*
* protected virtual methods
*/
- void (*mouse_move_event) (WebKitGtkFrame* frame, GdkEvent* move_event);
- void (*mouse_press_event) (WebKitGtkFrame* frame, GdkEvent* press_event);
- void (*mouse_release_event) (WebKitGtkFrame* frame, GdkEvent* mouse_release_event);
- void (*mouse_double_click_event) (WebKitGtkFrame* frame, GdkEvent* double_click_event);
- void (*mouse_wheel_event) (WebKitGtkFrame* frame, GdkEvent* wheel_event);
+ void (*mouse_move_event) (WebKitFrame* frame, GdkEvent* move_event);
+ void (*mouse_press_event) (WebKitFrame* frame, GdkEvent* press_event);
+ void (*mouse_release_event) (WebKitFrame* frame, GdkEvent* mouse_release_event);
+ void (*mouse_double_click_event) (WebKitFrame* frame, GdkEvent* double_click_event);
+ void (*mouse_wheel_event) (WebKitFrame* frame, GdkEvent* wheel_event);
};
-WEBKIT_GTK_API GType
-webkit_gtk_frame_get_type (void);
+WEBKIT_API GType
+webkit_frame_get_type (void);
-WEBKIT_GTK_API GObject*
-webkit_gtk_frame_new (WebKitGtkPage *page);
+WEBKIT_API GObject*
+webkit_frame_new (WebKitPage *page);
-WEBKIT_GTK_API WebKitGtkPage*
-webkit_gtk_frame_get_page (WebKitGtkFrame* frame);
+WEBKIT_API WebKitPage*
+webkit_frame_get_page (WebKitFrame* frame);
-WEBKIT_GTK_API gchar*
-webkit_gtk_frame_get_markup (WebKitGtkFrame* frame);
+WEBKIT_API gchar*
+webkit_frame_get_markup (WebKitFrame* frame);
-WEBKIT_GTK_API gchar*
-webkit_gtk_frame_get_inner_text (WebKitGtkFrame* frame);
+WEBKIT_API gchar*
+webkit_frame_get_inner_text (WebKitFrame* frame);
-WEBKIT_GTK_API gchar*
-webkit_gtk_frame_get_selected_text (WebKitGtkFrame* frame);
+WEBKIT_API gchar*
+webkit_frame_get_selected_text (WebKitFrame* frame);
-WEBKIT_GTK_API gchar*
-webkit_gtk_frame_get_title (WebKitGtkFrame* frame);
+WEBKIT_API gchar*
+webkit_frame_get_title (WebKitFrame* frame);
-WEBKIT_GTK_API gchar*
-webkit_gtk_frame_get_location (WebKitGtkFrame* frame);
+WEBKIT_API gchar*
+webkit_frame_get_location (WebKitFrame* frame);
-WEBKIT_GTK_API GSList*
-webkit_gtk_frame_get_child_frames (WebKitGtkFrame* frame);
+WEBKIT_API GSList*
+webkit_frame_get_child_frames (WebKitFrame* frame);
-WEBKIT_GTK_API GdkPoint*
-webkit_gtk_frame_get_position (WebKitGtkFrame* frame);
+WEBKIT_API GdkPoint*
+webkit_frame_get_position (WebKitFrame* frame);
-WEBKIT_GTK_API GdkRectangle*
-webkit_gtk_frame_get_rectangle (WebKitGtkFrame* frame);
+WEBKIT_API GdkRectangle*
+webkit_frame_get_rectangle (WebKitFrame* frame);
-WEBKIT_GTK_API WebKitGtkPage*
-webkit_gtk_frame_get_page (WebKitGtkFrame* frame);
+WEBKIT_API WebKitPage*
+webkit_frame_get_page (WebKitFrame* frame);
G_END_DECLS
#include "Logging.h"
extern "C" {
-void webkit_gtk_init(void)
+void webkit_init(void)
{
WebCore::InitializeLoggingChannelsIfNecessary();
}
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef WEBKIT_GTK_GLOBAL_H
-#define WEBKIT_GTK_GLOBAL_H
+#ifndef WEBKIT_GLOBAL_H
+#define WEBKIT_GLOBAL_H
#include "webkitgtkdefines.h"
G_BEGIN_DECLS
-WEBKIT_GTK_API void
-webkit_gtk_init (void);
+WEBKIT_API void
+webkit_init (void);
G_END_DECLS
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef WEBKIT_GTK_NETWORK_REQUEST_H
-#define WEBKIT_GTK_NETWORK_REQUEST_H
+#ifndef WEBKIT_NETWORK_REQUEST_H
+#define WEBKIT_NETWORK_REQUEST_H
#include <glib-object.h>
G_BEGIN_DECLS
-#define WEBKIT_GTK_TYPE_NETWORK_REQUEST (webkit_gtk_network_request_get_type())
-#define WEBKIT_GTK_NETWORK_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_GTK_TYPE_NETWORK_REQUEST, WebKitGtkNetworkRequest))
-#define WEBKIT_GTK_NETWORK_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), WEBKIT_GTK_TYPE_NETWORK_REQUEST, WebKitGtkNetworkRequestClass))
-#define WEBKIT_GTK_IS_NETWORK_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_GTK_TYPE_NETWORK_REQUEST))
-#define WEBKIT_GTK_IS_NETWORK_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_GTK_TYPE_NETWORK_REQUEST))
-#define WEBKIT_GTK_NETWORK_REQUEST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_GTK_TYPE_NETWORK_REQUEST, WebKitGtkNetworkRequestClass))
+#define WEBKIT_TYPE_NETWORK_REQUEST (webkit_network_request_get_type())
+#define WEBKIT_NETWORK_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_NETWORK_REQUEST, WebKitNetworkRequest))
+#define WEBKIT_NETWORK_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), WEBKIT_TYPE_NETWORK_REQUEST, WebKitNetworkRequestClass))
+#define WEBKIT_IS_NETWORK_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_NETWORK_REQUEST))
+#define WEBKIT_IS_NETWORK_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_TYPE_NETWORK_REQUEST))
+#define WEBKIT_NETWORK_REQUEST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_TYPE_NETWORK_REQUEST, WebKitNetworkRequestClass))
-typedef struct _WebKitGtkNetworkRequest WebKitGtkNetworkRequest;
-typedef struct _WebKitGtkNetworkRequestClass WebKitGtkNetworkRequestClass;
+typedef struct _WebKitNetworkRequest WebKitNetworkRequest;
+typedef struct _WebKitNetworkRequestClass WebKitNetworkRequestClass;
-struct _WebKitGtkNetworkRequest {
+struct _WebKitNetworkRequest {
GObject parent;
};
-struct _WebKitGtkNetworkRequestClass {
+struct _WebKitNetworkRequestClass {
GObject parent;
};
-WEBKIT_GTK_API GType
-webkit_gtk_network_request_get_type (void);
+WEBKIT_API GType
+webkit_network_request_get_type (void);
-WEBKIT_GTK_API GObject*
-webkit_gtk_network_request_new (void);
+WEBKIT_API GObject*
+webkit_network_request_new (void);
G_END_DECLS
LAST_SIGNAL
};
-static guint webkit_gtk_page_signals[LAST_SIGNAL] = { 0, };
+static guint webkit_page_signals[LAST_SIGNAL] = { 0, };
-G_DEFINE_TYPE(WebKitGtkPage, webkit_gtk_page, GTK_TYPE_CONTAINER)
+G_DEFINE_TYPE(WebKitPage, webkit_page, GTK_TYPE_CONTAINER)
-static gboolean webkit_gtk_page_expose_event(GtkWidget* widget, GdkEventExpose* event)
+static gboolean webkit_page_expose_event(GtkWidget* widget, GdkEventExpose* event)
{
- Frame* frame = core(getFrameFromPage(WEBKIT_GTK_PAGE(widget)));
+ Frame* frame = core(getFrameFromPage(WEBKIT_PAGE(widget)));
GdkRectangle clip;
gdk_region_get_clipbox(event->region, &clip);
cairo_t* cr = gdk_cairo_create(event->window);
return FALSE;
}
-static gboolean webkit_gtk_page_key_event(GtkWidget* widget, GdkEventKey* event)
+static gboolean webkit_page_key_event(GtkWidget* widget, GdkEventKey* event)
{
- Frame* frame = core(getFrameFromPage(WEBKIT_GTK_PAGE(widget)));
+ Frame* frame = core(getFrameFromPage(WEBKIT_PAGE(widget)));
frame->eventHandler()->keyEvent(PlatformKeyboardEvent(event));
return FALSE;
}
-static gboolean webkit_gtk_page_button_event(GtkWidget* widget, GdkEventButton* event)
+static gboolean webkit_page_button_event(GtkWidget* widget, GdkEventButton* event)
{
- Frame* frame = core(getFrameFromPage(WEBKIT_GTK_PAGE(widget)));
+ Frame* frame = core(getFrameFromPage(WEBKIT_PAGE(widget)));
if (event->type == GDK_BUTTON_RELEASE)
frame->eventHandler()->handleMouseReleaseEvent(PlatformMouseEvent(event));
return FALSE;
}
-static gboolean webkit_gtk_page_motion_event(GtkWidget* widget, GdkEventMotion* event)
+static gboolean webkit_page_motion_event(GtkWidget* widget, GdkEventMotion* event)
{
- Frame* frame = core(getFrameFromPage(WEBKIT_GTK_PAGE(widget)));
+ Frame* frame = core(getFrameFromPage(WEBKIT_PAGE(widget)));
frame->eventHandler()->mouseMoved(PlatformMouseEvent(event));
return FALSE;
}
-static gboolean webkit_gtk_page_scroll_event(GtkWidget* widget, GdkEventScroll* event)
+static gboolean webkit_page_scroll_event(GtkWidget* widget, GdkEventScroll* event)
{
- Frame* frame = core(getFrameFromPage(WEBKIT_GTK_PAGE(widget)));
+ Frame* frame = core(getFrameFromPage(WEBKIT_PAGE(widget)));
PlatformWheelEvent wheelEvent(event);
frame->eventHandler()->handleWheelEvent(wheelEvent);
return FALSE;
}
-static void webkit_gtk_page_size_allocate(GtkWidget* widget, GtkAllocation* allocation)
+static void webkit_page_size_allocate(GtkWidget* widget, GtkAllocation* allocation)
{
- GTK_WIDGET_CLASS(webkit_gtk_page_parent_class)->size_allocate(widget,allocation);
+ GTK_WIDGET_CLASS(webkit_page_parent_class)->size_allocate(widget,allocation);
- Frame* frame = core(getFrameFromPage(WEBKIT_GTK_PAGE(widget)));
+ Frame* frame = core(getFrameFromPage(WEBKIT_PAGE(widget)));
frame->view()->resize(allocation->width, allocation->height);
frame->forceLayout();
frame->view()->adjustViewSize();
frame->sendResizeEvent();
}
-static void webkit_gtk_page_realize(GtkWidget* widget)
+static void webkit_page_realize(GtkWidget* widget)
{
GTK_WIDGET_SET_FLAGS(widget, GTK_REALIZED);
gdk_window_set_user_data(widget->window, widget);
}
-static void webkit_gtk_page_map(GtkWidget* widget)
+static void webkit_page_map(GtkWidget* widget)
{
GTK_WIDGET_SET_FLAGS(widget, GTK_MAPPED);
- WebKitGtkPagePrivate* private_data = WEBKIT_GTK_PAGE_GET_PRIVATE(WEBKIT_GTK_PAGE(widget));
+ WebKitPagePrivate* private_data = WEBKIT_PAGE_GET_PRIVATE(WEBKIT_PAGE(widget));
HashSet<GtkWidget*>::const_iterator end = private_data->children.end();
for (HashSet<GtkWidget*>::const_iterator current = private_data->children.begin(); current != end; ++current)
gdk_window_show(widget->window);
}
-static void webkit_gtk_page_set_scroll_adjustments(WebKitGtkPage* page, GtkAdjustment* hadj, GtkAdjustment* vadj)
+static void webkit_page_set_scroll_adjustments(WebKitPage* page, GtkAdjustment* hadj, GtkAdjustment* vadj)
{
FrameView* view = core(getFrameFromPage(page))->view();
view->setGtkAdjustments(hadj, vadj);
}
-static void webkit_gtk_page_container_add(GtkContainer* container, GtkWidget* widget)
+static void webkit_page_container_add(GtkContainer* container, GtkWidget* widget)
{
- WebKitGtkPage* page = WEBKIT_GTK_PAGE(container);
- WebKitGtkPagePrivate* private_data = WEBKIT_GTK_PAGE_GET_PRIVATE(page);
+ WebKitPage* page = WEBKIT_PAGE(container);
+ WebKitPagePrivate* private_data = WEBKIT_PAGE_GET_PRIVATE(page);
private_data->children.add(widget);
if (GTK_WIDGET_REALIZED(container))
gtk_widget_set_parent(widget, GTK_WIDGET(container));
}
-static void webkit_gtk_page_container_remove(GtkContainer* container, GtkWidget* widget)
+static void webkit_page_container_remove(GtkContainer* container, GtkWidget* widget)
{
- WebKitGtkPagePrivate* private_data = WEBKIT_GTK_PAGE_GET_PRIVATE(WEBKIT_GTK_PAGE(container));
+ WebKitPagePrivate* private_data = WEBKIT_PAGE_GET_PRIVATE(WEBKIT_PAGE(container));
if (private_data->children.contains(widget)) {
gtk_widget_unparent(widget);
}
}
-static void webkit_gtk_page_container_forall(GtkContainer* container, gboolean, GtkCallback callback, gpointer callbackData)
+static void webkit_page_container_forall(GtkContainer* container, gboolean, GtkCallback callback, gpointer callbackData)
{
- WebKitGtkPagePrivate* privateData = WEBKIT_GTK_PAGE_GET_PRIVATE(WEBKIT_GTK_PAGE(container));
+ WebKitPagePrivate* privateData = WEBKIT_PAGE_GET_PRIVATE(WEBKIT_PAGE(container));
HashSet<GtkWidget*> children = privateData->children;
HashSet<GtkWidget*>::const_iterator end = children.end();
(*callback)(*current, callbackData);
}
-static WebKitGtkPage* webkit_gtk_page_real_create_page(WebKitGtkPage*)
+static WebKitPage* webkit_page_real_create_page(WebKitPage*)
{
notImplemented();
return 0;
}
-static WEBKIT_GTK_NAVIGATION_REQUEST_RESPONSE webkit_gtk_page_real_navigation_requested(WebKitGtkPage*, WebKitGtkFrame* frame, WebKitGtkNetworkRequest*)
+static WEBKIT_NAVIGATION_REQUEST_RESPONSE webkit_page_real_navigation_requested(WebKitPage*, WebKitFrame* frame, WebKitNetworkRequest*)
{
notImplemented();
- return WEBKIT_GTK_ACCEPT_NAVIGATION_REQUEST;
+ return WEBKIT_ACCEPT_NAVIGATION_REQUEST;
}
-static gchar* webkit_gtk_page_real_choose_file(WebKitGtkPage*, WebKitGtkFrame*, const gchar* old_name)
+static gchar* webkit_page_real_choose_file(WebKitPage*, WebKitFrame*, const gchar* old_name)
{
notImplemented();
return g_strdup(old_name);
}
-static void webkit_gtk_page_real_java_script_alert(WebKitGtkPage*, WebKitGtkFrame*, const gchar*)
+static void webkit_page_real_java_script_alert(WebKitPage*, WebKitFrame*, const gchar*)
{
notImplemented();
}
-static gboolean webkit_gtk_page_real_java_script_confirm(WebKitGtkPage*, WebKitGtkFrame*, const gchar*)
+static gboolean webkit_page_real_java_script_confirm(WebKitPage*, WebKitFrame*, const gchar*)
{
notImplemented();
return FALSE;
}
/**
- * WebKitGtkPage::java_script_prompt
+ * WebKitPage::java_script_prompt
*
* @return: NULL to cancel the prompt
*/
-static gchar* webkit_gtk_page_real_java_script_prompt(WebKitGtkPage*, WebKitGtkFrame*, const gchar*, const gchar* defaultValue)
+static gchar* webkit_page_real_java_script_prompt(WebKitPage*, WebKitFrame*, const gchar*, const gchar* defaultValue)
{
notImplemented();
return g_strdup(defaultValue);
}
-static void webkit_gtk_page_real_java_script_console_message(WebKitGtkPage*, const gchar*, unsigned int, const gchar*)
+static void webkit_page_real_java_script_console_message(WebKitPage*, const gchar*, unsigned int, const gchar*)
{
notImplemented();
}
-static void webkit_gtk_page_finalize(GObject* object)
+static void webkit_page_finalize(GObject* object)
{
- webkit_gtk_page_stop_loading(WEBKIT_GTK_PAGE(object));
+ webkit_page_stop_loading(WEBKIT_PAGE(object));
- WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(WEBKIT_GTK_PAGE(object));
+ WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(WEBKIT_PAGE(object));
delete pageData->page;
delete pageData->settings;
g_object_unref(pageData->mainFrame);
delete pageData->userAgent;
- G_OBJECT_CLASS(webkit_gtk_page_parent_class)->finalize(object);
+ G_OBJECT_CLASS(webkit_page_parent_class)->finalize(object);
}
-static void webkit_gtk_page_class_init(WebKitGtkPageClass* pageClass)
+static void webkit_page_class_init(WebKitPageClass* pageClass)
{
- g_type_class_add_private(pageClass, sizeof(WebKitGtkPagePrivate));
+ g_type_class_add_private(pageClass, sizeof(WebKitPagePrivate));
/*
* signals
*/
/**
- * WebKitGtkPage::load-started
+ * WebKitPage::load-started
* @page: the object on which the signal is emitted
* @frame: the frame going to do the load
*
- * When a WebKitGtkFrame begins to load this signal is emitted.
+ * When a WebKitFrame begins to load this signal is emitted.
*/
- webkit_gtk_page_signals[LOAD_STARTED] = g_signal_new("load_started",
+ webkit_page_signals[LOAD_STARTED] = g_signal_new("load_started",
G_TYPE_FROM_CLASS(pageClass),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
0,
NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
- WEBKIT_GTK_TYPE_FRAME);
+ WEBKIT_TYPE_FRAME);
/**
- * WebKitGtkPage::load-progress-changed
- * @page: The WebKitGtkPage
+ * WebKitPage::load-progress-changed
+ * @page: The WebKitPage
* @progress: Global progress
*/
- webkit_gtk_page_signals[LOAD_PROGRESS_CHANGED] = g_signal_new("load_progress_changed",
+ webkit_page_signals[LOAD_PROGRESS_CHANGED] = g_signal_new("load_progress_changed",
G_TYPE_FROM_CLASS(pageClass),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
0,
G_TYPE_NONE, 1,
G_TYPE_INT);
- webkit_gtk_page_signals[LOAD_FINISHED] = g_signal_new("load_finished",
+ webkit_page_signals[LOAD_FINISHED] = g_signal_new("load_finished",
G_TYPE_FROM_CLASS(pageClass),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
0,
NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
- WEBKIT_GTK_TYPE_FRAME);
+ WEBKIT_TYPE_FRAME);
- webkit_gtk_page_signals[TITLE_CHANGED] = g_signal_new("title_changed",
+ webkit_page_signals[TITLE_CHANGED] = g_signal_new("title_changed",
G_TYPE_FROM_CLASS(pageClass),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
0,
NULL,
NULL,
- webkit_gtk_marshal_VOID__STRING_STRING,
+ webkit_marshal_VOID__STRING_STRING,
G_TYPE_NONE, 2,
G_TYPE_STRING, G_TYPE_STRING);
- webkit_gtk_page_signals[HOVERING_OVER_LINK] = g_signal_new("hovering_over_link",
+ webkit_page_signals[HOVERING_OVER_LINK] = g_signal_new("hovering_over_link",
G_TYPE_FROM_CLASS(pageClass),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
0,
NULL,
NULL,
- webkit_gtk_marshal_VOID__STRING_STRING,
+ webkit_marshal_VOID__STRING_STRING,
G_TYPE_NONE, 2,
G_TYPE_STRING,
G_TYPE_STRING);
- webkit_gtk_page_signals[STATUS_BAR_TEXT_CHANGED] = g_signal_new("status_bar_text_changed",
+ webkit_page_signals[STATUS_BAR_TEXT_CHANGED] = g_signal_new("status_bar_text_changed",
G_TYPE_FROM_CLASS(pageClass),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
0,
G_TYPE_NONE, 1,
G_TYPE_STRING);
- webkit_gtk_page_signals[ICOND_LOADED] = g_signal_new("icon_loaded",
+ webkit_page_signals[ICOND_LOADED] = g_signal_new("icon_loaded",
G_TYPE_FROM_CLASS(pageClass),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
0,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
- webkit_gtk_page_signals[SELECTION_CHANGED] = g_signal_new("selection_changed",
+ webkit_page_signals[SELECTION_CHANGED] = g_signal_new("selection_changed",
G_TYPE_FROM_CLASS(pageClass),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
0,
/*
* implementations of virtual methods
*/
- pageClass->create_page = webkit_gtk_page_real_create_page;
- pageClass->navigation_requested = webkit_gtk_page_real_navigation_requested;
- pageClass->choose_file = webkit_gtk_page_real_choose_file;
- pageClass->java_script_alert = webkit_gtk_page_real_java_script_alert;
- pageClass->java_script_confirm = webkit_gtk_page_real_java_script_confirm;
- pageClass->java_script_prompt = webkit_gtk_page_real_java_script_prompt;
- pageClass->java_script_console_message = webkit_gtk_page_real_java_script_console_message;
+ pageClass->create_page = webkit_page_real_create_page;
+ pageClass->navigation_requested = webkit_page_real_navigation_requested;
+ pageClass->choose_file = webkit_page_real_choose_file;
+ pageClass->java_script_alert = webkit_page_real_java_script_alert;
+ pageClass->java_script_confirm = webkit_page_real_java_script_confirm;
+ pageClass->java_script_prompt = webkit_page_real_java_script_prompt;
+ pageClass->java_script_console_message = webkit_page_real_java_script_console_message;
- G_OBJECT_CLASS(pageClass)->finalize = webkit_gtk_page_finalize;
+ G_OBJECT_CLASS(pageClass)->finalize = webkit_page_finalize;
GtkWidgetClass* widgetClass = GTK_WIDGET_CLASS(pageClass);
- widgetClass->realize = webkit_gtk_page_realize;
- widgetClass->map = webkit_gtk_page_map;
- widgetClass->expose_event = webkit_gtk_page_expose_event;
- widgetClass->key_press_event = webkit_gtk_page_key_event;
- widgetClass->key_release_event = webkit_gtk_page_key_event;
- widgetClass->button_press_event = webkit_gtk_page_button_event;
- widgetClass->button_release_event = webkit_gtk_page_button_event;
- widgetClass->motion_notify_event = webkit_gtk_page_motion_event;
- widgetClass->scroll_event = webkit_gtk_page_scroll_event;
- widgetClass->size_allocate = webkit_gtk_page_size_allocate;
+ widgetClass->realize = webkit_page_realize;
+ widgetClass->map = webkit_page_map;
+ widgetClass->expose_event = webkit_page_expose_event;
+ widgetClass->key_press_event = webkit_page_key_event;
+ widgetClass->key_release_event = webkit_page_key_event;
+ widgetClass->button_press_event = webkit_page_button_event;
+ widgetClass->button_release_event = webkit_page_button_event;
+ widgetClass->motion_notify_event = webkit_page_motion_event;
+ widgetClass->scroll_event = webkit_page_scroll_event;
+ widgetClass->size_allocate = webkit_page_size_allocate;
GtkContainerClass* containerClass = GTK_CONTAINER_CLASS(pageClass);
- containerClass->add = webkit_gtk_page_container_add;
- containerClass->remove = webkit_gtk_page_container_remove;
- containerClass->forall = webkit_gtk_page_container_forall;
+ containerClass->add = webkit_page_container_add;
+ containerClass->remove = webkit_page_container_remove;
+ containerClass->forall = webkit_page_container_forall;
/*
* make us scrollable (e.g. addable to a GtkScrolledWindow)
*/
- pageClass->set_scroll_adjustments = webkit_gtk_page_set_scroll_adjustments;
+ pageClass->set_scroll_adjustments = webkit_page_set_scroll_adjustments;
GTK_WIDGET_CLASS(pageClass)->set_scroll_adjustments_signal = g_signal_new("set_scroll_adjustments",
G_TYPE_FROM_CLASS(pageClass),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
- G_STRUCT_OFFSET(WebKitGtkPageClass, set_scroll_adjustments),
+ G_STRUCT_OFFSET(WebKitPageClass, set_scroll_adjustments),
NULL, NULL,
- webkit_gtk_marshal_VOID__OBJECT_OBJECT,
+ webkit_marshal_VOID__OBJECT_OBJECT,
G_TYPE_NONE, 2,
GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
}
-static void webkit_gtk_page_init(WebKitGtkPage* page)
+static void webkit_page_init(WebKitPage* page)
{
- WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(WEBKIT_GTK_PAGE(page));
+ WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(WEBKIT_PAGE(page));
pageData->page = new Page(new WebKit::ChromeClient(page), new WebKit::ContextMenuClient, new WebKit::EditorClient(page), new WebKit::DragClient, new WebKit::InspectorClient);
Settings* settings = pageData->page->settings();
settings->setStandardFontFamily("Arial");
GTK_WIDGET_SET_FLAGS(page, GTK_CAN_FOCUS);
- pageData->mainFrame = WEBKIT_GTK_FRAME(webkit_gtk_frame_new(page));
+ pageData->mainFrame = WEBKIT_FRAME(webkit_frame_new(page));
}
-GtkWidget* webkit_gtk_page_new(void)
+GtkWidget* webkit_page_new(void)
{
- WebKitGtkPage* page = WEBKIT_GTK_PAGE(g_object_new(WEBKIT_GTK_TYPE_PAGE, NULL));
+ WebKitPage* page = WEBKIT_PAGE(g_object_new(WEBKIT_TYPE_PAGE, NULL));
return GTK_WIDGET(page);
}
-void webkit_gtk_page_set_settings(WebKitGtkPage* page, WebKitGtkSettings* settings)
+void webkit_page_set_settings(WebKitPage* page, WebKitSettings* settings)
{
notImplemented();
}
-WebKitGtkSettings* webkit_gtk_page_get_settings(WebKitGtkPage* page)
+WebKitSettings* webkit_page_get_settings(WebKitPage* page)
{
notImplemented();
return 0;
}
-void webkit_gtk_page_go_backward(WebKitGtkPage* page)
+void webkit_page_go_backward(WebKitPage* page)
{
- WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);
- WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(pageData->mainFrame);
+ WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
+ WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame);
frameData->frame->loader()->goBackOrForward(-1);
}
-void webkit_gtk_page_go_forward(WebKitGtkPage* page)
+void webkit_page_go_forward(WebKitPage* page)
{
- WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);
- WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(pageData->mainFrame);
+ WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
+ WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame);
frameData->frame->loader()->goBackOrForward(1);
}
-gboolean webkit_gtk_page_can_go_backward(WebKitGtkPage* page)
+gboolean webkit_page_can_go_backward(WebKitPage* page)
{
- WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);
- WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(pageData->mainFrame);
+ WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
+ WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame);
return frameData->frame->loader()->canGoBackOrForward(-1);
}
-gboolean webkit_gtk_page_can_go_forward(WebKitGtkPage* page)
+gboolean webkit_page_can_go_forward(WebKitPage* page)
{
- WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);
- WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(pageData->mainFrame);
+ WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
+ WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame);
return frameData->frame->loader()->canGoBackOrForward(1);
}
-void webkit_gtk_page_open(WebKitGtkPage* page, const gchar* url)
+void webkit_page_open(WebKitPage* page, const gchar* url)
{
- WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);
- WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(pageData->mainFrame);
+ WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
+ WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame);
DeprecatedString string = DeprecatedString::fromUtf8(url);
frameData->frame->loader()->load(ResourceRequest(KURL(string)));
}
-void webkit_gtk_page_reload(WebKitGtkPage* page)
+void webkit_page_reload(WebKitPage* page)
{
- WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);
- WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(pageData->mainFrame);
+ WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
+ WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame);
frameData->frame->loader()->reload();
}
-void webkit_gtk_page_load_string(WebKitGtkPage* page, const gchar* content, const gchar* contentMimeType, const gchar* contentEncoding, const gchar* baseUrl)
+void webkit_page_load_string(WebKitPage* page, const gchar* content, const gchar* contentMimeType, const gchar* contentEncoding, const gchar* baseUrl)
{
- WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);
- WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(pageData->mainFrame);
+ WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
+ WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame);
KURL url(DeprecatedString::fromUtf8(baseUrl));
RefPtr<SharedBuffer> sharedBuffer = new SharedBuffer(strdup(content), strlen(content));
frameData->frame->loader()->load(ResourceRequest(url), substituteData);
}
-void webkit_gtk_page_load_html_string(WebKitGtkPage* page, const gchar* content, const gchar* baseUrl)
+void webkit_page_load_html_string(WebKitPage* page, const gchar* content, const gchar* baseUrl)
{
- webkit_gtk_page_load_string(page, content, "text/html", "UTF-8", baseUrl);
+ webkit_page_load_string(page, content, "text/html", "UTF-8", baseUrl);
}
-void webkit_gtk_page_stop_loading(WebKitGtkPage* page)
+void webkit_page_stop_loading(WebKitPage* page)
{
- WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);
- WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(pageData->mainFrame);
+ WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
+ WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame);
if (FrameLoader* loader = frameData->frame->loader())
loader->stopAllLoaders();
}
-WebKitGtkFrame* webkit_gtk_page_get_main_frame(WebKitGtkPage* page)
+WebKitFrame* webkit_page_get_main_frame(WebKitPage* page)
{
- WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);
+ WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
return pageData->mainFrame;
}
-void webkit_gtk_page_execute_script(WebKitGtkPage* page, const gchar* script)
+void webkit_page_execute_script(WebKitPage* page, const gchar* script)
{
- WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);
- WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(pageData->mainFrame);
+ WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
+ WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame);
if (FrameLoader* loader = frameData->frame->loader())
loader->executeScript(String::fromUTF8(script), true);
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef WEBKIT_GTK_PAGE_H
-#define WEBKIT_GTK_PAGE_H
+#ifndef WEBKIT_PAGE_H
+#define WEBKIT_PAGE_H
#include <gtk/gtk.h>
G_BEGIN_DECLS
-#define WEBKIT_GTK_TYPE_PAGE (webkit_gtk_page_get_type())
-#define WEBKIT_GTK_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_GTK_TYPE_PAGE, WebKitGtkPage))
-#define WEBKIT_GTK_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), WEBKIT_GTK_TYPE_PAGE, WebKitGtkPageClass))
-#define WEBKIT_GTK_IS_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_GTK_TYPE_PAGE))
-#define WEBKIT_GTK_IS_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_GTK_TYPE_PAGE))
-#define WEBKIT_GTK_PAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_GTK_TYPE_PAGE, WebKitGtkPageClass))
+#define WEBKIT_TYPE_PAGE (webkit_page_get_type())
+#define WEBKIT_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_PAGE, WebKitPage))
+#define WEBKIT_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), WEBKIT_TYPE_PAGE, WebKitPageClass))
+#define WEBKIT_IS_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_PAGE))
+#define WEBKIT_IS_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_TYPE_PAGE))
+#define WEBKIT_PAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_TYPE_PAGE, WebKitPageClass))
typedef enum {
- WEBKIT_GTK_ACCEPT_NAVIGATION_REQUEST,
- WEBKIT_GTK_IGNORE_NAVIGATION_REQUEST,
- WEBKIT_GTK_DOWNLOAD_NAVIGATION_REQUEST
-} WEBKIT_GTK_NAVIGATION_REQUEST_RESPONSE;
+ WEBKIT_ACCEPT_NAVIGATION_REQUEST,
+ WEBKIT_IGNORE_NAVIGATION_REQUEST,
+ WEBKIT_DOWNLOAD_NAVIGATION_REQUEST
+} WEBKIT_NAVIGATION_REQUEST_RESPONSE;
-struct _WebKitGtkPage {
+struct _WebKitPage {
GtkContainer parent;
};
-struct _WebKitGtkPageClass {
+struct _WebKitPageClass {
GtkContainerClass parent;
/*
* require someone doing a g_signal_stop_emission_by_name
* WebUIDelegate has nothing for create_frame, WebPolicyDelegate as well...
*/
- WebKitGtkPage* (*create_page) (WebKitGtkPage* page);
+ WebKitPage* (*create_page) (WebKitPage* page);
/*
* TODO: FIXME: Create something like WebPolicyDecisionListener_Protocol instead
*/
- WEBKIT_GTK_NAVIGATION_REQUEST_RESPONSE (*navigation_requested) (WebKitGtkPage* page, WebKitGtkFrame* frame, WebKitGtkNetworkRequest* request);
+ WEBKIT_NAVIGATION_REQUEST_RESPONSE (*navigation_requested) (WebKitPage* page, WebKitFrame* frame, WebKitNetworkRequest* request);
/*
* TODO: DISCUSS: Should these be signals as well?
*/
- gchar* (*choose_file) (WebKitGtkPage* page, WebKitGtkFrame* frame, const gchar* old_file);
- void (*java_script_alert) (WebKitGtkPage* page, WebKitGtkFrame* frame, const gchar* alert_message);
- gboolean (*java_script_confirm) (WebKitGtkPage* page, WebKitGtkFrame* frame, const gchar* confirm_message);
- gchar* (*java_script_prompt) (WebKitGtkPage* page, WebKitGtkFrame* frame, const gchar* message, const gchar* default_value);
- void (*java_script_console_message) (WebKitGtkPage*, const gchar* message, unsigned int line_number, const gchar* source_id);
+ gchar* (*choose_file) (WebKitPage* page, WebKitFrame* frame, const gchar* old_file);
+ void (*java_script_alert) (WebKitPage* page, WebKitFrame* frame, const gchar* alert_message);
+ gboolean (*java_script_confirm) (WebKitPage* page, WebKitFrame* frame, const gchar* confirm_message);
+ gchar* (*java_script_prompt) (WebKitPage* page, WebKitFrame* frame, const gchar* message, const gchar* default_value);
+ void (*java_script_console_message) (WebKitPage*, const gchar* message, unsigned int line_number, const gchar* source_id);
/*
* internal
*/
- void (*set_scroll_adjustments) (WebKitGtkPage*, GtkAdjustment*, GtkAdjustment*);
+ void (*set_scroll_adjustments) (WebKitPage*, GtkAdjustment*, GtkAdjustment*);
};
-WEBKIT_GTK_API GType
-webkit_gtk_page_get_type (void);
+WEBKIT_API GType
+webkit_page_get_type (void);
-WEBKIT_GTK_API GtkWidget*
-webkit_gtk_page_new (void);
+WEBKIT_API GtkWidget*
+webkit_page_new (void);
-WEBKIT_GTK_API void
-webkit_gtk_page_set_settings (WebKitGtkPage* page, WebKitGtkSettings* settings);
+WEBKIT_API void
+webkit_page_set_settings (WebKitPage* page, WebKitSettings* settings);
-WEBKIT_GTK_API WebKitGtkSettings*
-webkit_gtk_page_get_settings (WebKitGtkPage* page);
+WEBKIT_API WebKitSettings*
+webkit_page_get_settings (WebKitPage* page);
-WEBKIT_GTK_API gboolean
-webkit_gtk_page_can_cut (WebKitGtkPage* page);
+WEBKIT_API gboolean
+webkit_page_can_cut (WebKitPage* page);
-WEBKIT_GTK_API gboolean
-webkit_gtk_page_can_copy (WebKitGtkPage* page);
+WEBKIT_API gboolean
+webkit_page_can_copy (WebKitPage* page);
-WEBKIT_GTK_API gboolean
-webkit_gtk_page_can_paste (WebKitGtkPage* page);
+WEBKIT_API gboolean
+webkit_page_can_paste (WebKitPage* page);
-WEBKIT_GTK_API void
-webkit_gtk_page_cut (WebKitGtkPage* page);
+WEBKIT_API void
+webkit_page_cut (WebKitPage* page);
-WEBKIT_GTK_API void
-webkit_gtk_page_copy (WebKitGtkPage* page);
+WEBKIT_API void
+webkit_page_copy (WebKitPage* page);
-WEBKIT_GTK_API void
-webkit_gtk_page_paste (WebKitGtkPage* page);
+WEBKIT_API void
+webkit_page_paste (WebKitPage* page);
-WEBKIT_GTK_API gboolean
-webkit_gtk_page_can_go_backward (WebKitGtkPage* page);
+WEBKIT_API gboolean
+webkit_page_can_go_backward (WebKitPage* page);
-WEBKIT_GTK_API gboolean
-webkit_gtk_page_can_go_forward (WebKitGtkPage* page);
+WEBKIT_API gboolean
+webkit_page_can_go_forward (WebKitPage* page);
-WEBKIT_GTK_API void
-webkit_gtk_page_go_backward (WebKitGtkPage* page);
+WEBKIT_API void
+webkit_page_go_backward (WebKitPage* page);
-WEBKIT_GTK_API void
-webkit_gtk_page_go_forward (WebKitGtkPage* page);
+WEBKIT_API void
+webkit_page_go_forward (WebKitPage* page);
-WEBKIT_GTK_API void
-webkit_gtk_page_stop_loading (WebKitGtkPage* page);
+WEBKIT_API void
+webkit_page_stop_loading (WebKitPage* page);
-WEBKIT_GTK_API void
-webkit_gtk_page_open (WebKitGtkPage* page, const gchar* url);
+WEBKIT_API void
+webkit_page_open (WebKitPage* page, const gchar* url);
-WEBKIT_GTK_API void
-webkit_gtk_page_reload (WebKitGtkPage *page);
+WEBKIT_API void
+webkit_page_reload (WebKitPage *page);
-WEBKIT_GTK_API void
-webkit_gtk_page_load_string (WebKitGtkPage* page, const gchar* content, const gchar* content_mime_type, const gchar* content_encoding, const gchar* base_url);
+WEBKIT_API void
+webkit_page_load_string (WebKitPage* page, const gchar* content, const gchar* content_mime_type, const gchar* content_encoding, const gchar* base_url);
-WEBKIT_GTK_API void
-webkit_gtk_page_load_html_string (WebKitGtkPage* page, const gchar* content, const gchar* base_url);
+WEBKIT_API void
+webkit_page_load_html_string (WebKitPage* page, const gchar* content, const gchar* base_url);
-WEBKIT_GTK_API WebKitGtkFrame*
-webkit_gtk_page_get_main_frame (WebKitGtkPage* page);
+WEBKIT_API WebKitFrame*
+webkit_page_get_main_frame (WebKitPage* page);
-WEBKIT_GTK_API void
-webkit_gtk_page_execute_script(WebKitGtkPage* page, const gchar* script);
+WEBKIT_API void
+webkit_page_execute_script(WebKitPage* page, const gchar* script);
G_END_DECLS
#endif
using namespace WebCore;
namespace WebKit {
-void apply(WebKitGtkSettings*, WebCore::Settings*)
+void apply(WebKitSettings*, WebCore::Settings*)
{
notImplemented();
}
-WebKitGtkSettings* create(WebCore::Settings*)
+WebKitSettings* create(WebCore::Settings*)
{
notImplemented();
return 0;
}
-WebKitGtkFrame* getFrameFromPage(WebKitGtkPage* page)
+WebKitFrame* getFrameFromPage(WebKitPage* page)
{
- return webkit_gtk_page_get_main_frame(page);
+ return webkit_page_get_main_frame(page);
}
-WebKitGtkPage* getPageFromFrame(WebKitGtkFrame* frame)
+WebKitPage* getPageFromFrame(WebKitFrame* frame)
{
- return webkit_gtk_frame_get_page(frame);
+ return webkit_frame_get_page(frame);
}
-WebCore::Frame* core(WebKitGtkFrame* frame)
+WebCore::Frame* core(WebKitFrame* frame)
{
- WebKitGtkFramePrivate* frame_data = WEBKIT_GTK_FRAME_GET_PRIVATE(frame);
+ WebKitFramePrivate* frame_data = WEBKIT_FRAME_GET_PRIVATE(frame);
return frame_data->frame;
}
-WebKitGtkFrame* kit(WebCore::Frame* coreFrame)
+WebKitFrame* kit(WebCore::Frame* coreFrame)
{
WebKit::FrameLoaderClient* client = static_cast<WebKit::FrameLoaderClient*>(coreFrame->loader()->client());
return client->webFrame();
}
-WebCore::Page* core(WebKitGtkPage* page)
+WebCore::Page* core(WebKitPage* page)
{
- WebKitGtkPagePrivate* page_data = WEBKIT_GTK_PAGE_GET_PRIVATE(page);
+ WebKitPagePrivate* page_data = WEBKIT_PAGE_GET_PRIVATE(page);
return page_data->page;
}
-WebKitGtkPage* kit(WebCore::Page* page)
+WebKitPage* kit(WebCore::Page* page)
{
WebKit::ChromeClient* client = static_cast<WebKit::ChromeClient*>(page->chrome()->client());
return client->webPage();
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef WEBKIT_GTK_PRIVATE_H
-#define WEBKIT_GTK_PRIVATE_H
+#ifndef WEBKIT_PRIVATE_H
+#define WEBKIT_PRIVATE_H
/*
- * Internal class. This class knows the shared secret of WebKitGtkFrame,
- * WebKitGtkNetworkRequest and WebKitGtkPage.
+ * Internal class. This class knows the shared secret of WebKitFrame,
+ * WebKitNetworkRequest and WebKitPage.
* They are using WebCore which musn't be exposed to the outer world.
*/
#include "FrameLoaderClient.h"
namespace WebKit {
- void apply(WebKitGtkSettings*,WebCore::Settings*);
- WebKitGtkSettings* create(WebCore::Settings*);
- WebKitGtkFrame* getFrameFromPage(WebKitGtkPage*);
- WebKitGtkPage* getPageFromFrame(WebKitGtkFrame*);
+ void apply(WebKitSettings*,WebCore::Settings*);
+ WebKitSettings* create(WebCore::Settings*);
+ WebKitFrame* getFrameFromPage(WebKitPage*);
+ WebKitPage* getPageFromFrame(WebKitFrame*);
- WebCore::Frame* core(WebKitGtkFrame*);
- WebKitGtkFrame* kit(WebCore::Frame*);
- WebCore::Page* core(WebKitGtkPage*);
- WebKitGtkPage* kit(WebCore::Page*);
+ WebCore::Frame* core(WebKitFrame*);
+ WebKitFrame* kit(WebCore::Frame*);
+ WebCore::Page* core(WebKitPage*);
+ WebKitPage* kit(WebCore::Page*);
}
extern "C" {
- #define WEBKIT_GTK_PAGE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_GTK_TYPE_PAGE, WebKitGtkPagePrivate))
- typedef struct _WebKitGtkPagePrivate WebKitGtkPagePrivate;
- struct _WebKitGtkPagePrivate {
+ #define WEBKIT_PAGE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_PAGE, WebKitPagePrivate))
+ typedef struct _WebKitPagePrivate WebKitPagePrivate;
+ struct _WebKitPagePrivate {
WebCore::Page* page;
WebCore::Settings* settings;
- WebKitGtkFrame* mainFrame;
+ WebKitFrame* mainFrame;
WebCore::String applicationNameForUserAgent;
WebCore::String* userAgent;
HashSet<GtkWidget*> children;
};
- #define WEBKIT_GTK_FRAME_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_GTK_TYPE_FRAME, WebKitGtkFramePrivate))
- typedef struct _WebKitGtkFramePrivate WebKitGtkFramePrivate;
- struct _WebKitGtkFramePrivate {
+ #define WEBKIT_FRAME_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_FRAME, WebKitFramePrivate))
+ typedef struct _WebKitFramePrivate WebKitFramePrivate;
+ struct _WebKitFramePrivate {
WebCore::Frame* frame;
WebCore::FrameLoaderClient* client;
- WebKitGtkPage* page;
+ WebKitPage* page;
gchar* title;
gchar* location;
};
- GObject* webkit_gtk_frame_init_with_page(WebKitGtkPage*, WebCore::HTMLFrameOwnerElement*);
+ GObject* webkit_frame_init_with_page(WebKitPage*, WebCore::HTMLFrameOwnerElement*);
}
#endif
#include "webkitgtksettings.h"
extern "C" {
-GType webkit_gtk_web_settings_get_type(void)
+GType webkit_web_settings_get_type(void)
{
}
-WebKitGtkSettings* webkit_gtk_web_settings_copy(WebKitGtkSettings* setting)
+WebKitSettings* webkit_web_settings_copy(WebKitSettings* setting)
{
}
-void webkit_gtk_web_settings_free(WebKitGtkSettings* setting)
+void webkit_web_settings_free(WebKitSettings* setting)
{
}
-WebKitGtkSettings* webkit_gtk_web_settings_get_global(void)
+WebKitSettings* webkit_web_settings_get_global(void)
{
}
-void webkit_gtk_web_settings_set_global (WebKitGtkSettings* setting)
+void webkit_web_settings_set_global (WebKitSettings* setting)
{
}
-void webkit_gtk_web_settings_set_font_family(WebKitGtkSettings*, WebKitGtkFontFamily family, gchar* family_name)
+void webkit_web_settings_set_font_family(WebKitSettings*, WebKitFontFamily family, gchar* family_name)
{
}
-gchar* webkit_gtk_web_settings_get_font_family(WebKitGtkSettings*, WebKitGtkFontFamily family)
+gchar* webkit_web_settings_get_font_family(WebKitSettings*, WebKitFontFamily family)
{
}
-void webkit_gtk_web_settings_set_user_style_sheet_location(WebKitGtkSettings*, gchar*)
+void webkit_web_settings_set_user_style_sheet_location(WebKitSettings*, gchar*)
{
}
-void webkit_gtk_set_ftp_directory_template_path(WebKitGtkSettings*, gchar*)
+void webkit_set_ftp_directory_template_path(WebKitSettings*, gchar*)
{
}
}
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef WEBKIT_GTK_SETTINGS_H
-#define WEBKIT_GTK_SETTINGS_H
+#ifndef WEBKIT_SETTINGS_H
+#define WEBKIT_SETTINGS_H
#include <glib.h>
#include <glib-object.h>
G_BEGIN_DECLS
typedef enum {
- WEBKIT_GTK_FONT_FAMILY_STANDARD,
- WEBKIT_GTK_FONT_FAMILY_FIXED,
- WEBKIT_GTK_FONT_FAMILY_SERIF,
- WEBKIT_GTK_FONT_FAMILY_SANS_SERIF,
- WEBKIT_GTK_FONT_FAMILY_CURSIVE,
- WEBKIT_GTK_FONT_FAMILY_FANTASY,
- WEBKIT_GTK_FONT_FAMILY_LAST_ENTRY
-} WebKitGtkFontFamily;
+ WEBKIT_FONT_FAMILY_STANDARD,
+ WEBKIT_FONT_FAMILY_FIXED,
+ WEBKIT_FONT_FAMILY_SERIF,
+ WEBKIT_FONT_FAMILY_SANS_SERIF,
+ WEBKIT_FONT_FAMILY_CURSIVE,
+ WEBKIT_FONT_FAMILY_FANTASY,
+ WEBKIT_FONT_FAMILY_LAST_ENTRY
+} WebKitFontFamily;
typedef enum {
- WEBKIT_GTK_EDITABLE_LINK_DEFAULT_BEHAVIOUR,
- WEBKIT_GTK_EDITABLE_LINK_ALWAYS_LIVE,
- WEBKIT_GTK_EDITABLE_LINK_ONLY_WITH_SHIFT_KEY,
- WEBKIT_GTK_EDITABLE_LINK_LIVE_WHEN_NOT_FOCUSED,
- WEBKIT_GTK_EDITABLE_LINK_NEVER_LIVE
-} WebKitGtkEditableLinkBehaviour;
-
-typedef struct _WebKitGtkSettings WebKitGtkSettings;
-typedef struct _WebKitGtkSettingsPrivate WebKitGtkSettingsPrivate;
-
-struct _WebKitGtkSettings {
- gchar* font_name[WEBKIT_GTK_FONT_FAMILY_LAST_ENTRY];
+ WEBKIT_EDITABLE_LINK_DEFAULT_BEHAVIOUR,
+ WEBKIT_EDITABLE_LINK_ALWAYS_LIVE,
+ WEBKIT_EDITABLE_LINK_ONLY_WITH_SHIFT_KEY,
+ WEBKIT_EDITABLE_LINK_LIVE_WHEN_NOT_FOCUSED,
+ WEBKIT_EDITABLE_LINK_NEVER_LIVE
+} WebKitEditableLinkBehaviour;
+
+typedef struct _WebKitSettings WebKitSettings;
+typedef struct _WebKitSettingsPrivate WebKitSettingsPrivate;
+
+struct _WebKitSettings {
+ gchar* font_name[WEBKIT_FONT_FAMILY_LAST_ENTRY];
gint minimum_font_size;
gint minimum_logical_font_size;
gint default_font_size;
gchar* user_style_sheet_location;
gboolean should_print_backgrounds;
gboolean text_areas_are_resizable;
- WebKitGtkEditableLinkBehaviour editable_link_behaviour;
+ WebKitEditableLinkBehaviour editable_link_behaviour;
gboolean uses_page_cache;
gboolean shrink_standalone_images_to_fit;
gboolean show_urls_in_tool_tips;
gboolean developer_extras_enabled;
- WebKitGtkSettingsPrivate *private_data;
+ WebKitSettingsPrivate *private_data;
};
GType
-webkit_gtk_web_settings_get_type (void);
+webkit_web_settings_get_type (void);
-WebKitGtkSettings*
-webkit_gtk_web_settings_copy (WebKitGtkSettings* setting);
+WebKitSettings*
+webkit_web_settings_copy (WebKitSettings* setting);
void
-webkit_gtk_web_settings_free (WebKitGtkSettings* setting);
+webkit_web_settings_free (WebKitSettings* setting);
-WebKitGtkSettings*
-webkit_gtk_web_settings_get_global (void);
+WebKitSettings*
+webkit_web_settings_get_global (void);
void
-webkit_gtk_web_settings_set_global (WebKitGtkSettings* setting);
+webkit_web_settings_set_global (WebKitSettings* setting);
void
-webkit_gtk_web_settings_set_font_family(WebKitGtkSettings*, WebKitGtkFontFamily family, gchar *family_name);
+webkit_web_settings_set_font_family(WebKitSettings*, WebKitFontFamily family, gchar *family_name);
gchar*
-webkit_gtk_web_settings_get_font_family(WebKitGtkSettings*, WebKitGtkFontFamily family);
+webkit_web_settings_get_font_family(WebKitSettings*, WebKitFontFamily family);
void
-webkit_gtk_web_settings_set_user_style_sheet_location(WebKitGtkSettings*, gchar*);
+webkit_web_settings_set_user_style_sheet_location(WebKitSettings*, gchar*);
void
-webkit_gtk_set_ftp_directory_template_path(WebKitGtkSettings*, gchar*);
+webkit_set_ftp_directory_template_path(WebKitSettings*, gchar*);
G_END_DECLS
+2007-10-03 Alp Toker <alp@atoker.com>
+
+ Reviewed by Adam.
+
+ http://bugs.webkit.org/show_bug.cgi?id=14726
+ [gtk] API design. Mapping the WebView delegates to signals.
+
+ Change the API namespace of the Gtk+ port from 'WebKitGtk' to 'WebKit'.
+
+ * Api/webkitgtkdefines.h:
+ * Api/webkitgtkframe.cpp:
+ * Api/webkitgtkframe.h:
+ * Api/webkitgtkglobal.cpp:
+ * Api/webkitgtkglobal.h:
+ * Api/webkitgtknetworkrequest.h:
+ * Api/webkitgtkpage.cpp:
+ * Api/webkitgtkpage.h:
+ * Api/webkitgtkprivate.cpp:
+ (WebKit::apply):
+ (WebKit::create):
+ (WebKit::getFrameFromPage):
+ (WebKit::getPageFromFrame):
+ (WebKit::core):
+ (WebKit::kit):
+ * Api/webkitgtkprivate.h:
+ * Api/webkitgtksettings.cpp:
+ * Api/webkitgtksettings.h:
+ * WebCoreSupport/ChromeClientGtk.cpp:
+ (WebKit::ChromeClient::ChromeClient):
+ (WebKit::ChromeClient::createWindow):
+ (WebKit::ChromeClient::addMessageToConsole):
+ (WebKit::ChromeClient::runJavaScriptAlert):
+ (WebKit::ChromeClient::runJavaScriptConfirm):
+ (WebKit::ChromeClient::runJavaScriptPrompt):
+ * WebCoreSupport/ChromeClientGtk.h:
+ (WebKit::ChromeClient::webPage):
+ * WebCoreSupport/EditorClientGtk.cpp:
+ (WebKit::EditorClient::EditorClient):
+ * WebCoreSupport/EditorClientGtk.h:
+ * WebCoreSupport/FrameLoaderClientGtk.cpp:
+ (WebKit::FrameLoaderClient::FrameLoaderClient):
+ (WebKit::FrameLoaderClient::postProgressStartedNotification):
+ (WebKit::FrameLoaderClient::postProgressEstimateChangedNotification):
+ (WebKit::FrameLoaderClient::postProgressFinishedNotification):
+ (WebKit::FrameLoaderClient::createFrame):
+ (WebKit::FrameLoaderClient::dispatchDidReceiveIcon):
+ (WebKit::FrameLoaderClient::setTitle):
+ * WebCoreSupport/FrameLoaderClientGtk.h:
+ (WebKit::FrameLoaderClient::webFrame):
+
2007-10-02 Cosimo Cecchi <cosimoc@svn.gnome.org>
Reviewed by Mark.
using namespace WebCore;
namespace WebKit {
-ChromeClient::ChromeClient(WebKitGtkPage* page)
+ChromeClient::ChromeClient(WebKitPage* page)
: m_webPage(page)
, m_didSendLinkSignal(false)
{
Page* ChromeClient::createWindow(Frame*, const FrameLoadRequest&)
{
/* TODO: FrameLoadRequest is not used */
- WebKitGtkPage* page = WEBKIT_GTK_PAGE_GET_CLASS(m_webPage)->create_page(m_webPage);
+ WebKitPage* page = WEBKIT_PAGE_GET_CLASS(m_webPage)->create_page(m_webPage);
if (!page)
return 0;
- WebKitGtkPagePrivate *privateData = WEBKIT_GTK_PAGE_GET_PRIVATE(WEBKIT_GTK_PAGE(page));
+ WebKitPagePrivate *privateData = WEBKIT_PAGE_GET_PRIVATE(WEBKIT_PAGE(page));
return privateData->page;
}
CString messageString = message.utf8();
CString sourceIdString = sourceId.utf8();
- WEBKIT_GTK_PAGE_GET_CLASS(m_webPage)->java_script_console_message(m_webPage, messageString.data(), lineNumber, sourceIdString.data());
+ WEBKIT_PAGE_GET_CLASS(m_webPage)->java_script_console_message(m_webPage, messageString.data(), lineNumber, sourceIdString.data());
}
void ChromeClient::runJavaScriptAlert(Frame* frame, const String& message)
{
CString messageString = message.utf8();
- WEBKIT_GTK_PAGE_GET_CLASS(m_webPage)->java_script_alert(m_webPage, kit(frame), messageString.data());
+ WEBKIT_PAGE_GET_CLASS(m_webPage)->java_script_alert(m_webPage, kit(frame), messageString.data());
}
bool ChromeClient::runJavaScriptConfirm(Frame* frame, const String& message)
{
CString messageString = message.utf8();
- return WEBKIT_GTK_PAGE_GET_CLASS(m_webPage)->java_script_confirm(m_webPage, kit(frame), messageString.data());
+ return WEBKIT_PAGE_GET_CLASS(m_webPage)->java_script_confirm(m_webPage, kit(frame), messageString.data());
}
bool ChromeClient::runJavaScriptPrompt(Frame* frame, const String& message, const String& defaultValue, String& result)
CString messageString = message.utf8();
CString defaultValueString = defaultValue.utf8();
- gchar* cresult = WEBKIT_GTK_PAGE_GET_CLASS(m_webPage)->java_script_prompt(m_webPage,
+ gchar* cresult = WEBKIT_PAGE_GET_CLASS(m_webPage)->java_script_prompt(m_webPage,
kit(frame),
messageString.data(),
defaultValueString.data());
#include "ChromeClient.h"
-typedef struct _WebKitGtkPage WebKitGtkPage;
+typedef struct _WebKitPage WebKitPage;
namespace WebKit {
class ChromeClient : public WebCore::ChromeClient {
public:
- ChromeClient(WebKitGtkPage*);
- WebKitGtkPage* webPage() const { return m_webPage; }
+ ChromeClient(WebKitPage*);
+ WebKitPage* webPage() const { return m_webPage; }
virtual void chromeDestroyed();
virtual void print(WebCore::Frame*);
private:
- WebKitGtkPage* m_webPage;
+ WebKitPage* m_webPage;
bool m_didSendLinkSignal;
};
}
notImplemented();
}
-EditorClient::EditorClient(WebKitGtkPage* page)
+EditorClient::EditorClient(WebKitPage* page)
: m_page(page)
{
}
#include <wtf/Forward.h>
-typedef struct _WebKitGtkPage WebKitGtkPage;
+typedef struct _WebKitPage WebKitPage;
namespace WebCore {
class Page;
class EditorClient : public WebCore::EditorClient {
public:
- EditorClient(WebKitGtkPage*);
+ EditorClient(WebKitPage*);
// from EditorClient
virtual void pageDestroyed();
virtual void setInputMethodState(bool enabled);
private:
- WebKitGtkPage* m_page;
+ WebKitPage* m_page;
};
}
namespace WebKit {
-FrameLoaderClient::FrameLoaderClient(WebKitGtkFrame* frame)
+FrameLoaderClient::FrameLoaderClient(WebKitFrame* frame)
: m_frame(frame)
, m_firstData(false)
{
void FrameLoaderClient::postProgressStartedNotification()
{
- WebKitGtkPage* page = getPageFromFrame(m_frame);
+ WebKitPage* page = getPageFromFrame(m_frame);
g_signal_emit_by_name(page, "load_started", m_frame);
}
void FrameLoaderClient::postProgressEstimateChangedNotification()
{
- WebKitGtkPage* kitPage = getPageFromFrame(m_frame);
+ WebKitPage* kitPage = getPageFromFrame(m_frame);
Page* corePage = core(kitPage);
g_signal_emit_by_name(kitPage, "load_progress_changed", lround(corePage->progress()->estimatedProgress()*100));
void FrameLoaderClient::postProgressFinishedNotification()
{
- WebKitGtkPage* page = getPageFromFrame(m_frame);
+ WebKitPage* page = getPageFromFrame(m_frame);
g_signal_emit_by_name(page, "load_finished", m_frame);
}
Frame* coreFrame = core(webFrame());
ASSERT(core(getPageFromFrame(webFrame())) == coreFrame->page());
- WebKitGtkFrame* gtkFrame = WEBKIT_GTK_FRAME(webkit_gtk_frame_init_with_page(getPageFromFrame(webFrame()), ownerElement));
+ WebKitFrame* gtkFrame = WEBKIT_FRAME(webkit_frame_init_with_page(getPageFromFrame(webFrame()), ownerElement));
Frame* childFrame = core(gtkFrame);
coreFrame->tree()->appendChild(childFrame);
void FrameLoaderClient::dispatchDidReceiveIcon()
{
- WebKitGtkPage* page = getPageFromFrame(m_frame);
+ WebKitPage* page = getPageFromFrame(m_frame);
g_signal_emit_by_name(page, "icon_loaded", m_frame);
}
void FrameLoaderClient::setTitle(const String& title, const KURL& url)
{
- WebKitGtkPage* page = getPageFromFrame(m_frame);
+ WebKitPage* page = getPageFromFrame(m_frame);
CString titleString = title.utf8();
DeprecatedCString urlString = url.prettyURL().utf8();
g_signal_emit_by_name(m_frame, "title_changed", titleString.data(), urlString.data());
- if (m_frame == webkit_gtk_page_get_main_frame(page))
+ if (m_frame == webkit_page_get_main_frame(page))
g_signal_emit_by_name(page, "title_changed", titleString.data(), urlString.data());
}
#include "FrameLoaderClient.h"
#include "ResourceResponse.h"
-typedef struct _WebKitGtkFrame WebKitGtkFrame;
+typedef struct _WebKitFrame WebKitFrame;
namespace WebKit {
class FrameLoaderClient : public WebCore::FrameLoaderClient {
public:
- FrameLoaderClient(WebKitGtkFrame*);
+ FrameLoaderClient(WebKitFrame*);
virtual ~FrameLoaderClient() { }
virtual void frameLoaderDestroyed();
- WebKitGtkFrame* webFrame() const { return m_frame; }
+ WebKitFrame* webFrame() const { return m_frame; }
virtual bool hasWebView() const;
virtual bool hasFrameView() const;
virtual bool canCachePage() const;
virtual void download(WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
private:
- WebKitGtkFrame* m_frame;
+ WebKitFrame* m_frame;
WebCore::ResourceResponse m_response;
bool m_firstData;
};
+2007-10-03 Alp Toker <alp@atoker.com>
+
+ Reviewed by Adam.
+
+ http://bugs.webkit.org/show_bug.cgi?id=14726
+ [gtk] API design. Mapping the WebView delegates to signals.
+
+ Change the API namespace of the Gtk+ port from 'WebKitGtk' to 'WebKit'.
+
+ * GtkLauncher/main.cpp:
+ (goToURLBarText):
+ (titleChanged):
+ (progressChanged):
+ (menuMainBackCallback):
+ (menuMainForwardCallback):
+ (main):
+
2007-10-03 Lars Knoll <lars@trolltech.com>
Reviewed by Rob.
static GtkWidget* gURLBarEntry;
static GtkWidget* gTopLevelWindow;
-static WebKitGtkPage* gPage;
+static WebKitPage* gPage;
static gchar* gTitle;
static gint gProgress;
return;
gchar* parsedURL = autocorrectURL(url);
- webkit_gtk_page_open(gPage, parsedURL);
+ webkit_page_open(gPage, parsedURL);
g_free(parsedURL);
}
g_free(title);
}
-static void titleChanged(WebKitGtkPage*, const gchar* title, const gchar* url, WebKitGtkPage*)
+static void titleChanged(WebKitPage*, const gchar* title, const gchar* url, WebKitPage*)
{
gtk_entry_set_text(GTK_ENTRY(gURLBarEntry), url);
updateWindowTitle();
}
-static void progressChanged(WebKitGtkPage*, gint progress, WebKitGtkPage*)
+static void progressChanged(WebKitPage*, gint progress, WebKitPage*)
{
gProgress = progress;
updateWindowTitle();
static void menuMainBackCallback(gpointer data)
{
g_assert(!data);
- webkit_gtk_page_go_backward(gPage);
+ webkit_page_go_backward(gPage);
}
static void menuMainForwardCallback(gpointer data)
{
g_assert(!data);
- webkit_gtk_page_go_forward(gPage);
+ webkit_page_go_forward(gPage);
}
static void menuMainQuitCallback(gpointer)
int main(int argc, char* argv[])
{
gtk_init(&argc, &argv);
- webkit_gtk_init();
+ webkit_init();
gchar* url = "http://www.google.com";
bool exitAfterLoading = false;
GtkWidget* scrolledWindow = gtk_scrolled_window_new(NULL,NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledWindow),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gPage = WEBKIT_GTK_PAGE(webkit_gtk_page_new());
+ gPage = WEBKIT_PAGE(webkit_page_new());
gtk_container_add(GTK_CONTAINER(scrolledWindow), GTK_WIDGET(gPage));
gtk_box_pack_start(GTK_BOX(vbox), scrolledWindow, TRUE, TRUE, 0);
g_signal_connect(gPage, "title-changed", G_CALLBACK(titleChanged), gPage);
g_signal_connect(gPage, "load-progress-changed", G_CALLBACK(progressChanged), gPage);
- webkit_gtk_page_open(gPage, url);
+ webkit_page_open(gPage, url);
gtk_widget_show_all(gTopLevelWindow);
gtk_main();
git://git.webkit.org / WebKit-https.git / commitdiff