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

Unified Diff: cc/trees/layer_tree_impl_unittest.cc

Issue 2417783005: [Master/Overview CL] Make PageScaleFactor work for oopif subframe.
Patch Set: Rebase to master@{#429656}. Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/trees/layer_tree_impl.cc ('k') | content/browser/renderer_host/render_widget_host_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_impl_unittest.cc
diff --git a/cc/trees/layer_tree_impl_unittest.cc b/cc/trees/layer_tree_impl_unittest.cc
index 47d4435117e2df1ec3c8d90e2c40bea041f9a0b8..041900d41962a31b6fae45df1e8ce3006649880a 100644
--- a/cc/trees/layer_tree_impl_unittest.cc
+++ b/cc/trees/layer_tree_impl_unittest.cc
@@ -1494,7 +1494,7 @@ TEST_F(LayerTreeImplTest,
Layer::INVALID_ID);
host_impl().active_tree()->BuildLayerListAndPropertyTreesForTesting();
host_impl().active_tree()->PushPageScaleFromMainThread(
- page_scale_factor, page_scale_factor, max_page_scale_factor);
+ page_scale_factor, 1.f, page_scale_factor, max_page_scale_factor);
host_impl().active_tree()->SetPageScaleOnActiveTree(page_scale_factor);
host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree();
@@ -1720,7 +1720,7 @@ TEST_F(LayerTreeImplTest,
Layer::INVALID_ID);
host_impl().active_tree()->BuildLayerListAndPropertyTreesForTesting();
host_impl().active_tree()->PushPageScaleFromMainThread(
- page_scale_factor, page_scale_factor, max_page_scale_factor);
+ page_scale_factor, 1.f, page_scale_factor, max_page_scale_factor);
host_impl().active_tree()->SetPageScaleOnActiveTree(page_scale_factor);
host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree();
@@ -2120,7 +2120,8 @@ TEST_F(LayerTreeImplTest, SelectionBoundsForScaledLayers) {
host_impl().active_tree()->SetViewportLayersFromIds(Layer::INVALID_ID, 1, 1,
Layer::INVALID_ID);
host_impl().active_tree()->PushPageScaleFromMainThread(
- page_scale_factor, page_scale_factor, page_scale_factor);
+ page_scale_factor, page_scale_factor, page_scale_factor,
+ page_scale_factor);
host_impl().active_tree()->SetPageScaleOnActiveTree(page_scale_factor);
host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree();
« no previous file with comments | « cc/trees/layer_tree_impl.cc ('k') | content/browser/renderer_host/render_widget_host_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698