Changeset 161335 in webkit

Timestamp:

Jan 6, 2014, 1:47:01 AM (12 years ago)

Author:

akling@apple.com

Message:

RenderInline::clone() should return RenderPtr.
<​https://webkit.org/b/126514>

Patch by Gurpreet Kaur <​k.gurpreet@samsung.com> on 2014-01-06
Reviewed by Antti Koivisto.

• rendering/RenderInline.h:
• rendering/RenderInline.cpp:

(WebCore::RenderInline::clone):

Tweaked to return RenderPtr<RenderInline>.

(WebCore::RenderInline::splitInlines):

Store cloned RenderInlines in RenderPtrs. Use leakPtr() to sink
them into ownership-taking APIs that still use raw pointers.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderInline.cpp (modified) (5 diffs)
• rendering/RenderInline.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ -1 +1 @@
 2014-01-06  Gurpreet Kaur  <k.gurpreet@samsung.com>
+
+        RenderInline::clone() should return RenderPtr.
+        <https://webkit.org/b/126514>
+
+        Reviewed by Antti Koivisto.
+
+        * rendering/RenderInline.h:
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::clone):
+
+            Tweaked to return RenderPtr<RenderInline>.
+
+        (WebCore::RenderInline::splitInlines):
+
+            Store cloned RenderInlines in RenderPtrs. Use leakPtr() to sink
+            them into ownership-taking APIs that still use raw pointers.
+
+2014-01-06  Andreas Kling  <akling@apple.com>
 
         <hr> appears gray instead of green because of color attribute is defined followed by noshade attribute

trunk/Source/WebCore/rendering/RenderInline.cpp

@@ -331 +331 @@
 }
 
-RenderInline* RenderInline::clone() const
-{
-    RenderInline* cloneInline = new RenderInline(*element(), style());
+RenderPtr<RenderInline> RenderInline::clone() const
+{
+    RenderPtr<RenderInline> cloneInline = createRenderer<RenderInline>(*element(), style());
     cloneInline->initializeStyle();
     cloneInline->setFlowThreadState(flowThreadState());
@@ -344 +344 @@
 {
     // Create a clone of this inline.
-    RenderInline* cloneInline = clone();
+    RenderPtr<RenderInline> cloneInline = clone();
     cloneInline->setContinuation(oldCont);
 
@@ -370 +370 @@
 
     // Hook |clone| up as the continuation of the middle block.
-    middleBlock->setContinuation(cloneInline);
+    middleBlock->setContinuation(cloneInline.get());
 
     // We have been reparented and are now under the fromBlock.  We need
@@ -388 +388 @@
         if (splitDepth < cMaxSplitDepth) {
             // Create a new clone.
-            RenderInline* cloneChild = cloneInline;
+            RenderPtr<RenderInline> cloneChild = std::move(cloneInline);
             cloneInline = toRenderInline(curr)->clone();
 
             // Insert our child clone as the first child.
-            cloneInline->addChildIgnoringContinuation(cloneChild, 0);
+            cloneInline->addChildIgnoringContinuation(cloneChild.leakPtr(), 0);
 
             // Hook the clone up as a continuation of |curr|.
             RenderInline* inlineCurr = toRenderInline(curr);
             oldCont = inlineCurr->continuation();
-            inlineCurr->setContinuation(cloneInline);
+            inlineCurr->setContinuation(cloneInline.get());
             cloneInline->setContinuation(oldCont);
 
@@ -419 +419 @@
 
     // Now we are at the block level. We need to put the clone into the toBlock.
-    toBlock->insertChildInternal(cloneInline, nullptr, NotifyChildren);
+    toBlock->insertChildInternal(cloneInline.leakPtr(), nullptr, NotifyChildren);
 
     // Now take all the children after currChild and remove them from the fromBlock

trunk/Source/WebCore/rendering/RenderInline.h

@@ -170 +170 @@
     virtual void updateFromStyle() OVERRIDE FINAL;
     
-    RenderInline* clone() const;
+    RenderPtr<RenderInline> clone() const;
 
     void paintOutlineForLine(GraphicsContext*, const LayoutPoint&, const LayoutRect& prevLine, const LayoutRect& thisLine,