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

Source/core/layout/svg/SVGResources.cpp

 /*
  * Copyright (C) Research In Motion Limited 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/SVGResources.h"
 
 #include "core/SVGNames.h"
 #include "core/layout/style/SVGLayoutStyle.h"
-#include "core/rendering/svg/RenderSVGResourceClipper.h"
-#include "core/rendering/svg/RenderSVGResourceFilter.h"
-#include "core/rendering/svg/RenderSVGResourceMarker.h"
-#include "core/rendering/svg/RenderSVGResourceMasker.h"
-#include "core/rendering/svg/RenderSVGResourcePaintServer.h"
+#include "core/layout/svg/LayoutSVGResourceClipper.h"
+#include "core/layout/svg/LayoutSVGResourceFilter.h"
+#include "core/layout/svg/LayoutSVGResourceMarker.h"
+#include "core/layout/svg/LayoutSVGResourceMasker.h"
+#include "core/layout/svg/LayoutSVGResourcePaintServer.h"
 #include "core/svg/SVGFilterElement.h"
 #include "core/svg/SVGGradientElement.h"
 #include "core/svg/SVGPatternElement.h"
 #include "core/svg/SVGURIReference.h"
 
 #ifndef NDEBUG
 #include <stdio.h>
 #endif
 
 namespace blink {
@@ skipping 117 matching lines @@
     case SVG_PAINTTYPE_URI_CURRENTCOLOR:
     case SVG_PAINTTYPE_URI_RGBCOLOR:
     case SVG_PAINTTYPE_URI:
         return true;
     default:
         break;
     }
     return false;
 }
 
-static inline RenderSVGResourcePaintServer* paintingResourceFromSVGPaint(TreeScope& treeScope, const SVGPaintType& paintType, const String& paintUri, AtomicString& id, bool& hasPendingResource)
+static inline LayoutSVGResourcePaintServer* paintingResourceFromSVGPaint(TreeScope& treeScope, const SVGPaintType& paintType, const String& paintUri, AtomicString& id, bool& hasPendingResource)
 {
     if (!svgPaintTypeHasURL(paintType))
         return nullptr;
 
     id = SVGURIReference::fragmentIdentifierFromIRIString(paintUri, treeScope);
-    RenderSVGResourceContainer* container = getRenderSVGResourceContainerById(treeScope, id);
+    LayoutSVGResourceContainer* container = getLayoutSVGResourceContainerById(treeScope, id);
     if (!container) {
         hasPendingResource = true;
         return nullptr;
     }
 
     if (!container->isSVGPaintServer())
         return nullptr;
 
-    return toRenderSVGResourcePaintServer(container);
+    return toLayoutSVGResourcePaintServer(container);
 }
 
 static inline void registerPendingResource(SVGDocumentExtensions& extensions, const AtomicString& id, SVGElement* element)
 {
     ASSERT(element);
     extensions.addPendingResource(id, element);
 }
 
 bool SVGResources::hasResourceData() const
 {
@@ skipping 25 matching lines @@
     const AtomicString& tagName = element->localName();
     ASSERT(!tagName.isNull());
 
     TreeScope& treeScope = element->treeScope();
     SVGDocumentExtensions& extensions = element->document().accessSVGExtensions();
 
     OwnPtr<SVGResources> resources;
     if (clipperFilterMaskerTags().contains(tagName)) {
         if (style.hasClipper()) {
             AtomicString id = style.clipperResource();
-            if (!ensureResources(resources).setClipper(getRenderSVGResourceById<RenderSVGResourceClipper>(treeScope, id)))
+            if (!ensureResources(resources).setClipper(getLayoutSVGResourceById<LayoutSVGResourceClipper>(treeScope, id)))
                 registerPendingResource(extensions, id, element);
         }
 
         if (style.hasFilter()) {
             AtomicString id = style.filterResource();
-            if (!ensureResources(resources).setFilter(getRenderSVGResourceById<RenderSVGResourceFilter>(treeScope, id)))
+            if (!ensureResources(resources).setFilter(getLayoutSVGResourceById<LayoutSVGResourceFilter>(treeScope, id)))
                 registerPendingResource(extensions, id, element);
         }
 
         if (style.hasMasker()) {
             AtomicString id = style.maskerResource();
-            if (!ensureResources(resources).setMasker(getRenderSVGResourceById<RenderSVGResourceMasker>(treeScope, id)))
+            if (!ensureResources(resources).setMasker(getLayoutSVGResourceById<LayoutSVGResourceMasker>(treeScope, id)))
                 registerPendingResource(extensions, id, element);
         }
     }
 
     if (style.hasMarkers() && supportsMarkers(*element)) {
         const AtomicString& markerStartId = style.markerStartResource();
-        if (!ensureResources(resources).setMarkerStart(getRenderSVGResourceById<RenderSVGResourceMarker>(treeScope, markerStartId)))
+        if (!ensureResources(resources).setMarkerStart(getLayoutSVGResourceById<LayoutSVGResourceMarker>(treeScope, markerStartId)))
             registerPendingResource(extensions, markerStartId, element);
 
         const AtomicString& markerMidId = style.markerMidResource();
-        if (!ensureResources(resources).setMarkerMid(getRenderSVGResourceById<RenderSVGResourceMarker>(treeScope, markerMidId)))
+        if (!ensureResources(resources).setMarkerMid(getLayoutSVGResourceById<LayoutSVGResourceMarker>(treeScope, markerMidId)))
             registerPendingResource(extensions, markerMidId, element);
 
         const AtomicString& markerEndId = style.markerEndResource();
-        if (!ensureResources(resources).setMarkerEnd(getRenderSVGResourceById<RenderSVGResourceMarker>(treeScope, style.markerEndResource())))
+        if (!ensureResources(resources).setMarkerEnd(getLayoutSVGResourceById<LayoutSVGResourceMarker>(treeScope, style.markerEndResource())))
             registerPendingResource(extensions, markerEndId, element);
     }
 
     if (fillAndStrokeTags().contains(tagName)) {
         if (style.hasFill()) {
             bool hasPendingResource = false;
             AtomicString id;
-            RenderSVGResourcePaintServer* resource = paintingResourceFromSVGPaint(treeScope, style.fillPaintType(), style.fillPaintUri(), id, hasPendingResource);
+            LayoutSVGResourcePaintServer* resource = paintingResourceFromSVGPaint(treeScope, style.fillPaintType(), style.fillPaintUri(), id, hasPendingResource);
             if (!ensureResources(resources).setFill(resource) && hasPendingResource) {
                 registerPendingResource(extensions, id, element);
             }
         }
 
         if (style.hasStroke()) {
             bool hasPendingResource = false;
             AtomicString id;
-            RenderSVGResourcePaintServer* resource = paintingResourceFromSVGPaint(treeScope, style.strokePaintType(), style.strokePaintUri(), id, hasPendingResource);
+            LayoutSVGResourcePaintServer* resource = paintingResourceFromSVGPaint(treeScope, style.strokePaintType(), style.strokePaintUri(), id, hasPendingResource);
             if (!ensureResources(resources).setStroke(resource) && hasPendingResource) {
                 registerPendingResource(extensions, id, element);
             }
         }
     }
 
     if (chainableResourceTags().contains(tagName)) {
         AtomicString id = targetReferenceFromResource(*element);
-        if (!ensureResources(resources).setLinkedResource(getRenderSVGResourceContainerById(treeScope, id)))
+        if (!ensureResources(resources).setLinkedResource(getLayoutSVGResourceContainerById(treeScope, id)))
             registerPendingResource(extensions, id, element);
     }
 
     return (!resources || !resources->hasResourceData()) ? nullptr : resources.release();
 }
 
 void SVGResources::layoutIfNeeded()
 {
     if (m_clipperFilterMaskerData) {
-        if (RenderSVGResourceClipper* clipper = m_clipperFilterMaskerData->clipper)
+        if (LayoutSVGResourceClipper* clipper = m_clipperFilterMaskerData->clipper)
             clipper->layoutIfNeeded();
-        if (RenderSVGResourceMasker* masker = m_clipperFilterMaskerData->masker)
+        if (LayoutSVGResourceMasker* masker = m_clipperFilterMaskerData->masker)
             masker->layoutIfNeeded();
-        if (RenderSVGResourceFilter* filter = m_clipperFilterMaskerData->filter)
+        if (LayoutSVGResourceFilter* filter = m_clipperFilterMaskerData->filter)
             filter->layoutIfNeeded();
     }
 
     if (m_markerData) {
-        if (RenderSVGResourceMarker* marker = m_markerData->markerStart)
+        if (LayoutSVGResourceMarker* marker = m_markerData->markerStart)
             marker->layoutIfNeeded();
-        if (RenderSVGResourceMarker* marker = m_markerData->markerMid)
+        if (LayoutSVGResourceMarker* marker = m_markerData->markerMid)
             marker->layoutIfNeeded();
-        if (RenderSVGResourceMarker* marker = m_markerData->markerEnd)
+        if (LayoutSVGResourceMarker* marker = m_markerData->markerEnd)
             marker->layoutIfNeeded();
     }
 
     if (m_fillStrokeData) {
-        if (RenderSVGResourcePaintServer* fill = m_fillStrokeData->fill)
+        if (LayoutSVGResourcePaintServer* fill = m_fillStrokeData->fill)
             fill->layoutIfNeeded();
-        if (RenderSVGResourcePaintServer* stroke = m_fillStrokeData->stroke)
+        if (LayoutSVGResourcePaintServer* stroke = m_fillStrokeData->stroke)
             stroke->layoutIfNeeded();
     }
 
     if (m_linkedResource)
         m_linkedResource->layoutIfNeeded();
 }
 
 void SVGResources::removeClientFromCache(LayoutObject* object, bool markForInvalidation) const
 {
     if (!hasResourceData())
@@ skipping 26 matching lines @@
     }
 
     if (m_fillStrokeData) {
         if (m_fillStrokeData->fill)
             m_fillStrokeData->fill->removeClientFromCache(object, markForInvalidation);
         if (m_fillStrokeData->stroke)
             m_fillStrokeData->stroke->removeClientFromCache(object, markForInvalidation);
     }
 }
 
-void SVGResources::resourceDestroyed(RenderSVGResourceContainer* resource)
+void SVGResources::resourceDestroyed(LayoutSVGResourceContainer* resource)
 {
     ASSERT(resource);
     if (!hasResourceData())
         return;
 
     if (m_linkedResource == resource) {
         ASSERT(!m_clipperFilterMaskerData);
         ASSERT(!m_markerData);
         ASSERT(!m_fillStrokeData);
         m_linkedResource->removeAllClientsFromCache();
@@ skipping 54 matching lines @@
         if (m_clipperFilterMaskerData->clipper == resource) {
             m_clipperFilterMaskerData->clipper->removeAllClientsFromCache();
             m_clipperFilterMaskerData->clipper = nullptr;
         }
         break;
     default:
         ASSERT_NOT_REACHED();
     }
 }
 
-void SVGResources::buildSetOfResources(HashSet<RenderSVGResourceContainer*>& set)
+void SVGResources::buildSetOfResources(HashSet<LayoutSVGResourceContainer*>& set)
 {
     if (!hasResourceData())
         return;
 
     if (m_linkedResource) {
         ASSERT(!m_clipperFilterMaskerData);
         ASSERT(!m_markerData);
         ASSERT(!m_fillStrokeData);
         set.add(m_linkedResource);
         return;
@@ skipping 18 matching lines @@
     }
 
     if (m_fillStrokeData) {
         if (m_fillStrokeData->fill)
             set.add(m_fillStrokeData->fill);
         if (m_fillStrokeData->stroke)
             set.add(m_fillStrokeData->stroke);
     }
 }
 
-bool SVGResources::setClipper(RenderSVGResourceClipper* clipper)
+bool SVGResources::setClipper(LayoutSVGResourceClipper* clipper)
 {
     if (!clipper)
         return false;
 
     ASSERT(clipper->resourceType() == ClipperResourceType);
 
     if (!m_clipperFilterMaskerData)
         m_clipperFilterMaskerData = ClipperFilterMaskerData::create();
 
     m_clipperFilterMaskerData->clipper = clipper;
     return true;
 }
 
 void SVGResources::resetClipper()
 {
     ASSERT(m_clipperFilterMaskerData);
     ASSERT(m_clipperFilterMaskerData->clipper);
     m_clipperFilterMaskerData->clipper = nullptr;
 }
 
-bool SVGResources::setFilter(RenderSVGResourceFilter* filter)
+bool SVGResources::setFilter(LayoutSVGResourceFilter* filter)
 {
     if (!filter)
         return false;
 
     ASSERT(filter->resourceType() == FilterResourceType);
 
     if (!m_clipperFilterMaskerData)
         m_clipperFilterMaskerData = ClipperFilterMaskerData::create();
 
     m_clipperFilterMaskerData->filter = filter;
     return true;
 }
 
 void SVGResources::resetFilter()
 {
     ASSERT(m_clipperFilterMaskerData);
     ASSERT(m_clipperFilterMaskerData->filter);
     m_clipperFilterMaskerData->filter = nullptr;
 }
 
-bool SVGResources::setMarkerStart(RenderSVGResourceMarker* markerStart)
+bool SVGResources::setMarkerStart(LayoutSVGResourceMarker* markerStart)
 {
     if (!markerStart)
         return false;
 
     ASSERT(markerStart->resourceType() == MarkerResourceType);
 
     if (!m_markerData)
         m_markerData = MarkerData::create();
 
     m_markerData->markerStart = markerStart;
     return true;
 }
 
 void SVGResources::resetMarkerStart()
 {
     ASSERT(m_markerData);
     ASSERT(m_markerData->markerStart);
     m_markerData->markerStart = nullptr;
 }
 
-bool SVGResources::setMarkerMid(RenderSVGResourceMarker* markerMid)
+bool SVGResources::setMarkerMid(LayoutSVGResourceMarker* markerMid)
 {
     if (!markerMid)
         return false;
 
     ASSERT(markerMid->resourceType() == MarkerResourceType);
 
     if (!m_markerData)
         m_markerData = MarkerData::create();
 
     m_markerData->markerMid = markerMid;
     return true;
 }
 
 void SVGResources::resetMarkerMid()
 {
     ASSERT(m_markerData);
     ASSERT(m_markerData->markerMid);
     m_markerData->markerMid = nullptr;
 }
 
-bool SVGResources::setMarkerEnd(RenderSVGResourceMarker* markerEnd)
+bool SVGResources::setMarkerEnd(LayoutSVGResourceMarker* markerEnd)
 {
     if (!markerEnd)
         return false;
 
     ASSERT(markerEnd->resourceType() == MarkerResourceType);
 
     if (!m_markerData)
         m_markerData = MarkerData::create();
 
     m_markerData->markerEnd = markerEnd;
     return true;
 }
 
 void SVGResources::resetMarkerEnd()
 {
     ASSERT(m_markerData);
     ASSERT(m_markerData->markerEnd);
     m_markerData->markerEnd = nullptr;
 }
 
-bool SVGResources::setMasker(RenderSVGResourceMasker* masker)
+bool SVGResources::setMasker(LayoutSVGResourceMasker* masker)
 {
     if (!masker)
         return false;
 
     ASSERT(masker->resourceType() == MaskerResourceType);
 
     if (!m_clipperFilterMaskerData)
         m_clipperFilterMaskerData = ClipperFilterMaskerData::create();
 
     m_clipperFilterMaskerData->masker = masker;
     return true;
 }
 
 void SVGResources::resetMasker()
 {
     ASSERT(m_clipperFilterMaskerData);
     ASSERT(m_clipperFilterMaskerData->masker);
     m_clipperFilterMaskerData->masker = nullptr;
 }
 
-bool SVGResources::setFill(RenderSVGResourcePaintServer* fill)
+bool SVGResources::setFill(LayoutSVGResourcePaintServer* fill)
 {
     if (!fill)
         return false;
 
     if (!m_fillStrokeData)
         m_fillStrokeData = FillStrokeData::create();
 
     m_fillStrokeData->fill = fill;
     return true;
 }
 
 void SVGResources::resetFill()
 {
     ASSERT(m_fillStrokeData);
     ASSERT(m_fillStrokeData->fill);
     m_fillStrokeData->fill = nullptr;
 }
 
-bool SVGResources::setStroke(RenderSVGResourcePaintServer* stroke)
+bool SVGResources::setStroke(LayoutSVGResourcePaintServer* stroke)
 {
     if (!stroke)
         return false;
 
     if (!m_fillStrokeData)
         m_fillStrokeData = FillStrokeData::create();
 
     m_fillStrokeData->stroke = stroke;
     return true;
 }
 
 void SVGResources::resetStroke()
 {
     ASSERT(m_fillStrokeData);
     ASSERT(m_fillStrokeData->stroke);
     m_fillStrokeData->stroke = nullptr;
 }
 
-bool SVGResources::setLinkedResource(RenderSVGResourceContainer* linkedResource)
+bool SVGResources::setLinkedResource(LayoutSVGResourceContainer* linkedResource)
 {
     if (!linkedResource)
         return false;
 
     m_linkedResource = linkedResource;
     return true;
 }
 
 void SVGResources::resetLinkedResource()
 {
     ASSERT(m_linkedResource);
     m_linkedResource = nullptr;
 }
 
 #ifndef NDEBUG
 void SVGResources::dump(const LayoutObject* object)
 {
     ASSERT(object);
     ASSERT(object->node());
 
     fprintf(stderr, "-> this=%p, SVGResources(renderer=%p, node=%p)\n", this, object, object->node());
     fprintf(stderr, " | DOM Tree:\n");
     object->node()->showTreeForThis();
 
     fprintf(stderr, "\n | List of resources:\n");
     if (m_clipperFilterMaskerData) {
-        if (RenderSVGResourceClipper* clipper = m_clipperFilterMaskerData->clipper)
+        if (LayoutSVGResourceClipper* clipper = m_clipperFilterMaskerData->clipper)
             fprintf(stderr, " |-> Clipper    : %p (node=%p)\n", clipper, clipper->element());
-        if (RenderSVGResourceFilter* filter = m_clipperFilterMaskerData->filter)
+        if (LayoutSVGResourceFilter* filter = m_clipperFilterMaskerData->filter)
             fprintf(stderr, " |-> Filter     : %p (node=%p)\n", filter, filter->element());
-        if (RenderSVGResourceMasker* masker = m_clipperFilterMaskerData->masker)
+        if (LayoutSVGResourceMasker* masker = m_clipperFilterMaskerData->masker)
             fprintf(stderr, " |-> Masker     : %p (node=%p)\n", masker, masker->element());
     }
 
     if (m_markerData) {
-        if (RenderSVGResourceMarker* markerStart = m_markerData->markerStart)
+        if (LayoutSVGResourceMarker* markerStart = m_markerData->markerStart)
             fprintf(stderr, " |-> MarkerStart: %p (node=%p)\n", markerStart, markerStart->element());
-        if (RenderSVGResourceMarker* markerMid = m_markerData->markerMid)
+        if (LayoutSVGResourceMarker* markerMid = m_markerData->markerMid)
             fprintf(stderr, " |-> MarkerMid  : %p (node=%p)\n", markerMid, markerMid->element());
-        if (RenderSVGResourceMarker* markerEnd = m_markerData->markerEnd)
+        if (LayoutSVGResourceMarker* markerEnd = m_markerData->markerEnd)
             fprintf(stderr, " |-> MarkerEnd  : %p (node=%p)\n", markerEnd, markerEnd->element());
     }
 
     if (m_fillStrokeData) {
-        if (RenderSVGResourcePaintServer* fill = m_fillStrokeData->fill)
+        if (LayoutSVGResourcePaintServer* fill = m_fillStrokeData->fill)
             fprintf(stderr, " |-> Fill       : %p (node=%p)\n", fill, fill->element());
-        if (RenderSVGResourcePaintServer* stroke = m_fillStrokeData->stroke)
+        if (LayoutSVGResourcePaintServer* stroke = m_fillStrokeData->stroke)
             fprintf(stderr, " |-> Stroke     : %p (node=%p)\n", stroke, stroke->element());
     }
 
     if (m_linkedResource)
         fprintf(stderr, " |-> xlink:href : %p (node=%p)\n", m_linkedResource, m_linkedResource->element());
 }
 #endif
 
 }