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

1 files changed, 4 insertions, 4 deletions

diff --git a/Source/WebCore/rendering/ExclusionShapeInsideInfo.cpp b/Source/WebCore/rendering/ExclusionShapeInsideInfo.cpp
index bf7f30dfd..b7830f10e 100644
--- a/Source/WebCore/rendering/ExclusionShapeInsideInfo.cpp
+++ b/Source/WebCore/rendering/ExclusionShapeInsideInfo.cpp
@@ -100,16 +100,16 @@ void ExclusionShapeInsideInfo::computeShapeSize(LayoutUnit logicalWidth, LayoutU
     ASSERT(m_shape);
 }
 
-bool ExclusionShapeInsideInfo::computeSegmentsForLine(LayoutUnit lineTop, LayoutUnit lineBottom)
+bool ExclusionShapeInsideInfo::computeSegmentsForLine(LayoutUnit lineTop, LayoutUnit lineHeight)
 {
-    ASSERT(lineTop <= lineBottom);
+    ASSERT(lineHeight >= 0);
     m_lineTop = lineTop;
-    m_lineBottom = lineBottom;
+    m_lineHeight = lineHeight;
     m_segments.clear();
 
     if (lineOverlapsShapeBounds()) {
         ASSERT(m_shape);
-        m_shape->getIncludedIntervals(lineTop, std::min(lineBottom, shapeLogicalBottom()), m_segments);
+        m_shape->getIncludedIntervals(lineTop, std::min(lineHeight, shapeLogicalBottom() - lineTop), m_segments);
     }
     return m_segments.size();
 }