aw: Ubercomp mega patch

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/lazy_instance.h"
 #include "base/message_loop/message_loop.h"
 #include "cc/input/input_handler.h"
 #include "content/browser/android/in_process/synchronous_compositor_factory_impl.h"
@@ skipping 48 matching lines @@
 
 SynchronousCompositorImpl* SynchronousCompositorImpl::FromRoutingID(
     int routing_id) {
   return FromID(GetInProcessRendererId(), routing_id);
 }
 
 SynchronousCompositorImpl::SynchronousCompositorImpl(WebContents* contents)
     : compositor_client_(NULL),
       output_surface_(NULL),
       contents_(contents),
-      input_handler_(NULL) {
+      input_handler_(NULL),
+      weak_ptr_factory_(this) {
   DCHECK(contents);
 }
 
 SynchronousCompositorImpl::~SynchronousCompositorImpl() {
   if (compositor_client_)
     compositor_client_->DidDestroyCompositor(this);
   SetInputHandler(NULL);
 }
 
 void SynchronousCompositorImpl::SetClient(
@@ skipping 28 matching lines @@
   DCHECK(output_surface_);
   output_surface_->ReleaseHwDraw();
   g_factory.Get().CompositorReleasedHardwareDraw();
 }
 
 bool SynchronousCompositorImpl::DemandDrawHw(
       gfx::Size surface_size,
       const gfx::Transform& transform,
       gfx::Rect viewport,
       gfx::Rect clip,
-      bool stencil_enabled) {
+      bool stencil_enabled,
+      cc::CompositorFrame* frame) {
   DCHECK(CalledOnValidThread());
   DCHECK(output_surface_);
+  DCHECK(frame);
 
-  return output_surface_->DemandDrawHw(
-      surface_size, transform, viewport, clip, stencil_enabled);
+  bool result = output_surface_->DemandDrawHw(
+      surface_size, transform, viewport, clip, stencil_enabled, frame);
+  if (result)
+    UpdateFrameMetaData(frame->metadata);
+  return result;
 }
 
-bool SynchronousCompositorImpl::DemandDrawSw(SkCanvas* canvas) {
+bool SynchronousCompositorImpl::DemandDrawDelegated(
+    const gfx::Transform& transform,
+    gfx::Rect viewport,
+    gfx::Rect clip,
+    cc::CompositorFrame* frame) {
   DCHECK(CalledOnValidThread());
   DCHECK(output_surface_);
+  DCHECK(frame);
 
-  return output_surface_->DemandDrawSw(canvas);
+  bool result =
+      output_surface_->DemandDrawDelegated(transform, viewport, clip, frame);
+  if (result)
+    UpdateFrameMetaData(frame->metadata);
+  return result;
+}
+
+bool SynchronousCompositorImpl::DemandDrawSw(SkCanvas* canvas,
+                                             cc::CompositorFrame* frame) {
+  DCHECK(CalledOnValidThread());
+  DCHECK(output_surface_);
+  DCHECK(frame);
+
+  bool result = output_surface_->DemandDrawSw(canvas, frame);
+  if (result)
+    UpdateFrameMetaData(frame->metadata);
+  return result;
+}
+
+void SynchronousCompositorImpl::ReturnResources(
+    const cc::CompositorFrameAck* frame_ack) {
+  output_surface_->ReturnResources(frame_ack);
+}
+
+void SynchronousCompositorImpl::UpdateFrameMetaData(
+    const cc::CompositorFrameMetadata& frame_metadata) {
+  if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
+    BrowserThread::PostTask(
+        BrowserThread::UI,
+        FROM_HERE,
+        base::Bind(&SynchronousCompositorImpl::UpdateFrameMetaData,
+                   weak_ptr_factory_.GetWeakPtr(),
+                   frame_metadata));
+    return;
+  }
+  RenderWidgetHostViewAndroid* rwhv = static_cast<RenderWidgetHostViewAndroid*>(
+      contents_->GetRenderWidgetHostView());
+  if (rwhv)
+    rwhv->SynchronousFrameMetadata(frame_metadata);
 }
 
 void SynchronousCompositorImpl::SetMemoryPolicy(
     const SynchronousCompositorMemoryPolicy& policy) {
   DCHECK(CalledOnValidThread());
   DCHECK(output_surface_);
 
   output_surface_->SetMemoryPolicy(policy);
 }
 
@@ skipping 59 matching lines @@
     compositor_client_->SetContinuousInvalidate(enable);
 }
 
 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::UpdateFrameMetaData(
-    const cc::CompositorFrameMetadata& frame_metadata) {
-  RenderWidgetHostViewAndroid* rwhv = static_cast<RenderWidgetHostViewAndroid*>(
-      contents_->GetRenderWidgetHostView());
-  if (rwhv)
-    rwhv->SynchronousFrameMetadata(frame_metadata);
-}
-
 void SynchronousCompositorImpl::DidActivatePendingTree() {
   if (compositor_client_)
     compositor_client_->DidUpdateContent();
 }
 
 gfx::Vector2dF SynchronousCompositorImpl::GetTotalScrollOffset() {
   DCHECK(CalledOnValidThread());
   if (compositor_client_)
     return compositor_client_->GetTotalRootLayerScrollOffset();
   return gfx::Vector2dF();
@@ skipping 39 matching lines @@
   if (client) {
     g_factory.Get();  // Ensure it's initialized.
     SynchronousCompositorImpl::CreateForWebContents(contents);
   }
   if (SynchronousCompositorImpl* instance =
       SynchronousCompositorImpl::FromWebContents(contents)) {
     instance->SetClient(client);
   }
 }
 
+// static
+SynchronousCompositorFactoryImpl* SynchronousCompositor::GetFactory() {
+  return g_factory.Pointer();
+}
+
 }  // namespace content