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 101 matching lines @@
     SynchronousCompositorExternalBeginFrameSource* begin_frame_source) {
   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_->SetBeginFrameSource(begin_frame_source_);
+  output_surface_->SetInvalidateCallback(
+      base::Bind(&SynchronousCompositorImpl::DidInvalidateOutputSurface,
+                 weak_ptr_factory_.GetWeakPtr()));
   output_surface_->SetTreeActivationCallback(
       base::Bind(&SynchronousCompositorImpl::DidActivatePendingTree,
                  weak_ptr_factory_.GetWeakPtr()));
   NeedsBeginFramesChanged();
   compositor_client_->DidInitializeCompositor(this);
 }
 
 void SynchronousCompositorImpl::DidDestroyRendererObjects() {
   DCHECK(output_surface_);
   DCHECK(begin_frame_source_);
 
   begin_frame_source_->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 29 matching lines @@
     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);
+
+  // This is to handle draws that are not initiated by the platform.
+  // Platform draws happen synchronously after OnVSync is called.
+  if (!begin_frame_source_->InsideBeginFrame())
+    begin_frame_source_->SendBeginFrameNow();
+
   scoped_ptr<cc::CompositorFrame> frame =
       output_surface_->DemandDrawHw(surface_size,
                                     transform,
                                     viewport,
                                     clip,
                                     viewport_rect_for_tile_priority,
                                     transform_for_tile_priority);
+  
+  DCHECK(!begin_frame_source_->InsideBeginFrame());
+
   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);
+ 
+  // This is to handle draws that are not initiated by the platform.
+  // Platform draws happen synchronously after OnVSync is called.
+  if (!begin_frame_source_->InsideBeginFrame())
+    begin_frame_source_->SendBeginFrameNow();
+
   scoped_ptr<cc::CompositorFrame> frame =
       output_surface_->DemandDrawSw(canvas);
+  
+  DCHECK(!begin_frame_source_->InsideBeginFrame());
+
   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::NeedsBeginFramesChanged() const {
+  compositor_client_->SetNeedsVSyncs(begin_frame_source_->NeedsBeginFrames());
+}
+
 void SynchronousCompositorImpl::DidChangeRootLayerScrollOffset() {
   if (input_handler_)
     input_handler_->OnRootLayerDelegatedScrollOffsetChanged();
 }
 
+void SynchronousCompositorImpl::OnVSync(base::TimeTicks frame_time, 
+      base::TimeDelta vsync_period) {
+  DCHECK(CalledOnValidThread());
+  begin_frame_source_->SendBeginFrame(frame_time, vsync_period);
+}
+
 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);
   RenderProcessHost* rph = contents_->GetRenderProcessHost();
   for (ScopedVector<IPC::Message>::const_iterator i = messages.begin();
        i != messages.end();
        ++i) {
     rph->OnMessageReceived(**i);
   }
 }
 
+void SynchronousCompositorImpl::DidInvalidateOutputSurface() {
+  // Ignore invalidations while inside a draw.
+  if (compositor_client_ && !invoking_composite_)
+    compositor_client_->PostInvalidate();
+}
+
 void SynchronousCompositorImpl::DidActivatePendingTree() {
   if (compositor_client_)
     compositor_client_->DidUpdateContent();
 }
 
 gfx::ScrollOffset SynchronousCompositorImpl::GetTotalScrollOffset() {
   DCHECK(CalledOnValidThread());
   if (compositor_client_) {
     // TODO(miletus): Make GetTotalRootLayerScrollOffset return
     // ScrollOffset. crbug.com/414283.
@@ skipping 46 matching lines @@
     g_factory.Get();  // Ensure it's initialized.
     SynchronousCompositorImpl::CreateForWebContents(contents);
   }
   SynchronousCompositorImpl* instance =
       SynchronousCompositorImpl::FromWebContents(contents);
   DCHECK(instance);
   instance->SetClient(client);
 }
 
 }  // namespace content