Changeset 87825 in webkit

Timestamp:

Jun 1, 2011 10:59:02 AM (13 years ago)

Author:

leviw@chromium.org

Message:

2011-06-01 Levi Weintraub <​leviw@chromium.org>

Reviewed by Eric Seidel.

Switch RenderLineBoxList intersection functions to use IntPoint
​https://bugs.webkit.org/show_bug.cgi?id=61794

Switching rangeIntersectsRect, anyLineIntersectsRect, and lineIntersectsDirtyRect
to take IntPoint instead of a tx/ty to represent the offset to be applied match
the rect and lines' coordinates.

No new tests since this is merely refactoring.

• rendering/RenderLineBoxList.cpp: (WebCore::RenderLineBoxList::rangeIntersectsRect): (WebCore::RenderLineBoxList::anyLineIntersectsRect): (WebCore::RenderLineBoxList::lineIntersectsDirtyRect): (WebCore::RenderLineBoxList::paint): (WebCore::RenderLineBoxList::hitTest):
• rendering/RenderLineBoxList.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLineBoxList.cpp (modified) (9 diffs)
• rendering/RenderLineBoxList.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-01  Levi Weintraub  <leviw@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Switch RenderLineBoxList intersection functions to use IntPoint
+        https://bugs.webkit.org/show_bug.cgi?id=61794
+
+        Switching rangeIntersectsRect, anyLineIntersectsRect, and lineIntersectsDirtyRect
+        to take IntPoint instead of a tx/ty to represent the offset to be applied match
+        the rect and lines' coordinates.
+
+        No new tests since this is merely refactoring.
+
+        * rendering/RenderLineBoxList.cpp:
+        (WebCore::RenderLineBoxList::rangeIntersectsRect):
+        (WebCore::RenderLineBoxList::anyLineIntersectsRect):
+        (WebCore::RenderLineBoxList::lineIntersectsDirtyRect):
+        (WebCore::RenderLineBoxList::paint):
+        (WebCore::RenderLineBoxList::hitTest):
+        * rendering/RenderLineBoxList.h:
+
 2011-05-19  Adrienne Walker  <enne@google.com>
 

trunk/Source/WebCore/rendering/RenderLineBoxList.cpp

@@ -147 +147 @@
 }
 
-bool RenderLineBoxList::rangeIntersectsRect(RenderBoxModelObject* renderer, int logicalTop, int logicalBottom, const IntRect& rect, int tx, int ty) const
+bool RenderLineBoxList::rangeIntersectsRect(RenderBoxModelObject* renderer, int logicalTop, int logicalBottom, const IntRect& rect, const IntPoint& offset) const
 {
     RenderBox* block;
@@ -160 +160 @@
     
     if (renderer->style()->isHorizontalWritingMode()) {
-        physicalStart += ty;
+        physicalStart += offset.y();
         if (physicalStart >= rect.maxY() || physicalStart + physicalExtent <= rect.y())
             return false;
     } else {
-        physicalStart += tx;
+        physicalStart += offset.x();
         if (physicalStart >= rect.maxX() || physicalStart + physicalExtent <= rect.x())
             return false;
@@ -172 +172 @@
 }
 
-bool RenderLineBoxList::anyLineIntersectsRect(RenderBoxModelObject* renderer, const IntRect& rect, int tx, int ty, bool usePrintRect, int outlineSize) const
+bool RenderLineBoxList::anyLineIntersectsRect(RenderBoxModelObject* renderer, const IntRect& rect, const IntPoint& offset, bool usePrintRect, int outlineSize) const
 {
     // We can check the first box and last box and avoid painting/hit testing if we don't
@@ -189 +189 @@
     int logicalBottom = outlineSize + lastLineBottom;
     
-    return rangeIntersectsRect(renderer, logicalTop, logicalBottom, rect, tx, ty);
-}
-
-bool RenderLineBoxList::lineIntersectsDirtyRect(RenderBoxModelObject* renderer, InlineFlowBox* box, const PaintInfo& paintInfo, int tx, int ty) const
+    return rangeIntersectsRect(renderer, logicalTop, logicalBottom, rect, offset);
+}
+
+bool RenderLineBoxList::lineIntersectsDirtyRect(RenderBoxModelObject* renderer, InlineFlowBox* box, const PaintInfo& paintInfo, const IntPoint& offset) const
 {
     RootInlineBox* root = box->root();
@@ -198 +198 @@
     int logicalBottom = box->logicalBottomVisualOverflow(root->lineBottom()) + renderer->maximalOutlineSize(paintInfo.phase);
     
-    return rangeIntersectsRect(renderer, logicalTop, logicalBottom, paintInfo.rect, tx, ty);
+    return rangeIntersectsRect(renderer, logicalTop, logicalBottom, paintInfo.rect, offset);
 }
 
