Title: [157952] trunk/Source/WebCore
- Revision
- 157952
- Author
- [email protected]
- Date
- 2013-10-24 13:46:50 -0700 (Thu, 24 Oct 2013)
Log Message
Try to fix build without CSS_SHAPES.
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::canUseFor):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (157951 => 157952)
--- trunk/Source/WebCore/ChangeLog 2013-10-24 20:39:33 UTC (rev 157951)
+++ trunk/Source/WebCore/ChangeLog 2013-10-24 20:46:50 UTC (rev 157952)
@@ -1,5 +1,12 @@
2013-10-24 Antti Koivisto <[email protected]>
+ Try to fix build without CSS_SHAPES.
+
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::canUseFor):
+
+2013-10-24 Antti Koivisto <[email protected]>
+
Simple line layout
https://bugs.webkit.org/show_bug.cgi?id=122458
Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (157951 => 157952)
--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2013-10-24 20:39:33 UTC (rev 157951)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2013-10-24 20:46:50 UTC (rev 157952)
@@ -75,8 +75,10 @@
return false;
// These tests only works during layout. Outside layout this function may give false positives.
if (flow.view().layoutState()) {
+#if ENABLE(CSS_SHAPES)
if (flow.view().layoutState()->shapeInsideInfo())
return false;
+#endif
if (flow.view().layoutState()->m_columnInfo)
return false;
}
@@ -116,8 +118,10 @@
return false;
if (style.textShadow())
return false;
+#if ENABLE(CSS_SHAPES)
if (style.resolvedShapeInside())
return true;
+#endif
if (style.textOverflow() || (flow.isAnonymousBlock() && flow.parent()->style()->textOverflow()))
return false;
if (style.hasPseudoStyle(FIRST_LINE) || style.hasPseudoStyle(FIRST_LETTER))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
