| Index: content/shell/renderer/test_runner/web_test_proxy.h
|
| diff --git a/content/shell/renderer/test_runner/web_test_proxy.h b/content/shell/renderer/test_runner/web_test_proxy.h
|
| index 7d1a6b77ce56daf9088eda45756296b0ab5d864f..dfde69a9d4a35e705f6ad2607fcc1f40149332c2 100644
|
| --- a/content/shell/renderer/test_runner/web_test_proxy.h
|
| +++ b/content/shell/renderer/test_runner/web_test_proxy.h
|
| @@ -120,8 +120,6 @@ class WebTestProxyBase : public blink::WebCompositeAndReadbackAsyncCallback {
|
|
|
| void DisplayAsyncThen(const base::Closure& callback);
|
|
|
| - void DiscardBackingStore();
|
| -
|
| blink::WebMIDIClientMock* GetMIDIClientMock();
|
| MockWebSpeechRecognizer* GetSpeechRecognizerMock();
|
|
|
| @@ -129,8 +127,6 @@ class WebTestProxyBase : public blink::WebCompositeAndReadbackAsyncCallback {
|
|
|
| blink::WebView* GetWebView() const;
|
|
|
| - void DidForceResize();
|
| -
|
| void PostSpellCheckEvent(const blink::WebString& eventName);
|
|
|
| // WebCompositeAndReadbackAsyncCallback implementation.
|
| @@ -140,14 +136,7 @@ class WebTestProxyBase : public blink::WebCompositeAndReadbackAsyncCallback {
|
| WebTestProxyBase();
|
| ~WebTestProxyBase();
|
|
|
| - void DidInvalidateRect(const blink::WebRect&);
|
| - void DidScrollRect(int, int, const blink::WebRect&);
|
| void ScheduleAnimation();
|
| - bool IsCompositorFramePending() const;
|
| - // FIXME: Remove once we switch to use didForceResize.
|
| - void SetWindowRect(const blink::WebRect&);
|
| - void Show(blink::WebNavigationPolicy);
|
| - void DidAutoResize(const blink::WebSize&);
|
| void PostAccessibilityEvent(const blink::WebAXObject&, blink::WebAXEvent);
|
| void StartDragging(blink::WebLocalFrame*, const blink::WebDragData&,
|
| blink::WebDragOperationsMask, const blink::WebImage&,
|
| @@ -224,9 +213,6 @@ class WebTestProxyBase : public blink::WebCompositeAndReadbackAsyncCallback {
|
| template <class, typename, typename>
|
| friend class WebFrameTestProxy;
|
| void LocationChangeDone(blink::WebFrame*);
|
| - void PaintPagesWithBoundaries();
|
| - SkCanvas* GetCanvas();
|
| - void InvalidateAll();
|
| void AnimateNow();
|
| void DrawSelectionRect(SkCanvas* canvas);
|
| void DidDisplayAsync(const base::Closure& callback, const SkBitmap& bitmap);
|
| @@ -243,9 +229,6 @@ class WebTestProxyBase : public blink::WebCompositeAndReadbackAsyncCallback {
|
| scoped_ptr<WebUserMediaClientMock> user_media_client_;
|
|
|
| // Painting.
|
| - scoped_ptr<SkCanvas> canvas_;
|
| - blink::WebRect paint_rect_;
|
| - bool is_painting_;
|
| bool animate_scheduled_;
|
| std::map<unsigned, std::string> resource_identifier_map_;
|
| std::deque<base::Callback<void(const SkBitmap&)> >
|
| @@ -271,29 +254,8 @@ class WebTestProxy : public Base, public WebTestProxyBase {
|
| virtual ~WebTestProxy() {}
|
|
|
| // WebViewClient implementation.
|
| - virtual void didInvalidateRect(const blink::WebRect& rect) {
|
| - WebTestProxyBase::DidInvalidateRect(rect);
|
| - }
|
| - virtual void didScrollRect(int dx, int dy, const blink::WebRect& clipRect) {
|
| - WebTestProxyBase::DidScrollRect(dx, dy, clipRect);
|
| - }
|
| virtual void scheduleComposite() { WebTestProxyBase::ScheduleComposite(); }
|
| virtual void scheduleAnimation() { WebTestProxyBase::ScheduleAnimation(); }
|
| - virtual bool isCompositorFramePending() const {
|
| - return WebTestProxyBase::IsCompositorFramePending();
|
| - }
|
| - virtual void setWindowRect(const blink::WebRect& rect) {
|
| - WebTestProxyBase::SetWindowRect(rect);
|
| - Base::setWindowRect(rect);
|
| - }
|
| - virtual void show(blink::WebNavigationPolicy policy) {
|
| - WebTestProxyBase::Show(policy);
|
| - Base::show(policy);
|
| - }
|
| - virtual void didAutoResize(const blink::WebSize& newSize) {
|
| - WebTestProxyBase::DidAutoResize(newSize);
|
| - Base::didAutoResize(newSize);
|
| - }
|
| virtual void postAccessibilityEvent(const blink::WebAXObject& object,
|
| blink::WebAXEvent event) {
|
| WebTestProxyBase::PostAccessibilityEvent(object, event);
|
|
|