Better build fix after r93384.
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 19 Aug 2011 16:29:32 +0000 (16:29 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 19 Aug 2011 16:29:32 +0000 (16:29 +0000)
* rendering/RenderBlockLineLayout.cpp:
(WebCore::RenderBlock::LineBreaker::nextLineBreak): Use WTF::Unicode wrapper instead of ICU.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@93421 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderBlockLineLayout.cpp

index 2090dbfa3b14d73b9fc577e765636349e094b846..a3a0f1ecbea2f70d189967f0b1a7724cfe0b2bf1 100644 (file)
@@ -1,3 +1,10 @@
+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>
 
         Web Inspector: update scope variables upon value changes via console.
index 04bcda6eaaf6568d2cf2197e2d34b674a714e751..2d2f42b1c88a70cf6a33e3c05288da8640db2643 100644 (file)
@@ -2299,11 +2299,7 @@ InlineIterator RenderBlock::LineBreaker::nextLineBreak(InlineBidiResolver& resol
                         breakWords = false;
                     }
 
-#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.
                         lBreak.moveTo(current.m_obj, current.m_pos, current.m_nextBreakablePosition);