Diff
Modified: trunk/Source/WebCore/ChangeLog (87752 => 87753)
--- trunk/Source/WebCore/ChangeLog 2011-05-31 21:50:19 UTC (rev 87752)
+++ trunk/Source/WebCore/ChangeLog 2011-05-31 21:55:41 UTC (rev 87753)
@@ -1,3 +1,47 @@
+2011-05-31 Levi Weintraub <[email protected]>
+
+ Reviewed by Simon Fraser.
+
+ Change InlineBox::paint and its overloaded variants to use IntPoint
+ https://bugs.webkit.org/show_bug.cgi?id=61804
+
+ Changing InlineBox::paint, its 7 overloaded variants, and RootInlineBox::paintEllipsisBox
+ to use IntPoint for their paint offset instead of a pair of ints.
+
+ No new tests since this is just a refactoring.
+
+ * rendering/EllipsisBox.cpp:
+ (WebCore::EllipsisBox::paint):
+ * rendering/EllipsisBox.h:
+ * rendering/InlineBox.cpp:
+ (WebCore::InlineBox::paint):
+ * rendering/InlineBox.h:
+ * rendering/InlineFlowBox.cpp:
+ (WebCore::InlineFlowBox::paint):
+ * rendering/InlineFlowBox.h:
+ * rendering/InlineTextBox.cpp:
+ (WebCore::InlineTextBox::paint):
+ * rendering/InlineTextBox.h:
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::paintEllipsisBoxes):
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::paintFillLayerExtended):
+ * rendering/RenderLineBoxList.cpp:
+ (WebCore::RenderLineBoxList::paint):
+ * rendering/RootInlineBox.cpp:
+ (WebCore::RootInlineBox::paintEllipsisBox):
+ (WebCore::RootInlineBox::paint):
+ * rendering/RootInlineBox.h:
+ * rendering/svg/SVGInlineFlowBox.cpp:
+ (WebCore::SVGInlineFlowBox::paint):
+ * rendering/svg/SVGInlineFlowBox.h:
+ * rendering/svg/SVGInlineTextBox.cpp:
+ (WebCore::SVGInlineTextBox::paint):
+ * rendering/svg/SVGInlineTextBox.h:
+ * rendering/svg/SVGRootInlineBox.cpp:
+ (WebCore::SVGRootInlineBox::paint):
+ * rendering/svg/SVGRootInlineBox.h:
+
2011-05-31 James Robinson <[email protected]>
Reviewed by Kenneth Russell.
Modified: trunk/Source/WebCore/rendering/EllipsisBox.cpp (87752 => 87753)
--- trunk/Source/WebCore/rendering/EllipsisBox.cpp 2011-05-31 21:50:19 UTC (rev 87752)
+++ trunk/Source/WebCore/rendering/EllipsisBox.cpp 2011-05-31 21:55:41 UTC (rev 87753)
@@ -30,7 +30,7 @@
namespace WebCore {
-void EllipsisBox::paint(PaintInfo& paintInfo, int tx, int ty, int lineTop, int lineBottom)
+void EllipsisBox::paint(PaintInfo& paintInfo, const IntPoint& paintOffset, int lineTop, int lineBottom)
{
GraphicsContext* context = paintInfo.context;
RenderStyle* style = m_renderer->style(m_firstLine);
@@ -46,7 +46,7 @@
const Font& font = style->font();
if (selectionState() != RenderObject::SelectionNone) {
- paintSelection(context, tx, ty, style, font);
+ paintSelection(context, paintOffset.x(), paintOffset.y(), style, font);
// Select the correct color for painting the text.
Color foreground = paintInfo.forceBlackText ? Color::black : renderer()->selectionForegroundColor();
@@ -55,7 +55,7 @@
}
// FIXME: Why is this always LTR? Fix by passing correct text run flags below.
- context->drawText(font, RenderBlock::constructTextRun(renderer(), font, m_str, style, TextRun::AllowTrailingExpansion), IntPoint(m_x + tx, m_y + ty + style->fontMetrics().ascent()));
+ context->drawText(font, RenderBlock::constructTextRun(renderer(), font, m_str, style, TextRun::AllowTrailingExpansion), IntPoint(m_x + paintOffset.x(), m_y + paintOffset.y() + style->fontMetrics().ascent()));
// Restore the regular fill color.
if (textColor != context->fillColor())
@@ -66,9 +66,10 @@
if (m_markupBox) {
// Paint the markup box
- tx += m_x + m_logicalWidth - m_markupBox->x();
- ty += m_y + style->fontMetrics().ascent() - (m_markupBox->y() + m_markupBox->renderer()->style(m_firstLine)->fontMetrics().ascent());
- m_markupBox->paint(paintInfo, tx, ty, lineTop, lineBottom);
+ IntPoint adjustedPaintOffset = paintOffset;
+ adjustedPaintOffset.move(m_x + m_logicalWidth - m_markupBox->x(),
+ m_y + style->fontMetrics().ascent() - (m_markupBox->y() + m_markupBox->renderer()->style(m_firstLine)->fontMetrics().ascent()));
+ m_markupBox->paint(paintInfo, adjustedPaintOffset, lineTop, lineBottom);
}
}
Modified: trunk/Source/WebCore/rendering/EllipsisBox.h (87752 => 87753)
--- trunk/Source/WebCore/rendering/EllipsisBox.h 2011-05-31 21:50:19 UTC (rev 87752)
+++ trunk/Source/WebCore/rendering/EllipsisBox.h 2011-05-31 21:55:41 UTC (rev 87753)
@@ -39,7 +39,7 @@
{
}
- virtual void paint(PaintInfo&, int tx, int ty, int lineTop, int lineBottom);
+ virtual void paint(PaintInfo&, const IntPoint&, int lineTop, int lineBottom);
virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const IntPoint& pointInContainer, int tx, int ty, int lineTop, int lineBottom);
void setSelectionState(RenderObject::SelectionState s) { m_selectionState = s; }
IntRect selectionRect(int tx, int ty);
Modified: trunk/Source/WebCore/rendering/InlineBox.cpp (87752 => 87753)
--- trunk/Source/WebCore/rendering/InlineBox.cpp 2011-05-31 21:50:19 UTC (rev 87752)
+++ trunk/Source/WebCore/rendering/InlineBox.cpp 2011-05-31 21:55:41 UTC (rev 87753)
@@ -193,12 +193,12 @@
toRenderBox(m_renderer)->move(dx, dy);
}
-void InlineBox::paint(PaintInfo& paintInfo, int tx, int ty, int /* lineTop */, int /*lineBottom*/)
+void InlineBox::paint(PaintInfo& paintInfo, const IntPoint& paintOffset, int /* lineTop */, int /*lineBottom*/)
{
if (!paintInfo.shouldPaintWithinRoot(renderer()) || (paintInfo.phase != PaintPhaseForeground && paintInfo.phase != PaintPhaseSelection))
return;
- IntPoint childPoint = IntPoint(tx, ty);
+ IntPoint childPoint = paintOffset;
if (parent()->renderer()->style()->isFlippedBlocksWritingMode()) // Faster than calling containingBlock().
childPoint = renderer()->containingBlock()->flipForWritingMode(toRenderBox(renderer()), childPoint, RenderBox::ParentToChildFlippingAdjustment);
Modified: trunk/Source/WebCore/rendering/InlineBox.h (87752 => 87753)
--- trunk/Source/WebCore/rendering/InlineBox.h 2011-05-31 21:50:19 UTC (rev 87752)
+++ trunk/Source/WebCore/rendering/InlineBox.h 2011-05-31 21:55:41 UTC (rev 87753)
@@ -129,7 +129,7 @@
adjustPosition(delta, 0);
}
- virtual void paint(PaintInfo&, int tx, int ty, int lineTop, int lineBottom);
+ virtual void paint(PaintInfo&, const IntPoint&, int lineTop, int lineBottom);
virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const IntPoint& pointInContainer, int tx, int ty, int lineTop, int lineBottom);
InlineBox* next() const { return m_next; }
Modified: trunk/Source/WebCore/rendering/InlineFlowBox.cpp (87752 => 87753)
--- trunk/Source/WebCore/rendering/InlineFlowBox.cpp 2011-05-31 21:50:19 UTC (rev 87752)
+++ trunk/Source/WebCore/rendering/InlineFlowBox.cpp 2011-05-31 21:55:41 UTC (rev 87753)
@@ -946,12 +946,12 @@
return false;
}
-void InlineFlowBox::paint(PaintInfo& paintInfo, int tx, int ty, int lineTop, int lineBottom)
+void InlineFlowBox::paint(PaintInfo& paintInfo, const IntPoint& paintOffset, int lineTop, int lineBottom)
{
IntRect overflowRect(visualOverflowRect(lineTop, lineBottom));
overflowRect.inflate(renderer()->maximalOutlineSize(paintInfo.phase));
flipForWritingMode(overflowRect);
- overflowRect.move(tx, ty);
+ overflowRect.move(paintOffset);
if (!paintInfo.rect.intersects(overflowRect))
return;
@@ -991,11 +991,11 @@
paintInfo.outlineObjects->add(inlineFlow);
}
} else if (paintInfo.phase == PaintPhaseMask) {
- paintMask(paintInfo, tx, ty);
+ paintMask(paintInfo, paintOffset.x(), paintOffset.y());
return;
} else {
// Paint our background, border and box-shadow.
- paintBoxDecorations(paintInfo, tx, ty);
+ paintBoxDecorations(paintInfo, paintOffset.x(), paintOffset.y());
}
}
@@ -1011,7 +1011,7 @@
if (paintPhase != PaintPhaseSelfOutline) {
for (InlineBox* curr = firstChild(); curr; curr = curr->nextOnLine()) {
if (curr->renderer()->isText() || !curr->boxModelObject()->hasSelfPaintingLayer())
- curr->paint(childInfo, tx, ty, lineTop, lineBottom);
+ curr->paint(childInfo, paintOffset, lineTop, lineBottom);
}
}
}
Modified: trunk/Source/WebCore/rendering/InlineFlowBox.h (87752 => 87753)
--- trunk/Source/WebCore/rendering/InlineFlowBox.h 2011-05-31 21:50:19 UTC (rev 87752)
+++ trunk/Source/WebCore/rendering/InlineFlowBox.h 2011-05-31 21:55:41 UTC (rev 87753)
@@ -108,7 +108,7 @@
void paintFillLayers(const PaintInfo&, const Color&, const FillLayer*, const IntRect&, CompositeOperator = CompositeSourceOver);
void paintFillLayer(const PaintInfo&, const Color&, const FillLayer*, const IntRect&, CompositeOperator = CompositeSourceOver);
void paintBoxShadow(GraphicsContext*, RenderStyle*, ShadowStyle, const IntRect&);
- virtual void paint(PaintInfo&, int tx, int ty, int lineTop, int lineBottom);
+ virtual void paint(PaintInfo&, const IntPoint&, int lineTop, int lineBottom);
virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const IntPoint& pointInContainer, int tx, int ty, int lineTop, int lineBottom);
virtual RenderLineBoxList* rendererLineBoxes() const;
Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (87752 => 87753)
--- trunk/Source/WebCore/rendering/InlineTextBox.cpp 2011-05-31 21:50:19 UTC (rev 87752)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp 2011-05-31 21:55:41 UTC (rev 87753)
@@ -463,7 +463,7 @@
: AffineTransform(0, -1, 1, 0, boxRect.x() - boxRect.maxY(), boxRect.x() + boxRect.maxY());
}
-void InlineTextBox::paint(PaintInfo& paintInfo, int tx, int ty, int /*lineTop*/, int /*lineBottom*/)
+void InlineTextBox::paint(PaintInfo& paintInfo, const IntPoint& paintOffset, int /*lineTop*/, int /*lineBottom*/)
{
if (isLineBreak() || !paintInfo.shouldPaintWithinRoot(renderer()) || renderer()->style()->visibility() != VISIBLE ||
m_truncation == cFullTruncation || paintInfo.phase == PaintPhaseOutline || !m_len)
@@ -473,12 +473,14 @@
int logicalLeftSide = logicalLeftVisualOverflow();
int logicalRightSide = logicalRightVisualOverflow();
- int logicalStart = logicalLeftSide + (isHorizontal() ? tx : ty);
+ int logicalStart = logicalLeftSide + (isHorizontal() ? paintOffset.x() : paintOffset.y());
int logicalExtent = logicalRightSide - logicalLeftSide;
int paintEnd = isHorizontal() ? paintInfo.rect.maxX() : paintInfo.rect.maxY();
int paintStart = isHorizontal() ? paintInfo.rect.x() : paintInfo.rect.y();
+ IntPoint adjustedPaintOffset = paintOffset;
+
if (logicalStart >= paintEnd || logicalStart + logicalExtent <= paintStart)
return;
@@ -503,10 +505,8 @@
int widthOfVisibleText = toRenderText(renderer())->width(m_start, m_truncation, textPos(), m_firstLine);
int widthOfHiddenText = m_logicalWidth - widthOfVisibleText;
// FIXME: The hit testing logic also needs to take this translation int account.
- if (isHorizontal())
- tx += isLeftToRightDirection() ? widthOfHiddenText : -widthOfHiddenText;
- else
- ty += isLeftToRightDirection() ? widthOfHiddenText : -widthOfHiddenText;
+ IntSize truncationOffset(isLeftToRightDirection() ? widthOfHiddenText : -widthOfHiddenText, 0);
+ adjustedPaintOffset.move(isHorizontal() ? truncationOffset : truncationOffset.transposedSize());
}
}
@@ -514,10 +514,10 @@
RenderStyle* styleToUse = renderer()->style(m_firstLine);
- ty -= styleToUse->isHorizontalWritingMode() ? 0 : logicalHeight();
+ adjustedPaintOffset.move(0, styleToUse->isHorizontalWritingMode() ? 0 : -logicalHeight());
FloatPoint boxOrigin = locationIncludingFlipping();
- boxOrigin.move(tx, ty);
+ boxOrigin.move(adjustedPaintOffset.x(), adjustedPaintOffset.y());
FloatRect boxRect(boxOrigin, IntSize(logicalWidth(), logicalHeight()));
RenderCombineText* combinedText = styleToUse->hasTextCombine() && textRenderer()->isCombineText() && toRenderCombineText(textRenderer())->isCombined() ? toRenderCombineText(textRenderer()) : 0;
@@ -544,7 +544,7 @@
#if PLATFORM(MAC)
// Custom highlighters go behind everything else.
if (styleToUse->highlight() != nullAtom && !context->paintingDisabled())
- paintCustomHighlight(tx, ty, styleToUse->highlight());
+ paintCustomHighlight(adjustedPaintOffset.x(), adjustedPaintOffset.y(), styleToUse->highlight());
#endif
if (containsComposition && !useCustomUnderlines)
Modified: trunk/Source/WebCore/rendering/InlineTextBox.h (87752 => 87753)
--- trunk/Source/WebCore/rendering/InlineTextBox.h 2011-05-31 21:50:19 UTC (rev 87752)
+++ trunk/Source/WebCore/rendering/InlineTextBox.h 2011-05-31 21:55:41 UTC (rev 87753)
@@ -110,7 +110,7 @@
void selectionStartEnd(int& sPos, int& ePos);
protected:
- virtual void paint(PaintInfo&, int tx, int ty, int lineTop, int lineBottom);
+ virtual void paint(PaintInfo&, const IntPoint&, int lineTop, int lineBottom);
virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const IntPoint& pointInContainer, int tx, int ty, int lineTop, int lineBottom);
public:
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (87752 => 87753)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2011-05-31 21:50:19 UTC (rev 87752)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2011-05-31 21:55:41 UTC (rev 87753)
@@ -2608,7 +2608,7 @@
yPos = ty + curr->y();
h = curr->logicalHeight();
if (curr->ellipsisBox() && yPos < paintInfo.rect.maxY() && yPos + h > paintInfo.rect.y())
- curr->paintEllipsisBox(paintInfo, tx, ty, curr->lineTop(), curr->lineBottom());
+ curr->paintEllipsisBox(paintInfo, IntPoint(tx, ty), curr->lineTop(), curr->lineBottom());
}
}
}
Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (87752 => 87753)
--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2011-05-31 21:50:19 UTC (rev 87752)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2011-05-31 21:55:41 UTC (rev 87753)
@@ -694,7 +694,7 @@
PaintInfo info(maskImageContext, maskRect, PaintPhaseTextClip, true, 0, 0);
if (box) {
RootInlineBox* root = box->root();
- box->paint(info, scrolledPaintRect.x() - box->x(), scrolledPaintRect.y() - box->y(), root->lineTop(), root->lineBottom());
+ box->paint(info, IntPoint(scrolledPaintRect.x() - box->x(), scrolledPaintRect.y() - box->y()), root->lineTop(), root->lineBottom());
} else {
int x = isBox() ? toRenderBox(this)->x() : 0;
int y = isBox() ? toRenderBox(this)->y() : 0;
Modified: trunk/Source/WebCore/rendering/RenderLineBoxList.cpp (87752 => 87753)
--- trunk/Source/WebCore/rendering/RenderLineBoxList.cpp 2011-05-31 21:50:19 UTC (rev 87752)
+++ trunk/Source/WebCore/rendering/RenderLineBoxList.cpp 2011-05-31 21:55:41 UTC (rev 87753)
@@ -259,7 +259,7 @@
if (lineIntersectsDirtyRect(renderer, curr, info, tx, ty)) {
RootInlineBox* root = curr->root();
- curr->paint(info, tx, ty, root->lineTop(), root->lineBottom());
+ curr->paint(info, IntPoint(tx, ty), root->lineTop(), root->lineBottom());
}
}
Modified: trunk/Source/WebCore/rendering/RootInlineBox.cpp (87752 => 87753)
--- trunk/Source/WebCore/rendering/RootInlineBox.cpp 2011-05-31 21:50:19 UTC (rev 87752)
+++ trunk/Source/WebCore/rendering/RootInlineBox.cpp 2011-05-31 21:55:41 UTC (rev 87753)
@@ -133,11 +133,11 @@
return result;
}
-void RootInlineBox::paintEllipsisBox(PaintInfo& paintInfo, int tx, int ty, int lineTop, int lineBottom) const
+void RootInlineBox::paintEllipsisBox(PaintInfo& paintInfo, const IntPoint& paintOffset, int lineTop, int lineBottom) const
{
if (hasEllipsisBox() && paintInfo.shouldPaintWithinRoot(renderer()) && renderer()->style()->visibility() == VISIBLE
&& paintInfo.phase == PaintPhaseForeground)
- ellipsisBox()->paint(paintInfo, tx, ty, lineTop, lineBottom);
+ ellipsisBox()->paint(paintInfo, paintOffset, lineTop, lineBottom);
}
#if PLATFORM(MAC)
@@ -178,14 +178,14 @@
#endif
-void RootInlineBox::paint(PaintInfo& paintInfo, int tx, int ty, int lineTop, int lineBottom)
+void RootInlineBox::paint(PaintInfo& paintInfo, const IntPoint& paintOffset, int lineTop, int lineBottom)
{
- InlineFlowBox::paint(paintInfo, tx, ty, lineTop, lineBottom);
- paintEllipsisBox(paintInfo, tx, ty, lineTop, lineBottom);
+ InlineFlowBox::paint(paintInfo, paintOffset, lineTop, lineBottom);
+ paintEllipsisBox(paintInfo, paintOffset, lineTop, lineBottom);
#if PLATFORM(MAC)
RenderStyle* styleToUse = renderer()->style(m_firstLine);
if (styleToUse->highlight() != nullAtom && !paintInfo.context->paintingDisabled())
- paintCustomHighlight(paintInfo, tx, ty, styleToUse->highlight());
+ paintCustomHighlight(paintInfo, paintOffset.x(), paintOffset.y(), styleToUse->highlight());
#endif
}
Modified: trunk/Source/WebCore/rendering/RootInlineBox.h (87752 => 87753)
--- trunk/Source/WebCore/rendering/RootInlineBox.h 2011-05-31 21:50:19 UTC (rev 87752)
+++ trunk/Source/WebCore/rendering/RootInlineBox.h 2011-05-31 21:55:41 UTC (rev 87753)
@@ -83,7 +83,7 @@
EllipsisBox* ellipsisBox() const;
- void paintEllipsisBox(PaintInfo&, int tx, int ty, int lineTop, int lineBottom) const;
+ void paintEllipsisBox(PaintInfo&, const IntPoint&, int lineTop, int lineBottom) const;
virtual void clearTruncation();
@@ -95,7 +95,7 @@
void paintCustomHighlight(PaintInfo&, int tx, int ty, const AtomicString& highlightType);
#endif
- virtual void paint(PaintInfo&, int tx, int ty, int lineTop, int lineBottom);
+ virtual void paint(PaintInfo&, const IntPoint&, int lineTop, int lineBottom);
virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const IntPoint& pointInContainer, int tx, int ty, int lineTop, int lineBottom);
bool hasSelectedChildren() const { return m_hasSelectedChildrenOrCanHaveLeadingExpansion; }
Modified: trunk/Source/WebCore/rendering/svg/SVGInlineFlowBox.cpp (87752 => 87753)
--- trunk/Source/WebCore/rendering/svg/SVGInlineFlowBox.cpp 2011-05-31 21:50:19 UTC (rev 87752)
+++ trunk/Source/WebCore/rendering/svg/SVGInlineFlowBox.cpp 2011-05-31 21:55:41 UTC (rev 87753)
@@ -49,7 +49,7 @@
}
}
-void SVGInlineFlowBox::paint(PaintInfo& paintInfo, int, int, int, int)
+void SVGInlineFlowBox::paint(PaintInfo& paintInfo, const IntPoint&, int, int)
{
ASSERT(paintInfo.phase == PaintPhaseForeground || paintInfo.phase == PaintPhaseSelection);
ASSERT(!paintInfo.context->paintingDisabled());
@@ -65,7 +65,7 @@
if (child->isSVGInlineTextBox())
computeTextMatchMarkerRectForRenderer(toRenderSVGInlineText(static_cast<SVGInlineTextBox*>(child)->textRenderer()));
- child->paint(childPaintInfo, 0, 0, 0, 0);
+ child->paint(childPaintInfo, IntPoint(), 0, 0);
}
}
Modified: trunk/Source/WebCore/rendering/svg/SVGInlineFlowBox.h (87752 => 87753)
--- trunk/Source/WebCore/rendering/svg/SVGInlineFlowBox.h 2011-05-31 21:50:19 UTC (rev 87752)
+++ trunk/Source/WebCore/rendering/svg/SVGInlineFlowBox.h 2011-05-31 21:55:41 UTC (rev 87753)
@@ -41,7 +41,7 @@
void setLogicalHeight(int h) { m_logicalHeight = h; }
void paintSelectionBackground(PaintInfo&);
- virtual void paint(PaintInfo&, int tx, int ty, int lineTop, int lineBottom);
+ virtual void paint(PaintInfo&, const IntPoint&, int lineTop, int lineBottom);
virtual IntRect calculateBoundaries() const;
Modified: trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp (87752 => 87753)
--- trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp 2011-05-31 21:50:19 UTC (rev 87752)
+++ trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp 2011-05-31 21:55:41 UTC (rev 87753)
@@ -240,7 +240,7 @@
ASSERT(!m_paintingResource);
}
-void SVGInlineTextBox::paint(PaintInfo& paintInfo, int, int, int, int)
+void SVGInlineTextBox::paint(PaintInfo& paintInfo, const IntPoint&, int, int)
{
ASSERT(paintInfo.shouldPaintWithinRoot(renderer()));
ASSERT(paintInfo.phase == PaintPhaseForeground || paintInfo.phase == PaintPhaseSelection);
Modified: trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.h (87752 => 87753)
--- trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.h 2011-05-31 21:50:19 UTC (rev 87752)
+++ trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.h 2011-05-31 21:55:41 UTC (rev 87753)
@@ -46,7 +46,7 @@
virtual float positionForOffset(int offset) const;
void paintSelectionBackground(PaintInfo&);
- virtual void paint(PaintInfo&, int tx, int ty, int lineTop, int lineBottom);
+ virtual void paint(PaintInfo&, const IntPoint&, int lineTop, int lineBottom);
virtual IntRect selectionRect(int absx, int absy, int startPosition, int endPosition);
bool mapStartEndPositionsIntoFragmentCoordinates(const SVGTextFragment&, int& startPosition, int& endPosition) const;
Modified: trunk/Source/WebCore/rendering/svg/SVGRootInlineBox.cpp (87752 => 87753)
--- trunk/Source/WebCore/rendering/svg/SVGRootInlineBox.cpp 2011-05-31 21:50:19 UTC (rev 87752)
+++ trunk/Source/WebCore/rendering/svg/SVGRootInlineBox.cpp 2011-05-31 21:55:41 UTC (rev 87753)
@@ -36,7 +36,7 @@
namespace WebCore {
-void SVGRootInlineBox::paint(PaintInfo& paintInfo, int, int, int, int)
+void SVGRootInlineBox::paint(PaintInfo& paintInfo, const IntPoint&, int, int)
{
ASSERT(paintInfo.phase == PaintPhaseForeground || paintInfo.phase == PaintPhaseSelection);
ASSERT(!paintInfo.context->paintingDisabled());
@@ -64,7 +64,7 @@
if (child->isSVGInlineTextBox())
SVGInlineFlowBox::computeTextMatchMarkerRectForRenderer(toRenderSVGInlineText(static_cast<SVGInlineTextBox*>(child)->textRenderer()));
- child->paint(childPaintInfo, 0, 0, 0, 0);
+ child->paint(childPaintInfo, IntPoint(), 0, 0);
}
}
Modified: trunk/Source/WebCore/rendering/svg/SVGRootInlineBox.h (87752 => 87753)
--- trunk/Source/WebCore/rendering/svg/SVGRootInlineBox.h 2011-05-31 21:50:19 UTC (rev 87752)
+++ trunk/Source/WebCore/rendering/svg/SVGRootInlineBox.h 2011-05-31 21:55:41 UTC (rev 87753)
@@ -45,7 +45,7 @@
virtual int virtualLogicalHeight() const { return m_logicalHeight; }
void setLogicalHeight(int height) { m_logicalHeight = height; }
- virtual void paint(PaintInfo&, int tx, int ty, int lineTop, int lineBottom);
+ virtual void paint(PaintInfo&, const IntPoint&, int lineTop, int lineBottom);
void computePerCharacterLayoutInformation();
