Refactor BrowserViewRenderer-RenderThreadManager relationship.

android_webview/native/aw_contents.cc

 // Copyright 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 "android_webview/native/aw_contents.h"
 
 #include <limits>
 #include <utility>
 
 #include "android_webview/browser/aw_browser_context.h"
@@ skipping 292 matching lines @@
   if (!web_contents_)
     return base::android::ScopedJavaLocalRef<jobject>();
 
   return web_contents_->GetJavaWebContents();
 }
 
 void AwContents::SetAwGLFunctor(AwGLFunctor* functor) {
   if (functor == functor_) {
     return;
   }
-  if (functor_) {
-    functor_->SetBrowserViewRenderer(nullptr);
-  }
   functor_ = functor;
   if (functor_) {
-    browser_view_renderer_.SetRenderThreadManager(
-        functor_->GetRenderThreadManager());
-    functor_->SetBrowserViewRenderer(&browser_view_renderer_);
+    browser_view_renderer_.SetCompositorFrameConsumer(
+        functor_->GetCompositorFrameConsumer());
   } else {
-    browser_view_renderer_.SetRenderThreadManager(nullptr);
+    browser_view_renderer_.SetCompositorFrameConsumer(nullptr);
   }
 }
 
 void AwContents::SetAwGLFunctor(JNIEnv* env,
                                 const base::android::JavaParamRef<jobject>& obj,
                                 jlong gl_functor) {
   SetAwGLFunctor(reinterpret_cast<AwGLFunctor*>(gl_functor));
 }
 
 void AwContents::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) {
@@ skipping 408 matching lines @@
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return;
 
   Java_AwContents_onReceivedTouchIconUrl(
       env, obj.obj(), ConvertUTF8ToJavaString(env, url).obj(), precomposed);
 }
 
-void AwContents::OnParentDrawConstraintsUpdated() {
-  browser_view_renderer_.OnParentDrawConstraintsUpdated();
-}
-
 void AwContents::PostInvalidate() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (!obj.is_null())
     Java_AwContents_postInvalidateOnAnimation(env, obj.obj());
 }
 
 void AwContents::OnNewPicture() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ skipping 528 matching lines @@
     const JavaParamRef<jobject>& obj) {
   web_contents_->ResumeLoadingCreatedWebContents();
 }
 
 void SetShouldDownloadFavicons(JNIEnv* env,
                                const JavaParamRef<jclass>& jclazz) {
   g_should_download_favicons = true;
 }
 
 }  // namespace android_webview