diff options
| author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-26 11:25:53 +0000 |
|---|---|---|
| committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-26 11:25:53 +0000 |
| commit | 7aad55f2a1e0912e85bec253c64beb3a54096e0b (patch) | |
| tree | ec88dcc72fe19f51f48a9eb567b92f999e65d3e3 /webkit | |
| parent | f7d37d705015c487d6656957a7972872b4a11de2 (diff) | |
| download | chromium_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 'webkit')
| -rw-r--r-- | webkit/renderer/compositor_bindings/web_layer_impl_fixed_bounds_unittest.cc | 37 |
1 files changed, 14 insertions, 23 deletions
diff --git a/webkit/renderer/compositor_bindings/web_layer_impl_fixed_bounds_unittest.cc b/webkit/renderer/compositor_bindings/web_layer_impl_fixed_bounds_unittest.cc index 1ae67d4..b90a12c 100644 --- a/webkit/renderer/compositor_bindings/web_layer_impl_fixed_bounds_unittest.cc +++ b/webkit/renderer/compositor_bindings/web_layer_impl_fixed_bounds_unittest.cc @@ -90,7 +90,6 @@ void CompareFixedBoundsLayerAndNormalLayer( const gfx::Size kDeviceViewportSize(800, 600); const float kDeviceScaleFactor = 2.f; const float kPageScaleFactor = 1.5f; - const int kMaxTextureSize = 512; WebSize bounds(150, 200); WebFloatPoint position(20, 30); @@ -129,17 +128,13 @@ void CompareFixedBoundsLayerAndNormalLayer( { cc::RenderSurfaceLayerList render_surface_layer_list; - cc::LayerTreeHostCommon::CalculateDrawProperties( - root_layer->layer(), - kDeviceViewportSize, - gfx::Transform(), - kDeviceScaleFactor, - kPageScaleFactor, - root_layer->layer(), - kMaxTextureSize, - false, // can_use_lcd_text - false, // can_adjust_raster_scales - &render_surface_layer_list); + cc::LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs( + root_layer->layer(), kDeviceViewportSize, &render_surface_layer_list); + inputs.device_scale_factor = kDeviceScaleFactor; + inputs.page_scale_factor = kPageScaleFactor; + inputs.page_scale_application_layer = root_layer->layer(), + cc::LayerTreeHostCommon::CalculateDrawProperties(&inputs); + ExpectEqualLayerRectsInTarget(normal_layer->layer(), fixed_bounds_layer->layer()); ExpectEqualLayerRectsInTarget(sublayer_under_normal_layer->layer(), @@ -152,17 +147,13 @@ void CompareFixedBoundsLayerAndNormalLayer( { cc::RenderSurfaceLayerList render_surface_layer_list; - cc::LayerTreeHostCommon::CalculateDrawProperties( - root_layer->layer(), - kDeviceViewportSize, - gfx::Transform(), - kDeviceScaleFactor, - kPageScaleFactor, - root_layer->layer(), - kMaxTextureSize, - false, // can_use_lcd_text - false, // can_adjust_raster_scales - &render_surface_layer_list); + cc::LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs( + root_layer->layer(), kDeviceViewportSize, &render_surface_layer_list); + inputs.device_scale_factor = kDeviceScaleFactor; + inputs.page_scale_factor = kPageScaleFactor; + inputs.page_scale_application_layer = root_layer->layer(), + cc::LayerTreeHostCommon::CalculateDrawProperties(&inputs); + ExpectEqualLayerRectsInTarget(normal_layer->layer(), fixed_bounds_layer->layer()); ExpectEqualLayerRectsInTarget(sublayer_under_normal_layer->layer(), |