Changeset 85059 in webkit


Ignore:
Timestamp:
Apr 27, 2011 10:23:34 AM (13 years ago)
Author:
Carlos Garcia Campos
Message:

2011-04-27 Carlos Garcia Campos <​cgarcia@igalia.com>

Reviewed by Martin Robinson.

[GTK] Move WebViewWidget to UIProcess/API/gtk
​https://bugs.webkit.org/show_bug.cgi?id=59594

API files should be under the API directory. This view widget will
be used by both C and gtk high level API, so it has been renamed
to WebKitWebViewBase.

  • GNUmakefile.am:
  • UIProcess/API/gtk/WebKitWebViewBase.cpp: Renamed from Source/WebKit2/UIProcess/gtk/WebViewWidget.cpp. (webkitWebViewBaseRealize): (webkitWebViewBaseContainerAdd): (webkitWebViewBaseDispose): (webkitWebViewBaseInit): (webViewExpose): (webViewDraw): (webViewSizeAllocate): (webViewFocusInEvent): (webViewFocusOutEvent): (webViewKeyPressEvent): (webViewKeyReleaseEvent): (getEventTime): (webViewButtonPressEvent): (webViewButtonReleaseEvent): (webViewScrollEvent): (webViewMotionNotifyEvent): (webkitWebViewBaseClassInit): (webkitWebViewBaseGetType): (webkitWebViewBaseGetWebViewInstance): (webkitWebViewBaseSetWebViewInstance): (webkitWebViewBaseGetIMContext):
  • UIProcess/API/gtk/WebKitWebViewBase.h: Renamed from Source/WebKit2/UIProcess/gtk/WebViewWidget.h.
  • UIProcess/gtk/WebView.cpp: (WebKit::WebView::WebView):
