Change WebLayer::addAnimation to transfer ownership of WebAnimation.

Source/core/rendering/RenderLayerBacking.cpp

 /*
  * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 1696 matching lines @@
 {
     bool hasTransform = renderer()->isBox() && keyframes.containsProperty(CSSPropertyWebkitTransform);
     IntSize boxSize;
     if (hasTransform)
         boxSize = toRenderBox(renderer())->pixelSnappedBorderBoxRect().size();
     WebAnimations animations(m_animationProvider->startAnimation(timeOffset, anim, keyframes, hasTransform, boxSize));
     if (animations.isEmpty())
         return false;
 
     bool didAnimate = false;
-    if (animations.m_transformAnimation && m_graphicsLayer->addAnimation(animations.m_transformAnimation.get()))
+    if (animations.m_transformAnimation && m_graphicsLayer->addAnimation(animations.m_transformAnimation.release()))

[Ian Vollick, 2013/09/20 15:19:02]

This will need to be rebased on top of your previous patch, of course.

[dshwang, 2013/09/20 15:22:20]

Yes, after CL 24198009 is landed, I'll rebase to upstream.

         didAnimate = true;
-    if (animations.m_opacityAnimation && m_graphicsLayer->addAnimation(animations.m_opacityAnimation.get()))
+    if (animations.m_opacityAnimation && m_graphicsLayer->addAnimation(animations.m_opacityAnimation.release()))
         didAnimate = true;
-    if (animations.m_filterAnimation && m_graphicsLayer->addAnimation(animations.m_filterAnimation.get()))
+    if (animations.m_filterAnimation && m_graphicsLayer->addAnimation(animations.m_filterAnimation.release()))
         didAnimate = true;
 
     return didAnimate;
 }
 
 void RenderLayerBacking::animationPaused(double timeOffset, const String& animationName)
 {
     int animationId = m_animationProvider->getWebAnimationId(animationName);
     if (animationId)
         m_graphicsLayer->pauseAnimation(animationId, timeOffset);
@@ skipping 16 matching lines @@
     }
     float fromOpacity = 0;
     float toOpacity = 0;
     if (property == CSSPropertyOpacity) {
         fromOpacity = compositingOpacity(fromStyle->opacity());
         toOpacity = compositingOpacity(toStyle->opacity());
     }
     WebAnimations animations(m_animationProvider->startTransition(timeOffset, property, fromStyle,
         toStyle, m_owningLayer->hasTransform(), m_owningLayer->hasFilter(), boxSize, fromOpacity, toOpacity));
     bool didAnimate = false;
-    if (animations.m_transformAnimation && m_graphicsLayer->addAnimation(animations.m_transformAnimation.get())) {
+    if (animations.m_transformAnimation && m_graphicsLayer->addAnimation(animations.m_transformAnimation.release())) {
         // To ensure that the correct transform is visible when the animation ends, also set the final transform.
         updateTransform(toStyle);
         didAnimate = true;
     }
-    if (animations.m_opacityAnimation && m_graphicsLayer->addAnimation(animations.m_opacityAnimation.get())) {
+    if (animations.m_opacityAnimation && m_graphicsLayer->addAnimation(animations.m_opacityAnimation.release())) {
         // To ensure that the correct opacity is visible when the animation ends, also set the final opacity.
         updateOpacity(toStyle);
         didAnimate = true;
     }
-    if (animations.m_filterAnimation && m_graphicsLayer->addAnimation(animations.m_filterAnimation.get())) {
+    if (animations.m_filterAnimation && m_graphicsLayer->addAnimation(animations.m_filterAnimation.release())) {
         // To ensure that the correct filter is visible when the animation ends, also set the final filter.
         updateFilters(toStyle);
         didAnimate = true;
     }
 
     return didAnimate;
 }
 
 void RenderLayerBacking::transitionPaused(double timeOffset, CSSPropertyID property)
 {
@@ skipping 100 matching lines @@
     } else if (graphicsLayer == m_scrollingContentsLayer.get()) {
         name = "Scrolling Contents Layer";
     } else {
         ASSERT_NOT_REACHED();
     }
 
     return name;
 }
 
 } // namespace WebCore