diff options
| author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-24 19:56:31 +0000 |
|---|---|---|
| committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-24 19:56:31 +0000 |
| commit | 873639e27af36392b3e84ac74d2885de27507756 (patch) | |
| tree | e6fa466ccc8fd4f2bb57f978d6161c5cd58f3f4e /webkit | |
| parent | fcf4b3cd0e8f81ca1f033ca3d3a8635f83730cc6 (diff) | |
| download | chromium_src-873639e27af36392b3e84ac74d2885de27507756.zip chromium_src-873639e27af36392b3e84ac74d2885de27507756.tar.gz chromium_src-873639e27af36392b3e84ac74d2885de27507756.tar.bz2 | |
Revert 213493 "cc: Use a struct for CalcDrawProps inputs"
> cc: Use a struct for CalcDrawProps inputs
>
> This is just a refactoring and should not change any behavior.
>
> R=danakj@chromium.org
> BUG=none
>
> Review URL: https://chromiumcodereview.appspot.com/19935003
TBR=enne@chromium.org
Review URL: https://codereview.chromium.org/20110002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213495 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, 23 insertions, 14 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 b90a12c..1ae67d4 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,6 +90,7 @@ 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); @@ -128,13 +129,17 @@ void CompareFixedBoundsLayerAndNormalLayer( { cc::RenderSurfaceLayerList 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); - + 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); ExpectEqualLayerRectsInTarget(normal_layer->layer(), fixed_bounds_layer->layer()); ExpectEqualLayerRectsInTarget(sublayer_under_normal_layer->layer(), @@ -147,13 +152,17 @@ void CompareFixedBoundsLayerAndNormalLayer( { cc::RenderSurfaceLayerList 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); - + 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); ExpectEqualLayerRectsInTarget(normal_layer->layer(), fixed_bounds_layer->layer()); ExpectEqualLayerRectsInTarget(sublayer_under_normal_layer->layer(), |