Tighten RenderLayerModelObject subclass constructors to operate on ContainerNodes.
authorantti@apple.com <antti@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 16 Jan 2013 21:50:05 +0000 (21:50 +0000)
committerantti@apple.com <antti@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 16 Jan 2013 21:50:05 +0000 (21:50 +0000)
https://bugs.webkit.org/show_bug.cgi?id=107041

Reviewed by Simon Fraser.

In rendering code only Nodes that are not ContainerNodes are used by RenderText. Tighter typing is better in general.
It also enables better code generation (especially with Document* moving from Node to ContainerNode).

This patch tightens constuctors for better static type checking. It also overrides node() with a covariant ContainerNode* return type
version in RenderLayerModelObject. RenderObject::createObject() is tightened to take Element*.

This patch does not change Node* usage in non-construction code (expect for the node() override).

With some further work it should be possible to tighten most of the rendering tree to operate on Elements for even less branchiness.

* dom/Document.cpp:
(WebCore::Document::attach):
* html/shadow/SliderThumbElement.cpp:
(WebCore::RenderSliderThumb::RenderSliderThumb):
(WebCore::RenderSliderContainer::RenderSliderContainer):
* html/shadow/SliderThumbElement.h:
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::RenderBlock):
* rendering/RenderBlock.h:
* rendering/RenderBox.cpp:
(WebCore::RenderBox::RenderBox):
* rendering/RenderBox.h:
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::RenderBoxModelObject):
* rendering/RenderBoxModelObject.h:
* rendering/RenderButton.cpp:
(WebCore::RenderButton::RenderButton):
* rendering/RenderButton.h:
* rendering/RenderDeprecatedFlexibleBox.cpp:
(WebCore::RenderDeprecatedFlexibleBox::RenderDeprecatedFlexibleBox):
* rendering/RenderDeprecatedFlexibleBox.h:
* rendering/RenderDetailsMarker.cpp:
(WebCore::RenderDetailsMarker::RenderDetailsMarker):
* rendering/RenderDetailsMarker.h:
* rendering/RenderDialog.h:
(WebCore::RenderDialog::RenderDialog):
* rendering/RenderFieldset.cpp:
(WebCore::RenderFieldset::RenderFieldset):
* rendering/RenderFieldset.h:
* rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::RenderFlexibleBox):
* rendering/RenderFlexibleBox.h:
* rendering/RenderFlowThread.cpp:
(WebCore::RenderFlowThread::RenderFlowThread):
* rendering/RenderFlowThread.h:
* rendering/RenderFullScreen.cpp:
(RenderFullScreen::RenderFullScreen):
* rendering/RenderFullScreen.h:
* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::RenderGrid):
* rendering/RenderGrid.h:
* rendering/RenderImage.cpp:
(WebCore::RenderImage::RenderImage):
* rendering/RenderImage.h:
* rendering/RenderInline.cpp:
(WebCore::RenderInline::RenderInline):
* rendering/RenderInline.h:
* rendering/RenderLayerModelObject.cpp:
(WebCore::RenderLayerModelObject::RenderLayerModelObject):
* rendering/RenderLayerModelObject.h:
(WebCore::RenderLayerModelObject::node):
* rendering/RenderListItem.cpp:
(WebCore::RenderListItem::RenderListItem):
* rendering/RenderListItem.h:
* rendering/RenderMediaControlElements.cpp:
(WebCore::RenderMediaVolumeSliderContainer::RenderMediaVolumeSliderContainer):
(WebCore::RenderMediaControlTimeDisplay::RenderMediaControlTimeDisplay):
(WebCore::RenderTextTrackContainerElement::RenderTextTrackContainerElement):
* rendering/RenderMediaControlElements.h:
* rendering/RenderMultiColumnBlock.cpp:
(WebCore::RenderMultiColumnBlock::RenderMultiColumnBlock):
* rendering/RenderMultiColumnBlock.h:
* rendering/RenderMultiColumnFlowThread.cpp:
(WebCore::RenderMultiColumnFlowThread::RenderMultiColumnFlowThread):
* rendering/RenderMultiColumnFlowThread.h:
* rendering/RenderMultiColumnSet.cpp:
(WebCore::RenderMultiColumnSet::RenderMultiColumnSet):
* rendering/RenderMultiColumnSet.h:
(RenderMultiColumnSet):
* rendering/RenderNamedFlowThread.cpp:
(WebCore::RenderNamedFlowThread::RenderNamedFlowThread):
* rendering/RenderNamedFlowThread.h:
(RenderNamedFlowThread):
* rendering/RenderObject.cpp:
(WebCore::RenderObject::createObject):
* rendering/RenderObject.h:
(RenderObject):
* rendering/RenderRegion.cpp:
(WebCore::RenderRegion::RenderRegion):
* rendering/RenderRegion.h:
(RenderRegion):
* rendering/RenderRegionSet.cpp:
(WebCore::RenderRegionSet::RenderRegionSet):
* rendering/RenderRegionSet.h:
(RenderRegionSet):
* rendering/RenderReplaced.cpp:
(WebCore::RenderReplaced::RenderReplaced):
* rendering/RenderReplaced.h:
(RenderReplaced):
* rendering/RenderReplica.cpp:
(WebCore::RenderReplica::RenderReplica):
(WebCore::RenderReplica::~RenderReplica):
* rendering/RenderReplica.h:
* rendering/RenderRuby.cpp:
(WebCore::RenderRubyAsInline::RenderRubyAsInline):
(WebCore::RenderRubyAsBlock::RenderRubyAsBlock):
* rendering/RenderRuby.h:
* rendering/RenderRubyBase.cpp:
(WebCore::RenderRubyBase::RenderRubyBase):
* rendering/RenderRubyBase.h:
* rendering/RenderRubyRun.cpp:
(WebCore::RenderRubyRun::RenderRubyRun):
* rendering/RenderRubyRun.h:
(RenderRubyRun):
* rendering/RenderRubyText.cpp:
(WebCore::RenderRubyText::RenderRubyText):
* rendering/RenderRubyText.h:
(RenderRubyText):
* rendering/RenderScrollbarPart.cpp:
(WebCore::RenderScrollbarPart::RenderScrollbarPart):
* rendering/RenderScrollbarPart.h:
(RenderScrollbarPart):
* rendering/RenderSearchField.cpp:
(WebCore::RenderSearchField::RenderSearchField):
* rendering/RenderSearchField.h:
(RenderSearchField):
* rendering/RenderTable.cpp:
(WebCore::RenderTable::RenderTable):
* rendering/RenderTable.h:
(RenderTable):
* rendering/RenderTableCaption.cpp:
(WebCore::RenderTableCaption::RenderTableCaption):
* rendering/RenderTableCaption.h:
(RenderTableCaption):
* rendering/RenderTableCell.cpp:
(WebCore::RenderTableCell::RenderTableCell):
* rendering/RenderTableCell.h:
(RenderTableCell):
* rendering/RenderTableCol.cpp:
(WebCore::RenderTableCol::RenderTableCol):
* rendering/RenderTableCol.h:
(RenderTableCol):
* rendering/RenderTableRow.cpp:
(WebCore::RenderTableRow::RenderTableRow):
* rendering/RenderTableRow.h:
(RenderTableRow):
* rendering/RenderTableSection.cpp:
(WebCore::RenderTableSection::RenderTableSection):
* rendering/RenderTableSection.h:
(RenderTableSection):
* rendering/RenderTextControl.cpp:
(WebCore::RenderTextControl::RenderTextControl):
* rendering/RenderTextControl.h:
* rendering/RenderTextControlMultiLine.cpp:
(WebCore::RenderTextControlMultiLine::RenderTextControlMultiLine):
* rendering/RenderTextControlMultiLine.h:
(RenderTextControlMultiLine):
* rendering/RenderTextControlSingleLine.cpp:
(WebCore::RenderTextControlSingleLine::RenderTextControlSingleLine):
* rendering/RenderTextControlSingleLine.h:
(RenderTextControlSingleLine):
(WebCore::RenderTextControlInnerBlock::RenderTextControlInnerBlock):
* rendering/RenderTextTrackCue.cpp:
(WebCore::RenderTextTrackCue::RenderTextTrackCue):
* rendering/RenderView.cpp:
(WebCore::RenderView::RenderView):
* rendering/RenderView.h:
* rendering/RenderWidget.cpp:
(WebCore::RenderWidget::RenderWidget):
* rendering/RenderWidget.h:
* rendering/mathml/RenderMathMLBlock.cpp:
(WebCore::RenderMathMLBlock::RenderMathMLBlock):
* rendering/mathml/RenderMathMLBlock.h:
(WebCore::RenderMathMLTable::RenderMathMLTable):
* rendering/mathml/RenderMathMLOperator.cpp:
(WebCore::RenderMathMLOperator::RenderMathMLOperator):
* rendering/mathml/RenderMathMLOperator.h:
* rendering/mathml/RenderMathMLRow.cpp:
(WebCore::RenderMathMLRow::RenderMathMLRow):
* rendering/mathml/RenderMathMLRow.h:
(RenderMathMLRow):
(WebCore::RenderSVGInline::RenderSVGInline):
* rendering/svg/RenderSVGInline.h:
* rendering/svg/RenderSVGTSpan.cpp:
(WebCore::RenderSVGTSpan::RenderSVGTSpan):
* rendering/svg/RenderSVGTSpan.h:
* rendering/svg/RenderSVGTextPath.cpp:
(WebCore::RenderSVGTextPath::RenderSVGTextPath):
* rendering/svg/RenderSVGTextPath.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@139920 268f45cc-cd09-0410-ab3c-d52691b4dbfc

