Index: third_party/WebKit/Source/web/WebViewImpl.cpp |
diff --git a/third_party/WebKit/Source/web/WebViewImpl.cpp b/third_party/WebKit/Source/web/WebViewImpl.cpp |
index 447d451843d430d612d2f3822b3401d34b2c2617..91b98693426b7bc2a78c070fa70a12906cbd4fd6 100644 |
--- a/third_party/WebKit/Source/web/WebViewImpl.cpp |
+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp |
@@ -96,6 +96,7 @@ |
#include "modules/encryptedmedia/MediaKeysController.h" |
#include "modules/storage/StorageNamespaceController.h" |
#include "modules/webgl/WebGLRenderingContext.h" |
+#include "platform/CompositorFactory.h" |
#include "platform/ContextMenu.h" |
#include "platform/ContextMenuItem.h" |
#include "platform/Cursor.h" |
@@ -4353,13 +4354,13 @@ void WebViewImpl::scheduleAnimation() |
void WebViewImpl::attachCompositorAnimationTimeline(WebCompositorAnimationTimeline* timeline) |
{ |
if (m_layerTreeView) |
- m_layerTreeView->attachCompositorAnimationTimeline(timeline); |
+ m_layerTreeView->attachCompositorAnimationTimeline(timeline->animationTimeline()); |
} |
void WebViewImpl::detachCompositorAnimationTimeline(WebCompositorAnimationTimeline* timeline) |
{ |
if (m_layerTreeView) |
- m_layerTreeView->detachCompositorAnimationTimeline(timeline); |
+ m_layerTreeView->detachCompositorAnimationTimeline(timeline->animationTimeline()); |
} |
void WebViewImpl::initializeLayerTreeView() |
@@ -4381,8 +4382,7 @@ void WebViewImpl::initializeLayerTreeView() |
ASSERT(m_layerTreeView || !m_client || m_client->allowsBrokenNullLayerTreeView()); |
if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled() && Platform::current()->isThreadedAnimationEnabled() && m_layerTreeView) { |
- ASSERT(Platform::current()->compositorSupport()); |
- m_linkHighlightsTimeline = adoptPtr(Platform::current()->compositorSupport()->createAnimationTimeline()); |
+ m_linkHighlightsTimeline = adoptPtr(CompositorFactory::current().createAnimationTimeline()); |
attachCompositorAnimationTimeline(m_linkHighlightsTimeline.get()); |
} |