Location:
trunk/Source/WebKit2
Files:
1 added
3 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r85019 r85059  
     12011-04-27  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        Reviewed by Martin Robinson.
     4
     5        [GTK] Move WebViewWidget to UIProcess/API/gtk
     6        https://bugs.webkit.org/show_bug.cgi?id=59594
     7
     8        API files should be under the API directory. This view widget will
     9        be used by both C and gtk high level API, so it has been renamed
     10        to WebKitWebViewBase.
     11
     12        * GNUmakefile.am:
     13        * UIProcess/API/gtk/WebKitWebViewBase.cpp: Renamed from Source/WebKit2/UIProcess/gtk/WebViewWidget.cpp.
     14        (webkitWebViewBaseRealize):
     15        (webkitWebViewBaseContainerAdd):
     16        (webkitWebViewBaseDispose):
     17        (webkitWebViewBaseInit):
     18        (webViewExpose):
     19        (webViewDraw):
     20        (webViewSizeAllocate):
     21        (webViewFocusInEvent):
     22        (webViewFocusOutEvent):
     23        (webViewKeyPressEvent):
     24        (webViewKeyReleaseEvent):
     25        (getEventTime):
     26        (webViewButtonPressEvent):
     27        (webViewButtonReleaseEvent):
     28        (webViewScrollEvent):
     29        (webViewMotionNotifyEvent):
     30        (webkitWebViewBaseClassInit):
     31        (webkitWebViewBaseGetType):
     32        (webkitWebViewBaseGetWebViewInstance):
     33        (webkitWebViewBaseSetWebViewInstance):
     34        (webkitWebViewBaseGetIMContext):
     35        * UIProcess/API/gtk/WebKitWebViewBase.h: Renamed from Source/WebKit2/UIProcess/gtk/WebViewWidget.h.
     36        * UIProcess/gtk/WebView.cpp:
     37        (WebKit::WebView::WebView):
     38
    1392011-04-26  Chang Shu  <cshu@webkit.org>
    240

  • trunk/Source/WebKit2/GNUmakefile.am

    r84712 r85059  
    351351        Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.cpp \
    352352        Source/WebKit2/UIProcess/API/cpp/WKRetainPtr.h \
     353        Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.h \
     354        Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp \
    353355        Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.cpp \
    354356        Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.h \
    … …  
    377379        Source/WebKit2/UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp \
    378380        Source/WebKit2/UIProcess/gtk/WebInspectorGtk.cpp \
    379         Source/WebKit2/UIProcess/gtk/WebViewWidget.cpp \
    380         Source/WebKit2/UIProcess/gtk/WebViewWidget.h \
    381381        Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp \
    382382        Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp \
    … …  
    706706        -I$(srcdir)/Source/WebKit2/UIProcess/API/C/gtk \
    707707        -I$(srcdir)/Source/WebKit2/UIProcess/API/cpp \
     708        -I$(srcdir)/Source/WebKit2/UIProcess/API/gtk \
    708709        -I$(srcdir)/Source/WebKit2/UIProcess/Authentication \
    709710        -I$(srcdir)/Source/WebKit2/UIProcess/Downloads \

  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp

    r85058 r85059  
    2727
    2828#include "config.h"
    29 #include "WebViewWidget.h"
     29#include "WebKitWebViewBase.h"
    3030
    3131#include "GOwnPtrGtk.h"
    … …  
    3737using namespace WebCore;
    3838
    39 static gpointer webViewWidgetParentClass = 0;
    40 
    41 struct _WebViewWidgetPrivate {
     39static gpointer webkitWebViewBaseParentClass = 0;
     40
     41struct _WebKitWebViewBasePrivate {
    4242    WebView* webViewInstance;
    4343    GtkIMContext* imContext;
    … …  
    4848};
    4949
    50 static void webViewWidgetRealize(GtkWidget* widget)
     50static void webkitWebViewBaseRealize(GtkWidget* widget)
    5151{
    5252    gtk_widget_set_realized(widget, TRUE);
    … …  
    9797#endif
    9898
    99     WebViewWidget* webView = WEB_VIEW_WIDGET(widget);
    100     WebViewWidgetPrivate* priv = webView->priv;
     99    WebKitWebViewBase* webView = WEBKIT_WEB_VIEW_BASE(widget);
     100    WebKitWebViewBasePrivate* priv = webView->priv;
    101101    gtk_im_context_set_client_window(priv->imContext, window);
    102102}
    103103
    104 static void webViewWidgetContainerAdd(GtkContainer* container, GtkWidget* widget)
     104static void webkitWebViewBaseContainerAdd(GtkContainer* container, GtkWidget* widget)
    105105{
    106106    gtk_widget_set_parent(widget, GTK_WIDGET(container));
    107107}
    108108
    109 static void webViewWidgetDispose(GObject* gobject)
    110 {
    111     WebViewWidget* webViewWidget = WEB_VIEW_WIDGET(gobject);
    112     WebViewWidgetPrivate* priv = webViewWidget->priv;
     109static void webkitWebViewBaseDispose(GObject* gobject)
     110{
     111    WebKitWebViewBase* webkitWebViewBase = WEBKIT_WEB_VIEW_BASE(gobject);
     112    WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
    113113
    114114    if (priv->imContext) {
    … …  
    117117    }
    118118
    119     G_OBJECT_CLASS(webViewWidgetParentClass)->dispose(gobject);
    120 }
    121 
    122 static void webViewWidgetInit(WebViewWidget* webViewWidget)
    123 {
    124     WebViewWidgetPrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(webViewWidget, WEB_VIEW_TYPE_WIDGET, WebViewWidgetPrivate);
    125     webViewWidget->priv = priv;
    126 
    127     gtk_widget_set_can_focus(GTK_WIDGET(webViewWidget), TRUE);
     119    G_OBJECT_CLASS(webkitWebViewBaseParentClass)->dispose(gobject);
     120}
     121
     122static void webkitWebViewBaseInit(WebKitWebViewBase* webkitWebViewBase)
     123{
     124    WebKitWebViewBasePrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(webkitWebViewBase, WEBKIT_TYPE_WEB_VIEW_BASE, WebKitWebViewBasePrivate);
     125    webkitWebViewBase->priv = priv;
     126
     127    gtk_widget_set_can_focus(GTK_WIDGET(webkitWebViewBase), TRUE);
    128128    priv->imContext = gtk_im_multicontext_new();
    129129
    … …  
    136136static gboolean webViewExpose(GtkWidget* widget, GdkEventExpose* event)
    137137{
    138     WebView* webView = webViewWidgetGetWebViewInstance(WEB_VIEW_WIDGET(widget));
     138    WebView* webView = webkitWebViewBaseGetWebViewInstance(WEBKIT_WEB_VIEW_BASE(widget));
    139139    GdkRectangle clipRect;
    140140    gdk_region_get_clipbox(event->region, &clipRect);
    … …  
    150150static gboolean webViewDraw(GtkWidget* widget, cairo_t* cr)
    151151{
    152     WebView* webView = webViewWidgetGetWebViewInstance(WEB_VIEW_WIDGET(widget));
     152    WebView* webView = webkitWebViewBaseGetWebViewInstance(WEBKIT_WEB_VIEW_BASE(widget));
    153153    GdkRectangle clipRect;
    154154
    … …  
    164164static void webViewSizeAllocate(GtkWidget* widget, GtkAllocation* allocation)
    165165{
    166     WebView* webView = webViewWidgetGetWebViewInstance(WEB_VIEW_WIDGET(widget));
    167     GTK_WIDGET_CLASS(webViewWidgetParentClass)->size_allocate(widget, allocation);
     166    WebView* webView = webkitWebViewBaseGetWebViewInstance(WEBKIT_WEB_VIEW_BASE(widget));
     167    GTK_WIDGET_CLASS(webkitWebViewBaseParentClass)->size_allocate(widget, allocation);
    168168    webView->setSize(widget, IntSize(allocation->width, allocation->height));
    169169}
    … …  
    171171static gboolean webViewFocusInEvent(GtkWidget* widget, GdkEventFocus* event)
    172172{
    173     WebViewWidget* webViewWidget = WEB_VIEW_WIDGET(widget);
    174     WebView* webView = webViewWidgetGetWebViewInstance(webViewWidget);
     173    WebKitWebViewBase* webkitWebViewBase = WEBKIT_WEB_VIEW_BASE(widget);
     174    WebView* webView = webkitWebViewBaseGetWebViewInstance(webkitWebViewBase);
    175175
    176176    GtkWidget* toplevel = gtk_widget_get_toplevel(widget);
    177177    if (gtk_widget_is_toplevel(toplevel) && gtk_window_has_toplevel_focus(GTK_WINDOW(toplevel))) {
    178         gtk_im_context_focus_in(webViewWidgetGetIMContext(webViewWidget));
     178        gtk_im_context_focus_in(webkitWebViewBaseGetIMContext(webkitWebViewBase));
    179179        webView->handleFocusInEvent(widget);
    180180    }
    181181
    182     return GTK_WIDGET_CLASS(webViewWidgetParentClass)->focus_in_event(widget, event);
     182    return GTK_WIDGET_CLASS(webkitWebViewBaseParentClass)->focus_in_event(widget, event);
    183183}
    184184
    185185static gboolean webViewFocusOutEvent(GtkWidget* widget, GdkEventFocus* event)
    186186{
    187     WebViewWidget* webViewWidget = WEB_VIEW_WIDGET(widget);
    188     WebView* webView = webViewWidgetGetWebViewInstance(webViewWidget);
     187    WebKitWebViewBase* webkitWebViewBase = WEBKIT_WEB_VIEW_BASE(widget);
     188    WebView* webView = webkitWebViewBaseGetWebViewInstance(webkitWebViewBase);
    189189
    190190    webView->handleFocusOutEvent(widget);
    191     GtkIMContext* imContext = webViewWidgetGetIMContext(webViewWidget);
     191    GtkIMContext* imContext = webkitWebViewBaseGetIMContext(webkitWebViewBase);
    192192    if (imContext)
    193193        gtk_im_context_focus_out(imContext);
    194194
    195     return GTK_WIDGET_CLASS(webViewWidgetParentClass)->focus_out_event(widget, event);
     195    return GTK_WIDGET_CLASS(webkitWebViewBaseParentClass)->focus_out_event(widget, event);
    196196}
    197197
    198198static gboolean webViewKeyPressEvent(GtkWidget* widget, GdkEventKey* event)
    199199{
    200     WebView* webView = webViewWidgetGetWebViewInstance(WEB_VIEW_WIDGET(widget));
     200    WebView* webView = webkitWebViewBaseGetWebViewInstance(WEBKIT_WEB_VIEW_BASE(widget));
    201201    webView->handleKeyboardEvent(event);
    202202
    203     return GTK_WIDGET_CLASS(webViewWidgetParentClass)->key_press_event(widget, event);
     203    return GTK_WIDGET_CLASS(webkitWebViewBaseParentClass)->key_press_event(widget, event);
    204204}
    205205
    206206static gboolean webViewKeyReleaseEvent(GtkWidget* widget, GdkEventKey* event)
    207207{
    208     WebViewWidget* webViewWidget = WEB_VIEW_WIDGET(widget);
    209     WebView* webView = webViewWidgetGetWebViewInstance(webViewWidget);
    210 
    211     if (gtk_im_context_filter_keypress(webViewWidgetGetIMContext(webViewWidget), event))
     208    WebKitWebViewBase* webkitWebViewBase = WEBKIT_WEB_VIEW_BASE(widget);
     209    WebView* webView = webkitWebViewBaseGetWebViewInstance(webkitWebViewBase);
     210
     211    if (gtk_im_context_filter_keypress(webkitWebViewBaseGetIMContext(webkitWebViewBase), event))
    212212        return TRUE;
    213213
    214214    webView->handleKeyboardEvent(event);
    215215
    216     return GTK_WIDGET_CLASS(webViewWidgetParentClass)->key_release_event(widget, event);
     216    return GTK_WIDGET_CLASS(webkitWebViewBaseParentClass)->key_release_event(widget, event);
    217217}
    218218
    … …  
    265265    GdkEvent* event(reinterpret_cast<GdkEvent*>(buttonEvent));
    266266    guint32 eventTime = getEventTime(event);
    267     WebViewWidget* webViewWidget = WEB_VIEW_WIDGET(widget);
    268     WebViewWidgetPrivate* priv = webViewWidget->priv;
     267    WebKitWebViewBase* webkitWebViewBase = WEBKIT_WEB_VIEW_BASE(widget);
     268    WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
    269269    if ((event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS)
    270270        || ((abs(buttonEvent->x - priv->previousClickPoint.x()) < doubleClickDistance)
    … …  
    276276        priv->currentClickCount = 1;
    277277
    278     WebView* webView = webViewWidgetGetWebViewInstance(webViewWidget);
     278    WebView* webView = webkitWebViewBaseGetWebViewInstance(webkitWebViewBase);
    279279    webView->handleMouseEvent(event, priv->currentClickCount);
    280280
    … …  
    290290static gboolean webViewButtonReleaseEvent(GtkWidget* widget, GdkEventButton* event)
    291291{
    292     WebView* webView = webViewWidgetGetWebViewInstance(WEB_VIEW_WIDGET(widget));
     292    WebView* webView = webkitWebViewBaseGetWebViewInstance(WEBKIT_WEB_VIEW_BASE(widget));
    293293    gtk_widget_grab_focus(widget);
    294294    webView->handleMouseEvent(reinterpret_cast<GdkEvent*>(event), 0 /* currentClickCount */);
    … …  
    299299static gboolean webViewScrollEvent(GtkWidget* widget, GdkEventScroll* event)
    300300{
    301     WebView* webView = webViewWidgetGetWebViewInstance(WEB_VIEW_WIDGET(widget));
     301    WebView* webView = webkitWebViewBaseGetWebViewInstance(WEBKIT_WEB_VIEW_BASE(widget));
    302302    webView->handleWheelEvent(event);
    303303
    … …  
    307307static gboolean webViewMotionNotifyEvent(GtkWidget* widget, GdkEventMotion* event)
    308308{
    309     WebView* webView = webViewWidgetGetWebViewInstance(WEB_VIEW_WIDGET(widget));
     309    WebView* webView = webkitWebViewBaseGetWebViewInstance(WEBKIT_WEB_VIEW_BASE(widget));
    310310    webView->handleMouseEvent(reinterpret_cast<GdkEvent*>(event), 0 /* currentClickCount */);
    311311
    … …  
    313313}
    314314
    315 static void webViewWidgetClassInit(WebViewWidgetClass* webViewWidgetClass)
    316 {
    317     webViewWidgetParentClass = g_type_class_peek_parent(webViewWidgetClass);
    318 
    319     GtkWidgetClass* widgetClass = GTK_WIDGET_CLASS(webViewWidgetClass);
    320     widgetClass->realize = webViewWidgetRealize;
     315static void webkitWebViewBaseClassInit(WebKitWebViewBaseClass* webkitWebViewBaseClass)
     316{
     317    webkitWebViewBaseParentClass = g_type_class_peek_parent(webkitWebViewBaseClass);
     318
     319    GtkWidgetClass* widgetClass = GTK_WIDGET_CLASS(webkitWebViewBaseClass);
     320    widgetClass->realize = webkitWebViewBaseRealize;
    321321#ifdef GTK_API_VERSION_2
    322322    widgetClass->expose_event = webViewExpose;
    … …  
    334334    widgetClass->motion_notify_event = webViewMotionNotifyEvent;
    335335
    336     GObjectClass* gobjectClass = G_OBJECT_CLASS(webViewWidgetClass);
    337     gobjectClass->dispose = webViewWidgetDispose;
    338 
    339     GtkContainerClass* containerClass = GTK_CONTAINER_CLASS(webViewWidgetClass);
    340     containerClass->add = webViewWidgetContainerAdd;
    341 
    342     g_type_class_add_private(webViewWidgetClass, sizeof(WebViewWidgetPrivate));
    343 }
    344 
    345 GType webViewWidgetGetType()
     336    GObjectClass* gobjectClass = G_OBJECT_CLASS(webkitWebViewBaseClass);
     337    gobjectClass->dispose = webkitWebViewBaseDispose;
     338
     339    GtkContainerClass* containerClass = GTK_CONTAINER_CLASS(webkitWebViewBaseClass);
     340    containerClass->add = webkitWebViewBaseContainerAdd;
     341
     342    g_type_class_add_private(webkitWebViewBaseClass, sizeof(WebKitWebViewBasePrivate));
     343}
     344
     345GType webkitWebViewBaseGetType()
    346346{
    347347    static volatile gsize gDefineTypeIdVolatile = 0;
    … …  
    351351
    352352    GType gDefineTypeId = g_type_register_static_simple(GTK_TYPE_CONTAINER,
    353                                                         g_intern_static_string("WebViewWidget"),
    354                                                         sizeof(WebViewWidgetClass),
    355                                                         reinterpret_cast<GClassInitFunc>(webViewWidgetClassInit),
    356                                                         sizeof(WebViewWidget),
    357                                                         reinterpret_cast<GInstanceInitFunc>(webViewWidgetInit),
     353                                                        g_intern_static_string("WebKitWebViewBase"),
     354                                                        sizeof(WebKitWebViewBaseClass),
     355                                                        reinterpret_cast<GClassInitFunc>(webkitWebViewBaseClassInit),
     356                                                        sizeof(WebKitWebViewBase),
     357                                                        reinterpret_cast<GInstanceInitFunc>(webkitWebViewBaseInit),
    358358                                                        static_cast<GTypeFlags>(0));
    359359    g_once_init_leave(&gDefineTypeIdVolatile, gDefineTypeId);
    … …  
    362362}
    363363
    364 WebView* webViewWidgetGetWebViewInstance(WebViewWidget* webViewWidget)
    365 {
    366     return webViewWidget->priv->webViewInstance;
    367 }
    368 
    369 void webViewWidgetSetWebViewInstance(WebViewWidget* webViewWidget, WebView* webViewInstance)
    370 {
    371     webViewWidget->priv->webViewInstance = webViewInstance;
    372 }
    373 
    374 GtkIMContext* webViewWidgetGetIMContext(WebViewWidget* webViewWidget)
    375 {
    376     return webViewWidget->priv->imContext;
    377 }
     364WebView* webkitWebViewBaseGetWebViewInstance(WebKitWebViewBase* webkitWebViewBase)
     365{
     366    return webkitWebViewBase->priv->webViewInstance;
     367}
     368
     369void webkitWebViewBaseSetWebViewInstance(WebKitWebViewBase* webkitWebViewBase, WebView* webViewInstance)
     370{
     371    webkitWebViewBase->priv->webViewInstance = webViewInstance;
     372}
     373
     374GtkIMContext* webkitWebViewBaseGetIMContext(WebKitWebViewBase* webkitWebViewBase)
     375{
     376    return webkitWebViewBase->priv->imContext;
     377}

  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.h

    r85058 r85059  
    2626 */
    2727
    28 #ifndef WebViewWidget_h
    29 #define WebViewWidget_h
     28#ifndef WebKitWebViewBase_h
     29#define WebKitWebViewBase_h
    3030
    3131#include "WebView.h"
    … …  
    3737G_BEGIN_DECLS
    3838
    39 #define WEB_VIEW_TYPE_WIDGET              (webViewWidgetGetType())
    40 #define WEB_VIEW_WIDGET(object)           (G_TYPE_CHECK_INSTANCE_CAST((object), WEB_VIEW_TYPE_WIDGET, WebViewWidget))
    41 #define WEB_VIEW_WIDGET_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST((klass), WEB_VIEW_TYPE_WIDGET, WebViewWidgetClass))
    42 #define WEB_VIEW_IS_WIDGET(object)        (G_TYPE_CHECK_INSTANCE_TYPE((object), WEB_VIEW_TYPE_WIDGET))
    43 #define WEB_VIEW_IS_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE((klass), WEB_VIEW_TYPE_WIDGET))
    44 #define WEB_VIEW_WIDGET_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), WEB_VIEW_TYPE_WIDGET, WebViewWidgetClass))
     39#define WEBKIT_TYPE_WEB_VIEW_BASE              (webkitWebViewBaseGetType())
     40#define WEBKIT_WEB_VIEW_BASE(object)           (G_TYPE_CHECK_INSTANCE_CAST((object), WEBKIT_TYPE_WEB_VIEW_BASE, WebKitWebViewBase))
     41#define WEBKIT_WEB_VIEW_BASE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST((klass), WEBKIT_TYPE_WEB_VIEW_BASE, WebKitWebViewBaseClass))
     42#define WEBKIT_IS_WEB_VIEW_BASE(object)        (G_TYPE_CHECK_INSTANCE_TYPE((object), WEBKIT_TYPE_WEB_VIEW_BASE))
     43#define WEBKIT_IS_WEB_VIEW_BASE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_TYPE_WEB_VIEW_BASE))
     44#define WEBKIT_WEB_VIEW_BASE_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), WEBKIT_TYPE_WEB_VIEW_BASE, WebKitWebViewBaseClass))
    4545
    46 typedef struct _WebViewWidget WebViewWidget;
    47 typedef struct _WebViewWidgetClass WebViewWidgetClass;
    48 typedef struct _WebViewWidgetPrivate WebViewWidgetPrivate;
     46typedef struct _WebKitWebViewBase WebKitWebViewBase;
     47typedef struct _WebKitWebViewBaseClass WebKitWebViewBaseClass;
     48typedef struct _WebKitWebViewBasePrivate WebKitWebViewBasePrivate;
    4949
    50 struct _WebViewWidget {
     50struct _WebKitWebViewBase {
    5151    GtkContainer parentInstance;
    5252    /*< private >*/
    53     WebViewWidgetPrivate* priv;
     53    WebKitWebViewBasePrivate* priv;
    5454};
    5555
    56 struct _WebViewWidgetClass {
     56struct _WebKitWebViewBaseClass {
    5757    GtkContainerClass parentClass;
    5858};
    5959
    60 GType webViewWidgetGetType();
     60GType webkitWebViewBaseGetType();
    6161
    62 WebView* webViewWidgetGetWebViewInstance(WebViewWidget*);
     62WebView* webkitWebViewBaseGetWebViewInstance(WebKitWebViewBase*);
    6363
    64 void webViewWidgetSetWebViewInstance(WebViewWidget*, WebView*);
     64void webkitWebViewBaseSetWebViewInstance(WebKitWebViewBase*, WebView*);
    6565
    66 GtkIMContext* webViewWidgetGetIMContext(WebViewWidget*);
     66GtkIMContext* webkitWebViewBaseGetIMContext(WebKitWebViewBase*);
    6767
    6868G_END_DECLS
    6969
    70 #endif // WebViewWidget_h
     70#endif // WebKitWebViewBase_h

  • trunk/Source/WebKit2/UIProcess/gtk/WebView.cpp

    r84138 r85059  
    3636#include "WebContextMenuProxy.h"
    3737#include "WebEventFactory.h"
    38 #include "WebViewWidget.h"
     38#include "WebKitWebViewBase.h"
    3939#include "WebPageProxy.h"
    4040#include <wtf/text/WTFString.h>
    … …  
    244244    m_page = context->createWebPage(this, pageGroup);
    245245
    246     m_viewWidget = static_cast<GtkWidget*>(g_object_new(WEB_VIEW_TYPE_WIDGET, NULL));
     246    m_viewWidget = static_cast<GtkWidget*>(g_object_new(WEBKIT_TYPE_WEB_VIEW_BASE, NULL));
    247247    ASSERT(m_viewWidget);
    248248
    249249    m_page->initializeWebPage();
    250250
    251     WebViewWidget* webViewWidget = WEB_VIEW_WIDGET(m_viewWidget);
    252     webViewWidgetSetWebViewInstance(webViewWidget, this);
     251    WebKitWebViewBase* webViewWidget = WEBKIT_WEB_VIEW_BASE(m_viewWidget);
     252    webkitWebViewBaseSetWebViewInstance(webViewWidget, this);
    253253
    254254    g_signal_connect(m_nativeWidget.get(), "backspace", G_CALLBACK(backspaceCallback), this);
Note: See TracChangeset for help on using the changeset viewer.