102 files changed:
Source/WebCore/ChangeLog
Source/WebCore/dom/Document.cpp
Source/WebCore/html/shadow/SliderThumbElement.cpp
Source/WebCore/html/shadow/SliderThumbElement.h
Source/WebCore/rendering/RenderBlock.cpp
Source/WebCore/rendering/RenderBlock.h
Source/WebCore/rendering/RenderBox.cpp
Source/WebCore/rendering/RenderBox.h
Source/WebCore/rendering/RenderBoxModelObject.cpp
Source/WebCore/rendering/RenderBoxModelObject.h
Source/WebCore/rendering/RenderButton.cpp
Source/WebCore/rendering/RenderButton.h
Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp
Source/WebCore/rendering/RenderDeprecatedFlexibleBox.h
Source/WebCore/rendering/RenderDetailsMarker.cpp
Source/WebCore/rendering/RenderDetailsMarker.h
Source/WebCore/rendering/RenderDialog.h
Source/WebCore/rendering/RenderFieldset.cpp
Source/WebCore/rendering/RenderFieldset.h
Source/WebCore/rendering/RenderFlexibleBox.cpp
Source/WebCore/rendering/RenderFlexibleBox.h
Source/WebCore/rendering/RenderFlowThread.cpp
Source/WebCore/rendering/RenderFlowThread.h
Source/WebCore/rendering/RenderFullScreen.cpp
Source/WebCore/rendering/RenderFullScreen.h
Source/WebCore/rendering/RenderGrid.cpp
Source/WebCore/rendering/RenderGrid.h
Source/WebCore/rendering/RenderImage.cpp
Source/WebCore/rendering/RenderImage.h
Source/WebCore/rendering/RenderInline.cpp
Source/WebCore/rendering/RenderInline.h
Source/WebCore/rendering/RenderLayerModelObject.cpp
Source/WebCore/rendering/RenderLayerModelObject.h
Source/WebCore/rendering/RenderListItem.cpp
Source/WebCore/rendering/RenderListItem.h
Source/WebCore/rendering/RenderMediaControlElements.cpp
Source/WebCore/rendering/RenderMediaControlElements.h
Source/WebCore/rendering/RenderMultiColumnBlock.cpp
Source/WebCore/rendering/RenderMultiColumnBlock.h
Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp
Source/WebCore/rendering/RenderMultiColumnFlowThread.h
Source/WebCore/rendering/RenderMultiColumnSet.cpp
Source/WebCore/rendering/RenderMultiColumnSet.h
Source/WebCore/rendering/RenderNamedFlowThread.cpp
Source/WebCore/rendering/RenderNamedFlowThread.h
Source/WebCore/rendering/RenderObject.cpp
Source/WebCore/rendering/RenderObject.h
Source/WebCore/rendering/RenderRegion.cpp
Source/WebCore/rendering/RenderRegion.h
Source/WebCore/rendering/RenderRegionSet.cpp
Source/WebCore/rendering/RenderRegionSet.h
Source/WebCore/rendering/RenderReplaced.cpp
Source/WebCore/rendering/RenderReplaced.h
Source/WebCore/rendering/RenderReplica.cpp
Source/WebCore/rendering/RenderReplica.h
Source/WebCore/rendering/RenderRuby.cpp
Source/WebCore/rendering/RenderRuby.h
Source/WebCore/rendering/RenderRubyBase.cpp
Source/WebCore/rendering/RenderRubyBase.h
Source/WebCore/rendering/RenderRubyRun.cpp
Source/WebCore/rendering/RenderRubyRun.h
Source/WebCore/rendering/RenderRubyText.cpp
Source/WebCore/rendering/RenderRubyText.h
Source/WebCore/rendering/RenderScrollbarPart.cpp
Source/WebCore/rendering/RenderScrollbarPart.h
Source/WebCore/rendering/RenderSearchField.cpp
Source/WebCore/rendering/RenderSearchField.h
Source/WebCore/rendering/RenderTable.cpp
Source/WebCore/rendering/RenderTable.h
Source/WebCore/rendering/RenderTableCaption.cpp
Source/WebCore/rendering/RenderTableCaption.h
Source/WebCore/rendering/RenderTableCell.cpp
Source/WebCore/rendering/RenderTableCell.h
Source/WebCore/rendering/RenderTableCol.cpp
Source/WebCore/rendering/RenderTableCol.h
Source/WebCore/rendering/RenderTableRow.cpp
Source/WebCore/rendering/RenderTableRow.h
Source/WebCore/rendering/RenderTableSection.cpp
Source/WebCore/rendering/RenderTableSection.h
Source/WebCore/rendering/RenderTextControl.cpp
Source/WebCore/rendering/RenderTextControl.h
Source/WebCore/rendering/RenderTextControlMultiLine.cpp
Source/WebCore/rendering/RenderTextControlMultiLine.h
Source/WebCore/rendering/RenderTextControlSingleLine.cpp
Source/WebCore/rendering/RenderTextControlSingleLine.h
Source/WebCore/rendering/RenderTextTrackCue.cpp
Source/WebCore/rendering/RenderView.cpp
Source/WebCore/rendering/RenderView.h
Source/WebCore/rendering/RenderWidget.cpp
Source/WebCore/rendering/RenderWidget.h
Source/WebCore/rendering/mathml/RenderMathMLBlock.cpp
Source/WebCore/rendering/mathml/RenderMathMLBlock.h
Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp
Source/WebCore/rendering/mathml/RenderMathMLOperator.h
Source/WebCore/rendering/mathml/RenderMathMLRow.cpp
Source/WebCore/rendering/mathml/RenderMathMLRow.h
Source/WebCore/rendering/svg/RenderSVGInline.cpp
Source/WebCore/rendering/svg/RenderSVGInline.h
Source/WebCore/rendering/svg/RenderSVGTSpan.cpp
Source/WebCore/rendering/svg/RenderSVGTSpan.h
Source/WebCore/rendering/svg/RenderSVGTextPath.cpp
Source/WebCore/rendering/svg/RenderSVGTextPath.h

