| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #ifndef CC_TEST_SURFACE_AGGREGATOR_TEST_HELPERS_H_ | 5 #ifndef CC_TEST_SURFACE_AGGREGATOR_TEST_HELPERS_H_ |
| 6 #define CC_TEST_SURFACE_AGGREGATOR_TEST_HELPERS_H_ | 6 #define CC_TEST_SURFACE_AGGREGATOR_TEST_HELPERS_H_ |
| 7 | 7 |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 | 9 |
| 10 #include <vector> | 10 #include <vector> |
| 11 | 11 |
| 12 #include "cc/quads/draw_quad.h" | 12 #include "cc/quads/draw_quad.h" |
| 13 #include "cc/quads/render_pass_id.h" | 13 #include "cc/quads/render_pass_id.h" |
| 14 #include "cc/surfaces/surface_id.h" | 14 #include "cc/surfaces/surface_id.h" |
| 15 #include "third_party/skia/include/core/SkColor.h" | 15 #include "third_party/skia/include/core/SkColor.h" |
| 16 #include "ui/gfx/geometry/size.h" | 16 #include "ui/gfx/geometry/size.h" |
| 17 | 17 |
| 18 namespace cc { | 18 namespace cc { |
| 19 | 19 |
| 20 class RenderPass; | 20 class RenderPass; |
| 21 class Surface; | 21 class Surface; |
| 22 class TestRenderPass; | 22 class TestRenderPass; |
| 23 | 23 |
| 24 typedef std::vector<scoped_ptr<RenderPass>> RenderPassList; | 24 typedef std::vector<std::unique_ptr<RenderPass>> RenderPassList; |
| 25 | 25 |
| 26 namespace test { | 26 namespace test { |
| 27 | 27 |
| 28 struct Quad { | 28 struct Quad { |
| 29 static Quad SolidColorQuad(SkColor color) { | 29 static Quad SolidColorQuad(SkColor color) { |
| 30 Quad quad; | 30 Quad quad; |
| 31 quad.material = DrawQuad::SOLID_COLOR; | 31 quad.material = DrawQuad::SOLID_COLOR; |
| 32 quad.color = color; | 32 quad.color = color; |
| 33 return quad; | 33 return quad; |
| 34 } | 34 } |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 void TestPassMatchesExpectations(Pass expected_pass, const RenderPass* pass); | 88 void TestPassMatchesExpectations(Pass expected_pass, const RenderPass* pass); |
| 89 | 89 |
| 90 void TestPassesMatchExpectations(Pass* expected_passes, | 90 void TestPassesMatchExpectations(Pass* expected_passes, |
| 91 size_t expected_pass_count, | 91 size_t expected_pass_count, |
| 92 const RenderPassList* passes); | 92 const RenderPassList* passes); |
| 93 | 93 |
| 94 } // namespace test | 94 } // namespace test |
| 95 } // namespace cc | 95 } // namespace cc |
| 96 | 96 |
| 97 #endif // CC_TEST_SURFACE_AGGREGATOR_TEST_HELPERS_H_ | 97 #endif // CC_TEST_SURFACE_AGGREGATOR_TEST_HELPERS_H_ |
| OLD | NEW |