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

Side by Side Diff: cc/layers/tiled_layer_impl_unittest.cc

Issue 389973004: cc: Give TilingData back a Size instead of a Rect. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tilingsize: comments Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « cc/layers/tiled_layer.cc ('k') | cc/resources/layer_tiling_data.h » ('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/layers/tiled_layer_impl.h" 5 #include "cc/layers/tiled_layer_impl.h"
6 6
7 #include "cc/layers/append_quads_data.h" 7 #include "cc/layers/append_quads_data.h"
8 #include "cc/quads/tile_draw_quad.h" 8 #include "cc/quads/tile_draw_quad.h"
9 #include "cc/resources/layer_tiling_data.h" 9 #include "cc/resources/layer_tiling_data.h"
10 #include "cc/test/fake_impl_proxy.h" 10 #include "cc/test/fake_impl_proxy.h"
(...skipping 11 matching lines...) Expand all
22 TiledLayerImplTest() : host_impl_(&proxy_, &shared_bitmap_manager_) {} 22 TiledLayerImplTest() : host_impl_(&proxy_, &shared_bitmap_manager_) {}
23 23
24 scoped_ptr<TiledLayerImpl> CreateLayerNoTiles( 24 scoped_ptr<TiledLayerImpl> CreateLayerNoTiles(
25 const gfx::Size& tile_size, 25 const gfx::Size& tile_size,
26 const gfx::Size& layer_size, 26 const gfx::Size& layer_size,
27 LayerTilingData::BorderTexelOption border_texels) { 27 LayerTilingData::BorderTexelOption border_texels) {
28 scoped_ptr<TiledLayerImpl> layer = 28 scoped_ptr<TiledLayerImpl> layer =
29 TiledLayerImpl::Create(host_impl_.active_tree(), 1); 29 TiledLayerImpl::Create(host_impl_.active_tree(), 1);
30 scoped_ptr<LayerTilingData> tiler = 30 scoped_ptr<LayerTilingData> tiler =
31 LayerTilingData::Create(tile_size, border_texels); 31 LayerTilingData::Create(tile_size, border_texels);
32 tiler->SetTilingRect(gfx::Rect(layer_size)); 32 tiler->SetTilingSize(layer_size);
33 layer->SetTilingData(*tiler); 33 layer->SetTilingData(*tiler);
34 layer->set_skips_draw(false); 34 layer->set_skips_draw(false);
35 layer->draw_properties().visible_content_rect = 35 layer->draw_properties().visible_content_rect =
36 gfx::Rect(layer_size); 36 gfx::Rect(layer_size);
37 layer->draw_properties().opacity = 1; 37 layer->draw_properties().opacity = 1;
38 layer->SetBounds(layer_size); 38 layer->SetBounds(layer_size);
39 layer->SetContentBounds(layer_size); 39 layer->SetContentBounds(layer_size);
40 layer->CreateRenderSurface(); 40 layer->CreateRenderSurface();
41 layer->draw_properties().render_target = layer.get(); 41 layer->draw_properties().render_target = layer.get();
42 return layer.Pass(); 42 return layer.Pass();
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 LayerTestCommon::LayerImplTest impl; 328 LayerTestCommon::LayerImplTest impl;
329 329
330 TiledLayerImpl* tiled_layer = impl.AddChildToRoot<TiledLayerImpl>(); 330 TiledLayerImpl* tiled_layer = impl.AddChildToRoot<TiledLayerImpl>();
331 tiled_layer->SetBounds(layer_bounds); 331 tiled_layer->SetBounds(layer_bounds);
332 tiled_layer->SetContentBounds(layer_bounds); 332 tiled_layer->SetContentBounds(layer_bounds);
333 tiled_layer->SetDrawsContent(true); 333 tiled_layer->SetDrawsContent(true);
334 tiled_layer->set_skips_draw(false); 334 tiled_layer->set_skips_draw(false);
335 335
336 scoped_ptr<LayerTilingData> tiler = 336 scoped_ptr<LayerTilingData> tiler =
337 LayerTilingData::Create(tile_size, LayerTilingData::NO_BORDER_TEXELS); 337 LayerTilingData::Create(tile_size, LayerTilingData::NO_BORDER_TEXELS);
338 tiler->SetTilingRect(gfx::Rect(layer_bounds)); 338 tiler->SetTilingSize(layer_bounds);
339 tiled_layer->SetTilingData(*tiler); 339 tiled_layer->SetTilingData(*tiler);
340 340
341 ResourceProvider::ResourceId resource_id = 1; 341 ResourceProvider::ResourceId resource_id = 1;
342 for (int i = 0; i < tiled_layer->TilingForTesting()->num_tiles_x(); ++i) { 342 for (int i = 0; i < tiled_layer->TilingForTesting()->num_tiles_x(); ++i) {
343 for (int j = 0; j < tiled_layer->TilingForTesting()->num_tiles_y(); ++j) 343 for (int j = 0; j < tiled_layer->TilingForTesting()->num_tiles_y(); ++j)
344 tiled_layer->PushTileProperties(i, j, resource_id++, gfx::Rect(), false); 344 tiled_layer->PushTileProperties(i, j, resource_id++, gfx::Rect(), false);
345 } 345 }
346 346
347 impl.CalcDrawProps(viewport_size); 347 impl.CalcDrawProps(viewport_size);
348 348
(...skipping 28 matching lines...) Expand all
377 occluded, 377 occluded,
378 &partially_occluded_count); 378 &partially_occluded_count);
379 // The layer outputs one quad, which is partially occluded. 379 // The layer outputs one quad, which is partially occluded.
380 EXPECT_EQ(100u - 10u, impl.quad_list().size()); 380 EXPECT_EQ(100u - 10u, impl.quad_list().size());
381 EXPECT_EQ(10u + 10u, partially_occluded_count); 381 EXPECT_EQ(10u + 10u, partially_occluded_count);
382 } 382 }
383 } 383 }
384 384
385 } // namespace 385 } // namespace
386 } // namespace cc 386 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/tiled_layer.cc ('k') | cc/resources/layer_tiling_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698