Changeset 156102 in webkit

Timestamp:

Sep 19, 2013, 10:52:38 AM (12 years ago)

Author:

Antti Koivisto

Message:

Add RenderElement
​https://bugs.webkit.org/show_bug.cgi?id=121608

Reviewed by Dave Hyatt.

Add a common base class for all Element renderers. The class hierarchy will now look like this

RenderObject

RenderText
RenderElement

RenderLayerModelObject

...

RenderSVGModelObject

...

RenderSVGGradientStop

This will allow tighter typing in both render and DOM trees.

The patch also moves renderer factory function to RenderElement::createFor().

Location:

trunk/Source/WebCore

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• GNUmakefile.list.am (modified) (1 diff)
• Target.pri (modified) (2 diffs)
• WebCore.vcxproj/WebCore.vcxproj (modified) (2 diffs)
• WebCore.xcodeproj/project.pbxproj (modified) (6 diffs)
• dom/Element.cpp (modified) (1 diff)
• html/HTMLAppletElement.cpp (modified) (1 diff)
• html/HTMLBRElement.cpp (modified) (1 diff)
• html/HTMLElement.cpp (modified) (1 diff)
• html/HTMLFrameSetElement.cpp (modified) (1 diff)
• html/HTMLImageElement.cpp (modified) (1 diff)
• html/HTMLMeterElement.cpp (modified) (1 diff)
• html/HTMLPlugInImageElement.cpp (modified) (1 diff)
• html/HTMLProgressElement.cpp (modified) (1 diff)
• html/InputType.cpp (modified) (2 diffs)
• rendering/RenderElement.cpp (added)
• rendering/RenderElement.h (added)
• rendering/RenderLayerModelObject.cpp (modified) (1 diff)
• rendering/RenderLayerModelObject.h (modified) (4 diffs)
• rendering/RenderObject.cpp (modified) (4 diffs)
• rendering/RenderObject.h (modified) (1 diff)
• rendering/RenderingAllInOne.cpp (modified) (1 diff)
• rendering/svg/RenderSVGGradientStop.cpp (modified) (2 diffs)
• rendering/svg/RenderSVGGradientStop.h (modified) (2 diffs)
• rendering/svg/RenderSVGModelObject.cpp (modified) (1 diff)
• rendering/svg/RenderSVGModelObject.h (modified) (4 diffs)
• rendering/svg/SVGRenderTreeAsText.cpp (modified) (1 diff)

trunk/Source/WebCore/CMakeLists.txt

@@ -2132 +2132 @@
     rendering/RenderDeprecatedFlexibleBox.cpp
     rendering/RenderDetailsMarker.cpp
+    rendering/RenderElement.cpp
     rendering/RenderEmbeddedObject.cpp
     rendering/RenderFieldset.cpp

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-19  Antti Koivisto  <antti@apple.com>
+
+        Add RenderElement
+        https://bugs.webkit.org/show_bug.cgi?id=121608
+
+        Reviewed by Dave Hyatt.
+
+        Add a common base class for all Element renderers. The class hierarchy will now look like this
+        
+        RenderObject
+            RenderText
+            RenderElement
+                RenderLayerModelObject
+                    ...
+                RenderSVGModelObject
+                    ...
+                RenderSVGGradientStop
+                
+        This will allow tighter typing in both render and DOM trees.
+        
+        The patch also moves renderer factory function to RenderElement::createFor().
+
 2013-09-19  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/GNUmakefile.list.am

@@ -4427 +4427 @@
         Source/WebCore/rendering/RenderDetailsMarker.cpp \
         Source/WebCore/rendering/RenderDetailsMarker.h \
+        Source/WebCore/rendering/RenderElement.cpp \
+        Source/WebCore/rendering/RenderElement.h \
         Source/WebCore/rendering/RenderEmbeddedObject.cpp \
         Source/WebCore/rendering/RenderEmbeddedObject.h \

trunk/Source/WebCore/Target.pri

@@ -1161 +1161 @@
     rendering/RenderDeprecatedFlexibleBox.cpp \
     rendering/RenderDetailsMarker.cpp \
+    rendering/RenderElement.cpp \
     rendering/RenderEmbeddedObject.cpp \
     rendering/RenderFieldset.cpp \
@@ -2430 +2431 @@
     rendering/RenderDeprecatedFlexibleBox.h \
     rendering/RenderDetailsMarker.h \
+    rendering/RenderElement.h \
     rendering/RenderEmbeddedObject.h \
     rendering/RenderFieldset.h \

trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

