Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(217)

Side by Side Diff: cc/test/surface_aggregator_test_helpers.h

Issue 1496103002: Reusing base::IdType<...> to implement SurfaceId. Base URL: https://chromium.googlesource.com/chromium/src.git@type-safe-id-base
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/surfaces/surface_unittest.cc ('k') | cc/test/surface_aggregator_test_helpers.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <vector> 8 #include <vector>
9 9
10 #include "cc/quads/draw_quad.h" 10 #include "cc/quads/draw_quad.h"
11 #include "cc/quads/render_pass_id.h" 11 #include "cc/quads/render_pass_id.h"
12 #include "cc/surfaces/surface_id.h" 12 #include "cc/surfaces/surface_id.h"
13 #include "third_party/skia/include/core/SkColor.h" 13 #include "third_party/skia/include/core/SkColor.h"
14 #include "ui/gfx/geometry/size.h" 14 #include "ui/gfx/geometry/size.h"
15 15
16 namespace cc { 16 namespace cc {
17 17
18 class RenderPass; 18 class RenderPass;
19 class Surface; 19 class Surface;
20 class TestRenderPass; 20 class TestRenderPass;
21 21
22 typedef std::vector<scoped_ptr<RenderPass>> RenderPassList; 22 typedef std::vector<scoped_ptr<RenderPass>> RenderPassList;
23 23
24 namespace test { 24 namespace test {
25 25
26 struct Quad { 26 struct Quad {
27 static Quad SolidColorQuad(SkColor color) { 27 static Quad SolidColorQuad(SkColor color);
28 Quad quad; 28 static Quad SurfaceQuad(SurfaceId surface_id, float opacity);
29 quad.material = DrawQuad::SOLID_COLOR; 29 static Quad RenderPassQuad(RenderPassId id);
30 quad.color = color;
31 return quad;
32 }
33
34 static Quad SurfaceQuad(SurfaceId surface_id, float opacity) {
35 Quad quad;
36 quad.material = DrawQuad::SURFACE_CONTENT;
37 quad.opacity = opacity;
38 quad.surface_id = surface_id;
39 return quad;
40 }
41
42 static Quad RenderPassQuad(RenderPassId id) {
43 Quad quad;
44 quad.material = DrawQuad::RENDER_PASS;
45 quad.render_pass_id = id;
46 return quad;
47 }
48 30
49 DrawQuad::Material material; 31 DrawQuad::Material material;
50 // Set when material==DrawQuad::SURFACE_CONTENT. 32 // Set when material==DrawQuad::SURFACE_CONTENT.
51 SurfaceId surface_id; 33 SurfaceId surface_id;
52 float opacity; 34 float opacity;
53 // Set when material==DrawQuad::SOLID_COLOR. 35 // Set when material==DrawQuad::SOLID_COLOR.
54 SkColor color; 36 SkColor color;
55 // Set when material==DrawQuad::RENDER_PASS. 37 // Set when material==DrawQuad::RENDER_PASS.
56 RenderPassId render_pass_id; 38 RenderPassId render_pass_id;
57 39
58 private: 40 private:
59 Quad() : material(DrawQuad::INVALID), opacity(1.f), color(SK_ColorWHITE) {} 41 Quad();
60 }; 42 };
61 43
62 struct Pass { 44 struct Pass {
63 Pass(Quad* quads, size_t quad_count, RenderPassId id) 45 Pass(Quad* quads, size_t quad_count, RenderPassId id)
64 : quads(quads), quad_count(quad_count), id(id) {} 46 : quads(quads), quad_count(quad_count), id(id) {}
65 Pass(Quad* quads, size_t quad_count) 47 Pass(Quad* quads, size_t quad_count)
66 : quads(quads), quad_count(quad_count), id(1, 1) {} 48 : quads(quads), quad_count(quad_count), id(1, 1) {}
67 49
68 Quad* quads; 50 Quad* quads;
69 size_t quad_count; 51 size_t quad_count;
(...skipping 16 matching lines...) Expand all
86 void TestPassMatchesExpectations(Pass expected_pass, const RenderPass* pass); 68 void TestPassMatchesExpectations(Pass expected_pass, const RenderPass* pass);
87 69
88 void TestPassesMatchExpectations(Pass* expected_passes, 70 void TestPassesMatchExpectations(Pass* expected_passes,
89 size_t expected_pass_count, 71 size_t expected_pass_count,
90 const RenderPassList* passes); 72 const RenderPassList* passes);
91 73
92 } // namespace test 74 } // namespace test
93 } // namespace cc 75 } // namespace cc
94 76
95 #endif // CC_TEST_SURFACE_AGGREGATOR_TEST_HELPERS_H_ 77 #endif // CC_TEST_SURFACE_AGGREGATOR_TEST_HELPERS_H_
OLDNEW
« no previous file with comments | « cc/surfaces/surface_unittest.cc ('k') | cc/test/surface_aggregator_test_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698