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

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

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments from Kent; merge. Created 4 years, 6 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: 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 f4a3cd26920f43d8ba0169c3bb18d6834ed96e57..71e25da7de7fde533a1c09210b6476efc01094e1 100644
--- a/third_party/WebKit/Source/web/LinkHighlightImpl.cpp
+++ b/third_party/WebKit/Source/web/LinkHighlightImpl.cpp
@@ -58,13 +58,15 @@
#include "web/WebSettingsImpl.h"
#include "web/WebViewImpl.h"
#include "wtf/CurrentTime.h"
+#include "wtf/PtrUtil.h"
#include "wtf/Vector.h"
+#include <memory>
namespace blink {
-PassOwnPtr<LinkHighlightImpl> LinkHighlightImpl::create(Node* node, WebViewImpl* owningWebViewImpl)
+std::unique_ptr<LinkHighlightImpl> LinkHighlightImpl::create(Node* node, WebViewImpl* owningWebViewImpl)
{
- return adoptPtr(new LinkHighlightImpl(node, owningWebViewImpl));
+ return wrapUnique(new LinkHighlightImpl(node, owningWebViewImpl));
}
LinkHighlightImpl::LinkHighlightImpl(Node* node, WebViewImpl* owningWebViewImpl)
@@ -80,12 +82,12 @@ LinkHighlightImpl::LinkHighlightImpl(Node* node, WebViewImpl* owningWebViewImpl)
DCHECK(owningWebViewImpl);
WebCompositorSupport* compositorSupport = Platform::current()->compositorSupport();
DCHECK(compositorSupport);
- m_contentLayer = adoptPtr(compositorSupport->createContentLayer(this));
- m_clipLayer = adoptPtr(compositorSupport->createLayer());
+ m_contentLayer = wrapUnique(compositorSupport->createContentLayer(this));
+ m_clipLayer = wrapUnique(compositorSupport->createLayer());
m_clipLayer->setTransformOrigin(WebFloatPoint3D());
m_clipLayer->addChild(m_contentLayer->layer());
- m_compositorPlayer = adoptPtr(CompositorFactory::current().createAnimationPlayer());
+ m_compositorPlayer = wrapUnique(CompositorFactory::current().createAnimationPlayer());
DCHECK(m_compositorPlayer);
m_compositorPlayer->setAnimationDelegate(this);
if (m_owningWebViewImpl->linkHighlightsTimeline())
@@ -301,7 +303,7 @@ void LinkHighlightImpl::startHighlightAnimationIfNeeded()
m_contentLayer->layer()->setOpacity(startOpacity);
- OwnPtr<CompositorFloatAnimationCurve> curve = adoptPtr(CompositorFactory::current().createFloatAnimationCurve());
+ std::unique_ptr<CompositorFloatAnimationCurve> curve = wrapUnique(CompositorFactory::current().createFloatAnimationCurve());
const auto easeType = CubicBezierTimingFunction::EaseType::EASE;
@@ -313,10 +315,10 @@ void LinkHighlightImpl::startHighlightAnimationIfNeeded()
// For layout tests we don't fade out.
curve->addCubicBezierKeyframe(CompositorFloatKeyframe(fadeDuration + extraDurationRequired, layoutTestMode() ? startOpacity : 0), easeType);
- OwnPtr<CompositorAnimation> animation = adoptPtr(CompositorFactory::current().createAnimation(*curve, CompositorTargetProperty::OPACITY));
+ std::unique_ptr<CompositorAnimation> animation = wrapUnique(CompositorFactory::current().createAnimation(*curve, CompositorTargetProperty::OPACITY));
m_contentLayer->layer()->setDrawsContent(true);
- m_compositorPlayer->addAnimation(animation.leakPtr());
+ m_compositorPlayer->addAnimation(animation.release());
invalidate();
m_owningWebViewImpl->scheduleAnimation();

Powered by Google App Engine
This is Rietveld 408576698