<!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>[175885] releases/WebKitGTK/webkit-2.6</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/175885">175885</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-11 02:33:43 -0800 (Tue, 11 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/174677">r174677</a> - Changes in the stretchy attribute do not update rendering
https://bugs.webkit.org/show_bug.cgi?id=136883
Reviewed by Darin Adler.
Source/WebCore:
Test: mathml/presentation/mo-stretch-update.html
We need to relayout when a change in the stretchy attribute
happens.
* mathml/MathMLTextElement.cpp:
(WebCore::MathMLTextElement::parseAttribute): Parse the
modifications of the stretchy attribute.
* mathml/MathMLTextElement.h:
* rendering/mathml/RenderMathMLOperator.cpp:
(WebCore::RenderMathMLOperator::setOperatorFlagAndScheduleLayoutIfNeeded):
Add function that receives the value instead of looking for it and
checks if the change should schedule a layout.
(WebCore::RenderMathMLOperator::setOperatorFlagFromAttribute):
(WebCore::RenderMathMLOperator::setOperatorFlagFromAttributeValue):
Add function that receives the value instead of looking for it.
* rendering/mathml/RenderMathMLOperator.h:
LayoutTests:
The test updates the stretchy value in a timeout.
* mathml/presentation/mo-stretch-update-expected.html: Added.
* mathml/presentation/mo-stretch-update.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoremathmlMathMLTextElementcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/mathml/MathMLTextElement.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoremathmlMathMLTextElementh">releases/WebKitGTK/webkit-2.6/Source/WebCore/mathml/MathMLTextElement.h</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorerenderingmathmlRenderMathMLOperatorcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorerenderingmathmlRenderMathMLOperatorh">releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/mathml/RenderMathMLOperator.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog (175884 => 175885)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog 2014-11-11 10:28:06 UTC (rev 175884)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog 2014-11-11 10:33:43 UTC (rev 175885)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-10-14 Alejandro G. Castro <alex@igalia.com>
+
+ Changes in the stretchy attribute do not update rendering
+ https://bugs.webkit.org/show_bug.cgi?id=136883
+
+ Reviewed by Darin Adler.
+
+ The test updates the stretchy value in a timeout.
+
+ * mathml/presentation/mo-stretch-update-expected.html: Added.
+ * mathml/presentation/mo-stretch-update.html: Added.
+
</ins><span class="cx"> 2014-10-12 Mike West <mkwst@chromium.org>
</span><span class="cx">
</span><span class="cx"> Referrer Policy: Update <meta name="referrer"> values to match the spec
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (175884 => 175885)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-11-11 10:28:06 UTC (rev 175884)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-11-11 10:33:43 UTC (rev 175885)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-10-14 Alejandro G. Castro <alex@igalia.com>
+
+ Changes in the stretchy attribute do not update rendering
+ https://bugs.webkit.org/show_bug.cgi?id=136883
+
+ Reviewed by Darin Adler.
+
+ Test: mathml/presentation/mo-stretch-update.html
+
+ We need to relayout when a change in the stretchy attribute
+ happens.
+
+ * mathml/MathMLTextElement.cpp:
+ (WebCore::MathMLTextElement::parseAttribute): Parse the
+ modifications of the stretchy attribute.
+ * mathml/MathMLTextElement.h:
+ * rendering/mathml/RenderMathMLOperator.cpp:
+ (WebCore::RenderMathMLOperator::setOperatorFlagAndScheduleLayoutIfNeeded):
+ Add function that receives the value instead of looking for it and
+ checks if the change should schedule a layout.
+ (WebCore::RenderMathMLOperator::setOperatorFlagFromAttribute):
+ (WebCore::RenderMathMLOperator::setOperatorFlagFromAttributeValue):
+ Add function that receives the value instead of looking for it.
+ * rendering/mathml/RenderMathMLOperator.h:
+
</ins><span class="cx"> 2014-10-12 Mike West <mkwst@chromium.org>
</span><span class="cx">
</span><span class="cx"> Referrer Policy: Update <meta name="referrer"> values to match the spec
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoremathmlMathMLTextElementcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/mathml/MathMLTextElement.cpp (175884 => 175885)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/mathml/MathMLTextElement.cpp 2014-11-11 10:28:06 UTC (rev 175884)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/mathml/MathMLTextElement.cpp 2014-11-11 10:33:43 UTC (rev 175885)
</span><span class="lines">@@ -64,6 +64,17 @@
</span><span class="cx"> toRenderMathMLToken(renderer())->updateTokenContent();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MathMLTextElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
+{
+ if (name == stretchyAttr) {
+ if (renderer() && renderer()->isRenderMathMLOperator())
+ toRenderMathMLOperator(renderer())->setOperatorFlagAndScheduleLayoutIfNeeded(MathMLOperatorDictionary::Stretchy, value);
+ return;
+ }
+
+ MathMLElement::parseAttribute(name, value);
+}
+
</ins><span class="cx"> RenderPtr<RenderElement> MathMLTextElement::createElementRenderer(PassRef<RenderStyle> style)
</span><span class="cx"> {
</span><span class="cx"> if (hasTagName(MathMLNames::moTag))
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoremathmlMathMLTextElementh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/mathml/MathMLTextElement.h (175884 => 175885)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/mathml/MathMLTextElement.h 2014-11-11 10:28:06 UTC (rev 175884)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/mathml/MathMLTextElement.h 2014-11-11 10:33:43 UTC (rev 175885)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class MathMLTextElement : public MathMLElement {
</del><ins>+class MathMLTextElement final : public MathMLElement {
</ins><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<MathMLTextElement> create(const QualifiedName& tagName, Document&);
</span><span class="cx"> virtual void didAttachRenderers() override;
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> virtual bool childShouldCreateRenderer(const Node&) const override;
</span><span class="cx">
</span><span class="cx"> virtual void childrenChanged(const ChildChange&) override;
</span><ins>+ virtual void parseAttribute(const QualifiedName&, const AtomicString&) override;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorerenderingmathmlRenderMathMLOperatorcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp (175884 => 175885)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp 2014-11-11 10:28:06 UTC (rev 175884)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp 2014-11-11 10:33:43 UTC (rev 175885)
</span><span class="lines">@@ -1157,10 +1157,25 @@
</span><span class="cx"> updateTokenContent(operatorString);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderMathMLOperator::setOperatorFlagAndScheduleLayoutIfNeeded(MathMLOperatorDictionary::Flag flag, const AtomicString& attributeValue)
+{
+ unsigned short oldOperatorFlags = m_operatorFlags;
+
+ setOperatorFlagFromAttributeValue(flag, attributeValue);
+
+ if (oldOperatorFlags != m_operatorFlags)
+ setNeedsLayoutAndPrefWidthsRecalc();
+}
+
</ins><span class="cx"> void RenderMathMLOperator::setOperatorFlagFromAttribute(MathMLOperatorDictionary::Flag flag, const QualifiedName& name)
</span><span class="cx"> {
</span><ins>+ setOperatorFlagFromAttributeValue(flag, element().fastGetAttribute(name));
+}
+
+void RenderMathMLOperator::setOperatorFlagFromAttributeValue(MathMLOperatorDictionary::Flag flag, const AtomicString& attributeValue)
+{
</ins><span class="cx"> ASSERT(!isAnonymous());
</span><del>- const AtomicString& attributeValue = element().fastGetAttribute(name);
</del><ins>+
</ins><span class="cx"> if (attributeValue == "true")
</span><span class="cx"> m_operatorFlags |= flag;
</span><span class="cx"> else if (attributeValue == "false")
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorerenderingmathmlRenderMathMLOperatorh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/mathml/RenderMathMLOperator.h (175884 => 175885)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/mathml/RenderMathMLOperator.h 2014-11-11 10:28:06 UTC (rev 175884)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/mathml/RenderMathMLOperator.h 2014-11-11 10:33:43 UTC (rev 175885)
</span><span class="lines">@@ -79,6 +79,7 @@
</span><span class="cx"> void updateTokenContent(const String& operatorString);
</span><span class="cx"> void updateTokenContent() override final;
</span><span class="cx"> void updateOperatorProperties();
</span><ins>+ void setOperatorFlagAndScheduleLayoutIfNeeded(MathMLOperatorDictionary::Flag, const AtomicString& attributeValue);
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> virtual const char* renderName() const override { return isAnonymous() ? "RenderMathMLOperator (anonymous)" : "RenderMathMLOperator"; }
</span><span class="lines">@@ -186,6 +187,7 @@
</span><span class="cx"> LayoutUnit m_maxSize;
</span><span class="cx">
</span><span class="cx"> void setOperatorFlagFromAttribute(MathMLOperatorDictionary::Flag, const QualifiedName&);
</span><ins>+ void setOperatorFlagFromAttributeValue(MathMLOperatorDictionary::Flag, const AtomicString& attributeValue);
</ins><span class="cx"> void setOperatorPropertiesFromOpDictEntry(const MathMLOperatorDictionary::Entry*);
</span><span class="cx"> virtual void SetOperatorProperties();
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>