Android Browser Compositor: Add ScheduleComposite() callback.

content/browser/renderer_host/render_widget_host_view_android.cc

 // Copyright (c) 2012 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/renderer_host/render_widget_host_view_android.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/android/draw_delegate_impl.h"
 #include "content/browser/gpu/gpu_surface_tracker.h"
 #include "content/browser/renderer_host/compositor_impl_android.h"
 #include "content/browser/renderer_host/image_transport_factory_android.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/common/android/device_info.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/common/view_messages.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/Platform.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorSupport.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
 
 namespace content {
 
 namespace {
 
 // TODO(pliard): http://crbug.com/142585. Remove this helper function and update
 // the clients to deal directly with WebKit::WebTextDirection.
 base::i18n::TextDirection ConvertTextDirection(WebKit::WebTextDirection dir) {
   switch (dir) {
@@ skipping 276 matching lines @@
 
 void RenderWidgetHostViewAndroid::AcceleratedSurfaceBuffersSwapped(
     const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params,
     int gpu_host_id) {
   texture_layer_->setTextureId(params.surface_handle);
   texture_layer_->layer()->invalidate();
   // TODO(sievers): The view and layer should get sized proactively.
   if (((gfx::Size)texture_layer_->layer()->bounds()).IsEmpty())
     texture_layer_->layer()->setBounds(
         DrawDelegateImpl::GetInstance()->GetBounds());
-  DrawDelegateImpl::GetInstance()->OnSurfaceUpdated(
-      params.surface_handle,
-      this,
-      base::Bind(&RenderWidgetHostImpl::AcknowledgeBufferPresent,
-                 params.route_id, gpu_host_id));
+
+  // TODO(sievers): When running the impl thread in the browser we
+  // need to delay the ACK until after commit.
+  DCHECK(!WebKit::Platform::current()->compositorSupport()->
+         isThreadingEnabled());
+  uint32 sync_point =
+      ImageTransportFactoryAndroid::GetInstance()->InsertSyncPoint();

[no sievers, 2012/10/12 21:33:07]

@piman: One thing: Isn't it a problem that I insert the sync point using the
helper context here and not the compositor context?
What if this sync point gets parsed before commands from the compositor context
that still use the old texture (commands that were submitted but not parsed)?

I thought AURA also uses a different helper context for this though..

+  RenderWidgetHostImpl::AcknowledgeBufferPresent(
+      params.route_id, gpu_host_id, sync_point);
 }
 
 void RenderWidgetHostViewAndroid::AcceleratedSurfacePostSubBuffer(
     const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params,
     int gpu_host_id) {
   NOTREACHED();
 }
 
 void RenderWidgetHostViewAndroid::AcceleratedSurfaceSuspend() {
   NOTREACHED();
@@ skipping 171 matching lines @@
 // RenderWidgetHostView, public:
 
 // static
 RenderWidgetHostView*
 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) {
   RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget);
   return new RenderWidgetHostViewAndroid(rwhi, NULL);
 }
 
 } // namespace content