diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-03 09:55:33 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-03 09:55:33 +0100 |
commit | cd44dc59cdfc39534aef4d417e9f3c412e3be139 (patch) | |
tree | 8d89889ba95ed6ec9322e733846cc9cce9d7dff1 /Source/JavaScriptCore/wtf/unicode | |
parent | d11f84f5b5cdc0d92a08af01b13472fdd5f9acb9 (diff) | |
download | qtwebkit-cd44dc59cdfc39534aef4d417e9f3c412e3be139.tar.gz |
Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 (http://svn.webkit.org/repository/webkit/trunk@106560)
Diffstat (limited to 'Source/JavaScriptCore/wtf/unicode')
-rw-r--r-- | Source/JavaScriptCore/wtf/unicode/CharacterNames.h | 1 | ||||
-rw-r--r-- | Source/JavaScriptCore/wtf/unicode/Collator.h | 8 | ||||
-rw-r--r-- | Source/JavaScriptCore/wtf/unicode/UTF8.h | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/Source/JavaScriptCore/wtf/unicode/CharacterNames.h b/Source/JavaScriptCore/wtf/unicode/CharacterNames.h index 10fdbf0ef..4acb5f0b1 100644 --- a/Source/JavaScriptCore/wtf/unicode/CharacterNames.h +++ b/Source/JavaScriptCore/wtf/unicode/CharacterNames.h @@ -72,6 +72,7 @@ const UChar rightToLeftEmbed = 0x202B; const UChar rightToLeftMark = 0x200F; const UChar rightToLeftOverride = 0x202E; const UChar sesameDot = 0xFE45; +const UChar smallLetterSharpS = 0x00DF; const UChar softHyphen = 0x00AD; const UChar space = 0x0020; const UChar tibetanMarkIntersyllabicTsheg = 0x0F0B; diff --git a/Source/JavaScriptCore/wtf/unicode/Collator.h b/Source/JavaScriptCore/wtf/unicode/Collator.h index 00ab16e6a..7994ff8e5 100644 --- a/Source/JavaScriptCore/wtf/unicode/Collator.h +++ b/Source/JavaScriptCore/wtf/unicode/Collator.h @@ -45,13 +45,13 @@ namespace WTF { public: enum Result { Equal = 0, Greater = 1, Less = -1 }; - Collator(const char* locale); // Parsing is lenient; e.g. language identifiers (such as "en-US") are accepted, too. - ~Collator(); - void setOrderLowerFirst(bool); + WTF_EXPORT_PRIVATE Collator(const char* locale); // Parsing is lenient; e.g. language identifiers (such as "en-US") are accepted, too. + WTF_EXPORT_PRIVATE ~Collator(); + WTF_EXPORT_PRIVATE void setOrderLowerFirst(bool); static PassOwnPtr<Collator> userDefault(); - Result collate(const ::UChar*, size_t, const ::UChar*, size_t) const; + WTF_EXPORT_PRIVATE Result collate(const ::UChar*, size_t, const ::UChar*, size_t) const; private: #if USE(ICU_UNICODE) && !UCONFIG_NO_COLLATION diff --git a/Source/JavaScriptCore/wtf/unicode/UTF8.h b/Source/JavaScriptCore/wtf/unicode/UTF8.h index bd3dd8a0a..bc2497b72 100644 --- a/Source/JavaScriptCore/wtf/unicode/UTF8.h +++ b/Source/JavaScriptCore/wtf/unicode/UTF8.h @@ -62,7 +62,7 @@ namespace Unicode { // to the replacement character; otherwise (when the flag is set to strict) // they constitute an error. - ConversionResult convertUTF8ToUTF16( + WTF_EXPORT_PRIVATE ConversionResult convertUTF8ToUTF16( const char** sourceStart, const char* sourceEnd, UChar** targetStart, UChar* targetEnd, bool strict = true); @@ -70,7 +70,7 @@ namespace Unicode { const LChar** sourceStart, const LChar* sourceEnd, char** targetStart, char* targetEnd); - ConversionResult convertUTF16ToUTF8( + WTF_EXPORT_PRIVATE ConversionResult convertUTF16ToUTF8( const UChar** sourceStart, const UChar* sourceEnd, char** targetStart, char* targetEnd, bool strict = true); |