summaryrefslogtreecommitdiffstats
path: root/cc/trees/layer_tree_host_common.h
diff options
context:
space:
mode:
authorajuma <ajuma@chromium.org>2015-06-25 14:53:02 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-25 21:53:34 +0000
commit6b46da2e972ced90f7ebcce21b355f0d87615f21 (patch)
treec0a77f4af6a35c1bedc532c301106dc230cf611e /cc/trees/layer_tree_host_common.h
parentbcc9224a55646e712f5f46ef0906d58ff0733006 (diff)
downloadchromium_src-6b46da2e972ced90f7ebcce21b355f0d87615f21.zip
chromium_src-6b46da2e972ced90f7ebcce21b355f0d87615f21.tar.gz
chromium_src-6b46da2e972ced90f7ebcce21b355f0d87615f21.tar.bz2
cc: Make impl-thread property trees handle bounds delta
This makes the transform tree aware of inner and outer viewport bounds delta, and makes transform nodes know whether their position is affected by inner or outer viewport bounds delta. LayerPositionConstraintTests now pass with verification enabled. BUG=497806 CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1159423002 Cr-Commit-Position: refs/heads/master@{#336268}
Diffstat (limited to 'cc/trees/layer_tree_host_common.h')
-rw-r--r--cc/trees/layer_tree_host_common.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/cc/trees/layer_tree_host_common.h b/cc/trees/layer_tree_host_common.h
index 53ac758..0e4de2d 100644
--- a/cc/trees/layer_tree_host_common.h
+++ b/cc/trees/layer_tree_host_common.h
@@ -40,6 +40,8 @@ class CC_EXPORT LayerTreeHostCommon {
float device_scale_factor,
float page_scale_factor,
const LayerType* page_scale_layer,
+ const LayerType* inner_viewport_scroll_layer,
+ const LayerType* outer_viewport_scroll_layer,
const gfx::Vector2dF& elastic_overscroll,
const LayerType* elastic_overscroll_application_layer,
int max_texture_size,
@@ -57,6 +59,8 @@ class CC_EXPORT LayerTreeHostCommon {
device_scale_factor(device_scale_factor),
page_scale_factor(page_scale_factor),
page_scale_layer(page_scale_layer),
+ inner_viewport_scroll_layer(inner_viewport_scroll_layer),
+ outer_viewport_scroll_layer(outer_viewport_scroll_layer),
elastic_overscroll(elastic_overscroll),
elastic_overscroll_application_layer(
elastic_overscroll_application_layer),
@@ -77,6 +81,8 @@ class CC_EXPORT LayerTreeHostCommon {
float device_scale_factor;
float page_scale_factor;
const LayerType* page_scale_layer;
+ const LayerType* inner_viewport_scroll_layer;
+ const LayerType* outer_viewport_scroll_layer;
gfx::Vector2dF elastic_overscroll;
const LayerType* elastic_overscroll_application_layer;
int max_texture_size;
@@ -252,6 +258,8 @@ LayerTreeHostCommon::CalcDrawPropsInputsForTesting<LayerType,
1.f,
1.f,
NULL,
+ NULL,
+ NULL,
gfx::Vector2dF(),
NULL,
std::numeric_limits<int>::max() / 2,
@@ -281,6 +289,8 @@ LayerTreeHostCommon::CalcDrawPropsInputsForTesting<LayerType,
1.f,
1.f,
NULL,
+ NULL,
+ NULL,
gfx::Vector2dF(),
NULL,
std::numeric_limits<int>::max() / 2,