Blink Compositor Animation: Use PassOwnPtr in CompositorFactory.

third_party/WebKit/Source/web/LinkHighlightImpl.cpp

 /*
  * Copyright (C) 2012 Google 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
@@ skipping 66 matching lines @@
 {
     ASSERT(m_node);
     ASSERT(owningWebViewImpl);
     WebCompositorSupport* compositorSupport = Platform::current()->compositorSupport();
     ASSERT(compositorSupport);
     m_contentLayer = adoptPtr(compositorSupport->createContentLayer(this));
     m_clipLayer = adoptPtr(compositorSupport->createLayer());
     m_clipLayer->setTransformOrigin(WebFloatPoint3D());
     m_clipLayer->addChild(m_contentLayer->layer());
     if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled()) {
-        m_compositorPlayer = adoptPtr(CompositorFactory::current().createAnimationPlayer());
+        m_compositorPlayer = CompositorFactory::current().createAnimationPlayer();
         ASSERT(m_compositorPlayer);
         m_compositorPlayer->setAnimationDelegate(this);
         if (m_owningWebViewImpl->linkHighlightsTimeline())
             m_owningWebViewImpl->linkHighlightsTimeline()->playerAttached(*this);
         m_compositorPlayer->attachLayer(m_contentLayer->layer());
     } else {
         owningWebViewImpl->registerForAnimations(m_contentLayer->layer());
         m_contentLayer->layer()->setAnimationDelegate(this);
     }
     m_contentLayer->layer()->setDrawsContent(true);
@@ skipping 190 matching lines @@
         return;
 
     m_isAnimating = true;
     const float startOpacity = 1;
     // FIXME: Should duration be configurable?
     const float fadeDuration = 0.1f;
     const float minPreFadeDuration = 0.1f;
 
     m_contentLayer->layer()->setOpacity(startOpacity);
 
-    OwnPtr<CompositorFloatAnimationCurve> curve = adoptPtr(CompositorFactory::current().createFloatAnimationCurve());
+    OwnPtr<CompositorFloatAnimationCurve> curve = CompositorFactory::current().createFloatAnimationCurve();
 
     curve->add(CompositorFloatKeyframe(0, startOpacity));
     // Make sure we have displayed for at least minPreFadeDuration before starting to fade out.
     float extraDurationRequired = std::max(0.f, minPreFadeDuration - static_cast<float>(monotonicallyIncreasingTime() - m_startTime));
     if (extraDurationRequired)
         curve->add(CompositorFloatKeyframe(extraDurationRequired, startOpacity));
     // For layout tests we don't fade out.
     curve->add(CompositorFloatKeyframe(fadeDuration + extraDurationRequired, layoutTestMode() ? startOpacity : 0));
 
-    OwnPtr<CompositorAnimation> animation = adoptPtr(CompositorFactory::current().createAnimation(*curve, CompositorAnimation::TargetPropertyOpacity));
+    OwnPtr<CompositorAnimation> animation = CompositorFactory::current().createAnimation(*curve, CompositorAnimation::TargetPropertyOpacity);
 
     m_contentLayer->layer()->setDrawsContent(true);
     if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled())
         m_compositorPlayer->addAnimation(animation.leakPtr());
     else
         m_contentLayer->layer()->addAnimation(animation->releaseCCAnimation());
 
     invalidate();
     m_owningWebViewImpl->scheduleAnimation();
 }
@@ skipping 61 matching lines @@
 {
     return clipLayer();
 }
 
 CompositorAnimationPlayer* LinkHighlightImpl::compositorPlayer() const
 {
     return m_compositorPlayer.get();
 }
 
 } // namespace blink