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

Unified Diff: third_party/WebKit/Source/core/layout/svg/SVGResources.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/core/layout/svg/SVGResources.cpp
diff --git a/third_party/WebKit/Source/core/layout/svg/SVGResources.cpp b/third_party/WebKit/Source/core/layout/svg/SVGResources.cpp
index 3f902156b378daa0fcc1a6667853c278efec29e7..fe15b73088be99170e7c2d132b9826f235e06247 100644
--- a/third_party/WebKit/Source/core/layout/svg/SVGResources.cpp
+++ b/third_party/WebKit/Source/core/layout/svg/SVGResources.cpp
@@ -30,8 +30,6 @@
#include "core/svg/SVGGradientElement.h"
#include "core/svg/SVGPatternElement.h"
#include "core/svg/SVGURIReference.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
#ifndef NDEBUG
#include <stdio.h>
@@ -197,15 +195,15 @@ bool SVGResources::hasResourceData() const
|| m_linkedResource;
}
-static inline SVGResources& ensureResources(std::unique_ptr<SVGResources>& resources)
+static inline SVGResources& ensureResources(OwnPtr<SVGResources>& resources)
{
if (!resources)
- resources = wrapUnique(new SVGResources);
+ resources = adoptPtr(new SVGResources);
return *resources.get();
}
-std::unique_ptr<SVGResources> SVGResources::buildResources(const LayoutObject* object, const SVGComputedStyle& style)
+PassOwnPtr<SVGResources> SVGResources::buildResources(const LayoutObject* object, const SVGComputedStyle& style)
{
ASSERT(object);
@@ -222,7 +220,7 @@ std::unique_ptr<SVGResources> SVGResources::buildResources(const LayoutObject* o
TreeScope& treeScope = element->treeScope();
SVGDocumentExtensions& extensions = element->document().accessSVGExtensions();
- std::unique_ptr<SVGResources> resources;
+ OwnPtr<SVGResources> resources;
if (clipperFilterMaskerTags().contains(tagName)) {
if (style.hasClipper()) {
AtomicString id = style.clipperResource();

Powered by Google App Engine
This is Rietveld 408576698