Diff
Modified: trunk/Source/WebCore/ChangeLog (87466 => 87467)
--- trunk/Source/WebCore/ChangeLog 2011-05-27 04:18:25 UTC (rev 87466)
+++ trunk/Source/WebCore/ChangeLog 2011-05-27 04:53:46 UTC (rev 87467)
@@ -1,3 +1,39 @@
+2011-05-26 Emil A Eklund <[email protected]>
+
+ 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 <[email protected]>
Reviewed by Ryosuke Niwa.
Modified: trunk/Source/WebCore/dom/MouseRelatedEvent.cpp (87466 => 87467)
--- trunk/Source/WebCore/dom/MouseRelatedEvent.cpp 2011-05-27 04:18:25 UTC (rev 87466)
+++ trunk/Source/WebCore/dom/MouseRelatedEvent.cpp 2011-05-27 04:53:46 UTC (rev 87467)
@@ -204,8 +204,9 @@
if (n && (layer = n->renderer()->enclosingLayer())) {
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();
}
}
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (87466 => 87467)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2011-05-27 04:18:25 UTC (rev 87466)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2011-05-27 04:53:46 UTC (rev 87467)
@@ -1506,7 +1506,7 @@
topLeft -= containerBox->layer()->scrolledContentOffset(); // For overflow:auto/scroll/hidden.
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())
return;
Modified: trunk/Source/WebCore/rendering/RenderBox.h (87466 => 87467)
--- trunk/Source/WebCore/rendering/RenderBox.h 2011-05-27 04:18:25 UTC (rev 87466)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2011-05-27 04:53:46 UTC (rev 87467)
@@ -144,6 +144,7 @@
int maxYLayoutOverflow() const { return m_overflow ? m_overflow->maxYLayoutOverflow() : borderTop() + clientHeight(); }
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(); }
Modified: trunk/Source/WebCore/rendering/RenderInline.cpp (87466 => 87467)
--- trunk/Source/WebCore/rendering/RenderInline.cpp 2011-05-27 04:18:25 UTC (rev 87466)
+++ trunk/Source/WebCore/rendering/RenderInline.cpp 2011-05-27 04:53:46 UTC (rev 87467)
@@ -989,7 +989,7 @@
IntRect repaintRect(r);
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);
}
@@ -1079,7 +1079,7 @@
topLeft -= containerBox->layer()->scrolledContentOffset(); // For overflow:auto/scroll/hidden.
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())
return;
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (87466 => 87467)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2011-05-27 04:18:25 UTC (rev 87466)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2011-05-27 04:53:46 UTC (rev 87467)
@@ -651,13 +651,11 @@
if (renderer()->isRenderInline()) {
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();
}
@@ -1204,9 +1202,9 @@
return;
parentLayer->convertToLayerCoords(ancestorLayer, xPos, yPos);
-
- xPos += x();
- yPos += y();
+
+ xPos += m_topLeft.x();
+ yPos += m_topLeft.y();
}
static inline int adjustedScrollDelta(int beginningDelta) {
@@ -2006,7 +2004,8 @@
IntSize RenderLayer::offsetFromResizeCorner(const IntPoint& absolutePoint) const
{
// 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;
}
@@ -3451,7 +3450,7 @@
int x = 0;
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.
if (renderer()->hasOverflowClip() || renderer()->hasClip()) {
Modified: trunk/Source/WebCore/rendering/RenderLayer.h (87466 => 87467)
--- trunk/Source/WebCore/rendering/RenderLayer.h 2011-05-27 04:18:25 UTC (rev 87466)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2011-05-27 04:53:46 UTC (rev 87467)
@@ -211,20 +211,14 @@
return curr;
}
- 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);
- }
+ const IntPoint& location() const { return m_topLeft; }
+ 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 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();
int scrollHeight();
Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (87466 => 87467)
--- trunk/Source/WebCore/rendering/RenderObject.cpp 2011-05-27 04:18:25 UTC (rev 87466)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2011-05-27 04:53:46 UTC (rev 87467)
@@ -1387,7 +1387,7 @@
IntRect repaintRect(rect);
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())
return;
Modified: trunk/Source/WebCore/rendering/RenderTreeAsText.cpp (87466 => 87467)
--- trunk/Source/WebCore/rendering/RenderTreeAsText.cpp 2011-05-27 04:18:25 UTC (rev 87466)
+++ trunk/Source/WebCore/rendering/RenderTreeAsText.cpp 2011-05-27 04:53:46 UTC (rev 87467)
@@ -580,7 +580,7 @@
view->layout();
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);
}
}
}
@@ -653,8 +653,7 @@
if (rootLayer == l) {
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()));
}
// Calculate the clip rects we should use.
@@ -776,7 +775,7 @@
TextStream ts;
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);
}
return ts.release();
Modified: trunk/Source/WebCore/rendering/RenderView.cpp (87466 => 87467)
--- trunk/Source/WebCore/rendering/RenderView.cpp 2011-05-27 04:18:25 UTC (rev 87466)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2011-05-27 04:53:46 UTC (rev 87467)
@@ -323,12 +323,12 @@
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()));
}
static RenderObject* rendererAfterPosition(RenderObject* object, unsigned offset)
