Changeset 157408 in webkit for trunk/Source/WebCore/rendering/RenderElement.cpp

Timestamp:

Oct 14, 2013, 10:55:52 AM (12 years ago)

Author:

[email protected]

Message:

Pass Document directly to anonymous renderer constructors.
<​https://webkit.org/b/122752>

Reviewed by Antti Koivisto.

Added separate constructors for creating anonymous renderers that
take a Document& instead of a null Element*/Text*.

Removed setDocumentForAnonymous() and all createAnonymous() helpers.
...and RenderObject::m_node is now a Node&, wohoo!

File:

• trunk/Source/WebCore/rendering/RenderElement.cpp (modified) (6 diffs)

trunk/Source/WebCore/rendering/RenderElement.cpp

@@ -66 +66 @@
 bool RenderElement::s_noLongerAffectsParentBlock = false;
 
-RenderElement::RenderElement(Element* element, unsigned baseTypeFlags)
+RenderElement::RenderElement(Element& element, unsigned baseTypeFlags)
     : RenderObject(element)
     , m_baseTypeFlags(baseTypeFlags)
@@ -72 +72 @@
     , m_firstChild(nullptr)
     , m_lastChild(nullptr)
-    , m_style(0)
+{
+}
+
+RenderElement::RenderElement(Document& document, unsigned baseTypeFlags)
+    : RenderObject(document)
+    , m_baseTypeFlags(baseTypeFlags)
+    , m_ancestorLineBoxDirty(false)
+    , m_firstChild(nullptr)
+    , m_lastChild(nullptr)
 {
 }
@@ -114 +122 @@
     const ContentData* contentData = style.contentData();
     if (contentData && !contentData->next() && contentData->isImage() && !element.isPseudoElement()) {
-        RenderImage* image = new (arena) RenderImage(&element);
+        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
@@ -138 +146 @@
         return new (arena) RenderRubyText(element);
     if (document.cssRegionsEnabled() && style.isDisplayRegionType() && !style.regionThread().isEmpty())
-        return new (arena) RenderRegion(&element, 0);
+        return new (arena) RenderRegion(element, nullptr);
     switch (style.display()) {
     case NONE:
         return 0;
     case INLINE:
-        return new (arena) RenderInline(&element);
+        return new (arena) RenderInline(element);
     case BLOCK:
     case INLINE_BLOCK:
@@ -150 +158 @@
         if ((!style.hasAutoColumnCount() || !style.hasAutoColumnWidth()) && document.regionBasedColumnsEnabled())
             return new (arena) RenderMultiColumnBlock(element);
-        return new (arena) RenderBlockFlow(&element);
+        return new (arena) RenderBlockFlow(element);
     case LIST_ITEM:
         return new (arena) RenderListItem(element);
     case TABLE:
     case INLINE_TABLE:
-        return new (arena) RenderTable(&element);
+        return new (arena) RenderTable(element);
     case TABLE_ROW_GROUP:
     case TABLE_HEADER_GROUP:
     case TABLE_FOOTER_GROUP:
-        return new (arena) RenderTableSection(&element);
+        return new (arena) RenderTableSection(element);
     case TABLE_ROW:
-        return new (arena) RenderTableRow(&element);
+        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);
+        return new (arena) RenderTableCell(element);
     case TABLE_CAPTION:
         return new (arena) RenderTableCaption(element);
@@ -174 +182 @@
     case FLEX:
     case INLINE_FLEX:
-        return new (arena) RenderFlexibleBox(&element);
+        return new (arena) RenderFlexibleBox(element);
     case GRID:
     case INLINE_GRID: