<!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>[171269] branches/safari-537.78-branch</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/171269">171269</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-07-19 16:00:00 -0700 (Sat, 19 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/169849">r169849</a>. <rdar://problem/17684636></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53778branchLayoutTestsChangeLog">branches/safari-537.78-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari53778branchSourceWebCoreChangeLog">branches/safari-537.78-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53778branchSourceWebCorepageWindowFeaturescpp">branches/safari-537.78-branch/Source/WebCore/page/WindowFeatures.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari53778branchLayoutTestsfastdomWindowresourceswindowpropertyinvalidcharactersignoredhtml">branches/safari-537.78-branch/LayoutTests/fast/dom/Window/resources/window-property-invalid-characters-ignored.html</a></li>
<li><a href="#branchessafari53778branchLayoutTestsfastdomWindowwindowpropertyinvalidcharactersignoredexpectedtxt">branches/safari-537.78-branch/LayoutTests/fast/dom/Window/window-property-invalid-characters-ignored-expected.txt</a></li>
<li><a href="#branchessafari53778branchLayoutTestsfastdomWindowwindowpropertyinvalidcharactersignoredhtml">branches/safari-537.78-branch/LayoutTests/fast/dom/Window/window-property-invalid-characters-ignored.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53778branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.78-branch/LayoutTests/ChangeLog (171268 => 171269)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.78-branch/LayoutTests/ChangeLog 2014-07-19 22:56:54 UTC (rev 171268)
+++ branches/safari-537.78-branch/LayoutTests/ChangeLog 2014-07-19 23:00:00 UTC (rev 171269)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2014-07-19 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r169849
+
+ 2014-06-11 David Kilzer <ddkilzer@apple.com>
+
+ WindowFeatures arguments shoud ignore invalid characters in values
+ <http://webkit.org/b/133703>
+ <rdar://problem/17254118>
+
+ Reviewed by Andy Estes.
+
+ * fast/dom/Window/resources/window-property-invalid-characters-ignored.html: Added.
+ * fast/dom/Window/window-property-invalid-characters-ignored-expected.txt: Added.
+ * fast/dom/Window/window-property-invalid-characters-ignored.html: Added.
+
+2014-07-19 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r169848
</span><span class="cx">
</span><span class="cx"> 2014-06-11 David Kilzer <ddkilzer@apple.com>
</span></span></pre></div>
<a id="branchessafari53778branchLayoutTestsfastdomWindowresourceswindowpropertyinvalidcharactersignoredhtmlfromrev169849trunkLayoutTestsfastdomWindowresourceswindowpropertyinvalidcharactersignoredhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-537.78-branch/LayoutTests/fast/dom/Window/resources/window-property-invalid-characters-ignored.html (from rev 169849, trunk/LayoutTests/fast/dom/Window/resources/window-property-invalid-characters-ignored.html) (0 => 171269)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.78-branch/LayoutTests/fast/dom/Window/resources/window-property-invalid-characters-ignored.html (rev 0)
+++ branches/safari-537.78-branch/LayoutTests/fast/dom/Window/resources/window-property-invalid-characters-ignored.html 2014-07-19 23:00:00 UTC (rev 171269)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+<!DOCTYPE html>
+<html><head></head><body onload="setTimeout('window.opener.finishTest()', 0)"></body></html>
</ins></span></pre></div>
<a id="branchessafari53778branchLayoutTestsfastdomWindowwindowpropertyinvalidcharactersignoredexpectedtxtfromrev169849trunkLayoutTestsfastdomWindowwindowpropertyinvalidcharactersignoredexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-537.78-branch/LayoutTests/fast/dom/Window/window-property-invalid-characters-ignored-expected.txt (from rev 169849, trunk/LayoutTests/fast/dom/Window/window-property-invalid-characters-ignored-expected.txt) (0 => 171269)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.78-branch/LayoutTests/fast/dom/Window/window-property-invalid-characters-ignored-expected.txt (rev 0)
+++ branches/safari-537.78-branch/LayoutTests/fast/dom/Window/window-property-invalid-characters-ignored-expected.txt 2014-07-19 23:00:00 UTC (rev 171269)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+Tests that invalid characters are ignored after a window property value.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS w.document.width is 123
+PASS w.document.height is 123
+PASS w !== window is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari53778branchLayoutTestsfastdomWindowwindowpropertyinvalidcharactersignoredhtmlfromrev169849trunkLayoutTestsfastdomWindowwindowpropertyinvalidcharactersignoredhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-537.78-branch/LayoutTests/fast/dom/Window/window-property-invalid-characters-ignored.html (from rev 169849, trunk/LayoutTests/fast/dom/Window/window-property-invalid-characters-ignored.html) (0 => 171269)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.78-branch/LayoutTests/fast/dom/Window/window-property-invalid-characters-ignored.html (rev 0)
+++ branches/safari-537.78-branch/LayoutTests/fast/dom/Window/window-property-invalid-characters-ignored.html 2014-07-19 23:00:00 UTC (rev 171269)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../../resources/js-test-pre.js"></script>
+<script>
+jsTestIsAsync = true;
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.setCanOpenWindows();
+}
+
+description("Tests that invalid characters are ignored after a window property value.");
+
+var w = window.open("resources/window-property-invalid-characters-ignored.html", "blank", "width=123\u0130,height=123\u0130");
+
+function finishTest()
+{
+ shouldBe("w.document.width", "123");
+ shouldBe("w.document.height", "123");
+ shouldBeTrue("w !== window");
+ w.close();
+
+ finishJSTest();
+}
+
+successfullyParsed = true;
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</head>
+<body>
+<pre id="console"></pre>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari53778branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.78-branch/Source/WebCore/ChangeLog (171268 => 171269)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.78-branch/Source/WebCore/ChangeLog 2014-07-19 22:56:54 UTC (rev 171268)
+++ branches/safari-537.78-branch/Source/WebCore/ChangeLog 2014-07-19 23:00:00 UTC (rev 171269)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2014-07-19 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r169849
+
+ 2014-06-11 David Kilzer <ddkilzer@apple.com>
+
+ WindowFeatures arguments shoud ignore invalid characters in values
+ <http://webkit.org/b/133703>
+ <rdar://problem/17254118>
+
+ Reviewed by Andy Estes.
+
+ Test: fast/dom/Window/window-property-invalid-characters-ignored.html
+
+ * page/WindowFeatures.cpp:
+ (WebCore::WindowFeatures::WindowFeatures): Set |length| based on
+ |buffer|, not |features|. Switch to using a for loop. Switch
+ to unsigned types since we are working with positive offsets
+ into a String.
+
+2014-07-19 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r169848
</span><span class="cx">
</span><span class="cx"> 2014-06-11 David Kilzer <ddkilzer@apple.com>
</span></span></pre></div>
<a id="branchessafari53778branchSourceWebCorepageWindowFeaturescpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.78-branch/Source/WebCore/page/WindowFeatures.cpp (171268 => 171269)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.78-branch/Source/WebCore/page/WindowFeatures.cpp 2014-07-19 22:56:54 UTC (rev 171268)
+++ branches/safari-537.78-branch/Source/WebCore/page/WindowFeatures.cpp 2014-07-19 23:00:00 UTC (rev 171269)
</span><span class="lines">@@ -71,13 +71,12 @@
</span><span class="cx"> resizable = true;
</span><span class="cx">
</span><span class="cx"> // Tread lightly in this code -- it was specifically designed to mimic Win IE's parsing behavior.
</span><del>- int keyBegin, keyEnd;
- int valueBegin, valueEnd;
</del><ins>+ unsigned keyBegin, keyEnd;
+ unsigned valueBegin, valueEnd;
</ins><span class="cx">
</span><del>- int i = 0;
- int length = features.length();
</del><span class="cx"> String buffer = features.lower();
</span><del>- while (i < length) {
</del><ins>+ unsigned length = buffer.length();
+ for (unsigned i = 0; i < length; ) {
</ins><span class="cx"> // skip to first non-separator, but don't skip past the end of the string
</span><span class="cx"> while (isWindowFeaturesSeparator(buffer[i])) {
</span><span class="cx"> if (i >= length)
</span></span></pre>
</div>
</div>
</body>
</html>