Diff
Modified: trunk/Source/WebCore/ChangeLog (87301 => 87302)
--- trunk/Source/WebCore/ChangeLog 2011-05-25 16:50:53 UTC (rev 87301)
+++ trunk/Source/WebCore/ChangeLog 2011-05-25 17:04:47 UTC (rev 87302)
@@ -1,3 +1,50 @@
+2011-05-25 Levi Weintraub <le...@chromium.org>
+
+ Reviewed by Eric Seidel.
+
+ Switch addFocusRingRects to use IntPoint
+ https://bugs.webkit.org/show_bug.cgi?id=60783
+
+ Switching addFocusRingRects to use an IntPoint representing the offset being
+ applied instead of a pair of ints.
+
+ No new tests as this is only refactoring.
+
+ * platform/graphics/FloatSize.h:
+ (WebCore::flooredIntPoint):
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::addFocusRingRects):
+ * rendering/RenderBlock.h:
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::addFocusRingRects):
+ * rendering/RenderBox.h:
+ * rendering/RenderInline.cpp:
+ (WebCore::RenderInline::addFocusRingRects):
+ * rendering/RenderInline.h:
+ * rendering/RenderListBox.cpp:
+ (WebCore::RenderListBox::addFocusRingRects):
+ * rendering/RenderListBox.h:
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::paintFocusRing):
+ (WebCore::RenderObject::absoluteFocusRingQuads):
+ * rendering/RenderObject.h:
+ (WebCore::RenderObject::addFocusRingRects):
+ * rendering/RenderTextControl.cpp:
+ (WebCore::RenderTextControl::addFocusRingRects):
+ * rendering/RenderTextControl.h:
+ * rendering/RenderTextControlSingleLine.cpp:
+ (WebCore::RenderTextControlSingleLine::addFocusRingRects):
+ * rendering/RenderTextControlSingleLine.h:
+ * rendering/svg/RenderSVGContainer.cpp:
+ (WebCore::RenderSVGContainer::addFocusRingRects):
+ * rendering/svg/RenderSVGContainer.h:
+ * rendering/svg/RenderSVGImage.cpp:
+ (WebCore::RenderSVGImage::addFocusRingRects):
+ * rendering/svg/RenderSVGImage.h:
+ * rendering/svg/RenderSVGPath.cpp:
+ (WebCore::RenderSVGPath::addFocusRingRects):
+ * rendering/svg/RenderSVGPath.h:
+
2011-05-25 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r87229.
Modified: trunk/Source/WebCore/platform/graphics/FloatSize.h (87301 => 87302)
--- trunk/Source/WebCore/platform/graphics/FloatSize.h 2011-05-25 16:50:53 UTC (rev 87301)
+++ trunk/Source/WebCore/platform/graphics/FloatSize.h 2011-05-25 17:04:47 UTC (rev 87302)
@@ -28,7 +28,7 @@
#ifndef FloatSize_h
#define FloatSize_h
-#include "IntSize.h"
+#include "IntPoint.h"
#include <wtf/MathExtras.h>
#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
@@ -155,6 +155,11 @@
return IntSize(clampToInteger(ceilf(p.width())), clampToInteger(ceilf(p.height())));
}
+inline IntPoint flooredIntPoint(const FloatSize& p)
+{
+ return IntPoint(static_cast<int>(p.width()), static_cast<int>(p.height()));
+}
+
} // namespace WebCore
#endif // FloatSize_h
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (87301 => 87302)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2011-05-25 16:50:53 UTC (rev 87301)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2011-05-25 17:04:47 UTC (rev 87302)
@@ -5843,7 +5843,7 @@
return IntRect(x, y, caretWidth, height);
}
-void RenderBlock::addFocusRingRects(Vector<IntRect>& rects, int tx, int ty)
+void RenderBlock::addFocusRingRects(Vector<IntRect>& rects, const IntPoint& additionalOffset)
{
// For blocks inside inlines, we go ahead and include margins so that we run right up to the
// inline boxes above and below us (thus getting merged with them to form a single irregular
@@ -5857,17 +5857,17 @@
bool prevInlineHasLineBox = toRenderInline(inlineElementContinuation()->node()->renderer())->firstLineBox();
int topMargin = prevInlineHasLineBox ? collapsedMarginBefore() : 0;
int bottomMargin = nextInlineHasLineBox ? collapsedMarginAfter() : 0;
- IntRect rect(tx, ty - topMargin, width(), height() + topMargin + bottomMargin);
+ IntRect rect(additionalOffset.x(), additionalOffset.y() - topMargin, width(), height() + topMargin + bottomMargin);
if (!rect.isEmpty())
rects.append(rect);
} else if (width() && height())
- rects.append(IntRect(tx, ty, width(), height()));
+ rects.append(IntRect(additionalOffset, size()));
if (!hasOverflowClip() && !hasControlClip()) {
for (RootInlineBox* curr = firstRootBox(); curr; curr = curr->nextRootBox()) {
int top = max(curr->lineTop(), curr->logicalTop());
int bottom = min(curr->lineBottom(), curr->logicalTop() + curr->logicalHeight());
- IntRect rect(tx + curr->x(), ty + top, curr->logicalWidth(), bottom - top);
+ IntRect rect(additionalOffset.x() + curr->x(), additionalOffset.y() + top, curr->logicalWidth(), bottom - top);
if (!rect.isEmpty())
rects.append(rect);
}
@@ -5880,16 +5880,14 @@
if (box->layer())
pos = curr->localToAbsolute();
else
- pos = FloatPoint(tx + box->x(), ty + box->y());
- box->addFocusRingRects(rects, pos.x(), pos.y());
+ pos = FloatPoint(additionalOffset.x() + box->x(), additionalOffset.y() + box->y());
+ box->addFocusRingRects(rects, flooredIntPoint(pos));
}
}
}
if (inlineElementContinuation())
- inlineElementContinuation()->addFocusRingRects(rects,
- tx - x() + inlineElementContinuation()->containingBlock()->x(),
- ty - y() + inlineElementContinuation()->containingBlock()->y());
+ inlineElementContinuation()->addFocusRingRects(rects, flooredIntPoint(additionalOffset + inlineElementContinuation()->containingBlock()->location() - location()));
}
RenderBlock* RenderBlock::createAnonymousBlock(bool isFlexibleBox) const
Modified: trunk/Source/WebCore/rendering/RenderBlock.h (87301 => 87302)
--- trunk/Source/WebCore/rendering/RenderBlock.h 2011-05-25 16:50:53 UTC (rev 87301)
+++ trunk/Source/WebCore/rendering/RenderBlock.h 2011-05-25 17:04:47 UTC (rev 87302)
@@ -333,7 +333,7 @@
void addOverflowFromBlockChildren();
void addOverflowFromInlineChildren();
- virtual void addFocusRingRects(Vector<IntRect>&, int tx, int ty);
+ virtual void addFocusRingRects(Vector<IntRect>&, const IntPoint&);
#if ENABLE(SVG)
// Only used by RenderSVGText, which explicitely overrides RenderBlock::layoutBlock(), do NOT use for anything else.
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (87301 => 87302)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2011-05-25 16:50:53 UTC (rev 87301)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2011-05-25 17:04:47 UTC (rev 87302)
@@ -506,10 +506,10 @@
return box;
}
-void RenderBox::addFocusRingRects(Vector<IntRect>& rects, int tx, int ty)
+void RenderBox::addFocusRingRects(Vector<IntRect>& rects, const IntPoint& additionalOffset)
{
- if (width() && height())
- rects.append(IntRect(tx, ty, width(), height()));
+ if (!size().isEmpty())
+ rects.append(IntRect(additionalOffset, size()));
}
IntRect RenderBox::reflectionBox() const
Modified: trunk/Source/WebCore/rendering/RenderBox.h (87301 => 87302)
--- trunk/Source/WebCore/rendering/RenderBox.h 2011-05-25 16:50:53 UTC (rev 87301)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2011-05-25 17:04:47 UTC (rev 87302)
@@ -128,7 +128,7 @@
// Bounds of the outline box in absolute coords. Respects transforms
virtual IntRect outlineBoundsForRepaint(RenderBoxModelObject* /*repaintContainer*/, IntPoint* cachedOffsetToRepaintContainer) const;
- virtual void addFocusRingRects(Vector<IntRect>&, int tx, int ty);
+ virtual void addFocusRingRects(Vector<IntRect>&, const IntPoint&);
// Use this with caution! No type checking is done!
RenderBox* previousSiblingBox() const;
Modified: trunk/Source/WebCore/rendering/RenderInline.cpp (87301 => 87302)
--- trunk/Source/WebCore/rendering/RenderInline.cpp 2011-05-25 16:50:53 UTC (rev 87301)
+++ trunk/Source/WebCore/rendering/RenderInline.cpp 2011-05-25 17:04:47 UTC (rev 87302)
@@ -1337,36 +1337,32 @@
repaint();
}
-void RenderInline::addFocusRingRects(Vector<IntRect>& rects, int tx, int ty)
+void RenderInline::addFocusRingRects(Vector<IntRect>& rects, const IntPoint& additionalOffset)
{
if (!alwaysCreateLineBoxes())
- culledInlineAbsoluteRects(this, rects, IntSize(tx, ty));
+ culledInlineAbsoluteRects(this, rects, toSize(additionalOffset));
else {
for (InlineFlowBox* curr = firstLineBox(); curr; curr = curr->nextLineBox())
- rects.append(enclosingIntRect(FloatRect(tx + curr->x(), ty + curr->y(), curr->width(), curr->height())));
+ rects.append(enclosingIntRect(FloatRect(additionalOffset.x() + curr->x(), additionalOffset.y() + curr->y(), curr->width(), curr->height())));
}
for (RenderObject* curr = firstChild(); curr; curr = curr->nextSibling()) {
if (!curr->isText() && !curr->isListMarker()) {
- FloatPoint pos(tx, ty);
+ FloatPoint pos(additionalOffset);
// FIXME: This doesn't work correctly with transforms.
if (curr->hasLayer())
pos = curr->localToAbsolute();
else if (curr->isBox())
pos.move(toRenderBox(curr)->x(), toRenderBox(curr)->y());
- curr->addFocusRingRects(rects, pos.x(), pos.y());
+ curr->addFocusRingRects(rects, flooredIntPoint(pos));
}
}
if (continuation()) {
if (continuation()->isInline())
- continuation()->addFocusRingRects(rects,
- tx - containingBlock()->x() + continuation()->containingBlock()->x(),
- ty - containingBlock()->y() + continuation()->containingBlock()->y());
+ continuation()->addFocusRingRects(rects, flooredIntPoint(additionalOffset + continuation()->containingBlock()->location() - containingBlock()->location()));
else
- continuation()->addFocusRingRects(rects,
- tx - containingBlock()->x() + toRenderBox(continuation())->x(),
- ty - containingBlock()->y() + toRenderBox(continuation())->y());
+ continuation()->addFocusRingRects(rects, flooredIntPoint(additionalOffset + toRenderBox(continuation())->location() - containingBlock()->location()));
}
}
Modified: trunk/Source/WebCore/rendering/RenderInline.h (87301 => 87302)
--- trunk/Source/WebCore/rendering/RenderInline.h 2011-05-25 16:50:53 UTC (rev 87301)
+++ trunk/Source/WebCore/rendering/RenderInline.h 2011-05-25 17:04:47 UTC (rev 87302)
@@ -75,7 +75,7 @@
IntSize relativePositionedInlineOffset(const RenderBox* child) const;
- virtual void addFocusRingRects(Vector<IntRect>&, int tx, int ty);
+ virtual void addFocusRingRects(Vector<IntRect>&, const IntPoint&);
void paintOutline(GraphicsContext*, int tx, int ty);
using RenderBoxModelObject::continuation;
Modified: trunk/Source/WebCore/rendering/RenderListBox.cpp (87301 => 87302)
--- trunk/Source/WebCore/rendering/RenderListBox.cpp 2011-05-25 16:50:53 UTC (rev 87301)
+++ trunk/Source/WebCore/rendering/RenderListBox.cpp 2011-05-25 17:04:47 UTC (rev 87302)
@@ -299,17 +299,17 @@
}
}
-void RenderListBox::addFocusRingRects(Vector<IntRect>& rects, int tx, int ty)
+void RenderListBox::addFocusRingRects(Vector<IntRect>& rects, const IntPoint& additionalOffset)
{
if (!isSpatialNavigationEnabled(frame()))
- return RenderBlock::addFocusRingRects(rects, tx, ty);
+ return RenderBlock::addFocusRingRects(rects, additionalOffset);
SelectElement* select = toSelectElement(static_cast<Element*>(node()));
// Focus the last selected item.
int selectedItem = select->activeSelectionEndListIndex();
if (selectedItem >= 0) {
- rects.append(itemBoundingBoxRect(tx, ty, selectedItem));
+ rects.append(itemBoundingBoxRect(additionalOffset.x(), additionalOffset.y(), selectedItem));
return;
}
@@ -319,7 +319,7 @@
for (int i = 0; i < size; ++i) {
OptionElement* optionElement = toOptionElement(listItems[i]);
if (optionElement && !optionElement->disabled()) {
- rects.append(itemBoundingBoxRect(tx, ty, i));
+ rects.append(itemBoundingBoxRect(additionalOffset.x(), additionalOffset.y(), i));
return;
}
}
Modified: trunk/Source/WebCore/rendering/RenderListBox.h (87301 => 87302)
--- trunk/Source/WebCore/rendering/RenderListBox.h 2011-05-25 16:50:53 UTC (rev 87301)
+++ trunk/Source/WebCore/rendering/RenderListBox.h 2011-05-25 17:04:47 UTC (rev 87302)
@@ -79,7 +79,7 @@
virtual void layout();
- virtual void addFocusRingRects(Vector<IntRect>&, int tx, int ty);
+ virtual void addFocusRingRects(Vector<IntRect>&, const IntPoint&);
virtual bool canBeProgramaticallyScrolled(bool) const { return true; }
virtual void autoscroll();
Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (87301 => 87302)
--- trunk/Source/WebCore/rendering/RenderObject.cpp 2011-05-25 16:50:53 UTC (rev 87301)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2011-05-25 17:04:47 UTC (rev 87302)
@@ -1000,7 +1000,7 @@
void RenderObject::paintFocusRing(GraphicsContext* context, int tx, int ty, RenderStyle* style)
{
Vector<IntRect> focusRingRects;
- addFocusRingRects(focusRingRects, tx, ty);
+ addFocusRingRects(focusRingRects, IntPoint(tx, ty));
if (style->outlineStyleIsAuto())
context->drawFocusRing(focusRingRects, style->outlineWidth(), style->outlineOffset(), style->visitedDependentColor(CSSPropertyOutlineColor));
else
@@ -1119,8 +1119,8 @@
// implicitly assumes that. This doesn't work correctly with transformed
// descendants.
FloatPoint absolutePoint = localToAbsolute();
- addFocusRingRects(rects, absolutePoint.x(), absolutePoint.y());
- size_t count = rects.size();
+ addFocusRingRects(rects, flooredIntPoint(absolutePoint));
+ size_t count = rects.size();
for (size_t i = 0; i < count; ++i) {
IntRect rect = rects[i];
rect.move(-absolutePoint.x(), -absolutePoint.y());
Modified: trunk/Source/WebCore/rendering/RenderObject.h (87301 => 87302)
--- trunk/Source/WebCore/rendering/RenderObject.h 2011-05-25 16:50:53 UTC (rev 87301)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2011-05-25 17:04:47 UTC (rev 87302)
@@ -775,7 +775,7 @@
bool shouldUseTransformFromContainer(const RenderObject* container) const;
void getTransformFromContainer(const RenderObject* container, const IntSize& offsetInContainer, TransformationMatrix&) const;
- virtual void addFocusRingRects(Vector<IntRect>&, int /*tx*/, int /*ty*/) { };
+ virtual void addFocusRingRects(Vector<IntRect>&, const IntPoint&) { };
IntRect absoluteOutlineBounds() const
{
Modified: trunk/Source/WebCore/rendering/RenderTextControl.cpp (87301 => 87302)
--- trunk/Source/WebCore/rendering/RenderTextControl.cpp 2011-05-25 16:50:53 UTC (rev 87301)
+++ trunk/Source/WebCore/rendering/RenderTextControl.cpp 2011-05-25 17:04:47 UTC (rev 87302)
@@ -585,10 +585,10 @@
}
}
-void RenderTextControl::addFocusRingRects(Vector<IntRect>& rects, int tx, int ty)
+void RenderTextControl::addFocusRingRects(Vector<IntRect>& rects, const IntPoint& additionalOffset)
{
- if (width() && height())
- rects.append(IntRect(tx, ty, width(), height()));
+ if (!size().isEmpty())
+ rects.append(IntRect(additionalOffset, size()));
}
void RenderTextControl::updatePlaceholderVisibility(bool placeholderShouldBeVisible, bool placeholderValueChanged)
Modified: trunk/Source/WebCore/rendering/RenderTextControl.h (87301 => 87302)
--- trunk/Source/WebCore/rendering/RenderTextControl.h 2011-05-25 16:50:53 UTC (rev 87301)
+++ trunk/Source/WebCore/rendering/RenderTextControl.h 2011-05-25 17:04:47 UTC (rev 87302)
@@ -92,7 +92,7 @@
virtual bool avoidsFloats() const { return true; }
virtual void paintObject(PaintInfo&, int tx, int ty);
- virtual void addFocusRingRects(Vector<IntRect>&, int tx, int ty);
+ virtual void addFocusRingRects(Vector<IntRect>&, const IntPoint&);
virtual bool canBeProgramaticallyScrolled(bool) const { return true; }
Modified: trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp (87301 => 87302)
--- trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp 2011-05-25 16:50:53 UTC (rev 87301)
+++ trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp 2011-05-25 17:04:47 UTC (rev 87302)
@@ -261,11 +261,11 @@
paintBoxDecorationsWithSize(paintInfo, IntRect(tx, ty, width() - decorationWidthRight(), height()));
}
-void RenderTextControlSingleLine::addFocusRingRects(Vector<IntRect>& rects, int tx, int ty)
+void RenderTextControlSingleLine::addFocusRingRects(Vector<IntRect>& rects, const IntPoint& additionalOffset)
{
int w = width() - decorationWidthRight();
if (w && height())
- rects.append(IntRect(tx, ty, w, height()));
+ rects.append(IntRect(additionalOffset, IntSize(w, height())));
}
void RenderTextControlSingleLine::layout()
Modified: trunk/Source/WebCore/rendering/RenderTextControlSingleLine.h (87301 => 87302)
--- trunk/Source/WebCore/rendering/RenderTextControlSingleLine.h 2011-05-25 16:50:53 UTC (rev 87301)
+++ trunk/Source/WebCore/rendering/RenderTextControlSingleLine.h 2011-05-25 17:04:47 UTC (rev 87302)
@@ -67,7 +67,7 @@
virtual void subtreeHasChanged();
virtual void paint(PaintInfo&, int tx, int ty);
virtual void paintBoxDecorations(PaintInfo&, int tx, int ty);
- virtual void addFocusRingRects(Vector<IntRect>&, int tx, int ty);
+ virtual void addFocusRingRects(Vector<IntRect>&, const IntPoint&);
virtual void layout();
virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const IntPoint& pointInContainer, int tx, int ty, HitTestAction);
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGContainer.cpp (87301 => 87302)
--- trunk/Source/WebCore/rendering/svg/RenderSVGContainer.cpp 2011-05-25 16:50:53 UTC (rev 87301)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGContainer.cpp 2011-05-25 17:04:47 UTC (rev 87302)
@@ -139,7 +139,7 @@
}
// addFocusRingRects is called from paintOutline and needs to be in the same coordinates as the paintOuline call
-void RenderSVGContainer::addFocusRingRects(Vector<IntRect>& rects, int, int)
+void RenderSVGContainer::addFocusRingRects(Vector<IntRect>& rects, const IntPoint&)
{
IntRect paintRectInParent = enclosingIntRect(localToParentTransform().mapRect(repaintRectInLocalCoordinates()));
if (!paintRectInParent.isEmpty())
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGContainer.h (87301 => 87302)
--- trunk/Source/WebCore/rendering/svg/RenderSVGContainer.h 2011-05-25 16:50:53 UTC (rev 87301)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGContainer.h 2011-05-25 17:04:47 UTC (rev 87302)
@@ -51,7 +51,7 @@
virtual void layout();
- virtual void addFocusRingRects(Vector<IntRect>&, int tx, int ty);
+ virtual void addFocusRingRects(Vector<IntRect>&, const IntPoint&);
virtual FloatRect objectBoundingBox() const { return m_objectBoundingBox; }
virtual FloatRect strokeBoundingBox() const { return m_strokeBoundingBox; }
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGImage.cpp (87301 => 87302)
--- trunk/Source/WebCore/rendering/svg/RenderSVGImage.cpp 2011-05-25 16:50:53 UTC (rev 87301)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGImage.cpp 2011-05-25 17:04:47 UTC (rev 87302)
@@ -179,7 +179,7 @@
repaint();
}
-void RenderSVGImage::addFocusRingRects(Vector<IntRect>& rects, int, int)
+void RenderSVGImage::addFocusRingRects(Vector<IntRect>& rects, const IntPoint&)
{
// this is called from paint() after the localTransform has already been applied
IntRect contentRect = enclosingIntRect(repaintRectInLocalCoordinates());
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGImage.h (87301 => 87302)
--- trunk/Source/WebCore/rendering/svg/RenderSVGImage.h 2011-05-25 16:50:53 UTC (rev 87301)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGImage.h 2011-05-25 17:04:47 UTC (rev 87302)
@@ -57,7 +57,7 @@
virtual FloatRect strokeBoundingBox() const { return m_objectBoundingBox; }
virtual FloatRect repaintRectInLocalCoordinates() const { return m_repaintBoundingBox; }
- virtual void addFocusRingRects(Vector<IntRect>&, int tx, int ty);
+ virtual void addFocusRingRects(Vector<IntRect>&, const IntPoint&);
virtual void imageChanged(WrappedImagePtr, const IntRect* = 0);
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGPath.cpp (87301 => 87302)
--- trunk/Source/WebCore/rendering/svg/RenderSVGPath.cpp 2011-05-25 16:50:53 UTC (rev 87301)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGPath.cpp 2011-05-25 17:04:47 UTC (rev 87302)
@@ -236,7 +236,7 @@
// This method is called from inside paintOutline() since we call paintOutline()
// while transformed to our coord system, return local coords
-void RenderSVGPath::addFocusRingRects(Vector<IntRect>& rects, int, int)
+void RenderSVGPath::addFocusRingRects(Vector<IntRect>& rects, const IntPoint&)
{
IntRect rect = enclosingIntRect(repaintRectInLocalCoordinates());
if (!rect.isEmpty())
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGPath.h (87301 => 87302)
--- trunk/Source/WebCore/rendering/svg/RenderSVGPath.h 2011-05-25 16:50:53 UTC (rev 87301)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGPath.h 2011-05-25 17:04:47 UTC (rev 87302)
@@ -61,7 +61,7 @@
virtual void layout();
virtual void paint(PaintInfo&, int parentX, int parentY);
- virtual void addFocusRingRects(Vector<IntRect>&, int tx, int ty);
+ virtual void addFocusRingRects(Vector<IntRect>&, const IntPoint&);
virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint& pointInParent, HitTestAction);
