Changeset 85193 in webkit


Ignore:
Timestamp:
Apr 28, 2011 9:32:35 AM (13 years ago)
Author:
Carlos Garcia Campos
Message:

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

Reviewed by Martin Robinson.

[GTK] PlatformWebView should be the view widget
​https://bugs.webkit.org/show_bug.cgi?id=59676

  • UIProcess/API/gtk/WebKitWebViewBase.cpp: (webkitWebViewBaseGetPage): Return the page of the view.
  • UIProcess/API/gtk/WebKitWebViewBase.h:
  • UIProcess/ChunkedUpdateDrawingAreaProxy.h: Map PlatformWebView to WebKitWebViewBase instead of the page client.
  • UIProcess/gtk/ChunkedUpdateDrawingAreaProxyGtk.cpp: (WebKit::ChunkedUpdateDrawingAreaProxy::page): Use the view widget directly. (WebKit::ChunkedUpdateDrawingAreaProxy::ensureBackingStore): Ditto. (WebKit::ChunkedUpdateDrawingAreaProxy::drawUpdateChunkIntoBackingStore): Ditto.
  • UIProcess/gtk/WebView.cpp: (WebKit::WebView::createDrawingAreaProxy): Pass the view widget to the DrawingAreaProxy constructor instead of the page client.
  • UIProcess/gtk/WebView.h: Remove getWebViewWindow() which is no longer needed.
Location:
trunk/Source/WebKit2
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r85192 r85193  
     12011-04-28  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        Reviewed by Martin Robinson.
     4
     5        [GTK] PlatformWebView should be the view widget
     6        https://bugs.webkit.org/show_bug.cgi?id=59676
     7
     8        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
     9        (webkitWebViewBaseGetPage): Return the page of the view.
     10        * UIProcess/API/gtk/WebKitWebViewBase.h:
     11        * UIProcess/ChunkedUpdateDrawingAreaProxy.h: Map PlatformWebView
     12        to WebKitWebViewBase instead of the page client.
     13        * UIProcess/gtk/ChunkedUpdateDrawingAreaProxyGtk.cpp:
     14        (WebKit::ChunkedUpdateDrawingAreaProxy::page): Use the view widget
     15        directly.
     16        (WebKit::ChunkedUpdateDrawingAreaProxy::ensureBackingStore): Ditto.
     17        (WebKit::ChunkedUpdateDrawingAreaProxy::drawUpdateChunkIntoBackingStore): Ditto.
     18        * UIProcess/gtk/WebView.cpp:
     19        (WebKit::WebView::createDrawingAreaProxy): Pass the view widget to
     20        the DrawingAreaProxy constructor instead of the page client.
     21        * UIProcess/gtk/WebView.h: Remove getWebViewWindow() which is no
     22        longer needed.
     23
    1242011-04-28  Carlos Garcia Campos  <cgarcia@igalia.com>
    225

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

    r85059 r85193  
    376376    return webkitWebViewBase->priv->imContext;
    377377}
     378
     379WebPageProxy* webkitWebViewBaseGetPage(WebKitWebViewBase* webkitWebViewBase)
     380{
     381    return webkitWebViewBase->priv->webViewInstance->page();
     382}

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

    r85059 r85193  
    6666GtkIMContext* webkitWebViewBaseGetIMContext(WebKitWebViewBase*);
    6767
     68WebPageProxy* webkitWebViewBaseGetPage(WebKitWebViewBase*);
     69
    6870G_END_DECLS
    6971

  • trunk/Source/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h

    r79943 r85193  
    4242#elif PLATFORM(GTK)
    4343typedef struct _cairo_surface cairo_surface_t;
     44typedef struct _WebKitWebViewBase WebKitWebViewBase;
    4445#endif
    4546
    … …  
    5758typedef QGraphicsWKView PlatformWebView;
    5859#elif PLATFORM(GTK)
    59 class WebView;
    60 typedef WebView PlatformWebView;
     60typedef WebKitWebViewBase PlatformWebView;
    6161#endif
    6262

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

    r83319 r85193  
    3131#include "RefPtrCairo.h"
    3232#include "UpdateChunk.h"
     33#include "WebKitWebViewBase.h"
    3334#include "WebProcessProxy.h"
    3435#include "WebView.h"
    … …  
    4243WebPageProxy* ChunkedUpdateDrawingAreaProxy::page()
    4344{
    44     return m_webView->page();
     45    return webkitWebViewBaseGetPage(m_webView);
    4546}
    4647
    … …  
    5051        return;
    5152
    52     m_backingStoreImage = gdk_window_create_similar_surface(gtk_widget_get_window(m_webView->window()),
     53    m_backingStoreImage = gdk_window_create_similar_surface(gtk_widget_get_window(GTK_WIDGET(m_webView)),
    5354                                                            CAIRO_CONTENT_COLOR_ALPHA, size().width(), size().height());
    5455}
    … …  
    8889    cairo_paint(cr.get());
    8990
    90     gtk_widget_queue_draw_area(m_webView->window(), updateChunkRect.x(), updateChunkRect.y(),
     91    gtk_widget_queue_draw_area(GTK_WIDGET(m_webView), updateChunkRect.x(), updateChunkRect.y(),
    9192                               updateChunkRect.width(), updateChunkRect.height());
    9293}

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

    r85059 r85193  
    268268}
    269269
    270 GdkWindow* WebView::getWebViewWindow()
    271 {
    272     return gtk_widget_get_window(m_viewWidget);
    273 }
    274 
    275270void WebView::paint(GtkWidget* widget, GdkRectangle rect, cairo_t* cr)
    276271{
    … …  
    357352PassOwnPtr<DrawingAreaProxy> WebView::createDrawingAreaProxy()
    358353{
    359     return ChunkedUpdateDrawingAreaProxy::create(this, m_page.get());
     354    return ChunkedUpdateDrawingAreaProxy::create(WEBKIT_WEB_VIEW_BASE(m_viewWidget), m_page.get());
    360355}
    361356

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

    r83568 r85193  
    3333#include "WindowsKeyboardCodes.h"
    3434#include <WebCore/IntSize.h>
    35 #include <gdk/gdk.h>
    36 #include <glib.h>
    3735#include <gtk/gtk.h>
    3836#include <wtf/PassRefPtr.h>
    … …  
    7068private:
    7169    WebView(WebContext*, WebPageGroup*);
    72 
    73     GdkWindow* getWebViewWindow();
    7470
    7571    bool isActive();
Note: See TracChangeset for help on using the changeset viewer.