cc/trees/layer_tree_impl.cc - Issue 1811423002: SubtreeShouldBeSkipped uses information from property trees

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cc/trees/layer_tree_impl.cc

Issue 1811423002: SubtreeShouldBeSkipped uses information from property trees (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix windows compile failure Created 4 years, 9 months 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

« cc/trees/layer_tree_host_common_unittest.cc ('K') | « cc/trees/layer_tree_host_common_unittest.cc ('k') | cc/trees/layer_tree_impl_unittest.cc » ('j') | cc/trees/layer_tree_impl_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: cc/trees/layer_tree_impl.cc

diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc

index e89c84d102f23dc4cc59f406897b639a8e82fe6f..ad69490b02d3e12019c6b86ca0f84d323a159454 100644

--- a/cc/trees/layer_tree_impl.cc

+++ b/cc/trees/layer_tree_impl.cc

@@ -576,8 +576,6 @@ void LayerTreeImpl::SetPageScaleOnActiveTree(float active_page_scale) {

draw_property_utils::UpdatePageScaleFactor(

property_trees(), PageScaleLayer(), current_page_scale_factor(),

device_scale_factor(), layer_tree_host_impl_->DrawTransform());

- } else {

- DCHECK(!root_layer_ || active_page_scale == 1);

ajuma 2016/03/24 15:11:59 This shouldn't be removed.

sunxd 2016/03/29 14:26:34 Done.

}

@@ -625,7 +623,8 @@ void LayerTreeImpl::PushPageScaleFactorAndLimits(const float* page_scale_factor,

property_trees(), PageScaleLayer(), current_page_scale_factor(),

device_scale_factor(), layer_tree_host_impl_->DrawTransform());

} else {

- DCHECK(!root_layer_ || *page_scale_factor == 1);

+ DCHECK(!root_layer_ || *page_scale_factor == 1 ||

+ page_scale_layer_id_ == -1);

ajuma 2016/03/24 15:11:59 We shouldn't have non-zero page scale when the pag

sunxd 2016/03/29 14:26:34 Done.

}