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

Unified Diff: third_party/WebKit/Source/wtf/text/icu/CollatorICU.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
« no previous file with comments | « third_party/WebKit/Source/wtf/text/TextPosition.cpp ('k') | third_party/WebKit/Source/wtf/wtf.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/wtf/text/icu/CollatorICU.cpp
diff --git a/third_party/WebKit/Source/wtf/text/icu/CollatorICU.cpp b/third_party/WebKit/Source/wtf/text/icu/CollatorICU.cpp
index 0bfe2b60a96ea6c4212556e57518fe48af8a4671..f5efcee32e0fc38472729a8417e8cfc73d7ccfe3 100644
--- a/third_party/WebKit/Source/wtf/text/icu/CollatorICU.cpp
+++ b/third_party/WebKit/Source/wtf/text/icu/CollatorICU.cpp
@@ -29,11 +29,9 @@
#include "wtf/text/Collator.h"
#include "wtf/Assertions.h"
-#include "wtf/PtrUtil.h"
#include "wtf/StringExtras.h"
#include "wtf/Threading.h"
#include "wtf/ThreadingPrimitives.h"
-#include <memory>
#include <stdlib.h>
#include <string.h>
#include <unicode/ucol.h>
@@ -56,9 +54,9 @@ Collator::Collator(const char* locale)
setEquivalentLocale(m_locale, m_equivalentLocale);
}
-std::unique_ptr<Collator> Collator::userDefault()
+PassOwnPtr<Collator> Collator::userDefault()
{
- return wrapUnique(new Collator(0));
+ return adoptPtr(new Collator(0));
}
Collator::~Collator()
« no previous file with comments | « third_party/WebKit/Source/wtf/text/TextPosition.cpp ('k') | third_party/WebKit/Source/wtf/wtf.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698