Changeset 26022 in webkit


Ignore:
Timestamp:
Oct 3, 2007 10:25:43 AM (17 years ago)
Author:
alp
Message:

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'.

Location:
trunk
Files:
23 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r26021 r26022  
     12007-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
    1122007-10-03  Alp Toker  <alp@atoker.com>
    213

  • trunk/WebCore/WebCore.pro

    r25969 r26022  
    15451545
    15461546    GENMARSHALS = ../WebKit/gtk/Api/webkitgtk-marshal.list
    1547     GENMARSHALS_PREFIX = webkit_gtk_marshal
     1547    GENMARSHALS_PREFIX = webkit_marshal
    15481548
    15491549    #

  • trunk/WebKit/gtk/Api/webkitgtkdefines.h

    r25647 r26022  
    2727 */
    2828
    29 #ifndef WEBKIT_GTK_DEFINES_H
    30 #define WEBKIT_GTK_DEFINES_H
     29#ifndef WEBKIT_DEFINES_H
     30#define WEBKIT_DEFINES_H
    3131
    3232#include <glib.h>
    3333
    34 typedef struct _WebKitGtkFrame WebKitGtkFrame;
    35 typedef struct _WebKitGtkFrameClass WebKitGtkFrameClass;
     34typedef struct _WebKitFrame WebKitFrame;
     35typedef struct _WebKitFrameClass WebKitFrameClass;
    3636
    37 typedef struct _WebKitGtkFrameData WebKitGtkFrameData;
    38 typedef struct _WebKitGtkNetworkRequest WebKitGtkNetworkRequest;
     37typedef struct _WebKitFrameData WebKitFrameData;
     38typedef struct _WebKitNetworkRequest WebKitNetworkRequest;
    3939
    40 typedef struct _WebKitGtkPage WebKitGtkPage;
    41 typedef struct _WebKitGtkPageClass WebKitGtkPageClass;
     40typedef struct _WebKitPage WebKitPage;
     41typedef struct _WebKitPageClass WebKitPageClass;
    4242
    4343#ifdef G_OS_WIN32
    4444    #ifdef BUILDING_WEBKIT
    45         #define WEBKIT_GTK_API __declspec(dllexport)
     45        #define WEBKIT_API __declspec(dllexport)
    4646    #else
    47         #define WEBKIT_GTK_API __declspec(dllimport)
     47        #define WEBKIT_API __declspec(dllimport)
    4848    #endif
    4949#else
    50     #define WEBKIT_GTK_API __attribute__((visibility("default")))
     50    #define WEBKIT_API __attribute__((visibility("default")))
    5151#endif
    5252
    53 #ifndef WEBKIT_GTK_API
    54 #define WEBKIT_GTK_API
     53#ifndef WEBKIT_API
     54#define WEBKIT_API
    5555#endif
    5656

  • trunk/WebKit/gtk/Api/webkitgtkframe.cpp

    r25593 r26022  
    4141extern "C" {
    4242
    43 extern void webkit_gtk_marshal_VOID__STRING_STRING (GClosure*     closure,
     43extern void webkit_marshal_VOID__STRING_STRING (GClosure*     closure,
    4444                                                    GValue*       return_value,
    4545                                                    guint         n_param_values,
    … …  
    5656};
    5757
    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(WebKitGtkFrame, webkit_gtk_frame, G_TYPE_OBJECT)
    63 
    64 static void webkit_gtk_frame_finalize(GObject* object)
    65 {
    66     WebKitGtkFramePrivate* privateData = WEBKIT_GTK_FRAME_GET_PRIVATE(WEBKIT_GTK_FRAME(object));
     58static guint webkit_frame_signals[LAST_SIGNAL] = { 0, };
     59
     60static void webkit_frame_real_title_changed(WebKitFrame* frame, gchar* title, gchar* location);
     61
     62G_DEFINE_TYPE(WebKitFrame, webkit_frame, G_TYPE_OBJECT)
     63
     64static void webkit_frame_finalize(GObject* object)
     65{
     66    WebKitFramePrivate* privateData = WEBKIT_FRAME_GET_PRIVATE(WEBKIT_FRAME(object));
    6767    privateData->frame->loader()->cancelAndClear();
    6868    g_free(privateData->title);
    … …  
    7070    delete privateData->frame;
    7171
    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(WebKitGtkFramePrivate));
     72    G_OBJECT_CLASS(webkit_frame_parent_class)->finalize(object);
     73}
     74
     75static void webkit_frame_class_init(WebKitFrameClass* frameClass)
     76{
     77    g_type_class_add_private(frameClass, sizeof(WebKitFramePrivate));
    7878
    7979    /*
    8080     * signals
    8181     */
    82     webkit_gtk_frame_signals[CLEARED] = g_signal_new("cleared",
     82    webkit_frame_signals[CLEARED] = g_signal_new("cleared",
    8383            G_TYPE_FROM_CLASS(frameClass),
    8484            (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
    … …  
    8989            G_TYPE_NONE, 0);
    9090
    91     webkit_gtk_frame_signals[LOAD_DONE] = g_signal_new("load_done",
     91    webkit_frame_signals[LOAD_DONE] = g_signal_new("load_done",
    9292            G_TYPE_FROM_CLASS(frameClass),
    9393            (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
    … …  
    9999            G_TYPE_BOOLEAN);
    100100
    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(WebKitGtkFrameClass, 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,
    108108            G_TYPE_NONE, 2,
    109109            G_TYPE_STRING, G_TYPE_STRING);
    110110
    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",
    112112            G_TYPE_FROM_CLASS(frameClass),
    113113            (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
    … …  
    115115            NULL,
    116116            NULL,
    117             webkit_gtk_marshal_VOID__STRING_STRING,
     117            webkit_marshal_VOID__STRING_STRING,
    118118            G_TYPE_NONE, 2,
    119119            G_TYPE_STRING, G_TYPE_STRING);
    120120
    121     frameClass->title_changed = webkit_gtk_frame_real_title_changed;
     121    frameClass->title_changed = webkit_frame_real_title_changed;
    122122
    123123    /*
    124124     * implementations of virtual methods
    125125     */
    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     WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(frame);
     126    G_OBJECT_CLASS(frameClass)->finalize = webkit_frame_finalize;
     127}
     128
     129static void webkit_frame_real_title_changed(WebKitFrame* frame, gchar* title, gchar* location)
     130{
     131    WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(frame);
    132132    g_free(frameData->title);
    133133    g_free(frameData->location);
    … …  
    136136}
    137137
    138 static void webkit_gtk_frame_init(WebKitGtkFrame* frame)
    139 {
    140 }
    141 
    142 GObject* webkit_gtk_frame_new(WebKitGtkPage* page)
    143 {
    144     WebKitGtkFrame* frame = WEBKIT_GTK_FRAME(g_object_new(WEBKIT_GTK_TYPE_FRAME, NULL));
    145     WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(frame);
    146     WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);
     138static void webkit_frame_init(WebKitFrame* frame)
     139{
     140}
     141
     142GObject* 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);
    147147
    148148    frameData->client = new WebKit::FrameLoaderClient(frame);
    … …  
    162162}
    163163
    164 GObject* webkit_gtk_frame_init_with_page(WebKitGtkPage* page, HTMLFrameOwnerElement* element)
    165 {
    166     WebKitGtkFrame* frame = WEBKIT_GTK_FRAME(g_object_new(WEBKIT_GTK_TYPE_FRAME, NULL));
    167     WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(frame);
    168     WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);
     164GObject* 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);
    169169
    170170    frameData->client = new WebKit::FrameLoaderClient(frame);
    … …  
    181181}
    182182
    183 WebKitGtkPage*
    184 webkit_gtk_frame_get_page(WebKitGtkFrame* frame)
    185 {
    186     WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(frame);
     183WebKitPage*
     184webkit_frame_get_page(WebKitFrame* frame)
     185{
     186    WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(frame);
    187187    return frameData->page;
    188188}
    189189
    190 gchar* webkit_gtk_frame_get_title(WebKitGtkFrame* frame)
    191 {
    192     WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(frame);
     190gchar* webkit_frame_get_title(WebKitFrame* frame)
     191{
     192    WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(frame);
    193193    return frameData->title;
    194194}
    195195
    196 gchar* webkit_gtk_frame_get_location(WebKitGtkFrame* frame)
    197 {
    198     WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(frame);
     196gchar* webkit_frame_get_location(WebKitFrame* frame)
     197{
     198    WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(frame);
    199199    return frameData->location;
    200200}

  • trunk/WebKit/gtk/Api/webkitgtkframe.h

    r25647 r26022  
    2727 */
    2828
    29 #ifndef WEBKIT_GTK_FRAME_H
    30 #define WEBKIT_GTK_FRAME_H
     29#ifndef WEBKIT_FRAME_H
     30#define WEBKIT_FRAME_H
    3131
    3232#include <glib-object.h>
    … …  
    3737G_BEGIN_DECLS
    3838
    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))
    4545
    4646
    47 struct _WebKitGtkFrame {
     47struct _WebKitFrame {
    4848    GObject parent;
    4949};
    5050
    51 struct _WebKitGtkFrameClass {
     51struct _WebKitFrameClass {
    5252    GObjectClass parent;
    5353
    54     void (*title_changed) (WebKitGtkFrame* frame, gchar* title, gchar* location);
     54    void (*title_changed) (WebKitFrame* frame, gchar* title, gchar* location);
    5555
    5656    /*
    5757     * protected virtual methods
    5858     */
    59     void (*mouse_move_event)  (WebKitGtkFrame* frame, GdkEvent* move_event);
    60     void (*mouse_press_event) (WebKitGtkFrame* frame, GdkEvent* press_event);
    61     void (*mouse_release_event) (WebKitGtkFrame* frame, GdkEvent* mouse_release_event);
    62     void (*mouse_double_click_event) (WebKitGtkFrame* frame, GdkEvent* double_click_event);
    63     void (*mouse_wheel_event) (WebKitGtkFrame* 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);
    6464};
    6565
    66 WEBKIT_GTK_API GType
    67 webkit_gtk_frame_get_type (void);
     66WEBKIT_API GType
     67webkit_frame_get_type (void);
    6868
    69 WEBKIT_GTK_API GObject*
    70 webkit_gtk_frame_new (WebKitGtkPage *page);
     69WEBKIT_API GObject*
     70webkit_frame_new (WebKitPage *page);
    7171
    72 WEBKIT_GTK_API WebKitGtkPage*
    73 webkit_gtk_frame_get_page (WebKitGtkFrame* frame);
     72WEBKIT_API WebKitPage*
     73webkit_frame_get_page (WebKitFrame* frame);
    7474
    75 WEBKIT_GTK_API gchar*
    76 webkit_gtk_frame_get_markup (WebKitGtkFrame* frame);
     75WEBKIT_API gchar*
     76webkit_frame_get_markup (WebKitFrame* frame);
    7777
    78 WEBKIT_GTK_API gchar*
    79 webkit_gtk_frame_get_inner_text (WebKitGtkFrame* frame);
     78WEBKIT_API gchar*
     79webkit_frame_get_inner_text (WebKitFrame* frame);
    8080
    81 WEBKIT_GTK_API gchar*
    82 webkit_gtk_frame_get_selected_text (WebKitGtkFrame* frame);
     81WEBKIT_API gchar*
     82webkit_frame_get_selected_text (WebKitFrame* frame);
    8383
    84 WEBKIT_GTK_API gchar*
    85 webkit_gtk_frame_get_title (WebKitGtkFrame* frame);
     84WEBKIT_API gchar*
     85webkit_frame_get_title (WebKitFrame* frame);
    8686
    87 WEBKIT_GTK_API gchar*
    88 webkit_gtk_frame_get_location (WebKitGtkFrame* frame);
     87WEBKIT_API gchar*
     88webkit_frame_get_location (WebKitFrame* frame);
    8989
    90 WEBKIT_GTK_API GSList*
    91 webkit_gtk_frame_get_child_frames (WebKitGtkFrame* frame);
     90WEBKIT_API GSList*
     91webkit_frame_get_child_frames (WebKitFrame* frame);
    9292
    93 WEBKIT_GTK_API GdkPoint*
    94 webkit_gtk_frame_get_position (WebKitGtkFrame* frame);
     93WEBKIT_API GdkPoint*
     94webkit_frame_get_position (WebKitFrame* frame);
    9595
    96 WEBKIT_GTK_API GdkRectangle*
    97 webkit_gtk_frame_get_rectangle (WebKitGtkFrame* frame);
     96WEBKIT_API GdkRectangle*
     97webkit_frame_get_rectangle (WebKitFrame* frame);
    9898
    99 WEBKIT_GTK_API WebKitGtkPage*
    100 webkit_gtk_frame_get_page (WebKitGtkFrame* frame);
     99WEBKIT_API WebKitPage*
     100webkit_frame_get_page (WebKitFrame* frame);
    101101
    102102G_END_DECLS

  • trunk/WebKit/gtk/Api/webkitgtkglobal.cpp

    r24537 r26022  
    3333
    3434extern "C" {
    35 void webkit_gtk_init(void)
     35void webkit_init(void)
    3636{
    3737    WebCore::InitializeLoggingChannelsIfNecessary();

  • trunk/WebKit/gtk/Api/webkitgtkglobal.h

    r24537 r26022  
    2727 */
    2828
    29 #ifndef WEBKIT_GTK_GLOBAL_H
    30 #define WEBKIT_GTK_GLOBAL_H
     29#ifndef WEBKIT_GLOBAL_H
     30#define WEBKIT_GLOBAL_H
    3131
    3232#include "webkitgtkdefines.h"
    … …  
    3434G_BEGIN_DECLS
    3535
    36 WEBKIT_GTK_API void
    37 webkit_gtk_init (void);
     36WEBKIT_API void
     37webkit_init (void);
    3838
    3939G_END_DECLS

  • trunk/WebKit/gtk/Api/webkitgtknetworkrequest.h

    r24537 r26022  
    2727 */
    2828
    29 #ifndef WEBKIT_GTK_NETWORK_REQUEST_H
    30 #define WEBKIT_GTK_NETWORK_REQUEST_H
     29#ifndef WEBKIT_NETWORK_REQUEST_H
     30#define WEBKIT_NETWORK_REQUEST_H
    3131
    3232#include <glib-object.h>
    … …  
    3636G_BEGIN_DECLS
    3737
    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))
    4444
    4545
    46 typedef struct _WebKitGtkNetworkRequest WebKitGtkNetworkRequest;
    47 typedef struct _WebKitGtkNetworkRequestClass WebKitGtkNetworkRequestClass;
     46typedef struct _WebKitNetworkRequest WebKitNetworkRequest;
     47typedef struct _WebKitNetworkRequestClass WebKitNetworkRequestClass;
    4848
    49 struct _WebKitGtkNetworkRequest {
     49struct _WebKitNetworkRequest {
    5050    GObject parent;
    5151};
    5252
    53 struct _WebKitGtkNetworkRequestClass {
     53struct _WebKitNetworkRequestClass {
    5454    GObject parent;
    5555};
    5656
    57 WEBKIT_GTK_API GType
    58 webkit_gtk_network_request_get_type (void);
     57WEBKIT_API GType
     58webkit_network_request_get_type (void);
    5959
    60 WEBKIT_GTK_API GObject*
    61 webkit_gtk_network_request_new (void);
     60WEBKIT_API GObject*
     61webkit_network_request_new (void);
    6262
    6363G_END_DECLS

  • trunk/WebKit/gtk/Api/webkitgtkpage.cpp

    r26019 r26022  
    6868};
    6969
    70 static guint webkit_gtk_page_signals[LAST_SIGNAL] = { 0, };
    71 
    72 G_DEFINE_TYPE(WebKitGtkPage, 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)));
     70static guint webkit_page_signals[LAST_SIGNAL] = { 0, };
     71
     72G_DEFINE_TYPE(WebKitPage, webkit_page, GTK_TYPE_CONTAINER)
     73
     74static gboolean webkit_page_expose_event(GtkWidget* widget, GdkEventExpose* event)
     75{
     76    Frame* frame = core(getFrameFromPage(WEBKIT_PAGE(widget)));
    7777    GdkRectangle clip;
    7878    gdk_region_get_clipbox(event->region, &clip);
    … …  
    9090}
    9191
    92 static gboolean webkit_gtk_page_key_event(GtkWidget* widget, GdkEventKey* event)
    93 {
    94     Frame* frame = core(getFrameFromPage(WEBKIT_GTK_PAGE(widget)));
     92static gboolean webkit_page_key_event(GtkWidget* widget, GdkEventKey* event)
     93{
     94    Frame* frame = core(getFrameFromPage(WEBKIT_PAGE(widget)));
    9595    frame->eventHandler()->keyEvent(PlatformKeyboardEvent(event));
    9696    return FALSE;
    9797}
    9898
    99 static gboolean webkit_gtk_page_button_event(GtkWidget* widget, GdkEventButton* event)
    100 {
    101     Frame* frame = core(getFrameFromPage(WEBKIT_GTK_PAGE(widget)));
     99static gboolean webkit_page_button_event(GtkWidget* widget, GdkEventButton* event)
     100{
     101    Frame* frame = core(getFrameFromPage(WEBKIT_PAGE(widget)));
    102102
    103103    if (event->type == GDK_BUTTON_RELEASE)
    … …  
    109109}
    110110
    111 static gboolean webkit_gtk_page_motion_event(GtkWidget* widget, GdkEventMotion* event)
    112 {
    113     Frame* frame = core(getFrameFromPage(WEBKIT_GTK_PAGE(widget)));
     111static gboolean webkit_page_motion_event(GtkWidget* widget, GdkEventMotion* event)
     112{
     113    Frame* frame = core(getFrameFromPage(WEBKIT_PAGE(widget)));
    114114    frame->eventHandler()->mouseMoved(PlatformMouseEvent(event));
    115115    return FALSE;
    116116}
    117117
    118 static gboolean webkit_gtk_page_scroll_event(GtkWidget* widget, GdkEventScroll* event)
    119 {
    120     Frame* frame = core(getFrameFromPage(WEBKIT_GTK_PAGE(widget)));
     118static gboolean webkit_page_scroll_event(GtkWidget* widget, GdkEventScroll* event)
     119{
     120    Frame* frame = core(getFrameFromPage(WEBKIT_PAGE(widget)));
    121121
    122122    PlatformWheelEvent wheelEvent(event);
    … …  
    125125}
    126126
    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)));
     127static 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)));
    132132    frame->view()->resize(allocation->width, allocation->height);
    133133    frame->forceLayout();
    … …  
    136136}
    137137
    138 static void webkit_gtk_page_realize(GtkWidget* widget)
     138static void webkit_page_realize(GtkWidget* widget)
    139139{
    140140    GTK_WIDGET_SET_FLAGS(widget, GTK_REALIZED);
    … …  
    166166}
    167167
    168 static void webkit_gtk_page_map(GtkWidget* widget)
     168static void webkit_page_map(GtkWidget* widget)
    169169{
    170170    GTK_WIDGET_SET_FLAGS(widget, GTK_MAPPED);
    171     WebKitGtkPagePrivate* private_data = WEBKIT_GTK_PAGE_GET_PRIVATE(WEBKIT_GTK_PAGE(widget));
     171    WebKitPagePrivate* private_data = WEBKIT_PAGE_GET_PRIVATE(WEBKIT_PAGE(widget));
    172172
    173173    HashSet<GtkWidget*>::const_iterator end = private_data->children.end();
    … …  
    179179}
    180180
    181 static void webkit_gtk_page_set_scroll_adjustments(WebKitGtkPage* page, GtkAdjustment* hadj, GtkAdjustment* vadj)
     181static void webkit_page_set_scroll_adjustments(WebKitPage* page, GtkAdjustment* hadj, GtkAdjustment* vadj)
    182182{
    183183    FrameView* view = core(getFrameFromPage(page))->view();
    … …  
    185185}
    186186
    187 static void webkit_gtk_page_container_add(GtkContainer* container, GtkWidget* widget)
    188 {
    189     WebKitGtkPage* page = WEBKIT_GTK_PAGE(container);
    190     WebKitGtkPagePrivate* private_data = WEBKIT_GTK_PAGE_GET_PRIVATE(page);
     187static 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);
    191191
    192192    private_data->children.add(widget);
    … …  
    196196}
    197197
    198 static void webkit_gtk_page_container_remove(GtkContainer* container, GtkWidget* widget)
    199 {
    200     WebKitGtkPagePrivate* private_data = WEBKIT_GTK_PAGE_GET_PRIVATE(WEBKIT_GTK_PAGE(container));
     198static void webkit_page_container_remove(GtkContainer* container, GtkWidget* widget)
     199{
     200    WebKitPagePrivate* private_data = WEBKIT_PAGE_GET_PRIVATE(WEBKIT_PAGE(container));
    201201
    202202    if (private_data->children.contains(widget)) {
    … …  
    206206}
    207207
    208 static void webkit_gtk_page_container_forall(GtkContainer* container, gboolean, GtkCallback callback, gpointer callbackData)
    209 {
    210     WebKitGtkPagePrivate* privateData = WEBKIT_GTK_PAGE_GET_PRIVATE(WEBKIT_GTK_PAGE(container));
     208static void webkit_page_container_forall(GtkContainer* container, gboolean, GtkCallback callback, gpointer callbackData)
     209{
     210    WebKitPagePrivate* privateData = WEBKIT_PAGE_GET_PRIVATE(WEBKIT_PAGE(container));
    211211
    212212    HashSet<GtkWidget*> children = privateData->children;
    … …  
    216216}
    217217
    218 static WebKitGtkPage* webkit_gtk_page_real_create_page(WebKitGtkPage*)
     218static WebKitPage* webkit_page_real_create_page(WebKitPage*)
    219219{
    220220    notImplemented();
    … …  
    222222}
    223223
    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)
     224static WEBKIT_NAVIGATION_REQUEST_RESPONSE webkit_page_real_navigation_requested(WebKitPage*, WebKitFrame* frame, WebKitNetworkRequest*)
     225{
     226    notImplemented();
     227    return WEBKIT_ACCEPT_NAVIGATION_REQUEST;
     228}
     229
     230static gchar* webkit_page_real_choose_file(WebKitPage*, WebKitFrame*, const gchar* old_name)
    231231{
    232232    notImplemented();
    … …  
    234234}
    235235
    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*)
     236static void webkit_page_real_java_script_alert(WebKitPage*, WebKitFrame*, const gchar*)
     237{
     238    notImplemented();
     239}
     240
     241static gboolean webkit_page_real_java_script_confirm(WebKitPage*, WebKitFrame*, const gchar*)
    242242{
    243243    notImplemented();
    … …  
    246246
    247247/**
    248  * WebKitGtkPage::java_script_prompt
     248 * WebKitPage::java_script_prompt
    249249 *
    250250 * @return: NULL to cancel the prompt
    251251 */
    252 static gchar* webkit_gtk_page_real_java_script_prompt(WebKitGtkPage*, WebKitGtkFrame*, const gchar*, const gchar* defaultValue)
     252static gchar* webkit_page_real_java_script_prompt(WebKitPage*, WebKitFrame*, const gchar*, const gchar* defaultValue)
    253253{
    254254    notImplemented();
    … …  
    256256}
    257257
    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     WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(WEBKIT_GTK_PAGE(object));
     258static void webkit_page_real_java_script_console_message(WebKitPage*, const gchar*, unsigned int, const gchar*)
     259{
     260    notImplemented();
     261}
     262
     263static 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));
    268268    delete pageData->page;
    269269    delete pageData->settings;
    … …  
    271271    delete pageData->userAgent;
    272272
    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(WebKitGtkPagePrivate));
     273    G_OBJECT_CLASS(webkit_page_parent_class)->finalize(object);
     274}
     275
     276static void webkit_page_class_init(WebKitPageClass* pageClass)
     277{
     278    g_type_class_add_private(pageClass, sizeof(WebKitPagePrivate));
    279279
    280280
    … …  
    283283     */
    284284    /**
    285      * WebKitGtkPage::load-started
     285     * WebKitPage::load-started
    286286     * @page: the object on which the signal is emitted
    287287     * @frame: the frame going to do the load
    288288     *
    289      * When a WebKitGtkFrame begins to load this signal is emitted.
     289     * When a WebKitFrame begins to load this signal is emitted.
    290290     */
    291     webkit_gtk_page_signals[LOAD_STARTED] = g_signal_new("load_started",
     291    webkit_page_signals[LOAD_STARTED] = g_signal_new("load_started",
    292292            G_TYPE_FROM_CLASS(pageClass),
    293293            (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
    … …  
    297297            g_cclosure_marshal_VOID__OBJECT,
    298298            G_TYPE_NONE, 1,
    299             WEBKIT_GTK_TYPE_FRAME);
     299            WEBKIT_TYPE_FRAME);
    300300
    301301    /**
    302      * WebKitGtkPage::load-progress-changed
    303      * @page: The WebKitGtkPage
     302     * WebKitPage::load-progress-changed
     303     * @page: The WebKitPage
    304304     * @progress: Global progress
    305305     */
    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",
    307307            G_TYPE_FROM_CLASS(pageClass),
    308308            (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
    … …  
    314314            G_TYPE_INT);
    315315   
    316     webkit_gtk_page_signals[LOAD_FINISHED] = g_signal_new("load_finished",
     316    webkit_page_signals[LOAD_FINISHED] = g_signal_new("load_finished",
    317317            G_TYPE_FROM_CLASS(pageClass),
    318318            (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
    … …  
    322322            g_cclosure_marshal_VOID__OBJECT,
    323323            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,
    333333            G_TYPE_NONE, 2,
    334334            G_TYPE_STRING, G_TYPE_STRING);
    335335
    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,
    343343            G_TYPE_NONE, 2,
    344344            G_TYPE_STRING,
    345345            G_TYPE_STRING);
    346346
    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",
    348348            G_TYPE_FROM_CLASS(pageClass),
    349349            (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
    … …  
    355355            G_TYPE_STRING);
    356356
    357     webkit_gtk_page_signals[ICOND_LOADED] = g_signal_new("icon_loaded",
     357    webkit_page_signals[ICOND_LOADED] = g_signal_new("icon_loaded",
    358358            G_TYPE_FROM_CLASS(pageClass),
    359359            (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
    … …  
    364364            G_TYPE_NONE, 0);
    365365
    366     webkit_gtk_page_signals[SELECTION_CHANGED] = g_signal_new("selection_changed",
     366    webkit_page_signals[SELECTION_CHANGED] = g_signal_new("selection_changed",
    367367            G_TYPE_FROM_CLASS(pageClass),
    368368            (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
    … …  
    377377     * implementations of virtual methods
    378378     */
    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;
    388388
    389389    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;
    400400
    401401    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;
    405405
    406406    /*
    407407     * make us scrollable (e.g. addable to a GtkScrolledWindow)
    408408     */
    409     pageClass->set_scroll_adjustments = webkit_gtk_page_set_scroll_adjustments;
     409    pageClass->set_scroll_adjustments = webkit_page_set_scroll_adjustments;
    410410    GTK_WIDGET_CLASS(pageClass)->set_scroll_adjustments_signal = g_signal_new("set_scroll_adjustments",
    411411            G_TYPE_FROM_CLASS(pageClass),
    412412            (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
    413             G_STRUCT_OFFSET(WebKitGtkPageClass, set_scroll_adjustments),
     413            G_STRUCT_OFFSET(WebKitPageClass, set_scroll_adjustments),
    414414            NULL, NULL,
    415             webkit_gtk_marshal_VOID__OBJECT_OBJECT,
     415            webkit_marshal_VOID__OBJECT_OBJECT,
    416416            G_TYPE_NONE, 2,
    417417            GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
    418418}
    419419
    420 static void webkit_gtk_page_init(WebKitGtkPage* page)
    421 {
    422     WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(WEBKIT_GTK_PAGE(page));
     420static void webkit_page_init(WebKitPage* page)
     421{
     422    WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(WEBKIT_PAGE(page));
    423423    pageData->page = new Page(new WebKit::ChromeClient(page), new WebKit::ContextMenuClient, new WebKit::EditorClient(page), new WebKit::DragClient, new WebKit::InspectorClient);
    424424
    … …  
    437437
    438438    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     WebKitGtkPage* page = WEBKIT_GTK_PAGE(g_object_new(WEBKIT_GTK_TYPE_PAGE, NULL));
     439    pageData->mainFrame = WEBKIT_FRAME(webkit_frame_new(page));
     440}
     441
     442GtkWidget* webkit_page_new(void)
     443{
     444    WebKitPage* page = WEBKIT_PAGE(g_object_new(WEBKIT_TYPE_PAGE, NULL));
    445445
    446446    return GTK_WIDGET(page);
    447447}
    448448
    449 void webkit_gtk_page_set_settings(WebKitGtkPage* page, WebKitGtkSettings* settings)
    450 {
    451     notImplemented();
    452 }
    453 
    454 WebKitGtkSettings* webkit_gtk_page_get_settings(WebKitGtkPage* page)
     449void webkit_page_set_settings(WebKitPage* page, WebKitSettings* settings)
     450{
     451    notImplemented();
     452}
     453
     454WebKitSettings* webkit_page_get_settings(WebKitPage* page)
    455455{
    456456    notImplemented();
    … …  
    458458}
    459459
    460 void webkit_gtk_page_go_backward(WebKitGtkPage* page)
    461 {
    462     WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);
    463     WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(pageData->mainFrame);
     460void webkit_page_go_backward(WebKitPage* page)
     461{
     462    WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
     463    WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame);
    464464    frameData->frame->loader()->goBackOrForward(-1);
    465465}
    466466
    467 void webkit_gtk_page_go_forward(WebKitGtkPage* page)
    468 {
    469     WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);
    470     WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(pageData->mainFrame);
     467void webkit_page_go_forward(WebKitPage* page)
     468{
     469    WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
     470    WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame);
    471471    frameData->frame->loader()->goBackOrForward(1);
    472472}
    473473
    474 gboolean webkit_gtk_page_can_go_backward(WebKitGtkPage* page)
    475 {
    476     WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);
    477     WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(pageData->mainFrame);
     474gboolean 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);
    478478    return frameData->frame->loader()->canGoBackOrForward(-1);
    479479}
    480480
    481 gboolean webkit_gtk_page_can_go_forward(WebKitGtkPage* page)
    482 {
    483     WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);
    484     WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(pageData->mainFrame);
     481gboolean 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);
    485485    return frameData->frame->loader()->canGoBackOrForward(1);
    486486}
    487487
    488 void webkit_gtk_page_open(WebKitGtkPage* page, const gchar* url)
    489 {
    490     WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);
    491     WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(pageData->mainFrame);
     488void 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);
    492492
    493493    DeprecatedString string = DeprecatedString::fromUtf8(url);
    … …  
    495495}
    496496
    497 void webkit_gtk_page_reload(WebKitGtkPage* page)
    498 {
    499     WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);
    500     WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(pageData->mainFrame);
     497void webkit_page_reload(WebKitPage* page)
     498{
     499    WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
     500    WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame);
    501501    frameData->frame->loader()->reload();
    502502}
    503503
    504 void webkit_gtk_page_load_string(WebKitGtkPage* page, const gchar* content, const gchar* contentMimeType, const gchar* contentEncoding, const gchar* baseUrl)
    505 {
    506     WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);
    507     WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(pageData->mainFrame);
     504void 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);
    508508   
    509509    KURL url(DeprecatedString::fromUtf8(baseUrl));
    … …  
    514514}
    515515
    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     WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);
    524     WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(pageData->mainFrame);
     516void 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
     521void webkit_page_stop_loading(WebKitPage* page)
     522{
     523    WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
     524    WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame);
    525525   
    526526    if (FrameLoader* loader = frameData->frame->loader())
    … …  
    529529}
    530530
    531 WebKitGtkFrame* webkit_gtk_page_get_main_frame(WebKitGtkPage* page)
    532 {
    533     WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);
     531WebKitFrame* webkit_page_get_main_frame(WebKitPage* page)
     532{
     533    WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
    534534    return pageData->mainFrame;
    535535}
    536536
    537 void webkit_gtk_page_execute_script(WebKitGtkPage* page, const gchar* script)
    538 {
    539     WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);
    540     WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(pageData->mainFrame);
     537void 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);
    541541
    542542    if (FrameLoader* loader = frameData->frame->loader())

  • trunk/WebKit/gtk/Api/webkitgtkpage.h

    r26019 r26022  
    2727 */
    2828
    29 #ifndef WEBKIT_GTK_PAGE_H
    30 #define WEBKIT_GTK_PAGE_H
     29#ifndef WEBKIT_PAGE_H
     30#define WEBKIT_PAGE_H
    3131
    3232#include <gtk/gtk.h>
    … …  
    3737G_BEGIN_DECLS
    3838
    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))
    4545
    4646
    4747typedef enum {
    48     WEBKIT_GTK_ACCEPT_NAVIGATION_REQUEST,
    49     WEBKIT_GTK_IGNORE_NAVIGATION_REQUEST,
    50     WEBKIT_GTK_DOWNLOAD_NAVIGATION_REQUEST
    51 } 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;
    5252
    5353
    5454
    55 struct _WebKitGtkPage {
     55struct _WebKitPage {
    5656    GtkContainer parent;
    5757};
    5858
    59 struct _WebKitGtkPageClass {
     59struct _WebKitPageClass {
    6060    GtkContainerClass parent;
    6161
    … …  
    6666     * WebUIDelegate has nothing for create_frame, WebPolicyDelegate as well...
    6767     */
    68     WebKitGtkPage*  (*create_page)  (WebKitGtkPage* page);
     68    WebKitPage*  (*create_page)  (WebKitPage* page);
    6969
    7070    /*
    7171     * TODO: FIXME: Create something like WebPolicyDecisionListener_Protocol instead
    7272     */
    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);
    7474
    7575    /*
    7676     * TODO: DISCUSS: Should these be signals as well?
    7777     */
    78     gchar* (*choose_file) (WebKitGtkPage* page, WebKitGtkFrame* frame, const gchar* old_file);
    79     void   (*java_script_alert) (WebKitGtkPage* page, WebKitGtkFrame* frame, const gchar* alert_message);
    80     gboolean   (*java_script_confirm) (WebKitGtkPage* page, WebKitGtkFrame* frame, const gchar* confirm_message);
    81     gchar* (*java_script_prompt) (WebKitGtkPage* page, WebKitGtkFrame* frame, const gchar* message, const gchar* default_value);
    82     void   (*java_script_console_message) (WebKitGtkPage*, 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);
    8383
    8484    /*
    8585     * internal
    8686     */
    87     void   (*set_scroll_adjustments) (WebKitGtkPage*, GtkAdjustment*, GtkAdjustment*);
     87    void   (*set_scroll_adjustments) (WebKitPage*, GtkAdjustment*, GtkAdjustment*);
    8888};
    8989
    90 WEBKIT_GTK_API GType
    91 webkit_gtk_page_get_type (void);
     90WEBKIT_API GType
     91webkit_page_get_type (void);
    9292
    93 WEBKIT_GTK_API GtkWidget*
    94 webkit_gtk_page_new (void);
     93WEBKIT_API GtkWidget*
     94webkit_page_new (void);
    9595
    96 WEBKIT_GTK_API void
    97 webkit_gtk_page_set_settings (WebKitGtkPage* page, WebKitGtkSettings* settings);
     96WEBKIT_API void
     97webkit_page_set_settings (WebKitPage* page, WebKitSettings* settings);
    9898
    99 WEBKIT_GTK_API WebKitGtkSettings*
    100 webkit_gtk_page_get_settings (WebKitGtkPage* page);
     99WEBKIT_API WebKitSettings*
     100webkit_page_get_settings (WebKitPage* page);
    101101
    102 WEBKIT_GTK_API gboolean
    103 webkit_gtk_page_can_cut (WebKitGtkPage* page);
     102WEBKIT_API gboolean
     103webkit_page_can_cut (WebKitPage* page);
    104104
    105 WEBKIT_GTK_API gboolean
    106 webkit_gtk_page_can_copy (WebKitGtkPage* page);
     105WEBKIT_API gboolean
     106webkit_page_can_copy (WebKitPage* page);
    107107
    108 WEBKIT_GTK_API gboolean
    109 webkit_gtk_page_can_paste (WebKitGtkPage* page);
     108WEBKIT_API gboolean
     109webkit_page_can_paste (WebKitPage* page);
    110110
    111 WEBKIT_GTK_API void
    112 webkit_gtk_page_cut (WebKitGtkPage* page);
     111WEBKIT_API void
     112webkit_page_cut (WebKitPage* page);
    113113
    114 WEBKIT_GTK_API void
    115 webkit_gtk_page_copy (WebKitGtkPage* page);
     114WEBKIT_API void
     115webkit_page_copy (WebKitPage* page);
    116116
    117 WEBKIT_GTK_API void
    118 webkit_gtk_page_paste (WebKitGtkPage* page);
     117WEBKIT_API void
     118webkit_page_paste (WebKitPage* page);
    119119
    120 WEBKIT_GTK_API gboolean
    121 webkit_gtk_page_can_go_backward (WebKitGtkPage* page);
     120WEBKIT_API gboolean
     121webkit_page_can_go_backward (WebKitPage* page);
    122122
    123 WEBKIT_GTK_API gboolean
    124 webkit_gtk_page_can_go_forward (WebKitGtkPage* page);
     123WEBKIT_API gboolean
     124webkit_page_can_go_forward (WebKitPage* page);
    125125
    126 WEBKIT_GTK_API void
    127 webkit_gtk_page_go_backward (WebKitGtkPage* page);
     126WEBKIT_API void
     127webkit_page_go_backward (WebKitPage* page);
    128128
    129 WEBKIT_GTK_API void
    130 webkit_gtk_page_go_forward (WebKitGtkPage* page);
     129WEBKIT_API void
     130webkit_page_go_forward (WebKitPage* page);
    131131
    132 WEBKIT_GTK_API void
    133 webkit_gtk_page_stop_loading (WebKitGtkPage* page);
     132WEBKIT_API void
     133webkit_page_stop_loading (WebKitPage* page);
    134134
    135 WEBKIT_GTK_API void
    136 webkit_gtk_page_open (WebKitGtkPage* page, const gchar* url);
     135WEBKIT_API void
     136webkit_page_open (WebKitPage* page, const gchar* url);
    137137
    138 WEBKIT_GTK_API void
    139 webkit_gtk_page_reload (WebKitGtkPage *page);
     138WEBKIT_API void
     139webkit_page_reload (WebKitPage *page);
    140140
    141 WEBKIT_GTK_API void
    142 webkit_gtk_page_load_string (WebKitGtkPage* page, const gchar* content, const gchar* content_mime_type, const gchar* content_encoding, const gchar* base_url);
     141WEBKIT_API void
     142webkit_page_load_string (WebKitPage* page, const gchar* content, const gchar* content_mime_type, const gchar* content_encoding, const gchar* base_url);
    143143
    144 WEBKIT_GTK_API void
    145 webkit_gtk_page_load_html_string (WebKitGtkPage* page, const gchar* content, const gchar* base_url);
     144WEBKIT_API void
     145webkit_page_load_html_string (WebKitPage* page, const gchar* content, const gchar* base_url);
    146146
    147 WEBKIT_GTK_API WebKitGtkFrame*
    148 webkit_gtk_page_get_main_frame (WebKitGtkPage* page);
     147WEBKIT_API WebKitFrame*
     148webkit_page_get_main_frame (WebKitPage* page);
    149149
    150 WEBKIT_GTK_API void
    151 webkit_gtk_page_execute_script(WebKitGtkPage* page, const gchar* script);
     150WEBKIT_API void
     151webkit_page_execute_script(WebKitPage* page, const gchar* script);
    152152G_END_DECLS
    153153

  • trunk/WebKit/gtk/Api/webkitgtkprivate.cpp

    r24978 r26022  
    3838
    3939namespace WebKit {
    40 void apply(WebKitGtkSettings*, WebCore::Settings*)
     40void apply(WebKitSettings*, WebCore::Settings*)
    4141{
    4242    notImplemented();
    4343}
    4444
    45 WebKitGtkSettings* create(WebCore::Settings*)
     45WebKitSettings* create(WebCore::Settings*)
    4646{
    4747    notImplemented();
    … …  
    4949}
    5050
    51 WebKitGtkFrame* getFrameFromPage(WebKitGtkPage* page)
     51WebKitFrame* getFrameFromPage(WebKitPage* page)
    5252{
    53     return webkit_gtk_page_get_main_frame(page);
     53    return webkit_page_get_main_frame(page);
    5454}
    5555
    56 WebKitGtkPage* getPageFromFrame(WebKitGtkFrame* frame)
     56WebKitPage* getPageFromFrame(WebKitFrame* frame)
    5757{
    58     return webkit_gtk_frame_get_page(frame);
     58    return webkit_frame_get_page(frame);
    5959}
    6060
    61 WebCore::Frame* core(WebKitGtkFrame* frame)
     61WebCore::Frame* core(WebKitFrame* frame)
    6262{
    63     WebKitGtkFramePrivate* frame_data = WEBKIT_GTK_FRAME_GET_PRIVATE(frame);
     63    WebKitFramePrivate* frame_data = WEBKIT_FRAME_GET_PRIVATE(frame);
    6464    return frame_data->frame;
    6565}
    6666
    67 WebKitGtkFrame* kit(WebCore::Frame* coreFrame)
     67WebKitFrame* kit(WebCore::Frame* coreFrame)
    6868{
    6969    WebKit::FrameLoaderClient* client = static_cast<WebKit::FrameLoaderClient*>(coreFrame->loader()->client());
    … …  
    7171}
    7272
    73 WebCore::Page* core(WebKitGtkPage* page)
     73WebCore::Page* core(WebKitPage* page)
    7474{
    75     WebKitGtkPagePrivate* page_data = WEBKIT_GTK_PAGE_GET_PRIVATE(page);
     75    WebKitPagePrivate* page_data = WEBKIT_PAGE_GET_PRIVATE(page);
    7676    return page_data->page;
    7777}
    7878
    79 WebKitGtkPage* kit(WebCore::Page* page)
     79WebKitPage* kit(WebCore::Page* page)
    8080{
    8181    WebKit::ChromeClient* client = static_cast<WebKit::ChromeClient*>(page->chrome()->client());

  • trunk/WebKit/gtk/Api/webkitgtkprivate.h

    r25593 r26022  
    2727 */
    2828
    29 #ifndef WEBKIT_GTK_PRIVATE_H
    30 #define WEBKIT_GTK_PRIVATE_H
     29#ifndef WEBKIT_PRIVATE_H
     30#define WEBKIT_PRIVATE_H
    3131
    3232/*
    33  * Internal class. This class knows the shared secret of WebKitGtkFrame,
    34  * WebKitGtkNetworkRequest and WebKitGtkPage.
     33 * Internal class. This class knows the shared secret of WebKitFrame,
     34 * WebKitNetworkRequest and WebKitPage.
    3535 * They are using WebCore which musn't be exposed to the outer world.
    3636 */
    … …  
    4848
    4949namespace WebKit {
    50     void apply(WebKitGtkSettings*,WebCore::Settings*);
    51     WebKitGtkSettings* create(WebCore::Settings*);
    52     WebKitGtkFrame*  getFrameFromPage(WebKitGtkPage*);
    53     WebKitGtkPage* getPageFromFrame(WebKitGtkFrame*);
     50    void apply(WebKitSettings*,WebCore::Settings*);
     51    WebKitSettings* create(WebCore::Settings*);
     52    WebKitFrame*  getFrameFromPage(WebKitPage*);
     53    WebKitPage* getPageFromFrame(WebKitFrame*);
    5454
    55     WebCore::Frame* core(WebKitGtkFrame*);
    56     WebKitGtkFrame* kit(WebCore::Frame*);
    57     WebCore::Page* core(WebKitGtkPage*);
    58     WebKitGtkPage* kit(WebCore::Page*);
     55    WebCore::Frame* core(WebKitFrame*);
     56    WebKitFrame* kit(WebCore::Frame*);
     57    WebCore::Page* core(WebKitPage*);
     58    WebKitPage* kit(WebCore::Page*);
    5959}
    6060
    6161extern "C" {
    62     #define WEBKIT_GTK_PAGE_GET_PRIVATE(obj)    (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_GTK_TYPE_PAGE, WebKitGtkPagePrivate))
    63     typedef struct _WebKitGtkPagePrivate WebKitGtkPagePrivate;
    64     struct _WebKitGtkPagePrivate {
     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 {
    6565        WebCore::Page* page;
    6666        WebCore::Settings* settings;
    6767
    68         WebKitGtkFrame* mainFrame;
     68        WebKitFrame* mainFrame;
    6969        WebCore::String applicationNameForUserAgent;
    7070        WebCore::String* userAgent;
    … …  
    7373    };
    7474   
    75     #define WEBKIT_GTK_FRAME_GET_PRIVATE(obj)    (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_GTK_TYPE_FRAME, WebKitGtkFramePrivate))
    76     typedef struct _WebKitGtkFramePrivate WebKitGtkFramePrivate;
    77     struct _WebKitGtkFramePrivate {
     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 {
    7878        WebCore::Frame* frame;
    7979        WebCore::FrameLoaderClient* client;
    80         WebKitGtkPage* page;
     80        WebKitPage* page;
    8181
    8282        gchar* title;
    … …  
    8585
    8686
    87     GObject* webkit_gtk_frame_init_with_page(WebKitGtkPage*, WebCore::HTMLFrameOwnerElement*);
     87    GObject* webkit_frame_init_with_page(WebKitPage*, WebCore::HTMLFrameOwnerElement*);
    8888}
    8989

  • trunk/WebKit/gtk/Api/webkitgtksettings.cpp

    r24537 r26022  
    3232
    3333extern "C" {
    34 GType webkit_gtk_web_settings_get_type(void)
     34GType webkit_web_settings_get_type(void)
    3535{
    3636}
    3737
    38 WebKitGtkSettings* webkit_gtk_web_settings_copy(WebKitGtkSettings* setting)
     38WebKitSettings* webkit_web_settings_copy(WebKitSettings* setting)
    3939{
    4040}
    4141
    42 void webkit_gtk_web_settings_free(WebKitGtkSettings* setting)
     42void webkit_web_settings_free(WebKitSettings* setting)
    4343{
    4444}
    4545
    46 WebKitGtkSettings* webkit_gtk_web_settings_get_global(void)
     46WebKitSettings* webkit_web_settings_get_global(void)
    4747{
    4848}
    4949
    50 void webkit_gtk_web_settings_set_global (WebKitGtkSettings* setting)
     50void webkit_web_settings_set_global (WebKitSettings* setting)
    5151{
    5252}
    5353
    54 void webkit_gtk_web_settings_set_font_family(WebKitGtkSettings*, WebKitGtkFontFamily family, gchar* family_name)
     54void webkit_web_settings_set_font_family(WebKitSettings*, WebKitFontFamily family, gchar* family_name)
    5555{
    5656}
    5757
    58 gchar* webkit_gtk_web_settings_get_font_family(WebKitGtkSettings*, WebKitGtkFontFamily family)
     58gchar* webkit_web_settings_get_font_family(WebKitSettings*, WebKitFontFamily family)
    5959{
    6060}
    6161
    62 void webkit_gtk_web_settings_set_user_style_sheet_location(WebKitGtkSettings*, gchar*)
     62void webkit_web_settings_set_user_style_sheet_location(WebKitSettings*, gchar*)
    6363{
    6464}
    6565
    66 void webkit_gtk_set_ftp_directory_template_path(WebKitGtkSettings*, gchar*)
     66void webkit_set_ftp_directory_template_path(WebKitSettings*, gchar*)
    6767{
    6868}

  • trunk/WebKit/gtk/Api/webkitgtksettings.h

    r24537 r26022  
    2727 */
    2828
    29 #ifndef WEBKIT_GTK_SETTINGS_H
    30 #define WEBKIT_GTK_SETTINGS_H
     29#ifndef WEBKIT_SETTINGS_H
     30#define WEBKIT_SETTINGS_H
    3131
    3232#include <glib.h>
    … …  
    3838
    3939typedef 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_ENTRY
    47 } WebKitGtkFontFamily;
     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;
    4848
    4949typedef 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_LIVE
    55 } WebKitGtkEditableLinkBehaviour;
     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;
    5656
    57 typedef struct _WebKitGtkSettings WebKitGtkSettings;
    58 typedef struct _WebKitGtkSettingsPrivate WebKitGtkSettingsPrivate;
     57typedef struct _WebKitSettings WebKitSettings;
     58typedef struct _WebKitSettingsPrivate WebKitSettingsPrivate;
    5959
    60 struct _WebKitGtkSettings {
    61     gchar* font_name[WEBKIT_GTK_FONT_FAMILY_LAST_ENTRY];
     60struct _WebKitSettings {
     61    gchar* font_name[WEBKIT_FONT_FAMILY_LAST_ENTRY];
    6262    gint   minimum_font_size;
    6363    gint   minimum_logical_font_size;
    … …  
    7272    gboolean should_print_backgrounds;
    7373    gboolean text_areas_are_resizable;
    74     WebKitGtkEditableLinkBehaviour editable_link_behaviour;
     74    WebKitEditableLinkBehaviour editable_link_behaviour;
    7575    gboolean uses_page_cache;
    7676    gboolean shrink_standalone_images_to_fit;
    … …  
    8181
    8282
    83     WebKitGtkSettingsPrivate *private_data;
     83    WebKitSettingsPrivate *private_data;
    8484};
    8585
    8686GType
    87 webkit_gtk_web_settings_get_type (void);
     87webkit_web_settings_get_type (void);
    8888
    89 WebKitGtkSettings*
    90 webkit_gtk_web_settings_copy (WebKitGtkSettings* setting);
     89WebKitSettings*
     90webkit_web_settings_copy (WebKitSettings* setting);
    9191
    9292void
    93 webkit_gtk_web_settings_free (WebKitGtkSettings* setting);
     93webkit_web_settings_free (WebKitSettings* setting);
    9494
    95 WebKitGtkSettings*
    96 webkit_gtk_web_settings_get_global (void);
     95WebKitSettings*
     96webkit_web_settings_get_global (void);
    9797
    9898void
    99 webkit_gtk_web_settings_set_global (WebKitGtkSettings* setting);
     99webkit_web_settings_set_global (WebKitSettings* setting);
    100100
    101101void
    102 webkit_gtk_web_settings_set_font_family(WebKitGtkSettings*, WebKitGtkFontFamily family, gchar *family_name);
     102webkit_web_settings_set_font_family(WebKitSettings*, WebKitFontFamily family, gchar *family_name);
    103103
    104104gchar*
    105 webkit_gtk_web_settings_get_font_family(WebKitGtkSettings*, WebKitGtkFontFamily family);
     105webkit_web_settings_get_font_family(WebKitSettings*, WebKitFontFamily family);
    106106
    107107void
    108 webkit_gtk_web_settings_set_user_style_sheet_location(WebKitGtkSettings*, gchar*);
     108webkit_web_settings_set_user_style_sheet_location(WebKitSettings*, gchar*);
    109109
    110110void
    111 webkit_gtk_set_ftp_directory_template_path(WebKitGtkSettings*, gchar*);
     111webkit_set_ftp_directory_template_path(WebKitSettings*, gchar*);
    112112
    113113

  • trunk/WebKit/gtk/ChangeLog

    r26020 r26022  
     12007-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
    1512007-10-02  Cosimo Cecchi  <cosimoc@svn.gnome.org>
    252

  • trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp

    r26020 r26022  
    4242
    4343namespace WebKit {
    44 ChromeClient::ChromeClient(WebKitGtkPage* page)
     44ChromeClient::ChromeClient(WebKitPage* page)
    4545    : m_webPage(page)
    4646    , m_didSendLinkSignal(false)
    … …  
    8989{
    9090    /* TODO: FrameLoadRequest is not used */
    91     WebKitGtkPage* 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);
    9292    if (!page)
    9393        return 0;
    9494
    95     WebKitGtkPagePrivate *privateData = WEBKIT_GTK_PAGE_GET_PRIVATE(WEBKIT_GTK_PAGE(page));
     95    WebKitPagePrivate *privateData = WEBKIT_PAGE_GET_PRIVATE(WEBKIT_PAGE(page));
    9696    return privateData->page;
    9797}
    … …  
    200200    CString sourceIdString = sourceId.utf8();
    201201
    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());
    203203}
    204204
    … …  
    206206{
    207207    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());
    209209}
    210210
    … …  
    212212{
    213213    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());
    215215}
    216216
    … …  
    220220    CString defaultValueString = defaultValue.utf8();
    221221
    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,
    223223                                                                              kit(frame),
    224224                                                                              messageString.data(),

  • trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h

    r26020 r26022  
    3232#include "ChromeClient.h"
    3333
    34 typedef struct _WebKitGtkPage WebKitGtkPage;
     34typedef struct _WebKitPage WebKitPage;
    3535
    3636namespace WebKit {
    … …  
    3838    class ChromeClient : public WebCore::ChromeClient {
    3939    public:
    40         ChromeClient(WebKitGtkPage*);
    41         WebKitGtkPage* webPage() const { return m_webPage; }
     40        ChromeClient(WebKitPage*);
     41        WebKitPage* webPage() const { return m_webPage; }
    4242
    4343        virtual void chromeDestroyed();
    … …  
    103103        virtual void print(WebCore::Frame*);
    104104    private:
    105         WebKitGtkPage* m_webPage;
     105        WebKitPage* m_webPage;
    106106        bool m_didSendLinkSignal;
    107107    };

  • trunk/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp

    r25345 r26022  
    258258}
    259259
    260 EditorClient::EditorClient(WebKitGtkPage* page)
     260EditorClient::EditorClient(WebKitPage* page)
    261261    : m_page(page)
    262262{

  • trunk/WebKit/gtk/WebCoreSupport/EditorClientGtk.h

    r25345 r26022  
    3535#include <wtf/Forward.h>
    3636
    37 typedef struct _WebKitGtkPage WebKitGtkPage;
     37typedef struct _WebKitPage WebKitPage;
    3838
    3939namespace WebCore {
    … …  
    4646    class EditorClient : public WebCore::EditorClient {
    4747    public:
    48         EditorClient(WebKitGtkPage*);
     48        EditorClient(WebKitPage*);
    4949
    5050        // from EditorClient
    … …  
    111111
    112112    private:
    113         WebKitGtkPage* m_page;
     113        WebKitPage* m_page;
    114114    };
    115115}

  • trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

    r25771 r26022  
    5656namespace WebKit {
    5757
    58 FrameLoaderClient::FrameLoaderClient(WebKitGtkFrame* frame)
     58FrameLoaderClient::FrameLoaderClient(WebKitFrame* frame)
    5959    : m_frame(frame)
    6060    , m_firstData(false)
    … …  
    113113void FrameLoaderClient::postProgressStartedNotification()
    114114{
    115     WebKitGtkPage* page = getPageFromFrame(m_frame);
     115    WebKitPage* page = getPageFromFrame(m_frame);
    116116    g_signal_emit_by_name(page, "load_started", m_frame);
    117117}
    … …  
    119119void FrameLoaderClient::postProgressEstimateChangedNotification()
    120120{
    121     WebKitGtkPage* kitPage = getPageFromFrame(m_frame);
     121    WebKitPage* kitPage = getPageFromFrame(m_frame);
    122122    Page* corePage = core(kitPage);
    123123
    … …  
    127127void FrameLoaderClient::postProgressFinishedNotification()
    128128{
    129     WebKitGtkPage* page = getPageFromFrame(m_frame);
     129    WebKitPage* page = getPageFromFrame(m_frame);
    130130
    131131    g_signal_emit_by_name(page, "load_finished", m_frame);
    … …  
    183183
    184184    ASSERT(core(getPageFromFrame(webFrame())) == coreFrame->page());
    185     WebKitGtkFrame* 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));
    186186    Frame* childFrame = core(gtkFrame);
    187187
    … …  
    325325void FrameLoaderClient::dispatchDidReceiveIcon()
    326326{
    327     WebKitGtkPage* page = getPageFromFrame(m_frame);
     327    WebKitPage* page = getPageFromFrame(m_frame);
    328328
    329329    g_signal_emit_by_name(page, "icon_loaded", m_frame);
    … …  
    373373void FrameLoaderClient::setTitle(const String& title, const KURL& url)
    374374{
    375     WebKitGtkPage* page = getPageFromFrame(m_frame);
     375    WebKitPage* page = getPageFromFrame(m_frame);
    376376
    377377    CString titleString = title.utf8();
    … …  
    379379    g_signal_emit_by_name(m_frame, "title_changed", titleString.data(), urlString.data());
    380380
    381     if (m_frame == webkit_gtk_page_get_main_frame(page))
     381    if (m_frame == webkit_page_get_main_frame(page))
    382382        g_signal_emit_by_name(page, "title_changed", titleString.data(), urlString.data());
    383383}

  • trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h

    r25447 r26022  
    3333#include "ResourceResponse.h"
    3434
    35 typedef struct _WebKitGtkFrame WebKitGtkFrame;
     35typedef struct _WebKitFrame WebKitFrame;
    3636
    3737namespace WebKit {
    … …  
    3939    class FrameLoaderClient : public WebCore::FrameLoaderClient {
    4040    public:
    41         FrameLoaderClient(WebKitGtkFrame*);
     41        FrameLoaderClient(WebKitFrame*);
    4242        virtual ~FrameLoaderClient() { }
    4343        virtual void frameLoaderDestroyed();
    4444
    45         WebKitGtkFrame*  webFrame() const { return m_frame; }
     45        WebKitFrame*  webFrame() const { return m_frame; }
    4646
    4747        virtual bool hasWebView() const;
    … …  
    179179        virtual void download(WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
    180180    private:
    181         WebKitGtkFrame* m_frame;
     181        WebKitFrame* m_frame;
    182182        WebCore::ResourceResponse m_response;
    183183        bool m_firstData;

  • trunk/WebKitTools/ChangeLog

    r26018 r26022  
     12007-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
    1182007-10-03  Lars Knoll  <lars@trolltech.com>
    219

  • trunk/WebKitTools/GtkLauncher/main.cpp

    r25703 r26022  
    88static GtkWidget* gURLBarEntry;
    99static GtkWidget* gTopLevelWindow;
    10 static WebKitGtkPage* gPage;
     10static WebKitPage* gPage;
    1111static gchar* gTitle;
    1212static gint gProgress;
    … …  
    3535
    3636    gchar* parsedURL = autocorrectURL(url);
    37     webkit_gtk_page_open(gPage, parsedURL);
     37    webkit_page_open(gPage, parsedURL);
    3838    g_free(parsedURL);
    3939}
    … …  
    5858}
    5959
    60 static void titleChanged(WebKitGtkPage*, const gchar* title, const gchar* url, WebKitGtkPage*)
     60static void titleChanged(WebKitPage*, const gchar* title, const gchar* url, WebKitPage*)
    6161{
    6262    gtk_entry_set_text(GTK_ENTRY(gURLBarEntry), url);
    … …  
    6868}
    6969
    70 static void progressChanged(WebKitGtkPage*, gint progress, WebKitGtkPage*)
     70static void progressChanged(WebKitPage*, gint progress, WebKitPage*)
    7171{
    7272    gProgress = progress;
    … …  
    8282{
    8383    g_assert(!data);
    84     webkit_gtk_page_go_backward(gPage);
     84    webkit_page_go_backward(gPage);
    8585}
    8686
    … …  
    8888{
    8989    g_assert(!data);
    90     webkit_gtk_page_go_forward(gPage);
     90    webkit_page_go_forward(gPage);
    9191}
    9292
    … …  
    9999{
    100100    gtk_init(&argc, &argv);
    101     webkit_gtk_init();
     101    webkit_init();
    102102
    103103    gchar* url = "http://www.google.com";
    … …  
    170170    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledWindow),
    171171                                   GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
    172     gPage = WEBKIT_GTK_PAGE(webkit_gtk_page_new());
     172    gPage = WEBKIT_PAGE(webkit_page_new());
    173173    gtk_container_add(GTK_CONTAINER(scrolledWindow), GTK_WIDGET(gPage));
    174174    gtk_box_pack_start(GTK_BOX(vbox), scrolledWindow, TRUE, TRUE, 0);
    … …  
    176176    g_signal_connect(gPage, "title-changed", G_CALLBACK(titleChanged), gPage);
    177177    g_signal_connect(gPage, "load-progress-changed", G_CALLBACK(progressChanged), gPage);
    178     webkit_gtk_page_open(gPage, url);
     178    webkit_page_open(gPage, url);
    179179
    180180    gtk_widget_show_all(gTopLevelWindow);
Note: See TracChangeset for help on using the changeset viewer.