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

Side by Side Diff: third_party/WebKit/Source/platform/text/PlatformLocale.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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011,2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011,2012 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 15 matching lines...) Expand all
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "platform/text/PlatformLocale.h" 31 #include "platform/text/PlatformLocale.h"
32 32
33 #include "platform/text/DateTimeFormat.h" 33 #include "platform/text/DateTimeFormat.h"
34 #include "public/platform/Platform.h" 34 #include "public/platform/Platform.h"
35 #include "wtf/text/StringBuilder.h" 35 #include "wtf/text/StringBuilder.h"
36 #include <memory>
37 36
38 namespace blink { 37 namespace blink {
39 38
40 class DateTimeStringBuilder : private DateTimeFormat::TokenHandler { 39 class DateTimeStringBuilder : private DateTimeFormat::TokenHandler {
41 WTF_MAKE_NONCOPYABLE(DateTimeStringBuilder); 40 WTF_MAKE_NONCOPYABLE(DateTimeStringBuilder);
42 public: 41 public:
43 // The argument objects must be alive until this object dies. 42 // The argument objects must be alive until this object dies.
44 DateTimeStringBuilder(Locale&, const DateComponents&); 43 DateTimeStringBuilder(Locale&, const DateComponents&);
45 44
46 bool build(const String&); 45 bool build(const String&);
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 m_builder.append(text); 169 m_builder.append(text);
171 } 170 }
172 171
173 String DateTimeStringBuilder::toString() 172 String DateTimeStringBuilder::toString()
174 { 173 {
175 return m_builder.toString(); 174 return m_builder.toString();
176 } 175 }
177 176
178 Locale& Locale::defaultLocale() 177 Locale& Locale::defaultLocale()
179 { 178 {
180 static Locale* locale = Locale::create(defaultLanguage()).release(); 179 static Locale* locale = Locale::create(defaultLanguage()).leakPtr();
181 ASSERT(isMainThread()); 180 ASSERT(isMainThread());
182 return *locale; 181 return *locale;
183 } 182 }
184 183
185 Locale::~Locale() 184 Locale::~Locale()
186 { 185 {
187 } 186 }
188 187
189 String Locale::queryString(WebLocalizedString::Name name) 188 String Locale::queryString(WebLocalizedString::Name name)
190 { 189 {
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 builder.build(formatType == FormatTypeShort ? dateTimeFormatWithoutSecon ds() : dateTimeFormatWithSeconds()); 443 builder.build(formatType == FormatTypeShort ? dateTimeFormatWithoutSecon ds() : dateTimeFormatWithSeconds());
445 break; 444 break;
446 case DateComponents::Invalid: 445 case DateComponents::Invalid:
447 ASSERT_NOT_REACHED(); 446 ASSERT_NOT_REACHED();
448 break; 447 break;
449 } 448 }
450 return builder.toString(); 449 return builder.toString();
451 } 450 }
452 451
453 } // namespace blink 452 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698