Unreviewed Win build fix after r158855; wrap shapeInfoForFloat() in an ENABLE(CSS_SHA...
authorjer.noble@apple.com <jer.noble@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Nov 2013 19:04:53 +0000 (19:04 +0000)
committerjer.noble@apple.com <jer.noble@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Nov 2013 19:04:53 +0000 (19:04 +0000)
* rendering/FloatingObjects.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@158856 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/rendering/FloatingObjects.cpp

index 02829df..1a07633 100644 (file)
@@ -1,3 +1,9 @@
+2013-11-07  Jer Noble  <jer.noble@apple.com>
+
+        Unreviewed Win build fix after r158855; wrap shapeInfoForFloat() in an ENABLE(CSS_SHAPES) guard.
+
+        * rendering/FloatingObjects.cpp:
+
 2013-11-07  Bem Jones-Bey  <bjonesbe@adobe.com>
 
         Refactor logical left/right offset for line methods
index f435a5a..a7a7907 100644 (file)
@@ -267,6 +267,7 @@ inline const FloatingObjectTree& FloatingObjects::placedFloatsTree()
     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 @@ static inline ShapeOutsideInfo* shapeInfoForFloat(const FloatingObject* floating
 
     return 0;
 }
+#endif
 
 template<>
 inline LayoutUnit ComputeFloatOffsetAdapter<FloatingObject::FloatLeft>::shapeOffset() const