<!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>[203688] 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/203688">203688</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-25 10:13:04 -0700 (Mon, 25 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce a MathMLOperatorElement class
https://bugs.webkit.org/show_bug.cgi?id=160034
Patch by Frederic Wang <fwang@igalia.com> on 2016-07-25
Reviewed by Darin Adler.
No new tests, rendering is unchaned.
* CMakeLists.txt: Add MathMLOperatorElement to the build file.
* WebCore.xcodeproj/project.pbxproj: Ditto.
* mathml/MathMLAllInOne.cpp: Ditto.
* mathml/MathMLOperatorElement.cpp: New DOM class for <mo> element.
(WebCore::MathMLOperatorElement::MathMLOperatorElement):
(WebCore::MathMLOperatorElement::create):
(WebCore::MathMLOperatorElement::parseAttribute): Handle mo attributes.
(WebCore::MathMLOperatorElement::createElementRenderer): Create RenderMathMLOperator.
* mathml/MathMLOperatorElement.h: Declare a class deriving from MathMLTextElement.
* mathml/MathMLTextElement.cpp: Remove all the RenderMathMLOperator parts.
(WebCore::MathMLTextElement::MathMLTextElement): Remove inline keyword so that the class can
be overriden.
(WebCore::MathMLTextElement::parseAttribute): Remove code handled in MathMLOperatorElement.
(WebCore::MathMLTextElement::createElementRenderer): Ditto.
* mathml/MathMLTextElement.h: Make class and members overridable.
* mathml/mathtags.in: Map mo to MathMLOperatorElement.
* rendering/mathml/RenderMathMLOperator.cpp:
(WebCore::RenderMathMLOperator::RenderMathMLOperator): Make the constructor take a
MathMLOperatorElement.
* rendering/mathml/RenderMathMLOperator.h: Ditto.</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="#trunkSourceWebCoremathmlMathMLTextElementcpp">trunk/Source/WebCore/mathml/MathMLTextElement.cpp</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLTextElementh">trunk/Source/WebCore/mathml/MathMLTextElement.h</a></li>
<li><a href="#trunkSourceWebCoremathmlmathtagsin">trunk/Source/WebCore/mathml/mathtags.in</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLOperatorcpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLOperatorh">trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoremathmlMathMLOperatorElementcpp">trunk/Source/WebCore/mathml/MathMLOperatorElement.cpp</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLOperatorElementh">trunk/Source/WebCore/mathml/MathMLOperatorElement.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 (203687 => 203688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-07-25 16:57:28 UTC (rev 203687)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-07-25 17:13:04 UTC (rev 203688)
</span><span class="lines">@@ -1989,6 +1989,7 @@
</span><span class="cx"> mathml/MathMLMathElement.cpp
</span><span class="cx"> mathml/MathMLMencloseElement.cpp
</span><span class="cx"> mathml/MathMLOperatorDictionary.cpp
</span><ins>+ mathml/MathMLOperatorElement.cpp
</ins><span class="cx"> mathml/MathMLPaddedElement.cpp
</span><span class="cx"> mathml/MathMLScriptsElement.cpp
</span><span class="cx"> mathml/MathMLSelectElement.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203687 => 203688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-25 16:57:28 UTC (rev 203687)
+++ trunk/Source/WebCore/ChangeLog 2016-07-25 17:13:04 UTC (rev 203688)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2016-07-25 Frederic Wang <fwang@igalia.com>
+
+ Introduce a MathMLOperatorElement class
+ https://bugs.webkit.org/show_bug.cgi?id=160034
+
+ Reviewed by Darin Adler.
+
+ No new tests, rendering is unchaned.
+
+ * CMakeLists.txt: Add MathMLOperatorElement to the build file.
+ * WebCore.xcodeproj/project.pbxproj: Ditto.
+ * mathml/MathMLAllInOne.cpp: Ditto.
+ * mathml/MathMLOperatorElement.cpp: New DOM class for <mo> element.
+ (WebCore::MathMLOperatorElement::MathMLOperatorElement):
+ (WebCore::MathMLOperatorElement::create):
+ (WebCore::MathMLOperatorElement::parseAttribute): Handle mo attributes.
+ (WebCore::MathMLOperatorElement::createElementRenderer): Create RenderMathMLOperator.
+ * mathml/MathMLOperatorElement.h: Declare a class deriving from MathMLTextElement.
+ * mathml/MathMLTextElement.cpp: Remove all the RenderMathMLOperator parts.
+ (WebCore::MathMLTextElement::MathMLTextElement): Remove inline keyword so that the class can
+ be overriden.
+ (WebCore::MathMLTextElement::parseAttribute): Remove code handled in MathMLOperatorElement.
+ (WebCore::MathMLTextElement::createElementRenderer): Ditto.
+ * mathml/MathMLTextElement.h: Make class and members overridable.
+ * mathml/mathtags.in: Map mo to MathMLOperatorElement.
+ * rendering/mathml/RenderMathMLOperator.cpp:
+ (WebCore::RenderMathMLOperator::RenderMathMLOperator): Make the constructor take a
+ MathMLOperatorElement.
+ * rendering/mathml/RenderMathMLOperator.h: Ditto.
+
</ins><span class="cx"> 2016-07-25 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Speed up make process slightly by improving "list of files" idiom
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (203687 => 203688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-07-25 16:57:28 UTC (rev 203687)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-07-25 17:13:04 UTC (rev 203688)
</span><span class="lines">@@ -6905,6 +6905,8 @@
</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><ins>+ FA654A6B1108ABED002616F1 /* MathMLOperatorElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA654A691108ABED002616F1 /* MathMLOperatorElement.cpp */; };
+ FA654A6C1108ABED002616F1 /* MathMLOperatorElement.h in Headers */ = {isa = PBXBuildFile; fileRef = FA654A6A1108ABED002616F1 /* MathMLOperatorElement.h */; };
</ins><span class="cx"> FA654A6B1108ABED002615E0 /* MathMLTextElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA654A691108ABED002615E0 /* MathMLTextElement.cpp */; };
</span><span class="cx"> FA654A6C1108ABED002615E0 /* MathMLTextElement.h in Headers */ = {isa = PBXBuildFile; fileRef = FA654A6A1108ABED002615E0 /* MathMLTextElement.h */; };
</span><span class="cx"> FA654A6B1108ABED002626F1 /* MathMLUnderOverElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA654A691108ABED002626F1 /* MathMLUnderOverElement.cpp */; };
</span><span class="lines">@@ -15085,6 +15087,8 @@
</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><ins>+ FA654A691108ABED002616F1 /* MathMLOperatorElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MathMLOperatorElement.cpp; sourceTree = "<group>"; };
+ FA654A6A1108ABED002616F1 /* MathMLOperatorElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MathMLOperatorElement.h; sourceTree = "<group>"; };
</ins><span class="cx"> FA654A691108ABED002615E0 /* MathMLTextElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MathMLTextElement.cpp; sourceTree = "<group>"; };
</span><span class="cx"> FA654A6A1108ABED002615E0 /* MathMLTextElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MathMLTextElement.h; sourceTree = "<group>"; };
</span><span class="cx"> FA654A691108ABED002626F1 /* MathMLUnderOverElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MathMLUnderOverElement.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -24910,6 +24914,8 @@
</span><span class="cx"> 59780849D41E6F65D81198BC /* MathMLSelectElement.h */,
</span><span class="cx"> 4FA65A691108ABED002615E0 /* MathMLSpaceElement.cpp */,
</span><span class="cx"> 4FA65A6A1108ABED002615E0 /* MathMLSpaceElement.h */,
</span><ins>+ FA654A691108ABED002616F1 /* MathMLOperatorElement.cpp */,
+ FA654A6A1108ABED002616F1 /* MathMLOperatorElement.h */,
</ins><span class="cx"> FA654A691108ABED002615E0 /* MathMLTextElement.cpp */,
</span><span class="cx"> FA654A6A1108ABED002615E0 /* MathMLTextElement.h */,
</span><span class="cx"> FA654A691108ABED002626F1 /* MathMLUnderOverElement.cpp */,
</span><span class="lines">@@ -27451,6 +27457,7 @@
</span><span class="cx"> 44A28AAF12DFB8BF00AE923B /* MathMLNames.h in Headers */,
</span><span class="cx"> 439176E012DA25E17BAF80A2 /* MathMLStyle.h in Headers */,
</span><span class="cx"> 4FA65A6C1108ABED002615E0 /* MathMLSpaceElement.h in Headers */,
</span><ins>+ FA654A6C1108ABED002616F1 /* MathMLOperatorElement.h in Headers */,
</ins><span class="cx"> FA654A6C1108ABED002615E0 /* MathMLTextElement.h in Headers */,
</span><span class="cx"> FA654A6C1108ABED002626F1 /* MathMLUnderOverElement.h in Headers */,
</span><span class="cx"> 439046EA12DA25E812AF80AC /* MathOperator.h in Headers */,
</span><span class="lines">@@ -31284,6 +31291,7 @@
</span><span class="cx"> B59CA390CED66C3255F72C59 /* MathMLPaddedElement.cpp in Sources */,
</span><span class="cx"> FED48390CED66C3255F72C59 /* MathMLSelectElement.cpp in Sources */,
</span><span class="cx"> 4FA65A6B1108ABED002615E0 /* MathMLSpaceElement.cpp in Sources */,
</span><ins>+ FA654A6B1108ABED002616F1 /* MathMLOperatorElement.cpp in Sources */,
</ins><span class="cx"> FA654A6B1108ABED002615E0 /* MathMLTextElement.cpp in Sources */,
</span><span class="cx"> FA654A6B1108ABED002626F1 /* MathMLUnderOverElement.cpp in Sources */,
</span><span class="cx"> 439046E912DA25E812AF80AC /* MathOperator.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLAllInOne.cpp (203687 => 203688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLAllInOne.cpp 2016-07-25 16:57:28 UTC (rev 203687)
+++ trunk/Source/WebCore/mathml/MathMLAllInOne.cpp 2016-07-25 17:13:04 UTC (rev 203688)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "MathMLMathElement.cpp"
</span><span class="cx"> #include "MathMLMencloseElement.cpp"
</span><span class="cx"> #include "MathMLOperatorDictionary.cpp"
</span><ins>+#include "MathMLOperatorElement.cpp"
</ins><span class="cx"> #include "MathMLPaddedElement.cpp"
</span><span class="cx"> #include "MathMLScriptsElement.cpp"
</span><span class="cx"> #include "MathMLSelectElement.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLOperatorElementcppfromrev203687trunkSourceWebCoremathmlMathMLTextElementh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/mathml/MathMLOperatorElement.cpp (from rev 203687, trunk/Source/WebCore/mathml/MathMLTextElement.h) (0 => 203688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLOperatorElement.cpp (rev 0)
+++ trunk/Source/WebCore/mathml/MathMLOperatorElement.cpp 2016-07-25 17:13:04 UTC (rev 203688)
</span><span class="lines">@@ -0,0 +1,66 @@
</span><ins>+/*
+ * Copyright (C) 2016 Igalia S.L. 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 "MathMLOperatorElement.h"
+
+#include "RenderMathMLOperator.h"
+
+namespace WebCore {
+
+using namespace MathMLNames;
+
+MathMLOperatorElement::MathMLOperatorElement(const QualifiedName& tagName, Document& document)
+ : MathMLTextElement(tagName, document)
+{
+}
+
+Ref<MathMLOperatorElement> MathMLOperatorElement::create(const QualifiedName& tagName, Document& document)
+{
+ return adoptRef(*new MathMLOperatorElement(tagName, document));
+}
+
+void MathMLOperatorElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
+{
+ if ((name == stretchyAttr || name == lspaceAttr || name == rspaceAttr || name == movablelimitsAttr) && renderer()) {
+ downcast<RenderMathMLOperator>(*renderer()).updateFromElement();
+ return;
+ }
+
+ MathMLTextElement::parseAttribute(name, value);
+}
+
+RenderPtr<RenderElement> MathMLOperatorElement::createElementRenderer(RenderStyle&& style, const RenderTreePosition&)
+{
+ ASSERT(hasTagName(MathMLNames::moTag));
+ return createRenderer<RenderMathMLOperator>(*this, WTFMove(style));
+}
+
+}
+
+#endif // ENABLE(MATHML)
</ins></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLOperatorElementhfromrev203687trunkSourceWebCoremathmlMathMLTextElementh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/mathml/MathMLOperatorElement.h (from rev 203687, trunk/Source/WebCore/mathml/MathMLTextElement.h) (0 => 203688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLOperatorElement.h (rev 0)
+++ trunk/Source/WebCore/mathml/MathMLOperatorElement.h 2016-07-25 17:13:04 UTC (rev 203688)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+/*
+ * Copyright (C) 2016 Igalia S.L. 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.
+ */
+
+#pragma once
+
+#if ENABLE(MATHML)
+#include "MathMLTextElement.h"
+
+namespace WebCore {
+
+class MathMLOperatorElement final : public MathMLTextElement {
+public:
+ static Ref<MathMLOperatorElement> create(const QualifiedName& tagName, Document&);
+private:
+ MathMLOperatorElement(const QualifiedName& tagName, Document&);
+ RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final;
+ void parseAttribute(const QualifiedName&, const AtomicString&) final;
+};
+
+}
+
+#endif // ENABLE(MATHML)
</ins></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLTextElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLTextElement.cpp (203687 => 203688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLTextElement.cpp 2016-07-25 16:57:28 UTC (rev 203687)
+++ trunk/Source/WebCore/mathml/MathMLTextElement.cpp 2016-07-25 17:13:04 UTC (rev 203688)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #include "MathMLTextElement.h"
</span><span class="cx">
</span><span class="cx"> #include "MathMLNames.h"
</span><del>-#include "RenderMathMLOperator.h"
</del><span class="cx"> #include "RenderMathMLToken.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -38,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> using namespace MathMLNames;
</span><span class="cx">
</span><del>-inline MathMLTextElement::MathMLTextElement(const QualifiedName& tagName, Document& document)
</del><ins>+MathMLTextElement::MathMLTextElement(const QualifiedName& tagName, Document& document)
</ins><span class="cx"> : MathMLElement(tagName, document)
</span><span class="cx"> {
</span><span class="cx"> setHasCustomStyleResolveCallbacks();
</span><span class="lines">@@ -65,12 +64,6 @@
</span><span class="cx">
</span><span class="cx"> void MathMLTextElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
</span><span class="cx"> {
</span><del>- if (name == stretchyAttr || name == lspaceAttr || name == rspaceAttr || name == movablelimitsAttr) {
- if (is<RenderMathMLOperator>(renderer()))
- downcast<RenderMathMLOperator>(*renderer()).updateFromElement();
- return;
- }
-
</del><span class="cx"> if (name == mathvariantAttr) {
</span><span class="cx"> m_mathVariant.dirty = true;
</span><span class="cx"> if (renderer())
</span><span class="lines">@@ -82,8 +75,6 @@
</span><span class="cx">
</span><span class="cx"> RenderPtr<RenderElement> MathMLTextElement::createElementRenderer(RenderStyle&& style, const RenderTreePosition& insertionPosition)
</span><span class="cx"> {
</span><del>- if (hasTagName(MathMLNames::moTag))
- return createRenderer<RenderMathMLOperator>(*this, WTFMove(style));
</del><span class="cx"> if (hasTagName(MathMLNames::annotationTag))
</span><span class="cx"> return MathMLElement::createElementRenderer(WTFMove(style), insertionPosition);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLTextElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLTextElement.h (203687 => 203688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLTextElement.h 2016-07-25 16:57:28 UTC (rev 203687)
+++ trunk/Source/WebCore/mathml/MathMLTextElement.h 2016-07-25 17:13:04 UTC (rev 203688)
</span><span class="lines">@@ -32,19 +32,20 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class MathMLTextElement final : public MathMLElement {
</del><ins>+class MathMLTextElement : public MathMLElement {
</ins><span class="cx"> public:
</span><span class="cx"> static Ref<MathMLTextElement> create(const QualifiedName& tagName, Document&);
</span><span class="cx"> bool acceptsMathVariantAttribute() final { return true; }
</span><span class="cx">
</span><del>-private:
</del><ins>+protected:
</ins><span class="cx"> MathMLTextElement(const QualifiedName& tagName, Document&);
</span><ins>+ void parseAttribute(const QualifiedName&, const AtomicString&) override;
</ins><span class="cx">
</span><del>- RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final;
</del><ins>+private:
+ RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override;
</ins><span class="cx"> bool childShouldCreateRenderer(const Node&) const final;
</span><span class="cx">
</span><span class="cx"> void childrenChanged(const ChildChange&) final;
</span><del>- void parseAttribute(const QualifiedName&, const AtomicString&) final;
</del><span class="cx"> void didAttachRenderers() final;
</span><span class="cx">
</span><span class="cx"> bool isPresentationMathML() const final { return true; }
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlmathtagsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/mathtags.in (203687 => 203688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/mathtags.in 2016-07-25 16:57:28 UTC (rev 203687)
+++ trunk/Source/WebCore/mathml/mathtags.in 2016-07-25 17:13:04 UTC (rev 203688)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> mroot interfaceName=MathMLInlineContainerElement
</span><span class="cx"> mi interfaceName=MathMLTextElement
</span><span class="cx"> mn interfaceName=MathMLTextElement
</span><del>-mo interfaceName=MathMLTextElement
</del><ins>+mo interfaceName=MathMLOperatorElement
</ins><span class="cx"> mtext interfaceName=MathMLTextElement
</span><span class="cx"> ms interfaceName=MathMLTextElement
</span><span class="cx"> mspace interfaceName=MathMLSpaceElement
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLOperatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp (203687 => 203688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp 2016-07-25 16:57:28 UTC (rev 203687)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp 2016-07-25 17:13:04 UTC (rev 203688)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx">
</span><span class="cx"> #include "FontSelector.h"
</span><span class="cx"> #include "MathMLNames.h"
</span><ins>+#include "MathMLOperatorElement.h"
</ins><span class="cx"> #include "PaintInfo.h"
</span><span class="cx"> #include "RenderBlockFlow.h"
</span><span class="cx"> #include "RenderText.h"
</span><span class="lines">@@ -46,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> using namespace MathMLNames;
</span><span class="cx">
</span><del>-RenderMathMLOperator::RenderMathMLOperator(MathMLElement& element, RenderStyle&& style)
</del><ins>+RenderMathMLOperator::RenderMathMLOperator(MathMLOperatorElement& element, RenderStyle&& style)
</ins><span class="cx"> : RenderMathMLToken(element, WTFMove(style))
</span><span class="cx"> , m_stretchHeightAboveBaseline(0)
</span><span class="cx"> , m_stretchDepthBelowBaseline(0)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLOperatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.h (203687 => 203688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.h 2016-07-25 16:57:28 UTC (rev 203687)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.h 2016-07-25 17:13:04 UTC (rev 203688)
</span><span class="lines">@@ -34,9 +34,11 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class MathMLOperatorElement;
+
</ins><span class="cx"> class RenderMathMLOperator final : public RenderMathMLToken {
</span><span class="cx"> public:
</span><del>- RenderMathMLOperator(MathMLElement&, RenderStyle&&);
</del><ins>+ RenderMathMLOperator(MathMLOperatorElement&, RenderStyle&&);
</ins><span class="cx"> RenderMathMLOperator(Document&, RenderStyle&&, const String& operatorString, MathMLOperatorDictionary::Form, unsigned short flags = 0);
</span><span class="cx">
</span><span class="cx"> void stretchTo(LayoutUnit heightAboveBaseline, LayoutUnit depthBelowBaseline);
</span></span></pre>
</div>
</div>
</body>
</html>