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

content/browser/android/in_process/synchronous_compositor_impl.cc

 // 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.
 
 #include "content/browser/android/in_process/synchronous_compositor_impl.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 55 matching lines @@
   return FromID(GetInProcessRendererId(), routing_id);
 }
 
 SynchronousCompositorImpl::SynchronousCompositorImpl(WebContents* contents)
     : compositor_client_(NULL),
       output_surface_(NULL),
       begin_frame_source_(nullptr),
       contents_(contents),
       routing_id_(contents->GetRoutingID()),
       input_handler_(NULL),
-      is_active_(false),
-      renderer_needs_begin_frames_(false),
+      invoking_composite_(false),
       weak_ptr_factory_(this) {
   DCHECK(contents);
   DCHECK_NE(routing_id_, MSG_ROUTING_NONE);
   SynchronousCompositorRegistry::GetInstance()->RegisterCompositor(routing_id_,
                                                                    this);
 }
 
 SynchronousCompositorImpl::~SynchronousCompositorImpl() {
   SynchronousCompositorRegistry::GetInstance()->UnregisterCompositor(
       routing_id_, this);
@@ skipping 26 matching lines @@
   DCHECK(!output_surface_);
   DCHECK(!begin_frame_source_);
   DCHECK(output_surface);
   DCHECK(begin_frame_source);
   DCHECK(compositor_client_);
 
   output_surface_ = output_surface;
   begin_frame_source_ = begin_frame_source;
 
   begin_frame_source_->SetCompositor(this);
-  output_surface_->SetCompositor(this);
-
+  output_surface_->SetBeginFrameSource(begin_frame_source_);
   output_surface_->SetTreeActivationCallback(
       base::Bind(&SynchronousCompositorImpl::DidActivatePendingTree,
                  weak_ptr_factory_.GetWeakPtr()));
-
-  OnNeedsBeginFramesChange(begin_frame_source_->NeedsBeginFrames());
-
+  NeedsBeginFramesChanged();
   compositor_client_->DidInitializeCompositor(this);
 }
 
 void SynchronousCompositorImpl::DidDestroyRendererObjects() {
   DCHECK(output_surface_);
   DCHECK(begin_frame_source_);
 
   begin_frame_source_->SetCompositor(nullptr);
-  output_surface_->SetCompositor(nullptr);
+  output_surface_->SetBeginFrameSource(nullptr);
   if (compositor_client_)
     compositor_client_->DidDestroyCompositor(this);
   compositor_client_ = nullptr;
   output_surface_ = nullptr;
   begin_frame_source_ = nullptr;
 }
 
 void SynchronousCompositorImpl::NotifyDidDestroyCompositorToClient() {
   if (compositor_client_)
     compositor_client_->DidDestroyCompositor(this);
@@ skipping 27 matching lines @@
 
 scoped_ptr<cc::CompositorFrame> SynchronousCompositorImpl::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) {
   DCHECK(CalledOnValidThread());
   DCHECK(output_surface_);
+  DCHECK(!invoking_composite_);
   DCHECK(compositor_client_);
   DCHECK(begin_frame_source_);
 
+  base::AutoReset<bool> invoking_composite_resetter(&invoking_composite_,
+                                                    true);
   scoped_ptr<cc::CompositorFrame> frame =
       output_surface_->DemandDrawHw(surface_size,
                                     transform,
                                     viewport,
                                     clip,
                                     viewport_rect_for_tile_priority,
                                     transform_for_tile_priority);
-
   if (frame.get())
     UpdateFrameMetaData(frame->metadata);
 
+  compositor_client_->SetContinuousInvalidate(
+      begin_frame_source_->NeedsBeginFrames());
+
   return frame.Pass();
 }
 
 void SynchronousCompositorImpl::ReturnResources(
     const cc::CompositorFrameAck& frame_ack) {
   DCHECK(CalledOnValidThread());
   output_surface_->ReturnResources(frame_ack);
 }
 
 bool SynchronousCompositorImpl::DemandDrawSw(SkCanvas* canvas) {
   DCHECK(CalledOnValidThread());
   DCHECK(output_surface_);
+  DCHECK(!invoking_composite_);
   DCHECK(compositor_client_);
   DCHECK(begin_frame_source_);
 
+  base::AutoReset<bool> invoking_composite_resetter(&invoking_composite_,
+                                                    true);
   scoped_ptr<cc::CompositorFrame> frame =
       output_surface_->DemandDrawSw(canvas);
-
   if (frame.get())
     UpdateFrameMetaData(frame->metadata);
 
+  compositor_client_->SetContinuousInvalidate(
+      begin_frame_source_->NeedsBeginFrames());
+
   return !!frame.get();
 }
 
 void SynchronousCompositorImpl::UpdateFrameMetaData(
     const cc::CompositorFrameMetadata& frame_metadata) {
   RenderWidgetHostViewAndroid* rwhv = static_cast<RenderWidgetHostViewAndroid*>(
       contents_->GetRenderWidgetHostView());
   if (rwhv)
     rwhv->SynchronousFrameMetadata(frame_metadata);
   DeliverMessages();
 }
 
 void SynchronousCompositorImpl::SetMemoryPolicy(size_t bytes_limit) {
   DCHECK(CalledOnValidThread());
   DCHECK(output_surface_);
 
   output_surface_->SetMemoryPolicy(bytes_limit);
 }
 
