Changeset 90530 in webkit

Timestamp:

Jul 6, 2011 8:48:15 PM (13 years ago)

Author:

eae@chromium.org

Message:

2011-07-06 Emil A Eklund <​eae@chromium.org>

Switch absoluteRects to to new layout types
​https://bugs.webkit.org/show_bug.cgi?id=64035

Reviewed by Eric Seidel.

Move absoluteRects over to new layout unit abstraction.
Add flooredLayoutPoint, mapped to flooredIntPoint.

No new tests, no functionality changes.

• rendering/LayoutTypes.h: (WebCore::flooredLayoutPoint):
• rendering/RenderBlock.cpp: (WebCore::RenderBlock::absoluteRects):
• rendering/RenderBlock.h:
• rendering/RenderBox.cpp: (WebCore::RenderBox::absoluteRects):
• rendering/RenderInline.cpp: (WebCore::RenderInline::absoluteRects):
• rendering/RenderInline.h:
• rendering/RenderObject.cpp: (WebCore::RenderObject::absoluteBoundingBoxRect):
• rendering/RenderObject.h: (WebCore::RenderObject::absoluteRects):
• rendering/RenderText.cpp: (WebCore::RenderText::absoluteRects):
• rendering/RenderText.h:
• rendering/RenderView.cpp: (WebCore::RenderView::absoluteRects):
• rendering/RenderView.h:
• rendering/svg/RenderSVGBlock.cpp: (WebCore::RenderSVGBlock::absoluteRects):
• rendering/svg/RenderSVGBlock.h:
• rendering/svg/RenderSVGModelObject.cpp: (WebCore::RenderSVGModelObject::absoluteRects):
• rendering/svg/RenderSVGModelObject.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/LayoutTypes.h (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (2 diffs)
• rendering/RenderBlock.h (modified) (1 diff)
• rendering/RenderBox.cpp (modified) (1 diff)
• rendering/RenderInline.cpp (modified) (1 diff)
• rendering/RenderInline.h (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (1 diff)
• rendering/RenderObject.h (modified) (1 diff)
• rendering/RenderText.cpp (modified) (1 diff)
• rendering/RenderText.h (modified) (1 diff)
• rendering/RenderView.cpp (modified) (1 diff)
• rendering/RenderView.h (modified) (1 diff)
• rendering/svg/RenderSVGBlock.cpp (modified) (1 diff)
• rendering/svg/RenderSVGBlock.h (modified) (1 diff)
• rendering/svg/RenderSVGModelObject.cpp (modified) (1 diff)
• rendering/svg/RenderSVGModelObject.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-06  Emil A Eklund  <eae@chromium.org>
+
+        Switch absoluteRects to to new layout types
+        https://bugs.webkit.org/show_bug.cgi?id=64035
+
+        Reviewed by Eric Seidel.
+
+        Move absoluteRects over to new layout unit abstraction.
+        Add flooredLayoutPoint, mapped to flooredIntPoint.
+
+        No new tests, no functionality changes.
+
+        * rendering/LayoutTypes.h:
+        (WebCore::flooredLayoutPoint):
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::absoluteRects):
+        * rendering/RenderBlock.h:
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::absoluteRects):
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::absoluteRects):
+        * rendering/RenderInline.h:
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::absoluteBoundingBoxRect):
+        * rendering/RenderObject.h:
+        (WebCore::RenderObject::absoluteRects):
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::absoluteRects):
+        * rendering/RenderText.h:
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::absoluteRects):
+        * rendering/RenderView.h:
+        * rendering/svg/RenderSVGBlock.cpp:
+        (WebCore::RenderSVGBlock::absoluteRects):
+        * rendering/svg/RenderSVGBlock.h:
+        * rendering/svg/RenderSVGModelObject.cpp:
+        (WebCore::RenderSVGModelObject::absoluteRects):
+        * rendering/svg/RenderSVGModelObject.h:
+
 2011-07-06  Emil A Eklund  <eae@chromium.org>
 

trunk/Source/WebCore/rendering/LayoutTypes.h

@@ -58 +58 @@
 }
 
+inline LayoutPoint flooredLayoutPoint(const FloatPoint& p)
+{
+    return flooredIntPoint(p);
+}
+
 inline LayoutUnit roundedLayoutUnit(float value)
 {

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -5714 +5714 @@
 }
 
