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 22a50f0b4453f67211f0774ac538eeb644c20ffd..c7699da91a35a65a5a1e33801f6ab106226fb19a 100644 |
--- a/cc/trees/layer_tree_host_impl.h |
+++ b/cc/trees/layer_tree_host_impl.h |
@@ -495,7 +495,7 @@ class CC_EXPORT LayerTreeHostImpl |
SharedBitmapManager* manager, |
int id); |
- void UpdateInnerViewportContainerSize(); |
+ void UpdateViewportContainerSizes(); |
// Virtual for testing. |
virtual void AnimateLayers(base::TimeTicks monotonic_time); |
@@ -534,6 +534,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, |