@@ -220 +220 @@
     bool usePrintRect = !v->printRect().isEmpty();
     int outlineSize = renderer->maximalOutlineSize(paintInfo.phase);
-    if (!anyLineIntersectsRect(renderer, paintInfo.rect, tx, ty, usePrintRect, outlineSize))
+    if (!anyLineIntersectsRect(renderer, paintInfo.rect, IntPoint(tx, ty), usePrintRect, outlineSize))
         return;
 
@@ -258 +258 @@
         }
 
-        if (lineIntersectsDirtyRect(renderer, curr, info, tx, ty)) {
+        if (lineIntersectsDirtyRect(renderer, curr, info, IntPoint(tx, ty))) {
             RootInlineBox* root = curr->root();
             curr->paint(info, IntPoint(tx, ty), root->lineTop(), root->lineBottom());
@@ -290 +290 @@
         IntRect(pointInContainer.x() - result.leftPadding(), pointInContainer.y(), result.rightPadding() + result.leftPadding() + 1, 1);
 
-    if (!anyLineIntersectsRect(renderer, rect, tx, ty))
+    if (!anyLineIntersectsRect(renderer, rect, IntPoint(tx, ty)))
         return false;
 
@@ -298 +298 @@
     for (InlineFlowBox* curr = lastLineBox(); curr; curr = curr->prevLineBox()) {
         RootInlineBox* root = curr->root();
-        if (rangeIntersectsRect(renderer, curr->logicalTopVisualOverflow(root->lineTop()), curr->logicalBottomVisualOverflow(root->lineBottom()), rect, tx, ty)) {
+        if (rangeIntersectsRect(renderer, curr->logicalTopVisualOverflow(root->lineTop()), curr->logicalBottomVisualOverflow(root->lineBottom()), rect, IntPoint(tx, ty))) {
             bool inside = curr->nodeAtPoint(request, result, pointInContainer, tx, ty, root->lineTop(), root->lineBottom());
             if (inside) {

trunk/Source/WebCore/rendering/RenderLineBoxList.h

@@ -68 +68 @@
     
 private:
-    bool anyLineIntersectsRect(RenderBoxModelObject*, const IntRect&, int tx, int ty, bool usePrintRect = false, int outlineSize = 0) const;
-    bool lineIntersectsDirtyRect(RenderBoxModelObject*, InlineFlowBox*, const PaintInfo&, int tx, int ty) const;
-    bool rangeIntersectsRect(RenderBoxModelObject*, int logicalTop, int logicalBottom, const IntRect&, int tx, int ty) const;
+    bool anyLineIntersectsRect(RenderBoxModelObject*, const IntRect&, const IntPoint&, bool usePrintRect = false, int outlineSize = 0) const;
+    bool lineIntersectsDirtyRect(RenderBoxModelObject*, InlineFlowBox*, const PaintInfo&, const IntPoint&) const;
+    bool rangeIntersectsRect(RenderBoxModelObject*, int logicalTop, int logicalBottom, const IntRect&, const IntPoint&) const;
 
     // For block flows, each box represents the root inline box for a line in the