Changeset 87467 in webkit

Timestamp:

May 26, 2011 9:53:46 PM (13 years ago)

Author:

eae@chromium.org

Message:

2011-05-26 Emil A Eklund <​eae@chromium.org>

Reviewed by Eric Seidel.

Replace RenderLayer::x/y/width/height with location/size
​https://bugs.webkit.org/show_bug.cgi?id=61414

Covered by existing tests.

• dom/MouseRelatedEvent.cpp: (WebCore::MouseRelatedEvent::computeRelativePosition):
• rendering/RenderBox.cpp: (WebCore::RenderBox::computeRectForRepaint):
• rendering/RenderBox.h: (WebCore::RenderBox::maxLayoutOverflow):
• rendering/RenderInline.cpp: (WebCore::RenderInline::clippedOverflowRectForRepaint): (WebCore::RenderInline::computeRectForRepaint):
• rendering/RenderLayer.cpp: (WebCore::RenderLayer::updateLayerPosition): (WebCore::RenderLayer::convertToLayerCoords): (WebCore::RenderLayer::offsetFromResizeCorner): (WebCore::RenderLayer::calculateRects):
• rendering/RenderLayer.h: (WebCore::RenderLayer::location): (WebCore::RenderLayer::setSize):
• rendering/RenderObject.cpp: (WebCore::RenderObject::computeRectForRepaint):
• rendering/RenderTreeAsText.cpp: (WebCore::write): (WebCore::writeLayers): (WebCore::externalRepresentation):
• rendering/RenderView.cpp: (WebCore::RenderView::absoluteRects): (WebCore::RenderView::absoluteQuads):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/MouseRelatedEvent.cpp (modified) (1 diff)
• rendering/RenderBox.cpp (modified) (1 diff)
• rendering/RenderBox.h (modified) (1 diff)
• rendering/RenderInline.cpp (modified) (2 diffs)
• rendering/RenderLayer.cpp (modified) (4 diffs)
• rendering/RenderLayer.h (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (1 diff)
• rendering/RenderTreeAsText.cpp (modified) (3 diffs)
• rendering/RenderView.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-26  Emil A Eklund  <eae@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Replace RenderLayer::x/y/width/height with location/size
+        https://bugs.webkit.org/show_bug.cgi?id=61414
+
+        Covered by existing tests.
+
+        * dom/MouseRelatedEvent.cpp:
+        (WebCore::MouseRelatedEvent::computeRelativePosition):
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::computeRectForRepaint):
+        * rendering/RenderBox.h:
+        (WebCore::RenderBox::maxLayoutOverflow):
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::clippedOverflowRectForRepaint):
+        (WebCore::RenderInline::computeRectForRepaint):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::updateLayerPosition):
+        (WebCore::RenderLayer::convertToLayerCoords):
+        (WebCore::RenderLayer::offsetFromResizeCorner):
+        (WebCore::RenderLayer::calculateRects):
+        * rendering/RenderLayer.h:
+        (WebCore::RenderLayer::location):
+        (WebCore::RenderLayer::setSize):
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::computeRectForRepaint):
+        * rendering/RenderTreeAsText.cpp:
+        (WebCore::write):
+        (WebCore::writeLayers):
+        (WebCore::externalRepresentation):
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::absoluteRects):
+        (WebCore::RenderView::absoluteQuads):
+
 2011-05-26  Annie Sullivan  <sullivan@chromium.org>
 

trunk/Source/WebCore/dom/MouseRelatedEvent.cpp

@@ -205 +205 @@
         layer->updateLayerPosition();
         for (; layer; layer = layer->parent()) {
-            m_layerX -= layer->x();
-            m_layerY -= layer->y();
+            const IntPoint& location = layer->location();
+            m_layerX -= location.x();
+            m_layerY -= location.y();
         }
     }

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -1507 +1507 @@
 
         IntRect repaintRect(topLeft, rect.size());
-        IntRect boxRect(0, 0, containerBox->layer()->width(), containerBox->layer()->height());
+        IntRect boxRect(IntPoint(), containerBox->layer()->size());
         rect = intersection(repaintRect, boxRect);
         if (rect.isEmpty())

trunk/Source/WebCore/rendering/RenderBox.h

@@ -145 +145 @@
     int minXLayoutOverflow() const { return m_overflow ? m_overflow->minXLayoutOverflow() : borderLeft(); }
     int maxXLayoutOverflow() const { return m_overflow ? m_overflow->maxXLayoutOverflow() : borderLeft() + clientWidth(); }
+    IntSize maxLayoutOverflow() const { return IntSize(maxXLayoutOverflow(), maxYLayoutOverflow()); }
     int logicalLeftLayoutOverflow() const { return style()->isHorizontalWritingMode() ? minXLayoutOverflow() : minYLayoutOverflow(); }
     int logicalRightLayoutOverflow() const { return style()->isHorizontalWritingMode() ? maxXLayoutOverflow() : maxYLayoutOverflow(); }

trunk/Source/WebCore/rendering/RenderInline.cpp

@@ -990 +990 @@
         repaintRect.move(-cb->layer()->scrolledContentOffset()); // For overflow:auto/scroll/hidden.
 
-        IntRect boxRect(0, 0, cb->layer()->width(), cb->layer()->height());
+        IntRect boxRect(IntPoint(), cb->layer()->size());
         r = intersection(repaintRect, boxRect);
     }
