Changeset 117497 in webkit

Timestamp:

May 17, 2012 2:31:10 PM (12 years ago)

Author:

jchaffraix@webkit.org

Message:

Kill RenderLayer::relativePositionOffset(LayoutUnit& relX, LayoutUnit& relY) and cleanup RenderInline::clippedOverflowRectForRepaint
​https://bugs.webkit.org/show_bug.cgi?id=86551

Reviewed by Abhishek Arya.

No test since there is no expected change in behavior.

• rendering/RenderInline.cpp:

(WebCore::RenderInline::clippedOverflowRectForRepaint):
Changed the function to use LayoutRect arithmetics instead of calculating
top / left manually. While at it, improved the naming, removed some local
variables and removed an unneeded style() NULL-check.

• rendering/RenderLayer.h: Removed the function.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderInline.cpp (modified) (3 diffs)
• rendering/RenderLayer.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-17  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        Kill RenderLayer::relativePositionOffset(LayoutUnit& relX, LayoutUnit& relY) and cleanup RenderInline::clippedOverflowRectForRepaint
+        https://bugs.webkit.org/show_bug.cgi?id=86551
+
+        Reviewed by Abhishek Arya.
+
+        No test since there is no expected change in behavior.
+
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::clippedOverflowRectForRepaint):
+        Changed the function to use LayoutRect arithmetics instead of calculating
+        top / left manually. While at it, improved the naming, removed some local
+        variables and removed an unneeded style() NULL-check.
+
+        * rendering/RenderLayer.h: Removed the function.
+
 2012-05-17  Rob Buis  <rwlbuis@webkit.org>
 

trunk/Source/WebCore/rendering/RenderInline.cpp

@@ -933 +933 @@
         return LayoutRect();
 
-    // Find our leftmost position.
-    LayoutRect boundingBox(linesVisualOverflowBoundingBox());
-    LayoutUnit left = boundingBox.x();
-    LayoutUnit top = boundingBox.y();
-
-    // Now invalidate a rectangle.
-    LayoutUnit ow = style() ? style()->outlineSize() : 0;
-
+    LayoutRect repaintRect(linesVisualOverflowBoundingBox());
     bool hitRepaintContainer = false;
 
@@ -953 +946 @@
         }
         if (inlineFlow->style()->position() == RelativePosition && inlineFlow->hasLayer())
-            toRenderInline(inlineFlow)->layer()->relativePositionOffset(left, top);
-    }
-
-    LayoutRect r(-ow + left, -ow + top, boundingBox.width() + ow * 2, boundingBox.height() + ow * 2);
+            repaintRect.move(toRenderInline(inlineFlow)->layer()->relativePositionOffset());
+    }
+
+    LayoutUnit outlineSize = style()->outlineSize();
+    repaintRect.inflate(outlineSize);
 
     if (hitRepaintContainer || !cb)
-        return r;
+        return repaintRect;
 
     if (cb->hasColumns())
-        cb->adjustRectForColumns(r);
+        cb->adjustRectForColumns(repaintRect);
 
     if (cb->hasOverflowClip()) {
@@ -968 +962 @@
         // layer's size instead.  Even if the layer's size is wrong, the layer itself will repaint
         // anyway if its size does change.
-        LayoutRect repaintRect(r);
         repaintRect.move(-cb->scrolledContentOffset()); // For overflow:auto/scroll/hidden.
 
         LayoutRect boxRect(LayoutPoint(), cb->cachedSizeForOverflowClip());
-        r = intersection(repaintRect, boxRect);
-    }
-
-    cb->computeRectForRepaint(repaintContainer, r);
-
-    if (ow) {
+        repaintRect.intersect(boxRect);
+    }
+
+    cb->computeRectForRepaint(repaintContainer, repaintRect);
+
+    if (outlineSize) {
         for (RenderObject* curr = firstChild(); curr; curr = curr->nextSibling()) {
-            if (!curr->isText()) {
-                LayoutRect childRect = curr->rectWithOutlineForRepaint(repaintContainer, ow);
-                r.unite(childRect);
-            }
-        }
-
-        if (continuation() && !continuation()->isInline() && continuation()->parent()) {
-            LayoutRect contRect = continuation()->rectWithOutlineForRepaint(repaintContainer, ow);
-            r.unite(contRect);
-        }
-    }
-
-    return r;
+            if (!curr->isText())
+                repaintRect.unite(curr->rectWithOutlineForRepaint(repaintContainer, outlineSize));
+        }
+
+        if (continuation() && !continuation()->isInline() && continuation()->parent())
+            repaintRect.unite(continuation()->rectWithOutlineForRepaint(repaintContainer, outlineSize));
+    }
+
+    return repaintRect;
 }
 

trunk/Source/WebCore/rendering/RenderLayer.h

@@ -370 +370 @@
     void updateTransform();
 
-    void relativePositionOffset(LayoutUnit& relX, LayoutUnit& relY) const { relX += m_relativeOffset.width(); relY += m_relativeOffset.height(); }
     const LayoutSize& relativePositionOffset() const { return m_relativeOffset; }