Move RenderSVGContainer to layout/svg/LayoutSVGContainer.

Source/core/layout/svg/LayoutSVGResourceMarker.cpp

 /*
  * Copyright (C) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Rob Buis <buis@kde.org>
  * Copyright (C) Research In Motion Limited 2009-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 "config.h"
 #include "core/layout/svg/LayoutSVGResourceMarker.h"
 
+#include "core/layout/svg/LayoutSVGContainer.h"
 #include "core/layout/svg/SVGLayoutSupport.h"
-#include "core/rendering/svg/RenderSVGContainer.h"
 #include "wtf/TemporaryChange.h"
 
 namespace blink {
 
 LayoutSVGResourceMarker::LayoutSVGResourceMarker(SVGMarkerElement* node)
     : LayoutSVGResourceContainer(node)
 {
 }
 
 LayoutSVGResourceMarker::~LayoutSVGResourceMarker()
 {
 }
 
 void LayoutSVGResourceMarker::layout()
 {
     ASSERT(needsLayout());
     if (m_isInLayout)
         return;
 
     TemporaryChange<bool> inLayoutChange(m_isInLayout, true);
 
     // RenderSVGHiddenContainer overwrites layout(). We need the
-    // layouting of RenderSVGContainer for calculating  local
+    // layouting of LayoutSVGContainer for calculating  local
     // transformations and paint invalidation.
-    RenderSVGContainer::layout();
+    LayoutSVGContainer::layout();
 
     clearInvalidationMask();
 }
 
 void LayoutSVGResourceMarker::removeAllClientsFromCache(bool markForInvalidation)
 {
     markAllClientsForInvalidation(markForInvalidation ? LayoutAndBoundariesInvalidation : ParentOnlyInvalidation);
 }
 
 void LayoutSVGResourceMarker::removeClientFromCache(LayoutObject* client, bool markForInvalidation)
 {
     ASSERT(client);
     markClientForInvalidation(client, markForInvalidation ? BoundariesInvalidation : ParentOnlyInvalidation);
 }
 
 FloatRect LayoutSVGResourceMarker::markerBoundaries(const AffineTransform& markerTransformation) const
 {
-    FloatRect coordinates = RenderSVGContainer::paintInvalidationRectInLocalCoordinates();
+    FloatRect coordinates = LayoutSVGContainer::paintInvalidationRectInLocalCoordinates();
 
     // Map paint invalidation rect into parent coordinate space, in which the marker boundaries have to be evaluated
     coordinates = localToParentTransform().mapRect(coordinates);
 
     return markerTransformation.mapRect(coordinates);
 }
 
 const AffineTransform& LayoutSVGResourceMarker::localToParentTransform() const
 {
     m_localToParentTransform = AffineTransform::translation(m_viewport.x(), m_viewport.y()) * viewportTransform();
@@ skipping 67 matching lines @@
     SVGMarkerElement* marker = toSVGMarkerElement(element());
     ASSERT(marker);
 
     SVGLengthContext lengthContext(marker);
     float w = marker->markerWidth()->currentValue()->value(lengthContext);
     float h = marker->markerHeight()->currentValue()->value(lengthContext);
     m_viewport = FloatRect(0, 0, w, h);
 }
 
 }