Don't apply svg viewport clip when mapping a LayoutSVGRoot's own rect

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

 /*
  * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2007, 2008, 2009 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 Google, Inc.
  * Copyright (C) Research In Motion Limited 2011. 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
@@ skipping 306 matching lines @@
     if (location().y())
         m_localToParentTransform.setF(m_localToParentTransform.f() + roundToInt(location().y()));
     return m_localToParentTransform;
 }
 
 LayoutRect LayoutSVGRoot::localOverflowRectForPaintInvalidation() const
 {
     // This is an open-coded aggregate of SVGLayoutSupport::localOverflowRectForPaintInvalidation,
     // and LayoutReplaced::localOverflowRectForPaintInvalidation.
     // The reason for this is to optimize/minimize the paint invalidation rect when the box is not "decorated"
-    // (does not have background/border/etc.)
-    // TODO(wangxianzhu): Verify if the optimization is still needed.
+    // (does not have background/border/etc., see LayoutSVGRootTest.OverflowRectMappingWithViewportClipWithoutBorder).
 
     // Return early for any cases where we don't actually paint.
     if (style()->visibility() != VISIBLE && !enclosingLayer()->hasVisibleContent())
         return LayoutRect();
 
     // Compute the paint invalidation rect of the content of the SVG in the border-box coordinate space.
     FloatRect contentPaintInvalidationRect = paintInvalidationRectInLocalSVGCoordinates();
     contentPaintInvalidationRect = m_localToBorderBoxTransform.mapRect(contentPaintInvalidationRect);
 
     // Apply initial viewport clip, overflow:visible content is added to visualOverflow
     // but the most common case is that overflow is hidden, so always intersect.
     contentPaintInvalidationRect.intersect(pixelSnappedBorderBoxRect());
 
     LayoutRect paintInvalidationRect = enclosingLayoutRect(contentPaintInvalidationRect);
     // If the box is decorated or is overflowing, extend it to include the border-box and overflow.
     if (m_hasBoxDecorationBackground || hasOverflowModel()) {
         // The selectionRect can project outside of the overflowRect, so take their union
         // for paint invalidation to avoid selection painting glitches.
         LayoutRect decoratedPaintInvalidationRect = unionRect(localSelectionRect(), visualOverflowRect());
         paintInvalidationRect.unite(decoratedPaintInvalidationRect);
     }
 
     return LayoutRect(enclosingIntRect(paintInvalidationRect));
 }
 
-bool LayoutSVGRoot::mapToVisualRectInAncestorSpace(const LayoutBoxModelObject* ancestor, LayoutRect& rect, VisualRectFlags visualRectFlags) const
-{
-    // Note that we don't apply the border-box transform here - it's assumed
-    // that whoever called us has done that already.
-
-    // Apply initial viewport clip
-    // TODO(crbug.com/597813): We should not apply clip on LayoutSVGRoot's own rect. This clip should
-    // be applied in children's mapToVisualRectInAncestorSpace().
-    if (shouldApplyViewportClip()) {
-        if (visualRectFlags & EdgeInclusive) {
-            if (!rect.inclusiveIntersect(LayoutRect(pixelSnappedBorderBoxRect())))
-                return false;
-        } else {
-            rect.intersect(LayoutRect(pixelSnappedBorderBoxRect()));
-        }
-    }
-
-    return LayoutReplaced::mapToVisualRectInAncestorSpace(ancestor, rect, visualRectFlags);
-}
-
 // This method expects local CSS box coordinates.
 // Callers with local SVG viewport coordinates should first apply the localToBorderBoxTransform
 // to convert from SVG viewport coordinates to local CSS box coordinates.
 void LayoutSVGRoot::mapLocalToAncestor(const LayoutBoxModelObject* ancestor, TransformState& transformState, MapCoordinatesFlags mode) const
 {
     LayoutReplaced::mapLocalToAncestor(ancestor, transformState, mode | ApplyContainerFlip);
 }
 
 const LayoutObject* LayoutSVGRoot::pushMappingToContainer(const LayoutBoxModelObject* ancestorToStopAt, LayoutGeometryMap& geometryMap) const
 {
@@ skipping 41 matching lines @@
             updateHitTestResult(result, pointInBorderBox);
             if (result.addNodeToListBasedTestResult(node(), locationInContainer, boundsRect) == StopHitTesting)
                 return true;
         }
     }
 
     return false;
 }
 
 } // namespace blink