@@ -9822 +9822 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\rendering\RenderElement.cpp">
+        <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+        <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+        <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+        <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+        <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+        <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+        <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+        <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+        <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+        <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+        <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+        <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\rendering\RenderEmbeddedObject.cpp">
@@ -19963 +19977 @@
     <ClInclude Include="..\rendering\RenderDeprecatedFlexibleBox.h" />
     <ClInclude Include="..\rendering\RenderDetailsMarker.h" />
+    <ClInclude Include="..\rendering\RenderElement.h" />
     <ClInclude Include="..\rendering\RenderEmbeddedObject.h" />
     <ClInclude Include="..\rendering\RenderFieldset.h" />

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -1260 +1260 @@
                 436708C712D9CA4B00044234 /* RenderSVGHiddenContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4367088812D9CA4A00044234 /* RenderSVGHiddenContainer.h */; };
                 436708C912D9CA4B00044234 /* RenderSVGImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 4367088A12D9CA4A00044234 /* RenderSVGImage.h */; };
-                436708CB12D9CA4B00044234 /* RenderSVGModelObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 4367088C12D9CA4A00044234 /* RenderSVGModelObject.h */; };
+                436708CB12D9CA4B00044234 /* RenderSVGModelObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 4367088C12D9CA4A00044234 /* RenderSVGModelObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 436708CD12D9CA4B00044234 /* RenderSVGResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 4367088E12D9CA4A00044234 /* RenderSVGResource.h */; };
                 436708CF12D9CA4B00044234 /* RenderSVGResourceClipper.h in Headers */ = {isa = PBXBuildFile; fileRef = 4367089012D9CA4A00044234 /* RenderSVGResourceClipper.h */; };
@@ -5618 +5618 @@
                 E43105B816750F0C00DB2FB8 /* NodeTraversal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E43105B716750F0C00DB2FB8 /* NodeTraversal.cpp */; };
                 E43105BB16750F1600DB2FB8 /* NodeTraversal.h in Headers */ = {isa = PBXBuildFile; fileRef = E43105BA16750F1600DB2FB8 /* NodeTraversal.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                E43A023B17EB370A004CDD25 /* RenderElement.h in Headers */ = {isa = PBXBuildFile; fileRef = E43A023A17EB370A004CDD25 /* RenderElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                E43A023D17EB3713004CDD25 /* RenderElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E43A023C17EB3713004CDD25 /* RenderElement.cpp */; };
                 E44613A10CD6331000FADA75 /* HTMLAudioElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E446138F0CD6331000FADA75 /* HTMLAudioElement.cpp */; };
                 E44613A20CD6331000FADA75 /* HTMLAudioElement.h in Headers */ = {isa = PBXBuildFile; fileRef = E44613900CD6331000FADA75 /* HTMLAudioElement.h */; };
@@ -12594 +12596 @@
                 E43105B716750F0C00DB2FB8 /* NodeTraversal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NodeTraversal.cpp; sourceTree = "<group>"; };
                 E43105BA16750F1600DB2FB8 /* NodeTraversal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NodeTraversal.h; sourceTree = "<group>"; };
+                E43A023A17EB370A004CDD25 /* RenderElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderElement.h; sourceTree = "<group>"; };
+                E43A023C17EB3713004CDD25 /* RenderElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderElement.cpp; sourceTree = "<group>"; };
                 E446138F0CD6331000FADA75 /* HTMLAudioElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLAudioElement.cpp; sourceTree = "<group>"; };
                 E44613900CD6331000FADA75 /* HTMLAudioElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLAudioElement.h; sourceTree = "<group>"; };
@@ -20527 +20531 @@
                                 D302754512A5FE84004BD828 /* RenderDetailsMarker.cpp */,
                                 D302754612A5FE84004BD828 /* RenderDetailsMarker.h */,
+                                E43A023A17EB370A004CDD25 /* RenderElement.h */,
+                                E43A023C17EB3713004CDD25 /* RenderElement.cpp */,
                                 0F5B7A5210F65D7A00376302 /* RenderEmbeddedObject.cpp */,
                                 0F5B7A5310F65D7A00376302 /* RenderEmbeddedObject.h */,
@@ -24281 +24287 @@
                                 088A0E0C126EF1DB00978F7A /* SVGPropertyTraits.h in Headers */,
                                 B2227A9A0D00BF220071B782 /* SVGRadialGradientElement.h in Headers */,
+                                E43A023B17EB370A004CDD25 /* RenderElement.h in Headers */,
                                 08EDE19F12A50B8E00B95797 /* SVGRect.h in Headers */,
                                 B2227A9E0D00BF220071B782 /* SVGRectElement.h in Headers */,
