Diff
Modified: trunk/Source/WebCore/ChangeLog (98766 => 98767)
--- trunk/Source/WebCore/ChangeLog 2011-10-28 21:46:17 UTC (rev 98766)
+++ trunk/Source/WebCore/ChangeLog 2011-10-28 21:55:11 UTC (rev 98767)
@@ -1,3 +1,35 @@
+2011-10-28 Emil A Eklund <[email protected]>
+
+ Overridden clippedOverflowRectForRepaint() still uses IntRects
+ https://bugs.webkit.org/show_bug.cgi?id=71046
+
+ Reviewed by Simon Fraser.
+
+ Change all virtual clippedOverflowRectForRepaint functions to use the
+ same signature.
+
+ No new tests.
+
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::rectWithOutlineForRepaint):
+ (WebCore::RenderObject::clippedOverflowRectForRepaint):
+ * rendering/RenderObject.h:
+ * rendering/RenderReplaced.cpp:
+ (WebCore::RenderReplaced::clippedOverflowRectForRepaint):
+ * rendering/RenderReplaced.h:
+ * rendering/RenderTableCell.cpp:
+ (WebCore::RenderTableCell::clippedOverflowRectForRepaint):
+ * rendering/RenderTableCell.h:
+ * rendering/RenderTableCol.cpp:
+ (WebCore::RenderTableCol::clippedOverflowRectForRepaint):
+ * rendering/RenderTableCol.h:
+ * rendering/RenderTableRow.cpp:
+ (WebCore::RenderTableRow::clippedOverflowRectForRepaint):
+ * rendering/RenderTableRow.h:
+ * rendering/RenderText.cpp:
+ (WebCore::RenderText::clippedOverflowRectForRepaint):
+ * rendering/RenderText.h:
+
2011-10-28 Adam Klein <[email protected]>
Remove unused parsers for 'exception' and 'alias' IDL keywords
Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (98766 => 98767)
--- trunk/Source/WebCore/rendering/RenderObject.cpp 2011-10-28 21:46:17 UTC (rev 98766)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2011-10-28 21:55:11 UTC (rev 98767)
@@ -1450,17 +1450,17 @@
return !document()->view()->needsFullRepaint() && !hasLayer();
}
-IntRect RenderObject::rectWithOutlineForRepaint(RenderBoxModelObject* repaintContainer, int outlineWidth) const
+LayoutRect RenderObject::rectWithOutlineForRepaint(RenderBoxModelObject* repaintContainer, LayoutUnit outlineWidth) const
{
- IntRect r(clippedOverflowRectForRepaint(repaintContainer));
+ LayoutRect r(clippedOverflowRectForRepaint(repaintContainer));
r.inflate(outlineWidth);
return r;
}
-IntRect RenderObject::clippedOverflowRectForRepaint(RenderBoxModelObject*) const
+LayoutRect RenderObject::clippedOverflowRectForRepaint(RenderBoxModelObject*) const
{
ASSERT_NOT_REACHED();
- return IntRect();
+ return LayoutRect();
}
void RenderObject::computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& rect, bool fixed) const
Modified: trunk/Source/WebCore/rendering/RenderObject.h (98766 => 98767)
--- trunk/Source/WebCore/rendering/RenderObject.h 2011-10-28 21:46:17 UTC (rev 98766)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2011-10-28 21:55:11 UTC (rev 98767)
@@ -708,8 +708,8 @@
{
return clippedOverflowRectForRepaint(0);
}
- virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
- virtual IntRect rectWithOutlineForRepaint(RenderBoxModelObject* repaintContainer, int outlineWidth) const;
+ virtual LayoutRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
+ virtual LayoutRect rectWithOutlineForRepaint(RenderBoxModelObject* repaintContainer, LayoutUnit outlineWidth) const;
// Given a rect in the object's coordinate space, compute a rect suitable for repainting
// that rect in view coordinates.
Modified: trunk/Source/WebCore/rendering/RenderReplaced.cpp (98766 => 98767)
--- trunk/Source/WebCore/rendering/RenderReplaced.cpp 2011-10-28 21:46:17 UTC (rev 98766)
+++ trunk/Source/WebCore/rendering/RenderReplaced.cpp 2011-10-28 21:55:11 UTC (rev 98767)
@@ -513,14 +513,14 @@
m_intrinsicSize = size;
}
-IntRect RenderReplaced::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const
+LayoutRect RenderReplaced::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const
{
if (style()->visibility() != VISIBLE && !enclosingLayer()->hasVisibleContent())
- return IntRect();
+ return LayoutRect();
// The selectionRect can project outside of the overflowRect, so take their union
// for repainting to avoid selection painting glitches.
- IntRect r = unionRect(localSelectionRect(false), visualOverflowRect());
+ LayoutRect r = unionRect(localSelectionRect(false), visualOverflowRect());
RenderView* v = view();
if (v) {
Modified: trunk/Source/WebCore/rendering/RenderReplaced.h (98766 => 98767)
--- trunk/Source/WebCore/rendering/RenderReplaced.h 2011-10-28 21:46:17 UTC (rev 98766)
+++ trunk/Source/WebCore/rendering/RenderReplaced.h 2011-10-28 21:55:11 UTC (rev 98767)
@@ -76,7 +76,7 @@
virtual void paintReplaced(PaintInfo&, const LayoutPoint&) { }
- virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
+ virtual LayoutRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
virtual VisiblePosition positionForPoint(const LayoutPoint&);
Modified: trunk/Source/WebCore/rendering/RenderTableCell.cpp (98766 => 98767)
--- trunk/Source/WebCore/rendering/RenderTableCell.cpp 2011-10-28 21:46:17 UTC (rev 98766)
+++ trunk/Source/WebCore/rendering/RenderTableCell.cpp 2011-10-28 21:55:11 UTC (rev 98767)
@@ -236,7 +236,7 @@
return offset;
}
-IntRect RenderTableCell::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const
+LayoutRect RenderTableCell::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const
{
// If the table grid is dirty, we cannot get reliable information about adjoining cells,
// so we ignore outside borders. This should not be a problem because it means that
Modified: trunk/Source/WebCore/rendering/RenderTableCell.h (98766 => 98767)
--- trunk/Source/WebCore/rendering/RenderTableCell.h 2011-10-28 21:46:17 UTC (rev 98766)
+++ trunk/Source/WebCore/rendering/RenderTableCell.h 2011-10-28 21:55:11 UTC (rev 98767)
@@ -154,7 +154,7 @@
virtual void paintMask(PaintInfo&, const LayoutPoint&);
virtual LayoutSize offsetFromContainer(RenderObject*, const LayoutPoint&) const;
- virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
+ virtual LayoutRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false) const;
void paintCollapsedBorder(GraphicsContext*, const LayoutRect&);
Modified: trunk/Source/WebCore/rendering/RenderTableCol.cpp (98766 => 98767)
--- trunk/Source/WebCore/rendering/RenderTableCol.cpp 2011-10-28 21:46:17 UTC (rev 98766)
+++ trunk/Source/WebCore/rendering/RenderTableCol.cpp 2011-10-28 21:55:11 UTC (rev 98767)
@@ -81,7 +81,7 @@
return style()->display() == TABLE_COLUMN_GROUP;
}
-IntRect RenderTableCol::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const
+LayoutRect RenderTableCol::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const
{
// For now, just repaint the whole table.
// FIXME: Find a better way to do this, e.g., need to repaint all the cells that we
Modified: trunk/Source/WebCore/rendering/RenderTableCol.h (98766 => 98767)
--- trunk/Source/WebCore/rendering/RenderTableCol.h 2011-10-28 21:46:17 UTC (rev 98766)
+++ trunk/Source/WebCore/rendering/RenderTableCol.h 2011-10-28 21:55:11 UTC (rev 98767)
@@ -56,7 +56,7 @@
virtual bool canHaveChildren() const;
virtual bool requiresLayer() const { return false; }
- virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
+ virtual LayoutRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
virtual void imageChanged(WrappedImagePtr, const IntRect* = 0);
virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
Modified: trunk/Source/WebCore/rendering/RenderTableRow.cpp (98766 => 98767)
--- trunk/Source/WebCore/rendering/RenderTableRow.cpp 2011-10-28 21:46:17 UTC (rev 98766)
+++ trunk/Source/WebCore/rendering/RenderTableRow.cpp 2011-10-28 21:55:11 UTC (rev 98767)
@@ -184,7 +184,7 @@
setNeedsLayout(false);
}
-IntRect RenderTableRow::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const
+LayoutRect RenderTableRow::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const
{
ASSERT(parent());
@@ -198,7 +198,7 @@
if (RenderTable* parentTable = table())
return parentTable->clippedOverflowRectForRepaint(repaintContainer);
- return IntRect();
+ return LayoutRect();
}
// Hit Testing
Modified: trunk/Source/WebCore/rendering/RenderTableRow.h (98766 => 98767)
--- trunk/Source/WebCore/rendering/RenderTableRow.h 2011-10-28 21:46:17 UTC (rev 98766)
+++ trunk/Source/WebCore/rendering/RenderTableRow.h 2011-10-28 21:55:11 UTC (rev 98767)
@@ -53,7 +53,7 @@
virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0);
virtual void layout();
- virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
+ virtual LayoutRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset, HitTestAction);
// The only time rows get a layer is when they have transparency.
Modified: trunk/Source/WebCore/rendering/RenderText.cpp (98766 => 98767)
--- trunk/Source/WebCore/rendering/RenderText.cpp 2011-10-28 21:46:17 UTC (rev 98766)
+++ trunk/Source/WebCore/rendering/RenderText.cpp 2011-10-28 21:55:11 UTC (rev 98767)
@@ -1520,7 +1520,7 @@
return rect;
}
-IntRect RenderText::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const
+LayoutRect RenderText::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const
{
RenderObject* rendererToRepaint = containingBlock();
Modified: trunk/Source/WebCore/rendering/RenderText.h (98766 => 98767)
--- trunk/Source/WebCore/rendering/RenderText.h 2011-10-28 21:46:17 UTC (rev 98766)
+++ trunk/Source/WebCore/rendering/RenderText.h 2011-10-28 21:55:11 UTC (rev 98767)
@@ -100,7 +100,7 @@
virtual LayoutUnit marginLeft() const { return style()->marginLeft().calcMinValue(0); }
virtual LayoutUnit marginRight() const { return style()->marginRight().calcMinValue(0); }
- virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
+ virtual LayoutRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
InlineTextBox* firstTextBox() const { return m_firstTextBox; }
InlineTextBox* lastTextBox() const { return m_lastTextBox; }
