Changeset 93421 in webkit

Timestamp:

Aug 19, 2011, 9:29:32 AM (14 years ago)

Author:

mitz@apple.com

Message:

Better build fix after r93384.

• rendering/RenderBlockLineLayout.cpp:

(WebCore::RenderBlock::LineBreaker::nextLineBreak): Use WTF::Unicode wrapper instead of ICU.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-19  Dan Bernstein  <mitz@apple.com>
+
+        Better build fix after r93384.
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlock::LineBreaker::nextLineBreak): Use WTF::Unicode wrapper instead of ICU.
+
 2011-08-19  Pavel Podivilov  <podivilov@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -2300 +2300 @@
                     }
 
-#if USE(ICU_UNICODE) && !UCONFIG_NO_COLLATION
-                    if (midWordBreak && !U16_IS_TRAIL(c) && !(U_GET_GC_MASK(c) & U_GC_M_MASK)) {
-#else
-                    if (midWordBreak && !U16_IS_TRAIL(c)) {
-#endif
+                    if (midWordBreak && !U16_IS_TRAIL(c) && !(category(c) & (Mark_NonSpacing | Mark_Enclosing | Mark_SpacingCombining))) {
                         // Remember this as a breakable position in case
                         // adding the end width forces a break.