WIP Handle AwContents needing multiple live functors.

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 77e35efbe3cba8f86c7d48bec6d05404d65fc5ae..de9c58d5e12c9c1fcac2da14533e16c278e45f41 100644
--- a/android_webview/native/aw_contents.cc
+++ b/android_webview/native/aw_contents.cc
@@ -310,10 +310,10 @@ void AwContents::SetAwGLFunctor(AwGLFunctor* functor) {
   }
   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);
   }
 }