Index: cc/trees/layer_tree_host_impl.h |
diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h |
index a987d46ecfcb211688f7b6e27e6aec420639d365..da1c5d6b52238d63dc9ec40babfe8c17c4e02145 100644 |
--- a/cc/trees/layer_tree_host_impl.h |
+++ b/cc/trees/layer_tree_host_impl.h |
@@ -490,7 +490,7 @@ class CC_EXPORT LayerTreeHostImpl |
SharedBitmapManager* manager, |
int id); |
- void UpdateInnerViewportContainerSize(); |
+ void UpdateViewportContainerSizes(); |
// Virtual for testing. |
virtual void AnimateLayers(base::TimeTicks monotonic_time); |
@@ -529,6 +529,8 @@ class CC_EXPORT LayerTreeHostImpl |
void AnimateScrollbars(base::TimeTicks monotonic_time); |
void AnimateTopControls(base::TimeTicks monotonic_time); |
+ bool ShouldTopControlsConsumeScroll(const gfx::Vector2dF& scroll_delta) const; |
+ |
gfx::Vector2dF ScrollLayerWithViewportSpaceDelta( |
LayerImpl* layer_impl, |
float scale_from_viewport_to_screen_space, |