Android Browser Compositor: Add ScheduleComposite() callback.

content/browser/renderer_host/compositor_impl_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/compositor_impl_android.h"
 
 #include <android/native_window_jni.h>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 53 matching lines @@
     scoped_ptr<WebKit::WebGraphicsContext3D> m_context3D;
     Capabilities m_capabilities;
     WebKit::WebCompositorOutputSurfaceClient* m_client;
 };
 
 } // anonymous namespace
 
 namespace content {
 
 // static
-Compositor* Compositor::Create() {
-  return new CompositorImpl();
+Compositor* Compositor::Create(Client* client) {
+  return client ? new CompositorImpl(client) : NULL;
 }
 
 // static
 void Compositor::Initialize() {
   g_initialized = true;
   // Android WebView runs in single process, and depends on the renderer to
   // perform WebKit::Platform initialization for the entire process. The
   // renderer, however, does that lazily which in practice means it waits
   // until the first page load request.
   // The WebView-specific rendering code isn't ready yet so we only want to
@@ skipping 11 matching lines @@
     return;
   }
   WebKit::Platform::current()->compositorSupport()->initialize(NULL);
 }
 
 // static
 bool CompositorImpl::IsInitialized() {
   return g_initialized;
 }
 
-CompositorImpl::CompositorImpl()
+CompositorImpl::CompositorImpl(Compositor::Client* client)
     : window_(NULL),
-      surface_id_(0) {
+      surface_id_(0),
+      client_(client) {
+  DCHECK(client);
   root_layer_.reset(
       WebKit::Platform::current()->compositorSupport()->createLayer());
 }
 
 CompositorImpl::~CompositorImpl() {
 }
 
-void CompositorImpl::OnSurfaceUpdated(
-    const SurfacePresentedCallback& callback) {
+void CompositorImpl::Composite() {
   if (host_.get())
     host_->composite();
-  // TODO(sievers): Let RWHV do this
-  uint32 sync_point =
-      ImageTransportFactoryAndroid::GetInstance()->InsertSyncPoint();
-  callback.Run(sync_point);
 }
 
 void CompositorImpl::SetRootLayer(WebKit::WebLayer* root_layer) {
   root_layer_->removeAllChildren();
   root_layer_->addChild(root_layer);
 }
 
 void CompositorImpl::SetWindowSurface(ANativeWindow* window) {
   GpuSurfaceTracker* tracker = GpuSurfaceTracker::Get();
 
@@ skipping 79 matching lines @@
 void CompositorImpl::didCommit() {
 }
 
 void CompositorImpl::didCommitAndDrawFrame() {
 }
 
 void CompositorImpl::didCompleteSwapBuffers() {
 }
 
 void CompositorImpl::scheduleComposite() {
+  client_->ScheduleComposite();
 }
 
 } // namespace content