-void RenderBlock::absoluteRects(Vector<IntRect>& rects, const IntPoint& accumulatedOffset)
+void RenderBlock::absoluteRects(Vector<LayoutRect>& rects, const LayoutPoint& accumulatedOffset)
 {
     // For blocks inside inlines, we go ahead and include margins so that we run right up to the
@@ -5722 +5722 @@
         // FIXME: This is wrong for block-flows that are horizontal.
         // https://bugs.webkit.org/show_bug.cgi?id=46781
-        rects.append(IntRect(accumulatedOffset.x(), accumulatedOffset.y() - collapsedMarginBefore(),
-                             width(), height() + collapsedMarginBefore() + collapsedMarginAfter()));
-        continuation()->absoluteRects(rects, accumulatedOffset - toSize(location() +
+        rects.append(LayoutRect(accumulatedOffset.x(), accumulatedOffset.y() - collapsedMarginBefore(),
+                                width(), height() + collapsedMarginBefore() + collapsedMarginAfter()));
+        continuation()->absoluteRects(rects, accumulatedOffset - toLayoutSize(location() +
                 inlineElementContinuation()->containingBlock()->location()));
     } else
-        rects.append(IntRect(accumulatedOffset, size()));
+        rects.append(LayoutRect(accumulatedOffset, size()));
 }
 

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -630 +630 @@
     int logicalRightSelectionOffset(RenderBlock* rootBlock, int position);
     
-    virtual void absoluteRects(Vector<IntRect>&, const IntPoint& accumulatedOffset);
+    virtual void absoluteRects(Vector<LayoutRect>&, const LayoutPoint& accumulatedOffset);
     virtual void absoluteQuads(Vector<FloatQuad>&);
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -460 +460 @@
 }
 
-void RenderBox::absoluteRects(Vector<IntRect>& rects, const IntPoint& accumulatedOffset)
-{
-    rects.append(IntRect(accumulatedOffset, size()));
+void RenderBox::absoluteRects(Vector<LayoutRect>& rects, const LayoutPoint& accumulatedOffset)
+{
+    rects.append(LayoutRect(accumulatedOffset, size()));
 }
 

trunk/Source/WebCore/rendering/RenderInline.cpp

@@ -466 +466 @@
 }
 
-void RenderInline::absoluteRects(Vector<IntRect>& rects, const IntPoint& accumulatedOffset)
+void RenderInline::absoluteRects(Vector<LayoutRect>& rects, const LayoutPoint& accumulatedOffset)
 {
     if (!alwaysCreateLineBoxes())
-        culledInlineAbsoluteRects(this, rects, toSize(accumulatedOffset));
+        culledInlineAbsoluteRects(this, rects, toLayoutSize(accumulatedOffset));
     else if (InlineFlowBox* curr = firstLineBox()) {
         for (; curr; curr = curr->nextLineBox())
-            rects.append(enclosingIntRect(FloatRect(accumulatedOffset + curr->topLeft(), curr->size())));
+            rects.append(enclosingLayoutRect(FloatRect(accumulatedOffset + curr->topLeft(), curr->size())));
     } else
-        rects.append(IntRect(accumulatedOffset, IntSize()));
+        rects.append(LayoutRect(accumulatedOffset, LayoutSize()));
 
     if (continuation()) {
         if (continuation()->isBox()) {
             RenderBox* box = toRenderBox(continuation());
-            continuation()->absoluteRects(rects, toPoint(accumulatedOffset - containingBlock()->location() + box->size()));
+            continuation()->absoluteRects(rects, toLayoutPoint(accumulatedOffset - containingBlock()->location() + box->size()));
         } else
-            continuation()->absoluteRects(rects, toPoint(accumulatedOffset - containingBlock()->location()));
+            continuation()->absoluteRects(rects, toLayoutPoint(accumulatedOffset - containingBlock()->location()));
     }
 }

trunk/Source/WebCore/rendering/RenderInline.h

@@ -49 +49 @@
     virtual LayoutUnit marginEnd() const;
 
-    virtual void absoluteRects(Vector<IntRect>&, const IntPoint& accumulatedOffset);
+    virtual void absoluteRects(Vector<LayoutRect>&, const LayoutPoint& accumulatedOffset);
     virtual void absoluteQuads(Vector<FloatQuad>&);
 

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -1108 +1108 @@
     FloatPoint absPos = localToAbsolute();
     Vector<IntRect> rects;
