<!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>[161183] 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/161183">161183</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2013-12-31 08:16:32 -0800 (Tue, 31 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>RenderListItem should store its marker in a RenderPtr.
<https://webkit.org/b/126298>
Make RenderListItem::m_marker a RenderPtr<RenderListMarker> and
remove two manual destroy() calls. Tweaked code to reduce nesting.
Reviewed by Anders Carlsson.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListItemcpp">trunk/Source/WebCore/rendering/RenderListItem.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListItemh">trunk/Source/WebCore/rendering/RenderListItem.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161182 => 161183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-31 16:14:39 UTC (rev 161182)
+++ trunk/Source/WebCore/ChangeLog 2013-12-31 16:16:32 UTC (rev 161183)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2013-12-31 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><ins>+ RenderListItem should store its marker in a RenderPtr.
+ <https://webkit.org/b/126298>
+
+ Make RenderListItem::m_marker a RenderPtr<RenderListMarker> and
+ remove two manual destroy() calls. Tweaked code to reduce nesting.
+
+ Reviewed by Anders Carlsson.
+
+2013-12-31 Andreas Kling <akling@apple.com>
+
</ins><span class="cx"> Element's renderer factory should return RenderPtrs.
</span><span class="cx"> <https://webkit.org/b/126318>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListItemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListItem.cpp (161182 => 161183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListItem.cpp 2013-12-31 16:14:39 UTC (rev 161182)
+++ trunk/Source/WebCore/rendering/RenderListItem.cpp 2013-12-31 16:16:32 UTC (rev 161183)
</span><span class="lines">@@ -42,7 +42,6 @@
</span><span class="cx">
</span><span class="cx"> RenderListItem::RenderListItem(Element& element, PassRef<RenderStyle> style)
</span><span class="cx"> : RenderBlockFlow(element, std::move(style))
</span><del>- , m_marker(0)
</del><span class="cx"> , m_hasExplicitValue(false)
</span><span class="cx"> , m_isValueUpToDate(false)
</span><span class="cx"> , m_notInList(false)
</span><span class="lines">@@ -54,29 +53,25 @@
</span><span class="cx"> {
</span><span class="cx"> RenderBlockFlow::styleDidChange(diff, oldStyle);
</span><span class="cx">
</span><del>- if (style().listStyleType() != NoneListStyle
- || (style().listStyleImage() && !style().listStyleImage()->errorOccurred())) {
- auto newStyle = RenderStyle::create();
- // The marker always inherits from the list item, regardless of where it might end
- // up (e.g., in some deeply nested line box). See CSS3 spec.
- newStyle.get().inheritFrom(&style());
- if (!m_marker) {
- m_marker = new RenderListMarker(*this, std::move(newStyle));
- m_marker->initializeStyle();
- } else
- m_marker->setStyle(std::move(newStyle));
- } else if (m_marker) {
- m_marker->destroy();
- m_marker = 0;
</del><ins>+ if (style().listStyleType() == NoneListStyle && (!style().listStyleImage() || style().listStyleImage()->errorOccurred())) {
+ m_marker = nullptr;
+ return;
</ins><span class="cx"> }
</span><ins>+
+ auto newStyle = RenderStyle::create();
+ // The marker always inherits from the list item, regardless of where it might end
+ // up (e.g., in some deeply nested line box). See CSS3 spec.
+ newStyle.get().inheritFrom(&style());
+ if (!m_marker) {
+ m_marker = createRenderer<RenderListMarker>(*this, std::move(newStyle));
+ m_marker->initializeStyle();
+ } else
+ m_marker->setStyle(std::move(newStyle));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderListItem::willBeDestroyed()
</span><del>-{
- if (m_marker) {
- m_marker->destroy();
- m_marker = 0;
- }
</del><ins>+{
+ m_marker = nullptr;
</ins><span class="cx"> RenderBlockFlow::willBeDestroyed();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -276,7 +271,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> RenderElement* currentParent = m_marker->parent();
</span><del>- RenderBlock* newParent = getParentOfFirstLineBox(this, m_marker);
</del><ins>+ RenderBlock* newParent = getParentOfFirstLineBox(this, m_marker.get());
</ins><span class="cx"> if (!newParent) {
</span><span class="cx"> // If the marker is currently contained inside an anonymous box,
</span><span class="cx"> // then we are the only item in that anonymous box (since no line box
</span><span class="lines">@@ -292,7 +287,7 @@
</span><span class="cx"> // containers other than ourselves, so we need to disable LayoutState.
</span><span class="cx"> LayoutStateDisabler layoutStateDisabler(&view());
</span><span class="cx"> m_marker->removeFromParent();
</span><del>- newParent->addChild(m_marker, firstNonMarkerChild(newParent));
</del><ins>+ newParent->addChild(m_marker.get(), firstNonMarkerChild(newParent));
</ins><span class="cx"> m_marker->updateMarginsAndContent();
</span><span class="cx"> // If current parent is an anonymous block that has lost all its children, destroy it.
</span><span class="cx"> if (currentParent && currentParent->isAnonymousBlock() && !currentParent->firstChild() && !toRenderBlock(currentParent)->continuation())
</span><span class="lines">@@ -400,7 +395,7 @@
</span><span class="cx"> LayoutRect markerRect(markerLogicalLeft + lineOffset, blockOffset, m_marker->width(), m_marker->height());
</span><span class="cx"> if (!style().isHorizontalWritingMode())
</span><span class="cx"> markerRect = markerRect.transposedRect();
</span><del>- RenderBox* o = m_marker;
</del><ins>+ RenderBox* o = m_marker.get();
</ins><span class="cx"> bool propagateVisualOverflow = true;
</span><span class="cx"> bool propagateLayoutOverflow = true;
</span><span class="cx"> do {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListItemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListItem.h (161182 => 161183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListItem.h 2013-12-31 16:14:39 UTC (rev 161182)
+++ trunk/Source/WebCore/rendering/RenderListItem.h 2013-12-31 16:16:32 UTC (rev 161183)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> #define RenderListItem_h
</span><span class="cx">
</span><span class="cx"> #include "RenderBlockFlow.h"
</span><ins>+#include "RenderPtr.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -84,7 +85,7 @@
</span><span class="cx"> void explicitValueChanged();
</span><span class="cx">
</span><span class="cx"> int m_explicitValue;
</span><del>- RenderListMarker* m_marker;
</del><ins>+ RenderPtr<RenderListMarker> m_marker;
</ins><span class="cx"> mutable int m_value;
</span><span class="cx">
</span><span class="cx"> bool m_hasExplicitValue : 1;
</span></span></pre>
</div>
</div>
</body>
</html>