index b09517f..c6f3022 100644 (file)
@@ -1,3 +1,200 @@
+2013-01-16  Antti Koivisto  <antti@apple.com>
+
+        Tighten RenderLayerModelObject subclass constructors to operate on ContainerNodes.
+        https://bugs.webkit.org/show_bug.cgi?id=107041
+
+        Reviewed by Simon Fraser.
+
+        In rendering code only Nodes that are not ContainerNodes are used by RenderText. Tighter typing is better in general. 
+        It also enables better code generation (especially with Document* moving from Node to ContainerNode).
+
+        This patch tightens constuctors for better static type checking. It also overrides node() with a covariant ContainerNode* return type
+        version in RenderLayerModelObject. RenderObject::createObject() is tightened to take Element*.
+        
+        This patch does not change Node* usage in non-construction code (expect for the node() override).
+        
+        With some further work it should be possible to tighten most of the rendering tree to operate on Elements for even less branchiness.
+
+        * dom/Document.cpp:
+        (WebCore::Document::attach):
+        * html/shadow/SliderThumbElement.cpp:
+        (WebCore::RenderSliderThumb::RenderSliderThumb):
+        (WebCore::RenderSliderContainer::RenderSliderContainer):
+        * html/shadow/SliderThumbElement.h:
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::RenderBlock):
+        * rendering/RenderBlock.h:
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::RenderBox):
+        * rendering/RenderBox.h:
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::RenderBoxModelObject):
+        * rendering/RenderBoxModelObject.h:
+        * rendering/RenderButton.cpp:
+        (WebCore::RenderButton::RenderButton):
+        * rendering/RenderButton.h:
+        * rendering/RenderDeprecatedFlexibleBox.cpp:
+        (WebCore::RenderDeprecatedFlexibleBox::RenderDeprecatedFlexibleBox):
+        * rendering/RenderDeprecatedFlexibleBox.h:
+        * rendering/RenderDetailsMarker.cpp:
+        (WebCore::RenderDetailsMarker::RenderDetailsMarker):
+        * rendering/RenderDetailsMarker.h:
+        * rendering/RenderDialog.h:
+        (WebCore::RenderDialog::RenderDialog):
+        * rendering/RenderFieldset.cpp:
+        (WebCore::RenderFieldset::RenderFieldset):
+        * rendering/RenderFieldset.h:
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::RenderFlexibleBox):
+        * rendering/RenderFlexibleBox.h:
+        * rendering/RenderFlowThread.cpp:
+        (WebCore::RenderFlowThread::RenderFlowThread):
+        * rendering/RenderFlowThread.h:
+        * rendering/RenderFullScreen.cpp:
+        (RenderFullScreen::RenderFullScreen):
+        * rendering/RenderFullScreen.h:
+        * rendering/RenderGrid.cpp:
+        (WebCore::RenderGrid::RenderGrid):
+        * rendering/RenderGrid.h:
+        * rendering/RenderImage.cpp:
+        (WebCore::RenderImage::RenderImage):
+        * rendering/RenderImage.h:
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::RenderInline):
+        * rendering/RenderInline.h:
+        * rendering/RenderLayerModelObject.cpp:
+        (WebCore::RenderLayerModelObject::RenderLayerModelObject):
+        * rendering/RenderLayerModelObject.h:
+        (WebCore::RenderLayerModelObject::node):
+        * rendering/RenderListItem.cpp:
+        (WebCore::RenderListItem::RenderListItem):
+        * rendering/RenderListItem.h:
+        * rendering/RenderMediaControlElements.cpp:
+        (WebCore::RenderMediaVolumeSliderContainer::RenderMediaVolumeSliderContainer):
+        (WebCore::RenderMediaControlTimeDisplay::RenderMediaControlTimeDisplay):
+        (WebCore::RenderTextTrackContainerElement::RenderTextTrackContainerElement):
+        * rendering/RenderMediaControlElements.h:
+        * rendering/RenderMultiColumnBlock.cpp:
+        (WebCore::RenderMultiColumnBlock::RenderMultiColumnBlock):
+        * rendering/RenderMultiColumnBlock.h:
+        * rendering/RenderMultiColumnFlowThread.cpp:
+        (WebCore::RenderMultiColumnFlowThread::RenderMultiColumnFlowThread):
+        * rendering/RenderMultiColumnFlowThread.h:
+        * rendering/RenderMultiColumnSet.cpp:
+        (WebCore::RenderMultiColumnSet::RenderMultiColumnSet):
+        * rendering/RenderMultiColumnSet.h:
+        (RenderMultiColumnSet):
+        * rendering/RenderNamedFlowThread.cpp:
+        (WebCore::RenderNamedFlowThread::RenderNamedFlowThread):
+        * rendering/RenderNamedFlowThread.h:
+        (RenderNamedFlowThread):
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::createObject):
+        * rendering/RenderObject.h:
+        (RenderObject):
+        * rendering/RenderRegion.cpp:
+        (WebCore::RenderRegion::RenderRegion):
+        * rendering/RenderRegion.h:
+        (RenderRegion):
+        * rendering/RenderRegionSet.cpp:
+        (WebCore::RenderRegionSet::RenderRegionSet):
+        * rendering/RenderRegionSet.h:
+        (RenderRegionSet):
+        * rendering/RenderReplaced.cpp:
+        (WebCore::RenderReplaced::RenderReplaced):
+        * rendering/RenderReplaced.h:
+        (RenderReplaced):
+        * rendering/RenderReplica.cpp:
+        (WebCore::RenderReplica::RenderReplica):
+        (WebCore::RenderReplica::~RenderReplica):
+        * rendering/RenderReplica.h:
+        * rendering/RenderRuby.cpp:
+        (WebCore::RenderRubyAsInline::RenderRubyAsInline):
+        (WebCore::RenderRubyAsBlock::RenderRubyAsBlock):
+        * rendering/RenderRuby.h:
+        * rendering/RenderRubyBase.cpp:
+        (WebCore::RenderRubyBase::RenderRubyBase):
+        * rendering/RenderRubyBase.h:
+        * rendering/RenderRubyRun.cpp:
+        (WebCore::RenderRubyRun::RenderRubyRun):
+        * rendering/RenderRubyRun.h:
+        (RenderRubyRun):
+        * rendering/RenderRubyText.cpp:
+        (WebCore::RenderRubyText::RenderRubyText):
+        * rendering/RenderRubyText.h:
+        (RenderRubyText):
+        * rendering/RenderScrollbarPart.cpp:
+        (WebCore::RenderScrollbarPart::RenderScrollbarPart):
+        * rendering/RenderScrollbarPart.h:
+        (RenderScrollbarPart):
+        * rendering/RenderSearchField.cpp:
+        (WebCore::RenderSearchField::RenderSearchField):
+        * rendering/RenderSearchField.h:
+        (RenderSearchField):
+        * rendering/RenderTable.cpp:
+        (WebCore::RenderTable::RenderTable):
+        * rendering/RenderTable.h:
+        (RenderTable):
+        * rendering/RenderTableCaption.cpp:
+        (WebCore::RenderTableCaption::RenderTableCaption):
+        * rendering/RenderTableCaption.h:
+        (RenderTableCaption):
+        * rendering/RenderTableCell.cpp:
+        (WebCore::RenderTableCell::RenderTableCell):
+        * rendering/RenderTableCell.h:
+        (RenderTableCell):
+        * rendering/RenderTableCol.cpp:
+        (WebCore::RenderTableCol::RenderTableCol):
+        * rendering/RenderTableCol.h:
+        (RenderTableCol):
+        * rendering/RenderTableRow.cpp:
+        (WebCore::RenderTableRow::RenderTableRow):
+        * rendering/RenderTableRow.h:
+        (RenderTableRow):
+        * rendering/RenderTableSection.cpp:
+        (WebCore::RenderTableSection::RenderTableSection):
+        * rendering/RenderTableSection.h:
+        (RenderTableSection):
+        * rendering/RenderTextControl.cpp:
+        (WebCore::RenderTextControl::RenderTextControl):
+        * rendering/RenderTextControl.h:
+        * rendering/RenderTextControlMultiLine.cpp:
+        (WebCore::RenderTextControlMultiLine::RenderTextControlMultiLine):
+        * rendering/RenderTextControlMultiLine.h:
+        (RenderTextControlMultiLine):
+        * rendering/RenderTextControlSingleLine.cpp:
+        (WebCore::RenderTextControlSingleLine::RenderTextControlSingleLine):
+        * rendering/RenderTextControlSingleLine.h:
+        (RenderTextControlSingleLine):
+        (WebCore::RenderTextControlInnerBlock::RenderTextControlInnerBlock):
+        * rendering/RenderTextTrackCue.cpp:
+        (WebCore::RenderTextTrackCue::RenderTextTrackCue):
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::RenderView):
+        * rendering/RenderView.h:
+        * rendering/RenderWidget.cpp:
+        (WebCore::RenderWidget::RenderWidget):
+        * rendering/RenderWidget.h:
+        * rendering/mathml/RenderMathMLBlock.cpp:
+        (WebCore::RenderMathMLBlock::RenderMathMLBlock):
+        * rendering/mathml/RenderMathMLBlock.h:
+        (WebCore::RenderMathMLTable::RenderMathMLTable):
+        * rendering/mathml/RenderMathMLOperator.cpp:
+        (WebCore::RenderMathMLOperator::RenderMathMLOperator):
+        * rendering/mathml/RenderMathMLOperator.h:
+        * rendering/mathml/RenderMathMLRow.cpp:
+        (WebCore::RenderMathMLRow::RenderMathMLRow):
+        * rendering/mathml/RenderMathMLRow.h:
+        (RenderMathMLRow):
+        (WebCore::RenderSVGInline::RenderSVGInline):
+        * rendering/svg/RenderSVGInline.h:
+        * rendering/svg/RenderSVGTSpan.cpp:
+        (WebCore::RenderSVGTSpan::RenderSVGTSpan):
+        * rendering/svg/RenderSVGTSpan.h:
+        * rendering/svg/RenderSVGTextPath.cpp:
+        (WebCore::RenderSVGTextPath::RenderSVGTextPath):
+        * rendering/svg/RenderSVGTextPath.h:
+
 2013-01-16  Chris Fleizach  <cfleizach@apple.com>
 
         Stub out WebSpeech synthesis
index cc33c07..4783375 100644 (file)
@@ -2018,7 +2018,7 @@ void Document::attach()
         m_renderArena = adoptPtr(new RenderArena);
     
     // Create the rendering tree
-    setRenderer(new (m_renderArena.get()) RenderView(this, view()));
+    setRenderer(new (m_renderArena.get()) RenderView(this));
 #if USE(ACCELERATED_COMPOSITING)
     renderView()->didMoveOnscreen();
 #endif
index 2e5aabb..589790c 100644 (file)
@@ -95,8 +95,8 @@ HTMLElement* sliderTrackElementOf(Node* node)
 
 // --------------------------------
 
-RenderSliderThumb::RenderSliderThumb(Node* node)
-    : RenderBlock(node)
+RenderSliderThumb::RenderSliderThumb(SliderThumbElement* element)
+    : RenderBlock(element)
 {
 }
 
