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

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: Rebase. Fix copyrights and years. Created 4 years, 10 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
« no previous file with comments | « third_party/WebKit/Source/web/WebViewImpl.h ('k') | third_party/WebKit/public/blink_headers.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 b3c81c80e1dd21a42a4e9e72d12a83cb0699c217..19ffcffc131450324c1b8104bd80d49beaa0709a 100644
--- a/third_party/WebKit/Source/web/WebViewImpl.cpp
+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp
@@ -112,6 +112,7 @@
#include "platform/exported/WebActiveGestureAnimation.h"
#include "platform/fonts/FontCache.h"
#include "platform/graphics/Color.h"
+#include "platform/graphics/CompositorFactory.h"
#include "platform/graphics/FirstPaintInvalidationTracking.h"
#include "platform/graphics/GraphicsContext.h"
#include "platform/graphics/Image.h"
@@ -4281,16 +4282,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()
@@ -4312,8 +4313,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());
}
« no previous file with comments | « third_party/WebKit/Source/web/WebViewImpl.h ('k') | third_party/WebKit/public/blink_headers.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698