| Index: cc/layer_tree_host_impl_unittest.cc
|
| diff --git a/cc/layer_tree_host_impl_unittest.cc b/cc/layer_tree_host_impl_unittest.cc
|
| index 3c6ce48c534b4cd567b4ae3cb8955026231082a1..bebeb601d598a71ce540509e7e735ef4c023cd4f 100644
|
| --- a/cc/layer_tree_host_impl_unittest.cc
|
| +++ b/cc/layer_tree_host_impl_unittest.cc
|
| @@ -9,6 +9,7 @@
|
| #include "base/bind.h"
|
| #include "base/command_line.h"
|
| #include "base/hash_tables.h"
|
| +#include "cc/compositor_frame_metadata.h"
|
| #include "cc/delegated_renderer_layer_impl.h"
|
| #include "cc/gl_renderer.h"
|
| #include "cc/heads_up_display_layer_impl.h"
|
| @@ -4205,9 +4206,9 @@ struct RenderPassRemovalTestData : public LayerTreeHostImpl::FrameData {
|
|
|
| class TestRenderer : public GLRenderer, public RendererClient {
|
| public:
|
| - static scoped_ptr<TestRenderer> create(ResourceProvider* resourceProvider, Proxy* proxy)
|
| + static scoped_ptr<TestRenderer> create(ResourceProvider* resourceProvider, OutputSurface* outputSurface, Proxy* proxy)
|
| {
|
| - scoped_ptr<TestRenderer> renderer(new TestRenderer(resourceProvider, proxy));
|
| + scoped_ptr<TestRenderer> renderer(new TestRenderer(resourceProvider, outputSurface, proxy));
|
| if (!renderer->initialize())
|
| return scoped_ptr<TestRenderer>();
|
|
|
| @@ -4228,9 +4229,11 @@ public:
|
| virtual void setManagedMemoryPolicy(const ManagedMemoryPolicy& policy) OVERRIDE { }
|
| virtual void enforceManagedMemoryPolicy(const ManagedMemoryPolicy& policy) OVERRIDE { }
|
| virtual bool hasImplThread() const OVERRIDE { return false; }
|
| + virtual CompositorFrameMetadata makeCompositorFrameMetadata() const
|
| + OVERRIDE { return CompositorFrameMetadata(); }
|
|
|
| protected:
|
| - TestRenderer(ResourceProvider* resourceProvider, Proxy* proxy) : GLRenderer(this, resourceProvider) { }
|
| + TestRenderer(ResourceProvider* resourceProvider, OutputSurface* outputSurface, Proxy* proxy) : GLRenderer(this, outputSurface, resourceProvider) { }
|
|
|
| private:
|
| LayerTreeSettings m_settings;
|
| @@ -4521,7 +4524,7 @@ TEST_P(LayerTreeHostImplTest, testRemoveRenderPasses)
|
| ASSERT_TRUE(outputSurface->Context3D());
|
| scoped_ptr<ResourceProvider> resourceProvider(ResourceProvider::create(outputSurface.get()));
|
|
|
| - scoped_ptr<TestRenderer> renderer(TestRenderer::create(resourceProvider.get(), &m_proxy));
|
| + scoped_ptr<TestRenderer> renderer(TestRenderer::create(resourceProvider.get(), outputSurface.get(), &m_proxy));
|
|
|
| int testCaseIndex = 0;
|
| while (removeRenderPassesCases[testCaseIndex].name) {
|
|
|