<!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>[161337] 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/161337">161337</a></dd>

<dt>Author</dt> <dd>akling@apple.com</dd>

<dt>Date</dt> <dd>2014-01-06 02:39:36 -0800 (Mon, 06 Jan 2014)</dd>

</dl>

<h3>Log Message</h3>

<pre>RenderBlock::clone() should return RenderPtr.

&lt;https://webkit.org/b/126513&gt;

Reviewed by Antti Koivisto.

* rendering/RenderBlock.h:

* rendering/RenderBlock.cpp:

(WebCore::RenderBlock::clone):

    Tweaked to return RenderPtr&lt;RenderBlock&gt;.

(WebCore::RenderBlock::splitBlocks):

    Store cloned RenderBlocks in RenderPtrs. Use leakPtr() to sink

    them into ownership-taking APIs that still use raw pointers.

* rendering/RenderPtr.h:

    Add a simple static_pointer_cast for RenderPtr&amp;&amp;.</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="#trunkSourceWebCorerenderingRenderPtrh">trunk/Source/WebCore/rendering/RenderPtr.h</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161336 => 161337)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-01-06 09:49:21 UTC (rev 161336)

+++ trunk/Source/WebCore/ChangeLog        2014-01-06 10:39:36 UTC (rev 161337)

</span><span class="lines">@@ -1,5 +1,27 @@

</span><span class="cx"> 2014-01-06  Andreas Kling  &lt;akling@apple.com&gt;

</span><span class="cx"> 

<ins>+        RenderBlock::clone() should return RenderPtr.

+        &lt;https://webkit.org/b/126513&gt;

+

+        Reviewed by Antti Koivisto.

+

+        * rendering/RenderBlock.h:

+        * rendering/RenderBlock.cpp:

+        (WebCore::RenderBlock::clone):

+

+            Tweaked to return RenderPtr&lt;RenderBlock&gt;.

+

+        (WebCore::RenderBlock::splitBlocks):

+

+            Store cloned RenderBlocks in RenderPtrs. Use leakPtr() to sink

+            them into ownership-taking APIs that still use raw pointers.

+

+        * rendering/RenderPtr.h:

+

+            Add a simple static_pointer_cast for RenderPtr&amp;&amp;.

+

+2014-01-06  Andreas Kling  &lt;akling@apple.com&gt;

+

</ins><span class="cx">         RenderInline::clone() should return RenderPtr.

</span><span class="cx">         &lt;https://webkit.org/b/126514&gt;

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (161336 => 161337)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp        2014-01-06 09:49:21 UTC (rev 161336)

+++ trunk/Source/WebCore/rendering/RenderBlock.cpp        2014-01-06 10:39:36 UTC (rev 161337)

</span><span class="lines">@@ -504,15 +504,14 @@

</span><span class="cx">     return 0;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-RenderBlock* RenderBlock::clone() const

</del><ins>+RenderPtr&lt;RenderBlock&gt; RenderBlock::clone() const