@@ -25535 +25542 @@
                                 85C7F5D10AAFB8D9004014DD /* DOMOverflowEvent.mm in Sources */,
                                 E1284BD51044A01E00EAEB52 /* DOMPageTransitionEvent.mm in Sources */,
+                                E43A023D17EB3713004CDD25 /* RenderElement.cpp in Sources */,
                                 1ACE53E70A8D18E70022947D /* DOMParser.cpp in Sources */,
                                 7A54881814E432A1006AE05A /* DOMPatchSupport.cpp in Sources */,

trunk/Source/WebCore/dom/Element.cpp

@@ -1265 +1265 @@
 RenderObject* Element::createRenderer(RenderArena&, RenderStyle& style)
 {
-    return RenderObject::createObject(*this, style);
+    return RenderElement::createFor(*this, style);
 }
 

trunk/Source/WebCore/html/HTMLAppletElement.cpp

@@ -79 +79 @@
 {
     if (!canEmbedJava())
-        return RenderObject::createObject(*this, style);
+        return RenderElement::createFor(*this, style);
 
     return RenderEmbeddedObject::createForApplet(*this);

trunk/Source/WebCore/html/HTMLBRElement.cpp

@@ -75 +75 @@
 {
     if (style.hasContent())
-        return RenderObject::createObject(*this, style);
+        return RenderElement::createFor(*this, style);
 
     return new (arena) RenderLineBreak(*this);

trunk/Source/WebCore/html/HTMLElement.cpp

@@ -793 +793 @@
     if (hasLocalName(wbrTag))
         return new (arena) RenderLineBreak(*this);
-    return RenderObject::createObject(*this, style);
+    return RenderElement::createFor(*this, style);
 }
 

trunk/Source/WebCore/html/HTMLFrameSetElement.cpp

@@ -160 +160 @@
 {
     if (style.hasContent())
-        return RenderObject::createObject(*this, style);
+        return RenderElement::createFor(*this, style);
     
     return new (arena) RenderFrameSet(*this);

trunk/Source/WebCore/html/HTMLImageElement.cpp

@@ -167 +167 @@
 {
     if (style.hasContent())
-        return RenderObject::createObject(*this, style);
+        return RenderElement::createFor(*this, style);
 
     RenderImage* image = new (arena) RenderImage(this);

trunk/Source/WebCore/html/HTMLMeterElement.cpp

@@ -60 +60 @@
 {
     if (hasAuthorShadowRoot() || !document().page()->theme()->supportsMeter(style.appearance()))
-        return RenderObject::createObject(*this, style);
+        return RenderElement::createFor(*this, style);
 
     return new (arena) RenderMeter(this);

trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp

@@ -214 +214 @@
     // return a RenderEmbeddedObject or RenderWidget.
     if (useFallbackContent())
-        return RenderObject::createObject(*this, style);
+        return RenderElement::createFor(*this, style);
 
     if (isImageType()) {

trunk/Source/WebCore/html/HTMLProgressElement.cpp

@@ -62 +62 @@
 {
     if (!style.hasAppearance() || hasAuthorShadowRoot())
-        return RenderObject::createObject(*this, style);
+        return RenderElement::createFor(*this, style);
 
     return new (arena) RenderProgress(this);

trunk/Source/WebCore/html/InputType.cpp

@@ -62 +62 @@
 #include "RangeInputType.h"
 #include "RegularExpression.h"
-#include "RenderObject.h"
+#include "RenderElement.h"
 #include "RenderTheme.h"
 #include "ResetInputType.h"
@@ -471 +471 @@
 RenderObject* InputType::createRenderer(RenderArena&, RenderStyle& style) const
 {
-    return RenderObject::createObject(element(), style);
+    return RenderElement::createFor(element(), style);
 }
 

trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp

@@ -39 +39 @@
 
 RenderLayerModelObject::RenderLayerModelObject(Element* element)
-    : RenderObject(element)
+    : RenderElement(element)
     , m_layer(0)
 {

trunk/Source/WebCore/rendering/RenderLayerModelObject.h

@@ -24 +24 @@
 #define RenderLayerModelObject_h
 
-#include "RenderObject.h"
+#include "RenderElement.h"
 
 namespace WebCore {
@@ -30 +30 @@
 class RenderLayer;
 
-class RenderLayerModelObject : public RenderObject {
+class RenderLayerModelObject : public RenderElement {
 public:
     explicit RenderLayerModelObject(Element*);
@@ -51 +51 @@
     virtual bool backgroundIsKnownToBeOpaqueInRect(const LayoutRect&) const { return false; }
 
-    // This is null for anonymous renderers.
-    Element* element() const { return toElement(RenderObject::node()); }
-    Element* nonPseudoElement() const { return toElement(RenderObject::nonPseudoNode()); }
-    Element* generatingElement() const { return toElement(RenderObject::generatingNode()); }
-
 protected:
     void ensureLayer();
@@ -64 +59 @@
 private:
     virtual bool isLayerModelObject() const OVERRIDE FINAL { return true; }
-
-    void node() const WTF_DELETED_FUNCTION;
-    void nonPseudoNode() const WTF_DELETED_FUNCTION;
-    void generatingNode() const WTF_DELETED_FUNCTION;
 
     RenderLayer* m_layer;

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -4 +4 @@
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
@@ -30 +30 @@
 #include "AXObjectCache.h"
 #include "AnimationController.h"
-#include "ContentData.h"
 #include "CursorList.h"
 #include "EventHandler.h"
@@ -50 +49 @@
 #include "RenderArena.h"
 #include "RenderCounter.h"
-#include "RenderDeprecatedFlexibleBox.h"
-#include "RenderFlexibleBox.h"
+#include "RenderFlowThread.h"
 #include "RenderGeometryMap.h"
-#include "RenderGrid.h"
-#include "RenderImage.h"
-#include "RenderImageResourceStyleImage.h"
 #include "RenderInline.h"
 #include "RenderLayer.h"
 #include "RenderLayerBacking.h"
-#include "RenderListItem.h"
-#include "RenderMultiColumnBlock.h"
 #include "RenderNamedFlowThread.h"
-#include "RenderRegion.h"
-#include "RenderRuby.h"
-#include "RenderRubyText.h"
 #include "RenderScrollbarPart.h"
-#include "RenderTableCaption.h"
-#include "RenderTableCell.h"
+#include "RenderTable.h"
 #include "RenderTableCol.h"
-#include "RenderTableRow.h"
 #include "RenderTheme.h"
 #include "RenderView.h"
@@ -160 +148 @@
     // Stash size where destroy can find it.
     *(size_t *)ptr = sz;
-}
-
-RenderObject* RenderObject::createObject(Element& element, RenderStyle& style)
-{
-    Document& document = element.document();
-    RenderArena& arena = *document.renderArena();
-
-    // Minimal support for content properties replacing an entire element.
-    // Works only if we have exactly one piece of content and it's a URL.
-    // Otherwise acts as if we didn't support this feature.
-    const ContentData* contentData = style.contentData();
-    if (contentData && !contentData->next() && contentData->isImage() && !element.isPseudoElement()) {
-        RenderImage* image = new (arena) RenderImage(&element);
-        // RenderImageResourceStyleImage requires a style being present on the image but we don't want to
-        // trigger a style change now as the node is not fully attached. Moving this code to style change
-        // doesn't make sense as it should be run once at renderer creation.
-        image->setStyleInternal(&style);
-        if (const StyleImage* styleImage = static_cast<const ImageContentData*>(contentData)->image()) {
-            image->setImageResource(RenderImageResourceStyleImage::create(const_cast<StyleImage*>(styleImage)));
-            image->setIsGeneratedContent();
-        } else
-            image->setImageResource(RenderImageResource::create());
-        image->setStyleInternal(0);
-        return image;
-    }
-
-    if (element.hasTagName(rubyTag)) {
-        if (style.display() == INLINE)
-            return new (arena) RenderRubyAsInline(element);
-        else if (style.display() == BLOCK)
-            return new (arena) RenderRubyAsBlock(element);
-    }
-    // treat <rt> as ruby text ONLY if it still has its default treatment of block
-    if (element.hasTagName(rtTag) && style.display() == BLOCK)
-        return new (arena) RenderRubyText(element);
-    if (document.cssRegionsEnabled() && style.isDisplayRegionType() && !style.regionThread().isEmpty())
-        return new (arena) RenderRegion(&element, 0);
-    switch (style.display()) {
-    case NONE:
-        return 0;
-    case INLINE:
-        return new (arena) RenderInline(&element);
-    case BLOCK:
-    case INLINE_BLOCK:
-    case RUN_IN:
-    case COMPACT:
-        if ((!style.hasAutoColumnCount() || !style.hasAutoColumnWidth()) && document.regionBasedColumnsEnabled())
-            return new (arena) RenderMultiColumnBlock(element);
-        return new (arena) RenderBlockFlow(&element);
-    case LIST_ITEM:
-        return new (arena) RenderListItem(element);
-    case TABLE:
-    case INLINE_TABLE:
-        return new (arena) RenderTable(&element);
-    case TABLE_ROW_GROUP:
-    case TABLE_HEADER_GROUP:
-    case TABLE_FOOTER_GROUP:
-        return new (arena) RenderTableSection(&element);
-    case TABLE_ROW:
-        return new (arena) RenderTableRow(&element);
-    case TABLE_COLUMN_GROUP:
-    case TABLE_COLUMN:
-        return new (arena) RenderTableCol(element);
-    case TABLE_CELL:
-        return new (arena) RenderTableCell(&element);
-    case TABLE_CAPTION:
-        return new (arena) RenderTableCaption(element);
-    case BOX:
-    case INLINE_BOX:
-        return new (arena) RenderDeprecatedFlexibleBox(element);
-    case FLEX:
-    case INLINE_FLEX:
-        return new (arena) RenderFlexibleBox(&element);
-    case GRID:
-    case INLINE_GRID:
-        return new (arena) RenderGrid(element);
-    }
-
-    return 0;
 }
 

trunk/Source/WebCore/rendering/RenderObject.h

@@ -326 +326 @@
     void showRenderTreeAndMark(const RenderObject* markedObject1 = 0, const char* markedLabel1 = 0, const RenderObject* markedObject2 = 0, const char* markedLabel2 = 0, int depth = 0) const;
 #endif
-
-    static RenderObject* createObject(Element&, RenderStyle&);
 
     // Overloaded new operator.  Derived classes must override operator new

trunk/Source/WebCore/rendering/RenderingAllInOne.cpp

@@ -54 +54 @@
 #include "RenderDeprecatedFlexibleBox.cpp"
 #include "RenderDetailsMarker.cpp"
+#include "RenderElement.cpp"
 #include "RenderEmbeddedObject.cpp"
 #include "RenderFieldset.cpp"

trunk/Source/WebCore/rendering/svg/RenderSVGGradientStop.cpp

@@ -35 +35 @@
 
 RenderSVGGradientStop::RenderSVGGradientStop(SVGStopElement* element)
-    : RenderObject(element)
+    : RenderElement(element)
 {
 }
@@ -72 +72 @@
 SVGGradientElement* RenderSVGGradientStop::gradientElement() const
 {
-    ContainerNode* parentNode = node()->parentNode();
+    ContainerNode* parentNode = element()->parentNode();
     if (parentNode->hasTagName(linearGradientTag) || parentNode->hasTagName(radialGradientTag))
         return toSVGGradientElement(parentNode);

trunk/Source/WebCore/rendering/svg/RenderSVGGradientStop.h

@@ -23 +23 @@
 
 #if ENABLE(SVG)
-#include "RenderObject.h"
+#include "RenderElement.h"
 
 namespace WebCore {
@@ -31 +31 @@
 
 // This class exists mostly so we can hear about gradient stop style changes
-class RenderSVGGradientStop FINAL : public RenderObject {
+class RenderSVGGradientStop FINAL : public RenderElement {
 public:
     RenderSVGGradientStop(SVGStopElement*);

trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.cpp

@@ -44 +44 @@
 
 RenderSVGModelObject::RenderSVGModelObject(SVGElement& element)
-    : RenderObject(&element)
+    : RenderElement(&element)
     , m_hasSVGShadow(false)
 {

trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.h

@@ -34 +34 @@
 #if ENABLE(SVG)
 
-#include "RenderObject.h"
+#include "RenderElement.h"
 #include "SVGElement.h"
 #include "SVGRenderSupport.h"
@@ -47 +47 @@
 class SVGElement;
 
-class RenderSVGModelObject : public RenderObject {
+class RenderSVGModelObject : public RenderElement {
 public:
     virtual LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObject* repaintContainer) const OVERRIDE;
@@ -68 +68 @@
     void setHasSVGShadow(bool hasShadow) { m_hasSVGShadow = hasShadow; }
 
-    SVGElement& element() const { return *toSVGElement(RenderObject::node()); }
+    SVGElement& element() const { return *toSVGElement(RenderElement::element()); }
 
 protected:
@@ -76 +76 @@
 
 private:
-    void node() const WTF_DELETED_FUNCTION;
-
     // This method should never be called, SVG uses a different nodeAtPoint method
     bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) OVERRIDE;

trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp

@@ -625 +625 @@
     writeStandardPrefix(ts, stop, indent);
 
-    SVGStopElement* stopElement = toSVGStopElement(toSVGElement(stop.node()));
+    SVGStopElement* stopElement = toSVGStopElement(toSVGElement(stop.element()));
     ASSERT(stopElement);