WIP Handle AwContents needing multiple live functors.

android_webview/browser/render_thread_manager.cc

 // Copyright 2014 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/browser/render_thread_manager.h"
 
 #include <utility>
 
 #include "android_webview/browser/child_frame.h"
 #include "android_webview/browser/compositor_frame_producer.h"
@@ skipping 88 matching lines @@
       weak_factory_on_ui_thread_(this) {
   DCHECK(ui_loop_->BelongsToCurrentThread());
   DCHECK(client_);
   ui_thread_weak_ptr_ = weak_factory_on_ui_thread_.GetWeakPtr();
   ResetRequestInvokeGLCallback();
 }
 
 RenderThreadManager::~RenderThreadManager() {
   DCHECK(ui_loop_->BelongsToCurrentThread());
   if (compositor_frame_producer_) {
-    compositor_frame_producer_->OnCompositorFrameConsumerWillDestroy();
+    compositor_frame_producer_->RemoveCompositorFrameConsumer(this);
   }
   DCHECK(!hardware_renderer_.get());
 }
 
 void RenderThreadManager::ClientRequestInvokeGL(bool for_idle) {
   if (ui_loop_->BelongsToCurrentThread()) {
     if (!g_request_invoke_gl_tracker.Get().ShouldRequestOnUiThread(this))
       return;
     ClientRequestInvokeGLOnUI();
   } else {
@@ skipping 31 matching lines @@
   g_request_invoke_gl_tracker.Get().SetQueuedFunctorOnUi(this);
   if (!client_->RequestInvokeGL(false)) {
     g_request_invoke_gl_tracker.Get().ResetPending();
     LOG(ERROR) << "Failed to request GL process. Deadlock likely";
   }
 }
 
 void RenderThreadManager::UpdateParentDrawConstraintsOnUI() {
   DCHECK(ui_loop_->BelongsToCurrentThread());
   if (compositor_frame_producer_) {
-    compositor_frame_producer_->OnParentDrawConstraintsUpdated();
+    compositor_frame_producer_->OnParentDrawConstraintsUpdated(this);
   }
 }
 
 void RenderThreadManager::SetScrollOffsetOnUI(gfx::Vector2d scroll_offset) {
   base::AutoLock lock(lock_);
   scroll_offset_ = scroll_offset;
 }
 
 gfx::Vector2d RenderThreadManager::GetScrollOffsetOnRT() {
   base::AutoLock lock(lock_);
@@ skipping 183 matching lines @@
   }
 
   if (hardware_initialized) {
     // Flush any invoke functors that's caused by ReleaseHardware.
     client_->RequestInvokeGL(true);
   }
 }
 
 void RenderThreadManager::SetCompositorFrameProducer(
     CompositorFrameProducer* compositor_frame_producer) {
+  if (compositor_frame_producer == compositor_frame_producer_) {

[boliu, 2016/05/05 21:40:32]

instead of the early out, relax the DCHECK instead?

[Tobias Sargeant, 2016/05/06 12:41:09]

Done.

+    return;
+  }
+  DCHECK_NE(compositor_frame_producer_ == nullptr,
+            compositor_frame_producer == nullptr);
   compositor_frame_producer_ = compositor_frame_producer;
 }
 
 bool RenderThreadManager::HasFrameOnUI() const {
   base::AutoLock lock(lock_);
   return hardware_renderer_has_frame_ || child_frame_.get();
 }
 
 bool RenderThreadManager::HasFrameForHardwareRendererOnRT() const {
   base::AutoLock lock(lock_);
@@ skipping 15 matching lines @@
     : render_thread_manager_(render_thread_manager) {
   DCHECK(!render_thread_manager_->IsInsideHardwareRelease());
   render_thread_manager_->SetInsideHardwareRelease(true);
 }
 
 RenderThreadManager::InsideHardwareReleaseReset::~InsideHardwareReleaseReset() {
   render_thread_manager_->SetInsideHardwareRelease(false);
 }
 
 }  // namespace android_webview