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

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

Issue 1410873003: CC Animations: Fix isThreadedAnimationEnabled mode for layout tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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/platform/scroll/ProgrammaticScrollAnimator.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/web/LinkHighlightImpl.cpp
diff --git a/third_party/WebKit/Source/web/LinkHighlightImpl.cpp b/third_party/WebKit/Source/web/LinkHighlightImpl.cpp
index b7cb039cf9c1eb020737225b15e5105cf30536ec..7c6dcfd2def3930111ab2d529feff78b1cdd556d 100644
--- a/third_party/WebKit/Source/web/LinkHighlightImpl.cpp
+++ b/third_party/WebKit/Source/web/LinkHighlightImpl.cpp
@@ -82,11 +82,12 @@ LinkHighlightImpl::LinkHighlightImpl(Node* node, WebViewImpl* owningWebViewImpl)
m_clipLayer = adoptPtr(compositorSupport->createLayer());
m_clipLayer->setTransformOrigin(WebFloatPoint3D());
m_clipLayer->addChild(m_contentLayer->layer());
- if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled() && Platform::current()->isThreadedAnimationEnabled()) {
+ if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled()) {
m_compositorPlayer = adoptPtr(compositorSupport->createAnimationPlayer());
ASSERT(m_compositorPlayer);
m_compositorPlayer->setAnimationDelegate(this);
- m_owningWebViewImpl->linkHighlightsTimeline()->playerAttached(*this);
+ if (m_owningWebViewImpl->linkHighlightsTimeline())
+ m_owningWebViewImpl->linkHighlightsTimeline()->playerAttached(*this);
m_compositorPlayer->attachLayer(m_contentLayer->layer());
} else {
owningWebViewImpl->registerForAnimations(m_contentLayer->layer());
@@ -102,7 +103,8 @@ LinkHighlightImpl::~LinkHighlightImpl()
{
if (m_compositorPlayer) {
m_compositorPlayer->detachLayer();
- m_owningWebViewImpl->linkHighlightsTimeline()->playerDestroyed(*this);
+ if (m_owningWebViewImpl->linkHighlightsTimeline())
+ m_owningWebViewImpl->linkHighlightsTimeline()->playerDestroyed(*this);
m_compositorPlayer->setAnimationDelegate(nullptr);
}
m_compositorPlayer.clear();
« no previous file with comments | « third_party/WebKit/Source/platform/scroll/ProgrammaticScrollAnimator.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698