Move rendering/svg/RenderSVGResource* to layout/svg.

Source/core/paint/SVGPaintContext.cpp

 /*
  * Copyright (C) 2007, 2008 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@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>
  * 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
@@ skipping 10 matching lines @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
 #include "core/paint/SVGPaintContext.h"
 
 #include "core/frame/FrameHost.h"
 #include "core/layout/Layer.h"
 #include "core/layout/PaintInfo.h"
+#include "core/layout/svg/LayoutSVGResourceFilter.h"
+#include "core/layout/svg/LayoutSVGResourceMasker.h"
 #include "core/layout/svg/SVGLayoutSupport.h"
 #include "core/layout/svg/SVGResources.h"
 #include "core/layout/svg/SVGResourcesCache.h"
 #include "core/paint/RenderDrawingRecorder.h"
-#include "core/rendering/svg/RenderSVGResourceFilter.h"
-#include "core/rendering/svg/RenderSVGResourceMasker.h"
 #include "platform/FloatConversion.h"
 
 namespace blink {
 
 SVGPaintContext::~SVGPaintContext()
 {
     if (m_filter) {
         ASSERT(SVGResourcesCache::cachedResourcesForLayoutObject(m_object));
         ASSERT(SVGResourcesCache::cachedResourcesForLayoutObject(m_object)->filter() == m_filter);
 
@@ skipping 71 matching lines @@
         CompositeOperator compositeOp = hasBlendMode ? CompositeSourceOver : m_paintInfo.context->compositeOperationDeprecated();
         m_compositingRecorder = adoptPtr(new CompositingRecorder(m_paintInfo.context, m_object->displayItemClient(), compositeOp, blendMode, opacity, compositeOp));
     }
 }
 
 bool SVGPaintContext::applyClipIfNecessary(SVGResources* resources)
 {
     // resources->clipper() corresponds to the non-prefixed 'clip-path' whereas
     // m_object->style()->clipPath() corresponds to '-webkit-clip-path'.
     // FIXME: We should unify the clip-path and -webkit-clip-path codepaths.
-    if (RenderSVGResourceClipper* clipper = resources ? resources->clipper() : nullptr) {
+    if (LayoutSVGResourceClipper* clipper = resources ? resources->clipper() : nullptr) {
         if (!clipper->applyStatefulResource(m_object, m_paintInfo.context, m_clipperState))
             return false;
         m_clipper = clipper;
     } else {
         ClipPathOperation* clipPathOperation = m_object->style()->clipPath();
         if (clipPathOperation && clipPathOperation->type() == ClipPathOperation::SHAPE) {
             ShapeClipPathOperation* clipPath = toShapeClipPathOperation(clipPathOperation);
             if (!clipPath->isValid())
                 return false;
             m_clipPathRecorder = adoptPtr(new ClipPathRecorder(*m_paintInfo.context, m_object->displayItemClient(), clipPath->path(m_object->objectBoundingBox()), clipPath->windRule()));
         }
     }
     return true;
 }
 
 bool SVGPaintContext::applyMaskIfNecessary(SVGResources* resources)
 {
-    if (RenderSVGResourceMasker* masker = resources ? resources->masker() : nullptr) {
+    if (LayoutSVGResourceMasker* masker = resources ? resources->masker() : nullptr) {
         if (!masker->prepareEffect(m_object, m_paintInfo.context))
             return false;
         m_masker = masker;
     }
     return true;
 }
 
 bool SVGPaintContext::applyFilterIfNecessary(SVGResources* resources)
 {
     if (!resources) {
         if (m_object->style()->svgStyle().hasFilter())
             return false;
-    } else if (RenderSVGResourceFilter* filter = resources->filter()) {
+    } else if (LayoutSVGResourceFilter* filter = resources->filter()) {
         m_filter = filter;
         GraphicsContext* filterContext = filter->prepareEffect(m_object, m_paintInfo.context);
         if (!filterContext)
             return false;
 
         // Because the filter needs to cache its contents we replace the context
         // during filtering with the filter's context.
         m_paintInfo.context = filterContext;
 
         // Because we cache the filter contents and do not invalidate on paint
         // invalidation rect changes, we need to paint the entire filter region
         // so elements outside the initial paint (due to scrolling, etc) paint.
         m_paintInfo.rect = LayoutRect::infiniteIntRect();
     }
     return true;
 }
 
 bool SVGPaintContext::isIsolationInstalled() const
 {
     if (m_compositingRecorder)
         return true;
     if (m_masker || m_filter)
         return true;
-    if (m_clipper && m_clipperState == RenderSVGResourceClipper::ClipperAppliedMask)
+    if (m_clipper && m_clipperState == LayoutSVGResourceClipper::ClipperAppliedMask)
         return true;
     return false;
 }
 
 void SVGPaintContext::paintSubtree(GraphicsContext* context, LayoutObject* item)
 {
     ASSERT(context);
     ASSERT(item);
     ASSERT(!item->needsLayout());
 
     PaintInfo info(context, LayoutRect::infiniteIntRect(), PaintPhaseForeground, PaintBehaviorNormal);
     item->paint(info, IntPoint());
 }
 
 } // namespace blink