| 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 5e190f1da77090818b977b81e85e42478eb88a0c..eac531d08a4bac58836b024b9056fa7749974933 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"
|
| @@ -4348,16 +4349,16 @@ void WebViewImpl::scheduleAnimation()
|
| m_client->scheduleAnimation();
|
| }
|
|
|
| -void WebViewImpl::attachCompositorAnimationTimeline(WebCompositorAnimationTimeline* timeline)
|
| +void WebViewImpl::attachCompositorAnimationTimeline(CompositorAnimationTimeline* timeline)
|
| {
|
| if (m_layerTreeView)
|
| - m_layerTreeView->attachCompositorAnimationTimeline(timeline);
|
| + m_layerTreeView->attachCompositorAnimationTimeline(timeline->animationTimeline());
|
| }
|
|
|
| -void WebViewImpl::detachCompositorAnimationTimeline(WebCompositorAnimationTimeline* timeline)
|
| +void WebViewImpl::detachCompositorAnimationTimeline(CompositorAnimationTimeline* timeline)
|
| {
|
| if (m_layerTreeView)
|
| - m_layerTreeView->detachCompositorAnimationTimeline(timeline);
|
| + m_layerTreeView->detachCompositorAnimationTimeline(timeline->animationTimeline());
|
| }
|
|
|
| void WebViewImpl::initializeLayerTreeView()
|
| @@ -4379,8 +4380,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());
|
| }
|
|
|
|
|