<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[203708] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/203708">203708</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-07-25 19:40:04 -0700 (Mon, 25 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cleanup RenderTable*::createAnonymous*
https://bugs.webkit.org/show_bug.cgi?id=160175
Reviewed by Simon Fraser.
This patch
1. tightens the type on createAnonymousBoxWithSameTypeAs, createAnonymousWithParentRendererAndDisplay and
createAnonymousWithParentRenderer from RenderObject to the appropriate type.
2. changes the return type of create* function from raw pointer to std::unique_ptr<>
3. decouples createAnonymousBoxWithSameTypeAs and createAnonymousWithParentRenderer.
createAnonymousBoxWithSameTypeAs misleadingly calls createAnonymousWithParentRenderer
while it is never the parent in case of table items.
(std::unique_ptr::release() vs. WTFMove() will be addressed in a separate patch)
No change in functionality.
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::createAnonymousBoxWithSameTypeAs):
(WebCore::RenderBlock::createAnonymousWithParentRendererAndDisplay):
* rendering/RenderBlock.h:
(WebCore::RenderBlock::createAnonymousBlock):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::layoutOverflowRectForPropagation):
* rendering/RenderBox.h:
(WebCore::RenderBox::createAnonymousBoxWithSameTypeAs):
* rendering/RenderElement.cpp:
(WebCore::RenderElement::addChild):
* rendering/RenderInline.cpp:
(WebCore::RenderInline::splitFlow):
* rendering/RenderTable.cpp:
(WebCore::RenderTable::addChild):
(WebCore::RenderTable::createTableWithStyle):
(WebCore::RenderTable::createAnonymousWithParentRenderer):
* rendering/RenderTable.h:
(WebCore::RenderTable::createAnonymousBoxWithSameTypeAs):
* rendering/RenderTableCell.cpp:
(WebCore::RenderTableCell::createTableCellWithStyle):
(WebCore::RenderTableCell::createAnonymousWithParentRenderer):
* rendering/RenderTableCell.h:
(WebCore::RenderTableCell::createAnonymousBoxWithSameTypeAs):
* rendering/RenderTableRow.cpp:
(WebCore::RenderTableRow::addChild):
(WebCore::RenderTableRow::createTableRowWithStyle):
(WebCore::RenderTableRow::createAnonymousWithParentRenderer):
* rendering/RenderTableRow.h:
(WebCore::RenderTableRow::createAnonymousBoxWithSameTypeAs):
* rendering/RenderTableSection.cpp:
(WebCore::RenderTableSection::addChild):
(WebCore::RenderTableSection::createTableSectionWithStyle):
(WebCore::RenderTableSection::createAnonymousWithParentRenderer):
* rendering/RenderTableSection.h:
(WebCore::RenderTableSection::createAnonymousBoxWithSameTypeAs):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockh">trunk/Source/WebCore/rendering/RenderBlock.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxh">trunk/Source/WebCore/rendering/RenderBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderInlinecpp">trunk/Source/WebCore/rendering/RenderInline.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTablecpp">trunk/Source/WebCore/rendering/RenderTable.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableh">trunk/Source/WebCore/rendering/RenderTable.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableCellcpp">trunk/Source/WebCore/rendering/RenderTableCell.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableCellh">trunk/Source/WebCore/rendering/RenderTableCell.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableRowcpp">trunk/Source/WebCore/rendering/RenderTableRow.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableRowh">trunk/Source/WebCore/rendering/RenderTableRow.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableSectioncpp">trunk/Source/WebCore/rendering/RenderTableSection.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableSectionh">trunk/Source/WebCore/rendering/RenderTableSection.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203707 => 203708)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-26 02:24:20 UTC (rev 203707)
+++ trunk/Source/WebCore/ChangeLog 2016-07-26 02:40:04 UTC (rev 203708)
</span><span class="lines">@@ -1,3 +1,58 @@
</span><ins>+2016-07-25 Zalan Bujtas <zalan@apple.com>
+
+ Cleanup RenderTable*::createAnonymous*
+ https://bugs.webkit.org/show_bug.cgi?id=160175
+
+ Reviewed by Simon Fraser.
+
+ This patch
+ 1. tightens the type on createAnonymousBoxWithSameTypeAs, createAnonymousWithParentRendererAndDisplay and
+ createAnonymousWithParentRenderer from RenderObject to the appropriate type.
+ 2. changes the return type of create* function from raw pointer to std::unique_ptr<>
+ 3. decouples createAnonymousBoxWithSameTypeAs and createAnonymousWithParentRenderer.
+ createAnonymousBoxWithSameTypeAs misleadingly calls createAnonymousWithParentRenderer
+ while it is never the parent in case of table items.
+ (std::unique_ptr::release() vs. WTFMove() will be addressed in a separate patch)
+
+ No change in functionality.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::createAnonymousBoxWithSameTypeAs):
+ (WebCore::RenderBlock::createAnonymousWithParentRendererAndDisplay):
+ * rendering/RenderBlock.h:
+ (WebCore::RenderBlock::createAnonymousBlock):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::layoutOverflowRectForPropagation):
+ * rendering/RenderBox.h:
+ (WebCore::RenderBox::createAnonymousBoxWithSameTypeAs):
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::addChild):
+ * rendering/RenderInline.cpp:
+ (WebCore::RenderInline::splitFlow):
+ * rendering/RenderTable.cpp:
+ (WebCore::RenderTable::addChild):
+ (WebCore::RenderTable::createTableWithStyle):
+ (WebCore::RenderTable::createAnonymousWithParentRenderer):
+ * rendering/RenderTable.h:
+ (WebCore::RenderTable::createAnonymousBoxWithSameTypeAs):
+ * rendering/RenderTableCell.cpp:
+ (WebCore::RenderTableCell::createTableCellWithStyle):
+ (WebCore::RenderTableCell::createAnonymousWithParentRenderer):
+ * rendering/RenderTableCell.h:
+ (WebCore::RenderTableCell::createAnonymousBoxWithSameTypeAs):
+ * rendering/RenderTableRow.cpp:
+ (WebCore::RenderTableRow::addChild):
+ (WebCore::RenderTableRow::createTableRowWithStyle):
+ (WebCore::RenderTableRow::createAnonymousWithParentRenderer):
+ * rendering/RenderTableRow.h:
+ (WebCore::RenderTableRow::createAnonymousBoxWithSameTypeAs):
+ * rendering/RenderTableSection.cpp:
+ (WebCore::RenderTableSection::addChild):
+ (WebCore::RenderTableSection::createTableSectionWithStyle):
+ (WebCore::RenderTableSection::createAnonymousWithParentRenderer):
+ * rendering/RenderTableSection.h:
+ (WebCore::RenderTableSection::createAnonymousBoxWithSameTypeAs):
+
</ins><span class="cx"> 2016-07-25 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Touch properties should be on the prototype
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (203707 => 203708)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2016-07-26 02:24:20 UTC (rev 203707)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2016-07-26 02:40:04 UTC (rev 203708)
</span><span class="lines">@@ -3550,9 +3550,17 @@
</span><span class="cx"> inlineElementContinuation()->addFocusRingRects(rects, flooredLayoutPoint(LayoutPoint(additionalOffset + inlineElementContinuation()->containingBlock()->location() - location())), paintContainer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderBox* RenderBlock::createAnonymousBoxWithSameTypeAs(const RenderObject* parent) const
</del><ins>+std::unique_ptr<RenderBlock> RenderBlock::createAnonymousBlockWithStyleAndDisplay(Document& document, const RenderStyle& style, EDisplay display)
</ins><span class="cx"> {
</span><del>- return createAnonymousWithParentRendererAndDisplay(parent, style().display());
</del><ins>+ // FIXME: Do we need to convert all our inline displays to block-type in the anonymous logic ?
+ std::unique_ptr<RenderBlock> newBox;
+ if (display == FLEX || display == INLINE_FLEX)
+ newBox = std::make_unique<RenderFlexibleBox>(document, RenderStyle::createAnonymousStyleWithDisplay(style, FLEX));
+ else
+ newBox = std::make_unique<RenderBlockFlow>(document, RenderStyle::createAnonymousStyleWithDisplay(style, BLOCK));
+
+ newBox->initializeStyle();
+ return newBox;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderBlock::offsetFromLogicalTopOfFirstPage() const
</span><span class="lines">@@ -3815,19 +3823,6 @@
</span><span class="cx"> return constructTextRun(StringView(characters, length), style, expansion);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderBlock* RenderBlock::createAnonymousWithParentRendererAndDisplay(const RenderObject* parent, EDisplay display)
-{
- // FIXME: Do we need to convert all our inline displays to block-type in the anonymous logic ?
- RenderBlock* newBox;
- if (display == FLEX || display == INLINE_FLEX)
- newBox = new RenderFlexibleBox(parent->document(), RenderStyle::createAnonymousStyleWithDisplay(parent->style(), FLEX));
- else
- newBox = new RenderBlockFlow(parent->document(), RenderStyle::createAnonymousStyleWithDisplay(parent->style(), BLOCK));
-
- newBox->initializeStyle();
- return newBox;
-}
-
</del><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> void RenderBlock::checkPositionedObjectsNeedLayout()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.h (203707 => 203708)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.h 2016-07-26 02:24:20 UTC (rev 203707)
+++ trunk/Source/WebCore/rendering/RenderBlock.h 2016-07-26 02:40:04 UTC (rev 203708)
</span><span class="lines">@@ -57,11 +57,11 @@
</span><span class="cx"> class RenderBlock : public RenderBox {
</span><span class="cx"> public:
</span><span class="cx"> friend class LineLayoutState;
</span><ins>+ virtual ~RenderBlock();
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> RenderBlock(Element&, RenderStyle&&, BaseTypeFlags);
</span><span class="cx"> RenderBlock(Document&, RenderStyle&&, BaseTypeFlags);
</span><del>- virtual ~RenderBlock();
</del><span class="cx">
</span><span class="cx"> public:
</span><span class="cx"> // These two functions are overridden for inline-block.
</span><span class="lines">@@ -192,11 +192,11 @@
</span><span class="cx"> using RenderBoxModelObject::continuation;
</span><span class="cx"> using RenderBoxModelObject::setContinuation;
</span><span class="cx">
</span><del>- static RenderBlock* createAnonymousWithParentRendererAndDisplay(const RenderObject*, EDisplay = BLOCK);
- RenderBlock* createAnonymousBlock(EDisplay display = BLOCK) const { return createAnonymousWithParentRendererAndDisplay(this, display); }
</del><ins>+ static std::unique_ptr<RenderBlock> createAnonymousWithParentRendererAndDisplay(const RenderBox& parent, EDisplay = BLOCK);
+ RenderBlock* createAnonymousBlock(EDisplay = BLOCK) const;
</ins><span class="cx"> static void dropAnonymousBoxChild(RenderBlock& parent, RenderBlock& child);
</span><span class="cx">
</span><del>- RenderBox* createAnonymousBoxWithSameTypeAs(const RenderObject* parent) const override;
</del><ins>+ std::unique_ptr<RenderBox> createAnonymousBoxWithSameTypeAs(const RenderBox&) const override;
</ins><span class="cx">
</span><span class="cx"> static bool shouldSkipCreatingRunsForObject(RenderObject& obj)
</span><span class="cx"> {
</span><span class="lines">@@ -392,6 +392,8 @@
</span><span class="cx"> void preparePaginationBeforeBlockLayout(bool&);
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ static std::unique_ptr<RenderBlock> createAnonymousBlockWithStyleAndDisplay(Document&, const RenderStyle&, EDisplay);
+
</ins><span class="cx"> // FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to RenderBlockFlow
</span><span class="cx"> virtual LayoutUnit logicalRightFloatOffsetForLine(LayoutUnit, LayoutUnit fixedOffset, LayoutUnit) const { return fixedOffset; };
</span><span class="cx"> // FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to RenderBlockFlow
</span><span class="lines">@@ -518,6 +520,21 @@
</span><span class="cx"> LayoutUnit inlineDirectionOffset(RenderBlock& rootBlock, const LayoutSize& offsetFromRootBlock);
</span><span class="cx"> VisiblePosition positionForPointRespectingEditingBoundaries(RenderBlock&, RenderBox&, const LayoutPoint&);
</span><span class="cx">
</span><ins>+inline std::unique_ptr<RenderBlock> RenderBlock::createAnonymousWithParentRendererAndDisplay(const RenderBox& parent, EDisplay display)
+{
+ return createAnonymousBlockWithStyleAndDisplay(parent.document(), parent.style(), display);
+}
+
+inline std::unique_ptr<RenderBox> RenderBlock::createAnonymousBoxWithSameTypeAs(const RenderBox& renderer) const
+{
+ return createAnonymousBlockWithStyleAndDisplay(document(), renderer.style(), style().display());
+}
+
+inline RenderBlock* RenderBlock::createAnonymousBlock(EDisplay display) const
+{
+ return createAnonymousBlockWithStyleAndDisplay(document(), style(), display).release();
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderBlock, isRenderBlock())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (203707 => 203708)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2016-07-26 02:24:20 UTC (rev 203707)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2016-07-26 02:40:04 UTC (rev 203708)
</span><span class="lines">@@ -5117,7 +5117,7 @@
</span><span class="cx">
</span><span class="cx"> // We have to split the parent box into two boxes and move children
</span><span class="cx"> // from |beforeChild| to end into the new post box.
</span><del>- RenderBox* postBox = boxToSplit.createAnonymousBoxWithSameTypeAs(this);
</del><ins>+ auto* postBox = boxToSplit.createAnonymousBoxWithSameTypeAs(*this).release();
</ins><span class="cx"> postBox->setChildrenInline(boxToSplit.childrenInline());
</span><span class="cx"> RenderBox* parentBox = downcast<RenderBox>(boxToSplit.parent());
</span><span class="cx"> // We need to invalidate the |parentBox| before inserting the new node
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.h (203707 => 203708)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.h 2016-07-26 02:24:20 UTC (rev 203707)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2016-07-26 02:40:04 UTC (rev 203708)
</span><span class="lines">@@ -598,7 +598,7 @@
</span><span class="cx"> return layoutOverflowRect.y() < y() || layoutOverflowRect.maxY() > y() + logicalHeight();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual RenderBox* createAnonymousBoxWithSameTypeAs(const RenderObject*) const
</del><ins>+ virtual std::unique_ptr<RenderBox> createAnonymousBoxWithSameTypeAs(const RenderBox&) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (203707 => 203708)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2016-07-26 02:24:20 UTC (rev 203707)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2016-07-26 02:40:04 UTC (rev 203708)
</span><span class="lines">@@ -492,7 +492,7 @@
</span><span class="cx"> if (afterChild && afterChild->isAnonymous() && is<RenderTable>(*afterChild) && !afterChild->isBeforeContent())
</span><span class="cx"> table = downcast<RenderTable>(afterChild);
</span><span class="cx"> else {
</span><del>- table = RenderTable::createAnonymousWithParentRenderer(this);
</del><ins>+ table = RenderTable::createAnonymousWithParentRenderer(*this).release();
</ins><span class="cx"> addChild(table, beforeChild);
</span><span class="cx"> }
</span><span class="cx"> table->addChild(newChild);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderInlinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderInline.cpp (203707 => 203708)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderInline.cpp 2016-07-26 02:24:20 UTC (rev 203707)
+++ trunk/Source/WebCore/rendering/RenderInline.cpp 2016-07-26 02:40:04 UTC (rev 203708)
</span><span class="lines">@@ -563,7 +563,7 @@
</span><span class="cx"> madeNewBeforeBlock = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RenderBlock& post = downcast<RenderBlock>(*pre->createAnonymousBoxWithSameTypeAs(block));
</del><ins>+ auto& post = downcast<RenderBlock>(*pre->createAnonymousBoxWithSameTypeAs(*block).release());
</ins><span class="cx">
</span><span class="cx"> RenderObject* boxFirst = madeNewBeforeBlock ? block->firstChild() : pre->nextSibling();
</span><span class="cx"> if (madeNewBeforeBlock)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTable.cpp (203707 => 203708)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTable.cpp 2016-07-26 02:24:20 UTC (rev 203707)
+++ trunk/Source/WebCore/rendering/RenderTable.cpp 2016-07-26 02:40:04 UTC (rev 203708)
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> if (beforeChild && !is<RenderTableSection>(*beforeChild) && beforeChild->style().display() != TABLE_CAPTION && beforeChild->style().display() != TABLE_COLUMN_GROUP)
</span><span class="cx"> beforeChild = nullptr;
</span><span class="cx">
</span><del>- RenderTableSection* section = RenderTableSection::createAnonymousWithParentRenderer(this);
</del><ins>+ auto section = RenderTableSection::createAnonymousWithParentRenderer(*this).release();
</ins><span class="cx"> addChild(section, beforeChild);
</span><span class="cx"> section->addChild(child);
</span><span class="cx"> }
</span><span class="lines">@@ -1555,13 +1555,18 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderTable* RenderTable::createAnonymousWithParentRenderer(const RenderObject* parent)
</del><ins>+std::unique_ptr<RenderTable> RenderTable::createTableWithStyle(Document& document, const RenderStyle& style)
</ins><span class="cx"> {
</span><del>- auto table = new RenderTable(parent->document(), RenderStyle::createAnonymousStyleWithDisplay(parent->style(), parent->style().display() == INLINE ? INLINE_TABLE : TABLE));
</del><ins>+ auto table = std::make_unique<RenderTable>(document, RenderStyle::createAnonymousStyleWithDisplay(style, style.display() == INLINE ? INLINE_TABLE : TABLE));
</ins><span class="cx"> table->initializeStyle();
</span><span class="cx"> return table;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+std::unique_ptr<RenderTable> RenderTable::createAnonymousWithParentRenderer(const RenderElement& parent)
+{
+ return RenderTable::createTableWithStyle(parent.document(), parent.style());
+}
+
</ins><span class="cx"> const BorderValue& RenderTable::tableStartBorderAdjoiningCell(const RenderTableCell& cell) const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(cell.isFirstOrLastCellInRow());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTable.h (203707 => 203708)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTable.h 2016-07-26 02:24:20 UTC (rev 203707)
+++ trunk/Source/WebCore/rendering/RenderTable.h 2016-07-26 02:40:04 UTC (rev 203708)
</span><span class="lines">@@ -251,11 +251,8 @@
</span><span class="cx"> recalcSections();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static RenderTable* createAnonymousWithParentRenderer(const RenderObject*);
- RenderBox* createAnonymousBoxWithSameTypeAs(const RenderObject* parent) const override
- {
- return createAnonymousWithParentRenderer(parent);
- }
</del><ins>+ static std::unique_ptr<RenderTable> createAnonymousWithParentRenderer(const RenderElement&);
+ std::unique_ptr<RenderBox> createAnonymousBoxWithSameTypeAs(const RenderBox& renderer) const override;
</ins><span class="cx">
</span><span class="cx"> const BorderValue& tableStartBorderAdjoiningCell(const RenderTableCell&) const;
</span><span class="cx"> const BorderValue& tableEndBorderAdjoiningCell(const RenderTableCell&) const;
</span><span class="lines">@@ -277,6 +274,8 @@
</span><span class="cx"> void simplifiedNormalFlowLayout() final;
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ static std::unique_ptr<RenderTable> createTableWithStyle(Document&, const RenderStyle&);
+
</ins><span class="cx"> const char* renderName() const override { return "RenderTable"; }
</span><span class="cx">
</span><span class="cx"> bool isTable() const final { return true; }
</span><span class="lines">@@ -380,6 +379,11 @@
</span><span class="cx">
</span><span class="cx"> inline bool isDirectionSame(const RenderBox* tableItem, const RenderBox* otherTableItem) { return tableItem && otherTableItem ? tableItem->style().direction() == otherTableItem->style().direction() : true; }
</span><span class="cx">
</span><ins>+inline std::unique_ptr<RenderBox> RenderTable::createAnonymousBoxWithSameTypeAs(const RenderBox& renderer) const
+{
+ return RenderTable::createTableWithStyle(renderer.document(), renderer.style());
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderTable, isTable())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableCellcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableCell.cpp (203707 => 203708)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableCell.cpp 2016-07-26 02:24:20 UTC (rev 203707)
+++ trunk/Source/WebCore/rendering/RenderTableCell.cpp 2016-07-26 02:40:04 UTC (rev 203708)
</span><span class="lines">@@ -1356,11 +1356,16 @@
</span><span class="cx"> setIntrinsicPaddingAfter(intrinsicPaddingAfter() - scrollbarHeight);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderTableCell* RenderTableCell::createAnonymousWithParentRenderer(const RenderObject* parent)
</del><ins>+std::unique_ptr<RenderTableCell> RenderTableCell::createTableCellWithStyle(Document& document, const RenderStyle& style)
</ins><span class="cx"> {
</span><del>- auto cell = new RenderTableCell(parent->document(), RenderStyle::createAnonymousStyleWithDisplay(parent->style(), TABLE_CELL));
</del><ins>+ auto cell = std::make_unique<RenderTableCell>(document, RenderStyle::createAnonymousStyleWithDisplay(style, TABLE_CELL));
</ins><span class="cx"> cell->initializeStyle();
</span><span class="cx"> return cell;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+std::unique_ptr<RenderTableCell> RenderTableCell::createAnonymousWithParentRenderer(const RenderTableRow& parent)
+{
+ return RenderTableCell::createTableCellWithStyle(parent.document(), parent.style());
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableCellh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableCell.h (203707 => 203708)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableCell.h 2016-07-26 02:24:20 UTC (rev 203707)
+++ trunk/Source/WebCore/rendering/RenderTableCell.h 2016-07-26 02:40:04 UTC (rev 203708)
</span><span class="lines">@@ -109,8 +109,8 @@
</span><span class="cx"> bool cellWidthChanged() const { return m_cellWidthChanged; }
</span><span class="cx"> void setCellWidthChanged(bool b = true) { m_cellWidthChanged = b; }
</span><span class="cx">
</span><del>- static RenderTableCell* createAnonymousWithParentRenderer(const RenderObject*);
- RenderBox* createAnonymousBoxWithSameTypeAs(const RenderObject* parent) const override { return createAnonymousWithParentRenderer(parent); }
</del><ins>+ static std::unique_ptr<RenderTableCell> createAnonymousWithParentRenderer(const RenderTableRow&);
+ std::unique_ptr<RenderBox> createAnonymousBoxWithSameTypeAs(const RenderBox&) const override;
</ins><span class="cx">
</span><span class="cx"> // This function is used to unify which table part's style we use for computing direction and
</span><span class="cx"> // writing mode. Writing modes are not allowed on row group and row but direction is.
</span><span class="lines">@@ -139,6 +139,8 @@
</span><span class="cx"> void computePreferredLogicalWidths() override;
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ static std::unique_ptr<RenderTableCell> createTableCellWithStyle(Document&, const RenderStyle&);
+
</ins><span class="cx"> const char* renderName() const override { return (isAnonymous() || isPseudoElement()) ? "RenderTableCell (anonymous)" : "RenderTableCell"; }
</span><span class="cx">
</span><span class="cx"> bool isTableCell() const override { return true; }
</span><span class="lines">@@ -372,6 +374,11 @@
</span><span class="cx"> m_hasEmptyCollapsedEndBorder = false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline std::unique_ptr<RenderBox> RenderTableCell::createAnonymousBoxWithSameTypeAs(const RenderBox& renderer) const
+{
+ return RenderTableCell::createTableCellWithStyle(renderer.document(), renderer.style());
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderTableCell, isTableCell())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableRowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableRow.cpp (203707 => 203708)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableRow.cpp 2016-07-26 02:24:20 UTC (rev 203707)
+++ trunk/Source/WebCore/rendering/RenderTableRow.cpp 2016-07-26 02:40:04 UTC (rev 203708)
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RenderTableCell* cell = RenderTableCell::createAnonymousWithParentRenderer(this);
</del><ins>+ auto* cell = RenderTableCell::createAnonymousWithParentRenderer(*this).release();
</ins><span class="cx"> addChild(cell, beforeChild);
</span><span class="cx"> cell->addChild(child);
</span><span class="cx"> return;
</span><span class="lines">@@ -260,11 +260,16 @@
</span><span class="cx"> repaint();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderTableRow* RenderTableRow::createAnonymousWithParentRenderer(const RenderObject* parent)
</del><ins>+std::unique_ptr<RenderTableRow> RenderTableRow::createTableRowWithStyle(Document& document, const RenderStyle& style)
</ins><span class="cx"> {
</span><del>- auto newRow = new RenderTableRow(parent->document(), RenderStyle::createAnonymousStyleWithDisplay(parent->style(), TABLE_ROW));
- newRow->initializeStyle();
- return newRow;
</del><ins>+ auto row = std::make_unique<RenderTableRow>(document, RenderStyle::createAnonymousStyleWithDisplay(style, TABLE_ROW));
+ row->initializeStyle();
+ return row;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+std::unique_ptr<RenderTableRow> RenderTableRow::createAnonymousWithParentRenderer(const RenderTableSection& parent)
+{
+ return RenderTableRow::createTableRowWithStyle(parent.document(), parent.style());
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableRowh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableRow.h (203707 => 203708)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableRow.h 2016-07-26 02:24:20 UTC (rev 203707)
+++ trunk/Source/WebCore/rendering/RenderTableRow.h 2016-07-26 02:40:04 UTC (rev 203708)
</span><span class="lines">@@ -47,8 +47,8 @@
</span><span class="cx">
</span><span class="cx"> void paintOutlineForRowIfNeeded(PaintInfo&, const LayoutPoint&);
</span><span class="cx">
</span><del>- static RenderTableRow* createAnonymousWithParentRenderer(const RenderObject*);
- RenderBox* createAnonymousBoxWithSameTypeAs(const RenderObject* parent) const override { return createAnonymousWithParentRenderer(parent); }
</del><ins>+ static std::unique_ptr<RenderTableRow> createAnonymousWithParentRenderer(const RenderTableSection&);
+ std::unique_ptr<RenderBox> createAnonymousBoxWithSameTypeAs(const RenderBox&) const override;
</ins><span class="cx">
</span><span class="cx"> void setRowIndex(unsigned);
</span><span class="cx"> bool rowIndexWasSet() const { return m_rowIndex != unsetRowIndex; }
</span><span class="lines">@@ -64,6 +64,8 @@
</span><span class="cx"> bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override;
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ static std::unique_ptr<RenderTableRow> createTableRowWithStyle(Document&, const RenderStyle&);
+
</ins><span class="cx"> const char* renderName() const override { return (isAnonymous() || isPseudoElement()) ? "RenderTableRow (anonymous)" : "RenderTableRow"; }
</span><span class="cx">
</span><span class="cx"> bool isTableRow() const override { return true; }
</span><span class="lines">@@ -147,6 +149,11 @@
</span><span class="cx"> return downcast<RenderTableRow>(RenderBox::lastChild());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline std::unique_ptr<RenderBox> RenderTableRow::createAnonymousBoxWithSameTypeAs(const RenderBox& renderer) const
+{
+ return RenderTableRow::createTableRowWithStyle(renderer.document(), renderer.style());
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderTableRow, isTableRow())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableSectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableSection.cpp (203707 => 203708)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableSection.cpp 2016-07-26 02:24:20 UTC (rev 203707)
+++ trunk/Source/WebCore/rendering/RenderTableSection.cpp 2016-07-26 02:40:04 UTC (rev 203708)
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RenderTableRow* row = RenderTableRow::createAnonymousWithParentRenderer(this);
</del><ins>+ auto* row = RenderTableRow::createAnonymousWithParentRenderer(*this).release();
</ins><span class="cx"> addChild(row, beforeChild);
</span><span class="cx"> row->addChild(child);
</span><span class="cx"> return;
</span><span class="lines">@@ -1577,13 +1577,18 @@
</span><span class="cx"> return it->value;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderTableSection* RenderTableSection::createAnonymousWithParentRenderer(const RenderObject* parent)
</del><ins>+std::unique_ptr<RenderTableSection> RenderTableSection::createTableSectionWithStyle(Document& document, const RenderStyle& style)
</ins><span class="cx"> {
</span><del>- auto section = new RenderTableSection(parent->document(), RenderStyle::createAnonymousStyleWithDisplay(parent->style(), TABLE_ROW_GROUP));
</del><ins>+ auto section = std::make_unique<RenderTableSection>(document, RenderStyle::createAnonymousStyleWithDisplay(style, TABLE_ROW_GROUP));
</ins><span class="cx"> section->initializeStyle();
</span><span class="cx"> return section;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+std::unique_ptr<RenderTableSection> RenderTableSection::createAnonymousWithParentRenderer(const RenderTable& parent)
+{
+ return RenderTableSection::createTableSectionWithStyle(parent.document(), parent.style());
+}
+
</ins><span class="cx"> void RenderTableSection::setLogicalPositionForCell(RenderTableCell* cell, unsigned effectiveColumn) const
</span><span class="cx"> {
</span><span class="cx"> LayoutPoint oldCellLocation = cell->location();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableSectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableSection.h (203707 => 203708)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableSection.h 2016-07-26 02:24:20 UTC (rev 203707)
+++ trunk/Source/WebCore/rendering/RenderTableSection.h 2016-07-26 02:40:04 UTC (rev 203708)
</span><span class="lines">@@ -143,8 +143,8 @@
</span><span class="cx"> // FIXME: We may want to introduce a structure holding the in-flux layout information.
</span><span class="cx"> LayoutUnit distributeExtraLogicalHeightToRows(LayoutUnit extraLogicalHeight);
</span><span class="cx">
</span><del>- static RenderTableSection* createAnonymousWithParentRenderer(const RenderObject*);
- RenderBox* createAnonymousBoxWithSameTypeAs(const RenderObject* parent) const override { return createAnonymousWithParentRenderer(parent); }
</del><ins>+ static std::unique_ptr<RenderTableSection> createAnonymousWithParentRenderer(const RenderTable&);
+ std::unique_ptr<RenderBox> createAnonymousBoxWithSameTypeAs(const RenderBox&) const override;
</ins><span class="cx">
</span><span class="cx"> void paint(PaintInfo&, const LayoutPoint&) override;
</span><span class="cx">
</span><span class="lines">@@ -152,6 +152,8 @@
</span><span class="cx"> void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ static std::unique_ptr<RenderTableSection> createTableSectionWithStyle(Document&, const RenderStyle&);
+
</ins><span class="cx"> enum ShouldIncludeAllIntersectingCells {
</span><span class="cx"> IncludeAllIntersectingCells,
</span><span class="cx"> DoNotIncludeAllIntersectingCells
</span><span class="lines">@@ -331,6 +333,11 @@
</span><span class="cx"> return CellSpan(0, m_grid.size());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline std::unique_ptr<RenderBox> RenderTableSection::createAnonymousBoxWithSameTypeAs(const RenderBox& renderer) const
+{
+ return RenderTableSection::createTableSectionWithStyle(renderer.document(), renderer.style());
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderTableSection, isTableSection())
</span></span></pre>
</div>
</div>
</body>
</html>