Title: [93421] trunk/Source/WebCore
- Revision
- 93421
- Author
- m...@apple.com
- Date
- 2011-08-19 09:29:32 -0700 (Fri, 19 Aug 2011)
Log Message
Better build fix after r93384.
* rendering/RenderBlockLineLayout.cpp:
(WebCore::RenderBlock::LineBreaker::nextLineBreak): Use WTF::Unicode wrapper instead of ICU.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (93420 => 93421)
--- trunk/Source/WebCore/ChangeLog 2011-08-19 16:22:29 UTC (rev 93420)
+++ trunk/Source/WebCore/ChangeLog 2011-08-19 16:29:32 UTC (rev 93421)
@@ -1,3 +1,10 @@
+2011-08-19 Dan Bernstein <m...@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 <podivi...@chromium.org>
Web Inspector: update scope variables upon value changes via console.
Modified: trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp (93420 => 93421)
--- trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2011-08-19 16:22:29 UTC (rev 93420)
+++ trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2011-08-19 16:29:32 UTC (rev 93421)
@@ -2299,11 +2299,7 @@
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);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
