diff options
| author | jaydasika <jaydasika@chromium.org> | 2015-10-09 15:14:50 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-09 22:16:30 +0000 |
| commit | 8dfef3215b736aee8fa1f2f332f4b3284ca53f60 (patch) | |
| tree | e696fdc2b295aa5de168505ab9769cb2241a3fd4 /cc/trees/layer_tree_host_common.cc | |
| parent | f4b4583bcc7ccb6b0191f5b4c72b94154a78bdd1 (diff) | |
| download | chromium_src-8dfef3215b736aee8fa1f2f332f4b3284ca53f60.zip chromium_src-8dfef3215b736aee8fa1f2f332f4b3284ca53f60.tar.gz chromium_src-8dfef3215b736aee8fa1f2f332f4b3284ca53f60.tar.bz2 | |
Page scale factor update in property trees when page scale layer is root
When page scale layer is the root, its property tree
node should have the combined scale factor and not just the
page scale factor.
BUG=540770
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1401573002
Cr-Commit-Position: refs/heads/master@{#353401}
Diffstat (limited to 'cc/trees/layer_tree_host_common.cc')
| -rw-r--r-- | cc/trees/layer_tree_host_common.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cc/trees/layer_tree_host_common.cc b/cc/trees/layer_tree_host_common.cc index 21054ff..ac25fbb 100644 --- a/cc/trees/layer_tree_host_common.cc +++ b/cc/trees/layer_tree_host_common.cc @@ -2713,9 +2713,10 @@ void CalculateDrawPropertiesAndVerify( // active tree immediately affect the pending tree, so instead of // trying to update property trees whenever page scale changes, we // update their page scale before using them. - UpdatePageScaleFactorInPropertyTrees(inputs->property_trees, - inputs->page_scale_layer, - inputs->page_scale_factor); + UpdatePageScaleFactorInPropertyTrees( + inputs->property_trees, inputs->page_scale_layer, + inputs->page_scale_factor, inputs->device_scale_factor, + inputs->device_transform); ComputeVisibleRectsUsingPropertyTrees( inputs->root_layer, inputs->property_trees, &update_layer_list); break; |