Diff
Modified: trunk/Source/WebCore/ChangeLog (87302 => 87303)
--- trunk/Source/WebCore/ChangeLog 2011-05-25 17:04:47 UTC (rev 87302)
+++ trunk/Source/WebCore/ChangeLog 2011-05-25 17:06:32 UTC (rev 87303)
@@ -2,6 +2,71 @@
Reviewed by Eric Seidel.
+ Add IntPoint versions of IntRect::move and IntPoint::move
+ https://bugs.webkit.org/show_bug.cgi?id=61390
+
+ Adding move methods to IntRect and IntPoint that take an IntPoint
+ that's acting as an offset. Since we also apply negative offsets,
+ also adding a single parameter operator- for IntPoint.
+
+ No new tests since this is refactoring.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::invalidateScrollbarRect):
+ (WebCore::FrameView::convertFromRenderer):
+ (WebCore::FrameView::convertToRenderer):
+ * platform/ScrollView.cpp:
+ (WebCore::ScrollView::wheelEvent):
+ * platform/ScrollView.h:
+ (WebCore::ScrollView::convertChildToSelf):
+ (WebCore::ScrollView::convertSelfToChild):
+ * platform/ScrollbarThemeComposite.cpp:
+ (WebCore::ScrollbarThemeComposite::invalidatePart):
+ * platform/graphics/IntPoint.h:
+ (WebCore::IntPoint::move):
+ (WebCore::operator-):
+ * platform/graphics/IntRect.h:
+ (WebCore::IntRect::move):
+ * platform/graphics/filters/FilterEffect.cpp:
+ (WebCore::FilterEffect::requestedRegionOfInputImageData):
+ * platform/graphics/gpu/Texture.cpp:
+ (WebCore::Texture::updateSubRect):
+ * platform/mac/WidgetMac.mm:
+ (WebCore::Widget::paint):
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::logicalRectToPhysicalRect):
+ (WebCore::RenderBlock::selectionGaps):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::offsetFromContainer):
+ (WebCore::RenderBox::computeRectForRepaint):
+ (WebCore::RenderBox::localCaretRect):
+ * rendering/RenderDetailsMarker.cpp:
+ (WebCore::RenderDetailsMarker::paint):
+ * rendering/RenderInline.cpp:
+ (WebCore::RenderInline::culledInlineVisualOverflowBoundingBox):
+ * rendering/RenderInputSpeech.cpp:
+ (WebCore::RenderInputSpeech::paintInputFieldSpeechButton):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::paintScrollbar):
+ (WebCore::RenderLayerBacking::paintContents):
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::paintScrollbar):
+ (WebCore::RenderLayerCompositor::paintContents):
+ * rendering/RenderListItem.cpp:
+ (WebCore::RenderListItem::positionListMarker):
+ * rendering/RenderListMarker.cpp:
+ (WebCore::RenderListMarker::paint):
+ * rendering/RenderTableCell.cpp:
+ (WebCore::RenderTableCell::computeRectForRepaint):
+ * rendering/RenderTextControlSingleLine.cpp:
+ (WebCore::RenderTextControlSingleLine::nodeAtPoint):
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::repaintViewRectangle):
+
+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
Modified: trunk/Source/WebCore/page/FrameView.cpp (87302 => 87303)
--- trunk/Source/WebCore/page/FrameView.cpp 2011-05-25 17:04:47 UTC (rev 87302)
+++ trunk/Source/WebCore/page/FrameView.cpp 2011-05-25 17:06:32 UTC (rev 87303)
@@ -2148,7 +2148,7 @@
{
// Add in our offset within the FrameView.
IntRect dirtyRect = rect;
- dirtyRect.move(scrollbar->x(), scrollbar->y());
+ dirtyRect.move(scrollbar->location());
invalidateRect(dirtyRect);
}
@@ -2612,7 +2612,7 @@
IntRect rect = renderer->localToAbsoluteQuad(FloatRect(rendererRect)).enclosingBoundingBox();
// Convert from page ("absolute") to FrameView coordinates.
- rect.move(-scrollX(), -scrollY());
+ rect.move(-scrollPosition());
return rect;
}
@@ -2622,7 +2622,7 @@
IntRect rect = viewRect;
// Convert from FrameView coords into page ("absolute") coordinates.
- rect.move(scrollX(), scrollY());
+ rect.move(scrollPosition());
// FIXME: we don't have a way to map an absolute rect down to a local quad, so just
// move the rect for now.
@@ -2635,7 +2635,7 @@
IntPoint point = roundedIntPoint(renderer->localToAbsolute(rendererPoint, false, true /* use transforms */));
// Convert from page ("absolute") to FrameView coordinates.
- point.move(-scrollX(), -scrollY());
+ point.move(-scrollPosition());
return point;
}
Modified: trunk/Source/WebCore/platform/ScrollView.cpp (87302 => 87303)
--- trunk/Source/WebCore/platform/ScrollView.cpp 2011-05-25 17:04:47 UTC (rev 87302)
+++ trunk/Source/WebCore/platform/ScrollView.cpp 2011-05-25 17:06:32 UTC (rev 87303)
@@ -1008,11 +1008,11 @@
GraphicsContextStateSaver stateSaver(*context);
context->translate(x(), y());
- documentDirtyRect.move(-x(), -y());
+ documentDirtyRect.move(-location());
if (!paintsEntireContents()) {
context->translate(-scrollX(), -scrollY());
- documentDirtyRect.move(scrollX(), scrollY());
+ documentDirtyRect.move(scrollPosition());
context->clip(visibleContentRect());
}
@@ -1033,7 +1033,7 @@
IntRect scrollViewDirtyRect = rect;
scrollViewDirtyRect.intersect(frameRect());
context->translate(x(), y());
- scrollViewDirtyRect.move(-x(), -y());
+ scrollViewDirtyRect.move(-location());
paintScrollbars(context, scrollViewDirtyRect);
}
@@ -1127,7 +1127,7 @@
{
// Scrollbars won't be transformed within us
IntRect newRect = localRect;
- newRect.move(scrollbar->x(), scrollbar->y());
+ newRect.move(scrollbar->location());
return newRect;
}
@@ -1135,7 +1135,7 @@
{
IntRect newRect = parentRect;
// Scrollbars won't be transformed within us
- newRect.move(-scrollbar->x(), -scrollbar->y());
+ newRect.move(-scrollbar->location());
return newRect;
}
@@ -1144,7 +1144,7 @@
{
// Scrollbars won't be transformed within us
IntPoint newPoint = localPoint;
- newPoint.move(scrollbar->x(), scrollbar->y());
+ newPoint.move(scrollbar->location());
return newPoint;
}
@@ -1152,7 +1152,7 @@
{
IntPoint newPoint = parentPoint;
// Scrollbars won't be transformed within us
- newPoint.move(-scrollbar->x(), -scrollbar->y());
+ newPoint.move(-scrollbar->location());
return newPoint;
}
Modified: trunk/Source/WebCore/platform/ScrollView.h (87302 => 87303)
--- trunk/Source/WebCore/platform/ScrollView.h 2011-05-25 17:04:47 UTC (rev 87302)
+++ trunk/Source/WebCore/platform/ScrollView.h 2011-05-25 17:06:32 UTC (rev 87303)
@@ -242,7 +242,7 @@
IntPoint newPoint = point;
if (!isScrollViewScrollbar(child))
newPoint = point - scrollOffset();
- newPoint.move(child->x(), child->y());
+ newPoint.move(child->location());
return newPoint;
}
@@ -251,7 +251,7 @@
IntPoint newPoint = point;
if (!isScrollViewScrollbar(child))
newPoint = point + scrollOffset();
- newPoint.move(-child->x(), -child->y());
+ newPoint.move(-child->location());
return newPoint;
}
Modified: trunk/Source/WebCore/platform/ScrollbarThemeComposite.cpp (87302 => 87303)
--- trunk/Source/WebCore/platform/ScrollbarThemeComposite.cpp 2011-05-25 17:04:47 UTC (rev 87302)
+++ trunk/Source/WebCore/platform/ScrollbarThemeComposite.cpp 2011-05-25 17:06:32 UTC (rev 87303)
@@ -234,7 +234,7 @@
result = thumbRect;
}
}
- result.move(-scrollbar->x(), -scrollbar->y());
+ result.move(-scrollbar->location());
scrollbar->invalidateRect(result);
}
Modified: trunk/Source/WebCore/platform/graphics/IntPoint.h (87302 => 87303)
--- trunk/Source/WebCore/platform/graphics/IntPoint.h 2011-05-25 17:04:47 UTC (rev 87302)
+++ trunk/Source/WebCore/platform/graphics/IntPoint.h 2011-05-25 17:06:32 UTC (rev 87303)
@@ -90,6 +90,7 @@
void setY(int y) { m_y = y; }
void move(const IntSize& s) { move(s.width(), s.height()); }
+ void move(const IntPoint& offset) { move(offset.x(), offset.y()); }
void move(int dx, int dy) { m_x += dx; m_y += dy; }
IntPoint expandedTo(const IntPoint& other) const
@@ -190,6 +191,11 @@
return IntPoint(a.x() - b.width(), a.y() - b.height());
}
+inline IntPoint operator-(const IntPoint& point)
+{
+ return IntPoint(-point.x(), -point.y());
+}
+
inline bool operator==(const IntPoint& a, const IntPoint& b)
{
return a.x() == b.x() && a.y() == b.y();
Modified: trunk/Source/WebCore/platform/graphics/IntRect.h (87302 => 87303)
--- trunk/Source/WebCore/platform/graphics/IntRect.h 2011-05-25 17:04:47 UTC (rev 87302)
+++ trunk/Source/WebCore/platform/graphics/IntRect.h 2011-05-25 17:06:32 UTC (rev 87303)
@@ -108,6 +108,7 @@
IntPoint center() const { return IntPoint(x() + width() / 2, y() + height() / 2); }
void move(const IntSize& size) { m_location += size; }
+ void move(const IntPoint& offset) { m_location.move(offset.x(), offset.y()); }
void move(int dx, int dy) { m_location.move(dx, dy); }
void expand(const IntSize& size) { m_location += size; }
Modified: trunk/Source/WebCore/platform/graphics/filters/FilterEffect.cpp (87302 => 87303)
--- trunk/Source/WebCore/platform/graphics/filters/FilterEffect.cpp 2011-05-25 17:04:47 UTC (rev 87302)
+++ trunk/Source/WebCore/platform/graphics/filters/FilterEffect.cpp 2011-05-25 17:06:32 UTC (rev 87303)
@@ -69,7 +69,7 @@
{
ASSERT(hasResult());
IntPoint location = m_absolutePaintRect.location();
- location.move(-effectRect.x(), -effectRect.y());
+ location.move(-effectRect.location());
return IntRect(location, m_absolutePaintRect.size());
}
Modified: trunk/Source/WebCore/platform/graphics/gpu/Texture.cpp (87302 => 87303)
--- trunk/Source/WebCore/platform/graphics/gpu/Texture.cpp 2011-05-25 17:04:47 UTC (rev 87302)
+++ trunk/Source/WebCore/platform/graphics/gpu/Texture.cpp 2011-05-25 17:06:32 UTC (rev 87303)
@@ -176,7 +176,7 @@
updateRectIntersected.intersect(tileBoundsWithBorder);
IntRect dstRect = updateRectIntersected;
- dstRect.move(-tileBoundsWithBorder.x(), -tileBoundsWithBorder.y());
+ dstRect.move(-tileBoundsWithBorder.location());
if (updateRectIntersected.isEmpty())
continue;
Modified: trunk/Source/WebCore/platform/mac/WidgetMac.mm (87302 => 87303)
--- trunk/Source/WebCore/platform/mac/WidgetMac.mm 2011-05-25 17:04:47 UTC (rev 87302)
+++ trunk/Source/WebCore/platform/mac/WidgetMac.mm 2011-05-25 17:06:32 UTC (rev 87303)
@@ -248,7 +248,7 @@
CGContextTranslateCTM(context, -transformOrigin.x(), -transformOrigin.y());
IntRect dirtyRect = r;
- dirtyRect.move(-transformOrigin.x(), -transformOrigin.y());
+ dirtyRect.move(-transformOrigin);
if (![view isFlipped])
dirtyRect.setY([view bounds].size.height - dirtyRect.maxY());
@@ -292,7 +292,7 @@
CGContextScaleCTM(cgContext, 1, -1);
IntRect dirtyRect = r;
- dirtyRect.move(-transformOrigin.x(), -transformOrigin.y());
+ dirtyRect.move(-transformOrigin);
if (![view isFlipped])
dirtyRect.setY([view bounds].size.height - dirtyRect.maxY());
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (87302 => 87303)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2011-05-25 17:04:47 UTC (rev 87302)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2011-05-25 17:06:32 UTC (rev 87303)
@@ -2791,7 +2791,7 @@
else
result = IntRect(logicalRect.y(), logicalRect.x(), logicalRect.height(), logicalRect.width());
flipForWritingMode(result);
- result.move(rootBlockPhysicalPosition.x(), rootBlockPhysicalPosition.y());
+ result.move(rootBlockPhysicalPosition);
return result;
}
@@ -2804,7 +2804,7 @@
// Note that we don't clip out overflow for positioned objects. We just stick to the border box.
IntRect flippedBlockRect = IntRect(offsetFromRootBlock.width(), offsetFromRootBlock.height(), width(), height());
rootBlock->flipForWritingMode(flippedBlockRect);
- flippedBlockRect.move(rootBlockPhysicalPosition.x(), rootBlockPhysicalPosition.y());
+ flippedBlockRect.move(rootBlockPhysicalPosition);
clipOutPositionedObjects(paintInfo, flippedBlockRect.location(), m_positionedObjects.get());
if (isBody() || isRoot()) // The <body> must make sure to examine its containingBlock's positioned objects.
for (RenderBlock* cb = containingBlock(); cb && !cb->isRenderView(); cb = cb->containingBlock())
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (87302 => 87303)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2011-05-25 17:04:47 UTC (rev 87302)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2011-05-25 17:06:32 UTC (rev 87303)
@@ -1310,7 +1310,7 @@
IntRect columnRect(frameRect());
toRenderBlock(o)->flipForWritingModeIncludingColumns(columnRect);
offset += IntSize(columnRect.location().x(), columnRect.location().y());
- columnRect.move(point.x(), point.y());
+ columnRect.move(point);
o->adjustForColumns(offset, columnRect.location());
} else
offset += locationOffsetIncludingFlipping();
@@ -1436,7 +1436,7 @@
if (style()->position() == RelativePosition && layer())
rect.move(layer()->relativePositionOffset());
- rect.move(x(), y());
+ rect.move(location());
rect.move(layoutState->m_paintOffset);
if (layoutState->m_clipped)
rect.intersect(layoutState->m_clipRect);
@@ -3095,7 +3095,7 @@
*extraWidthToEndOfLine = x() + width() - rect.maxX();
// Move to local coords
- rect.move(-x(), -y());
+ rect.move(-location());
return rect;
}
Modified: trunk/Source/WebCore/rendering/RenderDetailsMarker.cpp (87302 => 87303)
--- trunk/Source/WebCore/rendering/RenderDetailsMarker.cpp 2011-05-25 17:04:47 UTC (rev 87302)
+++ trunk/Source/WebCore/rendering/RenderDetailsMarker.cpp 2011-05-25 17:06:32 UTC (rev 87303)
@@ -129,7 +129,7 @@
IntPoint boxOrigin(tx + x(), ty + y());
IntRect overflowRect(visualOverflowRect());
- overflowRect.move(boxOrigin.x(), boxOrigin.y());
+ overflowRect.move(boxOrigin);
overflowRect.inflate(maximalOutlineSize(paintInfo.phase));
if (!paintInfo.rect.intersects(overflowRect))
Modified: trunk/Source/WebCore/rendering/RenderInline.cpp (87302 => 87303)
--- trunk/Source/WebCore/rendering/RenderInline.cpp 2011-05-25 17:04:47 UTC (rev 87302)
+++ trunk/Source/WebCore/rendering/RenderInline.cpp 2011-05-25 17:06:32 UTC (rev 87303)
@@ -899,10 +899,10 @@
if (!currBox->hasSelfPaintingLayer() && currBox->inlineBoxWrapper()) {
IntRect logicalRect = currBox->logicalVisualOverflowRectForPropagation(style());
if (isHorizontal) {
- logicalRect.move(currBox->x(), currBox->y());
+ logicalRect.move(currBox->location());
result.uniteIfNonZero(logicalRect);
} else {
- logicalRect.move(currBox->y(), currBox->x());
+ logicalRect.move(currBox->location());
result.uniteIfNonZero(logicalRect.transposedRect());
}
}
Modified: trunk/Source/WebCore/rendering/RenderInputSpeech.cpp (87302 => 87303)
--- trunk/Source/WebCore/rendering/RenderInputSpeech.cpp 2011-05-25 17:04:47 UTC (rev 87302)
+++ trunk/Source/WebCore/rendering/RenderInputSpeech.cpp 2011-05-25 17:06:32 UTC (rev 87303)
@@ -82,7 +82,7 @@
// Move the rect into partRenderer's coords.
buttonRect.move(offsetFromInputRenderer);
// Account for the local drawing offset.
- buttonRect.move(rect.x(), rect.y());
+ buttonRect.move(rect.location());
DEFINE_STATIC_LOCAL(RefPtr<Image>, imageStateNormal, (Image::loadPlatformResource("inputSpeech")));
DEFINE_STATIC_LOCAL(RefPtr<Image>, imageStateRecording, (Image::loadPlatformResource("inputSpeechRecording")));
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (87302 => 87303)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2011-05-25 17:04:47 UTC (rev 87302)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2011-05-25 17:06:32 UTC (rev 87303)
@@ -1201,7 +1201,7 @@
const IntRect& scrollbarRect = scrollbar->frameRect();
context.translate(-scrollbarRect.x(), -scrollbarRect.y());
IntRect transformedClip = clip;
- transformedClip.move(scrollbarRect.x(), scrollbarRect.y());
+ transformedClip.move(scrollbarRect.location());
scrollbar->paint(&context, transformedClip);
context.restore();
}
@@ -1235,7 +1235,7 @@
context.save();
context.translate(-scrollCornerAndResizer.x(), -scrollCornerAndResizer.y());
IntRect transformedClip = clip;
- transformedClip.move(scrollCornerAndResizer.x(), scrollCornerAndResizer.y());
+ transformedClip.move(scrollCornerAndResizer.location());
m_owningLayer->paintScrollCorner(&context, 0, 0, transformedClip);
m_owningLayer->paintResizer(&context, 0, 0, transformedClip);
context.restore();
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (87302 => 87303)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2011-05-25 17:04:47 UTC (rev 87302)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2011-05-25 17:06:32 UTC (rev 87303)
@@ -1445,7 +1445,7 @@
const IntRect& scrollbarRect = scrollbar->frameRect();
context.translate(-scrollbarRect.x(), -scrollbarRect.y());
IntRect transformedClip = clip;
- transformedClip.move(scrollbarRect.x(), scrollbarRect.y());
+ transformedClip.move(scrollbarRect.location());
scrollbar->paint(&context, transformedClip);
context.restore();
}
@@ -1461,7 +1461,7 @@
context.save();
context.translate(-scrollCorner.x(), -scrollCorner.y());
IntRect transformedClip = clip;
- transformedClip.move(scrollCorner.x(), scrollCorner.y());
+ transformedClip.move(scrollCorner.location());
m_renderView->frameView()->paintScrollCorner(&context, transformedClip);
context.restore();
}
Modified: trunk/Source/WebCore/rendering/RenderListItem.cpp (87302 => 87303)
--- trunk/Source/WebCore/rendering/RenderListItem.cpp 2011-05-25 17:04:47 UTC (rev 87302)
+++ trunk/Source/WebCore/rendering/RenderListItem.cpp 2011-05-25 17:06:32 UTC (rev 87303)
@@ -338,7 +338,7 @@
propagateLayoutOverflow = false;
if (o->hasSelfPaintingLayer())
propagateVisualOverflow = false;
- markerRect.move(-o->x(), -o->y());
+ markerRect.move(-o->location());
} while (o != this && propagateVisualOverflow && propagateLayoutOverflow);
}
}
Modified: trunk/Source/WebCore/rendering/RenderListMarker.cpp (87302 => 87303)
--- trunk/Source/WebCore/rendering/RenderListMarker.cpp 2011-05-25 17:04:47 UTC (rev 87302)
+++ trunk/Source/WebCore/rendering/RenderListMarker.cpp 2011-05-25 17:06:32 UTC (rev 87303)
@@ -1111,7 +1111,7 @@
IntPoint boxOrigin(tx + x(), ty + y());
IntRect overflowRect(visualOverflowRect());
- overflowRect.move(boxOrigin.x(), boxOrigin.y());
+ overflowRect.move(boxOrigin);
overflowRect.inflate(maximalOutlineSize(paintInfo.phase));
if (!paintInfo.rect.intersects(overflowRect))
@@ -1120,7 +1120,7 @@
IntRect box(boxOrigin, IntSize(width(), height()));
IntRect marker = getRelativeMarkerRect();
- marker.move(boxOrigin.x(), boxOrigin.y());
+ marker.move(boxOrigin);
GraphicsContext* context = paintInfo.context;
@@ -1132,7 +1132,7 @@
context->drawImage(m_image->image(this, marker.size()).get(), style()->colorSpace(), marker);
if (selectionState() != SelectionNone) {
IntRect selRect = localSelectionRect();
- selRect.move(boxOrigin.x(), boxOrigin.y());
+ selRect.move(boxOrigin);
context->fillRect(selRect, selectionBackgroundColor(), style()->colorSpace());
}
return;
@@ -1146,7 +1146,7 @@
if (selectionState() != SelectionNone) {
IntRect selRect = localSelectionRect();
- selRect.move(boxOrigin.x(), boxOrigin.y());
+ selRect.move(boxOrigin);
context->fillRect(selRect, selectionBackgroundColor(), style()->colorSpace());
}
@@ -1257,7 +1257,7 @@
GraphicsContextStateSaver stateSaver(*context, false);
if (!style()->isHorizontalWritingMode()) {
- marker.move(-boxOrigin.x(), -boxOrigin.y());
+ marker.move(-boxOrigin);
marker = marker.transposedRect();
marker.move(box.x(), box.y() - logicalHeight());
stateSaver.save();
Modified: trunk/Source/WebCore/rendering/RenderTableCell.cpp (87302 => 87303)
--- trunk/Source/WebCore/rendering/RenderTableCell.cpp 2011-05-25 17:04:47 UTC (rev 87302)
+++ trunk/Source/WebCore/rendering/RenderTableCell.cpp 2011-05-25 17:06:32 UTC (rev 87303)
@@ -294,7 +294,7 @@
r.setY(r.y());
RenderView* v = view();
if ((!v || !v->layoutStateEnabled() || repaintContainer) && parent())
- r.move(-parentBox()->x(), -parentBox()->y()); // Rows are in the same coordinate space, so don't add their offset in.
+ r.move(-parentBox()->location()); // Rows are in the same coordinate space, so don't add their offset in.
RenderBlock::computeRectForRepaint(repaintContainer, r, fixed);
}
Modified: trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp (87302 => 87303)
--- trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp 2011-05-25 17:04:47 UTC (rev 87302)
+++ trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp 2011-05-25 17:06:32 UTC (rev 87303)
@@ -401,7 +401,7 @@
RenderBox* innerTextRenderer = innerTextElement()->renderBox();
IntPoint localPoint = result.localPoint();
- localPoint.move(-innerBlockRenderer->x(), -innerBlockRenderer->y());
+ localPoint.move(-innerBlockRenderer->location());
int textLeft = tx + x() + innerBlockRenderer->x() + innerTextRenderer->x();
if (resultsButton && resultsButton->renderer() && pointInContainer.x() < textLeft)
@@ -423,7 +423,7 @@
if (innerNode) {
result.setInnerNode(innerNode);
- localPoint.move(-innerNode->renderBox()->x(), -innerNode->renderBox()->y());
+ localPoint.move(-innerNode->renderBox()->location());
}
result.setLocalPoint(localPoint);
Modified: trunk/Source/WebCore/rendering/RenderView.cpp (87302 => 87303)
--- trunk/Source/WebCore/rendering/RenderView.cpp 2011-05-25 17:04:47 UTC (rev 87302)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2011-05-25 17:06:32 UTC (rev 87303)
@@ -273,7 +273,7 @@
// Subtract out the contentsX and contentsY offsets to get our coords within the viewing
// rectangle.
- r.move(-vr.x(), -vr.y());
+ r.move(-vr.location());
// FIXME: Hardcoded offsets here are not good.
r.move(obj->borderLeft() + obj->paddingLeft(),
