Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2616)

Unified Diff: cc/trees/layer_tree_impl.h

Issue 2194833002: Overscroll and Elasticity for views::ScrollView Base URL: https://chromium.googlesource.com/chromium/src.git@20160728-MacViews-RouteThroughInputHandler
Patch Set: Restore functionality and fix bugs \o/ Created 4 years, 1 month 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
« no previous file with comments | « cc/trees/layer_tree_host_unittest_scroll.cc ('k') | cc/trees/layer_tree_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_impl.h
diff --git a/cc/trees/layer_tree_impl.h b/cc/trees/layer_tree_impl.h
index 620d04257013d4e42090d096b52430e420039f6d..81d30d2c7d6f8718838386493fb765068fb74f35 100644
--- a/cc/trees/layer_tree_impl.h
+++ b/cc/trees/layer_tree_impl.h
@@ -47,6 +47,7 @@ class PageScaleAnimation;
class PictureLayerImpl;
class TaskRunnerProvider;
class ResourceProvider;
+class ScrollElasticityHelper;
class TileManager;
class UIResourceRequest;
class VideoFrameControllerClient;
@@ -97,6 +98,8 @@ class CC_EXPORT LayerTreeImpl {
const gfx::Rect ViewportRectForTilePriority() const;
std::unique_ptr<ScrollbarAnimationController>
CreateScrollbarAnimationController(int scroll_layer_id);
+ std::unique_ptr<ScrollElasticityHelper> CreateScrollElasticityHelper(
+ int scroll_layer_id);
void DidAnimateScrollOffset();
bool use_gpu_rasterization() const;
GpuRasterizationStatus GetGpuRasterizationStatus() const;
@@ -206,7 +209,7 @@ class CC_EXPORT LayerTreeImpl {
void UpdatePropertyTreeScrollingAndAnimationFromMainThread();
void UpdatePropertyTreeScrollOffset(PropertyTrees* property_trees) {
property_trees_.scroll_tree.UpdateScrollOffsetMap(
- &property_trees->scroll_tree.scroll_offset_map(), this);
+ &property_trees->scroll_tree, this);
}
void SetPageScaleOnActiveTree(float active_page_scale);
void PushPageScaleFromMainThread(float page_scale_factor,
« no previous file with comments | « cc/trees/layer_tree_host_unittest_scroll.cc ('k') | cc/trees/layer_tree_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698