diff options
| author | ccameron <ccameron@chromium.org> | 2014-11-21 11:25:18 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-21 19:26:28 +0000 |
| commit | 8230b68b226157ab9c41b7bd9ad5bc7cd8c47cd6 (patch) | |
| tree | e95bc21822dc3ac280723cc37e2484b9dfdb8ad8 /cc/trees/layer_tree_impl_unittest.cc | |
| parent | 686ccaf7fa0333c873f500264a766dcd40879d81 (diff) | |
| download | chromium_src-8230b68b226157ab9c41b7bd9ad5bc7cd8c47cd6.zip chromium_src-8230b68b226157ab9c41b7bd9ad5bc7cd8c47cd6.tar.gz chromium_src-8230b68b226157ab9c41b7bd9ad5bc7cd8c47cd6.tar.bz2 | |
Plumb scroll elasticity layer from Blink to cc
Implement the 4-argument version of registerViewportLayers
for all implementers of WebLayerTreeView.
Add a scroll elasticity layer to cc::LayerTreeHost and through to
cc::LayerTreeHostImpl. These layers are still optional, and most
tests set them to NULL. Once the Blink side that pushes real layers
through is completed, the scroll elasticity layer will be required.
R=enne
TBR=jam
BUG=133097
Review URL: https://codereview.chromium.org/731863009
Cr-Commit-Position: refs/heads/master@{#305260}
Diffstat (limited to 'cc/trees/layer_tree_impl_unittest.cc')
| -rw-r--r-- | cc/trees/layer_tree_impl_unittest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cc/trees/layer_tree_impl_unittest.cc b/cc/trees/layer_tree_impl_unittest.cc index f8de8b0..52f8e0a 100644 --- a/cc/trees/layer_tree_impl_unittest.cc +++ b/cc/trees/layer_tree_impl_unittest.cc @@ -1798,7 +1798,8 @@ TEST_F(LayerTreeImplTest, host_impl().active_tree()->SetPageScaleFactorAndLimits( page_scale_factor, page_scale_factor, page_scale_factor); host_impl().active_tree()->SetRootLayer(root.Pass()); - host_impl().active_tree()->SetViewportLayersFromIds(1, 1, Layer::INVALID_ID); + host_impl().active_tree()->SetViewportLayersFromIds(Layer::INVALID_ID, 1, 1, + Layer::INVALID_ID); host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree(); // Sanity check the scenario we just created. @@ -2301,7 +2302,8 @@ TEST_F(LayerTreeImplTest, SelectionBoundsForScaledLayers) { host_impl().active_tree()->SetPageScaleFactorAndLimits( page_scale_factor, page_scale_factor, page_scale_factor); host_impl().active_tree()->SetRootLayer(root.Pass()); - host_impl().active_tree()->SetViewportLayersFromIds(1, 1, Layer::INVALID_ID); + host_impl().active_tree()->SetViewportLayersFromIds(Layer::INVALID_ID, 1, 1, + Layer::INVALID_ID); host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree(); // Sanity check the scenario we just created. |