Remove LayoutSVGViewportContainer's calcViewport and pointIsInsideViewportClip

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

 /*
  * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2007, 2008 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 Google, Inc.  All rights reserved.
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.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
@@ skipping 28 matching lines @@
       m_didScreenScaleFactorChange(false),
       m_hasNonIsolatedBlendingDescendants(false),
       m_hasNonIsolatedBlendingDescendantsDirty(false) {}
 
 LayoutSVGContainer::~LayoutSVGContainer() {}
 
 void LayoutSVGContainer::layout() {
   ASSERT(needsLayout());
   LayoutAnalyzer::Scope analyzer(*this);
 
-  // Allow LayoutSVGViewportContainer to update its viewport.
-  calcViewport();
-
   // Allow LayoutSVGTransformableContainer to update its transform.

[fs, 2016/12/13 10:11:23]

Nit: Maybe update this comment too (like in the header.)

[pdr., 2016/12/13 19:48:55]

Done. Went with a generic "Update the local transform in subclasses".

   SVGTransformChange transformChange = calculateLocalTransform();
   m_didScreenScaleFactorChange =
       transformChange == SVGTransformChange::Full ||
       SVGLayoutSupport::screenScaleFactorChanged(parent());
 
   // LayoutSVGViewportContainer needs to set the 'layout size changed' flag.
   determineIfLayoutSizeChanged();
 
   // When hasRelativeLengths() is false, no descendants have relative lengths
   // (hence no one is interested in viewport size changes).
@@ skipping 112 matching lines @@
   SVGLayoutSupport::computeContainerBoundingBoxes(
       this, m_objectBoundingBox, m_objectBoundingBoxValid, m_strokeBoundingBox,
       m_localVisualRect);
   if (element())
     element()->setNeedsResizeObserverUpdate();
 }
 
 bool LayoutSVGContainer::nodeAtFloatPoint(HitTestResult& result,
                                           const FloatPoint& pointInParent,
                                           HitTestAction hitTestAction) {
-  // Give LayoutSVGViewportContainer a chance to apply its viewport clip
-  if (!pointIsInsideViewportClip(pointInParent))
-    return false;
-
   FloatPoint localPoint;
   if (!SVGLayoutSupport::transformToUserSpaceAndCheckClipping(
           *this, localToSVGParentTransform(), pointInParent, localPoint))
     return false;
 
   for (LayoutObject* child = lastChild(); child;
        child = child->previousSibling()) {
     if (child->nodeAtFloatPoint(result, localPoint, hitTestAction)) {
       const LayoutPoint& localLayoutPoint = LayoutPoint(localPoint);
       updateHitTestResult(result, localLayoutPoint);
@@ skipping 21 matching lines @@
   // under the pointer (i.e., there is no target element), the event is not
   // dispatched."
   return false;
 }
 
 SVGTransformChange LayoutSVGContainer::calculateLocalTransform() {
   return SVGTransformChange::None;
 }
 
 }  // namespace blink