-    absoluteRects(rects, flooredIntPoint(absPos));
+    absoluteRects(rects, flooredLayoutPoint(absPos));
 
     size_t n = rects.size();

trunk/Source/WebCore/rendering/RenderObject.h

@@ -593 +593 @@
     LayoutSize offsetFromAncestorContainer(RenderObject*) const;
     
-    virtual void absoluteRects(Vector<IntRect>&, const IntPoint&) { }
+    virtual void absoluteRects(Vector<LayoutRect>&, const LayoutPoint&) { }
     // FIXME: useTransforms should go away eventually
     IntRect absoluteBoundingBoxRect(bool useTransforms = false);

trunk/Source/WebCore/rendering/RenderText.cpp

@@ -270 +270 @@
 }
 
-void RenderText::absoluteRects(Vector<IntRect>& rects, const IntPoint& accumulatedOffset)
+void RenderText::absoluteRects(Vector<LayoutRect>& rects, const LayoutPoint& accumulatedOffset)
 {
     for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox())
-        rects.append(enclosingIntRect(FloatRect(accumulatedOffset + box->topLeft(), box->size())));
+        rects.append(enclosingLayoutRect(FloatRect(accumulatedOffset + box->topLeft(), box->size())));
 }
 

trunk/Source/WebCore/rendering/RenderText.h

@@ -57 +57 @@
     void dirtyLineBoxes(bool fullLayout);
 
-    virtual void absoluteRects(Vector<IntRect>&, const IntPoint& accumulatedOffset);
+    virtual void absoluteRects(Vector<LayoutRect>&, const LayoutPoint& accumulatedOffset);
     void absoluteRectsForRange(Vector<IntRect>&, unsigned startOffset = 0, unsigned endOffset = UINT_MAX, bool useSelectionHeight = false);
 

trunk/Source/WebCore/rendering/RenderView.cpp

@@ -323 +323 @@
 }
 
-void RenderView::absoluteRects(Vector<IntRect>& rects, const IntPoint& accumulatedOffset)
-{
-    rects.append(IntRect(accumulatedOffset, m_layer->size()));
+void RenderView::absoluteRects(Vector<LayoutRect>& rects, const LayoutPoint& accumulatedOffset)
+{
+    rects.append(LayoutRect(accumulatedOffset, m_layer->size()));
 }
 

trunk/Source/WebCore/rendering/RenderView.h

@@ -83 +83 @@
     bool printing() const;
 
-    virtual void absoluteRects(Vector<IntRect>&, const IntPoint& accumulatedOffset);
+    virtual void absoluteRects(Vector<LayoutRect>&, const LayoutPoint& accumulatedOffset);
     virtual void absoluteQuads(Vector<FloatQuad>&);
 

trunk/Source/WebCore/rendering/svg/RenderSVGBlock.cpp

@@ -69 +69 @@
 }
 
-void RenderSVGBlock::absoluteRects(Vector<IntRect>&, const IntPoint&)
+void RenderSVGBlock::absoluteRects(Vector<LayoutRect>&, const LayoutPoint&)
 {
     // This code path should never be taken for SVG, as we're assuming useTransforms=true everywhere, absoluteQuads should be used.

trunk/Source/WebCore/rendering/svg/RenderSVGBlock.h

@@ -37 +37 @@
     virtual void updateBoxModelInfoFromStyle();
 
-    virtual void absoluteRects(Vector<IntRect>&, const IntPoint& accumulatedOffset);
+    virtual void absoluteRects(Vector<LayoutRect>&, const LayoutPoint& accumulatedOffset);
 
     virtual void destroy();

trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.cpp

@@ -71 +71 @@
 }
 
-void RenderSVGModelObject::absoluteRects(Vector<IntRect>&, const IntPoint&)
+void RenderSVGModelObject::absoluteRects(Vector<LayoutRect>&, const LayoutPoint&)
 {
     // This code path should never be taken for SVG, as we're assuming useTransforms=true everywhere, absoluteQuads should be used.

trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.h

@@ -56 +56 @@
     virtual IntRect outlineBoundsForRepaint(RenderBoxModelObject* repaintContainer, IntPoint*) const;
 
-    virtual void absoluteRects(Vector<IntRect>&, const IntPoint& accumulatedOffset);
+    virtual void absoluteRects(Vector<LayoutRect>&, const LayoutPoint& accumulatedOffset);
     virtual void absoluteQuads(Vector<FloatQuad>&);