From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- Source/WebCore/rendering/shapes/BoxShape.h | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'Source/WebCore/rendering/shapes/BoxShape.h') diff --git a/Source/WebCore/rendering/shapes/BoxShape.h b/Source/WebCore/rendering/shapes/BoxShape.h index 975578d69..9f95fcab0 100644 --- a/Source/WebCore/rendering/shapes/BoxShape.h +++ b/Source/WebCore/rendering/shapes/BoxShape.h @@ -12,7 +12,7 @@ * copyright notice, this list of conditions and the following * disclaimer in the documentation and/or other materials * provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -27,37 +27,35 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef BoxShape_h -#define BoxShape_h +#pragma once #include "FloatRoundedRect.h" +#include "RenderStyleConstants.h" #include "Shape.h" namespace WebCore { -class BoxShape : public Shape { +class RenderBox; + +RoundedRect computeRoundedRectForBoxShape(CSSBoxType, const RenderBox&); + +class BoxShape final : public Shape { public: BoxShape(const FloatRoundedRect& bounds) : m_bounds(bounds) { } - 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; + LayoutRect shapeMarginLogicalBoundingBox() const override; + bool isEmpty() const override { return m_bounds.isEmpty(); } + LineSegment getExcludedInterval(LayoutUnit logicalTop, LayoutUnit logicalHeight) const override; - virtual void buildDisplayPaths(DisplayPaths&) const override; + void buildDisplayPaths(DisplayPaths&) const override; private: FloatRoundedRect shapeMarginBounds() const; - FloatRoundedRect shapePaddingBounds() const; FloatRoundedRect m_bounds; }; } // namespace WebCore - -#endif // BoxShape_h -- cgit v1.2.1