Title: [158856] trunk/Source/WebCore
- Revision
- 158856
- Author
- [email protected]
- Date
- 2013-11-07 11:04:53 -0800 (Thu, 07 Nov 2013)
Log Message
Unreviewed Win build fix after r158855; wrap shapeInfoForFloat() in an ENABLE(CSS_SHAPES) guard.
* rendering/FloatingObjects.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (158855 => 158856)
--- trunk/Source/WebCore/ChangeLog 2013-11-07 18:11:43 UTC (rev 158855)
+++ trunk/Source/WebCore/ChangeLog 2013-11-07 19:04:53 UTC (rev 158856)
@@ -1,3 +1,9 @@
+2013-11-07 Jer Noble <[email protected]>
+
+ Unreviewed Win build fix after r158855; wrap shapeInfoForFloat() in an ENABLE(CSS_SHAPES) guard.
+
+ * rendering/FloatingObjects.cpp:
+
2013-11-07 Bem Jones-Bey <[email protected]>
Refactor logical left/right offset for line methods
Modified: trunk/Source/WebCore/rendering/FloatingObjects.cpp (158855 => 158856)
--- trunk/Source/WebCore/rendering/FloatingObjects.cpp 2013-11-07 18:11:43 UTC (rev 158855)
+++ trunk/Source/WebCore/rendering/FloatingObjects.cpp 2013-11-07 19:04:53 UTC (rev 158856)
@@ -267,6 +267,7 @@
return m_placedFloatsTree;
}
+#if ENABLE(CSS_SHAPES)
static inline ShapeOutsideInfo* shapeInfoForFloat(const FloatingObject* floatingObject, const RenderBlockFlow* containingBlock, LayoutUnit lineTop, LayoutUnit lineBottom)
{
if (floatingObject) {
@@ -278,6 +279,7 @@
return 0;
}
+#endif
template<>
inline LayoutUnit ComputeFloatOffsetAdapter<FloatingObject::FloatLeft>::shapeOffset() const
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
