Move RenderSVGResource into the inheritance hierarchy

Source/core/rendering/svg/RenderSVGResourceContainer.h

 /*
  * 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.
  */
 
 #ifndef RenderSVGResourceContainer_h
 #define RenderSVGResourceContainer_h
 
 #include "core/rendering/svg/RenderSVGHiddenContainer.h"
-#include "core/rendering/svg/RenderSVGResource.h"
 #include "core/svg/SVGDocumentExtensions.h"
 
 namespace blink {
 
 enum RenderSVGResourceType {
     MaskerResourceType,
     MarkerResourceType,
     PatternResourceType,
     LinearGradientResourceType,
     RadialGradientResourceType,
     FilterResourceType,
     ClipperResourceType
 };
 
 class RenderLayer;
 
-class RenderSVGResourceContainer : public RenderSVGHiddenContainer,
-                                   public RenderSVGResource {
+class RenderSVGResourceContainer : public RenderSVGHiddenContainer {
 public:
     explicit RenderSVGResourceContainer(SVGElement*);
     virtual ~RenderSVGResourceContainer();
 
     virtual void removeAllClientsFromCache(bool markForInvalidation = true) = 0;
     virtual void removeClientFromCache(RenderObject*, bool markForInvalidation = true) = 0;
 
     virtual void layout() override;
     virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override final;
     virtual bool isOfType(RenderObjectType type) const override { return type == RenderObjectSVGResourceContainer || RenderSVGHiddenContainer::isOfType(type); }
 
     virtual RenderSVGResourceType resourceType() const = 0;
 
+    bool isSVGPaintServer() const
+    {
+        RenderSVGResourceType resourceType = this->resourceType();
+        return resourceType == PatternResourceType
+            || resourceType == LinearGradientResourceType
+            || resourceType == RadialGradientResourceType;
+    }
+
     void idChanged();
     void addClientRenderLayer(Node*);
     void addClientRenderLayer(RenderLayer*);
     void removeClientRenderLayer(RenderLayer*);
 
     void invalidateCacheAndMarkForLayout(SubtreeLayoutScope* = 0);
 
     static void markForLayoutAndParentResourceInvalidation(RenderObject*, bool needsLayout = true);
 
 protected:
@@ skipping 19 matching lines @@
     void addClient(RenderObject*);
     void removeClient(RenderObject*);
 
     virtual void willBeDestroyed() override final;
     void registerResource();
 
     AtomicString m_id;
     // Track global (markAllClientsForInvalidation) invals to avoid redundant crawls.
     unsigned m_invalidationMask : 8;
 
-    bool m_registered : 1;
-    bool m_isInvalidating : 1;
+    unsigned m_registered : 1;
+    unsigned m_isInvalidating : 1;
     // 22 padding bits available
 
     HashSet<RenderObject*> m_clients;
     HashSet<RenderLayer*> m_clientLayers;
 };
 
 inline RenderSVGResourceContainer* getRenderSVGResourceContainerById(TreeScope& treeScope, const AtomicString& id)
 {
     if (id.isEmpty())
         return 0;
@@ skipping 15 matching lines @@
 }
 
 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderSVGResourceContainer, isSVGResourceContainer());
 
 #define DEFINE_RENDER_SVG_RESOURCE_TYPE_CASTS(thisType, typeName) \
     DEFINE_TYPE_CASTS(thisType, RenderSVGResourceContainer, resource, resource->resourceType() == typeName, resource.resourceType() == typeName)
 
 }
 
 #endif