diff options
Diffstat (limited to 'Tools/DumpRenderTree/chromium/WebViewHost.h')
| -rw-r--r-- | Tools/DumpRenderTree/chromium/WebViewHost.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/Tools/DumpRenderTree/chromium/WebViewHost.h b/Tools/DumpRenderTree/chromium/WebViewHost.h index 86007194b..eb41d54a4 100644 --- a/Tools/DumpRenderTree/chromium/WebViewHost.h +++ b/Tools/DumpRenderTree/chromium/WebViewHost.h @@ -41,6 +41,7 @@ #include "WebSpellCheckClient.h" #include "WebTask.h" #include "WebTestDelegate.h" +#include "WebTestProxy.h" #include "WebViewClient.h" #include <wtf/HashMap.h> #include <wtf/HashSet.h> @@ -86,6 +87,8 @@ class WebViewHost : public WebKit::WebViewClient, public WebKit::WebFrameClient, void setWebWidget(WebKit::WebWidget*); WebKit::WebView* webView() const; WebKit::WebWidget* webWidget() const; + WebTestRunner::WebTestProxyBase* proxy() const; + void setProxy(WebTestRunner::WebTestProxyBase*); void reset(); void setSelectTrailingWhitespaceEnabled(bool); void setSmartInsertDeleteEnabled(bool); @@ -99,7 +102,6 @@ class WebViewHost : public WebKit::WebViewClient, public WebKit::WebFrameClient, void setDeviceScaleFactor(float); void paintRect(const WebKit::WebRect&); - void updatePaintRect(const WebKit::WebRect&); void paintInvalidatedRegion(); void paintPagesWithBoundaries(); SkCanvas* canvas(); @@ -183,12 +185,10 @@ class WebViewHost : public WebKit::WebViewClient, public WebKit::WebFrameClient, virtual bool runModalBeforeUnloadDialog(WebKit::WebFrame*, const WebKit::WebString&); virtual void showContextMenu(WebKit::WebFrame*, const WebKit::WebContextMenuData&); virtual void setStatusText(const WebKit::WebString&); - virtual void startDragging(WebKit::WebFrame*, const WebKit::WebDragData&, WebKit::WebDragOperationsMask, const WebKit::WebImage&, const WebKit::WebPoint&); virtual void didUpdateLayout(); virtual void navigateBackForwardSoon(int offset); virtual int historyBackListCount(); virtual int historyForwardListCount(); - virtual void postAccessibilityNotification(const WebKit::WebAccessibilityObject&, WebKit::WebAccessibilityNotification); #if ENABLE(NOTIFICATIONS) virtual WebKit::WebNotificationPresenter* notificationPresenter(); #endif @@ -206,14 +206,8 @@ class WebViewHost : public WebKit::WebViewClient, public WebKit::WebFrameClient, virtual void printPage(WebKit::WebFrame*); // WebKit::WebWidgetClient - virtual void didInvalidateRect(const WebKit::WebRect&); - virtual void didScrollRect(int dx, int dy, const WebKit::WebRect&); virtual void didAutoResize(const WebKit::WebSize& newSize); - virtual void scheduleComposite(); -#if ENABLE(REQUEST_ANIMATION_FRAME) - virtual void serviceAnimation(); virtual void scheduleAnimation(); -#endif virtual void didFocus(); virtual void didBlur(); virtual void didChangeCursor(const WebKit::WebCursorInfo&); @@ -370,6 +364,9 @@ private: // Non-owning pointer. The WebViewHost instance is owned by this TestShell instance. TestShell* m_shell; + // Non-owning pointer. This class needs to be wrapped in a WebTestProxy. This is the pointer to the WebTestProxyBase. + WebTestRunner::WebTestProxyBase* m_proxy; + // This delegate works for the following widget. WebKit::WebWidget* m_webWidget; |
