| Index: cc/test/pixel_test.h
|
| diff --git a/cc/test/pixel_test.h b/cc/test/pixel_test.h
|
| index be32c6075d94d2632dfa7758c42f804f94fd6d2f..a739c1b9262955aebb2256e0633d7b60bfe1814d 100644
|
| --- a/cc/test/pixel_test.h
|
| +++ b/cc/test/pixel_test.h
|
| @@ -25,7 +25,7 @@ class SoftwareRenderer;
|
| class TestGpuMemoryBufferManager;
|
| class TestSharedBitmapManager;
|
|
|
| -class PixelTest : public testing::Test, public RendererClient {
|
| +class PixelTest : public testing::Test {
|
| protected:
|
| PixelTest();
|
| ~PixelTest() override;
|
| @@ -49,7 +49,6 @@ class PixelTest : public testing::Test, public RendererClient {
|
| LayerTreeSettings settings_;
|
| gfx::Size device_viewport_size_;
|
| bool disable_picture_quad_image_filtering_;
|
| - class PixelTestRendererClient;
|
| std::unique_ptr<FakeOutputSurfaceClient> output_surface_client_;
|
| std::unique_ptr<OutputSurface> output_surface_;
|
| std::unique_ptr<TestSharedBitmapManager> shared_bitmap_manager_;
|
| @@ -71,9 +70,6 @@ class PixelTest : public testing::Test, public RendererClient {
|
| void ForceDeviceClip(const gfx::Rect& clip);
|
| void EnableExternalStencilTest();
|
|
|
| - // RendererClient implementation.
|
| - void SetFullRootLayerDamage() override {}
|
| -
|
| private:
|
| void ReadbackResult(base::Closure quit_run_loop,
|
| std::unique_ptr<CopyOutputResult> result);
|
| @@ -99,14 +95,12 @@ class RendererPixelTest : public PixelTest {
|
| // have an externally determined size and offset.
|
| class GLRendererWithExpandedViewport : public GLRenderer {
|
| public:
|
| - GLRendererWithExpandedViewport(RendererClient* client,
|
| - const RendererSettings* settings,
|
| + GLRendererWithExpandedViewport(const RendererSettings* settings,
|
| OutputSurface* output_surface,
|
| ResourceProvider* resource_provider,
|
| TextureMailboxDeleter* texture_mailbox_deleter,
|
| int highp_threshold_min)
|
| - : GLRenderer(client,
|
| - settings,
|
| + : GLRenderer(settings,
|
| output_surface,
|
| resource_provider,
|
| texture_mailbox_deleter,
|
| @@ -115,23 +109,20 @@ class GLRendererWithExpandedViewport : public GLRenderer {
|
|
|
| class SoftwareRendererWithExpandedViewport : public SoftwareRenderer {
|
| public:
|
| - SoftwareRendererWithExpandedViewport(RendererClient* client,
|
| - const RendererSettings* settings,
|
| + SoftwareRendererWithExpandedViewport(const RendererSettings* settings,
|
| OutputSurface* output_surface,
|
| ResourceProvider* resource_provider)
|
| - : SoftwareRenderer(client, settings, output_surface, resource_provider) {}
|
| + : SoftwareRenderer(settings, output_surface, resource_provider) {}
|
| };
|
|
|
| class GLRendererWithFlippedSurface : public GLRenderer {
|
| public:
|
| - GLRendererWithFlippedSurface(RendererClient* client,
|
| - const RendererSettings* settings,
|
| + GLRendererWithFlippedSurface(const RendererSettings* settings,
|
| OutputSurface* output_surface,
|
| ResourceProvider* resource_provider,
|
| TextureMailboxDeleter* texture_mailbox_deleter,
|
| int highp_threshold_min)
|
| - : GLRenderer(client,
|
| - settings,
|
| + : GLRenderer(settings,
|
| output_surface,
|
| resource_provider,
|
| texture_mailbox_deleter,
|
|
|