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

Side by Side Diff: Source/core/rendering/shapes/RectangleShape.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

« LayoutTests/fast/shapes/shape-inside/shape-inside-polygon-rounded-first-fit.html ('K') | « Source/core/rendering/shapes/RasterShape.cpp ('k') | Source/core/rendering/shapes/RectangleShape.cpp » ('j') | Source/core/rendering/shapes/ShapeInsideInfo.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.	2 * Copyright (C) 2012 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 35 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
46 , m_bounds(bounds)	46 , m_bounds(bounds)

47 , m_radii(radii)	47 , m_radii(radii)

48 {	48 {

49 }	49 }

50	50

51 virtual LayoutRect shapeMarginLogicalBoundingBox() const OVERRIDE { return s tatic_cast<LayoutRect>(shapeMarginBounds()); }	51 virtual LayoutRect shapeMarginLogicalBoundingBox() const OVERRIDE { return s tatic_cast<LayoutRect>(shapeMarginBounds()); }

52 virtual LayoutRect shapePaddingLogicalBoundingBox() const OVERRIDE { return static_cast<LayoutRect>(shapePaddingBounds()); }	52 virtual LayoutRect shapePaddingLogicalBoundingBox() const OVERRIDE { return static_cast<LayoutRect>(shapePaddingBounds()); }

53 virtual bool isEmpty() const OVERRIDE { return m_bounds.isEmpty(); }	53 virtual bool isEmpty() const OVERRIDE { return m_bounds.isEmpty(); }

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

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

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

57	57

58 private:	58 private:

59 FloatRect shapeMarginBounds() const;	59 FloatRect shapeMarginBounds() const;

60 FloatRect shapePaddingBounds() const;	60 FloatRect shapePaddingBounds() const;

61	61

62 float rx() const { return m_radii.width(); }	62 float rx() const { return m_radii.width(); }

63 float ry() const { return m_radii.height(); }	63 float ry() const { return m_radii.height(); }

64 float x() const { return m_bounds.x(); }	64 float x() const { return m_bounds.x(); }

65 float y() const { return m_bounds.y(); }	65 float y() const { return m_bounds.y(); }

66 float width() const { return m_bounds.width(); }	66 float width() const { return m_bounds.width(); }

67 float height() const { return m_bounds.height(); }	67 float height() const { return m_bounds.height(); }

68	68

69 FloatRect m_bounds;	69 FloatRect m_bounds;

70 FloatSize m_radii;	70 FloatSize m_radii;

71 };	71 };

72	72

73 } // namespace WebCore	73 } // namespace WebCore

74	74

75 #endif // RectangleShape_h	75 #endif // RectangleShape_h

OLD	NEW