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 26 matching lines...) Expand all Loading... |
37 #include "wtf/DateMath.h" | 37 #include "wtf/DateMath.h" |
38 #include "wtf/PassOwnPtr.h" | 38 #include "wtf/PassOwnPtr.h" |
39 #include "wtf/text/StringBuffer.h" | 39 #include "wtf/text/StringBuffer.h" |
40 #include "wtf/text/StringBuilder.h" | 40 #include "wtf/text/StringBuilder.h" |
41 | 41 |
42 using namespace icu; | 42 using namespace icu; |
43 using namespace std; | 43 using namespace std; |
44 | 44 |
45 namespace WebCore { | 45 namespace WebCore { |
46 | 46 |
47 PassOwnPtr<Locale> Locale::create(const AtomicString& locale) | 47 PassOwnPtr<Locale> Locale::create(const String& locale) |
48 { | 48 { |
49 return LocaleICU::create(locale.string().utf8().data()); | 49 return LocaleICU::create(locale.utf8().data()); |
50 } | 50 } |
51 | 51 |
52 LocaleICU::LocaleICU(const char* locale) | 52 LocaleICU::LocaleICU(const char* locale) |
53 : m_locale(locale) | 53 : m_locale(locale) |
54 , m_numberFormat(0) | 54 , m_numberFormat(0) |
55 , m_shortDateFormat(0) | 55 , m_shortDateFormat(0) |
56 , m_didCreateDecimalFormat(false) | 56 , m_didCreateDecimalFormat(false) |
57 , m_didCreateShortDateFormat(false) | 57 , m_didCreateShortDateFormat(false) |
58 , m_firstDayOfWeek(0) | 58 , m_firstDayOfWeek(0) |
59 , m_mediumTimeFormat(0) | 59 , m_mediumTimeFormat(0) |
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
419 } | 419 } |
420 | 420 |
421 const Vector<String>& LocaleICU::timeAMPMLabels() | 421 const Vector<String>& LocaleICU::timeAMPMLabels() |
422 { | 422 { |
423 initializeDateTimeFormat(); | 423 initializeDateTimeFormat(); |
424 return m_timeAMPMLabels; | 424 return m_timeAMPMLabels; |
425 } | 425 } |
426 | 426 |
427 } // namespace WebCore | 427 } // namespace WebCore |
428 | 428 |
OLD | NEW |