Chromium Code Reviews| Index: cc/test/fake_output_surface.h |
| diff --git a/cc/test/fake_output_surface.h b/cc/test/fake_output_surface.h |
| index ca6676de64fec26141355e4fcf15aa8e3a2e9c74..ad91f081052ec392a038c6f87858018babc9482c 100644 |
| --- a/cc/test/fake_output_surface.h |
| +++ b/cc/test/fake_output_surface.h |
| @@ -17,6 +17,7 @@ |
| #include "cc/output/output_surface.h" |
| #include "cc/output/software_output_device.h" |
| #include "cc/test/test_context_provider.h" |
| +#include "cc/test/test_gles2_interface.h" |
| #include "cc/test/test_web_graphics_context_3d.h" |
| namespace cc { |
| @@ -45,6 +46,13 @@ class FakeOutputSurface : public OutputSurface { |
| } |
| static std::unique_ptr<FakeOutputSurface> Create3d( |
| + std::unique_ptr<TestGLES2Interface> gl) { |
| + return base::WrapUnique( |
|
vmpstr
2016/07/20 01:11:22
nit: MakeUnique here? Or keep it for consistency.
danakj
2016/07/20 18:57:41
That doesnt work for Create functions where the co
|
| + new FakeOutputSurface(TestContextProvider::Create(std::move(gl)), |
| + TestContextProvider::CreateWorker(), false)); |
| + } |
| + |
| + static std::unique_ptr<FakeOutputSurface> Create3d( |
| std::unique_ptr<TestWebGraphicsContext3D> context) { |
| return base::WrapUnique( |
| new FakeOutputSurface(TestContextProvider::Create(std::move(context)), |
| @@ -145,6 +153,7 @@ class FakeOutputSurface : public OutputSurface { |
| std::unique_ptr<ManagedMemoryPolicy> memory_policy_to_set_at_bind); |
| gfx::Rect last_swap_rect() const { |
| + DCHECK(last_swap_rect_valid_); |
| return last_swap_rect_; |
| } |
| @@ -173,6 +182,7 @@ class FakeOutputSurface : public OutputSurface { |
| TransferableResourceArray resources_held_by_parent_; |
| std::unique_ptr<ManagedMemoryPolicy> memory_policy_to_set_at_bind_; |
| OverlayCandidateValidator* overlay_candidate_validator_ = nullptr; |
| + bool last_swap_rect_valid_ = false; |
| gfx::Rect last_swap_rect_; |
| }; |