</ins><span class="cx"> {

</span><del>-    RenderBlock* cloneBlock;

</del><ins>+    RenderPtr&lt;RenderBlock&gt; cloneBlock;

</ins><span class="cx">     if (isAnonymousBlock()) {

</span><del>-        cloneBlock = createAnonymousBlock();

</del><ins>+        cloneBlock = RenderPtr&lt;RenderBlock&gt;(createAnonymousBlock());

</ins><span class="cx">         cloneBlock-&gt;setChildrenInline(childrenInline());

</span><span class="cx">     } else {

</span><del>-        auto cloneRenderer = element()-&gt;createElementRenderer(style());

-        cloneBlock = toRenderBlock(cloneRenderer.leakPtr());

</del><ins>+        cloneBlock = static_pointer_cast&lt;RenderBlock&gt;(element()-&gt;createElementRenderer(style()));

</ins><span class="cx">         cloneBlock-&gt;initializeStyle();

</span><span class="cx"> 

</span><span class="cx">         // This takes care of setting the right value of childrenInline in case

</span><span class="lines">@@ -529,7 +528,7 @@

</span><span class="cx">                               RenderObject* beforeChild, RenderBoxModelObject* oldCont)

</span><span class="cx"> {

<span class="cx">     // Create a clone of this inline.

</span><del>-    RenderBlock* cloneBlock = clone();

</del><ins>+    RenderPtr&lt;RenderBlock&gt; cloneBlock = clone();

</ins><span class="cx">     if (!isAnonymousBlock())

</span><span class="cx">         cloneBlock-&gt;setContinuation(oldCont);

</span><span class="cx"> 

</span><span class="lines">@@ -543,11 +542,11 @@

</span><span class="cx"> 

</span><span class="cx">     // Now take all of the children from beforeChild to the end and remove

<span class="cx">     // them from |this| and place them in the clone.

</span><del>-    moveChildrenTo(cloneBlock, beforeChild, 0, true);

</del><ins>+    moveChildrenTo(cloneBlock.get(), beforeChild, 0, true);

</ins><span class="cx">     

<span class="cx">     // Hook |clone| up as the continuation of the middle block.

</span><span class="cx">     if (!cloneBlock-&gt;isAnonymousBlock())

</span><del>-        middleBlock-&gt;setContinuation(cloneBlock);

</del><ins>+        middleBlock-&gt;setContinuation(cloneBlock.get());

</ins><span class="cx"> 

</span><span class="cx">     // We have been reparented and are now under the fromBlock.  We need

<span class="cx">     // to walk up our block parent chain until we hit the containing anonymous columns block.

</span><span class="lines">@@ -562,11 +561,11 @@

</span><span class="cx">         RenderBlock* blockCurr = toRenderBlock(curr);

</span><span class="cx">         

<span class="cx">         // Create a new clone.

</span><del>-        RenderBlock* cloneChild = cloneBlock;

</del><ins>+        RenderPtr&lt;RenderBlock&gt; cloneChild = std::move(cloneBlock);

</ins><span class="cx">         cloneBlock = blockCurr-&gt;clone();

</span><span class="cx"> 

<span class="cx">         // Insert our child clone as the first child.

</span><del>-        cloneBlock-&gt;addChildIgnoringContinuation(cloneChild, 0);

</del><ins>+        cloneBlock-&gt;addChildIgnoringContinuation(cloneChild.leakPtr(), 0);

</ins><span class="cx"> 

</span><span class="cx">         // Hook the clone up as a continuation of |curr|.  Note we do encounter

</span><span class="cx">         // anonymous blocks possibly as we walk up the block chain.  When we split an

</span><span class="lines">@@ -574,13 +573,13 @@

<span class="cx">         // actually split a real element.

</span><span class="cx">         if (!blockCurr-&gt;isAnonymousBlock()) {

</span><span class="cx">             oldCont = blockCurr-&gt;continuation();

</span><del>-            blockCurr-&gt;setContinuation(cloneBlock);

</del><ins>+            blockCurr-&gt;setContinuation(cloneBlock.get());

</ins><span class="cx">             cloneBlock-&gt;setContinuation(oldCont);

</span><span class="cx">         }

</span><span class="cx"> 

</span><span class="cx">         // Now we need to take all of the children starting from the first child

<span class="cx">         // *after* currChild and append them all to the clone.

</span><del>-        blockCurr-&gt;moveChildrenTo(cloneBlock, currChildNextSibling, 0, true);

</del><ins>+        blockCurr-&gt;moveChildrenTo(cloneBlock.get(), currChildNextSibling, 0, true);

</ins><span class="cx"> 

<span class="cx">         // Keep walking up the chain.

</span><span class="cx">         currChild = curr;

</span><span class="lines">@@ -589,7 +588,7 @@

</span><span class="cx">     }

</span><span class="cx"> 

<span class="cx">     // Now we are at the columns block level. We need to put the clone into the toBlock.

</span><del>-    toBlock-&gt;insertChildInternal(cloneBlock, nullptr, NotifyChildren);

</del><ins>+    toBlock-&gt;insertChildInternal(cloneBlock.leakPtr(), nullptr, NotifyChildren);

</ins><span class="cx"> 

</span><span class="cx">     // Now take all the children after currChild and remove them from the fromBlock

<span class="cx">     // and put them in the toBlock.

</span></span></pre></div>

<a id="trunkSourceWebCorerenderingRenderBlockh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.h (161336 => 161337)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.h        2014-01-06 09:49:21 UTC (rev 161336)

+++ trunk/Source/WebCore/rendering/RenderBlock.h        2014-01-06 10:39:36 UTC (rev 161337)

</span><span class="lines">@@ -583,7 +583,7 @@

</span><span class="cx">                      RenderObject* beforeChild, RenderBoxModelObject* oldCont);

</span><span class="cx">     void splitFlow(RenderObject* beforeChild, RenderBlock* newBlockBox,

</span><span class="cx">                    RenderObject* newChild, RenderBoxModelObject* oldCont);

</span><del>-    RenderBlock* clone() const;

</del><ins>+    RenderPtr&lt;RenderBlock&gt; clone() const;

</ins><span class="cx">     RenderBlock* continuationBefore(RenderObject* beforeChild);

</span><span class="cx">     RenderBlock* containingColumnsBlock(bool allowAnonymousColumnBlock = true);

</span><span class="cx">     RenderBlock* columnsBlockForSpanningElement(RenderObject* newChild);

</span></span></pre></div>

<a id="trunkSourceWebCorerenderingRenderPtrh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderPtr.h (161336 => 161337)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/rendering/RenderPtr.h        2014-01-06 09:49:21 UTC (rev 161336)

+++ trunk/Source/WebCore/rendering/RenderPtr.h        2014-01-06 10:39:36 UTC (rev 161337)

</span><span class="lines">@@ -158,6 +158,11 @@

</span><span class="cx">     return RenderPtr&lt;T&gt;(new T(std::forward&lt;Args&gt;(args)...));

</span><span class="cx"> }

</span><span class="cx"> 

</span><ins>+template&lt;typename T, typename U&gt; inline RenderPtr&lt;T&gt; static_pointer_cast(RenderPtr&lt;U&gt;&amp;&amp; p)

+{

+    return RenderPtr&lt;T&gt;(static_cast&lt;T*&gt;(p.leakPtr()));

+}

+

</ins><span class="cx"> } // namespace WebCore

</span><span class="cx"> 

</span><span class="cx"> namespace WTF {

</span></span></pre>

</div>

</div>

</body>

</html>