Unifies LayerTreeHost::SetNeedsUpdateLayers and SetNeedsAnimate -- V2

content/shell/renderer/test_runner/WebTestProxy.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBTESTPROXY_H_
 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBTESTPROXY_H_
 
 #include <map>
 #include <string>
 
@@ skipping 88 matching lines @@
     bool runFileChooser(const blink::WebFileChooserParams&, blink::WebFileChooserCompletion*);
     void showValidationMessage(const blink::WebRect& anchorInRootView, const blink::WebString& mainText, const blink::WebString& supplementalText, blink::WebTextDirection);
     void hideValidationMessage();
     void moveValidationMessage(const blink::WebRect& anchorInRootView);
 
     std::string captureTree(bool debugRenderTree);
     SkCanvas* capturePixels();
 
     void setLogConsoleOutput(bool enabled);
 
-    // FIXME: Make this private again.
-    void scheduleComposite();
-
     void didOpenChooser();
     void didCloseChooser();
     bool isChooserShown();
 
     void display();
     void displayInvalidatedRegion();
     void discardBackingStore();
 
     blink::WebGeolocationClientMock* geolocationClientMock();
     blink::WebMIDIClientMock* midiClientMock();
     MockWebSpeechInputController* speechInputControllerMock();
     MockWebSpeechRecognizer* speechRecognizerMock();
 
     WebTaskList* taskList() { return &m_taskList; }
 
     blink::WebView* webView();
 
     void didForceResize();
 
     void postSpellCheckEvent(const blink::WebString& eventName);
 
 protected:
     WebTestProxyBase();
     ~WebTestProxyBase();
 
     void didInvalidateRect(const blink::WebRect&);
     void didScrollRect(int, int, const blink::WebRect&);
-    void scheduleAnimation();
     // 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::WebFrame*, const blink::WebDragData&, blink::WebDragOperationsMask, const blink::WebImage&, const blink::WebPoint&);
     void didChangeSelection(bool isEmptySelection);
     void didChangeContents();
     void didEndEditing();
     bool createView(blink::WebFrame* creator, const blink::WebURLRequest&, const blink::WebWindowFeatures&, const blink::WebString& frameName, blink::WebNavigationPolicy, bool suppressOpener);
@@ skipping 35 matching lines @@
     void didDispatchPingLoader(blink::WebFrame*, const blink::WebURL&);
     void willRequestResource(blink::WebFrame*, const blink::WebCachedURLRequest&);
     void willSendRequest(blink::WebFrame*, unsigned identifier, blink::WebURLRequest&, const blink::WebURLResponse& redirectResponse);
     void didReceiveResponse(blink::WebFrame*, unsigned identifier, const blink::WebURLResponse&);
     void didChangeResourcePriority(blink::WebFrame*, unsigned identifier, const blink::WebURLRequest::Priority&);
     void didFinishResourceLoad(blink::WebFrame*, unsigned identifier);
     blink::WebNavigationPolicy decidePolicyForNavigation(blink::WebFrame*, blink::WebDataSource::ExtraData*, const blink::WebURLRequest&, blink::WebNavigationType, blink::WebNavigationPolicy defaultPolicy, bool isRedirect);
     bool willCheckAndDispatchMessageEvent(blink::WebFrame* sourceFrame, blink::WebFrame* targetFrame, blink::WebSecurityOrigin target, blink::WebDOMMessageEvent);
     void resetInputMethod();
 
+    void ScheduleComposite();
+    void ScheduleAnimation();
+
 private:
     template<class, typename, typename> friend class WebFrameTestProxy;
     void locationChangeDone(blink::WebFrame*);
     void paintRect(const blink::WebRect&);
     void paintInvalidatedRegion();
     void paintPagesWithBoundaries();
     SkCanvas* canvas();
     void displayRepaintMask();
     void invalidateAll();
     void animateNow();
@@ skipping 43 matching lines @@
 
     // 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 void setWindowRect(const blink::WebRect& rect)
     {
         WebTestProxyBase::setWindowRect(rect);
         Base::setWindowRect(rect);
     }
     virtual void show(blink::WebNavigationPolicy policy)
     {
         WebTestProxyBase::show(policy);
         Base::show(policy);
     }
@@ skipping 245 matching lines @@
     }
     virtual void moveValidationMessage(const blink::WebRect& anchorInRootView)
     {
         WebTestProxyBase::moveValidationMessage(anchorInRootView);
     }
     virtual void postSpellCheckEvent(const blink::WebString& eventName)
     {
         WebTestProxyBase::postSpellCheckEvent(eventName);
     }
 
+    // Override Base implementation
+    virtual void ScheduleComposite()
+    {
+        WebTestProxyBase::ScheduleComposite();
+    }
+    virtual void ScheduleAnimation()
+    {
+        WebTestProxyBase::ScheduleAnimation();
+    }
 private:
     DISALLOW_COPY_AND_ASSIGN(WebTestProxy);
 };
 
 }
 
 #endif  // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBTESTPROXY_H_