<!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>[205206] 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/205206">205206</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-30 15:54:41 -0700 (Tue, 30 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move some code from MathMLElement to MathMLPresentationElement
https://bugs.webkit.org/show_bug.cgi?id=161377
Patch by Frederic Wang <fwang@igalia.com> on 2016-08-30
Reviewed by Darin Adler.
The following code is only used in presentation MathML classes. We then move it from
MathMLElement to MathMLPresentationElement:
- testing whether a child is a phrasing/flow element.
- parsing of length attributes.
- parsing of boolean attributes.
- parsing of mathvariant attributes.
No new tests, already covered by existing tests.
* mathml/MathMLElement.cpp:
(WebCore::MathMLElement::isPhrasingContent): Deleted.
(WebCore::MathMLElement::isFlowContent): Deleted.
(WebCore::MathMLElement::parseNumberAndUnit): Deleted.
(WebCore::MathMLElement::parseNamedSpace): Deleted.
(WebCore::MathMLElement::parseMathMLLength): Deleted.
(WebCore::MathMLElement::cachedMathMLLength): Deleted.
(WebCore::MathMLElement::cachedBooleanAttribute): Deleted.
(WebCore::MathMLElement::parseMathVariantAttribute): Deleted.
(WebCore::MathMLElement::specifiedDisplayStyle): Deleted.
(WebCore::MathMLElement::specifiedMathVariant): Deleted.
* mathml/MathMLElement.h:
(WebCore::MathMLElement::specifiedDisplayStyle):
(WebCore::MathMLElement::specifiedMathVariant):
(WebCore::MathMLElement::acceptsDisplayStyleAttribute): Deleted.
(WebCore::MathMLElement::acceptsMathVariantAttribute): Deleted.
(WebCore::MathMLElement::toOptionalBool): Deleted.
* mathml/MathMLPresentationElement.cpp:
(WebCore::MathMLPresentationElement::isPhrasingContent):
(WebCore::MathMLPresentationElement::isFlowContent):
(WebCore::MathMLPresentationElement::cachedBooleanAttribute):
(WebCore::MathMLPresentationElement::parseNumberAndUnit):
(WebCore::MathMLPresentationElement::parseNamedSpace):
(WebCore::MathMLPresentationElement::parseMathMLLength):
(WebCore::MathMLPresentationElement::cachedMathMLLength):
(WebCore::MathMLPresentationElement::specifiedDisplayStyle):
(WebCore::MathMLPresentationElement::parseMathVariantAttribute):
(WebCore::MathMLPresentationElement::specifiedMathVariant):
* mathml/MathMLPresentationElement.h:
(WebCore::MathMLPresentationElement::toOptionalBool):
(WebCore::MathMLPresentationElement::acceptsMathVariantAttribute):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLElementcpp">trunk/Source/WebCore/mathml/MathMLElement.cpp</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLElementh">trunk/Source/WebCore/mathml/MathMLElement.h</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLPresentationElementcpp">trunk/Source/WebCore/mathml/MathMLPresentationElement.cpp</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLPresentationElementh">trunk/Source/WebCore/mathml/MathMLPresentationElement.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205205 => 205206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-30 22:49:45 UTC (rev 205205)
+++ trunk/Source/WebCore/ChangeLog 2016-08-30 22:54:41 UTC (rev 205206)
</span><span class="lines">@@ -1,5 +1,53 @@
</span><span class="cx"> 2016-08-30 Frederic Wang <fwang@igalia.com>
</span><span class="cx">
</span><ins>+ Move some code from MathMLElement to MathMLPresentationElement
+ https://bugs.webkit.org/show_bug.cgi?id=161377
+
+ Reviewed by Darin Adler.
+
+ The following code is only used in presentation MathML classes. We then move it from
+ MathMLElement to MathMLPresentationElement:
+ - testing whether a child is a phrasing/flow element.
+ - parsing of length attributes.
+ - parsing of boolean attributes.
+ - parsing of mathvariant attributes.
+
+ No new tests, already covered by existing tests.
+
+ * mathml/MathMLElement.cpp:
+ (WebCore::MathMLElement::isPhrasingContent): Deleted.
+ (WebCore::MathMLElement::isFlowContent): Deleted.
+ (WebCore::MathMLElement::parseNumberAndUnit): Deleted.
+ (WebCore::MathMLElement::parseNamedSpace): Deleted.
+ (WebCore::MathMLElement::parseMathMLLength): Deleted.
+ (WebCore::MathMLElement::cachedMathMLLength): Deleted.
+ (WebCore::MathMLElement::cachedBooleanAttribute): Deleted.
+ (WebCore::MathMLElement::parseMathVariantAttribute): Deleted.
+ (WebCore::MathMLElement::specifiedDisplayStyle): Deleted.
+ (WebCore::MathMLElement::specifiedMathVariant): Deleted.
+ * mathml/MathMLElement.h:
+ (WebCore::MathMLElement::specifiedDisplayStyle):
+ (WebCore::MathMLElement::specifiedMathVariant):
+ (WebCore::MathMLElement::acceptsDisplayStyleAttribute): Deleted.
+ (WebCore::MathMLElement::acceptsMathVariantAttribute): Deleted.
+ (WebCore::MathMLElement::toOptionalBool): Deleted.
+ * mathml/MathMLPresentationElement.cpp:
+ (WebCore::MathMLPresentationElement::isPhrasingContent):
+ (WebCore::MathMLPresentationElement::isFlowContent):
+ (WebCore::MathMLPresentationElement::cachedBooleanAttribute):
+ (WebCore::MathMLPresentationElement::parseNumberAndUnit):
+ (WebCore::MathMLPresentationElement::parseNamedSpace):
+ (WebCore::MathMLPresentationElement::parseMathMLLength):
+ (WebCore::MathMLPresentationElement::cachedMathMLLength):
+ (WebCore::MathMLPresentationElement::specifiedDisplayStyle):
+ (WebCore::MathMLPresentationElement::parseMathVariantAttribute):
+ (WebCore::MathMLPresentationElement::specifiedMathVariant):
+ * mathml/MathMLPresentationElement.h:
+ (WebCore::MathMLPresentationElement::toOptionalBool):
+ (WebCore::MathMLPresentationElement::acceptsMathVariantAttribute):
+
+2016-08-30 Frederic Wang <fwang@igalia.com>
+
</ins><span class="cx"> Introduce a MathMLUnknownElement class
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=161298
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLElement.cpp (205205 => 205206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLElement.cpp 2016-08-30 22:49:45 UTC (rev 205205)
+++ trunk/Source/WebCore/mathml/MathMLElement.cpp 2016-08-30 22:54:41 UTC (rev 205206)
</span><span class="lines">@@ -31,24 +31,12 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MATHML)
</span><span class="cx">
</span><del>-#include "ElementIterator.h"
-#include "Event.h"
</del><span class="cx"> #include "EventHandler.h"
</span><span class="cx"> #include "HTMLAnchorElement.h"
</span><del>-#include "HTMLElement.h"
-#include "HTMLHtmlElement.h"
-#include "HTMLMapElement.h"
-#include "HTMLNames.h"
</del><span class="cx"> #include "HTMLParserIdioms.h"
</span><del>-#include "MathMLMathElement.h"
</del><span class="cx"> #include "MathMLNames.h"
</span><del>-#include "MathMLSelectElement.h"
</del><span class="cx"> #include "MouseEvent.h"
</span><span class="cx"> #include "RenderTableCell.h"
</span><del>-#include "SVGElement.h"
-#include "SVGNames.h"
-#include "SVGSVGElement.h"
-#include "XLinkNames.h"
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -64,124 +52,6 @@
</span><span class="cx"> return adoptRef(*new MathMLElement(tagName, document));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MathMLElement::isPhrasingContent(const Node& node) const
-{
- // Phrasing content is described in the HTML 5 specification:
- // http://www.w3.org/TR/html5/dom.html#phrasing-content.
-
- if (!node.isElementNode())
- return node.isTextNode();
-
- if (is<MathMLElement>(node)) {
- auto& mathmlElement = downcast<MathMLElement>(node);
- return is<MathMLMathElement>(mathmlElement);
- }
-
- if (is<SVGElement>(node)) {
- auto& svgElement = downcast<SVGElement>(node);
- return is<SVGSVGElement>(svgElement);
- }
-
- if (is<HTMLElement>(node)) {
- // FIXME: add the <data> and <time> tags when they are implemented.
- auto& htmlElement = downcast<HTMLElement>(node);
- return htmlElement.hasTagName(HTMLNames::aTag)
- || htmlElement.hasTagName(HTMLNames::abbrTag)
- || (htmlElement.hasTagName(HTMLNames::areaTag) && ancestorsOfType<HTMLMapElement>(htmlElement).first())
- || htmlElement.hasTagName(HTMLNames::audioTag)
- || htmlElement.hasTagName(HTMLNames::bTag)
- || htmlElement.hasTagName(HTMLNames::bdiTag)
- || htmlElement.hasTagName(HTMLNames::bdoTag)
- || htmlElement.hasTagName(HTMLNames::brTag)
- || htmlElement.hasTagName(HTMLNames::buttonTag)
- || htmlElement.hasTagName(HTMLNames::canvasTag)
- || htmlElement.hasTagName(HTMLNames::citeTag)
- || htmlElement.hasTagName(HTMLNames::codeTag)
- || htmlElement.hasTagName(HTMLNames::datalistTag)
- || htmlElement.hasTagName(HTMLNames::delTag)
- || htmlElement.hasTagName(HTMLNames::dfnTag)
- || htmlElement.hasTagName(HTMLNames::emTag)
- || htmlElement.hasTagName(HTMLNames::embedTag)
- || htmlElement.hasTagName(HTMLNames::iTag)
- || htmlElement.hasTagName(HTMLNames::iframeTag)
- || htmlElement.hasTagName(HTMLNames::imgTag)
- || htmlElement.hasTagName(HTMLNames::inputTag)
- || htmlElement.hasTagName(HTMLNames::insTag)
- || htmlElement.hasTagName(HTMLNames::kbdTag)
- || htmlElement.hasTagName(HTMLNames::keygenTag)
- || htmlElement.hasTagName(HTMLNames::labelTag)
- || htmlElement.hasTagName(HTMLNames::mapTag)
- || htmlElement.hasTagName(HTMLNames::markTag)
- || htmlElement.hasTagName(HTMLNames::meterTag)
- || htmlElement.hasTagName(HTMLNames::noscriptTag)
- || htmlElement.hasTagName(HTMLNames::objectTag)
- || htmlElement.hasTagName(HTMLNames::outputTag)
- || htmlElement.hasTagName(HTMLNames::progressTag)
- || htmlElement.hasTagName(HTMLNames::qTag)
- || htmlElement.hasTagName(HTMLNames::rubyTag)
- || htmlElement.hasTagName(HTMLNames::sTag)
- || htmlElement.hasTagName(HTMLNames::sampTag)
- || htmlElement.hasTagName(HTMLNames::scriptTag)
- || htmlElement.hasTagName(HTMLNames::selectTag)
- || htmlElement.hasTagName(HTMLNames::smallTag)
- || htmlElement.hasTagName(HTMLNames::spanTag)
- || htmlElement.hasTagName(HTMLNames::strongTag)
- || htmlElement.hasTagName(HTMLNames::subTag)
- || htmlElement.hasTagName(HTMLNames::supTag)
- || htmlElement.hasTagName(HTMLNames::templateTag)
- || htmlElement.hasTagName(HTMLNames::textareaTag)
- || htmlElement.hasTagName(HTMLNames::uTag)
- || htmlElement.hasTagName(HTMLNames::varTag)
- || htmlElement.hasTagName(HTMLNames::videoTag)
- || htmlElement.hasTagName(HTMLNames::wbrTag);
- }
-
- return false;
-}
-
-bool MathMLElement::isFlowContent(const Node& node) const
-{
- // Flow content is described in the HTML 5 specification:
- // http://www.w3.org/TR/html5/dom.html#flow-content
-
- if (isPhrasingContent(node))
- return true;
-
- if (!is<HTMLElement>(node))
- return false;
-
- auto& htmlElement = downcast<HTMLElement>(node);
- // FIXME add the <dialog> tag when it is implemented.
- return htmlElement.hasTagName(HTMLNames::addressTag)
- || htmlElement.hasTagName(HTMLNames::articleTag)
- || htmlElement.hasTagName(HTMLNames::asideTag)
- || htmlElement.hasTagName(HTMLNames::blockquoteTag)
- || htmlElement.hasTagName(HTMLNames::detailsTag)
- || htmlElement.hasTagName(HTMLNames::divTag)
- || htmlElement.hasTagName(HTMLNames::dlTag)
- || htmlElement.hasTagName(HTMLNames::fieldsetTag)
- || htmlElement.hasTagName(HTMLNames::figureTag)
- || htmlElement.hasTagName(HTMLNames::footerTag)
- || htmlElement.hasTagName(HTMLNames::formTag)
- || htmlElement.hasTagName(HTMLNames::h1Tag)
- || htmlElement.hasTagName(HTMLNames::h2Tag)
- || htmlElement.hasTagName(HTMLNames::h3Tag)
- || htmlElement.hasTagName(HTMLNames::h4Tag)
- || htmlElement.hasTagName(HTMLNames::h5Tag)
- || htmlElement.hasTagName(HTMLNames::h6Tag)
- || htmlElement.hasTagName(HTMLNames::headerTag)
- || htmlElement.hasTagName(HTMLNames::hrTag)
- || htmlElement.hasTagName(HTMLNames::mainTag)
- || htmlElement.hasTagName(HTMLNames::navTag)
- || htmlElement.hasTagName(HTMLNames::olTag)
- || htmlElement.hasTagName(HTMLNames::pTag)
- || htmlElement.hasTagName(HTMLNames::preTag)
- || htmlElement.hasTagName(HTMLNames::sectionTag)
- || (htmlElement.hasTagName(HTMLNames::styleTag) && htmlElement.hasAttribute("scoped"))
- || htmlElement.hasTagName(HTMLNames::tableTag)
- || htmlElement.hasTagName(HTMLNames::ulTag);
-}
-
</del><span class="cx"> unsigned MathMLElement::colSpan() const
</span><span class="cx"> {
</span><span class="cx"> if (!hasTagName(mtdTag))
</span><span class="lines">@@ -356,197 +226,6 @@
</span><span class="cx"> return stringView.substring(start, stringLength);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-MathMLElement::Length MathMLElement::parseNumberAndUnit(const StringView& string)
-{
- LengthType lengthType = LengthType::UnitLess;
- unsigned stringLength = string.length();
- UChar lastChar = string[stringLength - 1];
- if (lastChar == '%') {
- lengthType = LengthType::Percentage;
- stringLength--;
- } else if (stringLength >= 2) {
- UChar penultimateChar = string[stringLength - 2];
- if (penultimateChar == 'c' && lastChar == 'm')
- lengthType = LengthType::Cm;
- if (penultimateChar == 'e' && lastChar == 'm')
- lengthType = LengthType::Em;
- else if (penultimateChar == 'e' && lastChar == 'x')
- lengthType = LengthType::Ex;
- else if (penultimateChar == 'i' && lastChar == 'n')
- lengthType = LengthType::In;
- else if (penultimateChar == 'm' && lastChar == 'm')
- lengthType = LengthType::Mm;
- else if (penultimateChar == 'p' && lastChar == 'c')
- lengthType = LengthType::Pc;
- else if (penultimateChar == 'p' && lastChar == 't')
- lengthType = LengthType::Pt;
- else if (penultimateChar == 'p' && lastChar == 'x')
- lengthType = LengthType::Px;
-
- if (lengthType != LengthType::UnitLess)
- stringLength -= 2;
- }
-
- bool ok;
- float lengthValue = string.substring(0, stringLength).toFloat(ok);
- if (!ok)
- return Length();
-
- Length length;
- length.type = lengthType;
- length.value = lengthValue;
- return length;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-MathMLElement::Length MathMLElement::parseNamedSpace(const StringView& string)
-{
- // Named space values are case-sensitive.
- int namedSpaceValue;
- if (string == "veryverythinmathspace")
- namedSpaceValue = 1;
- else if (string == "verythinmathspace")
- namedSpaceValue = 2;
- else if (string == "thinmathspace")
- namedSpaceValue = 3;
- else if (string == "mediummathspace")
- namedSpaceValue = 4;
- else if (string == "thickmathspace")
- namedSpaceValue = 5;
- else if (string == "verythickmathspace")
- namedSpaceValue = 6;
- else if (string == "veryverythickmathspace")
- namedSpaceValue = 7;
- else if (string == "negativeveryverythinmathspace")
- namedSpaceValue = -1;
- else if (string == "negativeverythinmathspace")
- namedSpaceValue = -2;
- else if (string == "negativethinmathspace")
- namedSpaceValue = -3;
- else if (string == "negativemediummathspace")
- namedSpaceValue = -4;
- else if (string == "negativethickmathspace")
- namedSpaceValue = -5;
- else if (string == "negativeverythickmathspace")
- namedSpaceValue = -6;
- else if (string == "negativeveryverythickmathspace")
- namedSpaceValue = -7;
- else
- return Length();
-
- Length length;
- length.type = LengthType::MathUnit;
- length.value = namedSpaceValue;
- return length;
-}
-
-MathMLElement::Length MathMLElement::parseMathMLLength(const String& string)
-{
- // The regular expression from the MathML Relax NG schema is as follows:
- //
- // pattern = '\s*((-?[0-9]*([0-9]\.?|\.[0-9])[0-9]*(e[mx]|in|cm|mm|p[xtc]|%)?)|(negative)?((very){0,2}thi(n|ck)|medium)mathspace)\s*'
- //
- // We do not perform a strict verification of the syntax of whitespaces and number.
- // Instead, we just use isHTMLSpace and toFloat to parse these parts.
-
- // We first skip whitespace from both ends of the string.
- StringView stringView = stripLeadingAndTrailingWhitespace(string);
-
- if (stringView.isEmpty())
- return Length();
-
- // We consider the most typical case: a number followed by an optional unit.
- UChar firstChar = stringView[0];
- if (isASCIIDigit(firstChar) || firstChar == '-' || firstChar == '.')
- return parseNumberAndUnit(stringView);
-
- // Otherwise, we try and parse a named space.
- return parseNamedSpace(stringView);
-}
-
-const MathMLElement::Length& MathMLElement::cachedMathMLLength(const QualifiedName& name, Optional<Length>& length)
-{
- if (length)
- return length.value();
- length = parseMathMLLength(attributeWithoutSynchronization(name));
- return length.value();
-}
-
-const MathMLElement::BooleanValue& MathMLElement::cachedBooleanAttribute(const QualifiedName& name, Optional<BooleanValue>& attribute)
-{
- if (attribute)
- return attribute.value();
-
- // In MathML, attribute values are case-sensitive.
- const AtomicString& value = attributeWithoutSynchronization(name);
- if (value == "true")
- attribute = BooleanValue::True;
- else if (value == "false")
- attribute = BooleanValue::False;
- else
- attribute = BooleanValue::Default;
-
- return attribute.value();
-}
-
-MathMLElement::MathVariant MathMLElement::parseMathVariantAttribute(const AtomicString& attributeValue)
-{
- // The mathvariant attribute values is case-sensitive.
- if (attributeValue == "normal")
- return MathVariant::Normal;
- if (attributeValue == "bold")
- return MathVariant::Bold;
- if (attributeValue == "italic")
- return MathVariant::Italic;
- if (attributeValue == "bold-italic")
- return MathVariant::BoldItalic;
- if (attributeValue == "double-struck")
- return MathVariant::DoubleStruck;
- if (attributeValue == "bold-fraktur")
- return MathVariant::BoldFraktur;
- if (attributeValue == "script")
- return MathVariant::Script;
- if (attributeValue == "bold-script")
- return MathVariant::BoldScript;
- if (attributeValue == "fraktur")
- return MathVariant::Fraktur;
- if (attributeValue == "sans-serif")
- return MathVariant::SansSerif;
- if (attributeValue == "bold-sans-serif")
- return MathVariant::BoldSansSerif;
- if (attributeValue == "sans-serif-italic")
- return MathVariant::SansSerifItalic;
- if (attributeValue == "sans-serif-bold-italic")
- return MathVariant::SansSerifBoldItalic;
- if (attributeValue == "monospace")
- return MathVariant::Monospace;
- if (attributeValue == "initial")
- return MathVariant::Initial;
- if (attributeValue == "tailed")
- return MathVariant::Tailed;
- if (attributeValue == "looped")
- return MathVariant::Looped;
- if (attributeValue == "stretched")
- return MathVariant::Stretched;
- return MathVariant::None;
-}
-
-Optional<bool> MathMLElement::specifiedDisplayStyle()
-{
- if (!acceptsDisplayStyleAttribute())
- return Nullopt;
- const MathMLElement::BooleanValue& specifiedDisplayStyle = cachedBooleanAttribute(displaystyleAttr, m_displayStyle);
- return toOptionalBool(specifiedDisplayStyle);
-}
-
-Optional<MathMLElement::MathVariant> MathMLElement::specifiedMathVariant()
-{
- if (!acceptsMathVariantAttribute())
- return Nullopt;
- if (!m_mathVariant)
- m_mathVariant = parseMathVariantAttribute(attributeWithoutSynchronization(mathvariantAttr));
- return m_mathVariant.value() == MathVariant::None ? Nullopt : m_mathVariant;
-}
-
-}
-
</del><span class="cx"> #endif // ENABLE(MATHML)
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLElement.h (205205 => 205206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLElement.h 2016-08-30 22:49:45 UTC (rev 205205)
+++ trunk/Source/WebCore/mathml/MathMLElement.h 2016-08-30 22:54:41 UTC (rev 205206)
</span><span class="lines">@@ -56,7 +56,6 @@
</span><span class="cx"> LengthType type { LengthType::ParsingFailed };
</span><span class="cx"> float value { 0 };
</span><span class="cx"> };
</span><del>- static Length parseMathMLLength(const String&);
</del><span class="cx">
</span><span class="cx"> enum class BooleanValue { True, False, Default };
</span><span class="cx">
</span><span class="lines">@@ -85,8 +84,8 @@
</span><span class="cx"> Stretched = 18
</span><span class="cx"> };
</span><span class="cx">
</span><del>- virtual Optional<bool> specifiedDisplayStyle();
- Optional<MathVariant> specifiedMathVariant();
</del><ins>+ virtual Optional<bool> specifiedDisplayStyle() { return Nullopt; }
+ virtual Optional<MathVariant> specifiedMathVariant() { return Nullopt; }
</ins><span class="cx">
</span><span class="cx"> virtual void updateSelectedChild() { }
</span><span class="cx">
</span><span class="lines">@@ -101,27 +100,10 @@
</span><span class="cx"> bool isPresentationAttribute(const QualifiedName&) const override;
</span><span class="cx"> void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) override;
</span><span class="cx">
</span><del>- bool isPhrasingContent(const Node&) const;
- bool isFlowContent(const Node&) const;
-
</del><span class="cx"> bool willRespondToMouseClickEvents() override;
</span><span class="cx"> void defaultEventHandler(Event*) override;
</span><span class="cx">
</span><del>- const Length& cachedMathMLLength(const QualifiedName&, Optional<Length>&);
- const BooleanValue& cachedBooleanAttribute(const QualifiedName&, Optional<BooleanValue>&);
-
- virtual bool acceptsDisplayStyleAttribute() { return false; }
- virtual bool acceptsMathVariantAttribute() { return false; }
-
- static Optional<bool> toOptionalBool(const BooleanValue& value) { return value == BooleanValue::Default ? Nullopt : Optional<bool>(value == BooleanValue::True); }
- Optional<BooleanValue> m_displayStyle;
- Optional<MathVariant> m_mathVariant;
-
</del><span class="cx"> private:
</span><del>- static Length parseNumberAndUnit(const StringView&);
- static Length parseNamedSpace(const StringView&);
- static MathVariant parseMathVariantAttribute(const AtomicString& attributeValue);
-
</del><span class="cx"> bool canStartSelection() const final;
</span><span class="cx"> bool isFocusable() const final;
</span><span class="cx"> bool isKeyboardFocusable(KeyboardEvent*) const final;
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLPresentationElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLPresentationElement.cpp (205205 => 205206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLPresentationElement.cpp 2016-08-30 22:49:45 UTC (rev 205205)
+++ trunk/Source/WebCore/mathml/MathMLPresentationElement.cpp 2016-08-30 22:54:41 UTC (rev 205206)
</span><span class="lines">@@ -30,8 +30,17 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MATHML)
</span><span class="cx">
</span><ins>+#include "ElementIterator.h"
+#include "HTMLHtmlElement.h"
+#include "HTMLMapElement.h"
+#include "HTMLNames.h"
+#include "HTMLParserIdioms.h"
+#include "MathMLMathElement.h"
</ins><span class="cx"> #include "MathMLNames.h"
</span><span class="cx"> #include "RenderMathMLBlock.h"
</span><ins>+#include "RenderTableCell.h"
+#include "SVGNames.h"
+#include "SVGSVGElement.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -55,11 +64,320 @@
</span><span class="cx"> return MathMLElement::createElementRenderer(WTFMove(style), insertionPosition);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool MathMLPresentationElement::isPhrasingContent(const Node& node)
+{
+ // Phrasing content is described in the HTML 5 specification:
+ // http://www.w3.org/TR/html5/dom.html#phrasing-content.
+
+ if (!node.isElementNode())
+ return node.isTextNode();
+
+ if (is<MathMLElement>(node)) {
+ auto& mathmlElement = downcast<MathMLElement>(node);
+ return is<MathMLMathElement>(mathmlElement);
+ }
+
+ if (is<SVGElement>(node)) {
+ auto& svgElement = downcast<SVGElement>(node);
+ return is<SVGSVGElement>(svgElement);
+ }
+
+ if (is<HTMLElement>(node)) {
+ // FIXME: add the <data> and <time> tags when they are implemented.
+ auto& htmlElement = downcast<HTMLElement>(node);
+ return htmlElement.hasTagName(HTMLNames::aTag)
+ || htmlElement.hasTagName(HTMLNames::abbrTag)
+ || (htmlElement.hasTagName(HTMLNames::areaTag) && ancestorsOfType<HTMLMapElement>(htmlElement).first())
+ || htmlElement.hasTagName(HTMLNames::audioTag)
+ || htmlElement.hasTagName(HTMLNames::bTag)
+ || htmlElement.hasTagName(HTMLNames::bdiTag)
+ || htmlElement.hasTagName(HTMLNames::bdoTag)
+ || htmlElement.hasTagName(HTMLNames::brTag)
+ || htmlElement.hasTagName(HTMLNames::buttonTag)
+ || htmlElement.hasTagName(HTMLNames::canvasTag)
+ || htmlElement.hasTagName(HTMLNames::citeTag)
+ || htmlElement.hasTagName(HTMLNames::codeTag)
+ || htmlElement.hasTagName(HTMLNames::datalistTag)
+ || htmlElement.hasTagName(HTMLNames::delTag)
+ || htmlElement.hasTagName(HTMLNames::dfnTag)
+ || htmlElement.hasTagName(HTMLNames::emTag)
+ || htmlElement.hasTagName(HTMLNames::embedTag)
+ || htmlElement.hasTagName(HTMLNames::iTag)
+ || htmlElement.hasTagName(HTMLNames::iframeTag)
+ || htmlElement.hasTagName(HTMLNames::imgTag)
+ || htmlElement.hasTagName(HTMLNames::inputTag)
+ || htmlElement.hasTagName(HTMLNames::insTag)
+ || htmlElement.hasTagName(HTMLNames::kbdTag)
+ || htmlElement.hasTagName(HTMLNames::keygenTag)
+ || htmlElement.hasTagName(HTMLNames::labelTag)
+ || htmlElement.hasTagName(HTMLNames::mapTag)
+ || htmlElement.hasTagName(HTMLNames::markTag)
+ || htmlElement.hasTagName(HTMLNames::meterTag)
+ || htmlElement.hasTagName(HTMLNames::noscriptTag)
+ || htmlElement.hasTagName(HTMLNames::objectTag)
+ || htmlElement.hasTagName(HTMLNames::outputTag)
+ || htmlElement.hasTagName(HTMLNames::progressTag)
+ || htmlElement.hasTagName(HTMLNames::qTag)
+ || htmlElement.hasTagName(HTMLNames::rubyTag)
+ || htmlElement.hasTagName(HTMLNames::sTag)
+ || htmlElement.hasTagName(HTMLNames::sampTag)
+ || htmlElement.hasTagName(HTMLNames::scriptTag)
+ || htmlElement.hasTagName(HTMLNames::selectTag)
+ || htmlElement.hasTagName(HTMLNames::smallTag)
+ || htmlElement.hasTagName(HTMLNames::spanTag)
+ || htmlElement.hasTagName(HTMLNames::strongTag)
+ || htmlElement.hasTagName(HTMLNames::subTag)
+ || htmlElement.hasTagName(HTMLNames::supTag)
+ || htmlElement.hasTagName(HTMLNames::templateTag)
+ || htmlElement.hasTagName(HTMLNames::textareaTag)
+ || htmlElement.hasTagName(HTMLNames::uTag)
+ || htmlElement.hasTagName(HTMLNames::varTag)
+ || htmlElement.hasTagName(HTMLNames::videoTag)
+ || htmlElement.hasTagName(HTMLNames::wbrTag);
+ }
+
+ return false;
+}
+
+bool MathMLPresentationElement::isFlowContent(const Node& node)
+{
+ // Flow content is described in the HTML 5 specification:
+ // http://www.w3.org/TR/html5/dom.html#flow-content
+
+ if (isPhrasingContent(node))
+ return true;
+
+ if (!is<HTMLElement>(node))
+ return false;
+
+ auto& htmlElement = downcast<HTMLElement>(node);
+ // FIXME add the <dialog> tag when it is implemented.
+ return htmlElement.hasTagName(HTMLNames::addressTag)
+ || htmlElement.hasTagName(HTMLNames::articleTag)
+ || htmlElement.hasTagName(HTMLNames::asideTag)
+ || htmlElement.hasTagName(HTMLNames::blockquoteTag)
+ || htmlElement.hasTagName(HTMLNames::detailsTag)
+ || htmlElement.hasTagName(HTMLNames::divTag)
+ || htmlElement.hasTagName(HTMLNames::dlTag)
+ || htmlElement.hasTagName(HTMLNames::fieldsetTag)
+ || htmlElement.hasTagName(HTMLNames::figureTag)
+ || htmlElement.hasTagName(HTMLNames::footerTag)
+ || htmlElement.hasTagName(HTMLNames::formTag)
+ || htmlElement.hasTagName(HTMLNames::h1Tag)
+ || htmlElement.hasTagName(HTMLNames::h2Tag)
+ || htmlElement.hasTagName(HTMLNames::h3Tag)
+ || htmlElement.hasTagName(HTMLNames::h4Tag)
+ || htmlElement.hasTagName(HTMLNames::h5Tag)
+ || htmlElement.hasTagName(HTMLNames::h6Tag)
+ || htmlElement.hasTagName(HTMLNames::headerTag)
+ || htmlElement.hasTagName(HTMLNames::hrTag)
+ || htmlElement.hasTagName(HTMLNames::mainTag)
+ || htmlElement.hasTagName(HTMLNames::navTag)
+ || htmlElement.hasTagName(HTMLNames::olTag)
+ || htmlElement.hasTagName(HTMLNames::pTag)
+ || htmlElement.hasTagName(HTMLNames::preTag)
+ || htmlElement.hasTagName(HTMLNames::sectionTag)
+ || (htmlElement.hasTagName(HTMLNames::styleTag) && htmlElement.hasAttribute("scoped"))
+ || htmlElement.hasTagName(HTMLNames::tableTag)
+ || htmlElement.hasTagName(HTMLNames::ulTag);
+}
+
+const MathMLElement::BooleanValue& MathMLPresentationElement::cachedBooleanAttribute(const QualifiedName& name, Optional<BooleanValue>& attribute)
+{
+ if (attribute)
+ return attribute.value();
+
+ // In MathML, attribute values are case-sensitive.
+ const AtomicString& value = attributeWithoutSynchronization(name);
+ if (value == "true")
+ attribute = BooleanValue::True;
+ else if (value == "false")
+ attribute = BooleanValue::False;
+ else
+ attribute = BooleanValue::Default;
+
+ return attribute.value();
+}
+
+MathMLElement::Length MathMLPresentationElement::parseNumberAndUnit(const StringView& string)
+{
+ LengthType lengthType = LengthType::UnitLess;
+ unsigned stringLength = string.length();
+ UChar lastChar = string[stringLength - 1];
+ if (lastChar == '%') {
+ lengthType = LengthType::Percentage;
+ stringLength--;
+ } else if (stringLength >= 2) {
+ UChar penultimateChar = string[stringLength - 2];
+ if (penultimateChar == 'c' && lastChar == 'm')
+ lengthType = LengthType::Cm;
+ if (penultimateChar == 'e' && lastChar == 'm')
+ lengthType = LengthType::Em;
+ else if (penultimateChar == 'e' && lastChar == 'x')
+ lengthType = LengthType::Ex;
+ else if (penultimateChar == 'i' && lastChar == 'n')
+ lengthType = LengthType::In;
+ else if (penultimateChar == 'm' && lastChar == 'm')
+ lengthType = LengthType::Mm;
+ else if (penultimateChar == 'p' && lastChar == 'c')
+ lengthType = LengthType::Pc;
+ else if (penultimateChar == 'p' && lastChar == 't')
+ lengthType = LengthType::Pt;
+ else if (penultimateChar == 'p' && lastChar == 'x')
+ lengthType = LengthType::Px;
+
+ if (lengthType != LengthType::UnitLess)
+ stringLength -= 2;
+ }
+
+ bool ok;
+ float lengthValue = string.substring(0, stringLength).toFloat(ok);
+ if (!ok)
+ return Length();
+
+ Length length;
+ length.type = lengthType;
+ length.value = lengthValue;
+ return length;
+}
+
+MathMLElement::Length MathMLPresentationElement::parseNamedSpace(const StringView& string)
+{
+ // Named space values are case-sensitive.
+ int namedSpaceValue;
+ if (string == "veryverythinmathspace")
+ namedSpaceValue = 1;
+ else if (string == "verythinmathspace")
+ namedSpaceValue = 2;
+ else if (string == "thinmathspace")
+ namedSpaceValue = 3;
+ else if (string == "mediummathspace")
+ namedSpaceValue = 4;
+ else if (string == "thickmathspace")
+ namedSpaceValue = 5;
+ else if (string == "verythickmathspace")
+ namedSpaceValue = 6;
+ else if (string == "veryverythickmathspace")
+ namedSpaceValue = 7;
+ else if (string == "negativeveryverythinmathspace")
+ namedSpaceValue = -1;
+ else if (string == "negativeverythinmathspace")
+ namedSpaceValue = -2;
+ else if (string == "negativethinmathspace")
+ namedSpaceValue = -3;
+ else if (string == "negativemediummathspace")
+ namedSpaceValue = -4;
+ else if (string == "negativethickmathspace")
+ namedSpaceValue = -5;
+ else if (string == "negativeverythickmathspace")
+ namedSpaceValue = -6;
+ else if (string == "negativeveryverythickmathspace")
+ namedSpaceValue = -7;
+ else
+ return Length();
+
+ Length length;
+ length.type = LengthType::MathUnit;
+ length.value = namedSpaceValue;
+ return length;
+}
+
+MathMLElement::Length MathMLPresentationElement::parseMathMLLength(const String& string)
+{
+ // The regular expression from the MathML Relax NG schema is as follows:
+ //
+ // pattern = '\s*((-?[0-9]*([0-9]\.?|\.[0-9])[0-9]*(e[mx]|in|cm|mm|p[xtc]|%)?)|(negative)?((very){0,2}thi(n|ck)|medium)mathspace)\s*'
+ //
+ // We do not perform a strict verification of the syntax of whitespaces and number.
+ // Instead, we just use isHTMLSpace and toFloat to parse these parts.
+
+ // We first skip whitespace from both ends of the string.
+ StringView stringView = stripLeadingAndTrailingWhitespace(string);
+
+ if (stringView.isEmpty())
+ return Length();
+
+ // We consider the most typical case: a number followed by an optional unit.
+ UChar firstChar = stringView[0];
+ if (isASCIIDigit(firstChar) || firstChar == '-' || firstChar == '.')
+ return parseNumberAndUnit(stringView);
+
+ // Otherwise, we try and parse a named space.
+ return parseNamedSpace(stringView);
+}
+
+const MathMLElement::Length& MathMLPresentationElement::cachedMathMLLength(const QualifiedName& name, Optional<Length>& length)
+{
+ if (length)
+ return length.value();
+ length = parseMathMLLength(attributeWithoutSynchronization(name));
+ return length.value();
+}
+
</ins><span class="cx"> bool MathMLPresentationElement::acceptsDisplayStyleAttribute()
</span><span class="cx"> {
</span><span class="cx"> return hasTagName(mtableTag);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+Optional<bool> MathMLPresentationElement::specifiedDisplayStyle()
+{
+ if (!acceptsDisplayStyleAttribute())
+ return Nullopt;
+ const MathMLElement::BooleanValue& specifiedDisplayStyle = cachedBooleanAttribute(displaystyleAttr, m_displayStyle);
+ return toOptionalBool(specifiedDisplayStyle);
+}
+
+MathMLElement::MathVariant MathMLPresentationElement::parseMathVariantAttribute(const AtomicString& attributeValue)
+{
+ // The mathvariant attribute values is case-sensitive.
+ if (attributeValue == "normal")
+ return MathVariant::Normal;
+ if (attributeValue == "bold")
+ return MathVariant::Bold;
+ if (attributeValue == "italic")
+ return MathVariant::Italic;
+ if (attributeValue == "bold-italic")
+ return MathVariant::BoldItalic;
+ if (attributeValue == "double-struck")
+ return MathVariant::DoubleStruck;
+ if (attributeValue == "bold-fraktur")
+ return MathVariant::BoldFraktur;
+ if (attributeValue == "script")
+ return MathVariant::Script;
+ if (attributeValue == "bold-script")
+ return MathVariant::BoldScript;
+ if (attributeValue == "fraktur")
+ return MathVariant::Fraktur;
+ if (attributeValue == "sans-serif")
+ return MathVariant::SansSerif;
+ if (attributeValue == "bold-sans-serif")
+ return MathVariant::BoldSansSerif;
+ if (attributeValue == "sans-serif-italic")
+ return MathVariant::SansSerifItalic;
+ if (attributeValue == "sans-serif-bold-italic")
+ return MathVariant::SansSerifBoldItalic;
+ if (attributeValue == "monospace")
+ return MathVariant::Monospace;
+ if (attributeValue == "initial")
+ return MathVariant::Initial;
+ if (attributeValue == "tailed")
+ return MathVariant::Tailed;
+ if (attributeValue == "looped")
+ return MathVariant::Looped;
+ if (attributeValue == "stretched")
+ return MathVariant::Stretched;
+ return MathVariant::None;
+}
+
+Optional<MathMLElement::MathVariant> MathMLPresentationElement::specifiedMathVariant()
+{
+ if (!acceptsMathVariantAttribute())
+ return Nullopt;
+ if (!m_mathVariant)
+ m_mathVariant = parseMathVariantAttribute(attributeWithoutSynchronization(mathvariantAttr));
+ return m_mathVariant.value() == MathVariant::None ? Nullopt : m_mathVariant;
+}
+
</ins><span class="cx"> void MathMLPresentationElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
</span><span class="cx"> {
</span><span class="cx"> bool displayStyleAttribute = name == displaystyleAttr && acceptsDisplayStyleAttribute();
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLPresentationElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLPresentationElement.h (205205 => 205206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLPresentationElement.h 2016-08-30 22:49:45 UTC (rev 205205)
+++ trunk/Source/WebCore/mathml/MathMLPresentationElement.h 2016-08-30 22:54:41 UTC (rev 205206)
</span><span class="lines">@@ -41,11 +41,31 @@
</span><span class="cx"> MathMLPresentationElement(const QualifiedName& tagName, Document&);
</span><span class="cx"> void parseAttribute(const QualifiedName&, const AtomicString&) override;
</span><span class="cx">
</span><del>- bool acceptsDisplayStyleAttribute() override;
</del><ins>+ static bool isPhrasingContent(const Node&);
+ static bool isFlowContent(const Node&);
</ins><span class="cx">
</span><ins>+ static Optional<bool> toOptionalBool(const BooleanValue& value) { return value == BooleanValue::Default ? Nullopt : Optional<bool>(value == BooleanValue::True); }
+ const BooleanValue& cachedBooleanAttribute(const QualifiedName&, Optional<BooleanValue>&);
+
+ static Length parseMathMLLength(const String&);
+ const Length& cachedMathMLLength(const QualifiedName&, Optional<Length>&);
+
+ virtual bool acceptsDisplayStyleAttribute();
+ Optional<bool> specifiedDisplayStyle() override;
+
+ virtual bool acceptsMathVariantAttribute() { return false; }
+ Optional<MathVariant> specifiedMathVariant() final;
+
+ Optional<BooleanValue> m_displayStyle;
+ Optional<MathVariant> m_mathVariant;
+
</ins><span class="cx"> private:
</span><span class="cx"> RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override;
</span><span class="cx"> bool isPresentationMathML() const final { return true; }
</span><ins>+
+ static Length parseNumberAndUnit(const StringView&);
+ static Length parseNamedSpace(const StringView&);
+ static MathVariant parseMathVariantAttribute(const AtomicString& attributeValue);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>