Move RenderSVGResource into the inheritance hierarchy

Source/core/rendering/svg/RenderSVGResourceContainer.h

Index: Source/core/rendering/svg/RenderSVGResourceContainer.h
diff --git a/Source/core/rendering/svg/RenderSVGResourceContainer.h b/Source/core/rendering/svg/RenderSVGResourceContainer.h
index b201cc87334465f4fdf3974d037f2ae4e1140012..b49dd4f48778c2c7699ee7125e05fdbd31375312 100644
--- a/Source/core/rendering/svg/RenderSVGResourceContainer.h
+++ b/Source/core/rendering/svg/RenderSVGResourceContainer.h
@@ -21,7 +21,6 @@
 #define RenderSVGResourceContainer_h
 
 #include "core/rendering/svg/RenderSVGHiddenContainer.h"
-#include "core/rendering/svg/RenderSVGResource.h"
 #include "core/svg/SVGDocumentExtensions.h"
 
 namespace blink {
@@ -38,8 +37,7 @@ enum RenderSVGResourceType {
 
 class RenderLayer;
 
-class RenderSVGResourceContainer : public RenderSVGHiddenContainer,
-                                   public RenderSVGResource {
+class RenderSVGResourceContainer : public RenderSVGHiddenContainer {
 public:
     explicit RenderSVGResourceContainer(SVGElement*);
     virtual ~RenderSVGResourceContainer();
@@ -53,6 +51,14 @@ public:
 
     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*);
@@ -92,8 +98,8 @@ private:
     // 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;