Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(633)

Unified Diff: third_party/WebKit/Source/web/WebViewImpl.cpp

Issue 1616653002: CC Animation: Move files from cc_blink to Source/platform/animation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix ScrollAnimatorCompositorCoordinator for MSVC. Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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());
}

Powered by Google App Engine
This is Rietveld 408576698