<!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>[204221] 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/204221">204221</a></dd>
<dt>Author</dt> <dd>utatane.tea@gmail.com</dd>
<dt>Date</dt> <dd>2016-08-05 23:28:24 -0700 (Fri, 05 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ES6] Add ScriptElement::determineScriptType
https://bugs.webkit.org/show_bug.cgi?id=149576
Reviewed by Ryosuke Niwa.
Change ScriptElement::isScriptTypeSupported to ScriptElement::determineScriptType.
And introduce ScriptType, which is either "classic" or "module".
And support "module" type in ScriptElement[1, 2].
But this patch does not contain any module tag support code.
This will be implemented in the subsequent patch.
[1]: https://html.spec.whatwg.org/multipage/webappapis.html#integration-with-the-javascript-module-system
[2]: https://html.spec.whatwg.org/multipage/scripting.html#attr-script-type
* dom/ScriptElement.cpp:
(WebCore::ScriptElement::determineScriptType):
(WebCore::ScriptElement::prepareScript):
(WebCore::ScriptElement::isScriptTypeSupported): Deleted.
* dom/ScriptElement.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomScriptElementcpp">trunk/Source/WebCore/dom/ScriptElement.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScriptElementh">trunk/Source/WebCore/dom/ScriptElement.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204220 => 204221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-08-06 05:37:28 UTC (rev 204220)
+++ trunk/Source/WebCore/ChangeLog        2016-08-06 06:28:24 UTC (rev 204221)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-08-05 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [ES6] Add ScriptElement::determineScriptType
+ https://bugs.webkit.org/show_bug.cgi?id=149576
+
+ Reviewed by Ryosuke Niwa.
+
+ Change ScriptElement::isScriptTypeSupported to ScriptElement::determineScriptType.
+ And introduce ScriptType, which is either "classic" or "module".
+ And support "module" type in ScriptElement[1, 2].
+ But this patch does not contain any module tag support code.
+ This will be implemented in the subsequent patch.
+
+ [1]: https://html.spec.whatwg.org/multipage/webappapis.html#integration-with-the-javascript-module-system
+ [2]: https://html.spec.whatwg.org/multipage/scripting.html#attr-script-type
+
+ * dom/ScriptElement.cpp:
+ (WebCore::ScriptElement::determineScriptType):
+ (WebCore::ScriptElement::prepareScript):
+ (WebCore::ScriptElement::isScriptTypeSupported): Deleted.
+ * dom/ScriptElement.h:
+
</ins><span class="cx"> 2016-08-05 Jonathan Bedard <jbedard@apple.com>
</span><span class="cx">
</span><span class="cx"> NULL Reference Error in ElementRuleCollector
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptElement.cpp (204220 => 204221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptElement.cpp        2016-08-06 05:37:28 UTC (rev 204220)
+++ trunk/Source/WebCore/dom/ScriptElement.cpp        2016-08-06 06:28:24 UTC (rev 204221)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> m_element.dispatchEvent(Event::create(eventNames().errorEvent, false, false));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ScriptElement::isScriptTypeSupported(LegacyTypeSupport supportLegacyTypes) const
</del><ins>+Optional<ScriptElement::ScriptType> ScriptElement::determineScriptType(LegacyTypeSupport supportLegacyTypes) const
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: isLegacySupportedJavaScriptLanguage() is not valid HTML5. It is used here to maintain backwards compatibility with existing layout tests. The specific violations are:
</span><span class="cx"> // - Allowing type=javascript. type= should only support MIME types, such as text/javascript.
</span><span class="lines">@@ -154,18 +154,24 @@
</span><span class="cx"> String language = languageAttributeValue();
</span><span class="cx"> if (type.isEmpty()) {
</span><span class="cx"> if (language.isEmpty())
</span><del>- return true; // Assume text/javascript.
</del><ins>+ return ScriptType::Classic; // Assume text/javascript.
</ins><span class="cx"> if (MIMETypeRegistry::isSupportedJavaScriptMIMEType("text/" + language))
</span><del>- return true;
</del><ins>+ return ScriptType::Classic;
</ins><span class="cx"> if (isLegacySupportedJavaScriptLanguage(language))
</span><del>- return true;
- return false;
</del><ins>+ return ScriptType::Classic;
+ return Nullopt;
</ins><span class="cx"> }
</span><span class="cx"> if (MIMETypeRegistry::isSupportedJavaScriptMIMEType(type.stripWhiteSpace()))
</span><del>- return true;
</del><ins>+ return ScriptType::Classic;
</ins><span class="cx"> if (supportLegacyTypes == AllowLegacyTypeInTypeAttribute && isLegacySupportedJavaScriptLanguage(type))
</span><del>- return true;
- return false;
</del><ins>+ return ScriptType::Classic;
+#if ENABLE(ES6_MODULES)
+ // https://html.spec.whatwg.org/multipage/scripting.html#attr-script-type
+ // Setting the attribute to an ASCII case-insensitive match for the string "module" means that the script is a module script.
+ if (equalLettersIgnoringASCIICase(type, "module"))
+ return ScriptType::Module;
+#endif
+ return Nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // http://dev.w3.org/html5/spec/Overview.html#prepare-a-script
</span><span class="lines">@@ -191,7 +197,7 @@
</span><span class="cx"> if (!m_element.inDocument())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (!isScriptTypeSupported(supportLegacyTypes))
</del><ins>+ if (!determineScriptType(supportLegacyTypes))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (wasParserInserted) {
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptElement.h (204220 => 204221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptElement.h        2016-08-06 05:37:28 UTC (rev 204220)
+++ trunk/Source/WebCore/dom/ScriptElement.h        2016-08-06 06:28:24 UTC (rev 204221)
</span><span class="lines">@@ -53,7 +53,6 @@
</span><span class="cx"> // XML parser calls these
</span><span class="cx"> virtual void dispatchLoadEvent() = 0;
</span><span class="cx"> void dispatchErrorEvent();
</span><del>- bool isScriptTypeSupported(LegacyTypeSupport) const;
</del><span class="cx">
</span><span class="cx"> bool haveFiredLoadEvent() const { return m_haveFiredLoad; }
</span><span class="cx"> bool willBeParserExecuted() const { return m_willBeParserExecuted; }
</span><span class="lines">@@ -77,6 +76,9 @@
</span><span class="cx"> void handleAsyncAttribute();
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ // https://html.spec.whatwg.org/multipage/scripting.html#concept-script-type
+ enum class ScriptType { Classic, Module };
+ Optional<ScriptType> determineScriptType(LegacyTypeSupport) const;
</ins><span class="cx"> bool ignoresLoadRequest() const;
</span><span class="cx"> bool isScriptForEventSupported() const;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>