Test: deleting RTM before BVR does not leak resources.

android_webview/browser/test/rendering_test.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/rendering_test.h"
 
 #include <utility>
 
 #include "android_webview/browser/browser_view_renderer.h"
 #include "android_webview/browser/child_frame.h"
@@ skipping 12 matching lines @@
  public:
   TestBrowserViewRenderer(
       RenderingTest* rendering_test,
       const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner,
       bool disable_page_visibility)
       : BrowserViewRenderer(rendering_test,
                             ui_task_runner,
                             disable_page_visibility),
         rendering_test_(rendering_test) {}
 
+  ~TestBrowserViewRenderer() {}
+
   void OnParentDrawConstraintsUpdated() override {
     BrowserViewRenderer::OnParentDrawConstraintsUpdated();
     rendering_test_->OnParentDrawConstraintsUpdated();
   }
 
  private:
   RenderingTest* const rendering_test_;
 };
 }
 
 RenderingTest::RenderingTest() : message_loop_(new base::MessageLoop) {
   ui_task_runner_ = base::ThreadTaskRunnerHandle::Get();
 }
 
 RenderingTest::~RenderingTest() {
+  DCHECK(ui_task_runner_->BelongsToCurrentThread());
   if (window_.get())
     window_->Detach();
 }
 
 void RenderingTest::SetUpTestHarness() {
   DCHECK(!browser_view_renderer_.get());
   DCHECK(!render_thread_manager_.get());
   render_thread_manager_.reset(
       new RenderThreadManager(this, base::ThreadTaskRunnerHandle::Get()));
   browser_view_renderer_.reset(new TestBrowserViewRenderer(
@@ skipping 13 matching lines @@
 }
 
 void RenderingTest::InitializeCompositor() {
   DCHECK(!compositor_.get());
   DCHECK(browser_view_renderer_.get());
   compositor_.reset(new content::TestSynchronousCompositor);
   compositor_->SetClient(browser_view_renderer_.get());
 }
 
 void RenderingTest::Attach() {
-  window_.reset(new FakeWindow(browser_view_renderer_.get(),
-                               render_thread_manager_.get(), this,
-                               gfx::Rect(100, 100)));
+  window_.reset(
+      new FakeWindow(browser_view_renderer_.get(),
+                     base::Bind(&RenderThreadManager::DrawGL,
+                                base::Unretained(render_thread_manager_.get())),
+                     this, gfx::Rect(100, 100)));
 }
 
 void RenderingTest::RunTest() {
   SetUpTestHarness();
 
   ui_task_runner_->PostTask(
       FROM_HERE, base::Bind(&RenderingTest::StartTest, base::Unretained(this)));
   message_loop_->Run();
 }
 
@@ skipping 18 matching lines @@
   std::unique_ptr<cc::DelegatedFrameData> frame(new cc::DelegatedFrameData);
   std::unique_ptr<cc::RenderPass> root_pass(cc::RenderPass::Create());
   gfx::Rect viewport(browser_view_renderer_->size());
   root_pass->SetNew(cc::RenderPassId(1, 1), viewport, viewport,
                     gfx::Transform());
   frame->render_pass_list.push_back(std::move(root_pass));
   compositor_frame->delegated_frame_data = std::move(frame);
   return compositor_frame;
 }
 
+std::unique_ptr<cc::CompositorFrame> RenderingTest::ConstructFrame(
+    cc::ResourceId resource_id) {
+  std::unique_ptr<cc::CompositorFrame> compositor_frame(ConstructEmptyFrame());
+  cc::TransferableResource resource;
+  resource.id = resource_id;
+  compositor_frame->delegated_frame_data->resource_list.push_back(resource);
+  return compositor_frame;
+}
+
 void RenderingTest::WillOnDraw() {
   DCHECK(compositor_);
   compositor_->SetHardwareFrame(0u, ConstructEmptyFrame());
 }
 
 bool RenderingTest::RequestInvokeGL(bool wait_for_completion) {
   window_->RequestInvokeGL(wait_for_completion);
   return true;
 }
 
-bool RenderingTest::WillDrawOnRT(RenderThreadManager* functor,
-                                 AwDrawGLInfo* draw_info) {
+bool RenderingTest::WillDrawOnRT(AwDrawGLInfo* draw_info) {
   draw_info->width = window_->surface_size().width();
   draw_info->height = window_->surface_size().height();
   draw_info->is_layer = false;
   gfx::Transform transform;
   transform.matrix().asColMajorf(draw_info->transform);
   return true;
 }
 
-void RenderingTest::OnNewPicture() {
-}
+void RenderingTest::OnNewPicture() {}
 
 void RenderingTest::PostInvalidate() {
   if (window_)
     window_->PostInvalidate();
 }
 
-void RenderingTest::DetachFunctorFromView() {
-}
+void RenderingTest::DetachFunctorFromView() {}
 
 gfx::Point RenderingTest::GetLocationOnScreen() {
   return gfx::Point();
 }
 
 }  // namespace android_webview