diff options
| author | jaydasika <jaydasika@chromium.org> | 2015-11-16 21:17:28 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-17 05:18:17 +0000 |
| commit | 0d98ba93e2c611450caaf4629cc8c33bbf26183e (patch) | |
| tree | 57020929637f8ad5385141049717346ae79e7e83 /cc/trees/layer_tree_host_common.cc | |
| parent | 46363ec9039a41216d1086f2e819c66ba4672f89 (diff) | |
| download | chromium_src-0d98ba93e2c611450caaf4629cc8c33bbf26183e.zip chromium_src-0d98ba93e2c611450caaf4629cc8c33bbf26183e.tar.gz chromium_src-0d98ba93e2c611450caaf4629cc8c33bbf26183e.tar.bz2 | |
cc::Fix unit test that fail when we enable impl property trees
One of the unit test fails because property trees do not
account for layer's scroll delta while computing the scroll
compensation. This CL fixes that.
BUG=551629
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1448593002
Cr-Commit-Position: refs/heads/master@{#360007}
Diffstat (limited to 'cc/trees/layer_tree_host_common.cc')
| -rw-r--r-- | cc/trees/layer_tree_host_common.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cc/trees/layer_tree_host_common.cc b/cc/trees/layer_tree_host_common.cc index 832f864..dddb80c5 100644 --- a/cc/trees/layer_tree_host_common.cc +++ b/cc/trees/layer_tree_host_common.cc @@ -2759,6 +2759,13 @@ void CalculateDrawPropertiesAndVerify( inputs->can_render_to_separate_surface, inputs->property_trees, &visible_layer_list); + // Property trees are normally constructed on the main thread and + // passed to compositor thread. Source to parent updates on them are not + // allowed in the compositor thread. Some tests build them on the + // compositor thread, so we need to explicitly disallow source to parent + // updates when they are built on compositor thread. + inputs->property_trees->transform_tree + .set_source_to_parent_updates_allowed(false); if (should_measure_property_tree_performance) { TRACE_EVENT_END0( TRACE_DISABLED_BY_DEFAULT("cc.debug.cdp-perf"), |