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

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

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 81153985a32d11cde9630938bb6b095775bbd364..9df40f3ade8c4a254b392091a4f681f211cce7f7 100644
--- a/third_party/WebKit/Source/web/LinkHighlightImpl.cpp
+++ b/third_party/WebKit/Source/web/LinkHighlightImpl.cpp
@@ -59,15 +59,13 @@
#include "web/WebSettingsImpl.h"
#include "web/WebViewImpl.h"
#include "wtf/CurrentTime.h"
-#include "wtf/PtrUtil.h"
#include "wtf/Vector.h"
-#include <memory>
namespace blink {
-std::unique_ptr<LinkHighlightImpl> LinkHighlightImpl::create(Node* node, WebViewImpl* owningWebViewImpl)
+PassOwnPtr<LinkHighlightImpl> LinkHighlightImpl::create(Node* node, WebViewImpl* owningWebViewImpl)
{
- return wrapUnique(new LinkHighlightImpl(node, owningWebViewImpl));
+ return adoptPtr(new LinkHighlightImpl(node, owningWebViewImpl));
}
LinkHighlightImpl::LinkHighlightImpl(Node* node, WebViewImpl* owningWebViewImpl)
@@ -83,8 +81,8 @@ LinkHighlightImpl::LinkHighlightImpl(Node* node, WebViewImpl* owningWebViewImpl)
DCHECK(owningWebViewImpl);
WebCompositorSupport* compositorSupport = Platform::current()->compositorSupport();
DCHECK(compositorSupport);
- m_contentLayer = wrapUnique(compositorSupport->createContentLayer(this));
- m_clipLayer = wrapUnique(compositorSupport->createLayer());
+ m_contentLayer = adoptPtr(compositorSupport->createContentLayer(this));
+ m_clipLayer = adoptPtr(compositorSupport->createLayer());
m_clipLayer->setTransformOrigin(WebFloatPoint3D());
m_clipLayer->addChild(m_contentLayer->layer());
@@ -304,7 +302,7 @@ void LinkHighlightImpl::startHighlightAnimationIfNeeded()
m_contentLayer->layer()->setOpacity(startOpacity);
- std::unique_ptr<CompositorFloatAnimationCurve> curve = CompositorFloatAnimationCurve::create();
+ OwnPtr<CompositorFloatAnimationCurve> curve = CompositorFloatAnimationCurve::create();
const auto easeType = CubicBezierTimingFunction::EaseType::EASE;
@@ -316,10 +314,10 @@ void LinkHighlightImpl::startHighlightAnimationIfNeeded()
// For layout tests we don't fade out.
curve->addCubicBezierKeyframe(CompositorFloatKeyframe(fadeDuration + extraDurationRequired, layoutTestMode() ? startOpacity : 0), easeType);
- std::unique_ptr<CompositorAnimation> animation = CompositorAnimation::create(*curve, CompositorTargetProperty::OPACITY, 0, 0);
+ OwnPtr<CompositorAnimation> animation = CompositorAnimation::create(*curve, CompositorTargetProperty::OPACITY, 0, 0);
m_contentLayer->layer()->setDrawsContent(true);
- m_compositorPlayer->addAnimation(animation.release());
+ m_compositorPlayer->addAnimation(animation.leakPtr());
invalidate();
m_owningWebViewImpl->scheduleAnimation();
« no previous file with comments | « third_party/WebKit/Source/web/LinkHighlightImpl.h ('k') | third_party/WebKit/Source/web/LinkHighlightImplTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698