diff options
| author | sunxd <sunxd@chromium.org> | 2016-01-06 08:42:54 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-06 16:44:09 +0000 |
| commit | 42238faf73f0d108a6a926f3fddf35887df071a1 (patch) | |
| tree | 29705e4455357349e73fe0ff1f77b73205b16e13 /cc/layers/layer.cc | |
| parent | 4b2b759006ad470f493a425345d6e6e261c943a1 (diff) | |
| download | chromium_src-42238faf73f0d108a6a926f3fddf35887df071a1.zip chromium_src-42238faf73f0d108a6a926f3fddf35887df071a1.tar.gz chromium_src-42238faf73f0d108a6a926f3fddf35887df071a1.tar.bz2 | |
Revert of Determine a layer's IsAffectedByPageScale property without using Layer Tree (patchset #2 id:20001 of https://codereview.chromium.org/1544103002/ )
Reason for revert:
Revert the CL to see if it causes an improvement on the waterfall. Related to Issue 573267: 10.3% regression in blink_perf.layout at 367076:367083.
Original issue's description:
> Determine a layer's IsAffectedByPageScale property without using Layer Tree.
>
> The property is retrieved from TransformTree;
> Fix the order of updating the page scale layer and adding transform tree node;
> Fix the problem that transform tree sequence number not correctly updated for mask layers;
> Fix related cc unit tests where a property tree was not created.
>
> BUG=568777
> CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
>
> Committed: https://crrev.com/73c0fa89da59c8ea5e0d86d1136d7c1a7e68e097
> Cr-Commit-Position: refs/heads/master@{#367083}
BUG=568777,573267
Review URL: https://codereview.chromium.org/1565783002
Cr-Commit-Position: refs/heads/master@{#367837}
Diffstat (limited to 'cc/layers/layer.cc')
| -rw-r--r-- | cc/layers/layer.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc index 19b8a95..4aaa673 100644 --- a/cc/layers/layer.cc +++ b/cc/layers/layer.cc @@ -1352,6 +1352,11 @@ void Layer::PushPropertiesTo(LayerImpl* layer) { frame_timing_requests_dirty_ = false; } + bool is_page_scale_layer = this == layer_tree_host()->page_scale_layer(); + bool parent_affected = + layer->parent() && layer->parent()->IsAffectedByPageScale(); + layer->SetIsAffectedByPageScale(is_page_scale_layer || parent_affected); + // Reset any state that should be cleared for the next update. stacking_order_changed_ = false; update_rect_ = gfx::Rect(); |