Better build fix after r93384.

* rendering/RenderBlockLineLayout.cpp:
(WebCore::RenderBlock::LineBreaker::nextLineBreak): Use WTF::Unicode wrapper instead of ICU.



git-svn-id: svn://svn.chromium.org/blink/trunk@93421 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/WebCore/ChangeLog

+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.

third_party/WebKit/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -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);