OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "cc/output/gl_renderer.h" | 5 #include "cc/output/gl_renderer.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 | 8 |
9 #include "cc/base/math_util.h" | 9 #include "cc/base/math_util.h" |
10 #include "cc/debug/test_web_graphics_context_3d.h" | 10 #include "cc/debug/test_web_graphics_context_3d.h" |
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
183 RenderPassList render_passes_in_draw_order_; | 183 RenderPassList render_passes_in_draw_order_; |
184 gfx::Size viewport_size_; | 184 gfx::Size viewport_size_; |
185 }; | 185 }; |
186 | 186 |
187 class FakeRendererGL : public GLRenderer { | 187 class FakeRendererGL : public GLRenderer { |
188 public: | 188 public: |
189 FakeRendererGL(RendererClient* client, | 189 FakeRendererGL(RendererClient* client, |
190 const LayerTreeSettings* settings, | 190 const LayerTreeSettings* settings, |
191 OutputSurface* output_surface, | 191 OutputSurface* output_surface, |
192 ResourceProvider* resource_provider) | 192 ResourceProvider* resource_provider) |
193 : GLRenderer(client, settings, output_surface, resource_provider, 0) {} | 193 : GLRenderer(client, |
| 194 settings, |
| 195 output_surface, |
| 196 resource_provider, |
| 197 NULL, |
| 198 0) {} |
194 | 199 |
195 // GLRenderer methods. | 200 // GLRenderer methods. |
196 | 201 |
197 // Changing visibility to public. | 202 // Changing visibility to public. |
198 using GLRenderer::Initialize; | 203 using GLRenderer::Initialize; |
199 using GLRenderer::IsBackbufferDiscarded; | 204 using GLRenderer::IsBackbufferDiscarded; |
200 using GLRenderer::DoDrawQuad; | 205 using GLRenderer::DoDrawQuad; |
201 using GLRenderer::BeginDrawingFrame; | 206 using GLRenderer::BeginDrawingFrame; |
202 using GLRenderer::FinishDrawingQuadList; | 207 using GLRenderer::FinishDrawingQuadList; |
203 using GLRenderer::stencil_enabled; | 208 using GLRenderer::stencil_enabled; |
(...skipping 1449 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1653 base::MessageLoop::current()->Run(); | 1658 base::MessageLoop::current()->Run(); |
1654 | 1659 |
1655 // The sync point should have happened. | 1660 // The sync point should have happened. |
1656 EXPECT_EQ(1, sync_point_callback_count); | 1661 EXPECT_EQ(1, sync_point_callback_count); |
1657 EXPECT_EQ(1, other_callback_count); | 1662 EXPECT_EQ(1, other_callback_count); |
1658 } | 1663 } |
1659 #endif // OS_ANDROID | 1664 #endif // OS_ANDROID |
1660 | 1665 |
1661 } // namespace | 1666 } // namespace |
1662 } // namespace cc | 1667 } // namespace cc |
OLD | NEW |