Refactor BrowserViewRenderer-RenderThreadManager relationship.

android_webview/native/aw_contents.cc

Index: android_webview/native/aw_contents.cc
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc
index f23ef639933985ac2c70c40c65c70aabeb72bee9..b98b55728a2ebc48582c7148af1f09f2a6e5138e 100644
--- a/android_webview/native/aw_contents.cc
+++ b/android_webview/native/aw_contents.cc
@@ -310,16 +310,12 @@ 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);
   }
 }
 
@@ -748,10 +744,6 @@ void AwContents::OnReceivedTouchIconUrl(const std::string& url,
       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();