Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / shapes / BoxShape.h

diff --git a/src/third_party/WebKit/Source/core/rendering/shapes/BoxShape.h b/src/third_party/WebKit/Source/core/rendering/shapes/BoxShape.h
index 70f067b..7b6cf15 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/shapes/BoxShape.h
+++ b/src/third_party/WebKit/Source/core/rendering/shapes/BoxShape.h
@@ -33,7 +33,7 @@
 #include "core/rendering/shapes/Shape.h"
 #include "platform/geometry/FloatRoundedRect.h"
 
-namespace WebCore {
+namespace blink {
 
 class BoxShape FINAL : public Shape {
 public:
@@ -44,20 +44,17 @@ public:
     }
 
     virtual LayoutRect shapeMarginLogicalBoundingBox() const OVERRIDE;
-    virtual LayoutRect shapePaddingLogicalBoundingBox() const OVERRIDE;
     virtual bool isEmpty() const OVERRIDE { return m_bounds.isEmpty(); }
-    virtual void getExcludedIntervals(LayoutUnit logicalTop, LayoutUnit logicalHeight, SegmentList&) const OVERRIDE;
-    virtual void getIncludedIntervals(LayoutUnit logicalTop, LayoutUnit logicalHeight, SegmentList&) const OVERRIDE;
-    virtual bool firstIncludedIntervalLogicalTop(LayoutUnit minLogicalIntervalTop, const FloatSize& minLogicalIntervalSize, LayoutUnit&) const OVERRIDE;
+    virtual LineSegment getExcludedInterval(LayoutUnit logicalTop, LayoutUnit logicalHeight) const OVERRIDE;
+    virtual void buildDisplayPaths(DisplayPaths&) const OVERRIDE;
 
 private:
     FloatRoundedRect shapeMarginBounds() const;
-    FloatRoundedRect shapePaddingBounds() const;
 
     FloatRoundedRect m_bounds;
 };
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // BoxShape_h