Source/core/rendering/shapes/RasterShape.h - Issue 133123003: [CSS Shapes] First line gets incorrectly adjusted in shape-inside due to rounding

Side by Side Diff: Source/core/rendering/shapes/RasterShape.h

Issue 133123003: [CSS Shapes] First line gets incorrectly adjusted in shape-inside due to rounding (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « Source/core/rendering/shapes/PolygonShape.cpp ('k') | Source/core/rendering/shapes/RasterShape.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.	2 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 *	7 *

8 * 1. Redistributions of source code must retain the above	8 * 1. Redistributions of source code must retain the above

9 * copyright notice, this list of conditions and the following	9 * copyright notice, this list of conditions and the following

10 * disclaimer.	10 * disclaimer.

(...skipping 81 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
92 , m_intervals(intervals)	92 , m_intervals(intervals)

93 , m_imageSize(imageSize)	93 , m_imageSize(imageSize)

94 {	94 {

95 }	95 }

96	96

97 virtual LayoutRect shapeMarginLogicalBoundingBox() const OVERRIDE { return s tatic_cast<LayoutRect>(marginIntervals().bounds()); }	97 virtual LayoutRect shapeMarginLogicalBoundingBox() const OVERRIDE { return s tatic_cast<LayoutRect>(marginIntervals().bounds()); }

98 virtual LayoutRect shapePaddingLogicalBoundingBox() const OVERRIDE { return static_cast<LayoutRect>(paddingIntervals().bounds()); }	98 virtual LayoutRect shapePaddingLogicalBoundingBox() const OVERRIDE { return static_cast<LayoutRect>(paddingIntervals().bounds()); }

99 virtual bool isEmpty() const OVERRIDE { return m_intervals->isEmpty(); }	99 virtual bool isEmpty() const OVERRIDE { return m_intervals->isEmpty(); }

100 virtual void getExcludedIntervals(LayoutUnit logicalTop, LayoutUnit logicalH eight, SegmentList&) const OVERRIDE;	100 virtual void getExcludedIntervals(LayoutUnit logicalTop, LayoutUnit logicalH eight, SegmentList&) const OVERRIDE;

101 virtual void getIncludedIntervals(LayoutUnit logicalTop, LayoutUnit logicalH eight, SegmentList&) const OVERRIDE;	101 virtual void getIncludedIntervals(LayoutUnit logicalTop, LayoutUnit logicalH eight, SegmentList&) const OVERRIDE;

102 virtual bool firstIncludedIntervalLogicalTop(LayoutUnit minLogicalIntervalTo p, const LayoutSize& minLogicalIntervalSize, LayoutUnit&) const OVERRIDE;	102 virtual bool firstIncludedIntervalLogicalTop(LayoutUnit minLogicalIntervalTo p, const FloatSize& minLogicalIntervalSize, LayoutUnit&) const OVERRIDE;

103	103

104 private:	104 private:

105 const RasterShapeIntervals& marginIntervals() const;	105 const RasterShapeIntervals& marginIntervals() const;

106 const RasterShapeIntervals& paddingIntervals() const;	106 const RasterShapeIntervals& paddingIntervals() const;

107	107

108 OwnPtr<RasterShapeIntervals> m_intervals;	108 OwnPtr<RasterShapeIntervals> m_intervals;

109 mutable OwnPtr<RasterShapeIntervals> m_marginIntervals;	109 mutable OwnPtr<RasterShapeIntervals> m_marginIntervals;

110 IntSize m_imageSize;	110 IntSize m_imageSize;

111 };	111 };

112	112

113 } // namespace WebCore	113 } // namespace WebCore

114	114

115 #endif // RasterShape_h	115 #endif // RasterShape_h

OLD	NEW