diff options
| author | Feng Qian <> | 2009-04-10 18:11:29 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-10 18:11:29 -0700 |
| commit | 8f72e70a9fd78eec56623b3a62e68f16b7b27e28 (patch) | |
| tree | 181bf9a400c30a1bf34ea6d72560e8d00111d549 /WebCore/rendering/RenderSVGTSpan.cpp | |
| parent | 7ed56f225e0ade046e1c2178977f72b2d896f196 (diff) | |
| download | external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.zip external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.gz external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.bz2 | |
AI 145796: Land the WebKit merge @r42026.
Automated import of CL 145796
Diffstat (limited to 'WebCore/rendering/RenderSVGTSpan.cpp')
| -rw-r--r-- | WebCore/rendering/RenderSVGTSpan.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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<IntRect>& 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<FloatQuad>& 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)); } |