Unify HTML and SVG coordinates of LayoutSVGText

third_party/WebKit/Source/core/layout/svg/LayoutSVGText.cpp

 /*
  * Copyright (C) 2006 Apple Computer, Inc.
  * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org>
  * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz>
  * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2008 Rob Buis <buis@kde.org>
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) Research In Motion Limited 2010-2012. All rights reserved.
  * Copyright (C) 2012 Google Inc.
  *
@@ skipping 231 matching lines @@
   LayoutUnit beforeEdge = borderBefore() + paddingBefore();
   LayoutUnit afterEdge =
       borderAfter() + paddingAfter() + scrollbarLogicalHeight();
   setLogicalHeight(beforeEdge);
 
   LayoutState state(*this);
   layoutInlineChildren(true, afterEdge);
 
   m_needsReordering = false;
 
-  // If we don't have any line boxes, then make sure the frame rect is still
-  // cleared.
-  if (!firstLineBox())
-    setFrameRect(LayoutRect());
+  FloatRect newBoundaries = objectBoundingBox();
+  if (!updateParentBoundaries)
+    updateParentBoundaries = oldBoundaries != newBoundaries;
 
   m_overflow.reset();
+  addSelfVisualOverflow(LayoutRect(newBoundaries));
   addVisualEffectOverflow();
 
-  if (!updateParentBoundaries)
-    updateParentBoundaries = oldBoundaries != objectBoundingBox();
-
   // Invalidate all resources of this client if our layout changed.
   if (everHadLayout() && selfNeedsLayout())
     SVGResourcesCache::clientLayoutChanged(this);
 
   // If our bounds changed, notify the parents.
   if (updateParentBoundaries)
     LayoutSVGBlock::setNeedsBoundariesUpdate();
 
   ASSERT(!m_needsReordering);
   ASSERT(!m_needsTransformUpdate);
@@ skipping 50 matching lines @@
   return false;
 }
 
 PositionWithAffinity LayoutSVGText::positionForPoint(
     const LayoutPoint& pointInContents) {
   RootInlineBox* rootBox = firstRootBox();
   if (!rootBox)
     return createPositionWithAffinity(0);
 
   LayoutPoint clippedPointInContents(pointInContents);
+  clippedPointInContents.moveBy(-rootBox->topLeft());
   clippedPointInContents.clampNegativeToZero();
+  clippedPointInContents.moveBy(rootBox->topLeft());
 
   ASSERT(!rootBox->nextRootBox());
   ASSERT(childrenInline());
 
   InlineBox* closestBox =
       toSVGRootInlineBox(rootBox)->closestLeafChildForPosition(
           clippedPointInContents);
   if (!closestBox)
     return createPositionWithAffinity(0);
 
   return closestBox->getLineLayoutItem().positionForPoint(
       LayoutPoint(clippedPointInContents.x(), closestBox->y()));
 }
 
 void LayoutSVGText::absoluteQuads(Vector<FloatQuad>& quads) const {
   quads.append(localToAbsoluteQuad(strokeBoundingBox()));
 }
 
 void LayoutSVGText::paint(const PaintInfo& paintInfo,
                           const LayoutPoint&) const {
   SVGTextPainter(*this).paint(paintInfo);
 }
 
+FloatRect LayoutSVGText::objectBoundingBox() const {
+  if (const RootInlineBox* box = firstRootBox())
+    return FloatRect(box->frameRect());
+  return FloatRect();
+}
+
 FloatRect LayoutSVGText::strokeBoundingBox() const {
   FloatRect strokeBoundaries = objectBoundingBox();
   const SVGComputedStyle& svgStyle = style()->svgStyle();
   if (!svgStyle.hasStroke())
     return strokeBoundaries;
 
   ASSERT(node());
   ASSERT(node()->isSVGElement());
   SVGLengthContext lengthContext(toSVGElement(node()));
   strokeBoundaries.inflate(
       lengthContext.valueForLength(svgStyle.strokeWidth()));
   return strokeBoundaries;
 }
 
 FloatRect LayoutSVGText::visualRectInLocalSVGCoordinates() const {
   FloatRect visualRect = strokeBoundingBox();
   SVGLayoutSupport::adjustVisualRectWithResources(this, visualRect);
 
   if (const ShadowList* textShadow = style()->textShadow())
     textShadow->adjustRectForShadow(visualRect);
 
   return visualRect;
 }
 
+void LayoutSVGText::addOutlineRects(Vector<LayoutRect>& rects,
+                                    const LayoutPoint&,
+                                    IncludeBlockVisualOverflowOrNot) const {
+  rects.append(LayoutRect(objectBoundingBox()));
+}
+
 bool LayoutSVGText::isObjectBoundingBoxValid() const {
   // If we don't have any line boxes, then consider the bbox invalid.
   return firstLineBox();
 }
 
 void LayoutSVGText::addChild(LayoutObject* child, LayoutObject* beforeChild) {
   LayoutSVGBlock::addChild(child, beforeChild);
 
   SVGResourcesCache::clientWasAddedToTree(child, child->styleRef());
   subtreeChildWasAdded();
 }
 
 void LayoutSVGText::removeChild(LayoutObject* child) {
   SVGResourcesCache::clientWillBeRemovedFromTree(child);
   subtreeChildWillBeRemoved();
 
   LayoutSVGBlock::removeChild(child);
 }
 
 void LayoutSVGText::invalidateTreeIfNeeded(
     const PaintInvalidationState& paintInvalidationState) {
   // TODO(wangxianzhu): Verify if the inherited
   // LayoutBoxModelObject::invalidateTreeIfNeeded()
   // is applicable here. If yes, remove this overriding method.
   LayoutObject::invalidateTreeIfNeeded(paintInvalidationState);
 }
 
 }  // namespace blink