-void SynchronousCompositorImpl::PostInvalidate() {
-  DCHECK(CalledOnValidThread());
-  DCHECK(compositor_client_);
-  compositor_client_->PostInvalidate();
-}
-
 void SynchronousCompositorImpl::DidChangeRootLayerScrollOffset() {
   if (input_handler_)
     input_handler_->OnRootLayerDelegatedScrollOffsetChanged();
 }
 
-void SynchronousCompositorImpl::SetIsActive(bool is_active) {
-  TRACE_EVENT1("cc", "SynchronousCompositorImpl::SetIsActive", "is_active",
-               is_active);
-  is_active_ = is_active;
-  UpdateNeedsBeginFrames();
-}
-
-void SynchronousCompositorImpl::OnNeedsBeginFramesChange(
-    bool needs_begin_frames) {
-  renderer_needs_begin_frames_ = needs_begin_frames;
-  UpdateNeedsBeginFrames();
-}
-
-void SynchronousCompositorImpl::BeginFrame(const cc::BeginFrameArgs& args) {
-  if (begin_frame_source_)
-    begin_frame_source_->BeginFrame(args);
-}
-
-void SynchronousCompositorImpl::UpdateNeedsBeginFrames() {
-  RenderWidgetHostViewAndroid* rwhv = static_cast<RenderWidgetHostViewAndroid*>(
-      contents_->GetRenderWidgetHostView());
-  if (rwhv)
-    rwhv->OnSetNeedsBeginFrames(is_active_ && renderer_needs_begin_frames_);
-}
-
 void SynchronousCompositorImpl::SetInputHandler(
     cc::InputHandler* input_handler) {
   DCHECK(CalledOnValidThread());
 
   if (input_handler_)
     input_handler_->SetRootLayerScrollOffsetDelegate(NULL);
 
   input_handler_ = input_handler;
 
   if (input_handler_)
     input_handler_->SetRootLayerScrollOffsetDelegate(this);
 }
 
 void SynchronousCompositorImpl::DidOverscroll(
     const DidOverscrollParams& params) {
   if (compositor_client_) {
     compositor_client_->DidOverscroll(params.accumulated_overscroll,
                                       params.latest_overscroll_delta,
                                       params.current_fling_velocity);
   }
 }
 
 void SynchronousCompositorImpl::DidStopFlinging() {
   RenderWidgetHostViewAndroid* rwhv = static_cast<RenderWidgetHostViewAndroid*>(
       contents_->GetRenderWidgetHostView());
   if (rwhv)
     rwhv->DidStopFlinging();
 }
 
+void SynchronousCompositorImpl::NeedsBeginFramesChanged() const {
+  DCHECK(CalledOnValidThread());
+  DCHECK(begin_frame_source_);
+  if (invoking_composite_)
+    return;
+
+  if (compositor_client_) {
+    compositor_client_->SetContinuousInvalidate(
+        begin_frame_source_->NeedsBeginFrames());
+  }
+}
+
 InputEventAckState SynchronousCompositorImpl::HandleInputEvent(
     const blink::WebInputEvent& input_event) {
   DCHECK(CalledOnValidThread());
   return g_factory.Get().synchronous_input_event_filter()->HandleInputEvent(
       contents_->GetRoutingID(), input_event);
 }
 
 void SynchronousCompositorImpl::DeliverMessages() {
   ScopedVector<IPC::Message> messages;
   output_surface_->GetMessagesToDeliver(&messages);
@@ skipping 64 matching lines @@
     g_factory.Get();  // Ensure it's initialized.
     SynchronousCompositorImpl::CreateForWebContents(contents);
   }
   SynchronousCompositorImpl* instance =
       SynchronousCompositorImpl::FromWebContents(contents);
   DCHECK(instance);
   instance->SetClient(client);
 }
 
 }  // namespace content