Move SharedRendererState ownership to AwContents

android_webview/browser/test/fake_window.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/test/fake_window.h"
 
 #include "android_webview/browser/browser_view_renderer.h"
+#include "android_webview/browser/child_frame.h"
+#include "android_webview/browser/shared_renderer_state.h"
 #include "base/location.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread.h"
 #include "ui/gl/gl_bindings.h"
 
 namespace android_webview {
 
 class FakeWindow::ScopedMakeCurrent {
  public:
@@ skipping 14 matching lines @@
     eglMakeCurrent(view_root_->surface_->GetDisplay(), EGL_NO_SURFACE,
                    EGL_NO_SURFACE, EGL_NO_CONTEXT);
     view_root_->context_->ReleaseCurrent(view_root_->surface_.get());
   }
 
  private:
   FakeWindow* view_root_;
 };
 
 FakeWindow::FakeWindow(BrowserViewRenderer* view,
+                       SharedRendererState* functor,
                        WindowHooks* hooks,
                        gfx::Rect location)
     : view_(view),
       hooks_(hooks),
       surface_size_(100, 100),
       location_(location),
       on_draw_hardware_pending_(false),
-      functor_(nullptr),
+      functor_(functor),
       context_current_(false),
       weak_ptr_factory_(this) {
   CheckCurrentlyOnUIThread();
   DCHECK(view_);
   view_->OnAttachedToWindow(location_.width(), location_.height());
   view_->SetWindowVisibility(true);
   view_->SetViewVisibility(true);
 }
 
 FakeWindow::~FakeWindow() {
   CheckCurrentlyOnUIThread();
 }
 
 void FakeWindow::Detach() {
   CheckCurrentlyOnUIThread();
+  functor_->DeleteHardwareRendererOnUI();

[boliu, 2016/03/30 16:12:13]

this is wrong order compared to aw_contents

[Tobias Sargeant, 2016/03/30 17:17:17]

It isn't possible to match the old AwContents order perfectly, and this matches
the new AwContents order.

   view_->OnDetachedFromWindow();
 
   if (render_thread_loop_) {
     base::WaitableEvent completion(true, false);
     render_thread_loop_->PostTask(
         FROM_HERE, base::Bind(&FakeWindow::DestroyOnRT, base::Unretained(this),
                               &completion));
     completion.Wait();
   }
 
   render_thread_.reset();
   functor_ = nullptr;

[boliu, 2016/03/30 16:12:13]

Can't do this anymore. Window can attach/detach many times.

[Tobias Sargeant, 2016/03/30 17:17:17]

Done.

 }
 
 void FakeWindow::RequestDrawGL(bool wait_for_completion) {
   CheckCurrentlyOnUIThread();
   base::WaitableEvent completion(true, false);
   render_thread_loop_->PostTask(
       FROM_HERE,
       base::Bind(&FakeWindow::ProcessFunctorOnRT, base::Unretained(this),
                  wait_for_completion ? &completion : nullptr));
   if (wait_for_completion)
@@ skipping 79 matching lines @@
   }
   hooks_->DidDrawOnRT(functor_);
 }
 
 void FakeWindow::CheckCurrentlyOnUIThread() {
   DCHECK(ui_checker_.CalledOnValidSequencedThread());
 }
 
 void FakeWindow::CreateRenderThreadIfNeeded() {
   CheckCurrentlyOnUIThread();
-  if (functor_) {
-    DCHECK(render_thread_.get());
+  if (render_thread_.get()) {

[boliu, 2016/03/30 16:12:13]

.get() not needed, can remove them from DCHECKs too

[Tobias Sargeant, 2016/03/30 17:17:17]

Done.

     DCHECK(render_thread_loop_.get());
     return;
   }
-  functor_ = view_->GetAwDrawGLViewContext();
   render_thread_.reset(new base::Thread("TestRenderThread"));
   render_thread_->Start();
   render_thread_loop_ = render_thread_->task_runner();
   rt_checker_.DetachFromSequence();
 
   base::WaitableEvent completion(true, false);
   render_thread_loop_->PostTask(
       FROM_HERE, base::Bind(&FakeWindow::InitializeOnRT, base::Unretained(this),
                             &completion));
   completion.Wait();
@@ skipping 18 matching lines @@
     surface_ = nullptr;
   }
   sync->Signal();
 }
 
 void FakeWindow::CheckCurrentlyOnRT() {
   DCHECK(rt_checker_.CalledOnValidSequencedThread());
 }
 
 }  // namespace android_webview