Changeset 93384 in webkit

Timestamp:

Aug 18, 2011, 8:34:36 PM (14 years ago)

Author:

mitz@apple.com

Message:

Mid-word break can occur between a character and a combining mark
​https://bugs.webkit.org/show_bug.cgi?id=66529

Reviewed by Simon Fraser.

No test added because I could not find a combining mark with a non-zero advance in
any of the system fonts and tests fonts.

• rendering/RenderBlockLineLayout.cpp:

(WebCore::RenderBlock::LineBreaker::nextLineBreak): Disallow a mid-word break before a
combining mark.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlockLineLayout.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-18  Dan Bernstein  <mitz@apple.com>
+
+        Mid-word break can occur between a character and a combining mark
+        https://bugs.webkit.org/show_bug.cgi?id=66529
+
+        Reviewed by Simon Fraser.
+
+        No test added because I could not find a combining mark with a non-zero advance in
+        any of the system fonts and tests fonts. 
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlock::LineBreaker::nextLineBreak): Disallow a mid-word break before a
+        combining mark.
+
 2011-08-18  Kent Tamura  <tkent@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -2300 +2300 @@
                     }
 
-                    if (midWordBreak && !U16_IS_TRAIL(c)) {
+                    if (midWordBreak && !U16_IS_TRAIL(c) && !(U_GET_GC_MASK(c) & U_GC_M_MASK)) {
                         // Remember this as a breakable position in case
                         // adding the end width forces a break.