Changeset 85198 in webkit


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

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

Reviewed by Martin Robinson.

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

And rename it as PageClientImpl, since it's a page client
implementation, not a web view.

  • GNUmakefile.am:
  • UIProcess/API/C/gtk/WKView.cpp:
  • UIProcess/API/gtk/PageClientImpl.cpp: Renamed from Source/WebKit2/UIProcess/gtk/WebView.cpp. (WebKit::backspaceCallback): (WebKit::selectAllCallback): (WebKit::cutClipboardCallback): (WebKit::copyClipboardCallback): (WebKit::pasteClipboardCallback): (WebKit::toggleOverwriteCallback): (WebKit::popupMenuCallback): (WebKit::showHelpCallback): (WebKit::deleteFromCursorCallback): (WebKit::moveCursorCallback): (WebKit::PageClientImpl::PageClientImpl): (WebKit::PageClientImpl::~PageClientImpl): (WebKit::PageClientImpl::getEditorCommandsForKeyEvent): (WebKit::PageClientImpl::createDrawingAreaProxy): (WebKit::PageClientImpl::setViewNeedsDisplay): (WebKit::PageClientImpl::displayView): (WebKit::PageClientImpl::scrollView): (WebKit::PageClientImpl::viewSize): (WebKit::PageClientImpl::isViewWindowActive): (WebKit::PageClientImpl::isViewFocused): (WebKit::PageClientImpl::isViewVisible): (WebKit::PageClientImpl::isViewInWindow): (WebKit::PageClientImpl::PageClientImpl::processDidCrash): (WebKit::PageClientImpl::didRelaunchProcess): (WebKit::PageClientImpl::takeFocus): (WebKit::PageClientImpl::toolTipChanged): (WebKit::PageClientImpl::setCursor): (WebKit::PageClientImpl::setViewportArguments): (WebKit::PageClientImpl::registerEditCommand): (WebKit::PageClientImpl::clearAllEditCommands): (WebKit::PageClientImpl::canUndoRedo): (WebKit::PageClientImpl::executeUndoRedo): (WebKit::PageClientImpl::convertToDeviceSpace): (WebKit::PageClientImpl::convertToUserSpace): (WebKit::PageClientImpl::windowToScreen): (WebKit::PageClientImpl::doneWithKeyEvent): (WebKit::PageClientImpl::didNotHandleKeyEvent): (WebKit::PageClientImpl::createPopupMenuProxy): (WebKit::PageClientImpl::createContextMenuProxy): (WebKit::PageClientImpl::setFindIndicator): (WebKit::PageClientImpl::pageDidEnterAcceleratedCompositing): (WebKit::PageClientImpl::pageDidLeaveAcceleratedCompositing): (WebKit::PageClientImpl::didCommitLoadForMainFrame): (WebKit::PageClientImpl::didFinishLoadingDataForCustomRepresentation): (WebKit::PageClientImpl::customRepresentationZoomFactor): (WebKit::PageClientImpl::setCustomRepresentationZoomFactor): (WebKit::PageClientImpl::pageClosed): (WebKit::PageClientImpl::didChangeScrollbarsForMainFrame): (WebKit::PageClientImpl::flashBackingStoreUpdates): (WebKit::PageClientImpl::findStringInCustomRepresentation): (WebKit::PageClientImpl::countStringMatchesInCustomRepresentation):
  • UIProcess/API/gtk/PageClientImpl.h: Renamed from Source/WebKit2/UIProcess/gtk/WebView.h. (WebKit::PageClientImpl::create): (WebKit::PageClientImpl::addPendingEditorCommand): (WebKit::PageClientImpl::userSpaceScaleFactor):
  • UIProcess/API/gtk/WebKitWebViewBase.cpp: (webkitWebViewBaseInit): (webkitWebViewBaseCreate):
  • UIProcess/API/gtk/WebKitWebViewBase.h:
  • UIProcess/gtk/ChunkedUpdateDrawingAreaProxyGtk.cpp:
