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

Side by Side Diff: cc/test/layer_test_common.cc

Issue 927783002: cc: Stop passing the occlusion explicitly to AppendQuads. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « cc/test/fake_picture_layer_impl.cc ('k') | cc/trees/layer_tree_host_impl.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 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/test/layer_test_common.h" 5 #include "cc/test/layer_test_common.h"
6 6
7 #include "cc/base/math_util.h" 7 #include "cc/base/math_util.h"
8 #include "cc/base/region.h" 8 #include "cc/base/region.h"
9 #include "cc/layers/append_quads_data.h" 9 #include "cc/layers/append_quads_data.h"
10 #include "cc/quads/draw_quad.h" 10 #include "cc/quads/draw_quad.h"
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 LayerImpl* layer_impl, 130 LayerImpl* layer_impl,
131 const gfx::Rect& occluded) { 131 const gfx::Rect& occluded) {
132 AppendQuadsData data; 132 AppendQuadsData data;
133 133
134 render_pass_->quad_list.clear(); 134 render_pass_->quad_list.clear();
135 render_pass_->shared_quad_state_list.clear(); 135 render_pass_->shared_quad_state_list.clear();
136 136
137 Occlusion occlusion(layer_impl->draw_transform(), 137 Occlusion occlusion(layer_impl->draw_transform(),
138 SimpleEnclosedRegion(occluded), 138 SimpleEnclosedRegion(occluded),
139 SimpleEnclosedRegion()); 139 SimpleEnclosedRegion());
140 layer_impl->draw_properties().occlusion_in_content_space = occlusion;
140 141
141 layer_impl->WillDraw(DRAW_MODE_HARDWARE, resource_provider()); 142 layer_impl->WillDraw(DRAW_MODE_HARDWARE, resource_provider());
142 layer_impl->AppendQuads(render_pass_.get(), occlusion, &data); 143 layer_impl->AppendQuads(render_pass_.get(), &data);
143 layer_impl->DidDraw(resource_provider()); 144 layer_impl->DidDraw(resource_provider());
144 } 145 }
145 146
146 void LayerTestCommon::LayerImplTest::AppendQuadsForPassWithOcclusion( 147 void LayerTestCommon::LayerImplTest::AppendQuadsForPassWithOcclusion(
147 LayerImpl* layer_impl, 148 LayerImpl* layer_impl,
148 RenderPass* given_render_pass, 149 RenderPass* given_render_pass,
149 const gfx::Rect& occluded) { 150 const gfx::Rect& occluded) {
150 AppendQuadsData data; 151 AppendQuadsData data;
151 152
152 given_render_pass->quad_list.clear(); 153 given_render_pass->quad_list.clear();
153 given_render_pass->shared_quad_state_list.clear(); 154 given_render_pass->shared_quad_state_list.clear();
154 155
155 Occlusion occlusion(layer_impl->draw_transform(), 156 Occlusion occlusion(layer_impl->draw_transform(),
156 SimpleEnclosedRegion(occluded), 157 SimpleEnclosedRegion(occluded),
157 SimpleEnclosedRegion()); 158 SimpleEnclosedRegion());
159 layer_impl->draw_properties().occlusion_in_content_space = occlusion;
158 160
159 layer_impl->WillDraw(DRAW_MODE_HARDWARE, resource_provider()); 161 layer_impl->WillDraw(DRAW_MODE_HARDWARE, resource_provider());
160 layer_impl->AppendQuads(given_render_pass, occlusion, &data); 162 layer_impl->AppendQuads(given_render_pass, &data);
161 layer_impl->DidDraw(resource_provider()); 163 layer_impl->DidDraw(resource_provider());
162 } 164 }
163 165
164 void LayerTestCommon::LayerImplTest::AppendSurfaceQuadsWithOcclusion( 166 void LayerTestCommon::LayerImplTest::AppendSurfaceQuadsWithOcclusion(
165 RenderSurfaceImpl* surface_impl, 167 RenderSurfaceImpl* surface_impl,
166 const gfx::Rect& occluded) { 168 const gfx::Rect& occluded) {
167 AppendQuadsData data; 169 AppendQuadsData data;
168 170
169 render_pass_->quad_list.clear(); 171 render_pass_->quad_list.clear();
170 render_pass_->shared_quad_state_list.clear(); 172 render_pass_->shared_quad_state_list.clear();
171 173
172 surface_impl->AppendQuads( 174 surface_impl->AppendQuads(
173 render_pass_.get(), gfx::Transform(), 175 render_pass_.get(), gfx::Transform(),
174 Occlusion(gfx::Transform(), SimpleEnclosedRegion(occluded), 176 Occlusion(gfx::Transform(), SimpleEnclosedRegion(occluded),
175 SimpleEnclosedRegion()), 177 SimpleEnclosedRegion()),
176 SK_ColorBLACK, 1.f, nullptr, &data, RenderPassId(1, 1)); 178 SK_ColorBLACK, 1.f, nullptr, &data, RenderPassId(1, 1));
177 } 179 }
178 180
179 } // namespace cc 181 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/fake_picture_layer_impl.cc ('k') | cc/trees/layer_tree_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698