Changeset 79567 in webkit

Timestamp:

Feb 24, 2011 8:09:18 AM (13 years ago)

Author:

andreas.kling@nokia.com

Message:

2011-02-24 Andreas Kling <​kling@webkit.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Remove bogus optimizations in TextBreakIteratorQt
​https://bugs.webkit.org/show_bug.cgi?id=55139

Let QTextBoundaryFinder hold a deep copy of the string data it's
operating on, and don't use the same working buffer for all iterators.

• platform/text/qt/TextBreakIteratorQt.cpp: (WebCore::TextBreakIterator::TextBreakIterator): (WebCore::setUpIterator):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/text/qt/TextBreakIteratorQt.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-24  Andreas Kling  <kling@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Remove bogus optimizations in TextBreakIteratorQt
+        https://bugs.webkit.org/show_bug.cgi?id=55139
+
+        Let QTextBoundaryFinder hold a deep copy of the string data it's
+        operating on, and don't use the same working buffer for all iterators.
+
+        * platform/text/qt/TextBreakIteratorQt.cpp:
+        (WebCore::TextBreakIterator::TextBreakIterator):
+        (WebCore::setUpIterator):
+
 2011-02-24  Andrey Adaikin  <aandrey@google.com>
 

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

@@ -40 +40 @@
 }
 #else
-    static unsigned char buffer[1024];
-
     class TextBreakIterator : public QTextBoundaryFinder {
     public:
-        TextBreakIterator(QTextBoundaryFinder::BoundaryType type, const UChar* string, int length)
-            : QTextBoundaryFinder(type, (const QChar*)string, length, buffer, sizeof(buffer))
-            , length(length)
-            , string(string) {}
+        TextBreakIterator(QTextBoundaryFinder::BoundaryType type, const QString& string)
+            : QTextBoundaryFinder(type, string)
+        { }
         TextBreakIterator()
             : QTextBoundaryFinder()
-            , length(0)
-            , string(0) {}
-
-        int length;
-        const UChar* string;
+        { }
     };
 
-    TextBreakIterator* setUpIterator(TextBreakIterator& iterator, QTextBoundaryFinder::BoundaryType type, const UChar* string, int length)
+    TextBreakIterator* setUpIterator(TextBreakIterator& iterator, QTextBoundaryFinder::BoundaryType type, const UChar* characters, int length)
     {
-        if (!string || !length)
+        if (!characters || !length)
             return 0;
 
-        if (iterator.isValid() && type == iterator.type() && length == iterator.length
-            && memcmp(string, iterator.string, length) == 0) {
+        if (iterator.isValid() && type == iterator.type() && iterator.string() == QString::fromRawData(reinterpret_cast<const QChar*>(characters), length)) {
             iterator.toStart();
             return &iterator;
         }
 
-        iterator = TextBreakIterator(type, string, length);
-
+        iterator = TextBreakIterator(type, QString(reinterpret_cast<const QChar*>(characters), length));
         return &iterator;
     }