Changeset 118990 in webkit

Timestamp:

May 30, 2012 3:58:54 PM (12 years ago)

Author:

mitz@apple.com

Message:

[Qt] REGRESSION(r118568): It broke fast/forms/textarea-maxlength.html on Qt 4.8
​https://bugs.webkit.org/show_bug.cgi?id=87740

Reviewed by Darin Adler.

Source/WebCore:

• platform/text/qt/TextBreakIteratorQt.cpp:

(WebCore::NonSharedCharacterBreakIterator::NonSharedCharacterBreakIterator): Changed to use
the return value of setUpIterator.

LayoutTests:

• platform/qt-4.8/Skipped: Removed fast/forms/textarea-maxlength.html.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt-4.8/Skipped (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/text/qt/TextBreakIteratorQt.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-30  Dan Bernstein  <mitz@apple.com>
+
+        [Qt] REGRESSION(r118568): It broke fast/forms/textarea-maxlength.html on Qt 4.8
+        https://bugs.webkit.org/show_bug.cgi?id=87740
+
+        Reviewed by Darin Adler.
+
+        * platform/qt-4.8/Skipped: Removed fast/forms/textarea-maxlength.html.
+
 2012-05-30  Raphael Kubo da Costa  <rakuco@webkit.org>
 

trunk/LayoutTests/platform/qt-4.8/Skipped

@@ -157 +157 @@
 # Fail with QtXmlPatterns (used by Qt 4.8 buid), but pass with libxslt (used by Qt 5 build)
 fast/parser/innerhtml-with-prefixed-elements.xhtml
-
-# [Qt] REGRESSION(r118568): It broke fast/forms/textarea-maxlength.html on Qt 4.8
-# https://bugs.webkit.org/show_bug.cgi?id=87740
-fast/forms/textarea-maxlength.html

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-30  Dan Bernstein  <mitz@apple.com>
+
+        [Qt] REGRESSION(r118568): It broke fast/forms/textarea-maxlength.html on Qt 4.8
+        https://bugs.webkit.org/show_bug.cgi?id=87740
+
+        Reviewed by Darin Adler.
+
+        * platform/text/qt/TextBreakIteratorQt.cpp:
+        (WebCore::NonSharedCharacterBreakIterator::NonSharedCharacterBreakIterator): Changed to use
+        the return value of setUpIterator.
+
 2012-05-30  Zeno Albisser  <zeno@webkit.org>
 

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

@@ -77 +77 @@
         if (!createdIterator)
             m_iterator = new TextBreakIterator();
-        setUpIterator(*m_iterator, QTextBoundaryFinder::Grapheme, buffer, length);
+        if (!setUpIterator(*m_iterator, QTextBoundaryFinder::Grapheme, buffer, length)) {
+            delete m_iterator;
+            m_iterator = 0;
+        }
     }