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

Side by Side Diff: third_party/WebKit/Source/wtf/text/icu/CollatorICU.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2008 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 11 matching lines...) Expand all
22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */ 27 */
28 28
29 #include "wtf/text/Collator.h" 29 #include "wtf/text/Collator.h"
30 30
31 #include "wtf/Assertions.h" 31 #include "wtf/Assertions.h"
32 #include "wtf/PtrUtil.h"
32 #include "wtf/StringExtras.h" 33 #include "wtf/StringExtras.h"
33 #include "wtf/Threading.h" 34 #include "wtf/Threading.h"
34 #include "wtf/ThreadingPrimitives.h" 35 #include "wtf/ThreadingPrimitives.h"
36 #include <memory>
35 #include <stdlib.h> 37 #include <stdlib.h>
36 #include <string.h> 38 #include <string.h>
37 #include <unicode/ucol.h> 39 #include <unicode/ucol.h>
38 40
39 namespace WTF { 41 namespace WTF {
40 42
41 static UCollator* cachedCollator; 43 static UCollator* cachedCollator;
42 static char cachedEquivalentLocale[Collator::ulocFullnameCapacity]; 44 static char cachedEquivalentLocale[Collator::ulocFullnameCapacity];
43 static Mutex& cachedCollatorMutex() 45 static Mutex& cachedCollatorMutex()
44 { 46 {
45 DEFINE_THREAD_SAFE_STATIC_LOCAL(Mutex, mutex, new Mutex); 47 DEFINE_THREAD_SAFE_STATIC_LOCAL(Mutex, mutex, new Mutex);
46 return mutex; 48 return mutex;
47 } 49 }
48 50
49 Collator::Collator(const char* locale) 51 Collator::Collator(const char* locale)
50 : m_collator(0) 52 : m_collator(0)
51 , m_locale(locale ? strdup(locale) : 0) 53 , m_locale(locale ? strdup(locale) : 0)
52 , m_lowerFirst(false) 54 , m_lowerFirst(false)
53 { 55 {
54 setEquivalentLocale(m_locale, m_equivalentLocale); 56 setEquivalentLocale(m_locale, m_equivalentLocale);
55 } 57 }
56 58
57 PassOwnPtr<Collator> Collator::userDefault() 59 std::unique_ptr<Collator> Collator::userDefault()
58 { 60 {
59 return adoptPtr(new Collator(0)); 61 return wrapUnique(new Collator(0));
60 } 62 }
61 63
62 Collator::~Collator() 64 Collator::~Collator()
63 { 65 {
64 releaseCollator(); 66 releaseCollator();
65 free(m_locale); 67 free(m_locale);
66 } 68 }
67 69
68 void Collator::setOrderLowerFirst(bool lowerFirst) 70 void Collator::setOrderLowerFirst(bool lowerFirst)
69 { 71 {
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 void Collator::setEquivalentLocale(const char* locale, char* equivalentLocale) 131 void Collator::setEquivalentLocale(const char* locale, char* equivalentLocale)
130 { 132 {
131 UErrorCode status = U_ZERO_ERROR; 133 UErrorCode status = U_ZERO_ERROR;
132 UBool isAvailable; 134 UBool isAvailable;
133 ucol_getFunctionalEquivalent(equivalentLocale, ulocFullnameCapacity, "collat ion", locale, &isAvailable, &status); 135 ucol_getFunctionalEquivalent(equivalentLocale, ulocFullnameCapacity, "collat ion", locale, &isAvailable, &status);
134 if (U_FAILURE(status)) 136 if (U_FAILURE(status))
135 strcpy(equivalentLocale, "root"); 137 strcpy(equivalentLocale, "root");
136 } 138 }
137 139
138 } // namespace WTF 140 } // namespace WTF
OLDNEW
« 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