@@ -1080 +1080 @@
 
         IntRect repaintRect(topLeft, rect.size());
-        IntRect boxRect(0, 0, containerBox->layer()->width(), containerBox->layer()->height());
+        IntRect boxRect(IntPoint(), containerBox->layer()->size());
         rect = intersection(repaintRect, boxRect);
         if (rect.isEmpty())

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -652 +652 @@
         RenderInline* inlineFlow = toRenderInline(renderer());
         IntRect lineBox = inlineFlow->linesBoundingBox();
-        setWidth(lineBox.width());
-        setHeight(lineBox.height());
-        inlineBoundingBoxOffset = IntSize(lineBox.x(), lineBox.y());
+        setSize(lineBox.size());
+        inlineBoundingBoxOffset = toSize(lineBox.location());
         localPoint += inlineBoundingBoxOffset;
     } else if (RenderBox* box = renderBox()) {
-        setWidth(box->width());
-        setHeight(box->height());
+        setSize(box->size());
         localPoint += box->locationOffsetIncludingFlipping();
     }
@@ -1205 +1203 @@
     
     parentLayer->convertToLayerCoords(ancestorLayer, xPos, yPos);
-    
-    xPos += x();
-    yPos += y();
+
+    xPos += m_topLeft.x();
+    yPos += m_topLeft.y();
 }
 
@@ -2007 +2005 @@
 {
     // Currently the resize corner is always the bottom right corner
-    IntPoint bottomRight(width(), height());
+    // FIXME: This assumes the location is 0, 0. Is this guaranteed to always be the case?
+    IntPoint bottomRight = toPoint(size());
     IntPoint localPoint = absoluteToContents(absolutePoint);
     return localPoint - bottomRight;
@@ -3452 +3451 @@
     int y = 0;
     convertToLayerCoords(rootLayer, x, y);
-    layerBounds = IntRect(x, y, width(), height());
+    layerBounds = IntRect(IntPoint(x, y), size());
     
     // Update the clip rects that will be passed to child layers.

trunk/Source/WebCore/rendering/RenderLayer.h

@@ -212 +212 @@
     }
     
-    int x() const { return m_topLeft.x(); }
-    int y() const { return m_topLeft.y(); }
-    void setLocation(int x, int y)
-    {
-        m_topLeft = IntPoint(x, y);
-    }
-
-    int width() const { return m_layerSize.width(); }
-    int height() const { return m_layerSize.height(); }
+    const IntPoint& location() const { return m_topLeft; }
+    void setLocation(int x, int y) { m_topLeft = IntPoint(x, y); }
+
     const IntSize& size() const { return m_layerSize; }
-    
-    void setWidth(int w) { m_layerSize.setWidth(w); }
-    void setHeight(int h) { m_layerSize.setHeight(h); }
+    void setSize(const IntSize& size) { m_layerSize = size; }
+
+    IntRect rect() const { return IntRect(location(), size()); }
 
     int scrollWidth();

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -1388 +1388 @@
             repaintRect.move(-boxParent->layer()->scrolledContentOffset()); // For overflow:auto/scroll/hidden.
 
-            IntRect boxRect(0, 0, boxParent->layer()->width(), boxParent->layer()->height());
+            IntRect boxRect(IntPoint(), boxParent->layer()->size());
             rect = intersection(repaintRect, boxRect);
             if (rect.isEmpty())

trunk/Source/WebCore/rendering/RenderTreeAsText.cpp

@@ -581 +581 @@
                 RenderLayer* l = root->layer();
                 if (l)
-                    writeLayers(ts, l, l, IntRect(l->x(), l->y(), l->width(), l->height()), indent + 1, behavior);
+                    writeLayers(ts, l, l, l->rect(), indent + 1, behavior);
             }
         }
@@ -654 +654 @@
         paintDirtyRect.setWidth(max(paintDirtyRect.width(), rootLayer->renderBox()->maxXLayoutOverflow()));
         paintDirtyRect.setHeight(max(paintDirtyRect.height(), rootLayer->renderBox()->maxYLayoutOverflow()));
-        l->setWidth(max(l->width(), l->renderBox()->maxXLayoutOverflow()));
-        l->setHeight(max(l->height(), l->renderBox()->maxYLayoutOverflow()));
+        l->setSize(l->size().expandedTo(l->renderBox()->maxLayoutOverflow()));
     }
     
@@ -777 +776 @@
     if (o->hasLayer()) {
         RenderLayer* l = toRenderBox(o)->layer();
-        writeLayers(ts, l, l, IntRect(l->x(), l->y(), l->width(), l->height()), 0, behavior);
+        writeLayers(ts, l, l, l->rect(), 0, behavior);
         writeSelection(ts, o);
     }

trunk/Source/WebCore/rendering/RenderView.cpp

@@ -324 +324 @@
 void RenderView::absoluteRects(Vector<IntRect>& rects, int tx, int ty)
 {
-    rects.append(IntRect(tx, ty, m_layer->width(), m_layer->height()));
+    rects.append(IntRect(IntPoint(tx, ty), m_layer->size()));
 }
 
 void RenderView::absoluteQuads(Vector<FloatQuad>& quads)
 {
-    quads.append(FloatRect(0, 0, m_layer->width(), m_layer->height()));
+    quads.append(FloatRect(FloatPoint(), m_layer->size()));
 }