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

Side by Side Diff: cc/output/software_renderer_unittest.cc

Issue 1357423009: gfx: Make conversions from Size to SizeF be explicit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sizefconvert-gfx: . Created 5 years, 2 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/output/software_renderer.cc ('k') | cc/playback/display_item_list_unittest.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/output/software_renderer.h" 5 #include "cc/output/software_renderer.h"
6 6
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "cc/output/compositor_frame_metadata.h" 8 #include "cc/output/compositor_frame_metadata.h"
9 #include "cc/output/copy_output_request.h" 9 #include "cc/output/copy_output_request.h"
10 #include "cc/output/copy_output_result.h" 10 #include "cc/output/copy_output_result.h"
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 shared_quad_state->SetAll(gfx::Transform(), 180 shared_quad_state->SetAll(gfx::Transform(),
181 outer_size, 181 outer_size,
182 outer_rect, 182 outer_rect,
183 outer_rect, 183 outer_rect,
184 false, 184 false,
185 1.0, 185 1.0,
186 SkXfermode::kSrcOver_Mode, 186 SkXfermode::kSrcOver_Mode,
187 0); 187 0);
188 TileDrawQuad* inner_quad = 188 TileDrawQuad* inner_quad =
189 root_render_pass->CreateAndAppendDrawQuad<TileDrawQuad>(); 189 root_render_pass->CreateAndAppendDrawQuad<TileDrawQuad>();
190 inner_quad->SetNew(shared_quad_state, 190 inner_quad->SetNew(shared_quad_state, inner_rect, inner_rect, inner_rect,
191 inner_rect, 191 resource_cyan, gfx::RectF(gfx::SizeF(inner_size)),
192 inner_rect, 192 inner_size, false, false);
193 inner_rect,
194 resource_cyan,
195 gfx::RectF(inner_size),
196 inner_size,
197 false,
198 false);
199 TileDrawQuad* outer_quad = 193 TileDrawQuad* outer_quad =
200 root_render_pass->CreateAndAppendDrawQuad<TileDrawQuad>(); 194 root_render_pass->CreateAndAppendDrawQuad<TileDrawQuad>();
201 outer_quad->SetNew(shared_quad_state, 195 outer_quad->SetNew(shared_quad_state, outer_rect, outer_rect, outer_rect,
202 outer_rect, 196 resource_yellow, gfx::RectF(gfx::SizeF(outer_size)),
203 outer_rect, 197 outer_size, false, false);
204 outer_rect,
205 resource_yellow,
206 gfx::RectF(outer_size),
207 outer_size,
208 false,
209 false);
210 198
211 RenderPassList list; 199 RenderPassList list;
212 list.push_back(root_render_pass.Pass()); 200 list.push_back(root_render_pass.Pass());
213 201
214 float device_scale_factor = 1.f; 202 float device_scale_factor = 1.f;
215 gfx::Rect device_viewport_rect(outer_size); 203 gfx::Rect device_viewport_rect(outer_size);
216 scoped_ptr<SkBitmap> output = 204 scoped_ptr<SkBitmap> output =
217 DrawAndCopyOutput(&list, device_scale_factor, device_viewport_rect); 205 DrawAndCopyOutput(&list, device_scale_factor, device_viewport_rect);
218 EXPECT_EQ(outer_rect.width(), output->info().width()); 206 EXPECT_EQ(outer_rect.width(), output->info().width());
219 EXPECT_EQ(outer_rect.height(), output->info().height()); 207 EXPECT_EQ(outer_rect.height(), output->info().height());
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 shared_quad_state->SetAll(gfx::Transform(), 247 shared_quad_state->SetAll(gfx::Transform(),
260 tile_size, 248 tile_size,
261 tile_rect, 249 tile_rect,
262 tile_rect, 250 tile_rect,
263 false, 251 false,
264 1.0, 252 1.0,
265 SkXfermode::kSrcOver_Mode, 253 SkXfermode::kSrcOver_Mode,
266 0); 254 0);
267 TileDrawQuad* quad = 255 TileDrawQuad* quad =
268 root_render_pass->CreateAndAppendDrawQuad<TileDrawQuad>(); 256 root_render_pass->CreateAndAppendDrawQuad<TileDrawQuad>();
269 quad->SetNew(shared_quad_state, 257 quad->SetNew(shared_quad_state, tile_rect, tile_rect, tile_rect,
270 tile_rect, 258 resource_cyan, gfx::RectF(gfx::SizeF(tile_size)), tile_size,
271 tile_rect, 259 false, false);
272 tile_rect,
273 resource_cyan,
274 gfx::RectF(tile_size),
275 tile_size,
276 false,
277 false);
278 quad->visible_rect = visible_rect; 260 quad->visible_rect = visible_rect;
279 261
280 RenderPassList list; 262 RenderPassList list;
281 list.push_back(root_render_pass.Pass()); 263 list.push_back(root_render_pass.Pass());
282 264
283 float device_scale_factor = 1.f; 265 float device_scale_factor = 1.f;
284 gfx::Rect device_viewport_rect(tile_size); 266 gfx::Rect device_viewport_rect(tile_size);
285 scoped_ptr<SkBitmap> output = 267 scoped_ptr<SkBitmap> output =
286 DrawAndCopyOutput(&list, device_scale_factor, device_viewport_rect); 268 DrawAndCopyOutput(&list, device_scale_factor, device_viewport_rect);
287 EXPECT_EQ(tile_rect.width(), output->info().width()); 269 EXPECT_EQ(tile_rect.width(), output->info().width());
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 EXPECT_EQ( 393 EXPECT_EQ(
412 SK_ColorMAGENTA, 394 SK_ColorMAGENTA,
413 output->getColor(interior_visible_rect.x(), interior_visible_rect.y())); 395 output->getColor(interior_visible_rect.x(), interior_visible_rect.y()));
414 EXPECT_EQ(SK_ColorMAGENTA, 396 EXPECT_EQ(SK_ColorMAGENTA,
415 output->getColor(interior_visible_rect.right() - 1, 397 output->getColor(interior_visible_rect.right() - 1,
416 interior_visible_rect.bottom() - 1)); 398 interior_visible_rect.bottom() - 1));
417 } 399 }
418 400
419 } // namespace 401 } // namespace
420 } // namespace cc 402 } // namespace cc
OLDNEW
« no previous file with comments | « cc/output/software_renderer.cc ('k') | cc/playback/display_item_list_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698