Title: [93388] trunk/Source/WebCore
- Revision
- 93388
- Author
- [email protected]
- Date
- 2011-08-19 00:54:35 -0700 (Fri, 19 Aug 2011)
Log Message
[Qt] Build fix after r93384.
* rendering/RenderBlockLineLayout.cpp:
(WebCore::RenderBlock::LineBreaker::nextLineBreak):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (93387 => 93388)
--- trunk/Source/WebCore/ChangeLog 2011-08-19 05:44:52 UTC (rev 93387)
+++ trunk/Source/WebCore/ChangeLog 2011-08-19 07:54:35 UTC (rev 93388)
@@ -1,3 +1,10 @@
+2011-08-19 Zoltan Horvath <[email protected]>
+
+ [Qt] Build fix after r93384.
+
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebCore::RenderBlock::LineBreaker::nextLineBreak):
+
2011-08-18 Shawn Singh <[email protected]>
Computing screen-space transform for LayerChromium and CCLayerImpl
Modified: trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp (93387 => 93388)
--- trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2011-08-19 05:44:52 UTC (rev 93387)
+++ trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2011-08-19 07:54:35 UTC (rev 93388)
@@ -2299,7 +2299,11 @@
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
// 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
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
