Revert of cc: Make scheduling be driven by vsync for android webview.

content/browser/android/in_process/synchronous_compositor_impl.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_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_IMPL_H_
 #define CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_IMPL_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/input/layer_scroll_offset_delegate.h"
 #include "content/browser/android/in_process/synchronous_compositor_output_surface.h"
 #include "content/common/input/input_event_ack_state.h"
 #include "content/public/browser/android/synchronous_compositor.h"
 #include "content/public/browser/web_contents_user_data.h"
 #include "ipc/ipc_message.h"
 
 namespace cc {
-struct BeginFrameArgs;
+class BeginFrameSource;
 class InputHandler;
 }
 
 namespace blink {
 class WebInputEvent;
 }
 
 namespace content {
 class InputHandlerManager;
 class SynchronousCompositorExternalBeginFrameSource;
@@ skipping 17 matching lines @@
 
   InputEventAckState HandleInputEvent(const blink::WebInputEvent& input_event);
 
   // Called by SynchronousCompositorRegistry.
   void DidInitializeRendererObjects(
       SynchronousCompositorOutputSurface* output_surface,
       SynchronousCompositorExternalBeginFrameSource* begin_frame_source);
   void DidDestroyRendererObjects();
 
   // Called by SynchronousCompositorExternalBeginFrameSource.
-  void OnNeedsBeginFramesChange(bool needs_begin_frames);
-
-  // Called by SynchronousCompositorOutputSurface.
-  void PostInvalidate();
-
-  // Called by RenderWidgetHostViewAndroid.
-  void BeginFrame(const cc::BeginFrameArgs& args);
+  void NeedsBeginFramesChanged() const;
 
   // SynchronousCompositor
   bool InitializeHwDraw() override;
   void ReleaseHwDraw() override;
   scoped_ptr<cc::CompositorFrame> DemandDrawHw(
       gfx::Size surface_size,
       const gfx::Transform& transform,
       gfx::Rect viewport,
       gfx::Rect clip,
       gfx::Rect viewport_rect_for_tile_priority,
       const gfx::Transform& transform_for_tile_priority) override;
   bool DemandDrawSw(SkCanvas* canvas) override;
   void ReturnResources(const cc::CompositorFrameAck& frame_ack) override;
   void SetMemoryPolicy(size_t bytes_limit) override;
   void DidChangeRootLayerScrollOffset() override;
-  void SetIsActive(bool is_active) override;
 
   // LayerScrollOffsetDelegate
   gfx::ScrollOffset GetTotalScrollOffset() override;
   void UpdateRootLayerState(const gfx::ScrollOffset& total_scroll_offset,
                             const gfx::ScrollOffset& max_scroll_offset,
                             const gfx::SizeF& scrollable_size,
                             float page_scale_factor,
                             float min_page_scale_factor,
                             float max_page_scale_factor) override;
   bool IsExternalFlingActive() const override;
 
   void SetInputHandler(cc::InputHandler* input_handler);
   void DidOverscroll(const DidOverscrollParams& params);
   void DidStopFlinging();
 
  private:
   friend class WebContentsUserData<SynchronousCompositorImpl>;
   friend class SynchronousCompositor;
   explicit SynchronousCompositorImpl(WebContents* contents);
   ~SynchronousCompositorImpl() override;
 
   void SetClient(SynchronousCompositorClient* compositor_client);
   void UpdateFrameMetaData(const cc::CompositorFrameMetadata& frame_info);
   void NotifyDidDestroyCompositorToClient();
   void DidActivatePendingTree();
   void DeliverMessages();
   bool CalledOnValidThread() const;
-  void UpdateNeedsBeginFrames();
 
   SynchronousCompositorClient* compositor_client_;
   SynchronousCompositorOutputSurface* output_surface_;
   SynchronousCompositorExternalBeginFrameSource* begin_frame_source_;
   WebContents* contents_;
   const int routing_id_;
   cc::InputHandler* input_handler_;
-  bool is_active_;
-  bool renderer_needs_begin_frames_;
+  bool invoking_composite_;
 
   base::WeakPtrFactory<SynchronousCompositorImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_IMPL_H_