summaryrefslogtreecommitdiffstats
path: root/cc/layers/layer_iterator_unittest.cc
diff options
context:
space:
mode:
authorenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-26 11:25:53 +0000
committerenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-26 11:25:53 +0000
commit7aad55f2a1e0912e85bec253c64beb3a54096e0b (patch)
treeec88dcc72fe19f51f48a9eb567b92f999e65d3e3 /cc/layers/layer_iterator_unittest.cc
parentf7d37d705015c487d6656957a7972872b4a11de2 (diff)
downloadchromium_src-7aad55f2a1e0912e85bec253c64beb3a54096e0b.zip
chromium_src-7aad55f2a1e0912e85bec253c64beb3a54096e0b.tar.gz
chromium_src-7aad55f2a1e0912e85bec253c64beb3a54096e0b.tar.bz2
cc: Use a struct for CalcDrawProps inputs
This is just a refactoring and should not change any behavior. R=danakj@chromium.org BUG=none Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=213493 Review URL: https://chromiumcodereview.appspot.com/19935003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213841 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layers/layer_iterator_unittest.cc')
-rw-r--r--cc/layers/layer_iterator_unittest.cc39
1 files changed, 9 insertions, 30 deletions
diff --git a/cc/layers/layer_iterator_unittest.cc b/cc/layers/layer_iterator_unittest.cc
index ea8ec3b..d828a41 100644
--- a/cc/layers/layer_iterator_unittest.cc
+++ b/cc/layers/layer_iterator_unittest.cc
@@ -137,16 +137,9 @@ TEST(LayerIteratorTest, SimpleTree) {
root_layer->AddChild(fourth);
RenderSurfaceLayerList render_surface_layer_list;
- LayerTreeHostCommon::CalculateDrawProperties(root_layer.get(),
- root_layer->bounds(),
- gfx::Transform(),
- 1.f,
- 1.f,
- NULL,
- 256,
- false,
- false,
- &render_surface_layer_list);
+ LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
+ root_layer.get(), root_layer->bounds(), &render_surface_layer_list);
+ LayerTreeHostCommon::CalculateDrawProperties(&inputs);
IterateBackToFront(&render_surface_layer_list);
EXPECT_COUNT(root_layer, 0, -1, 1);
@@ -184,16 +177,9 @@ TEST(LayerIteratorTest, ComplexTree) {
root23->AddChild(root231);
RenderSurfaceLayerList render_surface_layer_list;
- LayerTreeHostCommon::CalculateDrawProperties(root_layer.get(),
- root_layer->bounds(),
- gfx::Transform(),
- 1.f,
- 1.f,
- NULL,
- 256,
- false,
- false,
- &render_surface_layer_list);
+ LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
+ root_layer.get(), root_layer->bounds(), &render_surface_layer_list);
+ LayerTreeHostCommon::CalculateDrawProperties(&inputs);
IterateBackToFront(&render_surface_layer_list);
EXPECT_COUNT(root_layer, 0, -1, 1);
@@ -244,16 +230,9 @@ TEST(LayerIteratorTest, ComplexTreeMultiSurface) {
root23->AddChild(root231);
RenderSurfaceLayerList render_surface_layer_list;
- LayerTreeHostCommon::CalculateDrawProperties(root_layer.get(),
- root_layer->bounds(),
- gfx::Transform(),
- 1.f,
- 1.f,
- NULL,
- 256,
- false,
- false,
- &render_surface_layer_list);
+ LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
+ root_layer.get(), root_layer->bounds(), &render_surface_layer_list);
+ LayerTreeHostCommon::CalculateDrawProperties(&inputs);
IterateBackToFront(&render_surface_layer_list);
EXPECT_COUNT(root_layer, 0, -1, 1);