| 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 20b0fe7762fee89c47393ac1d12969143aa10823..115cfc13ca596d10f0e0483312cba7f782d8f0d6 100644
|
| --- a/third_party/WebKit/Source/web/LinkHighlightImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/LinkHighlightImpl.cpp
|
| @@ -84,7 +84,7 @@ LinkHighlightImpl::LinkHighlightImpl(Node* node, WebViewImpl* owningWebViewImpl)
|
| 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())
|
| @@ -295,7 +295,7 @@ void LinkHighlightImpl::startHighlightAnimationIfNeeded()
|
|
|
| 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.
|
| @@ -305,7 +305,7 @@ void LinkHighlightImpl::startHighlightAnimationIfNeeded()
|
| // 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())
|
|
|