<!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>[161491] 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/161491">161491</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-01-08 01:47:59 -0800 (Wed, 08 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>createMathMLOperator() should return RenderPtr.
<https://webkit.org/b/126622>
Reviewed by Antti Koivisto.
* rendering/mathml/RenderMathMLFenced.h:
* rendering/mathml/RenderMathMLFenced.cpp:
(WebCore::RenderMathMLFenced::createMathMLOperator):
Make this return a RenderPtr<RenderMathMLOperator>.
(WebCore::RenderMathMLFenced::makeFences):
(WebCore::RenderMathMLFenced::addChild):
Updated for the new createMathMLOperator() signature.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLFencedcpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLFenced.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLFencedh">trunk/Source/WebCore/rendering/mathml/RenderMathMLFenced.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161490 => 161491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-08 08:45:19 UTC (rev 161490)
+++ trunk/Source/WebCore/ChangeLog 2014-01-08 09:47:59 UTC (rev 161491)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-01-08 Andreas Kling <akling@apple.com>
+
+ createMathMLOperator() should return RenderPtr.
+ <https://webkit.org/b/126622>
+
+ Reviewed by Antti Koivisto.
+
+ * rendering/mathml/RenderMathMLFenced.h:
+ * rendering/mathml/RenderMathMLFenced.cpp:
+ (WebCore::RenderMathMLFenced::createMathMLOperator):
+
+ Make this return a RenderPtr<RenderMathMLOperator>.
+
+ (WebCore::RenderMathMLFenced::makeFences):
+ (WebCore::RenderMathMLFenced::addChild):
+
+ Updated for the new createMathMLOperator() signature.
+
</ins><span class="cx"> 2014-01-07 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r161195): Acid2 regression tests frequently fail
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLFencedcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLFenced.cpp (161490 => 161491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLFenced.cpp 2014-01-08 08:45:19 UTC (rev 161490)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLFenced.cpp 2014-01-08 09:47:59 UTC (rev 161491)
</span><span class="lines">@@ -82,14 +82,14 @@
</span><span class="cx"> makeFences();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderMathMLOperator* RenderMathMLFenced::createMathMLOperator(UChar uChar, RenderMathMLOperator::OperatorType operatorType)
</del><ins>+RenderPtr<RenderMathMLOperator> RenderMathMLFenced::createMathMLOperator(UChar uChar, RenderMathMLOperator::OperatorType operatorType)
</ins><span class="cx"> {
</span><span class="cx"> auto newStyle = RenderStyle::createAnonymousStyleWithDisplay(&style(), FLEX);
</span><span class="cx"> newStyle.get().setFlexDirection(FlowColumn);
</span><span class="cx"> newStyle.get().setMarginEnd(Length((operatorType == RenderMathMLOperator::Fence ? gFenceMarginEms : gSeparatorMarginEndEms) * style().fontSize(), Fixed));
</span><span class="cx"> if (operatorType == RenderMathMLOperator::Fence)
</span><span class="cx"> newStyle.get().setMarginStart(Length(gFenceMarginEms * style().fontSize(), Fixed));
</span><del>- RenderMathMLOperator* newOperator = new RenderMathMLOperator(element(), std::move(newStyle), uChar);
</del><ins>+ RenderPtr<RenderMathMLOperator> newOperator = createRenderer<RenderMathMLOperator>(element(), std::move(newStyle), uChar);
</ins><span class="cx"> newOperator->setOperatorType(operatorType);
</span><span class="cx"> newOperator->initializeStyle();
</span><span class="cx"> return newOperator;
</span><span class="lines">@@ -97,11 +97,15 @@
</span><span class="cx">
</span><span class="cx"> void RenderMathMLFenced::makeFences()
</span><span class="cx"> {
</span><del>- RenderMathMLOperator* openFence = createMathMLOperator(m_open, RenderMathMLOperator::Fence);
- RenderMathMLRow::addChild(openFence, firstChild());
- m_closeFenceRenderer = createMathMLOperator(m_close, RenderMathMLOperator::Fence);
- RenderMathMLRow::addChild(m_closeFenceRenderer);
- openFence->updateFromElement();
</del><ins>+ RenderPtr<RenderMathMLOperator> openFence = createMathMLOperator(m_open, RenderMathMLOperator::Fence);
+ RenderMathMLOperator* openFencePtr = openFence.get();
+ RenderMathMLRow::addChild(openFence.leakPtr(), firstChild());
+
+ RenderPtr<RenderMathMLOperator> closeFence = createMathMLOperator(m_close, RenderMathMLOperator::Fence);
+ m_closeFenceRenderer = closeFence.get();
+ RenderMathMLRow::addChild(closeFence.leakPtr());
+
+ openFencePtr->updateFromElement();
</ins><span class="cx"> m_closeFenceRenderer->updateFromElement();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -114,7 +118,7 @@
</span><span class="cx"> // FIXME: Adding or removing a child should possibly cause all later separators to shift places if they're different,
</span><span class="cx"> // as later child positions change by +1 or -1.
</span><span class="cx">
</span><del>- RenderMathMLOperator* separatorRenderer = nullptr;
</del><ins>+ RenderPtr<RenderMathMLOperator> separatorRenderer;
</ins><span class="cx"> if (m_separators.get()) {
</span><span class="cx"> unsigned int count = 0;
</span><span class="cx"> for (Node* position = child->node(); position; position = position->previousSibling()) {
</span><span class="lines">@@ -144,11 +148,11 @@
</span><span class="cx"> // Adding |x| before an existing |y| e.g. in element (y) - first insert our new child |x|, then its separator, to get (x, y).
</span><span class="cx"> RenderMathMLRow::addChild(child, beforeChild);
</span><span class="cx"> if (separatorRenderer)
</span><del>- RenderMathMLRow::addChild(separatorRenderer, beforeChild);
</del><ins>+ RenderMathMLRow::addChild(separatorRenderer.leakPtr(), beforeChild);
</ins><span class="cx"> } else {
</span><span class="cx"> // Adding |y| at the end of an existing element e.g. (x) - insert the separator first before the closing fence, then |y|, to get (x, y).
</span><span class="cx"> if (separatorRenderer)
</span><del>- RenderMathMLRow::addChild(separatorRenderer, m_closeFenceRenderer);
</del><ins>+ RenderMathMLRow::addChild(separatorRenderer.leakPtr(), m_closeFenceRenderer);
</ins><span class="cx"> RenderMathMLRow::addChild(child, m_closeFenceRenderer);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLFencedh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLFenced.h (161490 => 161491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLFenced.h 2014-01-08 08:45:19 UTC (rev 161490)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLFenced.h 2014-01-08 09:47:59 UTC (rev 161491)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void updateFromElement() OVERRIDE;
</span><span class="cx">
</span><del>- RenderMathMLOperator* createMathMLOperator(UChar, RenderMathMLOperator::OperatorType);
</del><ins>+ RenderPtr<RenderMathMLOperator> createMathMLOperator(UChar, RenderMathMLOperator::OperatorType);
</ins><span class="cx"> void makeFences();
</span><span class="cx">
</span><span class="cx"> UChar m_open;
</span></span></pre>
</div>
</div>
</body>
</html>