From 8f72e70a9fd78eec56623b3a62e68f16b7b27e28 Mon Sep 17 00:00:00 2001 From: Feng Qian <> Date: Fri, 10 Apr 2009 18:11:29 -0700 Subject: AI 145796: Land the WebKit merge @r42026. Automated import of CL 145796 --- WebCore/rendering/RenderSVGTSpan.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'WebCore/rendering/RenderSVGTSpan.cpp') diff --git a/WebCore/rendering/RenderSVGTSpan.cpp b/WebCore/rendering/RenderSVGTSpan.cpp index 49c45df..d493c45 100644 --- a/WebCore/rendering/RenderSVGTSpan.cpp +++ b/WebCore/rendering/RenderSVGTSpan.cpp @@ -48,11 +48,11 @@ void RenderSVGTSpan::absoluteRects(Vector& rects, int, int, bool) if (!object) return; - int xRef = object->x() + x(); - int yRef = object->y() + y(); + int xRef = object->x(); + int yRef = object->y(); for (InlineRunBox* curr = firstBox; curr; curr = curr->nextLineBox()) { - FloatRect rect(xRef + curr->xPos(), yRef + curr->yPos(), curr->width(), curr->height()); + FloatRect rect(xRef + curr->x(), yRef + curr->y(), curr->width(), curr->height()); // FIXME: broken with CSS transforms rects.append(enclosingIntRect(absoluteTransform().mapRect(rect))); } @@ -68,11 +68,11 @@ void RenderSVGTSpan::absoluteQuads(Vector& quads, bool) if (!object) return; - int xRef = object->x() + x(); - int yRef = object->y() + y(); + int xRef = object->x(); + int yRef = object->y(); for (InlineRunBox* curr = firstBox; curr; curr = curr->nextLineBox()) { - FloatRect rect(xRef + curr->xPos(), yRef + curr->yPos(), curr->width(), curr->height()); + FloatRect rect(xRef + curr->x(), yRef + curr->y(), curr->width(), curr->height()); // FIXME: broken with CSS transforms quads.append(absoluteTransform().mapRect(rect)); } -- cgit v1.1