Location:
trunk/Source/WebKit2
Files:
6 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r85197 r85198  
     12011-04-28  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        Reviewed by Martin Robinson.
     4
     5        [GTK] Move WebView to UIProcess/API/gtk
     6        https://bugs.webkit.org/show_bug.cgi?id=59686
     7
     8        And rename it as PageClientImpl, since it's a page client
     9        implementation, not a web view.
     10
     11        * GNUmakefile.am:
     12        * UIProcess/API/C/gtk/WKView.cpp:
     13        * UIProcess/API/gtk/PageClientImpl.cpp: Renamed from Source/WebKit2/UIProcess/gtk/WebView.cpp.
     14        (WebKit::backspaceCallback):
     15        (WebKit::selectAllCallback):
     16        (WebKit::cutClipboardCallback):
     17        (WebKit::copyClipboardCallback):
     18        (WebKit::pasteClipboardCallback):
     19        (WebKit::toggleOverwriteCallback):
     20        (WebKit::popupMenuCallback):
     21        (WebKit::showHelpCallback):
     22        (WebKit::deleteFromCursorCallback):
     23        (WebKit::moveCursorCallback):
     24        (WebKit::PageClientImpl::PageClientImpl):
     25        (WebKit::PageClientImpl::~PageClientImpl):
     26        (WebKit::PageClientImpl::getEditorCommandsForKeyEvent):
     27        (WebKit::PageClientImpl::createDrawingAreaProxy):
     28        (WebKit::PageClientImpl::setViewNeedsDisplay):
     29        (WebKit::PageClientImpl::displayView):
     30        (WebKit::PageClientImpl::scrollView):
     31        (WebKit::PageClientImpl::viewSize):
     32        (WebKit::PageClientImpl::isViewWindowActive):
     33        (WebKit::PageClientImpl::isViewFocused):
     34        (WebKit::PageClientImpl::isViewVisible):
     35        (WebKit::PageClientImpl::isViewInWindow):
     36        (WebKit::PageClientImpl::PageClientImpl::processDidCrash):
     37        (WebKit::PageClientImpl::didRelaunchProcess):
     38        (WebKit::PageClientImpl::takeFocus):
     39        (WebKit::PageClientImpl::toolTipChanged):
     40        (WebKit::PageClientImpl::setCursor):
     41        (WebKit::PageClientImpl::setViewportArguments):
     42        (WebKit::PageClientImpl::registerEditCommand):
     43        (WebKit::PageClientImpl::clearAllEditCommands):
     44        (WebKit::PageClientImpl::canUndoRedo):
     45        (WebKit::PageClientImpl::executeUndoRedo):
     46        (WebKit::PageClientImpl::convertToDeviceSpace):
     47        (WebKit::PageClientImpl::convertToUserSpace):
     48        (WebKit::PageClientImpl::windowToScreen):
     49        (WebKit::PageClientImpl::doneWithKeyEvent):
     50        (WebKit::PageClientImpl::didNotHandleKeyEvent):
     51        (WebKit::PageClientImpl::createPopupMenuProxy):
     52        (WebKit::PageClientImpl::createContextMenuProxy):
     53        (WebKit::PageClientImpl::setFindIndicator):
     54        (WebKit::PageClientImpl::pageDidEnterAcceleratedCompositing):
     55        (WebKit::PageClientImpl::pageDidLeaveAcceleratedCompositing):
     56        (WebKit::PageClientImpl::didCommitLoadForMainFrame):
     57        (WebKit::PageClientImpl::didFinishLoadingDataForCustomRepresentation):
     58        (WebKit::PageClientImpl::customRepresentationZoomFactor):
     59        (WebKit::PageClientImpl::setCustomRepresentationZoomFactor):
     60        (WebKit::PageClientImpl::pageClosed):
     61        (WebKit::PageClientImpl::didChangeScrollbarsForMainFrame):
     62        (WebKit::PageClientImpl::flashBackingStoreUpdates):
     63        (WebKit::PageClientImpl::findStringInCustomRepresentation):
     64        (WebKit::PageClientImpl::countStringMatchesInCustomRepresentation):
     65        * UIProcess/API/gtk/PageClientImpl.h: Renamed from Source/WebKit2/UIProcess/gtk/WebView.h.
     66        (WebKit::PageClientImpl::create):
     67        (WebKit::PageClientImpl::addPendingEditorCommand):
     68        (WebKit::PageClientImpl::userSpaceScaleFactor):
     69        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
     70        (webkitWebViewBaseInit):
     71        (webkitWebViewBaseCreate):
     72        * UIProcess/API/gtk/WebKitWebViewBase.h:
     73        * UIProcess/gtk/ChunkedUpdateDrawingAreaProxyGtk.cpp:
     74
    1752011-04-28  Carlos Garcia Campos  <cgarcia@igalia.com>
    276

  • trunk/Source/WebKit2/GNUmakefile.am

    r85059 r85198  
    351351        Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.cpp \
    352352        Source/WebKit2/UIProcess/API/cpp/WKRetainPtr.h \
     353        Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h \
     354        Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp \
    353355        Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.h \
    354356        Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp \
    … …  
    381383        Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp \
    382384        Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp \
    383         Source/WebKit2/UIProcess/gtk/WebView.cpp \
    384         Source/WebKit2/UIProcess/gtk/WebView.h \
    385385        Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp \
    386386        Source/WebKit2/UIProcess/Launcher/gtk/ThreadLauncherGtk.cpp \

  • trunk/Source/WebKit2/UIProcess/API/C/gtk/WKView.cpp

    r85196 r85198  
    3131#include "WKAPICast.h"
    3232#include "WebKitWebViewBase.h"
    33 #include "WebView.h"
    3433#include <wtf/PassRefPtr.h>
    3534#include <wtf/RefPtr.h>

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

    r85197 r85198  
    2727
    2828#include "config.h"
    29 #include "WebView.h"
     29#include "PageClientImpl.h"
    3030
    3131#include "ChunkedUpdateDrawingAreaProxy.h"
    … …  
    4646namespace WebKit {
    4747
    48 static void backspaceCallback(GtkWidget* widget, WebView* client)
     48static void backspaceCallback(GtkWidget* widget, PageClientImpl* client)
    4949{
    5050    g_signal_stop_emission_by_name(widget, "backspace");
    … …  
    5252}
    5353
    54 static void selectAllCallback(GtkWidget* widget, gboolean select, WebView* client)
     54static void selectAllCallback(GtkWidget* widget, gboolean select, PageClientImpl* client)
    5555{
    5656    g_signal_stop_emission_by_name(widget, "select-all");
    … …  
    5858}
    5959
    60 static void cutClipboardCallback(GtkWidget* widget, WebView* client)
     60static void cutClipboardCallback(GtkWidget* widget, PageClientImpl* client)
    6161{
    6262    g_signal_stop_emission_by_name(widget, "cut-clipboard");
    … …  
    6464}
    6565
    66 static void copyClipboardCallback(GtkWidget* widget, WebView* client)
     66static void copyClipboardCallback(GtkWidget* widget, PageClientImpl* client)
    6767{
    6868    g_signal_stop_emission_by_name(widget, "copy-clipboard");
    … …  
    7070}
    7171
    72 static void pasteClipboardCallback(GtkWidget* widget, WebView* client)
     72static void pasteClipboardCallback(GtkWidget* widget, PageClientImpl* client)
    7373{
    7474    g_signal_stop_emission_by_name(widget, "paste-clipboard");
    … …  
    106106};
    107107
    108 static void deleteFromCursorCallback(GtkWidget* widget, GtkDeleteType deleteType, gint count, WebView* client)
     108static void deleteFromCursorCallback(GtkWidget* widget, GtkDeleteType deleteType, gint count, PageClientImpl* client)
    109109{
    110110    g_signal_stop_emission_by_name(widget, "delete-from-cursor");
    … …  
    165165};
    166166
    167 static void moveCursorCallback(GtkWidget* widget, GtkMovementStep step, gint count, gboolean extendSelection, WebView* client)
     167static void moveCursorCallback(GtkWidget* widget, GtkMovementStep step, gint count, gboolean extendSelection, PageClientImpl* client)
    168168{
    169169    g_signal_stop_emission_by_name(widget, "move-cursor");
    … …  
    221221};
    222222
    223 WebView::WebView(GtkWidget* viewWidget)
     223PageClientImpl::PageClientImpl(GtkWidget* viewWidget)
    224224    : m_viewWidget(viewWidget)
    225225    , m_nativeWidget(gtk_text_view_new())
    … …  
    237237}
    238238
    239 WebView::~WebView()
    240 {
    241 }
    242 
    243 void WebView::getEditorCommandsForKeyEvent(const NativeWebKeyboardEvent& event, Vector<WTF::String>& commandList)
     239PageClientImpl::~PageClientImpl()
     240{
     241}
     242
     243void PageClientImpl::getEditorCommandsForKeyEvent(const NativeWebKeyboardEvent& event, Vector<WTF::String>& commandList)
    244244{
    245245    m_pendingEditorCommands.clear();
    … …  
    288288
    289289// PageClient's pure virtual functions
    290 PassOwnPtr<DrawingAreaProxy> WebView::createDrawingAreaProxy()
     290PassOwnPtr<DrawingAreaProxy> PageClientImpl::createDrawingAreaProxy()
    291291{
    292292    WebKitWebViewBase* view = WEBKIT_WEB_VIEW_BASE(m_viewWidget);
    … …  
    294294}
    295295
    296 void WebView::setViewNeedsDisplay(const WebCore::IntRect&)
    297 {
    298     notImplemented();
    299 }
    300 
    301 void WebView::displayView()
    302 {
    303     notImplemented();
    304 }
    305 
    306 void WebView::scrollView(const WebCore::IntRect& scrollRect, const WebCore::IntSize& scrollOffset)
    307 {
    308     notImplemented();
    309 }
    310 
    311 WebCore::IntSize WebView::viewSize()
     296void PageClientImpl::setViewNeedsDisplay(const WebCore::IntRect&)
     297{
     298    notImplemented();
     299}
     300
     301void PageClientImpl::displayView()
     302{
     303    notImplemented();
     304}
     305
     306void PageClientImpl::scrollView(const WebCore::IntRect& scrollRect, const WebCore::IntSize& scrollOffset)
     307{
     308    notImplemented();
     309}
     310
     311WebCore::IntSize PageClientImpl::viewSize()
    312312{
    313313    GtkAllocation allocation;
    … …  
    316316}
    317317
    318 bool WebView::isViewWindowActive()
     318bool PageClientImpl::isViewWindowActive()
    319319{
    320320    notImplemented();
    … …  
    322322}
    323323
    324 bool WebView::isViewFocused()
     324bool PageClientImpl::isViewFocused()
    325325{
    326326    notImplemented();
    … …  
    328328}
    329329
    330 bool WebView::isViewVisible()
     330bool PageClientImpl::isViewVisible()
    331331{
    332332    notImplemented();
    … …  
    334334}
    335335
    336 bool WebView::isViewInWindow()
     336bool PageClientImpl::isViewInWindow()
    337337{
    338338    notImplemented();
    … …  
    340340}
    341341
    342 void WebView::WebView::processDidCrash()
    343 {
    344     notImplemented();
    345 }
    346 
    347 void WebView::didRelaunchProcess()
    348 {
    349     notImplemented();
    350 }
    351 
    352 void WebView::takeFocus(bool)
    353 {
    354     notImplemented();
    355 }
    356 
    357 void WebView::toolTipChanged(const String&, const String&)
    358 {
    359     notImplemented();
    360 }
    361 
    362 void WebView::setCursor(const Cursor& cursor)
     342void PageClientImpl::PageClientImpl::processDidCrash()
     343{
     344    notImplemented();
     345}
     346
     347void PageClientImpl::didRelaunchProcess()
     348{
     349    notImplemented();
     350}
     351
     352void PageClientImpl::takeFocus(bool)
     353{
     354    notImplemented();
     355}
     356
     357void PageClientImpl::toolTipChanged(const String&, const String&)
     358{
     359    notImplemented();
     360}
     361
     362void PageClientImpl::setCursor(const Cursor& cursor)
    363363{
    364364    // [GTK] Widget::setCursor() gets called frequently
    … …  
    373373}
    374374
    375 void WebView::setViewportArguments(const WebCore::ViewportArguments&)
    376 {
    377     notImplemented();
    378 }
    379 
    380 void WebView::registerEditCommand(PassRefPtr<WebEditCommandProxy>, WebPageProxy::UndoOrRedo)
    381 {
    382     notImplemented();
    383 }
    384 
    385 void WebView::clearAllEditCommands()
    386 {
    387     notImplemented();
    388 }
    389 
    390 bool WebView::canUndoRedo(WebPageProxy::UndoOrRedo)
     375void PageClientImpl::setViewportArguments(const WebCore::ViewportArguments&)
     376{
     377    notImplemented();
     378}
     379
     380void PageClientImpl::registerEditCommand(PassRefPtr<WebEditCommandProxy>, WebPageProxy::UndoOrRedo)
     381{
     382    notImplemented();
     383}
     384
     385void PageClientImpl::clearAllEditCommands()
     386{
     387    notImplemented();
     388}
     389
     390bool PageClientImpl::canUndoRedo(WebPageProxy::UndoOrRedo)
    391391{
    392392    notImplemented();
    … …  
    394394}
    395395
    396 void WebView::executeUndoRedo(WebPageProxy::UndoOrRedo)
    397 {
    398     notImplemented();
    399 }
    400 
    401 FloatRect WebView::convertToDeviceSpace(const FloatRect& viewRect)
     396void PageClientImpl::executeUndoRedo(WebPageProxy::UndoOrRedo)
     397{
     398    notImplemented();
     399}
     400
     401FloatRect PageClientImpl::convertToDeviceSpace(const FloatRect& viewRect)
    402402{
    403403    notImplemented();
    … …  
    405405}
    406406
    407 FloatRect WebView::convertToUserSpace(const FloatRect& viewRect)
     407FloatRect PageClientImpl::convertToUserSpace(const FloatRect& viewRect)
    408408{
    409409    notImplemented();
    … …  
    411411}
    412412
    413 IntRect WebView::windowToScreen(const IntRect& rect)
     413IntRect PageClientImpl::windowToScreen(const IntRect& rect)
    414414{
    415415    notImplemented();
    … …  
    417417}
    418418
    419 void WebView::doneWithKeyEvent(const NativeWebKeyboardEvent&, bool wasEventHandled)
    420 {
    421     notImplemented();
    422 }
    423 
    424 void WebView::didNotHandleKeyEvent(const NativeWebKeyboardEvent& event)
    425 {
    426     notImplemented();
    427 }
    428 
    429 PassRefPtr<WebPopupMenuProxy> WebView::createPopupMenuProxy(WebPageProxy*)
     419void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent&, bool wasEventHandled)
     420{
     421    notImplemented();
     422}
     423
     424void PageClientImpl::didNotHandleKeyEvent(const NativeWebKeyboardEvent& event)
     425{
     426    notImplemented();
     427}
     428
     429PassRefPtr<WebPopupMenuProxy> PageClientImpl::createPopupMenuProxy(WebPageProxy*)
    430430{
    431431    notImplemented();
    … …  
    433433}
    434434
    435 PassRefPtr<WebContextMenuProxy> WebView::createContextMenuProxy(WebPageProxy*)
     435PassRefPtr<WebContextMenuProxy> PageClientImpl::createContextMenuProxy(WebPageProxy*)
    436436{
    437437    notImplemented();
    … …  
    439439}
    440440
    441 void WebView::setFindIndicator(PassRefPtr<FindIndicator>, bool fadeOut)
     441void PageClientImpl::setFindIndicator(PassRefPtr<FindIndicator>, bool fadeOut)
    442442{
    443443    notImplemented();
    … …  
    445445
    446446#if USE(ACCELERATED_COMPOSITING)
    447 void WebView::pageDidEnterAcceleratedCompositing()
    448 {
    449     notImplemented();
    450 }
    451 
    452 void WebView::pageDidLeaveAcceleratedCompositing()
     447void PageClientImpl::pageDidEnterAcceleratedCompositing()
     448{
     449    notImplemented();
     450}
     451
     452void PageClientImpl::pageDidLeaveAcceleratedCompositing()
    453453{
    454454    notImplemented();
    … …  
    456456#endif // USE(ACCELERATED_COMPOSITING)
    457457
    458 void WebView::didCommitLoadForMainFrame(bool useCustomRepresentation)
    459 {
    460 }
    461 
    462 void WebView::didFinishLoadingDataForCustomRepresentation(const String& suggestedFilename, const CoreIPC::DataReference&)
    463 {
    464 }
    465 
    466 double WebView::customRepresentationZoomFactor()
     458void PageClientImpl::didCommitLoadForMainFrame(bool useCustomRepresentation)
     459{
     460}
     461
     462void PageClientImpl::didFinishLoadingDataForCustomRepresentation(const String& suggestedFilename, const CoreIPC::DataReference&)
     463{
     464}
     465
     466double PageClientImpl::customRepresentationZoomFactor()
    467467{
    468468    notImplemented();
    … …  
    470470}
    471471
    472 void WebView::setCustomRepresentationZoomFactor(double)
    473 {
    474     notImplemented();
    475 }
    476 
    477 void WebView::pageClosed()
    478 {
    479     notImplemented();
    480 }
    481 
    482 void WebView::didChangeScrollbarsForMainFrame() const
    483 {
    484 }
    485 
    486 void WebView::flashBackingStoreUpdates(const Vector<IntRect>&)
    487 {
    488     notImplemented();
    489 }
    490 
    491 void WebView::findStringInCustomRepresentation(const String&, FindOptions, unsigned)
    492 {
    493     notImplemented();
    494 }
    495 
    496 void WebView::countStringMatchesInCustomRepresentation(const String&, FindOptions, unsigned)
     472void PageClientImpl::setCustomRepresentationZoomFactor(double)
     473{
     474    notImplemented();
     475}
     476
     477void PageClientImpl::pageClosed()
     478{
     479    notImplemented();
     480}
     481
     482void PageClientImpl::didChangeScrollbarsForMainFrame() const
     483{
     484}
     485
     486void PageClientImpl::flashBackingStoreUpdates(const Vector<IntRect>&)
     487{
     488    notImplemented();
     489}
     490
     491void PageClientImpl::findStringInCustomRepresentation(const String&, FindOptions, unsigned)
     492{
     493    notImplemented();
     494}
     495
     496void PageClientImpl::countStringMatchesInCustomRepresentation(const String&, FindOptions, unsigned)
    497497{
    498498    notImplemented();

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

    r85197 r85198  
    2626 */
    2727
    28 #ifndef WebView_h
    29 #define WebView_h
     28#ifndef PageClientImpl_h
     29#define PageClientImpl_h
    3030
    3131#include "PageClient.h"
    … …  
    4040class WebPageNamespace;
    4141
    42 class WebView : public PageClient {
     42class PageClientImpl : public PageClient {
    4343public:
    44     ~WebView();
    45     static PassOwnPtr<WebView> create(GtkWidget* viewWidget)
     44    ~PageClientImpl();
     45    static PassOwnPtr<PageClientImpl> create(GtkWidget* viewWidget)
    4646    {
    47         return adoptPtr(new WebView(viewWidget));
     47        return adoptPtr(new PageClientImpl(viewWidget));
    4848    }
    4949
    … …  
    5151
    5252private:
    53     WebView(GtkWidget*);
     53    PageClientImpl(GtkWidget*);
    5454
    55     // PageClient
    5655    virtual PassOwnPtr<DrawingAreaProxy> createDrawingAreaProxy();
    5756    virtual void setViewNeedsDisplay(const WebCore::IntRect&);
    … …  
    9998    virtual void setCustomRepresentationZoomFactor(double);
    10099
    101     // Members of WebView class
     100    // Members of PageClientImpl class
    102101    GtkWidget* m_viewWidget;
    103102    Vector<WTF::String> m_pendingEditorCommands;
    … …  
    107106} // namespace WebKit
    108107
    109 #endif // WebView_h
     108#endif // PageClientImpl_h

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

    r85197 r85198  
    3434#include "NativeWebMouseEvent.h"
    3535#include "NotImplemented.h"
     36#include "PageClientImpl.h"
    3637#include "RefPtrCairo.h"
    3738#include "WebContext.h"
    … …  
    4647
    4748struct _WebKitWebViewBasePrivate {
    48     OwnPtr<WebView> webViewInstance;
     49    OwnPtr<PageClientImpl> pageClient;
    4950    RefPtr<WebPageProxy> page;
    5051    gboolean isPageActive;
    … …  
    147148    priv->previousClickTime = 0;
    148149
    149     priv->webViewInstance = WebView::create(GTK_WIDGET(webkitWebViewBase));
     150    priv->pageClient = PageClientImpl::create(GTK_WIDGET(webkitWebViewBase));
    150151}
    151152
    … …  
    396397    WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
    397398
    398     priv->page = context->createWebPage(priv->webViewInstance.get(), pageGroup);
     399    priv->page = context->createWebPage(priv->pageClient.get(), pageGroup);
    399400    priv->page->initializeWebPage();
    400401

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

    r85197 r85198  
    2929#define WebKitWebViewBase_h
    3030
    31 #include "WebView.h"
    32 
     31#include "WebPageProxy.h"
    3332#include <gtk/gtk.h>
    3433

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

    r85193 r85198  
    3333#include "WebKitWebViewBase.h"
    3434#include "WebProcessProxy.h"
    35 #include "WebView.h"
    3635#include <WebCore/GtkVersioning.h>
    3736#include <gdk/gdk.h>
Note: See TracChangeset for help on using the changeset viewer.