Changeset 120624 in webkit

Timestamp:

Jun 18, 2012 1:40:28 PM (12 years ago)

Author:

mitz@apple.com

Message:

Ideographic comma and full-stops are mishandled in linebreak
​https://bugs.webkit.org/show_bug.cgi?id=87041

Reviewed by Alexey Proskuryakov.

Source/WebCore:

Test: fast/text/line-breaks-after-ideographic-comma-or-full-stop-2.html

Specifically, line breaks were always allowed after an ideographic comma or full stop, even
before a closing bracket.

• rendering/break_lines.cpp:

(WebCore::shouldBreakAfter): Removed code that unconditionally allowed line breaks after
ideographic commas and full stops, which was added for <​http://webkit.org/b/17411> to work
around an issue in Unicode 5.0. Current line break iterator implementations are based on
newer versions of Unicode, which do not have that issue, so we can use them instead of the
hardcoded approximate rule.

LayoutTests:

• fast/text/line-breaks-after-ideographic-comma-or-full-stop-2-expected.txt: Added.
• fast/text/line-breaks-after-ideographic-comma-or-full-stop-2.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/line-breaks-after-ideographic-comma-or-full-stop-2-expected.txt (added)
• LayoutTests/fast/text/line-breaks-after-ideographic-comma-or-full-stop-2.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/break_lines.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-06-18  Dan Bernstein  <mitz@apple.com>
+
+        Ideographic comma and full-stops are mishandled in linebreak
+        https://bugs.webkit.org/show_bug.cgi?id=87041
+
+        Reviewed by Alexey Proskuryakov.
+
+        * fast/text/line-breaks-after-ideographic-comma-or-full-stop-2-expected.txt: Added.
+        * fast/text/line-breaks-after-ideographic-comma-or-full-stop-2.html: Added.
+
 2012-06-18  Mike West  <mkwst@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-18  Dan Bernstein  <mitz@apple.com>
+
+        Ideographic comma and full-stops are mishandled in linebreak
+        https://bugs.webkit.org/show_bug.cgi?id=87041
+
+        Reviewed by Alexey Proskuryakov.
+
+        Test: fast/text/line-breaks-after-ideographic-comma-or-full-stop-2.html
+
+        Specifically, line breaks were always allowed after an ideographic comma or full stop, even
+        before a closing bracket.
+
+        * rendering/break_lines.cpp:
+        (WebCore::shouldBreakAfter): Removed code that unconditionally allowed line breaks after
+        ideographic commas and full stops, which was added for <http://webkit.org/b/17411> to work
+        around an issue in Unicode 5.0. Current line break iterator implementations are based on
+        newer versions of Unicode, which do not have that issue, so we can use them instead of the
+        hardcoded approximate rule.
+
 2012-06-18  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Source/WebCore/rendering/break_lines.cpp

@@ -122 +122 @@
 static inline bool shouldBreakAfter(UChar lastCh, UChar ch, UChar nextCh)
 {
-    switch (ch) {
-    case ideographicComma:
-    case ideographicFullStop:
-        // FIXME: cases for ideographicComma and ideographicFullStop are a workaround for an issue in Unicode 5.0
-        // which is likely to be resolved in Unicode 5.1 <http://bugs.webkit.org/show_bug.cgi?id=17411>.
-        // We may want to remove or conditionalize this workaround at some point.
-        return true;
-    case '-':
-        if (isASCIIDigit(nextCh)) {
-            // Don't allow line breaking between '-' and a digit if the '-' may mean a minus sign in the context,
-            // while allow breaking in 'ABCD-1234' and '1234-5678' which may be in long URLs.
-            return isASCIIAlphanumeric(lastCh);
-        }
-        // Fall through
-    default:
-        // If both ch and nextCh are ASCII characters, use a lookup table for enhanced speed and for compatibility
-        // with other browsers (see comments for asciiLineBreakTable for details).
-        if (ch >= asciiLineBreakTableFirstChar && ch <= asciiLineBreakTableLastChar
-                && nextCh >= asciiLineBreakTableFirstChar && nextCh <= asciiLineBreakTableLastChar) {
-            const unsigned char* tableRow = asciiLineBreakTable[ch - asciiLineBreakTableFirstChar];
-            int nextChIndex = nextCh - asciiLineBreakTableFirstChar;
-            return tableRow[nextChIndex / 8] & (1 << (nextChIndex % 8));
-        }
-        // Otherwise defer to the Unicode algorithm by returning false.
-        return false;
+    // Don't allow line breaking between '-' and a digit if the '-' may mean a minus sign in the context,
+    // while allow breaking in 'ABCD-1234' and '1234-5678' which may be in long URLs.
+    if (ch == '-' && isASCIIDigit(nextCh))
+        return isASCIIAlphanumeric(lastCh);
+
+    // If both ch and nextCh are ASCII characters, use a lookup table for enhanced speed and for compatibility
+    // with other browsers (see comments for asciiLineBreakTable for details).
+    if (ch >= asciiLineBreakTableFirstChar && ch <= asciiLineBreakTableLastChar
+            && nextCh >= asciiLineBreakTableFirstChar && nextCh <= asciiLineBreakTableLastChar) {
+        const unsigned char* tableRow = asciiLineBreakTable[ch - asciiLineBreakTableFirstChar];
+        int nextChIndex = nextCh - asciiLineBreakTableFirstChar;
+        return tableRow[nextChIndex / 8] & (1 << (nextChIndex % 8));
     }
+    // Otherwise defer to the Unicode algorithm by returning false.
+    return false;
 }