Index: third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp |
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp |
index 3a90c1ec967b68053b78334e54f73bb9d9a61b1b..d35fe84952b0240996fbe3a25a88f098afe18104 100644 |
--- a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp |
+++ b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp |
@@ -163,9 +163,10 @@ void ScrollAnimatorCompositorCoordinator::compositorAnimationFinished( |
} |
} |
-void ScrollAnimatorCompositorCoordinator::reattachCompositorPlayerIfNeeded( |
+bool ScrollAnimatorCompositorCoordinator::reattachCompositorPlayerIfNeeded( |
CompositorAnimationTimeline* timeline) |
{ |
+ bool reattached = false; |
int compositorAnimationAttachedToLayerId = 0; |
if (scrollableArea()->layerForScrolling()) |
compositorAnimationAttachedToLayerId = scrollableArea()->layerForScrolling()->platformLayer()->id(); |
@@ -184,10 +185,13 @@ void ScrollAnimatorCompositorCoordinator::reattachCompositorPlayerIfNeeded( |
timeline->playerAttached(*this); |
m_compositorPlayer->attachLayer( |
scrollableArea()->layerForScrolling()->platformLayer()); |
+ reattached = true; |
} |
m_compositorAnimationAttachedToLayerId = compositorAnimationAttachedToLayerId; |
} |
} |
+ |
+ return reattached; |
} |
void ScrollAnimatorCompositorCoordinator::notifyAnimationStarted( |