Android: Move scheduling logic to CompositorImpl

content/browser/android/content_view_render_view.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/android/content_view_render_view.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
@@ skipping 35 matching lines @@
 }  // anonymous namespace
 
 // static
 bool ContentViewRenderView::RegisterContentViewRenderView(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 ContentViewRenderView::ContentViewRenderView(JNIEnv* env,
                                              jobject obj,
                                              gfx::NativeWindow root_window)
-    : buffers_swapped_during_composite_(false),
-      layer_tree_build_helper_(new LayerTreeBuildHelperImpl()),
+    : layer_tree_build_helper_(new LayerTreeBuildHelperImpl()),
       root_window_(root_window),
       current_surface_format_(0) {
   java_obj_.Reset(env, obj);
 }
 
 ContentViewRenderView::~ContentViewRenderView() {
 }
 
 void ContentViewRenderView::SetLayerTreeBuildHelper(JNIEnv* env,
                                                     jobject obj,
@@ skipping 43 matching lines @@
 
 void ContentViewRenderView::SurfaceChanged(JNIEnv* env, jobject obj,
     jint format, jint width, jint height, jobject surface) {
   if (current_surface_format_ != format) {
     current_surface_format_ = format;
     compositor_->SetSurface(surface);
   }
   compositor_->SetWindowBounds(gfx::Size(width, height));
 }
 
-jboolean ContentViewRenderView::Composite(JNIEnv* env, jobject obj) {
-  if (!compositor_)
-    return false;
-
-  buffers_swapped_during_composite_ = false;
-  compositor_->Composite();
-  return buffers_swapped_during_composite_;
-}
-
 jboolean ContentViewRenderView::CompositeToBitmap(JNIEnv* env, jobject obj,
                                                   jobject java_bitmap) {
   gfx::JavaBitmap bitmap(java_bitmap);
   if (!compositor_ || bitmap.format() != ANDROID_BITMAP_FORMAT_RGBA_8888)
     return false;
   return compositor_->CompositeAndReadback(bitmap.pixels(),
                                            gfx::Rect(bitmap.size()));
 }
 
 void ContentViewRenderView::SetOverlayVideoMode(
     JNIEnv* env, jobject obj, bool enabled) {
   compositor_->SetHasTransparentBackground(enabled);
-  Java_ContentViewRenderView_requestRender(env, obj);
 }
 
-void ContentViewRenderView::ScheduleComposite() {
+void ContentViewRenderView::Layout() {
   JNIEnv* env = base::android::AttachCurrentThread();
-  Java_ContentViewRenderView_requestRender(env, java_obj_.obj());
+  Java_ContentViewRenderView_onCompositorLayout(env, java_obj_.obj());
 }
 
-void ContentViewRenderView::OnSwapBuffersPosted() {
-  buffers_swapped_during_composite_ = true;
-}
-
-void ContentViewRenderView::OnSwapBuffersCompleted() {
+void ContentViewRenderView::OnSwapBuffersCompleted(int pending_swap_buffers) {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_ContentViewRenderView_onSwapBuffersCompleted(env, java_obj_.obj());
 }
 
 void ContentViewRenderView::InitCompositor() {
   if (!compositor_)
     compositor_.reset(Compositor::Create(this, root_window_));
 }
 }  // namespace content