Changeset 85318 in webkit


Ignore:
Timestamp:
Apr 29, 2011 5:36:02 AM (13 years ago)
Author:
Carlos Garcia Campos
Message:

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

Reviewed by Martin Robinson.

[GTK] Rename page as pageProxy in WebKitWebViewBase
​https://bugs.webkit.org/show_bug.cgi?id=59790

To avoid consufion between page client and page proxy. Also rename
some methods to webkitWebViewBase* for consistency.

  • UIProcess/API/gtk/WebKitWebViewBase.cpp: (webkitWebViewBaseFinalize): (webkitWebViewBaseExpose): (webkitWebViewBaseDraw): (webkitWebViewBaseSizeAllocate): (webkitWebViewBaseFocusInEvent): (webkitWebViewBaseFocusOutEvent): (webkitWebViewBaseKeyPressEvent): (webkitWebViewBaseKeyReleaseEvent): (webkitWebViewBaseButtonPressEvent): (webkitWebViewBaseButtonReleaseEvent): (webkitWebViewBaseScrollEvent): (webkitWebViewBaseMotionNotifyEvent): (webkit_web_view_base_class_init): (webkitWebViewBaseCreate): (webkitWebViewBaseGetPage):
Location:
trunk/Source/WebKit2
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r85309 r85318  
     12011-04-29  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        Reviewed by Martin Robinson.
     4
     5        [GTK] Rename page as pageProxy in WebKitWebViewBase
     6        https://bugs.webkit.org/show_bug.cgi?id=59790
     7
     8        To avoid consufion between page client and page proxy. Also rename
     9        some methods to webkitWebViewBase* for consistency.
     10
     11        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
     12        (webkitWebViewBaseFinalize):
     13        (webkitWebViewBaseExpose):
     14        (webkitWebViewBaseDraw):
     15        (webkitWebViewBaseSizeAllocate):
     16        (webkitWebViewBaseFocusInEvent):
     17        (webkitWebViewBaseFocusOutEvent):
     18        (webkitWebViewBaseKeyPressEvent):
     19        (webkitWebViewBaseKeyReleaseEvent):
     20        (webkitWebViewBaseButtonPressEvent):
     21        (webkitWebViewBaseButtonReleaseEvent):
     22        (webkitWebViewBaseScrollEvent):
     23        (webkitWebViewBaseMotionNotifyEvent):
     24        (webkit_web_view_base_class_init):
     25        (webkitWebViewBaseCreate):
     26        (webkitWebViewBaseGetPage):
     27
    1282011-04-29  Carlos Garcia Campos  <cgarcia@igalia.com>
    229

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

    r85309 r85318  
    4848struct _WebKitWebViewBasePrivate {
    4949    OwnPtr<PageClientImpl> pageClient;
    50     RefPtr<WebPageProxy> page;
     50    RefPtr<WebPageProxy> pageProxy;
    5151    gboolean isPageActive;
    5252    GtkIMContext* imContext;
    … …  
    125125    }
    126126
    127     priv->page->close();
     127    priv->pageProxy->close();
    128128
    129129    delete priv;
    … …  
    147147
    148148#ifdef GTK_API_VERSION_2
    149 static gboolean webViewExpose(GtkWidget* widget, GdkEventExpose* event)
     149static gboolean webkitWebViewBaseExpose(GtkWidget* widget, GdkEventExpose* event)
    150150{
    151151    WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(widget);
    … …  
    155155
    156156    RefPtr<cairo_t> cr = adoptRef(gdk_cairo_create(gtk_widget_get_window(widget)));
    157     webViewBase->priv->page->drawingArea()->paint(clipRect, cr.get());
     157    webViewBase->priv->pageProxy->drawingArea()->paint(clipRect, cr.get());
    158158
    159159    return FALSE;
    160160}
    161161#else
    162 static gboolean webViewDraw(GtkWidget* widget, cairo_t* cr)
     162static gboolean webkitWebViewBaseDraw(GtkWidget* widget, cairo_t* cr)
    163163{
    164164    WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(widget);
    … …  
    168168        return FALSE;
    169169
    170     webViewBase->priv->page->drawingArea()->paint(clipRect, cr);
    171 
    172     return FALSE;
    173 }
    174 #endif
    175 
    176 static void webViewSizeAllocate(GtkWidget* widget, GtkAllocation* allocation)
     170    webViewBase->priv->pageProxy->drawingArea()->paint(clipRect, cr);
     171
     172    return FALSE;
     173}
     174#endif
     175
     176static void webkitWebViewBaseSizeAllocate(GtkWidget* widget, GtkAllocation* allocation)
    177177{
    178178    WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(widget);
    … …  
    180180
    181181    GTK_WIDGET_CLASS(webkit_web_view_base_parent_class)->size_allocate(widget, allocation);
    182     priv->page->drawingArea()->setSize(IntSize(allocation->width, allocation->height), IntSize());
    183 }
    184 
    185 static gboolean webViewFocusInEvent(GtkWidget* widget, GdkEventFocus* event)
     182    priv->pageProxy->drawingArea()->setSize(IntSize(allocation->width, allocation->height), IntSize());
     183}
     184
     185static gboolean webkitWebViewBaseFocusInEvent(GtkWidget* widget, GdkEventFocus* event)
    186186{
    187187    WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(widget);
    … …  
    193193        if (!priv->isPageActive) {
    194194            priv->isPageActive = TRUE;
    195             priv->page->viewStateDidChange(WebPageProxy::ViewWindowIsActive);
     195            priv->pageProxy->viewStateDidChange(WebPageProxy::ViewWindowIsActive);
    196196        }
    197197    }
    … …  
    200200}
    201201
    202 static gboolean webViewFocusOutEvent(GtkWidget* widget, GdkEventFocus* event)
     202static gboolean webkitWebViewBaseFocusOutEvent(GtkWidget* widget, GdkEventFocus* event)
    203203{
    204204    WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(widget);
    … …  
    206206
    207207    priv->isPageActive = FALSE;
    208     priv->page->viewStateDidChange(WebPageProxy::ViewWindowIsActive);
     208    priv->pageProxy->viewStateDidChange(WebPageProxy::ViewWindowIsActive);
    209209    if (priv->imContext)
    210210        gtk_im_context_focus_out(priv->imContext);
    … …  
    213213}
    214214
    215 static gboolean webViewKeyPressEvent(GtkWidget* widget, GdkEventKey* event)
    216 {
    217     WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(widget);
    218     WebKitWebViewBasePrivate* priv = webViewBase->priv;
    219 
    220     priv->page->handleKeyboardEvent(NativeWebKeyboardEvent(reinterpret_cast<GdkEvent*>(event)));
     215static gboolean webkitWebViewBaseKeyPressEvent(GtkWidget* widget, GdkEventKey* event)
     216{
     217    WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(widget);
     218    WebKitWebViewBasePrivate* priv = webViewBase->priv;
     219
     220    priv->pageProxy->handleKeyboardEvent(NativeWebKeyboardEvent(reinterpret_cast<GdkEvent*>(event)));
    221221
    222222    return GTK_WIDGET_CLASS(webkit_web_view_base_parent_class)->key_press_event(widget, event);
    223223}
    224224
    225 static gboolean webViewKeyReleaseEvent(GtkWidget* widget, GdkEventKey* event)
     225static gboolean webkitWebViewBaseKeyReleaseEvent(GtkWidget* widget, GdkEventKey* event)
    226226{
    227227    WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(widget);
    … …  
    231231        return TRUE;
    232232
    233     priv->page->handleKeyboardEvent(NativeWebKeyboardEvent(reinterpret_cast<GdkEvent*>(event)));
     233    priv->pageProxy->handleKeyboardEvent(NativeWebKeyboardEvent(reinterpret_cast<GdkEvent*>(event)));
    234234
    235235    return GTK_WIDGET_CLASS(webkit_web_view_base_parent_class)->key_release_event(widget, event);
    236236}
    237237
    238 static gboolean webViewButtonPressEvent(GtkWidget* widget, GdkEventButton* buttonEvent)
     238static gboolean webkitWebViewBaseButtonPressEvent(GtkWidget* widget, GdkEventButton* buttonEvent)
    239239{
    240240    WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(widget);
    … …  
    244244    if (!priv->clickCounter.shouldProcessButtonEvent(buttonEvent))
    245245        return TRUE;
    246     priv->page->handleMouseEvent(NativeWebMouseEvent(reinterpret_cast<GdkEvent*>(buttonEvent),
     246    priv->pageProxy->handleMouseEvent(NativeWebMouseEvent(reinterpret_cast<GdkEvent*>(buttonEvent),
    247247                                                     priv->clickCounter.clickCountForGdkButtonEvent(widget, buttonEvent)));
    248248    return FALSE;
    249249}
    250250
    251 static gboolean webViewButtonReleaseEvent(GtkWidget* widget, GdkEventButton* event)
     251static gboolean webkitWebViewBaseButtonReleaseEvent(GtkWidget* widget, GdkEventButton* event)
    252252{
    253253    WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(widget);
    … …  
    255255
    256256    gtk_widget_grab_focus(widget);
    257     priv->page->handleMouseEvent(NativeWebMouseEvent(reinterpret_cast<GdkEvent*>(event), 0 /* currentClickCount */));
    258 
    259     return FALSE;
    260 }
    261 
    262 static gboolean webViewScrollEvent(GtkWidget* widget, GdkEventScroll* event)
    263 {
    264     WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(widget);
    265     WebKitWebViewBasePrivate* priv = webViewBase->priv;
    266 
    267     priv->page->handleWheelEvent(WebEventFactory::createWebWheelEvent(event));
    268 
    269     return FALSE;
    270 }
    271 
    272 static gboolean webViewMotionNotifyEvent(GtkWidget* widget, GdkEventMotion* event)
    273 {
    274     WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(widget);
    275     WebKitWebViewBasePrivate* priv = webViewBase->priv;
    276 
    277     priv->page->handleMouseEvent(NativeWebMouseEvent(reinterpret_cast<GdkEvent*>(event), 0 /* currentClickCount */));
     257    priv->pageProxy->handleMouseEvent(NativeWebMouseEvent(reinterpret_cast<GdkEvent*>(event), 0 /* currentClickCount */));
     258
     259    return FALSE;
     260}
     261
     262static gboolean webkitWebViewBaseScrollEvent(GtkWidget* widget, GdkEventScroll* event)
     263{
     264    WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(widget);
     265    WebKitWebViewBasePrivate* priv = webViewBase->priv;
     266
     267    priv->pageProxy->handleWheelEvent(WebEventFactory::createWebWheelEvent(event));
     268
     269    return FALSE;
     270}
     271
     272static gboolean webkitWebViewBaseMotionNotifyEvent(GtkWidget* widget, GdkEventMotion* event)
     273{
     274    WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(widget);
     275    WebKitWebViewBasePrivate* priv = webViewBase->priv;
     276
     277    priv->pageProxy->handleMouseEvent(NativeWebMouseEvent(reinterpret_cast<GdkEvent*>(event), 0 /* currentClickCount */));
    278278
    279279    return FALSE;
    … …  
    285285    widgetClass->realize = webkitWebViewBaseRealize;
    286286#ifdef GTK_API_VERSION_2
    287     widgetClass->expose_event = webViewExpose;
     287    widgetClass->expose_event = webkitWebViewBaseExpose;
    288288#else
    289     widgetClass->draw = webViewDraw;
    290 #endif
    291     widgetClass->size_allocate = webViewSizeAllocate;
    292     widgetClass->focus_in_event = webViewFocusInEvent;
    293     widgetClass->focus_out_event = webViewFocusOutEvent;
    294     widgetClass->key_press_event = webViewKeyPressEvent;
    295     widgetClass->key_release_event = webViewKeyReleaseEvent;
    296     widgetClass->button_press_event = webViewButtonPressEvent;
    297     widgetClass->button_release_event = webViewButtonReleaseEvent;
    298     widgetClass->scroll_event = webViewScrollEvent;
    299     widgetClass->motion_notify_event = webViewMotionNotifyEvent;
     289    widgetClass->draw = webkitWebViewBaseDraw;
     290#endif
     291    widgetClass->size_allocate = webkitWebViewBaseSizeAllocate;
     292    widgetClass->focus_in_event = webkitWebViewBaseFocusInEvent;
     293    widgetClass->focus_out_event = webkitWebViewBaseFocusOutEvent;
     294    widgetClass->key_press_event = webkitWebViewBaseKeyPressEvent;
     295    widgetClass->key_release_event = webkitWebViewBaseKeyReleaseEvent;
     296    widgetClass->button_press_event = webkitWebViewBaseButtonPressEvent;
     297    widgetClass->button_release_event = webkitWebViewBaseButtonReleaseEvent;
     298    widgetClass->scroll_event = webkitWebViewBaseScrollEvent;
     299    widgetClass->motion_notify_event = webkitWebViewBaseMotionNotifyEvent;
    300300
    301301    GObjectClass* gobjectClass = G_OBJECT_CLASS(webkitWebViewBaseClass);
    … …  
    311311    WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
    312312
    313     priv->page = context->createWebPage(priv->pageClient.get(), pageGroup);
    314     priv->page->initializeWebPage();
     313    priv->pageProxy = context->createWebPage(priv->pageClient.get(), pageGroup);
     314    priv->pageProxy->initializeWebPage();
    315315
    316316    return webkitWebViewBase;
    … …  
    324324WebPageProxy* webkitWebViewBaseGetPage(WebKitWebViewBase* webkitWebViewBase)
    325325{
    326     return webkitWebViewBase->priv->page.get();
    327 }
     326    return webkitWebViewBase->priv->pageProxy.get();
     327}
Note: See TracChangeset for help on using the changeset viewer.