<!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>[176465] 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/176465">176465</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-11-21 12:42:14 -0800 (Fri, 21 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>RenderMathMLScripts isPrescript() helper should take a reference.
<https://webkit.org/b/138975>
Reviewed by Antti Koivisto.
Tidy this up a bit, since it's never called with a null pointer.
* rendering/mathml/RenderMathMLScripts.cpp:
(WebCore::isPrescript):
(WebCore::RenderMathMLScripts::fixAnonymousStyles):
(WebCore::RenderMathMLScripts::addChildInternal):
(WebCore::RenderMathMLScripts::removeChildInternal):
(WebCore::RenderMathMLScripts::layout):
(WebCore::RenderMathMLScriptsWrapper::addChildInternal):
(WebCore::RenderMathMLScriptsWrapper::removeChildInternal):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLScriptscpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176464 => 176465)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-21 20:37:21 UTC (rev 176464)
+++ trunk/Source/WebCore/ChangeLog 2014-11-21 20:42:14 UTC (rev 176465)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-11-21 Andreas Kling <akling@apple.com>
+
+ RenderMathMLScripts isPrescript() helper should take a reference.
+ <https://webkit.org/b/138975>
+
+ Reviewed by Antti Koivisto.
+
+ Tidy this up a bit, since it's never called with a null pointer.
+
+ * rendering/mathml/RenderMathMLScripts.cpp:
+ (WebCore::isPrescript):
+ (WebCore::RenderMathMLScripts::fixAnonymousStyles):
+ (WebCore::RenderMathMLScripts::addChildInternal):
+ (WebCore::RenderMathMLScripts::removeChildInternal):
+ (WebCore::RenderMathMLScripts::layout):
+ (WebCore::RenderMathMLScriptsWrapper::addChildInternal):
+ (WebCore::RenderMathMLScriptsWrapper::removeChildInternal):
+
</ins><span class="cx"> 2014-11-21 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Windows build fixes.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLScriptscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.cpp (176464 => 176465)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.cpp 2014-11-21 20:37:21 UTC (rev 176464)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.cpp 2014-11-21 20:42:14 UTC (rev 176465)
</span><span class="lines">@@ -50,10 +50,9 @@
</span><span class="cx"> // where BaseWrapper can now be empty and SubSupPairWrapper can now have one or two elements.
</span><span class="cx"> //
</span><span class="cx">
</span><del>-static bool isPrescript(RenderObject* renderObject)
</del><ins>+static bool isPrescript(const RenderObject& renderObject)
</ins><span class="cx"> {
</span><del>- ASSERT(renderObject);
- return renderObject->node() && renderObject->node()->hasTagName(MathMLNames::mprescriptsTag);
</del><ins>+ return renderObject.node() && renderObject.node()->hasTagName(MathMLNames::mprescriptsTag);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderMathMLScripts::RenderMathMLScripts(Element& element, PassRef<RenderStyle> style)
</span><span class="lines">@@ -119,18 +118,18 @@
</span><span class="cx">
</span><span class="cx"> // This sets the style for postscript pairs.
</span><span class="cx"> RenderObject* subSupPair = m_baseWrapper;
</span><del>- for (subSupPair = subSupPair->nextSibling(); subSupPair && !isPrescript(subSupPair); subSupPair = subSupPair->nextSibling())
</del><ins>+ for (subSupPair = subSupPair->nextSibling(); subSupPair && !isPrescript(*subSupPair); subSupPair = subSupPair->nextSibling())
</ins><span class="cx"> fixAnonymousStyleForSubSupPair(subSupPair, true);
</span><span class="cx">
</span><span class="cx"> if (subSupPair && m_kind == Multiscripts) {
</span><span class="cx"> // This sets the style for prescript pairs.
</span><del>- for (subSupPair = subSupPair->nextSibling(); subSupPair && !isPrescript(subSupPair); subSupPair = subSupPair->nextSibling())
</del><ins>+ for (subSupPair = subSupPair->nextSibling(); subSupPair && !isPrescript(*subSupPair); subSupPair = subSupPair->nextSibling())
</ins><span class="cx"> fixAnonymousStyleForSubSupPair(subSupPair, false);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // This resets style for extra subSup pairs.
</span><span class="cx"> for (; subSupPair; subSupPair = subSupPair->nextSibling()) {
</span><del>- if (!isPrescript(subSupPair)) {
</del><ins>+ if (!isPrescript(*subSupPair)) {
</ins><span class="cx"> ASSERT(subSupPair && subSupPair->style().refCount() == 1);
</span><span class="cx"> RenderStyle& scriptsStyle = subSupPair->style();
</span><span class="cx"> scriptsStyle.setFlexDirection(FlowRow);
</span><span class="lines">@@ -168,13 +167,13 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (isPrescript(child)) {
</del><ins>+ if (isPrescript(*child)) {
</ins><span class="cx"> // The new child becomes an <mprescripts/> separator.
</span><span class="cx"> RenderMathMLBlock::addChild(child, beforeChild);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!beforeChild || isPrescript(beforeChild)) {
</del><ins>+ if (!beforeChild || isPrescript(*beforeChild)) {
</ins><span class="cx"> // We are at the end of a sequence of subSup pairs.
</span><span class="cx"> RenderMathMLBlock* previousSibling = downcast<RenderMathMLBlock>(beforeChild ? beforeChild->previousSibling() : lastChild());
</span><span class="cx"> if (is<RenderMathMLScriptsWrapper>(previousSibling)) {
</span><span class="lines">@@ -204,13 +203,13 @@
</span><span class="cx"> if (doNotRestructure)
</span><span class="cx"> return RenderMathMLBlock::removeChild(child);
</span><span class="cx">
</span><del>- ASSERT(isPrescript(&child));
</del><ins>+ ASSERT(isPrescript(child));
</ins><span class="cx">
</span><span class="cx"> RenderObject* previousSibling = child.previousSibling();
</span><span class="cx"> RenderObject* nextSibling = child.nextSibling();
</span><span class="cx"> ASSERT(previousSibling);
</span><span class="cx">
</span><del>- if (nextSibling && !isPrescript(previousSibling) && !isPrescript(nextSibling)) {
</del><ins>+ if (nextSibling && !isPrescript(*previousSibling) && !isPrescript(*nextSibling)) {
</ins><span class="cx"> RenderMathMLScriptsWrapper& previousWrapper = downcast<RenderMathMLScriptsWrapper>(*previousSibling);
</span><span class="cx"> RenderMathMLScriptsWrapper& nextWrapper = downcast<RenderMathMLScriptsWrapper>(*nextSibling);
</span><span class="cx"> ASSERT(nextWrapper.m_kind == RenderMathMLScriptsWrapper::SubSupPair && !nextWrapper.isEmpty());
</span><span class="lines">@@ -306,7 +305,7 @@
</span><span class="cx"> for (; subSupPair; subSupPair = downcast<RenderMathMLBlock>(subSupPair->nextSibling())) {
</span><span class="cx">
</span><span class="cx"> // We skip the base and <mprescripts/> elements.
</span><del>- if (isPrescript(subSupPair)) {
</del><ins>+ if (isPrescript(*subSupPair)) {
</ins><span class="cx"> if (!isPostScript)
</span><span class="cx"> break;
</span><span class="cx"> isPostScript = false;
</span><span class="lines">@@ -396,7 +395,7 @@
</span><span class="cx"> RenderObject* oldBase = firstChild();
</span><span class="cx"> if (oldBase)
</span><span class="cx"> RenderMathMLBlock::removeChild(*oldBase);
</span><del>- if (isPrescript(child))
</del><ins>+ if (isPrescript(*child))
</ins><span class="cx"> parentNode->addChildInternal(true, child, sibling);
</span><span class="cx"> else
</span><span class="cx"> RenderMathMLBlock::addChild(child);
</span><span class="lines">@@ -405,7 +404,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (isPrescript(child)) {
</del><ins>+ if (isPrescript(*child)) {
</ins><span class="cx"> // We insert an <mprescripts> element.
</span><span class="cx"> if (!beforeChild)
</span><span class="cx"> parentNode->addChildInternal(true, child, nextSibling());
</span><span class="lines">@@ -431,7 +430,7 @@
</span><span class="cx">
</span><span class="cx"> // We first move to the last subSup pair in the curent sequence of scripts.
</span><span class="cx"> RenderMathMLScriptsWrapper* subSupPair = this;
</span><del>- while (subSupPair->nextSibling() && !isPrescript(subSupPair->nextSibling()))
</del><ins>+ while (subSupPair->nextSibling() && !isPrescript(*subSupPair->nextSibling()))
</ins><span class="cx"> subSupPair = downcast<RenderMathMLScriptsWrapper>(subSupPair->nextSibling());
</span><span class="cx"> if (subSupPair->firstChild()->nextSibling()) {
</span><span class="cx"> // The last pair has two children so we need to create a new pair to leave room for the new child.
</span><span class="lines">@@ -473,7 +472,7 @@
</span><span class="cx"> // We remove the child from the base wrapper.
</span><span class="cx"> RenderObject* sibling = nextSibling();
</span><span class="cx"> RenderMathMLBlock::removeChild(child);
</span><del>- if (sibling && !isPrescript(sibling)) {
</del><ins>+ if (sibling && !isPrescript(*sibling)) {
</ins><span class="cx"> // If there are postscripts, the first one becomes the base.
</span><span class="cx"> RenderMathMLScriptsWrapper& wrapper = downcast<RenderMathMLScriptsWrapper>(*sibling);
</span><span class="cx"> RenderObject* script = wrapper.firstChild();
</span><span class="lines">@@ -486,7 +485,7 @@
</span><span class="cx"> // We remove the child and shift the successors in the current sequence of scripts.
</span><span class="cx"> RenderObject* next = RenderMathMLBlock::removeChild(child);
</span><span class="cx"> RenderMathMLScriptsWrapper* subSupPair = this;
</span><del>- for (RenderObject* nextSibling = subSupPair->nextSibling(); nextSibling && !isPrescript(nextSibling); nextSibling = nextSibling->nextSibling()) {
</del><ins>+ for (RenderObject* nextSibling = subSupPair->nextSibling(); nextSibling && !isPrescript(*nextSibling); nextSibling = nextSibling->nextSibling()) {
</ins><span class="cx"> RenderMathMLScriptsWrapper& nextSubSupPair = downcast<RenderMathMLScriptsWrapper>(*nextSibling);
</span><span class="cx"> RenderObject* script = nextSubSupPair.firstChild();
</span><span class="cx"> nextSubSupPair.removeChildInternal(true, *script);
</span></span></pre>
</div>
</div>
</body>
</html>