Changeset 69773 in webkit

Timestamp:

Oct 14, 2010 9:57:00 AM (14 years ago)

Author:

noam.rosenthal@nokia.com

Message:

2010-10-14 No'am Rosenthal <​noam.rosenthal@nokia.com>

Reviewed by Andreas Kling.

[Qt] Text breaking is slow: enable ICU as an opt-in
​https://bugs.webkit.org/show_bug.cgi?id=40332

Added a config flag that enables ICU as an opt-in instead of the Qt specific code.
Because of the inclusion of ICU headers, some explicit casting was necessary in UnicodeQt4.h

• JavaScriptCore.pri:
• wtf/unicode/qt4/UnicodeQt4.h: (WTF::Unicode::toLower): (WTF::Unicode::toUpper): (WTF::Unicode::toTitleCase): (WTF::Unicode::foldCase): (WTF::Unicode::isPrintableChar): (WTF::Unicode::isSeparatorSpace): (WTF::Unicode::isPunct): (WTF::Unicode::isLower): (WTF::Unicode::mirroredChar): (WTF::Unicode::combiningClass): (WTF::Unicode::direction): (WTF::Unicode::category):

2010-10-14 No'am Rosenthal <​noam.rosenthal@nokia.com>

Reviewed by Andreas Kling.

[Qt] Text breaking is slow: enable ICU as an opt-in
​https://bugs.webkit.org/show_bug.cgi?id=40332

Added a config flag that enables ICU as an opt-in instead of the Qt specific code.

No new tests, this should be covered by existing tests.

• WebCore.pro:
• platform/text/qt/TextBreakIteratorQt.cpp: (WebCore::currentTextBreakLocaleID):

Location:

