summaryrefslogtreecommitdiffstats
path: root/cc/trees/draw_property_utils.h
diff options
context:
space:
mode:
authorajuma <ajuma@chromium.org>2015-12-04 13:49:01 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-04 21:49:56 +0000
commit1401782ba756dd2e7e3158b3a8ddf283ea61b735 (patch)
tree644825b42b6b2b1eb24ed251e5d4f56b372e9a67 /cc/trees/draw_property_utils.h
parent7eeb8cbd133d60e5fca6602529d77e3f54f87db5 (diff)
downloadchromium_src-1401782ba756dd2e7e3158b3a8ddf283ea61b735.zip
chromium_src-1401782ba756dd2e7e3158b3a8ddf283ea61b735.tar.gz
chromium_src-1401782ba756dd2e7e3158b3a8ddf283ea61b735.tar.bz2
cc: Make property trees support elastic overscroll
This makes property trees aware of the elastic overscroll value, which is used for the overscroll rubberbanding effect on Mac. BUG=559550 CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1494723002 Cr-Commit-Position: refs/heads/master@{#363302}
Diffstat (limited to 'cc/trees/draw_property_utils.h')
-rw-r--r--cc/trees/draw_property_utils.h16
1 files changed, 16 insertions, 0 deletions
diff --git a/cc/trees/draw_property_utils.h b/cc/trees/draw_property_utils.h
index 5c99458..72d9337 100644
--- a/cc/trees/draw_property_utils.h
+++ b/cc/trees/draw_property_utils.h
@@ -11,6 +11,7 @@
namespace gfx {
class Rect;
class Transform;
+class Vector2dF;
} // namespace gfx
namespace cc {
@@ -46,6 +47,8 @@ void CC_EXPORT BuildPropertyTreesAndComputeVisibleRects(
const Layer* page_scale_layer,
const Layer* inner_viewport_scroll_layer,
const Layer* outer_viewport_scroll_layer,
+ const Layer* overscroll_elasticity_layer,
+ const gfx::Vector2dF& elastic_overscroll,
float page_scale_factor,
float device_scale_factor,
const gfx::Rect& viewport,
@@ -59,6 +62,8 @@ void CC_EXPORT BuildPropertyTreesAndComputeVisibleRects(
const LayerImpl* page_scale_layer,
const LayerImpl* inner_viewport_scroll_layer,
const LayerImpl* outer_viewport_scroll_layer,
+ const LayerImpl* overscroll_elasticity_layer,
+ const gfx::Vector2dF& elastic_overscroll,
float page_scale_factor,
float device_scale_factor,
const gfx::Rect& viewport,
@@ -123,6 +128,17 @@ UpdatePageScaleFactorInPropertyTrees(PropertyTrees* property_trees,
float page_scale_factor,
float device_scale_factor,
const gfx::Transform device_transform);
+
+void CC_EXPORT UpdateElasticOverscrollInPropertyTrees(
+ PropertyTrees* property_trees,
+ const LayerImpl* overscroll_elasticity_layer,
+ const gfx::Vector2dF& elastic_overscroll);
+
+void CC_EXPORT UpdateElasticOverscrollInPropertyTrees(
+ PropertyTrees* property_trees,
+ const Layer* overscroll_elasticity_layer,
+ const gfx::Vector2dF& elastic_overscroll);
+
} // namespace cc
#endif // CC_TREES_DRAW_PROPERTY_UTILS_H_