aw: Ubercomp mega patch

content/browser/android/in_process/synchronous_compositor_output_surface.cc

Index: content/browser/android/in_process/synchronous_compositor_output_surface.cc
diff --git a/content/browser/android/in_process/synchronous_compositor_output_surface.cc b/content/browser/android/in_process/synchronous_compositor_output_surface.cc
index de609c3c7eb1a80fef535c4a6482c75afd5eae46..1ca8f36fc9d31ef70c87c6e91400b2b752310852 100644
--- a/content/browser/android/in_process/synchronous_compositor_output_surface.cc
+++ b/content/browser/android/in_process/synchronous_compositor_output_surface.cc
@@ -12,6 +12,7 @@
 #include "cc/output/output_surface_client.h"
 #include "cc/output/software_output_device.h"
 #include "content/browser/android/in_process/synchronous_compositor_impl.h"
+#include "content/browser/gpu/compositor_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/command_buffer/common/gpu_memory_allocation.h"
@@ -74,11 +75,14 @@ SynchronousCompositorOutputSurface::SynchronousCompositorOutputSurface(
       did_swap_buffer_(false),
       current_sw_canvas_(NULL),
       memory_policy_(0),
-      output_surface_client_(NULL),
-      weak_ptr_factory_(this) {
+      output_surface_client_(NULL) {
   capabilities_.deferred_gl_initialization = true;
   capabilities_.draw_and_swap_full_viewport_every_frame = true;
   capabilities_.adjust_deadline_for_parent = false;
+  if (IsDelegatedRendererEnabled()) {
+    capabilities_.delegated_rendering = true;
+    capabilities_.max_frames_pending = 1;
+  }
   // Cannot call out to GetDelegate() here as the output surface is not
   // constructed on the correct thread.
 
@@ -139,29 +143,14 @@ void SynchronousCompositorOutputSurface::SwapBuffers(
     DCHECK(context_provider_);
     context_provider_->ContextGL()->ShallowFlushCHROMIUM();
   }
-  UpdateFrameMetaData(frame->metadata);
+
+  DCHECK(frame_);
+  frame->AssignTo(frame_);
 
   did_swap_buffer_ = true;
   client_->DidSwapBuffers();
 }
 
-void SynchronousCompositorOutputSurface::UpdateFrameMetaData(
-    const cc::CompositorFrameMetadata& frame_info) {
-  if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    BrowserThread::PostTask(
-        BrowserThread::UI,
-        FROM_HERE,
-        base::Bind(&SynchronousCompositorOutputSurface::UpdateFrameMetaData,
-                   weak_ptr_factory_.GetWeakPtr(),
-                   frame_info));
-    return;
-  }
-
-  SynchronousCompositorOutputSurfaceDelegate* delegate = GetDelegate();
-  if (delegate)
-    delegate->UpdateFrameMetaData(frame_info);
-}
-
 namespace {
 void AdjustTransform(gfx::Transform* transform, gfx::Rect viewport) {
   // CC's draw origin starts at the viewport.
@@ -188,11 +177,13 @@ bool SynchronousCompositorOutputSurface::DemandDrawHw(
     const gfx::Transform& transform,
     gfx::Rect viewport,
     gfx::Rect clip,
-    bool stencil_enabled) {
+    bool stencil_enabled,
+    cc::CompositorFrame* frame) {
   DCHECK(CalledOnValidThread());
   DCHECK(HasClient());
   DCHECK(context_provider_);
 
+  base::AutoReset<cc::CompositorFrame*> frame_resetter(&frame_, frame);
   surface_size_ = surface_size;
   SetExternalStencilTest(stencil_enabled);
   InvokeComposite(transform, viewport, clip, true);
@@ -200,10 +191,30 @@ bool SynchronousCompositorOutputSurface::DemandDrawHw(
   return did_swap_buffer_;
 }
 
-bool SynchronousCompositorOutputSurface::DemandDrawSw(SkCanvas* canvas) {
+bool SynchronousCompositorOutputSurface::DemandDrawDelegated(
+    const gfx::Transform& transform,
+    gfx::Rect viewport,
+    gfx::Rect clip,
+    cc::CompositorFrame* frame) {
+  DCHECK(CalledOnValidThread());
+  DCHECK(HasClient());
+  DCHECK(context_provider_);
+
+  base::AutoReset<cc::CompositorFrame*> frame_resetter(&frame_, frame);
+  surface_size_ = gfx::Size(viewport.width(), viewport.height());
+  SetExternalStencilTest(false);
+  InvokeComposite(transform, viewport, clip, true);
+
+  return did_swap_buffer_;
+}
+
+bool SynchronousCompositorOutputSurface::DemandDrawSw(
+    SkCanvas* canvas,
+    cc::CompositorFrame* frame) {
   DCHECK(CalledOnValidThread());
   DCHECK(canvas);
   DCHECK(!current_sw_canvas_);
+  base::AutoReset<cc::CompositorFrame*> frame_resetter(&frame_, frame);
   base::AutoReset<SkCanvas*> canvas_resetter(&current_sw_canvas_, canvas);
 
   SkIRect canvas_clip;
@@ -258,6 +269,12 @@ void SynchronousCompositorOutputSurface::InvokeComposite(
     delegate->SetContinuousInvalidate(needs_begin_frame_);
 }
 
+void SynchronousCompositorOutputSurface::ReturnResources(
+    const cc::CompositorFrameAck* frame_ack) {
+  DCHECK(frame_ack);
+  ReclaimResources(frame_ack);
+}
+
 void SynchronousCompositorOutputSurface::SetMemoryPolicy(
     const SynchronousCompositorMemoryPolicy& policy) {
   DCHECK(CalledOnValidThread());