@@ -127,8 +127,8 @@ bool RenderSliderThumb::isSliderThumb() const
 // http://webkit.org/b/62535
 class RenderSliderContainer : public RenderFlexibleBox {
 public:
-    RenderSliderContainer(Node* node)
-        : RenderFlexibleBox(node) { }
+    RenderSliderContainer(SliderContainerElement* element)
+        : RenderFlexibleBox(element) { }
 public:
     virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const OVERRIDE;
 
index 765d22e..30ecc9d 100644 (file)
@@ -106,7 +106,7 @@ HTMLElement* sliderTrackElementOf(Node*);
 
 class RenderSliderThumb : public RenderBlock {
 public:
-    RenderSliderThumb(Node*);
+    RenderSliderThumb(SliderThumbElement*);
     void updateAppearance(RenderStyle* parentStyle);
 
 private:
index a2ce1b1..5665d04 100644 (file)
@@ -195,7 +195,7 @@ RenderBlock::MarginInfo::MarginInfo(RenderBlock* block, LayoutUnit beforeBorderP
 
 // -------------------------------------------------------------------------------------------------------
 
-RenderBlock::RenderBlock(Node* node)
+RenderBlock::RenderBlock(ContainerNode* node)
       : RenderBox(node)
       , m_lineHeight(-1)
       , m_beingDestroyed(false)
index ae5224e..e921171 100644 (file)
@@ -88,7 +88,7 @@ public:
     template <class> friend struct ValueToString;
 #endif
 
-    RenderBlock(Node*);
+    RenderBlock(ContainerNode*);
     virtual ~RenderBlock();
 
     RenderObject* firstChild() const { ASSERT(children() == virtualChildren()); return children()->firstChild(); }
index 505b9b3..ffa7cba 100644 (file)
@@ -83,7 +83,7 @@ static OverrideSizeMap* gOverrideContainingBlockLogicalWidthMap = 0;
 
 bool RenderBox::s_hadOverflowClip = false;
 
-RenderBox::RenderBox(Node* node)
+RenderBox::RenderBox(ContainerNode* node)
     : RenderBoxModelObject(node)
     , m_minPreferredLogicalWidth(-1)
     , m_maxPreferredLogicalWidth(-1)
index ee73766..ca749d2 100644 (file)
@@ -44,7 +44,7 @@ enum ShouldComputePreferred { ComputeActual, ComputePreferred };
 
 class RenderBox : public RenderBoxModelObject {
 public:
-    RenderBox(Node*);
+    RenderBox(ContainerNode*);
     virtual ~RenderBox();
 
     // hasAutoZIndex only returns true if the element is positioned or a flex-item since
index 1c4bde3..152010b 100644 (file)
@@ -310,7 +310,7 @@ bool RenderBoxModelObject::shouldPaintAtLowQuality(GraphicsContext* context, Ima
     return imageQualityController()->shouldPaintAtLowQuality(context, this, image, layer, size);
 }
 
-RenderBoxModelObject::RenderBoxModelObject(Node* node)
+RenderBoxModelObject::RenderBoxModelObject(ContainerNode* node)
     : RenderLayerModelObject(node)
 {
 }
index 7b68a53..e29592f 100644 (file)
@@ -59,7 +59,7 @@ class StickyPositionViewportConstraints;
 
 class RenderBoxModelObject : public RenderLayerModelObject {
 public:
-    RenderBoxModelObject(Node*);
+    RenderBoxModelObject(ContainerNode*);
     virtual ~RenderBoxModelObject();
     
     LayoutSize relativePositionOffset() const;
index 257fe1f..07645e1 100644 (file)
@@ -33,8 +33,8 @@ namespace WebCore {
 
 using namespace HTMLNames;
 
-RenderButton::RenderButton(Node* node)
-    : RenderDeprecatedFlexibleBox(node)
+RenderButton::RenderButton(Element* element)
+    : RenderDeprecatedFlexibleBox(element)
     , m_buttonText(0)
     , m_inner(0)
     , m_default(false)
index a7afb5d..63f19ac 100644 (file)
@@ -34,7 +34,7 @@ class RenderTextFragment;
 // to date as the button changes.
 class RenderButton : public RenderDeprecatedFlexibleBox {
 public:
-    explicit RenderButton(Node*);
+    explicit RenderButton(Element*);
     virtual ~RenderButton();
 
     virtual const char* renderName() const { return "RenderButton"; }
index 1b35274..8f0eb54 100644 (file)
@@ -119,7 +119,7 @@ private:
     int m_ordinalIteration;
 };
 
-RenderDeprecatedFlexibleBox::RenderDeprecatedFlexibleBox(Node* node)
+RenderDeprecatedFlexibleBox::RenderDeprecatedFlexibleBox(ContainerNode* node)
     : RenderBlock(node)
 {
     setChildrenInline(false); // All of our children must be block-level
index 7c41084..2ada059 100644 (file)
@@ -31,7 +31,7 @@ class FlexBoxIterator;
 
 class RenderDeprecatedFlexibleBox : public RenderBlock {
 public:
-    RenderDeprecatedFlexibleBox(Node*);
+    RenderDeprecatedFlexibleBox(ContainerNode*);
     virtual ~RenderDeprecatedFlexibleBox();
 
     virtual const char* renderName() const;
index 345c138..5d110b4 100644 (file)
@@ -31,7 +31,7 @@ namespace WebCore {
 
 using namespace HTMLNames;
 
-RenderDetailsMarker::RenderDetailsMarker(Node* node)
+RenderDetailsMarker::RenderDetailsMarker(ContainerNode* node)
     : RenderBlock(node)
 {
 }
index f60b3cb..7b44e00 100644 (file)
@@ -28,7 +28,7 @@ namespace WebCore {
 
 class RenderDetailsMarker : public RenderBlock {
 public:
-    RenderDetailsMarker(Node*);
+    RenderDetailsMarker(ContainerNode*);
 
     enum Orientation { Up, Down, Left, Right };
 
index ea66946..4f357f9 100644 (file)
@@ -36,7 +36,7 @@ class HTMLDialogElement;
 
 class RenderDialog : public RenderBlock {
 public:
-    explicit RenderDialog(Node* node)
+    explicit RenderDialog(ContainerNode* node)
         : RenderBlock(node)
     { }
 
index 1ebae53..bc4b227 100644 (file)
@@ -36,7 +36,7 @@ namespace WebCore {
 
 using namespace HTMLNames;
 
-RenderFieldset::RenderFieldset(Node* element)
+RenderFieldset::RenderFieldset(ContainerNode* element)
     : RenderBlock(element)
 {
 }
index 74ad92b..ad1e3e1 100644 (file)
@@ -30,7 +30,7 @@ namespace WebCore {
 
 class RenderFieldset : public RenderBlock {
 public:
-    explicit RenderFieldset(Node*);
+    explicit RenderFieldset(ContainerNode*);
 
     enum FindLegendOption { IgnoreFloatingOrOutOfFlow, IncludeFloatingOrOutOfFlow };
     RenderBox* findLegend(FindLegendOption = IgnoreFloatingOrOutOfFlow) const;
index 9e2144e..f188eb0 100644 (file)
@@ -123,7 +123,7 @@ struct RenderFlexibleBox::Violation {
 };
 
 
-RenderFlexibleBox::RenderFlexibleBox(Node* node)
+RenderFlexibleBox::RenderFlexibleBox(ContainerNode* node)
     : RenderBlock(node)
     , m_orderIterator(this)
     , m_numberOfInFlowChildrenOnFirstLine(-1)
index f83ab53..65b9e00 100644 (file)
@@ -37,7 +37,7 @@ namespace WebCore {
 
 class RenderFlexibleBox : public RenderBlock {
 public:
-    RenderFlexibleBox(Node*);
+    RenderFlexibleBox(ContainerNode*);
     virtual ~RenderFlexibleBox();
 
     virtual const char* renderName() const OVERRIDE;
index 80567a4..b833f63 100644 (file)
@@ -45,7 +45,7 @@
 
 namespace WebCore {
 
-RenderFlowThread::RenderFlowThread(Node* node)
+RenderFlowThread::RenderFlowThread(ContainerNode* node)
     : RenderBlock(node)
     , m_regionsInvalidated(false)
     , m_regionsHaveUniformLogicalWidth(true)
index 2ad93f5..58e94b4 100644 (file)
@@ -53,7 +53,7 @@ typedef ListHashSet<RenderRegion*> RenderRegionList;
 
 class RenderFlowThread: public RenderBlock {
 public:
-    RenderFlowThread(Node*);
+    RenderFlowThread(ContainerNode*);
     virtual ~RenderFlowThread() { };
     
     virtual bool isRenderFlowThread() const { return true; }
index 2f1c311..27be980 100644 (file)
@@ -55,8 +55,8 @@ void RenderFullScreenPlaceholder::willBeDestroyed()
     RenderBlock::willBeDestroyed();
 }
 
-RenderFullScreen::RenderFullScreen(Node* node) 
-    : RenderDeprecatedFlexibleBox(node)
+RenderFullScreen::RenderFullScreen(Document* document)
+    : RenderDeprecatedFlexibleBox(document)
     , m_placeholder(0)
 { 
     setReplaced(false); 
index a54ac15..9917aa9 100644 (file)
@@ -34,7 +34,7 @@ namespace WebCore {
 
 class RenderFullScreen : public RenderDeprecatedFlexibleBox {
 public:
-    RenderFullScreen(Node*);
+    RenderFullScreen(Document*);
     virtual bool isRenderFullScreen() const { return true; }
     virtual const char* renderName() const { return "RenderFullScreen"; }
 
index 9dfe7c0..66ae92f 100644 (file)
@@ -45,7 +45,7 @@ public:
     LayoutUnit m_maxBreadth;
 };
 
-RenderGrid::RenderGrid(Node* node)
+RenderGrid::RenderGrid(ContainerNode* node)
     : RenderBlock(node)
 {
     // All of our children must be block level.
index 3d026ca..a5738a8 100644 (file)
@@ -34,7 +34,7 @@ class GridTrack;
 
 class RenderGrid : public RenderBlock {
 public:
-    RenderGrid(Node*);
+    RenderGrid(ContainerNode*);
     virtual ~RenderGrid();
 
     virtual const char* renderName() const OVERRIDE;
index 2cca214..b987236 100644 (file)
@@ -52,7 +52,7 @@ namespace WebCore {
 
 using namespace HTMLNames;
 
-RenderImage::RenderImage(Node* node)
+RenderImage::RenderImage(ContainerNode* node)
     : RenderReplaced(node, IntSize())
     , m_needsToSetSizeForAltText(false)
     , m_didIncrementVisuallyNonEmptyPixelCount(false)
index e734fdd..3c7bf8b 100644 (file)
@@ -36,7 +36,7 @@ class HTMLMapElement;
 
 class RenderImage : public RenderReplaced {
 public:
-    RenderImage(Node*);
+    RenderImage(ContainerNode*);
     virtual ~RenderImage();
 
     void setImageResource(PassOwnPtr<RenderImageResource>);
index 7b13198..1930556 100644 (file)
@@ -49,7 +49,7 @@ using namespace std;
 
 namespace WebCore {
 
-RenderInline::RenderInline(Node* node)
+RenderInline::RenderInline(ContainerNode* node)
     : RenderBoxModelObject(node)
     , m_alwaysCreateLineBoxes(false)
 {
index fd2a6de..17608aa 100644 (file)
@@ -33,7 +33,7 @@ class Position;
 
 class RenderInline : public RenderBoxModelObject {
 public:
-    explicit RenderInline(Node*);
+    explicit RenderInline(ContainerNode*);
 
     RenderObject* firstChild() const { ASSERT(children() == virtualChildren()); return children()->firstChild(); }
     RenderObject* lastChild() const { ASSERT(children() == virtualChildren()); return children()->lastChild(); }
index a4d92f0..d4af219 100644 (file)
@@ -38,7 +38,7 @@ bool RenderLayerModelObject::s_hadLayer = false;
 bool RenderLayerModelObject::s_hadTransform = false;
 bool RenderLayerModelObject::s_layerWasSelfPainting = false;
 
-RenderLayerModelObject::RenderLayerModelObject(Node* node)
+RenderLayerModelObject::RenderLayerModelObject(ContainerNode* node)
     : RenderObject(node)
     , m_layer(0)
 {
index 8a4fc34..6c27ff4 100644 (file)
@@ -31,7 +31,7 @@ class RenderLayer;
 
 class RenderLayerModelObject : public RenderObject {
 public:
-    RenderLayerModelObject(Node*);
+    RenderLayerModelObject(ContainerNode*);
     virtual ~RenderLayerModelObject();
 
     // Called by RenderObject::willBeDestroyed() and is the only way layers should ever be destroyed
@@ -48,6 +48,9 @@ public:
 
     virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
 
+    // This is null for anonymous renderers.
+    ContainerNode* node() const { return toContainerNode(RenderObject::node()); }
+
 protected:
     void ensureLayer();
 
index ecac568..91be834 100644 (file)
@@ -39,7 +39,7 @@ namespace WebCore {
 
 using namespace HTMLNames;
 
-RenderListItem::RenderListItem(Node* node)
+RenderListItem::RenderListItem(ContainerNode* node)
     : RenderBlock(node)
     , m_marker(0)
     , m_hasExplicitValue(false)
index 29afa65..a15549e 100644 (file)
@@ -31,7 +31,7 @@ class RenderListMarker;
 
 class RenderListItem : public RenderBlock {
 public:
-    explicit RenderListItem(Node*);
+    explicit RenderListItem(ContainerNode*);
 
     int value() const { if (!m_isValueUpToDate) updateValueNow(); return m_value; }
     void updateValue();
index 47bac2c..b9d7535 100644 (file)
@@ -35,7 +35,7 @@
 
 namespace WebCore {
 
-RenderMediaVolumeSliderContainer::RenderMediaVolumeSliderContainer(Node* node)
+RenderMediaVolumeSliderContainer::RenderMediaVolumeSliderContainer(ContainerNode* node)
     : RenderBlock(node)
 {
 }
@@ -59,7 +59,7 @@ void RenderMediaVolumeSliderContainer::layout()
 
 // ----------------------------
 
-RenderMediaControlTimeDisplay::RenderMediaControlTimeDisplay(Node* node)
+RenderMediaControlTimeDisplay::RenderMediaControlTimeDisplay(ContainerNode* node)
     : RenderDeprecatedFlexibleBox(node)
 {
 }
@@ -83,7 +83,7 @@ void RenderMediaControlTimeDisplay::layout()
 
 #if ENABLE(VIDEO_TRACK)
 
-RenderTextTrackContainerElement::RenderTextTrackContainerElement(Node* node)
+RenderTextTrackContainerElement::RenderTextTrackContainerElement(ContainerNode* node)
     : RenderBlock(node)
 {
 }
index 2265d71..2dc20b3 100644 (file)
@@ -38,7 +38,7 @@ namespace WebCore {
 
 class RenderMediaVolumeSliderContainer : public RenderBlock {
 public:
-    RenderMediaVolumeSliderContainer(Node*);
+    RenderMediaVolumeSliderContainer(ContainerNode*);
 
 private:
     virtual void layout();
@@ -48,7 +48,7 @@ private:
 
 class RenderMediaControlTimeDisplay : public RenderDeprecatedFlexibleBox {
 public:
-    RenderMediaControlTimeDisplay(Node*);
+    RenderMediaControlTimeDisplay(ContainerNode*);
 
 private:
     virtual void layout();
@@ -60,7 +60,7 @@ private:
 
 class RenderTextTrackContainerElement : public RenderBlock {
 public:
-    RenderTextTrackContainerElement(Node*);
+    RenderTextTrackContainerElement(ContainerNode*);
 
 private:
     virtual void layout();
index 8135d8f..d31a6d1 100644 (file)
@@ -33,7 +33,7 @@ using namespace std;
 
 namespace WebCore {
 
-RenderMultiColumnBlock::RenderMultiColumnBlock(Node* node)
+RenderMultiColumnBlock::RenderMultiColumnBlock(ContainerNode* node)
     : RenderBlock(node)
     , m_flowThread(0)
     , m_columnCount(1)
index 34efd15..9753cf0 100644 (file)
@@ -35,7 +35,7 @@ class RenderMultiColumnFlowThread;
 
 class RenderMultiColumnBlock : public RenderBlock {
 public:
-    RenderMultiColumnBlock(Node*);
+    RenderMultiColumnBlock(ContainerNode*);
     
     LayoutUnit columnHeight() const { return m_columnHeight; }
     void setColumnHeight(LayoutUnit columnHeight) { m_columnHeight = columnHeight; }
index 5625068..339daf0 100644 (file)
@@ -28,7 +28,7 @@
 
 namespace WebCore {
 
-RenderMultiColumnFlowThread::RenderMultiColumnFlowThread(Node* node)
+RenderMultiColumnFlowThread::RenderMultiColumnFlowThread(ContainerNode* node)
     : RenderFlowThread(node)
 {
 }
index 5952227..54af7a2 100644 (file)
@@ -33,7 +33,7 @@ namespace WebCore {
 
 class RenderMultiColumnFlowThread : public RenderFlowThread {
 public:
-    RenderMultiColumnFlowThread(Node*);
+    RenderMultiColumnFlowThread(ContainerNode*);
     ~RenderMultiColumnFlowThread();
 
 private:
index 446cb77..90b3b9d 100644 (file)
@@ -36,7 +36,7 @@ using std::max;
 
 namespace WebCore {
 
-RenderMultiColumnSet::RenderMultiColumnSet(Node* node, RenderFlowThread* flowThread)
+RenderMultiColumnSet::RenderMultiColumnSet(ContainerNode* node, RenderFlowThread* flowThread)
     : RenderRegionSet(node, flowThread)
     , m_computedColumnCount(1)
     , m_computedColumnWidth(0)
index b8b2a63..0d5c431 100644 (file)
@@ -43,7 +43,7 @@ namespace WebCore {
 // come before and after the span.
 class RenderMultiColumnSet : public RenderRegionSet {
 public:
-    RenderMultiColumnSet(Node*, RenderFlowThread*);
+    RenderMultiColumnSet(ContainerNode*, RenderFlowThread*);
     
     virtual bool isRenderMultiColumnSet() const OVERRIDE { return true; }
 
index 295f049..c933ca6 100644 (file)
@@ -40,7 +40,7 @@
 
 namespace WebCore {
 
-RenderNamedFlowThread::RenderNamedFlowThread(Node* node, PassRefPtr<WebKitNamedFlow> namedFlow)
+RenderNamedFlowThread::RenderNamedFlowThread(ContainerNode* node, PassRefPtr<WebKitNamedFlow> namedFlow)
     : RenderFlowThread(node)
     , m_namedFlow(namedFlow)
     , m_regionLayoutUpdateEventTimer(this, &RenderNamedFlowThread::regionLayoutUpdateEventTimerFired)
index 2bd438b..1b401f6 100644 (file)
@@ -45,7 +45,7 @@ typedef ListHashSet<Node*> NamedFlowContentNodes;
 
 class RenderNamedFlowThread : public RenderFlowThread {
 public:
-    RenderNamedFlowThread(Node*, PassRefPtr<WebKitNamedFlow>);
+    RenderNamedFlowThread(ContainerNode*, PassRefPtr<WebKitNamedFlow>);
     virtual ~RenderNamedFlowThread();
 
     const AtomicString& flowThreadName() const;
index 0a2e606..768a886 100644 (file)
@@ -135,17 +135,17 @@ void RenderObject::operator delete(void* ptr, size_t sz)
     *(size_t *)ptr = sz;
 }
 
-RenderObject* RenderObject::createObject(Node* node, RenderStyle* style)
+RenderObject* RenderObject::createObject(Element* element, RenderStyle* style)
 {
-    Document* doc = node->document();
+    Document* doc = element->document();
     RenderArena* arena = doc->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() && doc != node && !node->isPseudoElement()) {
-        RenderImage* image = new (arena) RenderImage(node);
+    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.
@@ -159,56 +159,56 @@ RenderObject* RenderObject::createObject(Node* node, RenderStyle* style)
         return image;
     }
 
-    if (node->hasTagName(rubyTag)) {
+    if (element->hasTagName(rubyTag)) {
         if (style->display() == INLINE)
-            return new (arena) RenderRubyAsInline(node);
+            return new (arena) RenderRubyAsInline(element);
         else if (style->display() == BLOCK)
-            return new (arena) RenderRubyAsBlock(node);
+            return new (arena) RenderRubyAsBlock(element);
     }
     // treat <rt> as ruby text ONLY if it still has its default treatment of block
-    if (node->hasTagName(rtTag) && style->display() == BLOCK)
-        return new (arena) RenderRubyText(node);
+    if (element->hasTagName(rtTag) && style->display() == BLOCK)
+        return new (arena) RenderRubyText(element);
     if (doc->cssRegionsEnabled() && style->isDisplayRegionType() && !style->regionThread().isEmpty() && doc->renderView())
-        return new (arena) RenderRegion(node, 0);
+        return new (arena) RenderRegion(element, 0);
     switch (style->display()) {
     case NONE:
         return 0;
     case INLINE:
-        return new (arena) RenderInline(node);
+        return new (arena) RenderInline(element);
     case BLOCK:
     case INLINE_BLOCK:
     case RUN_IN:
     case COMPACT:
         if ((!style->hasAutoColumnCount() || !style->hasAutoColumnWidth()) && doc->regionBasedColumnsEnabled())
-            return new (arena) RenderMultiColumnBlock(node);
-        return new (arena) RenderBlock(node);
+            return new (arena) RenderMultiColumnBlock(element);
+        return new (arena) RenderBlock(element);
     case LIST_ITEM:
-        return new (arena) RenderListItem(node);
+        return new (arena) RenderListItem(element);
     case TABLE:
     case INLINE_TABLE:
-        return new (arena) RenderTable(node);
+        return new (arena) RenderTable(element);
     case TABLE_ROW_GROUP:
     case TABLE_HEADER_GROUP:
     case TABLE_FOOTER_GROUP:
-        return new (arena) RenderTableSection(node);
+        return new (arena) RenderTableSection(element);
     case TABLE_ROW:
-        return new (arena) RenderTableRow(node);
+        return new (arena) RenderTableRow(element);
     case TABLE_COLUMN_GROUP:
     case TABLE_COLUMN:
-        return new (arena) RenderTableCol(node);
+        return new (arena) RenderTableCol(element);
     case TABLE_CELL:
-        return new (arena) RenderTableCell(node);
+        return new (arena) RenderTableCell(element);
     case TABLE_CAPTION:
-        return new (arena) RenderTableCaption(node);
+        return new (arena) RenderTableCaption(element);
     case BOX:
     case INLINE_BOX:
-        return new (arena) RenderDeprecatedFlexibleBox(node);
+        return new (arena) RenderDeprecatedFlexibleBox(element);
     case FLEX:
     case INLINE_FLEX:
-        return new (arena) RenderFlexibleBox(node);
+        return new (arena) RenderFlexibleBox(element);
     case GRID:
     case INLINE_GRID:
-        return new (arena) RenderGrid(node);
+        return new (arena) RenderGrid(element);
     }
 
     return 0;
index b864c48..c8e1163 100644 (file)
@@ -294,7 +294,7 @@ public:
     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(Node*, RenderStyle*);
+    static RenderObject* createObject(Element*, RenderStyle*);
 
     // Overloaded new operator.  Derived classes must override operator new
     // in order to allocate out of the RenderArena.
index ce0b9d4..ed695bb 100644 (file)
@@ -43,7 +43,7 @@
 
 namespace WebCore {
 
-RenderRegion::RenderRegion(Node* node, RenderFlowThread* flowThread)
+RenderRegion::RenderRegion(ContainerNode* node, RenderFlowThread* flowThread)
     : RenderReplaced(node, IntSize())
     , m_flowThread(flowThread)
     , m_parentNamedFlowThread(0)
index 5617ae8..f929c80 100644 (file)
@@ -42,7 +42,7 @@ class RenderNamedFlowThread;
 
 class RenderRegion : public RenderReplaced {
 public:
-    explicit RenderRegion(Node*, RenderFlowThread*);
+    explicit RenderRegion(ContainerNode*, RenderFlowThread*);
 
     virtual bool isRenderRegion() const { return true; }
 
index 25b5cfa..575bd45 100644 (file)
@@ -30,7 +30,7 @@
 
 namespace WebCore {
 
-RenderRegionSet::RenderRegionSet(Node* node, RenderFlowThread* flowThread)
+RenderRegionSet::RenderRegionSet(ContainerNode* node, RenderFlowThread* flowThread)
     : RenderRegion(node, flowThread)
 {
 }
index e91ecee..93c57e3 100644 (file)
@@ -47,7 +47,7 @@ class RenderFlowThread;
 
 class RenderRegionSet : public RenderRegion {
 public:
-    RenderRegionSet(Node*, RenderFlowThread*);
+    RenderRegionSet(ContainerNode*, RenderFlowThread*);
     
 private:
     virtual void installFlowThread() OVERRIDE;
index 2a4e0c4..af39b84 100644 (file)
@@ -42,14 +42,14 @@ namespace WebCore {
 const int cDefaultWidth = 300;
 const int cDefaultHeight = 150;
 
-RenderReplaced::RenderReplaced(Node* node)
+RenderReplaced::RenderReplaced(ContainerNode* node)
     : RenderBox(node)
     , m_intrinsicSize(cDefaultWidth, cDefaultHeight)
 {
     setReplaced(true);
 }
 
-RenderReplaced::RenderReplaced(Node* node, const LayoutSize& intrinsicSize)
+RenderReplaced::RenderReplaced(ContainerNode* node, const LayoutSize& intrinsicSize)
     : RenderBox(node)
     , m_intrinsicSize(intrinsicSize)
 {
index 5c64549..1e9d7e2 100644 (file)
@@ -28,8 +28,8 @@ namespace WebCore {
 
 class RenderReplaced : public RenderBox {
 public:
-    RenderReplaced(Node*);
-    RenderReplaced(Node*, const LayoutSize& intrinsicSize);
+    RenderReplaced(ContainerNode*);
+    RenderReplaced(ContainerNode*, const LayoutSize& intrinsicSize);
     virtual ~RenderReplaced();
 
     virtual LayoutUnit computeReplacedLogicalWidth(ShouldComputePreferred  = ComputeActual) const OVERRIDE;
index c10bdca..b8a4f30 100644 (file)
@@ -33,8 +33,8 @@
 
 namespace WebCore {
 
-RenderReplica::RenderReplica(Node* n)
-: RenderBox(n)
+RenderReplica::RenderReplica(ContainerNode* node)
+    : RenderBox(node)
 {
     // This is a hack. Replicas are synthetic, and don't pick up the attributes of the
     // renderers being replicated, so they always report that they are inline, non-replaced.
@@ -44,7 +44,8 @@ RenderReplica::RenderReplica(Node* n)
 }
 
 RenderReplica::~RenderReplica()
-{}
+{
+}
     
 void RenderReplica::layout()
 {
index 4b68bc6..cc0e82d 100644 (file)
@@ -35,7 +35,7 @@ namespace WebCore {
 
 class RenderReplica : public RenderBox {
 public:
-    RenderReplica(Node*);
+    RenderReplica(ContainerNode*);
     virtual ~RenderReplica();
 
     virtual const char* renderName() const { return "RenderReplica"; }
index 63ad512..8a50c19 100644 (file)
@@ -109,7 +109,7 @@ static inline RenderRubyRun* findRubyRunParent(RenderObject* child)
 
 //=== ruby as inline object ===
 
-RenderRubyAsInline::RenderRubyAsInline(Node* node)
+RenderRubyAsInline::RenderRubyAsInline(ContainerNode* node)
     : RenderInline(node)
 {
 }
@@ -216,7 +216,7 @@ void RenderRubyAsInline::removeChild(RenderObject* child)
 
 //=== ruby as block object ===
 
-RenderRubyAsBlock::RenderRubyAsBlock(Node* node)
+RenderRubyAsBlock::RenderRubyAsBlock(ContainerNode* node)
     : RenderBlock(node)
 {
 }
index 2ab964c..eb7e1c0 100644 (file)
@@ -53,7 +53,7 @@ namespace WebCore {
 // <ruby> when used as 'display:inline'
 class RenderRubyAsInline : public RenderInline {
 public:
-    RenderRubyAsInline(Node*);
+    RenderRubyAsInline(ContainerNode*);
     virtual ~RenderRubyAsInline();
 
     virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0);
@@ -72,7 +72,7 @@ private:
 // <ruby> when used as 'display:block' or 'display:inline-block'
 class RenderRubyAsBlock : public RenderBlock {
 public:
-    RenderRubyAsBlock(Node*);
+    RenderRubyAsBlock(ContainerNode*);
     virtual ~RenderRubyAsBlock();
 
     virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0);
index 87402f7..3498f72 100644 (file)
@@ -38,7 +38,7 @@ using namespace std;
 
 namespace WebCore {
 
-RenderRubyBase::RenderRubyBase(Node* node)
+RenderRubyBase::RenderRubyBase(ContainerNode* node)
     : RenderBlock(node)
 {
     setInline(false);
index 9938920..ddfe4ee 100644 (file)
@@ -39,7 +39,7 @@ class RenderRubyRun;
 
 class RenderRubyBase : public RenderBlock {
 public:
-    RenderRubyBase(Node*);
+    RenderRubyBase(ContainerNode*);
     virtual ~RenderRubyBase();
 
     virtual const char* renderName() const { return "RenderRubyBase (anonymous)"; }
index 498d17d..4731618 100644 (file)
@@ -42,7 +42,7 @@ using namespace std;
 
 namespace WebCore {
 
-RenderRubyRun::RenderRubyRun(Node* node)
+RenderRubyRun::RenderRubyRun(ContainerNode* node)
     : RenderBlock(node)
 {
     setReplaced(true);
index f65ad86..33fb0d7 100644 (file)
@@ -43,7 +43,7 @@ class RenderRubyText;
 
 class RenderRubyRun : public RenderBlock {
 public:
-    RenderRubyRun(Node*);
+    RenderRubyRun(ContainerNode*);
     virtual ~RenderRubyRun();
 
     bool hasRubyText() const;
index be8313b..f4122d2 100644 (file)
@@ -37,7 +37,7 @@ using namespace std;
 
 namespace WebCore {
 
-RenderRubyText::RenderRubyText(Node* node)
+RenderRubyText::RenderRubyText(ContainerNode* node)
     : RenderBlock(node)
 {
 }
index 3a67926..c37e2e8 100644 (file)
@@ -37,7 +37,7 @@ namespace WebCore {
 
 class RenderRubyText : public RenderBlock {
 public:
-    RenderRubyText(Node*);
+    RenderRubyText(ContainerNode*);
     virtual ~RenderRubyText();
 
     virtual const char* renderName() const { return "RenderRubyText"; }
index 949d3ea..64982f0 100644 (file)
@@ -35,7 +35,7 @@ using namespace std;
 
 namespace WebCore {
 
-RenderScrollbarPart::RenderScrollbarPart(Node* node, RenderScrollbar* scrollbar, ScrollbarPart part)
+RenderScrollbarPart::RenderScrollbarPart(ContainerNode* node, RenderScrollbar* scrollbar, ScrollbarPart part)
     : RenderBlock(node)
     , m_scrollbar(scrollbar)
     , m_part(part)
index ba5f6a3..a2f96b0 100644 (file)
@@ -35,7 +35,7 @@ class RenderScrollbar;
 
 class RenderScrollbarPart : public RenderBlock {
 public:
-    RenderScrollbarPart(Node*, RenderScrollbar* = 0, ScrollbarPart = NoPart);
+    RenderScrollbarPart(ContainerNode*, RenderScrollbar* = 0, ScrollbarPart = NoPart);
     virtual ~RenderScrollbarPart();
 
     virtual const char* renderName() const { return "RenderScrollbarPart"; }
index 4ad458a..7a60bc5 100644 (file)
@@ -53,7 +53,7 @@ using namespace HTMLNames;
 
 // ----------------------------
 
-RenderSearchField::RenderSearchField(Node* node)
+RenderSearchField::RenderSearchField(ContainerNode* node)
     : RenderTextControlSingleLine(node)
     , m_searchPopupIsVisible(false)
     , m_searchPopup(0)
index 967335d..36d49cf 100644 (file)
@@ -33,7 +33,7 @@ class SearchPopupMenu;
 
 class RenderSearchField : public RenderTextControlSingleLine, private PopupMenuClient {
 public:
-    RenderSearchField(Node*);
+    RenderSearchField(ContainerNode*);
     virtual ~RenderSearchField();
 
     void updateCancelButtonVisibility() const;
index 781fce8..e447a1a 100644 (file)
@@ -49,7 +49,7 @@ namespace WebCore {
 
 using namespace HTMLNames;
 
-RenderTable::RenderTable(Node* node)
+RenderTable::RenderTable(ContainerNode* node)
     : RenderBlock(node)
     , m_head(0)
     , m_foot(0)
index 50232ab..7eed2b8 100644 (file)
@@ -42,7 +42,7 @@ enum SkipEmptySectionsValue { DoNotSkipEmptySections, SkipEmptySections };
 
 class RenderTable : public RenderBlock {
 public:
-    explicit RenderTable(Node*);
+    explicit RenderTable(ContainerNode*);
     virtual ~RenderTable();
 
     // Per CSS 3 writing-mode: "The first and second values of the 'border-spacing' property represent spacing between columns
index df5194c..ec2d5d9 100644 (file)
@@ -24,7 +24,7 @@
 
 namespace WebCore {
 
-RenderTableCaption::RenderTableCaption(Node* node)
+RenderTableCaption::RenderTableCaption(ContainerNode* node)
     : RenderBlock(node)
 {
 }
index 91edb9f..9172bf4 100644 (file)
@@ -28,7 +28,7 @@ class RenderTable;
 
 class RenderTableCaption : public RenderBlock {
 public:
-    explicit RenderTableCaption(Node*);
+    explicit RenderTableCaption(ContainerNode*);
     virtual ~RenderTableCaption();
     virtual LayoutUnit containingBlockLogicalWidthForContent() const OVERRIDE;
     
index aa3ad19..f2a1235 100644 (file)
@@ -55,7 +55,7 @@ struct SameSizeAsRenderTableCell : public RenderBlock {
 COMPILE_ASSERT(sizeof(RenderTableCell) == sizeof(SameSizeAsRenderTableCell), RenderTableCell_should_stay_small);
 COMPILE_ASSERT(sizeof(CollapsedBorderValue) == 8, CollapsedBorderValue_should_stay_small);
 
-RenderTableCell::RenderTableCell(Node* node)
+RenderTableCell::RenderTableCell(ContainerNode* node)
     : RenderBlock(node)
     , m_column(unsetColumnIndex)
     , m_cellWidthChanged(false)
index 65773ca..18cfeda 100644 (file)
@@ -37,7 +37,7 @@ enum IncludeBorderColorOrNot { DoNotIncludeBorderColor, IncludeBorderColor };
 
 class RenderTableCell : public RenderBlock {
 public:
-    explicit RenderTableCell(Node*);
+    explicit RenderTableCell(ContainerNode*);
     
     unsigned colSpan() const
     {
index 811c980..e6edbf4 100644 (file)
@@ -37,7 +37,7 @@ namespace WebCore {
 
 using namespace HTMLNames;
 
-RenderTableCol::RenderTableCol(Node* node)
+RenderTableCol::RenderTableCol(ContainerNode* node)
     : RenderBox(node)
     , m_span(1)
 {
index e11c8cb..a42e6b8 100644 (file)
@@ -35,7 +35,7 @@ class RenderTableCell;
 
 class RenderTableCol : public RenderBox {
 public:
-    explicit RenderTableCol(Node*);
+    explicit RenderTableCol(ContainerNode*);
 
     RenderObject* firstChild() const { ASSERT(children() == virtualChildren()); return children()->firstChild(); }
     RenderObject* lastChild() const { ASSERT(children() == virtualChildren()); return children()->lastChild(); }
index 9d3a0fa..308cc0a 100644 (file)
@@ -39,7 +39,7 @@ namespace WebCore {
 
 using namespace HTMLNames;
 
-RenderTableRow::RenderTableRow(Node* node)
+RenderTableRow::RenderTableRow(ContainerNode* node)
     : RenderBox(node)
     , m_rowIndex(unsetRowIndex)
 {
index 4405aa1..3c160cd 100644 (file)
@@ -34,7 +34,7 @@ static const unsigned maxRowIndex = 0x7FFFFFFE; // 2,147,483,646
 
 class RenderTableRow : public RenderBox {
 public:
-    explicit RenderTableRow(Node*);
+    explicit RenderTableRow(ContainerNode*);
 
     RenderObject* firstChild() const { ASSERT(children() == virtualChildren()); return children()->firstChild(); }
     RenderObject* lastChild() const { ASSERT(children() == virtualChildren()); return children()->lastChild(); }
index ef92b90..f34c70d 100644 (file)
@@ -89,7 +89,7 @@ static inline void updateLogicalHeightForCell(RenderTableSection::RowStruct& row
 }
 
 
-RenderTableSection::RenderTableSection(Node* node)
+RenderTableSection::RenderTableSection(ContainerNode* node)
     : RenderBox(node)
     , m_cCol(0)
     , m_cRow(0)
index e25fa74..e777e41 100644 (file)
@@ -62,7 +62,7 @@ class RenderTableRow;
 
 class RenderTableSection : public RenderBox {
 public:
-    RenderTableSection(Node*);
+    RenderTableSection(ContainerNode*);
     virtual ~RenderTableSection();
 
     RenderObject* firstChild() const { ASSERT(children() == virtualChildren()); return children()->firstChild(); }
index 612df30..f0c64e7 100644 (file)
@@ -36,7 +36,7 @@ using namespace std;
 
 namespace WebCore {
 
-RenderTextControl::RenderTextControl(Node* node)
+RenderTextControl::RenderTextControl(ContainerNode* node)
     : RenderBlock(node)
 {
     ASSERT(toTextFormControl(node));
index 922d10e..b716bd3 100644 (file)
@@ -38,7 +38,7 @@ public:
     VisiblePosition visiblePositionForIndex(int index) const;
 
 protected:
-    RenderTextControl(Node*);
+    RenderTextControl(ContainerNode*);
 
     // This convenience function should not be made public because innerTextElement may outlive the render tree.
     HTMLElement* innerTextElement() const;
index f409943..4682cc9 100644 (file)
@@ -32,7 +32,7 @@
 
 namespace WebCore {
 
-RenderTextControlMultiLine::RenderTextControlMultiLine(Node* node)
+RenderTextControlMultiLine::RenderTextControlMultiLine(ContainerNode* node)
     : RenderTextControl(node)
 {
 }
index 6dad346..f5b1bbb 100644 (file)
@@ -28,7 +28,7 @@ namespace WebCore {
 
 class RenderTextControlMultiLine : public RenderTextControl {
 public:
-    RenderTextControlMultiLine(Node*);
+    RenderTextControlMultiLine(ContainerNode*);
     virtual ~RenderTextControlMultiLine();
 
 private:
index c7f075a..f142727 100644 (file)
@@ -49,7 +49,7 @@ namespace WebCore {
 
 using namespace HTMLNames;
 
-RenderTextControlSingleLine::RenderTextControlSingleLine(Node* node)
+RenderTextControlSingleLine::RenderTextControlSingleLine(ContainerNode* node)
     : RenderTextControl(node)
     , m_shouldDrawCapsLockIndicator(false)
     , m_desiredInnerTextHeight(-1)
index af27bf7..f7461cb 100644 (file)
@@ -32,7 +32,7 @@ class HTMLInputElement;
 
 class RenderTextControlSingleLine : public RenderTextControl {
 public:
-    RenderTextControlSingleLine(Node*);
+    RenderTextControlSingleLine(ContainerNode*);
     virtual ~RenderTextControlSingleLine();
     // FIXME: Move create*Style() to their classes.
     virtual PassRefPtr<RenderStyle> createInnerTextStyle(const RenderStyle* startStyle) const;
@@ -110,7 +110,7 @@ void toRenderTextControlSingleLine(const RenderTextControlSingleLine*);
 
 class RenderTextControlInnerBlock : public RenderBlock {
 public:
-    RenderTextControlInnerBlock(Node* node) : RenderBlock(node) { }
+    RenderTextControlInnerBlock(ContainerNode* node) : RenderBlock(node) { }
 
 private:
     virtual bool hasLineIfEmpty() const { return true; }
index 4e9dc15..51613e0 100644 (file)
@@ -34,7 +34,7 @@
 namespace WebCore {
 
 RenderTextTrackCue::RenderTextTrackCue(TextTrackCueBox* node)
-    : RenderBlock(static_cast<Node*>(node))
+    : RenderBlock(node)
     , m_cue(node->getCue())
 {
 }
index a152a7c..09a3820 100644 (file)
@@ -53,9 +53,9 @@
 
 namespace WebCore {
 
-RenderView::RenderView(Node* node, FrameView* view)
-    : RenderBlock(node)
-    , m_frameView(view)
+RenderView::RenderView(Document* document)
+    : RenderBlock(document)
+    , m_frameView(document->view())
     , m_selectionStart(0)
     , m_selectionEnd(0)
     , m_selectionStartPos(-1)
index c662ec9..c5ff22a 100644 (file)
@@ -44,7 +44,7 @@ class CustomFilterGlobalContext;
 
 class RenderView : public RenderBlock {
 public:
-    RenderView(Node*, FrameView*);
+    RenderView(Document*);
     virtual ~RenderView();
 
     bool hitTest(const HitTestRequest&, HitTestResult&);
index 6db0d69..2079e2d 100644 (file)
@@ -85,7 +85,7 @@ static void moveWidgetToParentSoon(Widget* child, FrameView* parent)
     WidgetHierarchyUpdatesSuspensionScope::scheduleWidgetToMove(child, parent);
 }
 
-RenderWidget::RenderWidget(Node* node)
+RenderWidget::RenderWidget(ContainerNode* node)
     : RenderReplaced(node)
     , m_widget(0)
     , m_frameView(node->document()->view())
index d20123a..d0e10af 100644 (file)
@@ -73,7 +73,7 @@ public:
     void deref(RenderArena*);
 
 protected:
-    RenderWidget(Node*);
+    RenderWidget(ContainerNode*);
 
     FrameView* frameView() const { return m_frameView; }
 
index c23a9de..ac8cafc 100644 (file)
@@ -42,7 +42,7 @@ namespace WebCore {
     
 using namespace MathMLNames;
     
-RenderMathMLBlock::RenderMathMLBlock(Node* container) 
+RenderMathMLBlock::RenderMathMLBlock(ContainerNode* container)
     : RenderFlexibleBox(container)
     , m_ignoreInAccessibilityTree(false)
     , m_intrinsicPaddingBefore(0)
index 51e80ec..69f2265 100644 (file)
@@ -41,7 +41,7 @@ class RenderMathMLOperator;
 
 class RenderMathMLBlock : public RenderFlexibleBox {
 public:
-    RenderMathMLBlock(Node* container);
+    RenderMathMLBlock(ContainerNode*);
     virtual bool isChildAllowed(RenderObject*, RenderStyle*) const;
     
     virtual bool isRenderMathMLBlock() const { return true; }
@@ -132,7 +132,7 @@ void toRenderMathMLBlock(const RenderMathMLBlock*);
 
 class RenderMathMLTable : public RenderTable {
 public:
-    explicit RenderMathMLTable(Node* node) : RenderTable(node) { }
+    explicit RenderMathMLTable(Element* element) : RenderTable(element) { }
     
     virtual int firstLineBoxBaseline() const OVERRIDE;
     
index bde8baf..0bebb4e 100644 (file)
@@ -47,7 +47,7 @@ RenderMathMLOperator::RenderMathMLOperator(Element* element)
 {
 }
 
-RenderMathMLOperator::RenderMathMLOperator(Node* node, UChar operatorChar)
+RenderMathMLOperator::RenderMathMLOperator(ContainerNode* node, UChar operatorChar)
     : RenderMathMLBlock(node)
     , m_stretchHeight(0)
     , m_operator(convertHyphenMinusToMinusSign(operatorChar))
index 75bb941..777ff11 100644 (file)
@@ -36,7 +36,7 @@ namespace WebCore {
 class RenderMathMLOperator : public RenderMathMLBlock {
 public:
     RenderMathMLOperator(Element*);
-    RenderMathMLOperator(Node*, UChar operatorChar);
+    RenderMathMLOperator(ContainerNode*, UChar operatorChar);
     virtual bool isRenderMathMLOperator() const { return true; }
     
     virtual bool isChildAllowed(RenderObject*, RenderStyle*) const;
index 52bb6fe..698ffb8 100644 (file)
@@ -36,7 +36,7 @@ namespace WebCore {
 
 using namespace MathMLNames;
 
-RenderMathMLRow::RenderMathMLRow(Node* node)
+RenderMathMLRow::RenderMathMLRow(ContainerNode* node)
     : RenderMathMLBlock(node)
 {
 }
index 37f64a1..b3ce765 100644 (file)
@@ -34,7 +34,7 @@ namespace WebCore {
     
 class RenderMathMLRow : public RenderMathMLBlock {
 public:
-    RenderMathMLRow(Node*);
+    RenderMathMLRow(ContainerNode*);
     static RenderMathMLRow* createAnonymousWithParentRenderer(const RenderObject*);
     
     virtual bool isRenderMathMLRow() const { return true; }
index 0984a3a..5827528 100644 (file)
@@ -32,8 +32,8 @@
 
 namespace WebCore {
     
-RenderSVGInline::RenderSVGInline(Node* n)
-    : RenderInline(n)
+RenderSVGInline::RenderSVGInline(ContainerNode* node)
+    : RenderInline(node)
 {
     setAlwaysCreateLineBoxes();
 }
index 8157577..4f604ec 100644 (file)
@@ -30,7 +30,7 @@ namespace WebCore {
 
 class RenderSVGInline : public RenderInline {
 public:
-    explicit RenderSVGInline(Node*);
+    explicit RenderSVGInline(ContainerNode*);
 
     virtual const char* renderName() const { return "RenderSVGInline"; }
     virtual bool requiresLayer() const { return false; }
index 872d076..d735aa8 100644 (file)
@@ -27,8 +27,8 @@
 
 namespace WebCore {
 
-RenderSVGTSpan::RenderSVGTSpan(Node* n)
-    : RenderSVGInline(n)
+RenderSVGTSpan::RenderSVGTSpan(ContainerNode* node)
+    : RenderSVGInline(node)
 {
 }
 
index d5e2ed7..555ce2b 100644 (file)
@@ -28,7 +28,7 @@
 namespace WebCore {
 class RenderSVGTSpan : public RenderSVGInline {
 public:
-    explicit RenderSVGTSpan(Node*);
+    explicit RenderSVGTSpan(ContainerNode*);
     virtual const char* renderName() const { return "RenderSVGTSpan"; }
 };
 }
index 15b48f5..95d9508 100644 (file)
@@ -34,8 +34,8 @@
 
 namespace WebCore {
 
-RenderSVGTextPath::RenderSVGTextPath(Node* n)
-    : RenderSVGInline(n)
+RenderSVGTextPath::RenderSVGTextPath(ContainerNode* node)
+    : RenderSVGInline(node)
 {
 }
 
index 2758a06..12dc17d 100644 (file)
@@ -28,7 +28,7 @@ namespace WebCore {
 
 class RenderSVGTextPath : public RenderSVGInline {
 public:
-    RenderSVGTextPath(Node*);
+    RenderSVGTextPath(ContainerNode*);
 
     Path layoutPath() const;
     float startOffset() const;