[CSS Exclusions] ExclusionShape bounding box methods should return LayoutRects

Source/core/rendering/exclusions/ExclusionShape.h

 /*
  * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above
  *    copyright notice, this list of conditions and the following
  *    disclaimer.
@@ skipping 12 matching lines @@
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef ExclusionShape_h
 #define ExclusionShape_h
 
-#include "core/platform/graphics/FloatRect.h"
+#include "core/platform/graphics/LayoutRect.h"
 #include "core/platform/text/WritingMode.h"
 #include "core/rendering/style/BasicShapes.h"
 #include <wtf/PassOwnPtr.h>
 #include <wtf/Vector.h>
 
 namespace WebCore {
 
 struct LineSegment {
     LineSegment(float logicalLeft, float logicalRight)
         : logicalLeft(logicalLeft)
         , logicalRight(logicalRight)
     {
     }
 
     float logicalLeft;
     float logicalRight;
 };
 
 typedef Vector<LineSegment> SegmentList;
 
 
 // A representation of a BasicShape that enables layout code to determine how to break a line up into segments
 // that will fit within or around a shape. The line is defined by a pair of logical Y coordinates and the
 // computed segments are returned as pairs of logical X coordinates. The BasicShape itself is defined in
 // physical coordinates.
 
 class ExclusionShape {
 public:
-    static PassOwnPtr<ExclusionShape> createExclusionShape(const BasicShape*, float logicalBoxWidth, float logicalBoxHeight, WritingMode, Length margin, Length padding);
+    static PassOwnPtr<ExclusionShape> createExclusionShape(const BasicShape*, const LayoutSize& logicalBoxSize, WritingMode, Length margin, Length padding);
 
     virtual ~ExclusionShape() { }
 
+    virtual LayoutRect shapeMarginLogicalBoundingBox() const = 0;
+    virtual LayoutRect shapePaddingLogicalBoundingBox() const = 0;
+    virtual bool isEmpty() const = 0;
+    virtual void getIncludedIntervals(LayoutUnit logicalTop, LayoutUnit logicalHeight, SegmentList&) const = 0;
+    virtual void getExcludedIntervals(LayoutUnit logicalTop, LayoutUnit logicalHeight, SegmentList&) const = 0;
+    virtual bool firstIncludedIntervalLogicalTop(LayoutUnit minLogicalIntervalTop, const LayoutSize& minLogicalIntervalSize, LayoutUnit& result) const = 0;
+
+protected:
     float shapeMargin() const { return m_margin; }
     float shapePadding() const { return m_padding; }
-    virtual FloatRect shapeMarginLogicalBoundingBox() const = 0;
-    virtual FloatRect shapePaddingLogicalBoundingBox() const = 0;
-    virtual bool isEmpty() const = 0;
-    virtual void getIncludedIntervals(float logicalTop, float logicalHeight, SegmentList&) const = 0;
-    virtual void getExcludedIntervals(float logicalTop, float logicalHeight, SegmentList&) const = 0;
-    virtual bool firstIncludedIntervalLogicalTop(float minLogicalIntervalTop, const FloatSize& minLogicalIntervalSize, float& result) const = 0;
 
 private:
     WritingMode m_writingMode;
-    float m_logicalBoxWidth;
-    float m_logicalBoxHeight;
     float m_margin;
     float m_padding;
 };
 
 } // namespace WebCore
 
 #endif // ExclusionShape_h