WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/rendering/RenderSVGTextPath.cpp

 /*
  * This file is part of the WebKit project.
  *
  * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 70 matching lines @@
 void RenderSVGTextPath::absoluteRects(Vector<IntRect>& rects, int, int)
 {
     InlineRunBox* firstBox = firstLineBox();
 
     SVGRootInlineBox* rootBox = firstBox ? static_cast<SVGInlineTextBox*>(firstBox)->svgRootInlineBox() : 0;
     RenderBlock* object = rootBox ? rootBox->block() : 0;
 
     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());
         // FIXME: broken with CSS transforms
         rects.append(enclosingIntRect(absoluteTransform().mapRect(rect)));
     }
 }
 
 void RenderSVGTextPath::absoluteQuads(Vector<FloatQuad>& quads, bool)
 {
     InlineRunBox* firstBox = firstLineBox();
 
     SVGRootInlineBox* rootBox = firstBox ? static_cast<SVGInlineTextBox*>(firstBox)->svgRootInlineBox() : 0;
     RenderBlock* object = rootBox ? rootBox->block() : 0;
 
     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());
         // FIXME: broken with CSS transforms
         quads.append(absoluteTransform().mapRect(rect));
     }
 }
 
 }
 
 #endif // ENABLE(SVG)