Clean up SVGResources

Source/core/rendering/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
@@ skipping 23 matching lines @@
 
 #ifndef NDEBUG
 #include <stdio.h>
 #endif
 
 namespace blink {
 
 using namespace SVGNames;
 
 SVGResources::SVGResources()
-    : m_linkedResource(0)
+    : m_linkedResource(nullptr)
 {
 }
 
 static HashSet<AtomicString>& clipperFilterMaskerTags()
 {
     DEFINE_STATIC_LOCAL(HashSet<AtomicString>, s_tagList, ());
     if (s_tagList.isEmpty()) {
         // "container elements": http://www.w3.org/TR/SVG11/intro.html#TermContainerElement
         // "graphics elements" : http://www.w3.org/TR/SVG11/intro.html#TermGraphicsElement
         s_tagList.add(aTag.localName());
@@ skipping 105 matching lines @@
         return true;
     default:
         break;
     }
     return false;
 }
 
 static inline RenderSVGResourcePaintServer* paintingResourceFromSVGPaint(TreeScope& treeScope, const SVGPaintType& paintType, const String& paintUri, AtomicString& id, bool& hasPendingResource)
 {
     if (!svgPaintTypeHasURL(paintType))
-        return 0;
+        return nullptr;
 
     id = SVGURIReference::fragmentIdentifierFromIRIString(paintUri, treeScope);
     RenderSVGResourceContainer* container = getRenderSVGResourceContainerById(treeScope, id);
     if (!container) {
         hasPendingResource = true;
-        return 0;
+        return nullptr;
     }
 
     if (!container->isSVGPaintServer())
-        return 0;
+        return nullptr;
 
     return toRenderSVGResourcePaintServer(container);
 }
 
 static inline void registerPendingResource(SVGDocumentExtensions& extensions, const AtomicString& id, SVGElement* element)
 {
     ASSERT(element);
     extensions.addPendingResource(id, element);
 }
 
 bool SVGResources::hasResourceData() const
 {
     return m_clipperFilterMaskerData
         || m_markerData
         || m_fillStrokeData
         || m_linkedResource;
 }
 
-static inline SVGResources* ensureResources(OwnPtr<SVGResources>& resources)
+static inline SVGResources& ensureResources(OwnPtr<SVGResources>& resources)
 {
     if (!resources)
         resources = adoptPtr(new SVGResources);
 
-    return resources.get();
+    return *resources.get();
 }
 
 PassOwnPtr<SVGResources> SVGResources::buildResources(const RenderObject* object, const SVGRenderStyle& style)
 {
     ASSERT(object);
 
     Node* node = object->node();
     ASSERT(node);
     ASSERT_WITH_SECURITY_IMPLICATION(node->isSVGElement());
 
     SVGElement* element = toSVGElement(node);
-    if (!element)
-        return nullptr;
+    ASSERT(element);
+
+    const AtomicString& tagName = element->localName();
+    ASSERT(!tagName.isNull());
 
     TreeScope& treeScope = element->treeScope();
-
-    SVGDocumentExtensions& extensions = object->document().accessSVGExtensions();
-
-    const AtomicString& tagName = element->localName();
-    if (tagName.isNull())
-        return nullptr;
+    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(getRenderSVGResourceById<RenderSVGResourceClipper>(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(getRenderSVGResourceById<RenderSVGResourceFilter>(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(getRenderSVGResourceById<RenderSVGResourceMasker>(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(getRenderSVGResourceById<RenderSVGResourceMarker>(treeScope, markerStartId)))
             registerPendingResource(extensions, markerStartId, element);
 
         const AtomicString& markerMidId = style.markerMidResource();
-        if (!ensureResources(resources)->setMarkerMid(getRenderSVGResourceById<RenderSVGResourceMarker>(treeScope, markerMidId)))
+        if (!ensureResources(resources).setMarkerMid(getRenderSVGResourceById<RenderSVGResourceMarker>(treeScope, markerMidId)))
             registerPendingResource(extensions, markerMidId, element);
 
         const AtomicString& markerEndId = style.markerEndResource();
-        if (!ensureResources(resources)->setMarkerEnd(getRenderSVGResourceById<RenderSVGResourceMarker>(treeScope, style.markerEndResource())))
+        if (!ensureResources(resources).setMarkerEnd(getRenderSVGResourceById<RenderSVGResourceMarker>(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);
-            if (!ensureResources(resources)->setFill(resource) && 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);
-            if (!ensureResources(resources)->setStroke(resource) && 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(getRenderSVGResourceContainerById(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)
@@ skipping 67 matching lines @@
 {
     ASSERT(resource);
     if (!hasResourceData())
         return;
 
     if (m_linkedResource == resource) {
         ASSERT(!m_clipperFilterMaskerData);
         ASSERT(!m_markerData);
         ASSERT(!m_fillStrokeData);
         m_linkedResource->removeAllClientsFromCache();
-        m_linkedResource = 0;
+        m_linkedResource = nullptr;
         return;
     }
 
     switch (resource->resourceType()) {
     case MaskerResourceType:
         if (!m_clipperFilterMaskerData)
             break;
         if (m_clipperFilterMaskerData->masker == resource) {
             m_clipperFilterMaskerData->masker->removeAllClientsFromCache();
-            m_clipperFilterMaskerData->masker = 0;
+            m_clipperFilterMaskerData->masker = nullptr;
         }
         break;
     case MarkerResourceType:
         if (!m_markerData)
             break;
         if (m_markerData->markerStart == resource) {
             m_markerData->markerStart->removeAllClientsFromCache();
-            m_markerData->markerStart = 0;
+            m_markerData->markerStart = nullptr;
         }
         if (m_markerData->markerMid == resource) {
             m_markerData->markerMid->removeAllClientsFromCache();
-            m_markerData->markerMid = 0;
+            m_markerData->markerMid = nullptr;
         }
         if (m_markerData->markerEnd == resource) {
             m_markerData->markerEnd->removeAllClientsFromCache();
-            m_markerData->markerEnd = 0;
+            m_markerData->markerEnd = nullptr;
         }
         break;
     case PatternResourceType:
     case LinearGradientResourceType:
     case RadialGradientResourceType:
         if (!m_fillStrokeData)
             break;
         if (m_fillStrokeData->fill == resource) {
             m_fillStrokeData->fill->removeAllClientsFromCache();
-            m_fillStrokeData->fill = 0;
+            m_fillStrokeData->fill = nullptr;
         }
         if (m_fillStrokeData->stroke == resource) {
             m_fillStrokeData->stroke->removeAllClientsFromCache();
-            m_fillStrokeData->stroke = 0;
+            m_fillStrokeData->stroke = nullptr;
         }
         break;
     case FilterResourceType:
         if (!m_clipperFilterMaskerData)
             break;
         if (m_clipperFilterMaskerData->filter == resource) {
             m_clipperFilterMaskerData->filter->removeAllClientsFromCache();
-            m_clipperFilterMaskerData->filter = 0;
+            m_clipperFilterMaskerData->filter = nullptr;
         }
         break;
     case ClipperResourceType:
         if (!m_clipperFilterMaskerData)
             break;
         if (m_clipperFilterMaskerData->clipper == resource) {
             m_clipperFilterMaskerData->clipper->removeAllClientsFromCache();
-            m_clipperFilterMaskerData->clipper = 0;
+            m_clipperFilterMaskerData->clipper = nullptr;
         }
         break;
     default:
         ASSERT_NOT_REACHED();
     }
 }
 
 void SVGResources::buildSetOfResources(HashSet<RenderSVGResourceContainer*>& set)
 {
     if (!hasResourceData())
@@ skipping 44 matching lines @@
         m_clipperFilterMaskerData = ClipperFilterMaskerData::create();
 
     m_clipperFilterMaskerData->clipper = clipper;
     return true;
 }
 
 void SVGResources::resetClipper()
 {
     ASSERT(m_clipperFilterMaskerData);
     ASSERT(m_clipperFilterMaskerData->clipper);
-    m_clipperFilterMaskerData->clipper = 0;
+    m_clipperFilterMaskerData->clipper = nullptr;
 }
 
 bool SVGResources::setFilter(RenderSVGResourceFilter* 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 = 0;
+    m_clipperFilterMaskerData->filter = nullptr;
 }
 
 bool SVGResources::setMarkerStart(RenderSVGResourceMarker* 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 = 0;
+    m_markerData->markerStart = nullptr;
 }
 
 bool SVGResources::setMarkerMid(RenderSVGResourceMarker* 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 = 0;
+    m_markerData->markerMid = nullptr;
 }
 
 bool SVGResources::setMarkerEnd(RenderSVGResourceMarker* 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 = 0;
+    m_markerData->markerEnd = nullptr;
 }
 
 bool SVGResources::setMasker(RenderSVGResourceMasker* 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 = 0;
+    m_clipperFilterMaskerData->masker = nullptr;
 }
 
 bool SVGResources::setFill(RenderSVGResourcePaintServer* 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 = 0;
+    m_fillStrokeData->fill = nullptr;
 }
 
 bool SVGResources::setStroke(RenderSVGResourcePaintServer* 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 = 0;
+    m_fillStrokeData->stroke = nullptr;
 }
 
 bool SVGResources::setLinkedResource(RenderSVGResourceContainer* linkedResource)
 {
     if (!linkedResource)
         return false;
 
     m_linkedResource = linkedResource;
     return true;
 }
 
 void SVGResources::resetLinkedResource()
 {
     ASSERT(m_linkedResource);
-    m_linkedResource = 0;
+    m_linkedResource = nullptr;
 }
 
 #ifndef NDEBUG
 void SVGResources::dump(const RenderObject* 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");
@@ skipping 24 matching lines @@
         if (RenderSVGResourcePaintServer* 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
 
 }