Index: android_webview/browser/test/rendering_test.h |
diff --git a/android_webview/browser/test/rendering_test.h b/android_webview/browser/test/rendering_test.h |
index 8dd6cae30b83ad56b8d5e5cd4fa6208f9d9a2235..942f31c2315f83fd5d187f41bef0a54f476c2d71 100644 |
--- a/android_webview/browser/test/rendering_test.h |
+++ b/android_webview/browser/test/rendering_test.h |
@@ -6,6 +6,7 @@ |
#define ANDROID_WEBVIEW_BROWSER_TEST_RENDERING_TEST_H_ |
#include "android_webview/browser/browser_view_renderer_client.h" |
+#include "android_webview/browser/shared_renderer_state_client.h" |
#include "android_webview/browser/test/fake_window.h" |
#include "base/macros.h" |
#include "base/memory/scoped_ptr.h" |
@@ -32,13 +33,12 @@ struct ParentCompositorDrawConstraints; |
class RenderingTest : public testing::Test, |
public BrowserViewRendererClient, |
+ public SharedRendererStateClient, |
public WindowHooks { |
public: |
// BrowserViewRendererClient overrides. |
- bool RequestDrawGL(bool wait_for_completion) override; |
void OnNewPicture() override; |
void PostInvalidate() override; |
- void DetachFunctorFromView() override; |
gfx::Point GetLocationOnScreen() override; |
void ScrollContainerViewTo(const gfx::Vector2d& new_value) override {} |
void UpdateScrollState(const gfx::Vector2d& max_scroll_offset, |
@@ -48,8 +48,12 @@ class RenderingTest : public testing::Test, |
float max_page_scale_factor) override {} |
void DidOverscroll(const gfx::Vector2d& overscroll_delta, |
const gfx::Vector2dF& overscroll_velocity) override {} |
- void ParentDrawConstraintsUpdated( |
- const ParentCompositorDrawConstraints& draw_constraints) override {} |
+ |
+ // SharedRendererStateClient overrides. |
+ void OnParentDrawConstraintsUpdated() override; |
+ bool RequestDrawGL(bool wait_for_completion) override; |
+ void DetachFunctorFromView() override; |
+ |
// WindowHooks overrides. |
void WillOnDraw() override; |
void DidOnDraw(bool success) override {} |
@@ -76,6 +80,7 @@ class RenderingTest : public testing::Test, |
scoped_ptr<cc::CompositorFrame> ConstructEmptyFrame(); |
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_; |
+ scoped_ptr<SharedRendererState> shared_renderer_state_; |
scoped_ptr<BrowserViewRenderer> browser_view_renderer_; |
scoped_ptr<content::TestSynchronousCompositor> compositor_; |
scoped_ptr<FakeWindow> window_; |