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

Unified Diff: Source/web/LinkHighlight.cpp

Issue 23834010: Change WebLayer::addAnimation to transfer ownership of WebAnimation. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Pass ownership of WebAnimation under ANIMATION_OWNERSHIP_NOT_TRANSFER guard. Created 7 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
Index: Source/web/LinkHighlight.cpp
diff --git a/Source/web/LinkHighlight.cpp b/Source/web/LinkHighlight.cpp
index a42601978dd2ad3539e70f80e80ffbf5fe126755..add75010e14510b4e3301709da927465cd6e19f6 100644
--- a/Source/web/LinkHighlight.cpp
+++ b/Source/web/LinkHighlight.cpp
@@ -271,10 +271,14 @@ void LinkHighlight::startHighlightAnimationIfNeeded()
// For layout tests we don't fade out.
curve->add(WebFloatKeyframe(fadeDuration + extraDurationRequired, WebKit::layoutTestMode() ? startOpacity : 0));
- m_animation = adoptPtr(compositorSupport->createAnimation(*curve, WebAnimation::TargetPropertyOpacity));
+ OwnPtr<WebAnimation> animation = adoptPtr(compositorSupport->createAnimation(*curve, WebAnimation::TargetPropertyOpacity));
m_contentLayer->layer()->setDrawsContent(true);
- m_contentLayer->layer()->addAnimation(m_animation.get());
+#if defined(ANIMATION_OWNERSHIP_NOT_TRANSFER)
+ m_contentLayer->layer()->addAnimation(animation.get());
+#else
+ m_contentLayer->layer()->addAnimation(animation.leakPtr());
+#endif
invalidate();
m_owningWebViewImpl->scheduleAnimation();

Powered by Google App Engine
This is Rietveld 408576698