Changeset 26022 in webkit
- Timestamp:
- Oct 3, 2007 10:25:43 AM (17 years ago)
- Location:
- trunk
- Files:
-
- 23 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r26021 r26022 1 2007-10-03 Alp Toker <alp@atoker.com> 2 3 Reviewed by Adam. 4 5 http://bugs.webkit.org/show_bug.cgi?id=14726 6 [gtk] API design. Mapping the WebView delegates to signals. 7 8 Change the API namespace of the Gtk+ port from 'WebKitGtk' to 'WebKit'. 9 10 * WebCore.pro: 11 1 12 2007-10-03 Alp Toker <alp@atoker.com> 2 13 -
trunk/WebCore/WebCore.pro
r25969 r26022 1545 1545 1546 1546 GENMARSHALS = ../WebKit/gtk/Api/webkitgtk-marshal.list 1547 GENMARSHALS_PREFIX = webkit_ gtk_marshal1547 GENMARSHALS_PREFIX = webkit_marshal 1548 1548 1549 1549 # -
trunk/WebKit/gtk/Api/webkitgtkdefines.h
r25647 r26022 27 27 */ 28 28 29 #ifndef WEBKIT_ GTK_DEFINES_H30 #define WEBKIT_ GTK_DEFINES_H29 #ifndef WEBKIT_DEFINES_H 30 #define WEBKIT_DEFINES_H 31 31 32 32 #include <glib.h> 33 33 34 typedef struct _WebKit GtkFrame WebKitGtkFrame;35 typedef struct _WebKit GtkFrameClass WebKitGtkFrameClass;34 typedef struct _WebKitFrame WebKitFrame; 35 typedef struct _WebKitFrameClass WebKitFrameClass; 36 36 37 typedef struct _WebKit GtkFrameData WebKitGtkFrameData;38 typedef struct _WebKit GtkNetworkRequest WebKitGtkNetworkRequest;37 typedef struct _WebKitFrameData WebKitFrameData; 38 typedef struct _WebKitNetworkRequest WebKitNetworkRequest; 39 39 40 typedef struct _WebKit GtkPage WebKitGtkPage;41 typedef struct _WebKit GtkPageClass WebKitGtkPageClass;40 typedef struct _WebKitPage WebKitPage; 41 typedef struct _WebKitPageClass WebKitPageClass; 42 42 43 43 #ifdef G_OS_WIN32 44 44 #ifdef BUILDING_WEBKIT 45 #define WEBKIT_ GTK_API __declspec(dllexport)45 #define WEBKIT_API __declspec(dllexport) 46 46 #else 47 #define WEBKIT_ GTK_API __declspec(dllimport)47 #define WEBKIT_API __declspec(dllimport) 48 48 #endif 49 49 #else 50 #define WEBKIT_ GTK_API __attribute__((visibility("default")))50 #define WEBKIT_API __attribute__((visibility("default"))) 51 51 #endif 52 52 53 #ifndef WEBKIT_ GTK_API54 #define WEBKIT_ GTK_API53 #ifndef WEBKIT_API 54 #define WEBKIT_API 55 55 #endif 56 56 -
trunk/WebKit/gtk/Api/webkitgtkframe.cpp
r25593 r26022 41 41 extern "C" { 42 42 43 extern void webkit_ gtk_marshal_VOID__STRING_STRING (GClosure* closure,43 extern void webkit_marshal_VOID__STRING_STRING (GClosure* closure, 44 44 GValue* return_value, 45 45 guint n_param_values, … … 56 56 }; 57 57 58 static guint webkit_ gtk_frame_signals[LAST_SIGNAL] = { 0, };59 60 static void webkit_ gtk_frame_real_title_changed(WebKitGtkFrame* frame, gchar* title, gchar* location);61 62 G_DEFINE_TYPE(WebKit GtkFrame, webkit_gtk_frame, G_TYPE_OBJECT)63 64 static void webkit_ gtk_frame_finalize(GObject* object)65 { 66 WebKit GtkFramePrivate* privateData = WEBKIT_GTK_FRAME_GET_PRIVATE(WEBKIT_GTK_FRAME(object));58 static guint webkit_frame_signals[LAST_SIGNAL] = { 0, }; 59 60 static void webkit_frame_real_title_changed(WebKitFrame* frame, gchar* title, gchar* location); 61 62 G_DEFINE_TYPE(WebKitFrame, webkit_frame, G_TYPE_OBJECT) 63 64 static void webkit_frame_finalize(GObject* object) 65 { 66 WebKitFramePrivate* privateData = WEBKIT_FRAME_GET_PRIVATE(WEBKIT_FRAME(object)); 67 67 privateData->frame->loader()->cancelAndClear(); 68 68 g_free(privateData->title); … … 70 70 delete privateData->frame; 71 71 72 G_OBJECT_CLASS(webkit_ gtk_frame_parent_class)->finalize(object);73 } 74 75 static void webkit_ gtk_frame_class_init(WebKitGtkFrameClass* frameClass)76 { 77 g_type_class_add_private(frameClass, sizeof(WebKit GtkFramePrivate));72 G_OBJECT_CLASS(webkit_frame_parent_class)->finalize(object); 73 } 74 75 static void webkit_frame_class_init(WebKitFrameClass* frameClass) 76 { 77 g_type_class_add_private(frameClass, sizeof(WebKitFramePrivate)); 78 78 79 79 /* 80 80 * signals 81 81 */ 82 webkit_ gtk_frame_signals[CLEARED] = g_signal_new("cleared",82 webkit_frame_signals[CLEARED] = g_signal_new("cleared", 83 83 G_TYPE_FROM_CLASS(frameClass), 84 84 (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), … … 89 89 G_TYPE_NONE, 0); 90 90 91 webkit_ gtk_frame_signals[LOAD_DONE] = g_signal_new("load_done",91 webkit_frame_signals[LOAD_DONE] = g_signal_new("load_done", 92 92 G_TYPE_FROM_CLASS(frameClass), 93 93 (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), … … 99 99 G_TYPE_BOOLEAN); 100 100 101 webkit_ gtk_frame_signals[TITLE_CHANGED] = g_signal_new("title_changed",102 G_TYPE_FROM_CLASS(frameClass), 103 (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), 104 G_STRUCT_OFFSET(WebKit GtkFrameClass, title_changed),105 NULL, 106 NULL, 107 webkit_ gtk_marshal_VOID__STRING_STRING,101 webkit_frame_signals[TITLE_CHANGED] = g_signal_new("title_changed", 102 G_TYPE_FROM_CLASS(frameClass), 103 (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), 104 G_STRUCT_OFFSET(WebKitFrameClass, title_changed), 105 NULL, 106 NULL, 107 webkit_marshal_VOID__STRING_STRING, 108 108 G_TYPE_NONE, 2, 109 109 G_TYPE_STRING, G_TYPE_STRING); 110 110 111 webkit_ gtk_frame_signals[HOVERING_OVER_LINK] = g_signal_new("hovering_over_link",111 webkit_frame_signals[HOVERING_OVER_LINK] = g_signal_new("hovering_over_link", 112 112 G_TYPE_FROM_CLASS(frameClass), 113 113 (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), … … 115 115 NULL, 116 116 NULL, 117 webkit_ gtk_marshal_VOID__STRING_STRING,117 webkit_marshal_VOID__STRING_STRING, 118 118 G_TYPE_NONE, 2, 119 119 G_TYPE_STRING, G_TYPE_STRING); 120 120 121 frameClass->title_changed = webkit_ gtk_frame_real_title_changed;121 frameClass->title_changed = webkit_frame_real_title_changed; 122 122 123 123 /* 124 124 * implementations of virtual methods 125 125 */ 126 G_OBJECT_CLASS(frameClass)->finalize = webkit_ gtk_frame_finalize;127 } 128 129 static void webkit_ gtk_frame_real_title_changed(WebKitGtkFrame* frame, gchar* title, gchar* location)130 { 131 WebKit GtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(frame);126 G_OBJECT_CLASS(frameClass)->finalize = webkit_frame_finalize; 127 } 128 129 static void webkit_frame_real_title_changed(WebKitFrame* frame, gchar* title, gchar* location) 130 { 131 WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(frame); 132 132 g_free(frameData->title); 133 133 g_free(frameData->location); … … 136 136 } 137 137 138 static void webkit_ gtk_frame_init(WebKitGtkFrame* frame)139 { 140 } 141 142 GObject* webkit_ gtk_frame_new(WebKitGtkPage* page)143 { 144 WebKit GtkFrame* frame = WEBKIT_GTK_FRAME(g_object_new(WEBKIT_GTK_TYPE_FRAME, NULL));145 WebKit GtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(frame);146 WebKit GtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);138 static void webkit_frame_init(WebKitFrame* frame) 139 { 140 } 141 142 GObject* webkit_frame_new(WebKitPage* page) 143 { 144 WebKitFrame* frame = WEBKIT_FRAME(g_object_new(WEBKIT_TYPE_FRAME, NULL)); 145 WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(frame); 146 WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page); 147 147 148 148 frameData->client = new WebKit::FrameLoaderClient(frame); … … 162 162 } 163 163 164 GObject* webkit_ gtk_frame_init_with_page(WebKitGtkPage* page, HTMLFrameOwnerElement* element)165 { 166 WebKit GtkFrame* frame = WEBKIT_GTK_FRAME(g_object_new(WEBKIT_GTK_TYPE_FRAME, NULL));167 WebKit GtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(frame);168 WebKit GtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);164 GObject* webkit_frame_init_with_page(WebKitPage* page, HTMLFrameOwnerElement* element) 165 { 166 WebKitFrame* frame = WEBKIT_FRAME(g_object_new(WEBKIT_TYPE_FRAME, NULL)); 167 WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(frame); 168 WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page); 169 169 170 170 frameData->client = new WebKit::FrameLoaderClient(frame); … … 181 181 } 182 182 183 WebKit GtkPage*184 webkit_ gtk_frame_get_page(WebKitGtkFrame* frame)185 { 186 WebKit GtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(frame);183 WebKitPage* 184 webkit_frame_get_page(WebKitFrame* frame) 185 { 186 WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(frame); 187 187 return frameData->page; 188 188 } 189 189 190 gchar* webkit_ gtk_frame_get_title(WebKitGtkFrame* frame)191 { 192 WebKit GtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(frame);190 gchar* webkit_frame_get_title(WebKitFrame* frame) 191 { 192 WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(frame); 193 193 return frameData->title; 194 194 } 195 195 196 gchar* webkit_ gtk_frame_get_location(WebKitGtkFrame* frame)197 { 198 WebKit GtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(frame);196 gchar* webkit_frame_get_location(WebKitFrame* frame) 197 { 198 WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(frame); 199 199 return frameData->location; 200 200 } -
trunk/WebKit/gtk/Api/webkitgtkframe.h
r25647 r26022 27 27 */ 28 28 29 #ifndef WEBKIT_ GTK_FRAME_H30 #define WEBKIT_ GTK_FRAME_H29 #ifndef WEBKIT_FRAME_H 30 #define WEBKIT_FRAME_H 31 31 32 32 #include <glib-object.h> … … 37 37 G_BEGIN_DECLS 38 38 39 #define WEBKIT_ GTK_TYPE_FRAME (webkit_gtk_frame_get_type())40 #define WEBKIT_ GTK_FRAME(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_GTK_TYPE_FRAME, WebKitGtkFrame))41 #define WEBKIT_ GTK_FRAME_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), WEBKIT_GTK_TYPE_FRAME, WebKitGtkFrameClass))42 #define WEBKIT_ GTK_IS_FRAME(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_GTK_TYPE_FRAME))43 #define WEBKIT_ GTK_IS_FRAME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_GTK_TYPE_FRAME))44 #define WEBKIT_ GTK_FRAME_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_GTK_TYPE_FRAME, WebKitGtkFrameClass))39 #define WEBKIT_TYPE_FRAME (webkit_frame_get_type()) 40 #define WEBKIT_FRAME(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_FRAME, WebKitFrame)) 41 #define WEBKIT_FRAME_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), WEBKIT_TYPE_FRAME, WebKitFrameClass)) 42 #define WEBKIT_IS_FRAME(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_FRAME)) 43 #define WEBKIT_IS_FRAME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_TYPE_FRAME)) 44 #define WEBKIT_FRAME_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_TYPE_FRAME, WebKitFrameClass)) 45 45 46 46 47 struct _WebKit GtkFrame {47 struct _WebKitFrame { 48 48 GObject parent; 49 49 }; 50 50 51 struct _WebKit GtkFrameClass {51 struct _WebKitFrameClass { 52 52 GObjectClass parent; 53 53 54 void (*title_changed) (WebKit GtkFrame* frame, gchar* title, gchar* location);54 void (*title_changed) (WebKitFrame* frame, gchar* title, gchar* location); 55 55 56 56 /* 57 57 * protected virtual methods 58 58 */ 59 void (*mouse_move_event) (WebKit GtkFrame* frame, GdkEvent* move_event);60 void (*mouse_press_event) (WebKit GtkFrame* frame, GdkEvent* press_event);61 void (*mouse_release_event) (WebKit GtkFrame* frame, GdkEvent* mouse_release_event);62 void (*mouse_double_click_event) (WebKit GtkFrame* frame, GdkEvent* double_click_event);63 void (*mouse_wheel_event) (WebKit GtkFrame* frame, GdkEvent* wheel_event);59 void (*mouse_move_event) (WebKitFrame* frame, GdkEvent* move_event); 60 void (*mouse_press_event) (WebKitFrame* frame, GdkEvent* press_event); 61 void (*mouse_release_event) (WebKitFrame* frame, GdkEvent* mouse_release_event); 62 void (*mouse_double_click_event) (WebKitFrame* frame, GdkEvent* double_click_event); 63 void (*mouse_wheel_event) (WebKitFrame* frame, GdkEvent* wheel_event); 64 64 }; 65 65 66 WEBKIT_ GTK_API GType67 webkit_ gtk_frame_get_type (void);66 WEBKIT_API GType 67 webkit_frame_get_type (void); 68 68 69 WEBKIT_ GTK_API GObject*70 webkit_ gtk_frame_new (WebKitGtkPage *page);69 WEBKIT_API GObject* 70 webkit_frame_new (WebKitPage *page); 71 71 72 WEBKIT_ GTK_API WebKitGtkPage*73 webkit_ gtk_frame_get_page (WebKitGtkFrame* frame);72 WEBKIT_API WebKitPage* 73 webkit_frame_get_page (WebKitFrame* frame); 74 74 75 WEBKIT_ GTK_API gchar*76 webkit_ gtk_frame_get_markup (WebKitGtkFrame* frame);75 WEBKIT_API gchar* 76 webkit_frame_get_markup (WebKitFrame* frame); 77 77 78 WEBKIT_ GTK_API gchar*79 webkit_ gtk_frame_get_inner_text (WebKitGtkFrame* frame);78 WEBKIT_API gchar* 79 webkit_frame_get_inner_text (WebKitFrame* frame); 80 80 81 WEBKIT_ GTK_API gchar*82 webkit_ gtk_frame_get_selected_text (WebKitGtkFrame* frame);81 WEBKIT_API gchar* 82 webkit_frame_get_selected_text (WebKitFrame* frame); 83 83 84 WEBKIT_ GTK_API gchar*85 webkit_ gtk_frame_get_title (WebKitGtkFrame* frame);84 WEBKIT_API gchar* 85 webkit_frame_get_title (WebKitFrame* frame); 86 86 87 WEBKIT_ GTK_API gchar*88 webkit_ gtk_frame_get_location (WebKitGtkFrame* frame);87 WEBKIT_API gchar* 88 webkit_frame_get_location (WebKitFrame* frame); 89 89 90 WEBKIT_ GTK_API GSList*91 webkit_ gtk_frame_get_child_frames (WebKitGtkFrame* frame);90 WEBKIT_API GSList* 91 webkit_frame_get_child_frames (WebKitFrame* frame); 92 92 93 WEBKIT_ GTK_API GdkPoint*94 webkit_ gtk_frame_get_position (WebKitGtkFrame* frame);93 WEBKIT_API GdkPoint* 94 webkit_frame_get_position (WebKitFrame* frame); 95 95 96 WEBKIT_ GTK_API GdkRectangle*97 webkit_ gtk_frame_get_rectangle (WebKitGtkFrame* frame);96 WEBKIT_API GdkRectangle* 97 webkit_frame_get_rectangle (WebKitFrame* frame); 98 98 99 WEBKIT_ GTK_API WebKitGtkPage*100 webkit_ gtk_frame_get_page (WebKitGtkFrame* frame);99 WEBKIT_API WebKitPage* 100 webkit_frame_get_page (WebKitFrame* frame); 101 101 102 102 G_END_DECLS -
trunk/WebKit/gtk/Api/webkitgtkglobal.cpp
r24537 r26022 33 33 34 34 extern "C" { 35 void webkit_ gtk_init(void)35 void webkit_init(void) 36 36 { 37 37 WebCore::InitializeLoggingChannelsIfNecessary(); -
trunk/WebKit/gtk/Api/webkitgtkglobal.h
r24537 r26022 27 27 */ 28 28 29 #ifndef WEBKIT_G TK_GLOBAL_H30 #define WEBKIT_G TK_GLOBAL_H29 #ifndef WEBKIT_GLOBAL_H 30 #define WEBKIT_GLOBAL_H 31 31 32 32 #include "webkitgtkdefines.h" … … 34 34 G_BEGIN_DECLS 35 35 36 WEBKIT_ GTK_API void37 webkit_ gtk_init (void);36 WEBKIT_API void 37 webkit_init (void); 38 38 39 39 G_END_DECLS -
trunk/WebKit/gtk/Api/webkitgtknetworkrequest.h
r24537 r26022 27 27 */ 28 28 29 #ifndef WEBKIT_ GTK_NETWORK_REQUEST_H30 #define WEBKIT_ GTK_NETWORK_REQUEST_H29 #ifndef WEBKIT_NETWORK_REQUEST_H 30 #define WEBKIT_NETWORK_REQUEST_H 31 31 32 32 #include <glib-object.h> … … 36 36 G_BEGIN_DECLS 37 37 38 #define WEBKIT_ GTK_TYPE_NETWORK_REQUEST (webkit_gtk_network_request_get_type())39 #define WEBKIT_ GTK_NETWORK_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_GTK_TYPE_NETWORK_REQUEST, WebKitGtkNetworkRequest))40 #define WEBKIT_ GTK_NETWORK_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), WEBKIT_GTK_TYPE_NETWORK_REQUEST, WebKitGtkNetworkRequestClass))41 #define WEBKIT_ GTK_IS_NETWORK_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_GTK_TYPE_NETWORK_REQUEST))42 #define WEBKIT_ GTK_IS_NETWORK_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_GTK_TYPE_NETWORK_REQUEST))43 #define WEBKIT_ GTK_NETWORK_REQUEST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_GTK_TYPE_NETWORK_REQUEST, WebKitGtkNetworkRequestClass))38 #define WEBKIT_TYPE_NETWORK_REQUEST (webkit_network_request_get_type()) 39 #define WEBKIT_NETWORK_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_NETWORK_REQUEST, WebKitNetworkRequest)) 40 #define WEBKIT_NETWORK_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), WEBKIT_TYPE_NETWORK_REQUEST, WebKitNetworkRequestClass)) 41 #define WEBKIT_IS_NETWORK_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_NETWORK_REQUEST)) 42 #define WEBKIT_IS_NETWORK_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_TYPE_NETWORK_REQUEST)) 43 #define WEBKIT_NETWORK_REQUEST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_TYPE_NETWORK_REQUEST, WebKitNetworkRequestClass)) 44 44 45 45 46 typedef struct _WebKit GtkNetworkRequest WebKitGtkNetworkRequest;47 typedef struct _WebKit GtkNetworkRequestClass WebKitGtkNetworkRequestClass;46 typedef struct _WebKitNetworkRequest WebKitNetworkRequest; 47 typedef struct _WebKitNetworkRequestClass WebKitNetworkRequestClass; 48 48 49 struct _WebKit GtkNetworkRequest {49 struct _WebKitNetworkRequest { 50 50 GObject parent; 51 51 }; 52 52 53 struct _WebKit GtkNetworkRequestClass {53 struct _WebKitNetworkRequestClass { 54 54 GObject parent; 55 55 }; 56 56 57 WEBKIT_ GTK_API GType58 webkit_ gtk_network_request_get_type (void);57 WEBKIT_API GType 58 webkit_network_request_get_type (void); 59 59 60 WEBKIT_ GTK_API GObject*61 webkit_ gtk_network_request_new (void);60 WEBKIT_API GObject* 61 webkit_network_request_new (void); 62 62 63 63 G_END_DECLS -
trunk/WebKit/gtk/Api/webkitgtkpage.cpp
r26019 r26022 68 68 }; 69 69 70 static guint webkit_ gtk_page_signals[LAST_SIGNAL] = { 0, };71 72 G_DEFINE_TYPE(WebKit GtkPage, webkit_gtk_page, GTK_TYPE_CONTAINER)73 74 static gboolean webkit_ gtk_page_expose_event(GtkWidget* widget, GdkEventExpose* event)75 { 76 Frame* frame = core(getFrameFromPage(WEBKIT_ GTK_PAGE(widget)));70 static guint webkit_page_signals[LAST_SIGNAL] = { 0, }; 71 72 G_DEFINE_TYPE(WebKitPage, webkit_page, GTK_TYPE_CONTAINER) 73 74 static gboolean webkit_page_expose_event(GtkWidget* widget, GdkEventExpose* event) 75 { 76 Frame* frame = core(getFrameFromPage(WEBKIT_PAGE(widget))); 77 77 GdkRectangle clip; 78 78 gdk_region_get_clipbox(event->region, &clip); … … 90 90 } 91 91 92 static gboolean webkit_ gtk_page_key_event(GtkWidget* widget, GdkEventKey* event)93 { 94 Frame* frame = core(getFrameFromPage(WEBKIT_ GTK_PAGE(widget)));92 static gboolean webkit_page_key_event(GtkWidget* widget, GdkEventKey* event) 93 { 94 Frame* frame = core(getFrameFromPage(WEBKIT_PAGE(widget))); 95 95 frame->eventHandler()->keyEvent(PlatformKeyboardEvent(event)); 96 96 return FALSE; 97 97 } 98 98 99 static gboolean webkit_ gtk_page_button_event(GtkWidget* widget, GdkEventButton* event)100 { 101 Frame* frame = core(getFrameFromPage(WEBKIT_ GTK_PAGE(widget)));99 static gboolean webkit_page_button_event(GtkWidget* widget, GdkEventButton* event) 100 { 101 Frame* frame = core(getFrameFromPage(WEBKIT_PAGE(widget))); 102 102 103 103 if (event->type == GDK_BUTTON_RELEASE) … … 109 109 } 110 110 111 static gboolean webkit_ gtk_page_motion_event(GtkWidget* widget, GdkEventMotion* event)112 { 113 Frame* frame = core(getFrameFromPage(WEBKIT_ GTK_PAGE(widget)));111 static gboolean webkit_page_motion_event(GtkWidget* widget, GdkEventMotion* event) 112 { 113 Frame* frame = core(getFrameFromPage(WEBKIT_PAGE(widget))); 114 114 frame->eventHandler()->mouseMoved(PlatformMouseEvent(event)); 115 115 return FALSE; 116 116 } 117 117 118 static gboolean webkit_ gtk_page_scroll_event(GtkWidget* widget, GdkEventScroll* event)119 { 120 Frame* frame = core(getFrameFromPage(WEBKIT_ GTK_PAGE(widget)));118 static gboolean webkit_page_scroll_event(GtkWidget* widget, GdkEventScroll* event) 119 { 120 Frame* frame = core(getFrameFromPage(WEBKIT_PAGE(widget))); 121 121 122 122 PlatformWheelEvent wheelEvent(event); … … 125 125 } 126 126 127 static void webkit_ gtk_page_size_allocate(GtkWidget* widget, GtkAllocation* allocation)128 { 129 GTK_WIDGET_CLASS(webkit_ gtk_page_parent_class)->size_allocate(widget,allocation);130 131 Frame* frame = core(getFrameFromPage(WEBKIT_ GTK_PAGE(widget)));127 static void webkit_page_size_allocate(GtkWidget* widget, GtkAllocation* allocation) 128 { 129 GTK_WIDGET_CLASS(webkit_page_parent_class)->size_allocate(widget,allocation); 130 131 Frame* frame = core(getFrameFromPage(WEBKIT_PAGE(widget))); 132 132 frame->view()->resize(allocation->width, allocation->height); 133 133 frame->forceLayout(); … … 136 136 } 137 137 138 static void webkit_ gtk_page_realize(GtkWidget* widget)138 static void webkit_page_realize(GtkWidget* widget) 139 139 { 140 140 GTK_WIDGET_SET_FLAGS(widget, GTK_REALIZED); … … 166 166 } 167 167 168 static void webkit_ gtk_page_map(GtkWidget* widget)168 static void webkit_page_map(GtkWidget* widget) 169 169 { 170 170 GTK_WIDGET_SET_FLAGS(widget, GTK_MAPPED); 171 WebKit GtkPagePrivate* private_data = WEBKIT_GTK_PAGE_GET_PRIVATE(WEBKIT_GTK_PAGE(widget));171 WebKitPagePrivate* private_data = WEBKIT_PAGE_GET_PRIVATE(WEBKIT_PAGE(widget)); 172 172 173 173 HashSet<GtkWidget*>::const_iterator end = private_data->children.end(); … … 179 179 } 180 180 181 static void webkit_ gtk_page_set_scroll_adjustments(WebKitGtkPage* page, GtkAdjustment* hadj, GtkAdjustment* vadj)181 static void webkit_page_set_scroll_adjustments(WebKitPage* page, GtkAdjustment* hadj, GtkAdjustment* vadj) 182 182 { 183 183 FrameView* view = core(getFrameFromPage(page))->view(); … … 185 185 } 186 186 187 static void webkit_ gtk_page_container_add(GtkContainer* container, GtkWidget* widget)188 { 189 WebKit GtkPage* page = WEBKIT_GTK_PAGE(container);190 WebKit GtkPagePrivate* private_data = WEBKIT_GTK_PAGE_GET_PRIVATE(page);187 static void webkit_page_container_add(GtkContainer* container, GtkWidget* widget) 188 { 189 WebKitPage* page = WEBKIT_PAGE(container); 190 WebKitPagePrivate* private_data = WEBKIT_PAGE_GET_PRIVATE(page); 191 191 192 192 private_data->children.add(widget); … … 196 196 } 197 197 198 static void webkit_ gtk_page_container_remove(GtkContainer* container, GtkWidget* widget)199 { 200 WebKit GtkPagePrivate* private_data = WEBKIT_GTK_PAGE_GET_PRIVATE(WEBKIT_GTK_PAGE(container));198 static void webkit_page_container_remove(GtkContainer* container, GtkWidget* widget) 199 { 200 WebKitPagePrivate* private_data = WEBKIT_PAGE_GET_PRIVATE(WEBKIT_PAGE(container)); 201 201 202 202 if (private_data->children.contains(widget)) { … … 206 206 } 207 207 208 static void webkit_ gtk_page_container_forall(GtkContainer* container, gboolean, GtkCallback callback, gpointer callbackData)209 { 210 WebKit GtkPagePrivate* privateData = WEBKIT_GTK_PAGE_GET_PRIVATE(WEBKIT_GTK_PAGE(container));208 static void webkit_page_container_forall(GtkContainer* container, gboolean, GtkCallback callback, gpointer callbackData) 209 { 210 WebKitPagePrivate* privateData = WEBKIT_PAGE_GET_PRIVATE(WEBKIT_PAGE(container)); 211 211 212 212 HashSet<GtkWidget*> children = privateData->children; … … 216 216 } 217 217 218 static WebKit GtkPage* webkit_gtk_page_real_create_page(WebKitGtkPage*)218 static WebKitPage* webkit_page_real_create_page(WebKitPage*) 219 219 { 220 220 notImplemented(); … … 222 222 } 223 223 224 static WEBKIT_ GTK_NAVIGATION_REQUEST_RESPONSE webkit_gtk_page_real_navigation_requested(WebKitGtkPage*, WebKitGtkFrame* frame, WebKitGtkNetworkRequest*)225 { 226 notImplemented(); 227 return WEBKIT_ GTK_ACCEPT_NAVIGATION_REQUEST;228 } 229 230 static gchar* webkit_ gtk_page_real_choose_file(WebKitGtkPage*, WebKitGtkFrame*, const gchar* old_name)224 static WEBKIT_NAVIGATION_REQUEST_RESPONSE webkit_page_real_navigation_requested(WebKitPage*, WebKitFrame* frame, WebKitNetworkRequest*) 225 { 226 notImplemented(); 227 return WEBKIT_ACCEPT_NAVIGATION_REQUEST; 228 } 229 230 static gchar* webkit_page_real_choose_file(WebKitPage*, WebKitFrame*, const gchar* old_name) 231 231 { 232 232 notImplemented(); … … 234 234 } 235 235 236 static void webkit_ gtk_page_real_java_script_alert(WebKitGtkPage*, WebKitGtkFrame*, const gchar*)237 { 238 notImplemented(); 239 } 240 241 static gboolean webkit_ gtk_page_real_java_script_confirm(WebKitGtkPage*, WebKitGtkFrame*, const gchar*)236 static void webkit_page_real_java_script_alert(WebKitPage*, WebKitFrame*, const gchar*) 237 { 238 notImplemented(); 239 } 240 241 static gboolean webkit_page_real_java_script_confirm(WebKitPage*, WebKitFrame*, const gchar*) 242 242 { 243 243 notImplemented(); … … 246 246 247 247 /** 248 * WebKit GtkPage::java_script_prompt248 * WebKitPage::java_script_prompt 249 249 * 250 250 * @return: NULL to cancel the prompt 251 251 */ 252 static gchar* webkit_ gtk_page_real_java_script_prompt(WebKitGtkPage*, WebKitGtkFrame*, const gchar*, const gchar* defaultValue)252 static gchar* webkit_page_real_java_script_prompt(WebKitPage*, WebKitFrame*, const gchar*, const gchar* defaultValue) 253 253 { 254 254 notImplemented(); … … 256 256 } 257 257 258 static void webkit_ gtk_page_real_java_script_console_message(WebKitGtkPage*, const gchar*, unsigned int, const gchar*)259 { 260 notImplemented(); 261 } 262 263 static void webkit_ gtk_page_finalize(GObject* object)264 { 265 webkit_ gtk_page_stop_loading(WEBKIT_GTK_PAGE(object));266 267 WebKit GtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(WEBKIT_GTK_PAGE(object));258 static void webkit_page_real_java_script_console_message(WebKitPage*, const gchar*, unsigned int, const gchar*) 259 { 260 notImplemented(); 261 } 262 263 static void webkit_page_finalize(GObject* object) 264 { 265 webkit_page_stop_loading(WEBKIT_PAGE(object)); 266 267 WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(WEBKIT_PAGE(object)); 268 268 delete pageData->page; 269 269 delete pageData->settings; … … 271 271 delete pageData->userAgent; 272 272 273 G_OBJECT_CLASS(webkit_ gtk_page_parent_class)->finalize(object);274 } 275 276 static void webkit_ gtk_page_class_init(WebKitGtkPageClass* pageClass)277 { 278 g_type_class_add_private(pageClass, sizeof(WebKit GtkPagePrivate));273 G_OBJECT_CLASS(webkit_page_parent_class)->finalize(object); 274 } 275 276 static void webkit_page_class_init(WebKitPageClass* pageClass) 277 { 278 g_type_class_add_private(pageClass, sizeof(WebKitPagePrivate)); 279 279 280 280 … … 283 283 */ 284 284 /** 285 * WebKit GtkPage::load-started285 * WebKitPage::load-started 286 286 * @page: the object on which the signal is emitted 287 287 * @frame: the frame going to do the load 288 288 * 289 * When a WebKit GtkFrame begins to load this signal is emitted.289 * When a WebKitFrame begins to load this signal is emitted. 290 290 */ 291 webkit_ gtk_page_signals[LOAD_STARTED] = g_signal_new("load_started",291 webkit_page_signals[LOAD_STARTED] = g_signal_new("load_started", 292 292 G_TYPE_FROM_CLASS(pageClass), 293 293 (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), … … 297 297 g_cclosure_marshal_VOID__OBJECT, 298 298 G_TYPE_NONE, 1, 299 WEBKIT_ GTK_TYPE_FRAME);299 WEBKIT_TYPE_FRAME); 300 300 301 301 /** 302 * WebKit GtkPage::load-progress-changed303 * @page: The WebKit GtkPage302 * WebKitPage::load-progress-changed 303 * @page: The WebKitPage 304 304 * @progress: Global progress 305 305 */ 306 webkit_ gtk_page_signals[LOAD_PROGRESS_CHANGED] = g_signal_new("load_progress_changed",306 webkit_page_signals[LOAD_PROGRESS_CHANGED] = g_signal_new("load_progress_changed", 307 307 G_TYPE_FROM_CLASS(pageClass), 308 308 (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), … … 314 314 G_TYPE_INT); 315 315 316 webkit_ gtk_page_signals[LOAD_FINISHED] = g_signal_new("load_finished",316 webkit_page_signals[LOAD_FINISHED] = g_signal_new("load_finished", 317 317 G_TYPE_FROM_CLASS(pageClass), 318 318 (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), … … 322 322 g_cclosure_marshal_VOID__OBJECT, 323 323 G_TYPE_NONE, 1, 324 WEBKIT_ GTK_TYPE_FRAME);325 326 webkit_ gtk_page_signals[TITLE_CHANGED] = g_signal_new("title_changed",327 G_TYPE_FROM_CLASS(pageClass), 328 (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), 329 0, 330 NULL, 331 NULL, 332 webkit_ gtk_marshal_VOID__STRING_STRING,324 WEBKIT_TYPE_FRAME); 325 326 webkit_page_signals[TITLE_CHANGED] = g_signal_new("title_changed", 327 G_TYPE_FROM_CLASS(pageClass), 328 (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), 329 0, 330 NULL, 331 NULL, 332 webkit_marshal_VOID__STRING_STRING, 333 333 G_TYPE_NONE, 2, 334 334 G_TYPE_STRING, G_TYPE_STRING); 335 335 336 webkit_ gtk_page_signals[HOVERING_OVER_LINK] = g_signal_new("hovering_over_link",337 G_TYPE_FROM_CLASS(pageClass), 338 (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), 339 0, 340 NULL, 341 NULL, 342 webkit_ gtk_marshal_VOID__STRING_STRING,336 webkit_page_signals[HOVERING_OVER_LINK] = g_signal_new("hovering_over_link", 337 G_TYPE_FROM_CLASS(pageClass), 338 (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), 339 0, 340 NULL, 341 NULL, 342 webkit_marshal_VOID__STRING_STRING, 343 343 G_TYPE_NONE, 2, 344 344 G_TYPE_STRING, 345 345 G_TYPE_STRING); 346 346 347 webkit_ gtk_page_signals[STATUS_BAR_TEXT_CHANGED] = g_signal_new("status_bar_text_changed",347 webkit_page_signals[STATUS_BAR_TEXT_CHANGED] = g_signal_new("status_bar_text_changed", 348 348 G_TYPE_FROM_CLASS(pageClass), 349 349 (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), … … 355 355 G_TYPE_STRING); 356 356 357 webkit_ gtk_page_signals[ICOND_LOADED] = g_signal_new("icon_loaded",357 webkit_page_signals[ICOND_LOADED] = g_signal_new("icon_loaded", 358 358 G_TYPE_FROM_CLASS(pageClass), 359 359 (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), … … 364 364 G_TYPE_NONE, 0); 365 365 366 webkit_ gtk_page_signals[SELECTION_CHANGED] = g_signal_new("selection_changed",366 webkit_page_signals[SELECTION_CHANGED] = g_signal_new("selection_changed", 367 367 G_TYPE_FROM_CLASS(pageClass), 368 368 (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), … … 377 377 * implementations of virtual methods 378 378 */ 379 pageClass->create_page = webkit_ gtk_page_real_create_page;380 pageClass->navigation_requested = webkit_ gtk_page_real_navigation_requested;381 pageClass->choose_file = webkit_ gtk_page_real_choose_file;382 pageClass->java_script_alert = webkit_ gtk_page_real_java_script_alert;383 pageClass->java_script_confirm = webkit_ gtk_page_real_java_script_confirm;384 pageClass->java_script_prompt = webkit_ gtk_page_real_java_script_prompt;385 pageClass->java_script_console_message = webkit_ gtk_page_real_java_script_console_message;386 387 G_OBJECT_CLASS(pageClass)->finalize = webkit_ gtk_page_finalize;379 pageClass->create_page = webkit_page_real_create_page; 380 pageClass->navigation_requested = webkit_page_real_navigation_requested; 381 pageClass->choose_file = webkit_page_real_choose_file; 382 pageClass->java_script_alert = webkit_page_real_java_script_alert; 383 pageClass->java_script_confirm = webkit_page_real_java_script_confirm; 384 pageClass->java_script_prompt = webkit_page_real_java_script_prompt; 385 pageClass->java_script_console_message = webkit_page_real_java_script_console_message; 386 387 G_OBJECT_CLASS(pageClass)->finalize = webkit_page_finalize; 388 388 389 389 GtkWidgetClass* widgetClass = GTK_WIDGET_CLASS(pageClass); 390 widgetClass->realize = webkit_ gtk_page_realize;391 widgetClass->map = webkit_ gtk_page_map;392 widgetClass->expose_event = webkit_ gtk_page_expose_event;393 widgetClass->key_press_event = webkit_ gtk_page_key_event;394 widgetClass->key_release_event = webkit_ gtk_page_key_event;395 widgetClass->button_press_event = webkit_ gtk_page_button_event;396 widgetClass->button_release_event = webkit_ gtk_page_button_event;397 widgetClass->motion_notify_event = webkit_ gtk_page_motion_event;398 widgetClass->scroll_event = webkit_ gtk_page_scroll_event;399 widgetClass->size_allocate = webkit_ gtk_page_size_allocate;390 widgetClass->realize = webkit_page_realize; 391 widgetClass->map = webkit_page_map; 392 widgetClass->expose_event = webkit_page_expose_event; 393 widgetClass->key_press_event = webkit_page_key_event; 394 widgetClass->key_release_event = webkit_page_key_event; 395 widgetClass->button_press_event = webkit_page_button_event; 396 widgetClass->button_release_event = webkit_page_button_event; 397 widgetClass->motion_notify_event = webkit_page_motion_event; 398 widgetClass->scroll_event = webkit_page_scroll_event; 399 widgetClass->size_allocate = webkit_page_size_allocate; 400 400 401 401 GtkContainerClass* containerClass = GTK_CONTAINER_CLASS(pageClass); 402 containerClass->add = webkit_ gtk_page_container_add;403 containerClass->remove = webkit_ gtk_page_container_remove;404 containerClass->forall = webkit_ gtk_page_container_forall;402 containerClass->add = webkit_page_container_add; 403 containerClass->remove = webkit_page_container_remove; 404 containerClass->forall = webkit_page_container_forall; 405 405 406 406 /* 407 407 * make us scrollable (e.g. addable to a GtkScrolledWindow) 408 408 */ 409 pageClass->set_scroll_adjustments = webkit_ gtk_page_set_scroll_adjustments;409 pageClass->set_scroll_adjustments = webkit_page_set_scroll_adjustments; 410 410 GTK_WIDGET_CLASS(pageClass)->set_scroll_adjustments_signal = g_signal_new("set_scroll_adjustments", 411 411 G_TYPE_FROM_CLASS(pageClass), 412 412 (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), 413 G_STRUCT_OFFSET(WebKit GtkPageClass, set_scroll_adjustments),413 G_STRUCT_OFFSET(WebKitPageClass, set_scroll_adjustments), 414 414 NULL, NULL, 415 webkit_ gtk_marshal_VOID__OBJECT_OBJECT,415 webkit_marshal_VOID__OBJECT_OBJECT, 416 416 G_TYPE_NONE, 2, 417 417 GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT); 418 418 } 419 419 420 static void webkit_ gtk_page_init(WebKitGtkPage* page)421 { 422 WebKit GtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(WEBKIT_GTK_PAGE(page));420 static void webkit_page_init(WebKitPage* page) 421 { 422 WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(WEBKIT_PAGE(page)); 423 423 pageData->page = new Page(new WebKit::ChromeClient(page), new WebKit::ContextMenuClient, new WebKit::EditorClient(page), new WebKit::DragClient, new WebKit::InspectorClient); 424 424 … … 437 437 438 438 GTK_WIDGET_SET_FLAGS(page, GTK_CAN_FOCUS); 439 pageData->mainFrame = WEBKIT_ GTK_FRAME(webkit_gtk_frame_new(page));440 } 441 442 GtkWidget* webkit_ gtk_page_new(void)443 { 444 WebKit GtkPage* page = WEBKIT_GTK_PAGE(g_object_new(WEBKIT_GTK_TYPE_PAGE, NULL));439 pageData->mainFrame = WEBKIT_FRAME(webkit_frame_new(page)); 440 } 441 442 GtkWidget* webkit_page_new(void) 443 { 444 WebKitPage* page = WEBKIT_PAGE(g_object_new(WEBKIT_TYPE_PAGE, NULL)); 445 445 446 446 return GTK_WIDGET(page); 447 447 } 448 448 449 void webkit_ gtk_page_set_settings(WebKitGtkPage* page, WebKitGtkSettings* settings)450 { 451 notImplemented(); 452 } 453 454 WebKit GtkSettings* webkit_gtk_page_get_settings(WebKitGtkPage* page)449 void webkit_page_set_settings(WebKitPage* page, WebKitSettings* settings) 450 { 451 notImplemented(); 452 } 453 454 WebKitSettings* webkit_page_get_settings(WebKitPage* page) 455 455 { 456 456 notImplemented(); … … 458 458 } 459 459 460 void webkit_ gtk_page_go_backward(WebKitGtkPage* page)461 { 462 WebKit GtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);463 WebKit GtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(pageData->mainFrame);460 void webkit_page_go_backward(WebKitPage* page) 461 { 462 WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page); 463 WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame); 464 464 frameData->frame->loader()->goBackOrForward(-1); 465 465 } 466 466 467 void webkit_ gtk_page_go_forward(WebKitGtkPage* page)468 { 469 WebKit GtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);470 WebKit GtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(pageData->mainFrame);467 void webkit_page_go_forward(WebKitPage* page) 468 { 469 WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page); 470 WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame); 471 471 frameData->frame->loader()->goBackOrForward(1); 472 472 } 473 473 474 gboolean webkit_ gtk_page_can_go_backward(WebKitGtkPage* page)475 { 476 WebKit GtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);477 WebKit GtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(pageData->mainFrame);474 gboolean webkit_page_can_go_backward(WebKitPage* page) 475 { 476 WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page); 477 WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame); 478 478 return frameData->frame->loader()->canGoBackOrForward(-1); 479 479 } 480 480 481 gboolean webkit_ gtk_page_can_go_forward(WebKitGtkPage* page)482 { 483 WebKit GtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);484 WebKit GtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(pageData->mainFrame);481 gboolean webkit_page_can_go_forward(WebKitPage* page) 482 { 483 WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page); 484 WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame); 485 485 return frameData->frame->loader()->canGoBackOrForward(1); 486 486 } 487 487 488 void webkit_ gtk_page_open(WebKitGtkPage* page, const gchar* url)489 { 490 WebKit GtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);491 WebKit GtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(pageData->mainFrame);488 void webkit_page_open(WebKitPage* page, const gchar* url) 489 { 490 WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page); 491 WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame); 492 492 493 493 DeprecatedString string = DeprecatedString::fromUtf8(url); … … 495 495 } 496 496 497 void webkit_ gtk_page_reload(WebKitGtkPage* page)498 { 499 WebKit GtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);500 WebKit GtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(pageData->mainFrame);497 void webkit_page_reload(WebKitPage* page) 498 { 499 WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page); 500 WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame); 501 501 frameData->frame->loader()->reload(); 502 502 } 503 503 504 void webkit_ gtk_page_load_string(WebKitGtkPage* page, const gchar* content, const gchar* contentMimeType, const gchar* contentEncoding, const gchar* baseUrl)505 { 506 WebKit GtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);507 WebKit GtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(pageData->mainFrame);504 void webkit_page_load_string(WebKitPage* page, const gchar* content, const gchar* contentMimeType, const gchar* contentEncoding, const gchar* baseUrl) 505 { 506 WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page); 507 WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame); 508 508 509 509 KURL url(DeprecatedString::fromUtf8(baseUrl)); … … 514 514 } 515 515 516 void webkit_ gtk_page_load_html_string(WebKitGtkPage* page, const gchar* content, const gchar* baseUrl)517 { 518 webkit_ gtk_page_load_string(page, content, "text/html", "UTF-8", baseUrl);519 } 520 521 void webkit_ gtk_page_stop_loading(WebKitGtkPage* page)522 { 523 WebKit GtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);524 WebKit GtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(pageData->mainFrame);516 void webkit_page_load_html_string(WebKitPage* page, const gchar* content, const gchar* baseUrl) 517 { 518 webkit_page_load_string(page, content, "text/html", "UTF-8", baseUrl); 519 } 520 521 void webkit_page_stop_loading(WebKitPage* page) 522 { 523 WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page); 524 WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame); 525 525 526 526 if (FrameLoader* loader = frameData->frame->loader()) … … 529 529 } 530 530 531 WebKit GtkFrame* webkit_gtk_page_get_main_frame(WebKitGtkPage* page)532 { 533 WebKit GtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);531 WebKitFrame* webkit_page_get_main_frame(WebKitPage* page) 532 { 533 WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page); 534 534 return pageData->mainFrame; 535 535 } 536 536 537 void webkit_ gtk_page_execute_script(WebKitGtkPage* page, const gchar* script)538 { 539 WebKit GtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);540 WebKit GtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(pageData->mainFrame);537 void webkit_page_execute_script(WebKitPage* page, const gchar* script) 538 { 539 WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page); 540 WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame); 541 541 542 542 if (FrameLoader* loader = frameData->frame->loader()) -
trunk/WebKit/gtk/Api/webkitgtkpage.h
r26019 r26022 27 27 */ 28 28 29 #ifndef WEBKIT_ GTK_PAGE_H30 #define WEBKIT_ GTK_PAGE_H29 #ifndef WEBKIT_PAGE_H 30 #define WEBKIT_PAGE_H 31 31 32 32 #include <gtk/gtk.h> … … 37 37 G_BEGIN_DECLS 38 38 39 #define WEBKIT_ GTK_TYPE_PAGE (webkit_gtk_page_get_type())40 #define WEBKIT_ GTK_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_GTK_TYPE_PAGE, WebKitGtkPage))41 #define WEBKIT_ GTK_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), WEBKIT_GTK_TYPE_PAGE, WebKitGtkPageClass))42 #define WEBKIT_ GTK_IS_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_GTK_TYPE_PAGE))43 #define WEBKIT_ GTK_IS_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_GTK_TYPE_PAGE))44 #define WEBKIT_ GTK_PAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_GTK_TYPE_PAGE, WebKitGtkPageClass))39 #define WEBKIT_TYPE_PAGE (webkit_page_get_type()) 40 #define WEBKIT_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_PAGE, WebKitPage)) 41 #define WEBKIT_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), WEBKIT_TYPE_PAGE, WebKitPageClass)) 42 #define WEBKIT_IS_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_PAGE)) 43 #define WEBKIT_IS_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_TYPE_PAGE)) 44 #define WEBKIT_PAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_TYPE_PAGE, WebKitPageClass)) 45 45 46 46 47 47 typedef enum { 48 WEBKIT_ GTK_ACCEPT_NAVIGATION_REQUEST,49 WEBKIT_ GTK_IGNORE_NAVIGATION_REQUEST,50 WEBKIT_ GTK_DOWNLOAD_NAVIGATION_REQUEST51 } WEBKIT_ GTK_NAVIGATION_REQUEST_RESPONSE;48 WEBKIT_ACCEPT_NAVIGATION_REQUEST, 49 WEBKIT_IGNORE_NAVIGATION_REQUEST, 50 WEBKIT_DOWNLOAD_NAVIGATION_REQUEST 51 } WEBKIT_NAVIGATION_REQUEST_RESPONSE; 52 52 53 53 54 54 55 struct _WebKit GtkPage {55 struct _WebKitPage { 56 56 GtkContainer parent; 57 57 }; 58 58 59 struct _WebKit GtkPageClass {59 struct _WebKitPageClass { 60 60 GtkContainerClass parent; 61 61 … … 66 66 * WebUIDelegate has nothing for create_frame, WebPolicyDelegate as well... 67 67 */ 68 WebKit GtkPage* (*create_page) (WebKitGtkPage* page);68 WebKitPage* (*create_page) (WebKitPage* page); 69 69 70 70 /* 71 71 * TODO: FIXME: Create something like WebPolicyDecisionListener_Protocol instead 72 72 */ 73 WEBKIT_ GTK_NAVIGATION_REQUEST_RESPONSE (*navigation_requested) (WebKitGtkPage* page, WebKitGtkFrame* frame, WebKitGtkNetworkRequest* request);73 WEBKIT_NAVIGATION_REQUEST_RESPONSE (*navigation_requested) (WebKitPage* page, WebKitFrame* frame, WebKitNetworkRequest* request); 74 74 75 75 /* 76 76 * TODO: DISCUSS: Should these be signals as well? 77 77 */ 78 gchar* (*choose_file) (WebKit GtkPage* page, WebKitGtkFrame* frame, const gchar* old_file);79 void (*java_script_alert) (WebKit GtkPage* page, WebKitGtkFrame* frame, const gchar* alert_message);80 gboolean (*java_script_confirm) (WebKit GtkPage* page, WebKitGtkFrame* frame, const gchar* confirm_message);81 gchar* (*java_script_prompt) (WebKit GtkPage* page, WebKitGtkFrame* frame, const gchar* message, const gchar* default_value);82 void (*java_script_console_message) (WebKit GtkPage*, const gchar* message, unsigned int line_number, const gchar* source_id);78 gchar* (*choose_file) (WebKitPage* page, WebKitFrame* frame, const gchar* old_file); 79 void (*java_script_alert) (WebKitPage* page, WebKitFrame* frame, const gchar* alert_message); 80 gboolean (*java_script_confirm) (WebKitPage* page, WebKitFrame* frame, const gchar* confirm_message); 81 gchar* (*java_script_prompt) (WebKitPage* page, WebKitFrame* frame, const gchar* message, const gchar* default_value); 82 void (*java_script_console_message) (WebKitPage*, const gchar* message, unsigned int line_number, const gchar* source_id); 83 83 84 84 /* 85 85 * internal 86 86 */ 87 void (*set_scroll_adjustments) (WebKit GtkPage*, GtkAdjustment*, GtkAdjustment*);87 void (*set_scroll_adjustments) (WebKitPage*, GtkAdjustment*, GtkAdjustment*); 88 88 }; 89 89 90 WEBKIT_ GTK_API GType91 webkit_ gtk_page_get_type (void);90 WEBKIT_API GType 91 webkit_page_get_type (void); 92 92 93 WEBKIT_ GTK_API GtkWidget*94 webkit_ gtk_page_new (void);93 WEBKIT_API GtkWidget* 94 webkit_page_new (void); 95 95 96 WEBKIT_ GTK_API void97 webkit_ gtk_page_set_settings (WebKitGtkPage* page, WebKitGtkSettings* settings);96 WEBKIT_API void 97 webkit_page_set_settings (WebKitPage* page, WebKitSettings* settings); 98 98 99 WEBKIT_ GTK_API WebKitGtkSettings*100 webkit_ gtk_page_get_settings (WebKitGtkPage* page);99 WEBKIT_API WebKitSettings* 100 webkit_page_get_settings (WebKitPage* page); 101 101 102 WEBKIT_ GTK_API gboolean103 webkit_ gtk_page_can_cut (WebKitGtkPage* page);102 WEBKIT_API gboolean 103 webkit_page_can_cut (WebKitPage* page); 104 104 105 WEBKIT_ GTK_API gboolean106 webkit_ gtk_page_can_copy (WebKitGtkPage* page);105 WEBKIT_API gboolean 106 webkit_page_can_copy (WebKitPage* page); 107 107 108 WEBKIT_ GTK_API gboolean109 webkit_ gtk_page_can_paste (WebKitGtkPage* page);108 WEBKIT_API gboolean 109 webkit_page_can_paste (WebKitPage* page); 110 110 111 WEBKIT_ GTK_API void112 webkit_ gtk_page_cut (WebKitGtkPage* page);111 WEBKIT_API void 112 webkit_page_cut (WebKitPage* page); 113 113 114 WEBKIT_ GTK_API void115 webkit_ gtk_page_copy (WebKitGtkPage* page);114 WEBKIT_API void 115 webkit_page_copy (WebKitPage* page); 116 116 117 WEBKIT_ GTK_API void118 webkit_ gtk_page_paste (WebKitGtkPage* page);117 WEBKIT_API void 118 webkit_page_paste (WebKitPage* page); 119 119 120 WEBKIT_ GTK_API gboolean121 webkit_ gtk_page_can_go_backward (WebKitGtkPage* page);120 WEBKIT_API gboolean 121 webkit_page_can_go_backward (WebKitPage* page); 122 122 123 WEBKIT_ GTK_API gboolean124 webkit_ gtk_page_can_go_forward (WebKitGtkPage* page);123 WEBKIT_API gboolean 124 webkit_page_can_go_forward (WebKitPage* page); 125 125 126 WEBKIT_ GTK_API void127 webkit_ gtk_page_go_backward (WebKitGtkPage* page);126 WEBKIT_API void 127 webkit_page_go_backward (WebKitPage* page); 128 128 129 WEBKIT_ GTK_API void130 webkit_ gtk_page_go_forward (WebKitGtkPage* page);129 WEBKIT_API void 130 webkit_page_go_forward (WebKitPage* page); 131 131 132 WEBKIT_ GTK_API void133 webkit_ gtk_page_stop_loading (WebKitGtkPage* page);132 WEBKIT_API void 133 webkit_page_stop_loading (WebKitPage* page); 134 134 135 WEBKIT_ GTK_API void136 webkit_ gtk_page_open (WebKitGtkPage* page, const gchar* url);135 WEBKIT_API void 136 webkit_page_open (WebKitPage* page, const gchar* url); 137 137 138 WEBKIT_ GTK_API void139 webkit_ gtk_page_reload (WebKitGtkPage *page);138 WEBKIT_API void 139 webkit_page_reload (WebKitPage *page); 140 140 141 WEBKIT_ GTK_API void142 webkit_ gtk_page_load_string (WebKitGtkPage* page, const gchar* content, const gchar* content_mime_type, const gchar* content_encoding, const gchar* base_url);141 WEBKIT_API void 142 webkit_page_load_string (WebKitPage* page, const gchar* content, const gchar* content_mime_type, const gchar* content_encoding, const gchar* base_url); 143 143 144 WEBKIT_ GTK_API void145 webkit_ gtk_page_load_html_string (WebKitGtkPage* page, const gchar* content, const gchar* base_url);144 WEBKIT_API void 145 webkit_page_load_html_string (WebKitPage* page, const gchar* content, const gchar* base_url); 146 146 147 WEBKIT_ GTK_API WebKitGtkFrame*148 webkit_ gtk_page_get_main_frame (WebKitGtkPage* page);147 WEBKIT_API WebKitFrame* 148 webkit_page_get_main_frame (WebKitPage* page); 149 149 150 WEBKIT_ GTK_API void151 webkit_ gtk_page_execute_script(WebKitGtkPage* page, const gchar* script);150 WEBKIT_API void 151 webkit_page_execute_script(WebKitPage* page, const gchar* script); 152 152 G_END_DECLS 153 153 -
trunk/WebKit/gtk/Api/webkitgtkprivate.cpp
r24978 r26022 38 38 39 39 namespace WebKit { 40 void apply(WebKit GtkSettings*, WebCore::Settings*)40 void apply(WebKitSettings*, WebCore::Settings*) 41 41 { 42 42 notImplemented(); 43 43 } 44 44 45 WebKit GtkSettings* create(WebCore::Settings*)45 WebKitSettings* create(WebCore::Settings*) 46 46 { 47 47 notImplemented(); … … 49 49 } 50 50 51 WebKit GtkFrame* getFrameFromPage(WebKitGtkPage* page)51 WebKitFrame* getFrameFromPage(WebKitPage* page) 52 52 { 53 return webkit_ gtk_page_get_main_frame(page);53 return webkit_page_get_main_frame(page); 54 54 } 55 55 56 WebKit GtkPage* getPageFromFrame(WebKitGtkFrame* frame)56 WebKitPage* getPageFromFrame(WebKitFrame* frame) 57 57 { 58 return webkit_ gtk_frame_get_page(frame);58 return webkit_frame_get_page(frame); 59 59 } 60 60 61 WebCore::Frame* core(WebKit GtkFrame* frame)61 WebCore::Frame* core(WebKitFrame* frame) 62 62 { 63 WebKit GtkFramePrivate* frame_data = WEBKIT_GTK_FRAME_GET_PRIVATE(frame);63 WebKitFramePrivate* frame_data = WEBKIT_FRAME_GET_PRIVATE(frame); 64 64 return frame_data->frame; 65 65 } 66 66 67 WebKit GtkFrame* kit(WebCore::Frame* coreFrame)67 WebKitFrame* kit(WebCore::Frame* coreFrame) 68 68 { 69 69 WebKit::FrameLoaderClient* client = static_cast<WebKit::FrameLoaderClient*>(coreFrame->loader()->client()); … … 71 71 } 72 72 73 WebCore::Page* core(WebKit GtkPage* page)73 WebCore::Page* core(WebKitPage* page) 74 74 { 75 WebKit GtkPagePrivate* page_data = WEBKIT_GTK_PAGE_GET_PRIVATE(page);75 WebKitPagePrivate* page_data = WEBKIT_PAGE_GET_PRIVATE(page); 76 76 return page_data->page; 77 77 } 78 78 79 WebKit GtkPage* kit(WebCore::Page* page)79 WebKitPage* kit(WebCore::Page* page) 80 80 { 81 81 WebKit::ChromeClient* client = static_cast<WebKit::ChromeClient*>(page->chrome()->client()); -
trunk/WebKit/gtk/Api/webkitgtkprivate.h
r25593 r26022 27 27 */ 28 28 29 #ifndef WEBKIT_ GTK_PRIVATE_H30 #define WEBKIT_ GTK_PRIVATE_H29 #ifndef WEBKIT_PRIVATE_H 30 #define WEBKIT_PRIVATE_H 31 31 32 32 /* 33 * Internal class. This class knows the shared secret of WebKit GtkFrame,34 * WebKit GtkNetworkRequest and WebKitGtkPage.33 * Internal class. This class knows the shared secret of WebKitFrame, 34 * WebKitNetworkRequest and WebKitPage. 35 35 * They are using WebCore which musn't be exposed to the outer world. 36 36 */ … … 48 48 49 49 namespace WebKit { 50 void apply(WebKit GtkSettings*,WebCore::Settings*);51 WebKit GtkSettings* create(WebCore::Settings*);52 WebKit GtkFrame* getFrameFromPage(WebKitGtkPage*);53 WebKit GtkPage* getPageFromFrame(WebKitGtkFrame*);50 void apply(WebKitSettings*,WebCore::Settings*); 51 WebKitSettings* create(WebCore::Settings*); 52 WebKitFrame* getFrameFromPage(WebKitPage*); 53 WebKitPage* getPageFromFrame(WebKitFrame*); 54 54 55 WebCore::Frame* core(WebKit GtkFrame*);56 WebKit GtkFrame* kit(WebCore::Frame*);57 WebCore::Page* core(WebKit GtkPage*);58 WebKit GtkPage* kit(WebCore::Page*);55 WebCore::Frame* core(WebKitFrame*); 56 WebKitFrame* kit(WebCore::Frame*); 57 WebCore::Page* core(WebKitPage*); 58 WebKitPage* kit(WebCore::Page*); 59 59 } 60 60 61 61 extern "C" { 62 #define WEBKIT_ GTK_PAGE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_GTK_TYPE_PAGE, WebKitGtkPagePrivate))63 typedef struct _WebKit GtkPagePrivate WebKitGtkPagePrivate;64 struct _WebKit GtkPagePrivate {62 #define WEBKIT_PAGE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_PAGE, WebKitPagePrivate)) 63 typedef struct _WebKitPagePrivate WebKitPagePrivate; 64 struct _WebKitPagePrivate { 65 65 WebCore::Page* page; 66 66 WebCore::Settings* settings; 67 67 68 WebKit GtkFrame* mainFrame;68 WebKitFrame* mainFrame; 69 69 WebCore::String applicationNameForUserAgent; 70 70 WebCore::String* userAgent; … … 73 73 }; 74 74 75 #define WEBKIT_ GTK_FRAME_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_GTK_TYPE_FRAME, WebKitGtkFramePrivate))76 typedef struct _WebKit GtkFramePrivate WebKitGtkFramePrivate;77 struct _WebKit GtkFramePrivate {75 #define WEBKIT_FRAME_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_FRAME, WebKitFramePrivate)) 76 typedef struct _WebKitFramePrivate WebKitFramePrivate; 77 struct _WebKitFramePrivate { 78 78 WebCore::Frame* frame; 79 79 WebCore::FrameLoaderClient* client; 80 WebKit GtkPage* page;80 WebKitPage* page; 81 81 82 82 gchar* title; … … 85 85 86 86 87 GObject* webkit_ gtk_frame_init_with_page(WebKitGtkPage*, WebCore::HTMLFrameOwnerElement*);87 GObject* webkit_frame_init_with_page(WebKitPage*, WebCore::HTMLFrameOwnerElement*); 88 88 } 89 89 -
trunk/WebKit/gtk/Api/webkitgtksettings.cpp
r24537 r26022 32 32 33 33 extern "C" { 34 GType webkit_ gtk_web_settings_get_type(void)34 GType webkit_web_settings_get_type(void) 35 35 { 36 36 } 37 37 38 WebKit GtkSettings* webkit_gtk_web_settings_copy(WebKitGtkSettings* setting)38 WebKitSettings* webkit_web_settings_copy(WebKitSettings* setting) 39 39 { 40 40 } 41 41 42 void webkit_ gtk_web_settings_free(WebKitGtkSettings* setting)42 void webkit_web_settings_free(WebKitSettings* setting) 43 43 { 44 44 } 45 45 46 WebKit GtkSettings* webkit_gtk_web_settings_get_global(void)46 WebKitSettings* webkit_web_settings_get_global(void) 47 47 { 48 48 } 49 49 50 void webkit_ gtk_web_settings_set_global (WebKitGtkSettings* setting)50 void webkit_web_settings_set_global (WebKitSettings* setting) 51 51 { 52 52 } 53 53 54 void webkit_ gtk_web_settings_set_font_family(WebKitGtkSettings*, WebKitGtkFontFamily family, gchar* family_name)54 void webkit_web_settings_set_font_family(WebKitSettings*, WebKitFontFamily family, gchar* family_name) 55 55 { 56 56 } 57 57 58 gchar* webkit_ gtk_web_settings_get_font_family(WebKitGtkSettings*, WebKitGtkFontFamily family)58 gchar* webkit_web_settings_get_font_family(WebKitSettings*, WebKitFontFamily family) 59 59 { 60 60 } 61 61 62 void webkit_ gtk_web_settings_set_user_style_sheet_location(WebKitGtkSettings*, gchar*)62 void webkit_web_settings_set_user_style_sheet_location(WebKitSettings*, gchar*) 63 63 { 64 64 } 65 65 66 void webkit_ gtk_set_ftp_directory_template_path(WebKitGtkSettings*, gchar*)66 void webkit_set_ftp_directory_template_path(WebKitSettings*, gchar*) 67 67 { 68 68 } -
trunk/WebKit/gtk/Api/webkitgtksettings.h
r24537 r26022 27 27 */ 28 28 29 #ifndef WEBKIT_ GTK_SETTINGS_H30 #define WEBKIT_ GTK_SETTINGS_H29 #ifndef WEBKIT_SETTINGS_H 30 #define WEBKIT_SETTINGS_H 31 31 32 32 #include <glib.h> … … 38 38 39 39 typedef enum { 40 WEBKIT_ GTK_FONT_FAMILY_STANDARD,41 WEBKIT_ GTK_FONT_FAMILY_FIXED,42 WEBKIT_ GTK_FONT_FAMILY_SERIF,43 WEBKIT_ GTK_FONT_FAMILY_SANS_SERIF,44 WEBKIT_ GTK_FONT_FAMILY_CURSIVE,45 WEBKIT_ GTK_FONT_FAMILY_FANTASY,46 WEBKIT_ GTK_FONT_FAMILY_LAST_ENTRY47 } WebKit GtkFontFamily;40 WEBKIT_FONT_FAMILY_STANDARD, 41 WEBKIT_FONT_FAMILY_FIXED, 42 WEBKIT_FONT_FAMILY_SERIF, 43 WEBKIT_FONT_FAMILY_SANS_SERIF, 44 WEBKIT_FONT_FAMILY_CURSIVE, 45 WEBKIT_FONT_FAMILY_FANTASY, 46 WEBKIT_FONT_FAMILY_LAST_ENTRY 47 } WebKitFontFamily; 48 48 49 49 typedef enum { 50 WEBKIT_ GTK_EDITABLE_LINK_DEFAULT_BEHAVIOUR,51 WEBKIT_ GTK_EDITABLE_LINK_ALWAYS_LIVE,52 WEBKIT_ GTK_EDITABLE_LINK_ONLY_WITH_SHIFT_KEY,53 WEBKIT_ GTK_EDITABLE_LINK_LIVE_WHEN_NOT_FOCUSED,54 WEBKIT_ GTK_EDITABLE_LINK_NEVER_LIVE55 } WebKit GtkEditableLinkBehaviour;50 WEBKIT_EDITABLE_LINK_DEFAULT_BEHAVIOUR, 51 WEBKIT_EDITABLE_LINK_ALWAYS_LIVE, 52 WEBKIT_EDITABLE_LINK_ONLY_WITH_SHIFT_KEY, 53 WEBKIT_EDITABLE_LINK_LIVE_WHEN_NOT_FOCUSED, 54 WEBKIT_EDITABLE_LINK_NEVER_LIVE 55 } WebKitEditableLinkBehaviour; 56 56 57 typedef struct _WebKit GtkSettings WebKitGtkSettings;58 typedef struct _WebKit GtkSettingsPrivate WebKitGtkSettingsPrivate;57 typedef struct _WebKitSettings WebKitSettings; 58 typedef struct _WebKitSettingsPrivate WebKitSettingsPrivate; 59 59 60 struct _WebKit GtkSettings {61 gchar* font_name[WEBKIT_ GTK_FONT_FAMILY_LAST_ENTRY];60 struct _WebKitSettings { 61 gchar* font_name[WEBKIT_FONT_FAMILY_LAST_ENTRY]; 62 62 gint minimum_font_size; 63 63 gint minimum_logical_font_size; … … 72 72 gboolean should_print_backgrounds; 73 73 gboolean text_areas_are_resizable; 74 WebKit GtkEditableLinkBehaviour editable_link_behaviour;74 WebKitEditableLinkBehaviour editable_link_behaviour; 75 75 gboolean uses_page_cache; 76 76 gboolean shrink_standalone_images_to_fit; … … 81 81 82 82 83 WebKit GtkSettingsPrivate *private_data;83 WebKitSettingsPrivate *private_data; 84 84 }; 85 85 86 86 GType 87 webkit_ gtk_web_settings_get_type (void);87 webkit_web_settings_get_type (void); 88 88 89 WebKit GtkSettings*90 webkit_ gtk_web_settings_copy (WebKitGtkSettings* setting);89 WebKitSettings* 90 webkit_web_settings_copy (WebKitSettings* setting); 91 91 92 92 void 93 webkit_ gtk_web_settings_free (WebKitGtkSettings* setting);93 webkit_web_settings_free (WebKitSettings* setting); 94 94 95 WebKit GtkSettings*96 webkit_ gtk_web_settings_get_global (void);95 WebKitSettings* 96 webkit_web_settings_get_global (void); 97 97 98 98 void 99 webkit_ gtk_web_settings_set_global (WebKitGtkSettings* setting);99 webkit_web_settings_set_global (WebKitSettings* setting); 100 100 101 101 void 102 webkit_ gtk_web_settings_set_font_family(WebKitGtkSettings*, WebKitGtkFontFamily family, gchar *family_name);102 webkit_web_settings_set_font_family(WebKitSettings*, WebKitFontFamily family, gchar *family_name); 103 103 104 104 gchar* 105 webkit_ gtk_web_settings_get_font_family(WebKitGtkSettings*, WebKitGtkFontFamily family);105 webkit_web_settings_get_font_family(WebKitSettings*, WebKitFontFamily family); 106 106 107 107 void 108 webkit_ gtk_web_settings_set_user_style_sheet_location(WebKitGtkSettings*, gchar*);108 webkit_web_settings_set_user_style_sheet_location(WebKitSettings*, gchar*); 109 109 110 110 void 111 webkit_ gtk_set_ftp_directory_template_path(WebKitGtkSettings*, gchar*);111 webkit_set_ftp_directory_template_path(WebKitSettings*, gchar*); 112 112 113 113 -
trunk/WebKit/gtk/ChangeLog
r26020 r26022 1 2007-10-03 Alp Toker <alp@atoker.com> 2 3 Reviewed by Adam. 4 5 http://bugs.webkit.org/show_bug.cgi?id=14726 6 [gtk] API design. Mapping the WebView delegates to signals. 7 8 Change the API namespace of the Gtk+ port from 'WebKitGtk' to 'WebKit'. 9 10 * Api/webkitgtkdefines.h: 11 * Api/webkitgtkframe.cpp: 12 * Api/webkitgtkframe.h: 13 * Api/webkitgtkglobal.cpp: 14 * Api/webkitgtkglobal.h: 15 * Api/webkitgtknetworkrequest.h: 16 * Api/webkitgtkpage.cpp: 17 * Api/webkitgtkpage.h: 18 * Api/webkitgtkprivate.cpp: 19 (WebKit::apply): 20 (WebKit::create): 21 (WebKit::getFrameFromPage): 22 (WebKit::getPageFromFrame): 23 (WebKit::core): 24 (WebKit::kit): 25 * Api/webkitgtkprivate.h: 26 * Api/webkitgtksettings.cpp: 27 * Api/webkitgtksettings.h: 28 * WebCoreSupport/ChromeClientGtk.cpp: 29 (WebKit::ChromeClient::ChromeClient): 30 (WebKit::ChromeClient::createWindow): 31 (WebKit::ChromeClient::addMessageToConsole): 32 (WebKit::ChromeClient::runJavaScriptAlert): 33 (WebKit::ChromeClient::runJavaScriptConfirm): 34 (WebKit::ChromeClient::runJavaScriptPrompt): 35 * WebCoreSupport/ChromeClientGtk.h: 36 (WebKit::ChromeClient::webPage): 37 * WebCoreSupport/EditorClientGtk.cpp: 38 (WebKit::EditorClient::EditorClient): 39 * WebCoreSupport/EditorClientGtk.h: 40 * WebCoreSupport/FrameLoaderClientGtk.cpp: 41 (WebKit::FrameLoaderClient::FrameLoaderClient): 42 (WebKit::FrameLoaderClient::postProgressStartedNotification): 43 (WebKit::FrameLoaderClient::postProgressEstimateChangedNotification): 44 (WebKit::FrameLoaderClient::postProgressFinishedNotification): 45 (WebKit::FrameLoaderClient::createFrame): 46 (WebKit::FrameLoaderClient::dispatchDidReceiveIcon): 47 (WebKit::FrameLoaderClient::setTitle): 48 * WebCoreSupport/FrameLoaderClientGtk.h: 49 (WebKit::FrameLoaderClient::webFrame): 50 1 51 2007-10-02 Cosimo Cecchi <cosimoc@svn.gnome.org> 2 52 -
trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
r26020 r26022 42 42 43 43 namespace WebKit { 44 ChromeClient::ChromeClient(WebKit GtkPage* page)44 ChromeClient::ChromeClient(WebKitPage* page) 45 45 : m_webPage(page) 46 46 , m_didSendLinkSignal(false) … … 89 89 { 90 90 /* TODO: FrameLoadRequest is not used */ 91 WebKit GtkPage* page = WEBKIT_GTK_PAGE_GET_CLASS(m_webPage)->create_page(m_webPage);91 WebKitPage* page = WEBKIT_PAGE_GET_CLASS(m_webPage)->create_page(m_webPage); 92 92 if (!page) 93 93 return 0; 94 94 95 WebKit GtkPagePrivate *privateData = WEBKIT_GTK_PAGE_GET_PRIVATE(WEBKIT_GTK_PAGE(page));95 WebKitPagePrivate *privateData = WEBKIT_PAGE_GET_PRIVATE(WEBKIT_PAGE(page)); 96 96 return privateData->page; 97 97 } … … 200 200 CString sourceIdString = sourceId.utf8(); 201 201 202 WEBKIT_ GTK_PAGE_GET_CLASS(m_webPage)->java_script_console_message(m_webPage, messageString.data(), lineNumber, sourceIdString.data());202 WEBKIT_PAGE_GET_CLASS(m_webPage)->java_script_console_message(m_webPage, messageString.data(), lineNumber, sourceIdString.data()); 203 203 } 204 204 … … 206 206 { 207 207 CString messageString = message.utf8(); 208 WEBKIT_ GTK_PAGE_GET_CLASS(m_webPage)->java_script_alert(m_webPage, kit(frame), messageString.data());208 WEBKIT_PAGE_GET_CLASS(m_webPage)->java_script_alert(m_webPage, kit(frame), messageString.data()); 209 209 } 210 210 … … 212 212 { 213 213 CString messageString = message.utf8(); 214 return WEBKIT_ GTK_PAGE_GET_CLASS(m_webPage)->java_script_confirm(m_webPage, kit(frame), messageString.data());214 return WEBKIT_PAGE_GET_CLASS(m_webPage)->java_script_confirm(m_webPage, kit(frame), messageString.data()); 215 215 } 216 216 … … 220 220 CString defaultValueString = defaultValue.utf8(); 221 221 222 gchar* cresult = WEBKIT_ GTK_PAGE_GET_CLASS(m_webPage)->java_script_prompt(m_webPage,222 gchar* cresult = WEBKIT_PAGE_GET_CLASS(m_webPage)->java_script_prompt(m_webPage, 223 223 kit(frame), 224 224 messageString.data(), -
trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h
r26020 r26022 32 32 #include "ChromeClient.h" 33 33 34 typedef struct _WebKit GtkPage WebKitGtkPage;34 typedef struct _WebKitPage WebKitPage; 35 35 36 36 namespace WebKit { … … 38 38 class ChromeClient : public WebCore::ChromeClient { 39 39 public: 40 ChromeClient(WebKit GtkPage*);41 WebKit GtkPage* webPage() const { return m_webPage; }40 ChromeClient(WebKitPage*); 41 WebKitPage* webPage() const { return m_webPage; } 42 42 43 43 virtual void chromeDestroyed(); … … 103 103 virtual void print(WebCore::Frame*); 104 104 private: 105 WebKit GtkPage* m_webPage;105 WebKitPage* m_webPage; 106 106 bool m_didSendLinkSignal; 107 107 }; -
trunk/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp
r25345 r26022 258 258 } 259 259 260 EditorClient::EditorClient(WebKit GtkPage* page)260 EditorClient::EditorClient(WebKitPage* page) 261 261 : m_page(page) 262 262 { -
trunk/WebKit/gtk/WebCoreSupport/EditorClientGtk.h
r25345 r26022 35 35 #include <wtf/Forward.h> 36 36 37 typedef struct _WebKit GtkPage WebKitGtkPage;37 typedef struct _WebKitPage WebKitPage; 38 38 39 39 namespace WebCore { … … 46 46 class EditorClient : public WebCore::EditorClient { 47 47 public: 48 EditorClient(WebKit GtkPage*);48 EditorClient(WebKitPage*); 49 49 50 50 // from EditorClient … … 111 111 112 112 private: 113 WebKit GtkPage* m_page;113 WebKitPage* m_page; 114 114 }; 115 115 } -
trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
r25771 r26022 56 56 namespace WebKit { 57 57 58 FrameLoaderClient::FrameLoaderClient(WebKit GtkFrame* frame)58 FrameLoaderClient::FrameLoaderClient(WebKitFrame* frame) 59 59 : m_frame(frame) 60 60 , m_firstData(false) … … 113 113 void FrameLoaderClient::postProgressStartedNotification() 114 114 { 115 WebKit GtkPage* page = getPageFromFrame(m_frame);115 WebKitPage* page = getPageFromFrame(m_frame); 116 116 g_signal_emit_by_name(page, "load_started", m_frame); 117 117 } … … 119 119 void FrameLoaderClient::postProgressEstimateChangedNotification() 120 120 { 121 WebKit GtkPage* kitPage = getPageFromFrame(m_frame);121 WebKitPage* kitPage = getPageFromFrame(m_frame); 122 122 Page* corePage = core(kitPage); 123 123 … … 127 127 void FrameLoaderClient::postProgressFinishedNotification() 128 128 { 129 WebKit GtkPage* page = getPageFromFrame(m_frame);129 WebKitPage* page = getPageFromFrame(m_frame); 130 130 131 131 g_signal_emit_by_name(page, "load_finished", m_frame); … … 183 183 184 184 ASSERT(core(getPageFromFrame(webFrame())) == coreFrame->page()); 185 WebKit GtkFrame* gtkFrame = WEBKIT_GTK_FRAME(webkit_gtk_frame_init_with_page(getPageFromFrame(webFrame()), ownerElement));185 WebKitFrame* gtkFrame = WEBKIT_FRAME(webkit_frame_init_with_page(getPageFromFrame(webFrame()), ownerElement)); 186 186 Frame* childFrame = core(gtkFrame); 187 187 … … 325 325 void FrameLoaderClient::dispatchDidReceiveIcon() 326 326 { 327 WebKit GtkPage* page = getPageFromFrame(m_frame);327 WebKitPage* page = getPageFromFrame(m_frame); 328 328 329 329 g_signal_emit_by_name(page, "icon_loaded", m_frame); … … 373 373 void FrameLoaderClient::setTitle(const String& title, const KURL& url) 374 374 { 375 WebKit GtkPage* page = getPageFromFrame(m_frame);375 WebKitPage* page = getPageFromFrame(m_frame); 376 376 377 377 CString titleString = title.utf8(); … … 379 379 g_signal_emit_by_name(m_frame, "title_changed", titleString.data(), urlString.data()); 380 380 381 if (m_frame == webkit_ gtk_page_get_main_frame(page))381 if (m_frame == webkit_page_get_main_frame(page)) 382 382 g_signal_emit_by_name(page, "title_changed", titleString.data(), urlString.data()); 383 383 } -
trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h
r25447 r26022 33 33 #include "ResourceResponse.h" 34 34 35 typedef struct _WebKit GtkFrame WebKitGtkFrame;35 typedef struct _WebKitFrame WebKitFrame; 36 36 37 37 namespace WebKit { … … 39 39 class FrameLoaderClient : public WebCore::FrameLoaderClient { 40 40 public: 41 FrameLoaderClient(WebKit GtkFrame*);41 FrameLoaderClient(WebKitFrame*); 42 42 virtual ~FrameLoaderClient() { } 43 43 virtual void frameLoaderDestroyed(); 44 44 45 WebKit GtkFrame* webFrame() const { return m_frame; }45 WebKitFrame* webFrame() const { return m_frame; } 46 46 47 47 virtual bool hasWebView() const; … … 179 179 virtual void download(WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&); 180 180 private: 181 WebKit GtkFrame* m_frame;181 WebKitFrame* m_frame; 182 182 WebCore::ResourceResponse m_response; 183 183 bool m_firstData; -
trunk/WebKitTools/ChangeLog
r26018 r26022 1 2007-10-03 Alp Toker <alp@atoker.com> 2 3 Reviewed by Adam. 4 5 http://bugs.webkit.org/show_bug.cgi?id=14726 6 [gtk] API design. Mapping the WebView delegates to signals. 7 8 Change the API namespace of the Gtk+ port from 'WebKitGtk' to 'WebKit'. 9 10 * GtkLauncher/main.cpp: 11 (goToURLBarText): 12 (titleChanged): 13 (progressChanged): 14 (menuMainBackCallback): 15 (menuMainForwardCallback): 16 (main): 17 1 18 2007-10-03 Lars Knoll <lars@trolltech.com> 2 19 -
trunk/WebKitTools/GtkLauncher/main.cpp
r25703 r26022 8 8 static GtkWidget* gURLBarEntry; 9 9 static GtkWidget* gTopLevelWindow; 10 static WebKit GtkPage* gPage;10 static WebKitPage* gPage; 11 11 static gchar* gTitle; 12 12 static gint gProgress; … … 35 35 36 36 gchar* parsedURL = autocorrectURL(url); 37 webkit_ gtk_page_open(gPage, parsedURL);37 webkit_page_open(gPage, parsedURL); 38 38 g_free(parsedURL); 39 39 } … … 58 58 } 59 59 60 static void titleChanged(WebKit GtkPage*, const gchar* title, const gchar* url, WebKitGtkPage*)60 static void titleChanged(WebKitPage*, const gchar* title, const gchar* url, WebKitPage*) 61 61 { 62 62 gtk_entry_set_text(GTK_ENTRY(gURLBarEntry), url); … … 68 68 } 69 69 70 static void progressChanged(WebKit GtkPage*, gint progress, WebKitGtkPage*)70 static void progressChanged(WebKitPage*, gint progress, WebKitPage*) 71 71 { 72 72 gProgress = progress; … … 82 82 { 83 83 g_assert(!data); 84 webkit_ gtk_page_go_backward(gPage);84 webkit_page_go_backward(gPage); 85 85 } 86 86 … … 88 88 { 89 89 g_assert(!data); 90 webkit_ gtk_page_go_forward(gPage);90 webkit_page_go_forward(gPage); 91 91 } 92 92 … … 99 99 { 100 100 gtk_init(&argc, &argv); 101 webkit_ gtk_init();101 webkit_init(); 102 102 103 103 gchar* url = "http://www.google.com"; … … 170 170 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledWindow), 171 171 GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); 172 gPage = WEBKIT_ GTK_PAGE(webkit_gtk_page_new());172 gPage = WEBKIT_PAGE(webkit_page_new()); 173 173 gtk_container_add(GTK_CONTAINER(scrolledWindow), GTK_WIDGET(gPage)); 174 174 gtk_box_pack_start(GTK_BOX(vbox), scrolledWindow, TRUE, TRUE, 0); … … 176 176 g_signal_connect(gPage, "title-changed", G_CALLBACK(titleChanged), gPage); 177 177 g_signal_connect(gPage, "load-progress-changed", G_CALLBACK(progressChanged), gPage); 178 webkit_ gtk_page_open(gPage, url);178 webkit_page_open(gPage, url); 179 179 180 180 gtk_widget_show_all(gTopLevelWindow);
Note: See TracChangeset
for help on using the changeset viewer.