diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-23 10:25:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-23 10:25:11 +0200 |
| commit | 5ea819f80c6840c492386bfafbffb059c7e2091f (patch) | |
| tree | 42ad0b1d82eff090d14278a088ea0f4840a0f938 /Source/WebCore/rendering/ExclusionRectangle.cpp | |
| parent | 43a42f108af6bcbd91f2672731c3047c26213af1 (diff) | |
| download | qtwebkit-5ea819f80c6840c492386bfafbffb059c7e2091f.tar.gz | |
Imported WebKit commit 20434eb8eb95065803473139d8794e98a7672f75 (http://svn.webkit.org/repository/webkit/trunk@132191)
New snapshot that should fix build with latest qtbase and the QPlastiqueStyle removal
Diffstat (limited to 'Source/WebCore/rendering/ExclusionRectangle.cpp')
| -rw-r--r-- | Source/WebCore/rendering/ExclusionRectangle.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/WebCore/rendering/ExclusionRectangle.cpp b/Source/WebCore/rendering/ExclusionRectangle.cpp index 0ccf6224a..328cba2f3 100644 --- a/Source/WebCore/rendering/ExclusionRectangle.cpp +++ b/Source/WebCore/rendering/ExclusionRectangle.cpp @@ -40,13 +40,13 @@ static inline float ellipseXIntercept(float y, float rx, float ry) return rx * sqrt(1 - (y*y) / (ry*ry)); } -void ExclusionRectangle::getExcludedIntervals(float logicalTop, float logicalBottom, SegmentList& result) const +void ExclusionRectangle::getExcludedIntervals(float logicalTop, float logicalHeight, SegmentList& result) const { if (isEmpty()) return; - float y1 = minYForLogicalLine(logicalTop, logicalBottom); - float y2 = maxYForLogicalLine(logicalTop, logicalBottom); + float y1 = minYForLogicalLine(logicalTop, logicalHeight); + float y2 = maxYForLogicalLine(logicalTop, logicalHeight); if (y2 < m_y || y1 >= m_y + m_height) return; @@ -71,13 +71,13 @@ void ExclusionRectangle::getExcludedIntervals(float logicalTop, float logicalBot result.append(LineSegment(x1, x2)); } -void ExclusionRectangle::getIncludedIntervals(float logicalTop, float logicalBottom, SegmentList& result) const +void ExclusionRectangle::getIncludedIntervals(float logicalTop, float logicalHeight, SegmentList& result) const { if (isEmpty()) return; - float y1 = minYForLogicalLine(logicalTop, logicalBottom); - float y2 = maxYForLogicalLine(logicalTop, logicalBottom); + float y1 = minYForLogicalLine(logicalTop, logicalHeight); + float y2 = maxYForLogicalLine(logicalTop, logicalHeight); if (y1 < m_y || y2 > m_y + m_height) return; |