Revert 245445 "Unifies LayerTreeHost::SetNeedsUpdateLayers and S..."

trunk/src/content/shell/renderer/test_runner/WebTestProxy.h

Index: trunk/src/content/shell/renderer/test_runner/WebTestProxy.h
===================================================================
--- trunk/src/content/shell/renderer/test_runner/WebTestProxy.h	(revision 245527)
+++ trunk/src/content/shell/renderer/test_runner/WebTestProxy.h	(working copy)
@@ -106,6 +106,9 @@
 
     void setLogConsoleOutput(bool enabled);
 
+    // FIXME: Make this private again.
+    void scheduleComposite();
+
     void didOpenChooser();
     void didCloseChooser();
     bool isChooserShown();
@@ -133,6 +136,7 @@
 
     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);
@@ -188,9 +192,6 @@
     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*);
@@ -254,6 +255,14 @@
     {
         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);
@@ -519,15 +528,6 @@
         WebTestProxyBase::postSpellCheckEvent(eventName);
     }
 
-    // Override Base implementation
-    virtual void ScheduleComposite()
-    {
-        WebTestProxyBase::ScheduleComposite();
-    }
-    virtual void ScheduleAnimation()
-    {
-        WebTestProxyBase::ScheduleAnimation();
-    }
 private:
     DISALLOW_COPY_AND_ASSIGN(WebTestProxy);
 };