WIP Handle AwContents needing multiple live functors.

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 @@
 
   return web_contents_->GetJavaWebContents();
 }
 
 void AwContents::SetAwGLFunctor(AwGLFunctor* functor) {
   if (functor == functor_) {
     return;
   }
   functor_ = functor;
   if (functor_) {
-    browser_view_renderer_.SetCompositorFrameConsumer(
+    browser_view_renderer_.SetCurrentCompositorFrameConsumer(
         functor_->GetCompositorFrameConsumer());
   } else {
-    browser_view_renderer_.SetCompositorFrameConsumer(nullptr);
+    browser_view_renderer_.SetCurrentCompositorFrameConsumer(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 952 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