Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1724)

Unified Diff: android_webview/browser/test/rendering_test.cc

Issue 1816283005: Move SharedRendererState ownership to AwContents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « android_webview/browser/test/rendering_test.h ('k') | android_webview/native/aw_contents.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 e51f3aa92fe5e482e679495c1de87958336bdb4b..25068c6abd2235476e10dc4fb3d24e0763a887c2 100644
--- a/android_webview/browser/test/rendering_test.cc
+++ b/android_webview/browser/test/rendering_test.cc
@@ -8,6 +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 "base/location.h"
#include "base/thread_task_runner_handle.h"
#include "cc/output/compositor_frame.h"
@@ -26,8 +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()));
browser_view_renderer_.reset(new BrowserViewRenderer(
this, base::ThreadTaskRunnerHandle::Get(), false));
+ browser_view_renderer_->SetSharedRendererState(shared_renderer_state_.get());
InitializeCompositor();
Attach();
}
@@ -40,8 +45,9 @@ void RenderingTest::InitializeCompositor() {
}
void RenderingTest::Attach() {
- window_.reset(
- new FakeWindow(browser_view_renderer_.get(), this, gfx::Rect(100, 100)));
+ window_.reset(new FakeWindow(browser_view_renderer_.get(),
+ shared_renderer_state_.get(), this,
+ gfx::Rect(100, 100)));
}
void RenderingTest::RunTest() {
@@ -107,6 +113,10 @@ void RenderingTest::PostInvalidate() {
window_->PostInvalidate();
}
+void RenderingTest::OnParentDrawConstraintsUpdated() {
+ browser_view_renderer_->OnParentDrawConstraintsUpdated();
+}
+
void RenderingTest::DetachFunctorFromView() {
}
« no previous file with comments | « android_webview/browser/test/rendering_test.h ('k') | android_webview/native/aw_contents.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698