| 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 3970fda65af89484fb5f6f40b4b09e3bd630ec5b..b3a55dfc591f80e6fba2eadabccdb1a51f93f1be 100644
|
| --- a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
|
| +++ b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
|
| @@ -255,18 +255,17 @@ void ScrollAnimatorCompositorCoordinator::updateImplOnlyCompositorAnimations() {
|
| return;
|
|
|
| GraphicsLayer* layer = getScrollableArea()->layerForScrolling();
|
| - CompositorAnimationTimeline* timeline =
|
| - getScrollableArea()->compositorAnimationTimeline();
|
| - if (layer && timeline && !timeline->compositorAnimationHost().isNull()) {
|
| - CompositorAnimationHost host = timeline->compositorAnimationHost();
|
| - cc::ElementId elementId = layer->platformLayer()->elementId();
|
| + CompositorAnimationHost* host =
|
| + getScrollableArea()->compositorAnimationHost();
|
| + if (layer && host) {
|
| + CompositorElementId elementId = layer->platformLayer()->elementId();
|
| if (!m_implOnlyAnimationAdjustment.isZero()) {
|
| - host.adjustImplOnlyScrollOffsetAnimation(
|
| + host->adjustImplOnlyScrollOffsetAnimation(
|
| elementId, gfx::Vector2dF(m_implOnlyAnimationAdjustment.width(),
|
| m_implOnlyAnimationAdjustment.height()));
|
| }
|
| if (m_implOnlyAnimationTakeover)
|
| - host.takeOverImplOnlyScrollOffsetAnimation(elementId);
|
| + host->takeOverImplOnlyScrollOffsetAnimation(elementId);
|
| }
|
| m_implOnlyAnimationAdjustment = IntSize();
|
| m_implOnlyAnimationTakeover = false;
|
|
|