<!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>[204715] 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/204715">204715</a></dd>
<dt>Author</dt> <dd>fred.wang@free.fr</dd>
<dt>Date</dt> <dd>2016-08-22 08:18:10 -0700 (Mon, 22 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename MathMLTextElement to MathMLTokenElement
https://bugs.webkit.org/show_bug.cgi?id=160542
Patch by Frederic Wang <fwang@igalia.com> on 2016-08-22
Reviewed by Darin Adler.
No new tests, behavior is unchanged.
* CMakeLists.txt: Rename MathMLTextElement to MathMLTokenElement.
* WebCore.xcodeproj/project.pbxproj: Ditto.
* mathml/MathMLAllInOne.cpp: Ditto.
* mathml/MathMLOperatorElement.cpp: Ditto.
* mathml/MathMLOperatorElement.h: Ditto.
* mathml/MathMLTokenElement.cpp: Ditto. Also remove dead code in childShouldCreateRenderer
to handle the case of mspace since that element uses its own class and forbids child creation
in RenderMathMLSpace::isChildAllowed.
* mathml/MathMLTokenElement.h: Rename MathMLTextElement to MathMLTokenElement.
* mathml/mathtags.in: Ditto.
* rendering/mathml/RenderMathMLToken.cpp: Move inclusion of MathMLTokenElement.h and
implementation of element() here.
* rendering/mathml/RenderMathMLToken.h: Do not implement element() in the header so that
we only need need to predeclare MathMLTokenElement instead of including its header.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLAllInOnecpp">trunk/Source/WebCore/mathml/MathMLAllInOne.cpp</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLOperatorElementcpp">trunk/Source/WebCore/mathml/MathMLOperatorElement.cpp</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLOperatorElementh">trunk/Source/WebCore/mathml/MathMLOperatorElement.h</a></li>
<li><a href="#trunkSourceWebCoremathmlmathtagsin">trunk/Source/WebCore/mathml/mathtags.in</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLTokencpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLToken.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLTokenh">trunk/Source/WebCore/rendering/mathml/RenderMathMLToken.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoremathmlMathMLTokenElementcpp">trunk/Source/WebCore/mathml/MathMLTokenElement.cpp</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLTokenElementh">trunk/Source/WebCore/mathml/MathMLTokenElement.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoremathmlMathMLTextElementcpp">trunk/Source/WebCore/mathml/MathMLTextElement.cpp</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLTextElementh">trunk/Source/WebCore/mathml/MathMLTextElement.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (204714 => 204715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-08-22 14:12:10 UTC (rev 204714)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-08-22 15:18:10 UTC (rev 204715)
</span><span class="lines">@@ -2014,7 +2014,7 @@
</span><span class="cx"> mathml/MathMLScriptsElement.cpp
</span><span class="cx"> mathml/MathMLSelectElement.cpp
</span><span class="cx"> mathml/MathMLSpaceElement.cpp
</span><del>- mathml/MathMLTextElement.cpp
</del><ins>+ mathml/MathMLTokenElement.cpp
</ins><span class="cx"> mathml/MathMLUnderOverElement.cpp
</span><span class="cx">
</span><span class="cx"> page/AutoscrollController.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204714 => 204715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-22 14:12:10 UTC (rev 204714)
+++ trunk/Source/WebCore/ChangeLog 2016-08-22 15:18:10 UTC (rev 204715)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-08-22 Frederic Wang <fwang@igalia.com>
+
+ Rename MathMLTextElement to MathMLTokenElement
+ https://bugs.webkit.org/show_bug.cgi?id=160542
+
+ Reviewed by Darin Adler.
+
+ No new tests, behavior is unchanged.
+
+ * CMakeLists.txt: Rename MathMLTextElement to MathMLTokenElement.
+ * WebCore.xcodeproj/project.pbxproj: Ditto.
+ * mathml/MathMLAllInOne.cpp: Ditto.
+ * mathml/MathMLOperatorElement.cpp: Ditto.
+ * mathml/MathMLOperatorElement.h: Ditto.
+ * mathml/MathMLTokenElement.cpp: Ditto. Also remove dead code in childShouldCreateRenderer
+ to handle the case of mspace since that element uses its own class and forbids child creation
+ in RenderMathMLSpace::isChildAllowed.
+ * mathml/MathMLTokenElement.h: Rename MathMLTextElement to MathMLTokenElement.
+ * mathml/mathtags.in: Ditto.
+ * rendering/mathml/RenderMathMLToken.cpp: Move inclusion of MathMLTokenElement.h and
+ implementation of element() here.
+ * rendering/mathml/RenderMathMLToken.h: Do not implement element() in the header so that
+ we only need need to predeclare MathMLTokenElement instead of including its header.
+
</ins><span class="cx"> 2016-08-21 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Use Document& instead of Document* when getting cookies
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (204714 => 204715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-08-22 14:12:10 UTC (rev 204714)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-08-22 15:18:10 UTC (rev 204715)
</span><span class="lines">@@ -6709,10 +6709,10 @@
</span><span class="cx"> F98FFF4411A2676200F548E8 /* CSSOMUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F98FFF4211A2676200F548E8 /* CSSOMUtils.cpp */; };
</span><span class="cx"> F98FFF4511A2676200F548E8 /* CSSOMUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = F98FFF4311A2676200F548E8 /* CSSOMUtils.h */; };
</span><span class="cx"> F9F0ED7A0DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = F9F0ED770DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.h */; };
</span><del>- FA654A6B1108ABED002615E0 /* MathMLTextElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA654A691108ABED002615E0 /* MathMLTextElement.cpp */; };
</del><ins>+ FA654A6B1108ABED002615E0 /* MathMLTokenElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA654A691108ABED002615E0 /* MathMLTokenElement.cpp */; };
</ins><span class="cx"> FA654A6B1108ABED002616F1 /* MathMLOperatorElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA654A691108ABED002616F1 /* MathMLOperatorElement.cpp */; };
</span><span class="cx"> FA654A6B1108ABED002626F1 /* MathMLUnderOverElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA654A691108ABED002626F1 /* MathMLUnderOverElement.cpp */; };
</span><del>- FA654A6C1108ABED002615E0 /* MathMLTextElement.h in Headers */ = {isa = PBXBuildFile; fileRef = FA654A6A1108ABED002615E0 /* MathMLTextElement.h */; };
</del><ins>+ FA654A6C1108ABED002615E0 /* MathMLTokenElement.h in Headers */ = {isa = PBXBuildFile; fileRef = FA654A6A1108ABED002615E0 /* MathMLTokenElement.h */; };
</ins><span class="cx"> FA654A6C1108ABED002616F1 /* MathMLOperatorElement.h in Headers */ = {isa = PBXBuildFile; fileRef = FA654A6A1108ABED002616F1 /* MathMLOperatorElement.h */; };
</span><span class="cx"> FA654A6C1108ABED002626F1 /* MathMLUnderOverElement.h in Headers */ = {isa = PBXBuildFile; fileRef = FA654A6A1108ABED002626F1 /* MathMLUnderOverElement.h */; };
</span><span class="cx"> FABE72F41059C1EB00D888CC /* MathMLAnnotationElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FABE72ED1059C1EB00D888CC /* MathMLAnnotationElement.cpp */; };
</span><span class="lines">@@ -14687,10 +14687,10 @@
</span><span class="cx"> F9F0ED780DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = XMLHttpRequestProgressEvent.idl; sourceTree = "<group>"; };
</span><span class="cx"> FA654A631108ABB7002615E0 /* mathml.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = mathml.css; sourceTree = "<group>"; };
</span><span class="cx"> FA654A671108ABE2002615E0 /* mathattrs.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mathattrs.in; sourceTree = "<group>"; };
</span><del>- FA654A691108ABED002615E0 /* MathMLTextElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MathMLTextElement.cpp; sourceTree = "<group>"; };
</del><ins>+ FA654A691108ABED002615E0 /* MathMLTokenElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MathMLTokenElement.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> FA654A691108ABED002616F1 /* MathMLOperatorElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MathMLOperatorElement.cpp; sourceTree = "<group>"; };
</span><span class="cx"> FA654A691108ABED002626F1 /* MathMLUnderOverElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MathMLUnderOverElement.cpp; sourceTree = "<group>"; };
</span><del>- FA654A6A1108ABED002615E0 /* MathMLTextElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MathMLTextElement.h; sourceTree = "<group>"; };
</del><ins>+ FA654A6A1108ABED002615E0 /* MathMLTokenElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MathMLTokenElement.h; sourceTree = "<group>"; };
</ins><span class="cx"> FA654A6A1108ABED002616F1 /* MathMLOperatorElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MathMLOperatorElement.h; sourceTree = "<group>"; };
</span><span class="cx"> FA654A6A1108ABED002626F1 /* MathMLUnderOverElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MathMLUnderOverElement.h; sourceTree = "<group>"; };
</span><span class="cx"> FA6E466FCD0418A9966A5B60 /* DNSResolveQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DNSResolveQueue.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -24372,8 +24372,8 @@
</span><span class="cx"> 59780849D41E6F65D81198BC /* MathMLSelectElement.h */,
</span><span class="cx"> 4FA65A691108ABED002615E0 /* MathMLSpaceElement.cpp */,
</span><span class="cx"> 4FA65A6A1108ABED002615E0 /* MathMLSpaceElement.h */,
</span><del>- FA654A691108ABED002615E0 /* MathMLTextElement.cpp */,
- FA654A6A1108ABED002615E0 /* MathMLTextElement.h */,
</del><ins>+ FA654A691108ABED002615E0 /* MathMLTokenElement.cpp */,
+ FA654A6A1108ABED002615E0 /* MathMLTokenElement.h */,
</ins><span class="cx"> FA654A691108ABED002626F1 /* MathMLUnderOverElement.cpp */,
</span><span class="cx"> FA654A6A1108ABED002626F1 /* MathMLUnderOverElement.h */,
</span><span class="cx"> FABE72F31059C1EB00D999DD /* mathtags.in */,
</span><span class="lines">@@ -26807,7 +26807,7 @@
</span><span class="cx"> FA654A6C1108ABED002616F1 /* MathMLOperatorElement.h in Headers */,
</span><span class="cx"> 4FA65A6C1108ABED002615E0 /* MathMLSpaceElement.h in Headers */,
</span><span class="cx"> 439176E012DA25E17BAF80A2 /* MathMLStyle.h in Headers */,
</span><del>- FA654A6C1108ABED002615E0 /* MathMLTextElement.h in Headers */,
</del><ins>+ FA654A6C1108ABED002615E0 /* MathMLTokenElement.h in Headers */,
</ins><span class="cx"> FA654A6C1108ABED002626F1 /* MathMLUnderOverElement.h in Headers */,
</span><span class="cx"> 439046EA12DA25E812AF80AC /* MathOperator.h in Headers */,
</span><span class="cx"> 49D5DC2C0F423A73008F20FD /* Matrix3DTransformOperation.h in Headers */,
</span><span class="lines">@@ -30620,7 +30620,7 @@
</span><span class="cx"> FED48390CED66C3255F72C59 /* MathMLSelectElement.cpp in Sources */,
</span><span class="cx"> 4FA65A6B1108ABED002615E0 /* MathMLSpaceElement.cpp in Sources */,
</span><span class="cx"> 439176DF12DA25E17BAF80A2 /* MathMLStyle.cpp in Sources */,
</span><del>- FA654A6B1108ABED002615E0 /* MathMLTextElement.cpp in Sources */,
</del><ins>+ FA654A6B1108ABED002615E0 /* MathMLTokenElement.cpp in Sources */,
</ins><span class="cx"> FA654A6B1108ABED002626F1 /* MathMLUnderOverElement.cpp in Sources */,
</span><span class="cx"> 439046E912DA25E812AF80AC /* MathOperator.cpp in Sources */,
</span><span class="cx"> 49D5DC2B0F423A73008F20FD /* Matrix3DTransformOperation.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLAllInOne.cpp (204714 => 204715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLAllInOne.cpp 2016-08-22 14:12:10 UTC (rev 204714)
+++ trunk/Source/WebCore/mathml/MathMLAllInOne.cpp 2016-08-22 15:18:10 UTC (rev 204715)
</span><span class="lines">@@ -36,6 +36,6 @@
</span><span class="cx"> #include "MathMLPaddedElement.cpp"
</span><span class="cx"> #include "MathMLScriptsElement.cpp"
</span><span class="cx"> #include "MathMLSelectElement.cpp"
</span><del>-#include "MathMLTextElement.cpp"
</del><ins>+#include "MathMLTokenElement.cpp"
</ins><span class="cx"> #include "MathMLUnderOverElement.cpp"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLOperatorElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLOperatorElement.cpp (204714 => 204715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLOperatorElement.cpp 2016-08-22 14:12:10 UTC (rev 204714)
+++ trunk/Source/WebCore/mathml/MathMLOperatorElement.cpp 2016-08-22 15:18:10 UTC (rev 204715)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> using namespace MathMLOperatorDictionary;
</span><span class="cx">
</span><span class="cx"> MathMLOperatorElement::MathMLOperatorElement(const QualifiedName& tagName, Document& document)
</span><del>- : MathMLTextElement(tagName, document)
</del><ins>+ : MathMLTokenElement(tagName, document)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -219,7 +219,7 @@
</span><span class="cx"> m_operatorChar = Nullopt;
</span><span class="cx"> m_dictionaryProperty = Nullopt;
</span><span class="cx"> m_properties.dirtyFlags = MathMLOperatorDictionary::allFlags;
</span><del>- MathMLTextElement::childrenChanged(change);
</del><ins>+ MathMLTokenElement::childrenChanged(change);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Optional<MathMLOperatorDictionary::Flag> attributeNameToPropertyFlag(const QualifiedName& name)
</span><span class="lines">@@ -262,7 +262,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- MathMLTextElement::parseAttribute(name, value);
</del><ins>+ MathMLTokenElement::parseAttribute(name, value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderPtr<RenderElement> MathMLOperatorElement::createElementRenderer(RenderStyle&& style, const RenderTreePosition&)
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLOperatorElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLOperatorElement.h (204714 => 204715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLOperatorElement.h 2016-08-22 14:12:10 UTC (rev 204714)
+++ trunk/Source/WebCore/mathml/MathMLOperatorElement.h 2016-08-22 15:18:10 UTC (rev 204715)
</span><span class="lines">@@ -27,11 +27,11 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MATHML)
</span><span class="cx"> #include "MathMLOperatorDictionary.h"
</span><del>-#include "MathMLTextElement.h"
</del><ins>+#include "MathMLTokenElement.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class MathMLOperatorElement final : public MathMLTextElement {
</del><ins>+class MathMLOperatorElement final : public MathMLTokenElement {
</ins><span class="cx"> public:
</span><span class="cx"> static Ref<MathMLOperatorElement> create(const QualifiedName& tagName, Document&);
</span><span class="cx"> struct OperatorChar {
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLTextElementcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/mathml/MathMLTextElement.cpp (204714 => 204715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLTextElement.cpp 2016-08-22 14:12:10 UTC (rev 204714)
+++ trunk/Source/WebCore/mathml/MathMLTextElement.cpp 2016-08-22 15:18:10 UTC (rev 204715)
</span><span class="lines">@@ -1,94 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009 Alex Milowski (alex@milowski.com). All rights reserved.
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if ENABLE(MATHML)
-
-#include "MathMLTextElement.h"
-
-#include "MathMLNames.h"
-#include "RenderMathMLToken.h"
-
-namespace WebCore {
-
-using namespace MathMLNames;
-
-MathMLTextElement::MathMLTextElement(const QualifiedName& tagName, Document& document)
- : MathMLElement(tagName, document)
-{
- setHasCustomStyleResolveCallbacks();
-}
-
-Ref<MathMLTextElement> MathMLTextElement::create(const QualifiedName& tagName, Document& document)
-{
- return adoptRef(*new MathMLTextElement(tagName, document));
-}
-
-void MathMLTextElement::didAttachRenderers()
-{
- MathMLElement::didAttachRenderers();
- if (is<RenderMathMLToken>(renderer()))
- downcast<RenderMathMLToken>(*renderer()).updateTokenContent();
-}
-
-void MathMLTextElement::childrenChanged(const ChildChange& change)
-{
- MathMLElement::childrenChanged(change);
- if (is<RenderMathMLToken>(renderer()))
- downcast<RenderMathMLToken>(*renderer()).updateTokenContent();
-}
-
-void MathMLTextElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
-{
- if (name == mathvariantAttr) {
- m_mathVariant = Nullopt;
- if (renderer())
- MathMLStyle::resolveMathMLStyleTree(renderer());
- }
-
- MathMLElement::parseAttribute(name, value);
-}
-
-RenderPtr<RenderElement> MathMLTextElement::createElementRenderer(RenderStyle&& style, const RenderTreePosition&)
-{
- ASSERT(hasTagName(MathMLNames::miTag) || hasTagName(MathMLNames::mnTag) || hasTagName(MathMLNames::msTag) || hasTagName(MathMLNames::mtextTag));
-
- return createRenderer<RenderMathMLToken>(*this, WTFMove(style));
-}
-
-bool MathMLTextElement::childShouldCreateRenderer(const Node& child) const
-{
- if (hasTagName(MathMLNames::mspaceTag))
- return false;
-
- // The HTML specification defines <mi>, <mo>, <mn>, <ms> and <mtext> as insertion points.
- return isPhrasingContent(child) && StyledElement::childShouldCreateRenderer(child);
-}
-
-}
-
-#endif // ENABLE(MATHML)
</del></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLTextElementh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/mathml/MathMLTextElement.h (204714 => 204715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLTextElement.h 2016-08-22 14:12:10 UTC (rev 204714)
+++ trunk/Source/WebCore/mathml/MathMLTextElement.h 2016-08-22 15:18:10 UTC (rev 204715)
</span><span class="lines">@@ -1,57 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009 Alex Milowski (alex@milowski.com). All rights reserved.
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- * Copyright (C) 2016 Igalia S.L.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#if ENABLE(MATHML)
-#include "MathMLElement.h"
-
-namespace WebCore {
-
-class MathMLTextElement : public MathMLElement {
-public:
- static Ref<MathMLTextElement> create(const QualifiedName& tagName, Document&);
- bool acceptsMathVariantAttribute() final { return true; }
-
-protected:
- MathMLTextElement(const QualifiedName& tagName, Document&);
- void childrenChanged(const ChildChange&) override;
- void parseAttribute(const QualifiedName&, const AtomicString&) override;
-
-private:
- RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override;
- bool childShouldCreateRenderer(const Node&) const final;
-
- void didAttachRenderers() final;
-
- bool isMathMLToken() const final { return true; }
- bool isPresentationMathML() const final { return true; }
-};
-
-}
-
-#endif // ENABLE(MATHML)
</del></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLTokenElementcppfromrev204714trunkSourceWebCoremathmlMathMLTextElementcpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/mathml/MathMLTokenElement.cpp (from rev 204714, trunk/Source/WebCore/mathml/MathMLTextElement.cpp) (0 => 204715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLTokenElement.cpp (rev 0)
+++ trunk/Source/WebCore/mathml/MathMLTokenElement.cpp 2016-08-22 15:18:10 UTC (rev 204715)
</span><span class="lines">@@ -0,0 +1,93 @@
</span><ins>+/*
+ * Copyright (C) 2009 Alex Milowski (alex@milowski.com). All rights reserved.
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2016 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#if ENABLE(MATHML)
+#include "MathMLTokenElement.h"
+
+#include "MathMLNames.h"
+#include "RenderMathMLToken.h"
+
+namespace WebCore {
+
+using namespace MathMLNames;
+
+MathMLTokenElement::MathMLTokenElement(const QualifiedName& tagName, Document& document)
+ : MathMLElement(tagName, document)
+{
+ setHasCustomStyleResolveCallbacks();
+}
+
+Ref<MathMLTokenElement> MathMLTokenElement::create(const QualifiedName& tagName, Document& document)
+{
+ return adoptRef(*new MathMLTokenElement(tagName, document));
+}
+
+void MathMLTokenElement::didAttachRenderers()
+{
+ MathMLElement::didAttachRenderers();
+ auto* mathmlRenderer = renderer();
+ if (is<RenderMathMLToken>(mathmlRenderer))
+ downcast<RenderMathMLToken>(*mathmlRenderer).updateTokenContent();
+}
+
+void MathMLTokenElement::childrenChanged(const ChildChange& change)
+{
+ MathMLElement::childrenChanged(change);
+ auto* mathmlRenderer = renderer();
+ if (is<RenderMathMLToken>(mathmlRenderer))
+ downcast<RenderMathMLToken>(*mathmlRenderer).updateTokenContent();
+}
+
+void MathMLTokenElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
+{
+ if (name == mathvariantAttr) {
+ m_mathVariant = Nullopt;
+ if (renderer())
+ MathMLStyle::resolveMathMLStyleTree(renderer());
+ }
+
+ MathMLElement::parseAttribute(name, value);
+}
+
+RenderPtr<RenderElement> MathMLTokenElement::createElementRenderer(RenderStyle&& style, const RenderTreePosition&)
+{
+ ASSERT(hasTagName(MathMLNames::miTag) || hasTagName(MathMLNames::mnTag) || hasTagName(MathMLNames::msTag) || hasTagName(MathMLNames::mtextTag));
+
+ return createRenderer<RenderMathMLToken>(*this, WTFMove(style));
+}
+
+bool MathMLTokenElement::childShouldCreateRenderer(const Node& child) const
+{
+ // The HTML specification defines <mi>, <mo>, <mn>, <ms> and <mtext> as insertion points.
+ return isPhrasingContent(child) && StyledElement::childShouldCreateRenderer(child);
+}
+
+}
+
+#endif // ENABLE(MATHML)
</ins></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLTokenElementcpp"></a>
<div class="propset"><h4>Property changes: trunk/Source/WebCore/mathml/MathMLTokenElement.cpp</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<ins>+LF
</ins><span class="cx">\ No newline at end of property
</span><a id="trunkSourceWebCoremathmlMathMLTokenElementhfromrev204714trunkSourceWebCoremathmlMathMLTextElementh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/mathml/MathMLTokenElement.h (from rev 204714, trunk/Source/WebCore/mathml/MathMLTextElement.h) (0 => 204715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLTokenElement.h (rev 0)
+++ trunk/Source/WebCore/mathml/MathMLTokenElement.h 2016-08-22 15:18:10 UTC (rev 204715)
</span><span class="lines">@@ -0,0 +1,58 @@
</span><ins>+/*
+ * Copyright (C) 2009 Alex Milowski (alex@milowski.com). All rights reserved.
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2016 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#if ENABLE(MATHML)
+
+#include "MathMLElement.h"
+
+namespace WebCore {
+
+class MathMLTokenElement : public MathMLElement {
+public:
+ static Ref<MathMLTokenElement> create(const QualifiedName& tagName, Document&);
+
+protected:
+ MathMLTokenElement(const QualifiedName& tagName, Document&);
+ void childrenChanged(const ChildChange&) override;
+ void parseAttribute(const QualifiedName&, const AtomicString&) override;
+
+private:
+ RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override;
+ bool childShouldCreateRenderer(const Node&) const final;
+
+ void didAttachRenderers() final;
+
+ bool isMathMLToken() const final { return true; }
+ bool isPresentationMathML() const final { return true; }
+ bool acceptsMathVariantAttribute() final { return true; }
+};
+
+}
+
+#endif // ENABLE(MATHML)
</ins></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLTokenElementh"></a>
<div class="propset"><h4>Property changes: trunk/Source/WebCore/mathml/MathMLTokenElement.h</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<ins>+LF
</ins><span class="cx">\ No newline at end of property
</span><a id="trunkSourceWebCoremathmlmathtagsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/mathtags.in (204714 => 204715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/mathtags.in 2016-08-22 14:12:10 UTC (rev 204714)
+++ trunk/Source/WebCore/mathml/mathtags.in 2016-08-22 15:18:10 UTC (rev 204715)
</span><span class="lines">@@ -20,11 +20,11 @@
</span><span class="cx"> munderover interfaceName=MathMLUnderOverElement
</span><span class="cx"> msqrt interfaceName=MathMLInlineContainerElement
</span><span class="cx"> mroot interfaceName=MathMLInlineContainerElement
</span><del>-mi interfaceName=MathMLTextElement
-mn interfaceName=MathMLTextElement
</del><ins>+mi interfaceName=MathMLTokenElement
+mn interfaceName=MathMLTokenElement
</ins><span class="cx"> mo interfaceName=MathMLOperatorElement
</span><del>-mtext interfaceName=MathMLTextElement
-ms interfaceName=MathMLTextElement
</del><ins>+mtext interfaceName=MathMLTokenElement
+ms interfaceName=MathMLTokenElement
</ins><span class="cx"> mspace interfaceName=MathMLSpaceElement
</span><span class="cx"> msub interfaceName=MathMLScriptsElement
</span><span class="cx"> msup interfaceName=MathMLScriptsElement
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLTokencpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLToken.cpp (204714 => 204715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLToken.cpp 2016-08-22 14:12:10 UTC (rev 204714)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLToken.cpp 2016-08-22 15:18:10 UTC (rev 204715)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx">
</span><span class="cx"> #include "MathMLElement.h"
</span><span class="cx"> #include "MathMLNames.h"
</span><ins>+#include "MathMLTokenElement.h"
</ins><span class="cx"> #include "PaintInfo.h"
</span><span class="cx"> #include "RenderElement.h"
</span><span class="cx"> #include "RenderIterator.h"
</span><span class="lines">@@ -53,6 +54,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+MathMLTokenElement& RenderMathMLToken::element()
+{
+ return static_cast<MathMLTokenElement&>(nodeForNonAnonymous());
+}
+
</ins><span class="cx"> void RenderMathMLToken::updateTokenContent()
</span><span class="cx"> {
</span><span class="cx"> RenderMathMLBlock::updateFromElement();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLTokenh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLToken.h (204714 => 204715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLToken.h 2016-08-22 14:12:10 UTC (rev 204714)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLToken.h 2016-08-22 15:18:10 UTC (rev 204715)
</span><span class="lines">@@ -28,17 +28,18 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MATHML)
</span><span class="cx">
</span><del>-#include "MathMLTextElement.h"
</del><span class="cx"> #include "RenderMathMLBlock.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class MathMLTokenElement;
+
</ins><span class="cx"> class RenderMathMLToken : public RenderMathMLBlock {
</span><span class="cx"> public:
</span><span class="cx"> RenderMathMLToken(Element&, RenderStyle&&);
</span><span class="cx"> RenderMathMLToken(Document&, RenderStyle&&);
</span><span class="cx">
</span><del>- MathMLTextElement& element() { return static_cast<MathMLTextElement&>(nodeForNonAnonymous()); }
</del><ins>+ MathMLTokenElement& element();
</ins><span class="cx">
</span><span class="cx"> virtual void updateTokenContent();
</span><span class="cx"> void updateFromElement() override;
</span></span></pre>
</div>
</div>
</body>
</html>