<!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>[191349] trunk</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/191349">191349</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-10-20 11:33:38 -0700 (Tue, 20 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Only HTML spaces should be stripped from a <script>'s 'for' / 'event' attributes
https://bugs.webkit.org/show_bug.cgi?id=150335
Reviewed by Darin Adler.
Source/WebCore:
Only HTML spaces should be stripped from a <script>'s 'for' / 'event' attributes:
https://html.spec.whatwg.org/multipage/scripting.html#prepare-a-script (step 12.3)
https://html.spec.whatwg.org/multipage/infrastructure.html#space-character
Previously, we were uding the wrong stripping function and we were stripping
some non-HTML spaces.
Test: fast/dom/script-for-event-spaces.html
* dom/ScriptElement.cpp:
(WebCore::ScriptElement::isScriptForEventSupported):
LayoutTests:
Add a layout test to check that U+000B does not get stripped from the
script's 'for' / 'event' attributes.
* fast/dom/script-for-event-spaces-expected.txt: Added.
* fast/dom/script-for-event-spaces.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomScriptElementcpp">trunk/Source/WebCore/dom/ScriptElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdomscriptforeventspacesexpectedtxt">trunk/LayoutTests/fast/dom/script-for-event-spaces-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomscriptforeventspaceshtml">trunk/LayoutTests/fast/dom/script-for-event-spaces.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (191348 => 191349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-10-20 18:15:58 UTC (rev 191348)
+++ trunk/LayoutTests/ChangeLog 2015-10-20 18:33:38 UTC (rev 191349)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-10-20 Chris Dumez <cdumez@apple.com>
+
+ Only HTML spaces should be stripped from a <script>'s 'for' / 'event' attributes
+ https://bugs.webkit.org/show_bug.cgi?id=150335
+
+ Reviewed by Darin Adler.
+
+ Add a layout test to check that U+000B does not get stripped from the
+ script's 'for' / 'event' attributes.
+
+ * fast/dom/script-for-event-spaces-expected.txt: Added.
+ * fast/dom/script-for-event-spaces.html: Added.
+
</ins><span class="cx"> 2015-10-20 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgba4444.html flakily times out on Mavericks WK1
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomscriptforeventspacesexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/script-for-event-spaces-expected.txt (0 => 191349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/script-for-event-spaces-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/dom/script-for-event-spaces-expected.txt 2015-10-20 18:33:38 UTC (rev 191349)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+Tests that only HTML spaces in a script's 'event' / 'for' attributes are stripped.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+* for="&#xb;window&#xb;" event="onload"
+PASS wasExecuted is false
+
+* for="window" event="&#xb;onload&#xb;"
+PASS wasExecuted is false
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomscriptforeventspaceshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/script-for-event-spaces.html (0 => 191349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/script-for-event-spaces.html (rev 0)
+++ trunk/LayoutTests/fast/dom/script-for-event-spaces.html 2015-10-20 18:33:38 UTC (rev 191349)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<script src="../../resources/js-test.js"></script>
+
+<script>
+description("Tests that only HTML spaces in a script's 'event' / 'for' attributes are stripped.");
+var wasExecuted = false;
+// U+000B / &#xb; is not an HTML space.
+</script>
+
+<script for="&#xb;window&#xb;" event="onload">
+wasExecuted = true;
+</script>
+
+<script>
+debug("* for=\"&amp;#xb;window&amp;#xb;\" event=\"onload\"");
+shouldBeFalse("wasExecuted");
+wasExecuted = false;
+</script>
+
+<script for="window" event="&#xb;onload&#xb;">
+wasExecuted = true;
+</script>
+
+<script>
+debug("");
+debug("* for=\"window\" event=\"&amp;#xb;onload&amp;#xb;\"");
+shouldBeFalse("wasExecuted");
+wasExecuted = false;
+</script>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191348 => 191349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-20 18:15:58 UTC (rev 191348)
+++ trunk/Source/WebCore/ChangeLog 2015-10-20 18:33:38 UTC (rev 191349)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-10-20 Chris Dumez <cdumez@apple.com>
+
+ Only HTML spaces should be stripped from a <script>'s 'for' / 'event' attributes
+ https://bugs.webkit.org/show_bug.cgi?id=150335
+
+ Reviewed by Darin Adler.
+
+ Only HTML spaces should be stripped from a <script>'s 'for' / 'event' attributes:
+ https://html.spec.whatwg.org/multipage/scripting.html#prepare-a-script (step 12.3)
+ https://html.spec.whatwg.org/multipage/infrastructure.html#space-character
+
+ Previously, we were uding the wrong stripping function and we were stripping
+ some non-HTML spaces.
+
+ Test: fast/dom/script-for-event-spaces.html
+
+ * dom/ScriptElement.cpp:
+ (WebCore::ScriptElement::isScriptForEventSupported):
+
</ins><span class="cx"> 2015-10-20 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix the !ENABLE(CSS_GRID_LAYOUT) build after r191128
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptElement.cpp (191348 => 191349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptElement.cpp 2015-10-20 18:15:58 UTC (rev 191348)
+++ trunk/Source/WebCore/dom/ScriptElement.cpp 2015-10-20 18:33:38 UTC (rev 191349)
</span><span class="lines">@@ -369,11 +369,11 @@
</span><span class="cx"> String eventAttribute = eventAttributeValue();
</span><span class="cx"> String forAttribute = forAttributeValue();
</span><span class="cx"> if (!eventAttribute.isNull() && !forAttribute.isNull()) {
</span><del>- forAttribute = forAttribute.stripWhiteSpace();
</del><ins>+ forAttribute = stripLeadingAndTrailingHTMLSpaces(forAttribute);
</ins><span class="cx"> if (!equalIgnoringCase(forAttribute, "window"))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- eventAttribute = eventAttribute.stripWhiteSpace();
</del><ins>+ eventAttribute = stripLeadingAndTrailingHTMLSpaces(eventAttribute);
</ins><span class="cx"> if (!equalIgnoringCase(eventAttribute, "onload") && !equalIgnoringCase(eventAttribute, "onload()"))
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>