<!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>[204721] 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/204721">204721</a></dd>
<dt>Author</dt> <dd>fred.wang@free.fr</dd>
<dt>Date</dt> <dd>2016-08-22 09:18:09 -0700 (Mon, 22 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use memoize pattern for the menclose notation attribute
https://bugs.webkit.org/show_bug.cgi?id=160461
Patch by Frederic Wang <fwang@igalia.com> on 2016-08-22
Reviewed by Darin Adler.
Currently, MathMLMencloseElement::parseAttribute parse the "notation" attribute each time it
is changed. We change this to use the memoize pattern as done for other MathML attributes:
We store m_notationFlags in an Optional<uint16_t> where Optnull means that the
attribute is dirty and must be parsed again.
No new tests, already covered by existing tests.
* mathml/MathMLMencloseElement.cpp:
(WebCore::MathMLMencloseElement::parseNotationAttribute): Move parsing of the "notation"
attribute from parseAttribute into this separate helper function.
(WebCore::MathMLMencloseElement::hasNotation): This now check whether the attribute and
dirty and parse it if necessary.
(WebCore::MathMLMencloseElement::parseAttribute): Just make the attribute dirty rather than
parsing it immediately.
* mathml/MathMLMencloseElement.h: hasNotation is no longer const as it may update the
m_notationsFlags. We declare parseNotationAttribute(). Finally, we wrap m_notationFlags
in an Optional<uint16_t> and make addNotation extract the value.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLMencloseElementcpp">trunk/Source/WebCore/mathml/MathMLMencloseElement.cpp</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLMencloseElementh">trunk/Source/WebCore/mathml/MathMLMencloseElement.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204720 => 204721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-22 16:13:28 UTC (rev 204720)
+++ trunk/Source/WebCore/ChangeLog 2016-08-22 16:18:09 UTC (rev 204721)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-08-22 Frederic Wang <fwang@igalia.com>
+
+ Use memoize pattern for the menclose notation attribute
+ https://bugs.webkit.org/show_bug.cgi?id=160461
+
+ Reviewed by Darin Adler.
+
+ Currently, MathMLMencloseElement::parseAttribute parse the "notation" attribute each time it
+ is changed. We change this to use the memoize pattern as done for other MathML attributes:
+ We store m_notationFlags in an Optional<uint16_t> where Optnull means that the
+ attribute is dirty and must be parsed again.
+
+ No new tests, already covered by existing tests.
+
+ * mathml/MathMLMencloseElement.cpp:
+ (WebCore::MathMLMencloseElement::parseNotationAttribute): Move parsing of the "notation"
+ attribute from parseAttribute into this separate helper function.
+ (WebCore::MathMLMencloseElement::hasNotation): This now check whether the attribute and
+ dirty and parse it if necessary.
+ (WebCore::MathMLMencloseElement::parseAttribute): Just make the attribute dirty rather than
+ parsing it immediately.
+ * mathml/MathMLMencloseElement.h: hasNotation is no longer const as it may update the
+ m_notationsFlags. We declare parseNotationAttribute(). Finally, we wrap m_notationFlags
+ in an Optional<uint16_t> and make addNotation extract the value.
+
</ins><span class="cx"> 2016-08-22 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] <a ping> and <area ping> tests time out
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLMencloseElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLMencloseElement.cpp (204720 => 204721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLMencloseElement.cpp 2016-08-22 16:13:28 UTC (rev 204720)
+++ trunk/Source/WebCore/mathml/MathMLMencloseElement.cpp 2016-08-22 16:18:09 UTC (rev 204721)
</span><span class="lines">@@ -34,6 +34,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+using namespace MathMLNames;
+
</ins><span class="cx"> MathMLMencloseElement::MathMLMencloseElement(const QualifiedName& tagName, Document& document)
</span><span class="cx"> : MathMLInlineContainerElement(tagName, document)
</span><span class="cx"> {
</span><span class="lines">@@ -52,59 +54,70 @@
</span><span class="cx"> return createRenderer<RenderMathMLMenclose>(*this, WTFMove(style));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MathMLMencloseElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
</del><ins>+void MathMLMencloseElement::parseNotationAttribute()
</ins><span class="cx"> {
</span><del>- if (name == MathMLNames::notationAttr) {
- clearNotations();
- if (!hasAttribute(name)) {
- addNotation(LongDiv); // default value is longdiv
- return;
- }
- Vector<String> notationsList;
- String(value).split(' ', notationsList);
- for (auto& notation : notationsList) {
- if (notation == "longdiv") {
- addNotation(LongDiv);
- } else if (notation == "roundedbox") {
- addNotation(RoundedBox);
- } else if (notation == "circle") {
- addNotation(Circle);
- } else if (notation == "left") {
- addNotation(Left);
- } else if (notation == "right") {
- addNotation(Right);
- } else if (notation == "top") {
- addNotation(Top);
- } else if (notation == "bottom") {
- addNotation(Bottom);
- } else if (notation == "updiagonalstrike") {
- addNotation(UpDiagonalStrike);
- } else if (notation == "downdiagonalstrike") {
- addNotation(DownDiagonalStrike);
- } else if (notation == "verticalstrike") {
- addNotation(VerticalStrike);
- } else if (notation == "horizontalstrike") {
- addNotation(HorizontalStrike);
- } else if (notation == "updiagonalarrow") {
- addNotation(UpDiagonalArrow);
- } else if (notation == "phasorangle") {
- addNotation(PhasorAngle);
- } else if (notation == "box") {
- addNotation(Left);
- addNotation(Right);
- addNotation(Top);
- addNotation(Bottom);
- } else if (notation == "actuarial") {
- addNotation(Right);
- addNotation(Top);
- } else if (notation == "madruwb") {
- addNotation(Right);
- addNotation(Bottom);
- }
- }
</del><ins>+ clearNotations();
+ if (!hasAttribute(notationAttr)) {
+ addNotation(LongDiv); // The default value is longdiv.
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+ auto& value = attributeWithoutSynchronization(notationAttr);
+ Vector<String> notationsList;
+ String(value).split(' ', notationsList);
+ for (auto& notation : notationsList) {
+ if (notation == "longdiv") {
+ addNotation(LongDiv);
+ } else if (notation == "roundedbox") {
+ addNotation(RoundedBox);
+ } else if (notation == "circle") {
+ addNotation(Circle);
+ } else if (notation == "left") {
+ addNotation(Left);
+ } else if (notation == "right") {
+ addNotation(Right);
+ } else if (notation == "top") {
+ addNotation(Top);
+ } else if (notation == "bottom") {
+ addNotation(Bottom);
+ } else if (notation == "updiagonalstrike") {
+ addNotation(UpDiagonalStrike);
+ } else if (notation == "downdiagonalstrike") {
+ addNotation(DownDiagonalStrike);
+ } else if (notation == "verticalstrike") {
+ addNotation(VerticalStrike);
+ } else if (notation == "horizontalstrike") {
+ addNotation(HorizontalStrike);
+ } else if (notation == "updiagonalarrow") {
+ addNotation(UpDiagonalArrow);
+ } else if (notation == "phasorangle") {
+ addNotation(PhasorAngle);
+ } else if (notation == "box") {
+ addNotation(Left);
+ addNotation(Right);
+ addNotation(Top);
+ addNotation(Bottom);
+ } else if (notation == "actuarial") {
+ addNotation(Right);
+ addNotation(Top);
+ } else if (notation == "madruwb") {
+ addNotation(Right);
+ addNotation(Bottom);
+ }
+ }
+}
</ins><span class="cx">
</span><ins>+bool MathMLMencloseElement::hasNotation(MencloseNotationFlag notationFlag)
+{
+ if (!m_notationFlags)
+ parseNotationAttribute();
+ return m_notationFlags.value() & notationFlag;
+}
+
+void MathMLMencloseElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
+{
+ if (name == notationAttr)
+ m_notationFlags = Nullopt;
+
</ins><span class="cx"> MathMLInlineContainerElement::parseAttribute(name, value);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLMencloseElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLMencloseElement.h (204720 => 204721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLMencloseElement.h 2016-08-22 16:13:28 UTC (rev 204720)
+++ trunk/Source/WebCore/mathml/MathMLMencloseElement.h 2016-08-22 16:18:09 UTC (rev 204721)
</span><span class="lines">@@ -52,15 +52,16 @@
</span><span class="cx"> PhasorAngle = 1 << 13 // FIXME: phasorangle is not implemented. See http://wkb.ug/127466
</span><span class="cx"> // We do not implement the Radical notation. Authors should instead use the <msqrt> element.
</span><span class="cx"> };
</span><del>- bool hasNotation(MencloseNotationFlag notationFlag) const { return m_notationFlags & notationFlag; }
</del><ins>+ bool hasNotation(MencloseNotationFlag);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> MathMLMencloseElement(const QualifiedName&, Document&);
</span><span class="cx"> RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final;
</span><span class="cx"> void parseAttribute(const QualifiedName&, const AtomicString&) final;
</span><ins>+ void parseNotationAttribute();
</ins><span class="cx"> void clearNotations() { m_notationFlags = 0; }
</span><del>- void addNotation(MencloseNotationFlag notationFlag) { m_notationFlags |= notationFlag; }
- unsigned short m_notationFlags;
</del><ins>+ void addNotation(MencloseNotationFlag notationFlag) { m_notationFlags.value() |= notationFlag; }
+ Optional<uint16_t> m_notationFlags;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>