<!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>[203228] 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/203228">203228</a></dd>
<dt>Author</dt> <dd>fred.wang@free.fr</dd>
<dt>Date</dt> <dd>2016-07-14 10:59:17 -0700 (Thu, 14 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cleanup of MathML headers
https://bugs.webkit.org/show_bug.cgi?id=159336
Reviewed by Alex Christensen.
We do some cleanup in MathML headers:
- Use #pragma once
- Use final for class that are not extended.
- Use final instead of override for virtual members that are not overridden by derived classes.
- Try and reduce the visibility of function members to private or protected as appropriate.
- Remove useless #include
- Remove useless class or friendship declaration
- Remove unused functions
No new tests, behavior is unchanged.
* mathml/MathMLElement.h:
* mathml/MathMLInlineContainerElement.h:
* mathml/MathMLMathElement.h:
* mathml/MathMLMencloseElement.h:
* mathml/MathMLOperatorDictionary.h:
* mathml/MathMLPaddedElement.h:
* mathml/MathMLSelectElement.h:
* mathml/MathMLSpaceElement.h:
* mathml/MathMLTextElement.h:
* rendering/mathml/MathOperator.h:
* rendering/mathml/RenderMathMLBlock.h:
* rendering/mathml/RenderMathMLFenced.h:
* rendering/mathml/RenderMathMLFraction.h:
* rendering/mathml/RenderMathMLMath.h:
* rendering/mathml/RenderMathMLMenclose.h:
* rendering/mathml/RenderMathMLOperator.h:
* rendering/mathml/RenderMathMLRoot.h:
* rendering/mathml/RenderMathMLRow.cpp:
(WebCore::RenderMathMLRow::RenderMathMLRow): Deleted. We no longer create anonymous row.
* rendering/mathml/RenderMathMLRow.h:
* rendering/mathml/RenderMathMLScripts.h:
* rendering/mathml/RenderMathMLSpace.h:
* rendering/mathml/RenderMathMLToken.h:
* rendering/mathml/RenderMathMLUnderOver.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLElementh">trunk/Source/WebCore/mathml/MathMLElement.h</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLInlineContainerElementh">trunk/Source/WebCore/mathml/MathMLInlineContainerElement.h</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLMathElementh">trunk/Source/WebCore/mathml/MathMLMathElement.h</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLMencloseElementh">trunk/Source/WebCore/mathml/MathMLMencloseElement.h</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLOperatorDictionaryh">trunk/Source/WebCore/mathml/MathMLOperatorDictionary.h</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLPaddedElementh">trunk/Source/WebCore/mathml/MathMLPaddedElement.h</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLSelectElementh">trunk/Source/WebCore/mathml/MathMLSelectElement.h</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLSpaceElementh">trunk/Source/WebCore/mathml/MathMLSpaceElement.h</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLTextElementh">trunk/Source/WebCore/mathml/MathMLTextElement.h</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlMathMLStyleh">trunk/Source/WebCore/rendering/mathml/MathMLStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlMathOperatorh">trunk/Source/WebCore/rendering/mathml/MathOperator.h</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLBlockh">trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.h</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLFencedh">trunk/Source/WebCore/rendering/mathml/RenderMathMLFenced.h</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLFractionh">trunk/Source/WebCore/rendering/mathml/RenderMathMLFraction.h</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLMathh">trunk/Source/WebCore/rendering/mathml/RenderMathMLMath.h</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLMencloseh">trunk/Source/WebCore/rendering/mathml/RenderMathMLMenclose.h</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLOperatorh">trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.h</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLPaddedh">trunk/Source/WebCore/rendering/mathml/RenderMathMLPadded.h</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLRooth">trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.h</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLRowcpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLRowh">trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.h</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLScriptsh">trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.h</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLSpaceh">trunk/Source/WebCore/rendering/mathml/RenderMathMLSpace.h</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLTokenh">trunk/Source/WebCore/rendering/mathml/RenderMathMLToken.h</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLUnderOverh">trunk/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203227 => 203228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-14 17:50:46 UTC (rev 203227)
+++ trunk/Source/WebCore/ChangeLog 2016-07-14 17:59:17 UTC (rev 203228)
</span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2016-07-14 Frederic Wang <fred.wang@free.fr>
+
+ Cleanup of MathML headers
+ https://bugs.webkit.org/show_bug.cgi?id=159336
+
+ Reviewed by Alex Christensen.
+
+ We do some cleanup in MathML headers:
+ - Use #pragma once
+ - Use final for class that are not extended.
+ - Use final instead of override for virtual members that are not overridden by derived classes.
+ - Try and reduce the visibility of function members to private or protected as appropriate.
+ - Remove useless #include
+ - Remove useless class or friendship declaration
+ - Remove unused functions
+
+ No new tests, behavior is unchanged.
+
+ * mathml/MathMLElement.h:
+ * mathml/MathMLInlineContainerElement.h:
+ * mathml/MathMLMathElement.h:
+ * mathml/MathMLMencloseElement.h:
+ * mathml/MathMLOperatorDictionary.h:
+ * mathml/MathMLPaddedElement.h:
+ * mathml/MathMLSelectElement.h:
+ * mathml/MathMLSpaceElement.h:
+ * mathml/MathMLTextElement.h:
+ * rendering/mathml/MathOperator.h:
+ * rendering/mathml/RenderMathMLBlock.h:
+ * rendering/mathml/RenderMathMLFenced.h:
+ * rendering/mathml/RenderMathMLFraction.h:
+ * rendering/mathml/RenderMathMLMath.h:
+ * rendering/mathml/RenderMathMLMenclose.h:
+ * rendering/mathml/RenderMathMLOperator.h:
+ * rendering/mathml/RenderMathMLRoot.h:
+ * rendering/mathml/RenderMathMLRow.cpp:
+ (WebCore::RenderMathMLRow::RenderMathMLRow): Deleted. We no longer create anonymous row.
+ * rendering/mathml/RenderMathMLRow.h:
+ * rendering/mathml/RenderMathMLScripts.h:
+ * rendering/mathml/RenderMathMLSpace.h:
+ * rendering/mathml/RenderMathMLToken.h:
+ * rendering/mathml/RenderMathMLUnderOver.h:
+
</ins><span class="cx"> 2016-07-14 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Pass SessionID to WebSocketHandle constructor
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLElement.h (203227 => 203228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLElement.h 2016-07-14 17:50:46 UTC (rev 203227)
+++ trunk/Source/WebCore/mathml/MathMLElement.h 2016-07-14 17:59:17 UTC (rev 203228)
</span><span class="lines">@@ -25,8 +25,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef MathMLElement_h
-#define MathMLElement_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(MATHML)
</span><span class="cx">
</span><span class="lines">@@ -113,5 +112,3 @@
</span><span class="cx"> #include "MathMLElementTypeHelpers.h"
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MATHML)
</span><del>-
-#endif // MathMLElement_h
</del></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLInlineContainerElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLInlineContainerElement.h (203227 => 203228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLInlineContainerElement.h 2016-07-14 17:50:46 UTC (rev 203227)
+++ trunk/Source/WebCore/mathml/MathMLInlineContainerElement.h 2016-07-14 17:59:17 UTC (rev 203228)
</span><span class="lines">@@ -24,8 +24,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef MathMLInlineContainerElement_h
-#define MathMLInlineContainerElement_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(MATHML)
</span><span class="cx"> #include "MathMLElement.h"
</span><span class="lines">@@ -36,8 +35,6 @@
</span><span class="cx"> public:
</span><span class="cx"> static Ref<MathMLInlineContainerElement> create(const QualifiedName& tagName, Document&);
</span><span class="cx">
</span><del>- bool isPresentationMathML() const override { return true; }
-
</del><span class="cx"> protected:
</span><span class="cx"> MathMLInlineContainerElement(const QualifiedName& tagName, Document&);
</span><span class="cx"> void childrenChanged(const ChildChange&) override;
</span><span class="lines">@@ -45,9 +42,9 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override;
</span><ins>+ bool isPresentationMathML() const final { return true; }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MATHML)
</span><del>-#endif // MathMLInlineContainerElement_h
</del></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLMathElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLMathElement.h (203227 => 203228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLMathElement.h 2016-07-14 17:50:46 UTC (rev 203227)
+++ trunk/Source/WebCore/mathml/MathMLMathElement.h 2016-07-14 17:59:17 UTC (rev 203228)
</span><span class="lines">@@ -24,8 +24,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef MathMLMathElement_h
-#define MathMLMathElement_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(MATHML)
</span><span class="cx"> #include "MathMLInlineContainerElement.h"
</span><span class="lines">@@ -32,21 +31,18 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class MathMLMathElement : public MathMLInlineContainerElement {
</del><ins>+class MathMLMathElement final : public MathMLInlineContainerElement {
</ins><span class="cx"> public:
</span><span class="cx"> static Ref<MathMLMathElement> create(const QualifiedName& tagName, Document&);
</span><span class="cx">
</span><del>-protected:
- void didAttachRenderers() final;
-
</del><span class="cx"> private:
</span><span class="cx"> MathMLMathElement(const QualifiedName& tagName, Document&);
</span><span class="cx"> void parseAttribute(const QualifiedName&, const AtomicString&) final;
</span><ins>+ void didAttachRenderers() final;
</ins><span class="cx">
</span><del>- RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override;
</del><ins>+ RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MATHML)
</span><del>-#endif // MathMLMathElement_h
</del></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLMencloseElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLMencloseElement.h (203227 => 203228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLMencloseElement.h 2016-07-14 17:50:46 UTC (rev 203227)
+++ trunk/Source/WebCore/mathml/MathMLMencloseElement.h 2016-07-14 17:59:17 UTC (rev 203228)
</span><span class="lines">@@ -24,8 +24,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef MathMLMencloseElement_h
-#define MathMLMencloseElement_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(MATHML)
</span><span class="cx"> #include "Element.h"
</span><span class="lines">@@ -36,7 +35,6 @@
</span><span class="cx"> class MathMLMencloseElement final: public MathMLInlineContainerElement {
</span><span class="cx"> public:
</span><span class="cx"> static Ref<MathMLMencloseElement> create(const QualifiedName& tagName, Document&);
</span><del>- void parseAttribute(const QualifiedName&, const AtomicString&) final;
</del><span class="cx">
</span><span class="cx"> enum MencloseNotationFlag {
</span><span class="cx"> LongDiv = 1 << 1,
</span><span class="lines">@@ -59,6 +57,7 @@
</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><ins>+ void parseAttribute(const QualifiedName&, const AtomicString&) final;
</ins><span class="cx"> void clearNotations() { m_notationFlags = 0; }
</span><span class="cx"> void addNotation(MencloseNotationFlag notationFlag) { m_notationFlags |= notationFlag; }
</span><span class="cx"> unsigned short m_notationFlags;
</span><span class="lines">@@ -67,4 +66,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MATHML)
</span><del>-#endif // MathMLMencloseElement_h
</del></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLOperatorDictionaryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLOperatorDictionary.h (203227 => 203228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLOperatorDictionary.h 2016-07-14 17:50:46 UTC (rev 203227)
+++ trunk/Source/WebCore/mathml/MathMLOperatorDictionary.h 2016-07-14 17:59:17 UTC (rev 203228)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef MathMLOperatorDictionary_h
-#define MathMLOperatorDictionary_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(MATHML)
</span><span class="cx">
</span><span class="lines">@@ -57,4 +56,3 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(MATHML)
</span><del>-#endif // MathMLOperatorDictionary_h
</del></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLPaddedElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLPaddedElement.h (203227 => 203228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLPaddedElement.h 2016-07-14 17:50:46 UTC (rev 203227)
+++ trunk/Source/WebCore/mathml/MathMLPaddedElement.h 2016-07-14 17:59:17 UTC (rev 203228)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef MathMLPaddedElement_h
-#define MathMLPaddedElement_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(MATHML)
</span><span class="cx"> #include "MathMLInlineContainerElement.h"
</span><span class="lines">@@ -55,4 +54,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MATHML)
</span><del>-#endif // MathMLPaddedElement_h
</del></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLSelectElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLSelectElement.h (203227 => 203228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLSelectElement.h 2016-07-14 17:50:46 UTC (rev 203227)
+++ trunk/Source/WebCore/mathml/MathMLSelectElement.h 2016-07-14 17:59:17 UTC (rev 203228)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef MathMLSelectElement_h
-#define MathMLSelectElement_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(MATHML)
</span><span class="cx"> #include "MathMLInlineContainerElement.h"
</span><span class="lines">@@ -40,15 +39,15 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> MathMLSelectElement(const QualifiedName& tagName, Document&);
</span><del>- RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override;
</del><ins>+ RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final;
</ins><span class="cx">
</span><del>- bool childShouldCreateRenderer(const Node&) const override;
</del><ins>+ bool childShouldCreateRenderer(const Node&) const final;
</ins><span class="cx">
</span><del>- void finishParsingChildren() override;
- void childrenChanged(const ChildChange&) override;
- void attributeChanged(const QualifiedName&, const AtomicString& oldValue, const AtomicString& newValue, AttributeModificationReason = ModifiedDirectly) override;
- void defaultEventHandler(Event*) override;
- bool willRespondToMouseClickEvents() override;
</del><ins>+ void finishParsingChildren() final;
+ void childrenChanged(const ChildChange&) final;
+ void attributeChanged(const QualifiedName&, const AtomicString& oldValue, const AtomicString& newValue, AttributeModificationReason = ModifiedDirectly) final;
+ void defaultEventHandler(Event*) final;
+ bool willRespondToMouseClickEvents() final;
</ins><span class="cx">
</span><span class="cx"> void toggle();
</span><span class="cx"> int getSelectedActionChildAndIndex(Element*& selectedChild);
</span><span class="lines">@@ -55,7 +54,7 @@
</span><span class="cx"> Element* getSelectedActionChild();
</span><span class="cx"> Element* getSelectedSemanticsChild();
</span><span class="cx">
</span><del>- void updateSelectedChild() override;
</del><ins>+ void updateSelectedChild() final;
</ins><span class="cx"> RefPtr<Element> m_selectedChild;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -62,4 +61,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MATHML)
</span><del>-#endif // MathMLSelectElement_h
</del></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLSpaceElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLSpaceElement.h (203227 => 203228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLSpaceElement.h 2016-07-14 17:50:46 UTC (rev 203227)
+++ trunk/Source/WebCore/mathml/MathMLSpaceElement.h 2016-07-14 17:59:17 UTC (rev 203228)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef MathMLSpaceElement_h
-#define MathMLSpaceElement_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(MATHML)
</span><span class="cx"> #include "MathMLElement.h"
</span><span class="lines">@@ -51,4 +50,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MATHML)
</span><del>-#endif // MathMLSpaceElement_h
</del></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLTextElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLTextElement.h (203227 => 203228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLTextElement.h 2016-07-14 17:50:46 UTC (rev 203227)
+++ trunk/Source/WebCore/mathml/MathMLTextElement.h 2016-07-14 17:59:17 UTC (rev 203228)
</span><span class="lines">@@ -24,8 +24,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef MathMLTextElement_h
-#define MathMLTextElement_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(MATHML)
</span><span class="cx"> #include "MathMLElement.h"
</span><span class="lines">@@ -35,21 +34,20 @@
</span><span class="cx"> class MathMLTextElement final : public MathMLElement {
</span><span class="cx"> public:
</span><span class="cx"> static Ref<MathMLTextElement> create(const QualifiedName& tagName, Document&);
</span><del>- void didAttachRenderers() override;
</del><span class="cx">
</span><del>- bool isPresentationMathML() const override { return true; }
-
</del><span class="cx"> private:
</span><span class="cx"> MathMLTextElement(const QualifiedName& tagName, Document&);
</span><span class="cx">
</span><del>- RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override;
- bool childShouldCreateRenderer(const Node&) const override;
</del><ins>+ RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final;
+ bool childShouldCreateRenderer(const Node&) const final;
</ins><span class="cx">
</span><del>- void childrenChanged(const ChildChange&) override;
- void parseAttribute(const QualifiedName&, const AtomicString&) override;
</del><ins>+ void childrenChanged(const ChildChange&) final;
+ void parseAttribute(const QualifiedName&, const AtomicString&) final;
+ void didAttachRenderers() final;
+
+ bool isPresentationMathML() const final { return true; }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MATHML)
</span><del>-#endif // MathMLTextElement_h
</del></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlMathMLStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/MathMLStyle.h (203227 => 203228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/MathMLStyle.h 2016-07-14 17:50:46 UTC (rev 203227)
+++ trunk/Source/WebCore/rendering/mathml/MathMLStyle.h 2016-07-14 17:59:17 UTC (rev 203228)
</span><span class="lines">@@ -23,8 +23,6 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef MathMLStyle_h
-#define MathMLStyle_h
</del><span class="cx"> #pragma once
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MATHML)
</span><span class="lines">@@ -86,4 +84,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MATHML)
</span><del>-#endif // MathMLStyle_h
</del></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlMathOperatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/MathOperator.h (203227 => 203228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/MathOperator.h 2016-07-14 17:50:46 UTC (rev 203227)
+++ trunk/Source/WebCore/rendering/mathml/MathOperator.h 2016-07-14 17:59:17 UTC (rev 203228)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef MathOperator_h
-#define MathOperator_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(MATHML)
</span><span class="cx"> #include "GlyphPage.h"
</span><span class="lines">@@ -104,4 +103,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MATHML)
</span><del>-#endif // MathOperator_h
</del></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.h (203227 => 203228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.h 2016-07-14 17:50:46 UTC (rev 203227)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.h 2016-07-14 17:59:17 UTC (rev 203228)
</span><span class="lines">@@ -24,8 +24,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RenderMathMLBlock_h
-#define RenderMathMLBlock_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(MATHML)
</span><span class="cx">
</span><span class="lines">@@ -104,13 +103,13 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Optional<int> firstLineBaseline() const override;
</del><span class="cx">
</span><span class="cx"> MathMLStyle* mathMLStyle() const { return const_cast<MathMLStyle*>(&m_mathMLStyle.get()); }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- bool isRenderMathMLTable() const override { return true; }
- const char* renderName() const override { return "RenderMathMLTable"; }
</del><ins>+ bool isRenderMathMLTable() const final { return true; }
+ const char* renderName() const final { return "RenderMathMLTable"; }
+ Optional<int> firstLineBaseline() const final;
</ins><span class="cx">
</span><span class="cx"> Ref<MathMLStyle> m_mathMLStyle;
</span><span class="cx"> };
</span><span class="lines">@@ -125,4 +124,3 @@
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderMathMLTable, isRenderMathMLTable())
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MATHML)
</span><del>-#endif // RenderMathMLBlock_h
</del></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLFencedh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLFenced.h (203227 => 203228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLFenced.h 2016-07-14 17:50:46 UTC (rev 203227)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLFenced.h 2016-07-14 17:59:17 UTC (rev 203228)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RenderMathMLFenced_h
-#define RenderMathMLFenced_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(MATHML)
</span><span class="cx">
</span><span class="lines">@@ -40,10 +39,10 @@
</span><span class="cx"> MathMLInlineContainerElement& element() { return static_cast<MathMLInlineContainerElement&>(nodeForNonAnonymous()); }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- bool isRenderMathMLFenced() const override { return true; }
- const char* renderName() const override { return "RenderMathMLFenced"; }
- void addChild(RenderObject* child, RenderObject* beforeChild) override;
- void updateFromElement() override;
</del><ins>+ bool isRenderMathMLFenced() const final { return true; }
+ const char* renderName() const final { return "RenderMathMLFenced"; }
+ void addChild(RenderObject* child, RenderObject* beforeChild) final;
+ void updateFromElement() final;
</ins><span class="cx">
</span><span class="cx"> RenderPtr<RenderMathMLOperator> createMathMLOperator(const String& operatorString, MathMLOperatorDictionary::Form, MathMLOperatorDictionary::Flag);
</span><span class="cx"> void makeFences();
</span><span class="lines">@@ -58,5 +57,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MATHML)
</span><del>-
-#endif // RenderMathMLFenced_h
</del></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLFractionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLFraction.h (203227 => 203228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLFraction.h 2016-07-14 17:50:46 UTC (rev 203227)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLFraction.h 2016-07-14 17:59:17 UTC (rev 203228)
</span><span class="lines">@@ -25,8 +25,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RenderMathMLFraction_h
-#define RenderMathMLFraction_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(MATHML)
</span><span class="cx">
</span><span class="lines">@@ -42,16 +41,14 @@
</span><span class="cx"> MathMLInlineContainerElement& element() { return static_cast<MathMLInlineContainerElement&>(nodeForNonAnonymous()); }
</span><span class="cx"> float relativeLineThickness() const { return m_defaultLineThickness ? m_lineThickness / m_defaultLineThickness : LayoutUnit(0); }
</span><span class="cx">
</span><del>- void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) final;
</del><span class="cx"> void updateFromElement() final;
</span><span class="cx">
</span><del>-protected:
- void computePreferredLogicalWidths() final;
-
</del><span class="cx"> private:
</span><span class="cx"> bool isRenderMathMLFraction() const final { return true; }
</span><span class="cx"> const char* renderName() const final { return "RenderMathMLFraction"; }
</span><span class="cx">
</span><ins>+ void computePreferredLogicalWidths() final;
+ void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) final;
</ins><span class="cx"> Optional<int> firstLineBaseline() const final;
</span><span class="cx"> void paint(PaintInfo&, const LayoutPoint&) final;
</span><span class="cx"> RenderMathMLOperator* unembellishedOperator() final;
</span><span class="lines">@@ -94,5 +91,3 @@
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderMathMLFraction, isRenderMathMLFraction())
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MATHML)
</span><del>-
-#endif // RenderMathMLFraction_h
</del></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLMathh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLMath.h (203227 => 203228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLMath.h 2016-07-14 17:50:46 UTC (rev 203227)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLMath.h 2016-07-14 17:59:17 UTC (rev 203228)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RenderMathMLMath_h
-#define RenderMathMLMath_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(MATHML)
</span><span class="cx">
</span><span class="lines">@@ -37,8 +36,8 @@
</span><span class="cx"> RenderMathMLMath(Element&, RenderStyle&&);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- bool isRenderMathMLMath() const override { return true; }
- const char* renderName() const override { return "RenderMathMLMath"; }
</del><ins>+ bool isRenderMathMLMath() const final { return true; }
+ const char* renderName() const final { return "RenderMathMLMath"; }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span><span class="lines">@@ -46,4 +45,3 @@
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderMathMLMath, isRenderMathMLMath())
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MATHML)
</span><del>-#endif // RenderMathMLMath_h
</del></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLMencloseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLMenclose.h (203227 => 203228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLMenclose.h 2016-07-14 17:50:46 UTC (rev 203227)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLMenclose.h 2016-07-14 17:59:17 UTC (rev 203228)
</span><span class="lines">@@ -24,8 +24,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RenderMathMLMenclose_h
-#define RenderMathMLMenclose_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(MATHML)
</span><span class="cx"> #include "MathMLMencloseElement.h"
</span><span class="lines">@@ -58,4 +57,3 @@
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderMathMLMenclose, isRenderMathMLMenclose())
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MATHML)
</span><del>-#endif // RenderMathMLMenclose_h
</del></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLOperatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.h (203227 => 203228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.h 2016-07-14 17:50:46 UTC (rev 203227)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.h 2016-07-14 17:59:17 UTC (rev 203228)
</span><span class="lines">@@ -23,22 +23,18 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RenderMathMLOperator_h
-#define RenderMathMLOperator_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(MATHML)
</span><span class="cx">
</span><del>-#include "Font.h"
-#include "GlyphPage.h"
</del><span class="cx"> #include "MathMLElement.h"
</span><span class="cx"> #include "MathMLOperatorDictionary.h"
</span><span class="cx"> #include "MathOperator.h"
</span><del>-#include "OpenTypeMathData.h"
</del><span class="cx"> #include "RenderMathMLToken.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class RenderMathMLOperator : public RenderMathMLToken {
</del><ins>+class RenderMathMLOperator final : public RenderMathMLToken {
</ins><span class="cx"> public:
</span><span class="cx"> RenderMathMLOperator(MathMLElement&, RenderStyle&&);
</span><span class="cx"> RenderMathMLOperator(Document&, RenderStyle&&, const String& operatorString, MathMLOperatorDictionary::Form, unsigned short flags = 0);
</span><span class="lines">@@ -54,10 +50,6 @@
</span><span class="cx"> bool isVertical() const { return m_isVertical; }
</span><span class="cx"> LayoutUnit italicCorrection() const { return m_mathOperator.italicCorrection(); }
</span><span class="cx">
</span><del>- void styleDidChange(StyleDifference, const RenderStyle* oldStyle) final;
-
- void paint(PaintInfo&, const LayoutPoint&) final;
-
</del><span class="cx"> void updateTokenContent(const String& operatorString);
</span><span class="cx"> void updateTokenContent() final;
</span><span class="cx"> void updateOperatorProperties();
</span><span class="lines">@@ -64,15 +56,17 @@
</span><span class="cx"> void updateFromElement() final;
</span><span class="cx"> UChar textContent() const { return m_textContent; }
</span><span class="cx">
</span><del>-protected:
</del><ins>+private:
</ins><span class="cx"> virtual void setOperatorProperties();
</span><ins>+ void styleDidChange(StyleDifference, const RenderStyle* oldStyle) final;
</ins><span class="cx"> void computePreferredLogicalWidths() final;
</span><span class="cx"> void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) final;
</span><ins>+ void paint(PaintInfo&, const LayoutPoint&) final;
+
</ins><span class="cx"> void setLeadingSpace(LayoutUnit leadingSpace) { m_leadingSpace = leadingSpace; }
</span><span class="cx"> void setTrailingSpace(LayoutUnit trailingSpace) { m_trailingSpace = trailingSpace; }
</span><span class="cx">
</span><del>-private:
- const char* renderName() const override { return isAnonymous() ? "RenderMathMLOperator (anonymous)" : "RenderMathMLOperator"; }
</del><ins>+ const char* renderName() const final { return isAnonymous() ? "RenderMathMLOperator (anonymous)" : "RenderMathMLOperator"; }
</ins><span class="cx"> void paintChildren(PaintInfo& forSelf, const LayoutPoint&, PaintInfo& forChild, bool usePrintRect) final;
</span><span class="cx"> bool isRenderMathMLOperator() const final { return true; }
</span><span class="cx"> // The following operators are invisible: U+2061 FUNCTION APPLICATION, U+2062 INVISIBLE TIMES, U+2063 INVISIBLE SEPARATOR, U+2064 INVISIBLE PLUS.
</span><span class="lines">@@ -109,4 +103,3 @@
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderMathMLOperator, isRenderMathMLOperator())
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MATHML)
</span><del>-#endif // RenderMathMLOperator_h
</del></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLPaddedh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLPadded.h (203227 => 203228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLPadded.h 2016-07-14 17:50:46 UTC (rev 203227)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLPadded.h 2016-07-14 17:59:17 UTC (rev 203228)
</span><span class="lines">@@ -23,8 +23,6 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RenderMathMLPadded_h
-#define RenderMathMLPadded_h
</del><span class="cx"> #pragma once
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MATHML)
</span><span class="lines">@@ -61,4 +59,3 @@
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderMathMLPadded, isRenderMathMLPadded())
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MATHML)
</span><del>-#endif // RenderMathMLPadded_h
</del></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLRooth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.h (203227 => 203228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.h 2016-07-14 17:50:46 UTC (rev 203227)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.h 2016-07-14 17:59:17 UTC (rev 203228)
</span><span class="lines">@@ -24,8 +24,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RenderMathMLRoot_h
-#define RenderMathMLRoot_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(MATHML)
</span><span class="cx">
</span><span class="lines">@@ -35,25 +34,14 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class RenderMathMLMenclose;
-
</del><span class="cx"> // Render base^(1/index), or sqrt(base) using radical notation.
</span><del>-class RenderMathMLRoot : public RenderMathMLRow {
</del><ins>+class RenderMathMLRoot final : public RenderMathMLRow {
</ins><span class="cx">
</span><del>-friend class RenderMathMLRootWrapper;
-
</del><span class="cx"> public:
</span><span class="cx"> RenderMathMLRoot(Element&, RenderStyle&&);
</span><del>- void styleDidChange(StyleDifference, const RenderStyle* oldStyle) final;
</del><span class="cx"> void updateFromElement() final;
</span><del>-
- void computePreferredLogicalWidths() final;
- void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) final;
</del><span class="cx"> void updateStyle();
</span><span class="cx">
</span><del>-protected:
- void paint(PaintInfo&, const LayoutPoint&) final;
-
</del><span class="cx"> private:
</span><span class="cx"> bool isValid() const;
</span><span class="cx"> RenderBox& getBase() const;
</span><span class="lines">@@ -61,6 +49,12 @@
</span><span class="cx"> bool isRenderMathMLRoot() const final { return true; }
</span><span class="cx"> const char* renderName() const final { return "RenderMathMLRoot"; }
</span><span class="cx">
</span><ins>+ void styleDidChange(StyleDifference, const RenderStyle* oldStyle) final;
+
+ void computePreferredLogicalWidths() final;
+ void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) final;
+ void paint(PaintInfo&, const LayoutPoint&) final;
+
</ins><span class="cx"> MathOperator m_radicalOperator;
</span><span class="cx"> LayoutUnit m_verticalGap;
</span><span class="cx"> LayoutUnit m_ruleThickness;
</span><span class="lines">@@ -81,5 +75,3 @@
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderMathMLRoot, isRenderMathMLRoot())
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MATHML)
</span><del>-
-#endif // RenderMathMLRoot_h
</del></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLRowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.cpp (203227 => 203228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.cpp 2016-07-14 17:50:46 UTC (rev 203227)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.cpp 2016-07-14 17:59:17 UTC (rev 203228)
</span><span class="lines">@@ -44,11 +44,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderMathMLRow::RenderMathMLRow(Document& document, RenderStyle&& style)
- : RenderMathMLBlock(document, WTFMove(style))
-{
-}
-
</del><span class="cx"> void RenderMathMLRow::updateOperatorProperties()
</span><span class="cx"> {
</span><span class="cx"> for (auto* child = firstChildBox(); child; child = child->nextSiblingBox()) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLRowh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.h (203227 => 203228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.h 2016-07-14 17:50:46 UTC (rev 203227)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.h 2016-07-14 17:59:17 UTC (rev 203228)
</span><span class="lines">@@ -24,8 +24,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RenderMathMLRow_h
-#define RenderMathMLRow_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(MATHML)
</span><span class="cx">
</span><span class="lines">@@ -33,19 +32,16 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class RenderMathMLRoot;
-
</del><span class="cx"> class RenderMathMLRow : public RenderMathMLBlock {
</span><span class="cx"> public:
</span><span class="cx"> RenderMathMLRow(Element&, RenderStyle&&);
</span><del>- RenderMathMLRow(Document&, RenderStyle&&);
</del><span class="cx">
</span><span class="cx"> void updateOperatorProperties();
</span><span class="cx">
</span><ins>+protected:
</ins><span class="cx"> void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) override;
</span><span class="cx"> Optional<int> firstLineBaseline() const override;
</span><span class="cx">
</span><del>-protected:
</del><span class="cx"> void layoutRowItems(LayoutUnit& ascent, LayoutUnit& descent);
</span><span class="cx"> void computeLineVerticalStretch(LayoutUnit& ascent, LayoutUnit& descent);
</span><span class="cx"> void computePreferredLogicalWidths() override;
</span><span class="lines">@@ -60,4 +56,3 @@
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderMathMLRow, isRenderMathMLRow())
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MATHML)
</span><del>-#endif // RenderMathMLRow_h
</del></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLScriptsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.h (203227 => 203228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.h 2016-07-14 17:50:46 UTC (rev 203227)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.h 2016-07-14 17:59:17 UTC (rev 203228)
</span><span class="lines">@@ -25,8 +25,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RenderMathMLScripts_h
-#define RenderMathMLScripts_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(MATHML)
</span><span class="cx">
</span><span class="lines">@@ -38,18 +37,18 @@
</span><span class="cx"> public:
</span><span class="cx"> RenderMathMLScripts(Element&, RenderStyle&&);
</span><span class="cx"> RenderMathMLOperator* unembellishedOperator() final;
</span><del>- Optional<int> firstLineBaseline() const final;
- void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) override;
</del><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> bool isRenderMathMLScripts() const override { return true; }
</span><span class="cx"> const char* renderName() const override { return "RenderMathMLScripts"; }
</span><span class="cx"> void computePreferredLogicalWidths() override;
</span><ins>+ void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) override;
</ins><span class="cx">
</span><span class="cx"> enum ScriptsType { Sub, Super, SubSup, Multiscripts, Under, Over, UnderOver };
</span><span class="cx"> ScriptsType m_scriptType;
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ Optional<int> firstLineBaseline() const final;
</ins><span class="cx"> bool getBaseAndScripts(RenderBox*& base, RenderBox*& firstPostScript, RenderBox*& firstPreScript);
</span><span class="cx"> LayoutUnit spaceAfterScript();
</span><span class="cx"> LayoutUnit italicCorrection(RenderBox* base);
</span><span class="lines">@@ -61,5 +60,3 @@
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderMathMLScripts, isRenderMathMLScripts())
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MATHML)
</span><del>-
-#endif // RenderMathMLScripts_h
</del></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLSpaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLSpace.h (203227 => 203228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLSpace.h 2016-07-14 17:50:46 UTC (rev 203227)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLSpace.h 2016-07-14 17:59:17 UTC (rev 203228)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RenderMathMLSpace_h
-#define RenderMathMLSpace_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(MATHML)
</span><span class="cx">
</span><span class="lines">@@ -55,4 +54,3 @@
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderMathMLSpace, isRenderMathMLSpace())
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MATHML)
</span><del>-#endif // RenderMathMLSpace_h
</del></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLTokenh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLToken.h (203227 => 203228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLToken.h 2016-07-14 17:50:46 UTC (rev 203227)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLToken.h 2016-07-14 17:59:17 UTC (rev 203228)
</span><span class="lines">@@ -24,14 +24,12 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RenderMathMLToken_h
-#define RenderMathMLToken_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(MATHML)
</span><span class="cx">
</span><span class="cx"> #include "MathMLTextElement.h"
</span><span class="cx"> #include "RenderMathMLBlock.h"
</span><del>-#include "RenderText.h"
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -42,10 +40,10 @@
</span><span class="cx">
</span><span class="cx"> MathMLTextElement& element() { return static_cast<MathMLTextElement&>(nodeForNonAnonymous()); }
</span><span class="cx">
</span><del>- bool isChildAllowed(const RenderObject&, const RenderStyle&) const override { return true; };
</del><span class="cx"> virtual void updateTokenContent();
</span><span class="cx"> void updateFromElement() override;
</span><span class="cx">
</span><ins>+protected:
</ins><span class="cx"> void paint(PaintInfo&, const LayoutPoint&) override;
</span><span class="cx"> void paintChildren(PaintInfo& forSelf, const LayoutPoint&, PaintInfo& forChild, bool usePrintRect) override;
</span><span class="cx"> Optional<int> firstLineBaseline() const override;
</span><span class="lines">@@ -55,6 +53,7 @@
</span><span class="cx"> private:
</span><span class="cx"> bool isRenderMathMLToken() const final { return true; }
</span><span class="cx"> const char* renderName() const override { return "RenderMathMLToken"; }
</span><ins>+ bool isChildAllowed(const RenderObject&, const RenderStyle&) const final { return true; };
</ins><span class="cx"> void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
</span><span class="cx"> void updateMathVariantGlyph();
</span><span class="cx"> void setMathVariantGlyphDirty()
</span><span class="lines">@@ -71,4 +70,3 @@
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderMathMLToken, isRenderMathMLToken())
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MATHML)
</span><del>-#endif // RenderMathMLToken_h
</del></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLUnderOverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.h (203227 => 203228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.h 2016-07-14 17:50:46 UTC (rev 203227)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.h 2016-07-14 17:59:17 UTC (rev 203228)
</span><span class="lines">@@ -24,8 +24,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RenderMathMLUnderOver_h
-#define RenderMathMLUnderOver_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(MATHML)
</span><span class="cx">
</span><span class="lines">@@ -36,14 +35,15 @@
</span><span class="cx"> class RenderMathMLUnderOver final : public RenderMathMLScripts {
</span><span class="cx"> public:
</span><span class="cx"> RenderMathMLUnderOver(Element&, RenderStyle&&);
</span><del>- void computePreferredLogicalWidths() final;
- void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) final;
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> bool isRenderMathMLScripts() const final { return false; }
</span><del>- bool isRenderMathMLUnderOver() const override { return true; }
- const char* renderName() const override { return "RenderMathMLUnderOver"; }
</del><ins>+ bool isRenderMathMLUnderOver() const final { return true; }
+ const char* renderName() const final { return "RenderMathMLUnderOver"; }
</ins><span class="cx">
</span><ins>+ void computePreferredLogicalWidths() final;
+ void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) final;
+
</ins><span class="cx"> void computeOperatorsHorizontalStretch();
</span><span class="cx"> bool isValid() const;
</span><span class="cx"> bool shouldMoveLimits();
</span><span class="lines">@@ -61,5 +61,3 @@
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderMathMLUnderOver, isRenderMathMLUnderOver())
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MATHML)
</span><del>-
-#endif // RenderMathMLUnderOver_h
</del></span></pre>
</div>
</div>
</body>
</html>