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

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

Issue 1158433010: Reland: cc: Fix size_t to int truncations in layers/ output/ playback/ quads/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 months 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
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_SURFACES_SURFACE_AGGREGATOR_TEST_HELPERS_H_ 5 #ifndef CC_SURFACES_SURFACE_AGGREGATOR_TEST_HELPERS_H_
6 #define CC_SURFACES_SURFACE_AGGREGATOR_TEST_HELPERS_H_ 6 #define CC_SURFACES_SURFACE_AGGREGATOR_TEST_HELPERS_H_
7 7
8 #include "cc/base/scoped_ptr_vector.h" 8 #include "cc/base/scoped_ptr_vector.h"
9 #include "cc/quads/draw_quad.h" 9 #include "cc/quads/draw_quad.h"
10 #include "cc/quads/render_pass_id.h" 10 #include "cc/quads/render_pass_id.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 DrawQuad::Material material; 48 DrawQuad::Material material;
49 // Set when material==DrawQuad::SURFACE_CONTENT. 49 // Set when material==DrawQuad::SURFACE_CONTENT.
50 SurfaceId surface_id; 50 SurfaceId surface_id;
51 float opacity; 51 float opacity;
52 // Set when material==DrawQuad::SOLID_COLOR. 52 // Set when material==DrawQuad::SOLID_COLOR.
53 SkColor color; 53 SkColor color;
54 // Set when material==DrawQuad::RENDER_PASS. 54 // Set when material==DrawQuad::RENDER_PASS.
55 RenderPassId render_pass_id; 55 RenderPassId render_pass_id;
56 56
57 private: 57 private:
58 Quad() 58 Quad() : material(DrawQuad::INVALID), opacity(1.f), color(SK_ColorWHITE) {}
59 : material(DrawQuad::INVALID),
60 opacity(1.f),
61 color(SK_ColorWHITE),
62 render_pass_id(-1, -1) {}
63 }; 59 };
64 60
65 struct Pass { 61 struct Pass {
66 Pass(Quad* quads, size_t quad_count, RenderPassId id) 62 Pass(Quad* quads, size_t quad_count, RenderPassId id)
67 : quads(quads), quad_count(quad_count), id(id) {} 63 : quads(quads), quad_count(quad_count), id(id) {}
68 Pass(Quad* quads, size_t quad_count) 64 Pass(Quad* quads, size_t quad_count)
69 : quads(quads), quad_count(quad_count), id(1, 1) {} 65 : quads(quads), quad_count(quad_count), id(1, 1) {}
70 66
71 Quad* quads; 67 Quad* quads;
72 size_t quad_count; 68 size_t quad_count;
(...skipping 16 matching lines...) Expand all
89 void TestPassMatchesExpectations(Pass expected_pass, const RenderPass* pass); 85 void TestPassMatchesExpectations(Pass expected_pass, const RenderPass* pass);
90 86
91 void TestPassesMatchExpectations(Pass* expected_passes, 87 void TestPassesMatchExpectations(Pass* expected_passes,
92 size_t expected_pass_count, 88 size_t expected_pass_count,
93 const RenderPassList* passes); 89 const RenderPassList* passes);
94 90
95 } // namespace test 91 } // namespace test
96 } // namespace cc 92 } // namespace cc
97 93
98 #endif // CC_SURFACES_SURFACE_AGGREGATOR_TEST_HELPERS_H_ 94 #endif // CC_SURFACES_SURFACE_AGGREGATOR_TEST_HELPERS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698