trunk

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.pri (modified) (1 diff)
• JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h (modified) (9 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.pro (modified) (2 diffs)
• WebCore/platform/text/qt/TextBreakIteratorQt.cpp (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-10-14  No'am Rosenthal  <noam.rosenthal@nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Text breaking is slow: enable ICU as an opt-in
+        https://bugs.webkit.org/show_bug.cgi?id=40332
+
+        Added a config flag that enables ICU as an opt-in instead of the Qt specific code.
+        Because of the inclusion of ICU headers, some explicit casting was necessary in UnicodeQt4.h
+
+        * JavaScriptCore.pri:
+        * wtf/unicode/qt4/UnicodeQt4.h:
+        (WTF::Unicode::toLower):
+        (WTF::Unicode::toUpper):
+        (WTF::Unicode::toTitleCase):
+        (WTF::Unicode::foldCase):
+        (WTF::Unicode::isPrintableChar):
+        (WTF::Unicode::isSeparatorSpace):
+        (WTF::Unicode::isPunct):
+        (WTF::Unicode::isLower):
+        (WTF::Unicode::mirroredChar):
+        (WTF::Unicode::combiningClass):
+        (WTF::Unicode::direction):
+        (WTF::Unicode::category):
+
 2010-10-14  Anton Faern  <anton@bladehawke.com>
 

trunk/JavaScriptCore/JavaScriptCore.pri

@@ -55 +55 @@
 DEFINES += BUILDING_QT__ BUILDING_JavaScriptCore BUILDING_WTF
 
+# CONFIG += text_breaking_with_icu
+
+contains (CONFIG, text_breaking_with_icu) {
+    DEFINES += WTF_USE_QT_ICU_TEXT_BREAKING=1
+}
+
 wince* {
     INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/ce-compat

trunk/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h

@@ -32 +32 @@
 
 #include <stdint.h>
+#if USE(QT_ICU_TEXT_BREAKING)
+#include <unicode/ubrk.h>
+#endif
 
 QT_BEGIN_NAMESPACE
@@ -64 +67 @@
 typedef uint16_t UChar;
 #endif
+
+#if !USE(QT_ICU_TEXT_BREAKING)
 typedef uint32_t UChar32;
+#endif
 
 namespace WTF {
@@ -151 +157 @@
 inline UChar32 toLower(UChar32 ch)
 {
-    return QChar::toLower(ch);
+    return QChar::toLower(uint32_t(ch));
 }
 
@@ -207 +213 @@
 }
 
-inline UChar32 toUpper(UChar32 ch)
-{
-    return QChar::toUpper(ch);
+inline UChar32 toUpper(UChar32 c)
+{
+    return QChar::toUpper(uint32_t(c));
 }
 
@@ -267 +273 @@
 inline int toTitleCase(UChar32 c)
 {
-    return QChar::toTitleCase(c);
+    return QChar::toTitleCase(uint32_t(c));
 }
 
 inline UChar32 foldCase(UChar32 c)
 {
-    return QChar::toCaseFolded(c);
+    return QChar::toCaseFolded(uint32_t(c));
 }
 
@@ -297 +303 @@
     const uint test = U_MASK(QChar::Other_Control) |
                       U_MASK(QChar::Other_NotAssigned);
-    return !(U_MASK(QChar::category(c)) & test);
+    return !(U_MASK(QChar::category(uint32_t(c))) & test);
 }
 
 inline bool isSeparatorSpace(UChar32 c)
 {
-    return QChar::category(c) == QChar::Separator_Space;
+    return QChar::category(uint32_t(c)) == QChar::Separator_Space;
 }
 
@@ -314 +320 @@
                       U_MASK(QChar::Punctuation_FinalQuote) |
                       U_MASK(QChar::Punctuation_Other);
-    return U_MASK(QChar::category(c)) & test;
+    return U_MASK(QChar::category(uint32_t(c))) & test;
 }
 
 inline bool isLower(UChar32 c)
 {
-    return QChar::category(c) == QChar::Letter_Lowercase;
+    return QChar::category(uint32_t(c)) == QChar::Letter_Lowercase;
 }
 
@@ -330 +336 @@
 inline UChar32 mirroredChar(UChar32 c)
 {
-    return QChar::mirroredChar(c);
+    return QChar::mirroredChar(uint32_t(c));
 }
 
 inline uint8_t combiningClass(UChar32 c)
 {
-    return QChar::combiningClass(c);
+    return QChar::combiningClass(uint32_t(c));
 }
 
@@ -357 +363 @@
 inline Direction direction(UChar32 c)
 {
-    return (Direction)QChar::direction(c);
+    return (Direction)QChar::direction(uint32_t(c));
 }
 
 inline CharCategory category(UChar32 c)
 {
-    return (CharCategory) U_MASK(QChar::category(c));
+    return (CharCategory) U_MASK(QChar::category(uint32_t(c)));
 }
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-14  No'am Rosenthal  <noam.rosenthal@nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Text breaking is slow: enable ICU as an opt-in
+        https://bugs.webkit.org/show_bug.cgi?id=40332
+
+        Added a config flag that enables ICU as an opt-in instead of the Qt specific code.
+
+        No new tests, this should be covered by existing tests.
+
+        * WebCore.pro:
+        * platform/text/qt/TextBreakIteratorQt.cpp:
+        (WebCore::currentTextBreakLocaleID):
+
 2010-10-14  No'am Rosenthal  <noam.rosenthal@nokia.com>
 

trunk/WebCore/WebCore.pro

@@ -2677 +2677 @@
     ../WebKit/qt/Api/qwebkitversion.cpp
 
-
 contains(DEFINES, WTF_USE_QT_MOBILE_THEME=1) {
     HEADERS += platform/qt/QtMobileWebStyle.h
@@ -2712 +2711 @@
         LIBS += -lole32
     }
+
+contains (CONFIG, text_breaking_with_icu) {
+    SOURCES += platform/text/TextBreakIteratorICU.cpp
+    LIBS += -licuuc
+}
 
 contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=1) {

trunk/WebCore/platform/text/qt/TextBreakIteratorQt.cpp

@@ -34 +34 @@
 namespace WebCore {
 
+#if USE(QT_ICU_TEXT_BREAKING)
+const char* currentTextBreakLocaleID()
+{
+    return QLocale::system().name().toLatin1();
+}
+#else
     static unsigned char buffer[1024];
 
@@ -136 +142 @@
         return true;
     }
+#endif
 
 }