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

trunk/src/content/renderer/render_widget.h

 // Copyright (c) 2012 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_RENDERER_RENDER_WIDGET_H_
 #define CONTENT_RENDERER_RENDER_WIDGET_H_
 
 #include <deque>
 #include <map>
 
@@ skipping 115 matching lines @@
   virtual void didScrollRect(int dx, int dy,
                              const blink::WebRect& clipRect);
   virtual void didAutoResize(const blink::WebSize& new_size);
   virtual void didActivateCompositor(int input_handler_identifier);
   virtual void didDeactivateCompositor();
   virtual void initializeLayerTreeView();
   virtual blink::WebLayerTreeView* layerTreeView();
   virtual void didBecomeReadyForAdditionalInput();
   virtual void didCommitAndDrawCompositorFrame();
   virtual void didCompleteSwapBuffers();
-  virtual void scheduleAnimation(); // Renamed. Staged for removal.
-  virtual void scheduleUpdate();
+  virtual void scheduleComposite();
+  virtual void scheduleAnimation();
   virtual void didFocus();
   virtual void didBlur();
   virtual void didChangeCursor(const blink::WebCursorInfo&);
   virtual void closeWidgetSoon();
   virtual void show(blink::WebNavigationPolicy);
   virtual void runModal() {}
   virtual blink::WebRect windowRect();
   virtual void setToolTipText(const blink::WebString& text,
                               blink::WebTextDirection hint);
   virtual void setWindowRect(const blink::WebRect&);
@@ skipping 71 matching lines @@
   // Emulates screen and widget metrics. Supplied values override everything
   // coming from host.
   void EnableScreenMetricsEmulation(
       const gfx::Rect& device_rect,
       const gfx::Rect& widget_rect,
       float device_scale_factor,
       bool fit_to_view);
   void DisableScreenMetricsEmulation();
   void SetPopupOriginAdjustmentsForEmulation(ScreenMetricsEmulator* emulator);
 
-  virtual void ScheduleAnimation(); // virtual for testing
-  virtual void ScheduleComposite(); // virtual for testing
   void ScheduleCompositeWithForcedRedraw();
 
   // Called by the compositor in single-threaded mode when a swap is posted,
   // completes or is aborted.
   void OnSwapBuffersPosted();
   void OnSwapBuffersComplete();
   void OnSwapBuffersAborted();
 
   // Checks if the text input state and compose inline mode have been changed.
   // If they are changed, the new value will be sent to the browser process.
@@ skipping 550 matching lines @@
   float popup_origin_scale_for_emulation_;
 
   scoped_ptr<ResizingModeSelector> resizing_mode_selector_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidget);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_WIDGET_H_