| OLD | NEW |
| 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 Loading... |
| 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> |
| 36 | 37 |
| 37 namespace blink { | 38 namespace blink { |
| 38 | 39 |
| 39 class DateTimeStringBuilder : private DateTimeFormat::TokenHandler { | 40 class DateTimeStringBuilder : private DateTimeFormat::TokenHandler { |
| 40 WTF_MAKE_NONCOPYABLE(DateTimeStringBuilder); | 41 WTF_MAKE_NONCOPYABLE(DateTimeStringBuilder); |
| 41 public: | 42 public: |
| 42 // The argument objects must be alive until this object dies. | 43 // The argument objects must be alive until this object dies. |
| 43 DateTimeStringBuilder(Locale&, const DateComponents&); | 44 DateTimeStringBuilder(Locale&, const DateComponents&); |
| 44 | 45 |
| 45 bool build(const String&); | 46 bool build(const String&); |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 169 m_builder.append(text); | 170 m_builder.append(text); |
| 170 } | 171 } |
| 171 | 172 |
| 172 String DateTimeStringBuilder::toString() | 173 String DateTimeStringBuilder::toString() |
| 173 { | 174 { |
| 174 return m_builder.toString(); | 175 return m_builder.toString(); |
| 175 } | 176 } |
| 176 | 177 |
| 177 Locale& Locale::defaultLocale() | 178 Locale& Locale::defaultLocale() |
| 178 { | 179 { |
| 179 static Locale* locale = Locale::create(defaultLanguage()).leakPtr(); | 180 static Locale* locale = Locale::create(defaultLanguage()).release(); |
| 180 ASSERT(isMainThread()); | 181 ASSERT(isMainThread()); |
| 181 return *locale; | 182 return *locale; |
| 182 } | 183 } |
| 183 | 184 |
| 184 Locale::~Locale() | 185 Locale::~Locale() |
| 185 { | 186 { |
| 186 } | 187 } |
| 187 | 188 |
| 188 String Locale::queryString(WebLocalizedString::Name name) | 189 String Locale::queryString(WebLocalizedString::Name name) |
| 189 { | 190 { |
| (...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 443 builder.build(formatType == FormatTypeShort ? dateTimeFormatWithoutSecon
ds() : dateTimeFormatWithSeconds()); | 444 builder.build(formatType == FormatTypeShort ? dateTimeFormatWithoutSecon
ds() : dateTimeFormatWithSeconds()); |
| 444 break; | 445 break; |
| 445 case DateComponents::Invalid: | 446 case DateComponents::Invalid: |
| 446 ASSERT_NOT_REACHED(); | 447 ASSERT_NOT_REACHED(); |
| 447 break; | 448 break; |
| 448 } | 449 } |
| 449 return builder.toString(); | 450 return builder.toString(); |
| 450 } | 451 } |
| 451 | 452 |
| 452 } // namespace blink | 453 } // namespace blink |
| OLD | NEW |