Avoid special handling of LayoutSVGForeignObject about its paint offset

third_party/WebKit/Source/core/paint/SVGForeignObjectPainter.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/paint/SVGForeignObjectPainter.h"
 
 #include "core/layout/svg/LayoutSVGForeignObject.h"
 #include "core/layout/svg/SVGLayoutSupport.h"
 #include "core/paint/BlockPainter.h"
 #include "core/paint/FloatClipRecorder.h"
@@ skipping 22 matching lines @@
 
 }  // namespace
 
 void SVGForeignObjectPainter::paint(const PaintInfo& paintInfo) {
   if (paintInfo.phase != PaintPhaseForeground &&
       paintInfo.phase != PaintPhaseSelection)
     return;
 
   PaintInfo paintInfoBeforeFiltering(paintInfo);
   paintInfoBeforeFiltering.updateCullRect(
-      m_layoutSVGForeignObject.localSVGTransform());
+      m_layoutSVGForeignObject.localToSVGParentTransform());
   SVGTransformContext transformContext(
       paintInfoBeforeFiltering.context, m_layoutSVGForeignObject,
-      m_layoutSVGForeignObject.localSVGTransform());
+      m_layoutSVGForeignObject.localToSVGParentTransform());
 
   Optional<FloatClipRecorder> clipRecorder;
-  if (SVGLayoutSupport::isOverflowHidden(&m_layoutSVGForeignObject))
-    clipRecorder.emplace(paintInfoBeforeFiltering.context,
-                         m_layoutSVGForeignObject,
-                         paintInfoBeforeFiltering.phase,
-                         m_layoutSVGForeignObject.viewportRect());
+  if (SVGLayoutSupport::isOverflowHidden(&m_layoutSVGForeignObject)) {
+    clipRecorder.emplace(
+        paintInfoBeforeFiltering.context, m_layoutSVGForeignObject,
+        paintInfoBeforeFiltering.phase,
+        FloatRect(FloatPoint(),
+                  m_layoutSVGForeignObject.viewportRect().size()));
+  }
 
   SVGPaintContext paintContext(m_layoutSVGForeignObject,
                                paintInfoBeforeFiltering);
   bool continueRendering = true;
   if (paintContext.paintInfo().phase == PaintPhaseForeground)
     continueRendering = paintContext.applyClipMaskAndFilterIfNecessary();
 
   if (continueRendering) {
     // Paint all phases of FO elements atomically as though the FO element
     // established its own stacking context.  The delegate forwards calls to
     // paint() in LayoutObject::paintAllPhasesAtomically() to
     // BlockPainter::paint(), instead of m_layoutSVGForeignObject.paint() (which
     // would call this method again).
     BlockPainterDelegate delegate(m_layoutSVGForeignObject);
-    ObjectPainter(delegate).paintAllPhasesAtomically(paintContext.paintInfo(),
-                                                     LayoutPoint());
+    // We have included location() in transform, so pass -location() to adjust
+    // paint offset that will be added by location() in BlockPainter::paint().
+    ObjectPainter(delegate).paintAllPhasesAtomically(
+        paintContext.paintInfo(), -m_layoutSVGForeignObject.location());
   }
 }
 
 }  // namespace blink