| Index: android_webview/browser/test/rendering_test.cc
|
| diff --git a/android_webview/browser/test/rendering_test.cc b/android_webview/browser/test/rendering_test.cc
|
| index c010832af624a03c7415d1054184b9dfc4c12ea5..b07434b25fa70d406c92b882ea10b0db84a34775 100644
|
| --- a/android_webview/browser/test/rendering_test.cc
|
| +++ b/android_webview/browser/test/rendering_test.cc
|
| @@ -8,7 +8,7 @@
|
|
|
| #include "android_webview/browser/browser_view_renderer.h"
|
| #include "android_webview/browser/child_frame.h"
|
| -#include "android_webview/browser/shared_renderer_state.h"
|
| +#include "android_webview/browser/render_thread_manager.h"
|
| #include "base/location.h"
|
| #include "base/thread_task_runner_handle.h"
|
| #include "cc/output/compositor_frame.h"
|
| @@ -27,12 +27,12 @@ RenderingTest::~RenderingTest() {
|
|
|
| void RenderingTest::SetUpTestHarness() {
|
| DCHECK(!browser_view_renderer_.get());
|
| - DCHECK(!shared_renderer_state_.get());
|
| - shared_renderer_state_.reset(
|
| - new SharedRendererState(this, base::ThreadTaskRunnerHandle::Get()));
|
| + DCHECK(!render_thread_manager_.get());
|
| + render_thread_manager_.reset(
|
| + new RenderThreadManager(this, base::ThreadTaskRunnerHandle::Get()));
|
| browser_view_renderer_.reset(new BrowserViewRenderer(
|
| this, base::ThreadTaskRunnerHandle::Get(), false));
|
| - browser_view_renderer_->SetSharedRendererState(shared_renderer_state_.get());
|
| + browser_view_renderer_->SetRenderThreadManager(render_thread_manager_.get());
|
| InitializeCompositor();
|
| Attach();
|
| }
|
| @@ -46,7 +46,7 @@ void RenderingTest::InitializeCompositor() {
|
|
|
| void RenderingTest::Attach() {
|
| window_.reset(new FakeWindow(browser_view_renderer_.get(),
|
| - shared_renderer_state_.get(), this,
|
| + render_thread_manager_.get(), this,
|
| gfx::Rect(100, 100)));
|
| }
|
|
|
| @@ -96,7 +96,7 @@ bool RenderingTest::RequestDrawGL(bool wait_for_completion) {
|
| return true;
|
| }
|
|
|
| -bool RenderingTest::WillDrawOnRT(SharedRendererState* functor,
|
| +bool RenderingTest::WillDrawOnRT(RenderThreadManager* functor,
|
| AwDrawGLInfo* draw_info) {
|
| draw_info->width = window_->surface_size().width();
|
| draw_info->height = window_->surface_size().height();
|
|
|