Revert "Let SVGForeignObject's local SVG coordinates mean what it should"

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

 /*
  * Copyright (C) 2006 Apple Computer, Inc.
  * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * 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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "core/layout/svg/LayoutSVGBlock.h"
 
-#include "core/layout/LayoutGeometryMap.h"
 #include "core/layout/LayoutView.h"
 #include "core/layout/svg/LayoutSVGRoot.h"
 #include "core/layout/svg/SVGLayoutSupport.h"
 #include "core/layout/svg/SVGResourcesCache.h"
 #include "core/style/ShadowList.h"
 #include "core/svg/SVGElement.h"
-#include "platform/geometry/TransformState.h"
 
 namespace blink {
 
 LayoutSVGBlock::LayoutSVGBlock(SVGElement* element)
     : LayoutBlockFlow(element) {}
 
 bool LayoutSVGBlock::allowsOverflowClip() const {
   // LayoutSVGBlock, used by Layout(SVGText|ForeignObject), is not allowed to
   // have overflow clip.
   // LayoutBlock assumes a layer to be present when the overflow clip
@@ skipping 50 matching lines @@
                                   : DescendantIsolationNeedsUpdate);
   }
 
   LayoutBlock::styleDidChange(diff, oldStyle);
   SVGResourcesCache::clientStyleChanged(this, diff, styleRef());
 }
 
 void LayoutSVGBlock::mapLocalToAncestor(const LayoutBoxModelObject* ancestor,
                                         TransformState& transformState,
                                         MapCoordinatesFlags flags) const {
-  // Convert from local HTML coordinates to local SVG coordinates.
-  transformState.move(locationOffset());
-  // Apply other mappings on local SVG coordinates.
   SVGLayoutSupport::mapLocalToAncestor(this, ancestor, transformState, flags);
 }
 
 void LayoutSVGBlock::mapAncestorToLocal(const LayoutBoxModelObject* ancestor,
                                         TransformState& transformState,
                                         MapCoordinatesFlags flags) const {
   if (this == ancestor)
     return;
-
-  // Map to local SVG coordinates.
   SVGLayoutSupport::mapAncestorToLocal(*this, ancestor, transformState, flags);
-  // Convert from local SVG coordinates to local HTML coordinates.
-  transformState.move(-locationOffset());
 }
 
 const LayoutObject* LayoutSVGBlock::pushMappingToContainer(
     const LayoutBoxModelObject* ancestorToStopAt,
     LayoutGeometryMap& geometryMap) const {
-  // Convert from local HTML coordinates to local SVG coordinates.
-  geometryMap.push(this, locationOffset());
-  // Apply other mappings on local SVG coordinates.
   return SVGLayoutSupport::pushMappingToContainer(this, ancestorToStopAt,
                                                   geometryMap);
 }
 
 LayoutRect LayoutSVGBlock::absoluteVisualRect() const {
   return SVGLayoutSupport::visualRectInAncestorSpace(*this, *view());
 }
 
 bool LayoutSVGBlock::mapToVisualRectInAncestorSpace(
     const LayoutBoxModelObject* ancestor,
     LayoutRect& rect,
     VisualRectFlags) const {
-  // Convert from local HTML coordinates to local SVG coordinates.
-  rect.moveBy(location());
-  // Apply other mappings on local SVG coordinates.
   return SVGLayoutSupport::mapToVisualRectInAncestorSpace(
       *this, ancestor, FloatRect(rect), rect);
 }
 
 bool LayoutSVGBlock::nodeAtPoint(HitTestResult&,
                                  const HitTestLocation&,
                                  const LayoutPoint&,
                                  HitTestAction) {
   ASSERT_NOT_REACHED();
   return false;
 }
 
 }  // namespace blink