<!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>[182872] 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/182872">182872</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-15 17:15:11 -0700 (Wed, 15 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>String.prototype.startsWith/endsWith/includes have wrong length in <a href="http://trac.webkit.org/projects/webkit/changeset/182673">r182673</a>
https://bugs.webkit.org/show_bug.cgi?id=143659
Patch by Jordan Harband <ljharb@gmail.com> on 2015-04-15
Reviewed by Benjamin Poulain.
Source/JavaScriptCore:
Fix lengths of String.prototype.{includes,startsWith,endsWith} per spec
https://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.includes
https://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.startswith
https://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.endswith
* runtime/StringPrototype.cpp:
(JSC::StringPrototype::finishCreation):
LayoutTests:
* js/script-tests/string-includes.js:
* js/string-includes-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsstringincludesjs">trunk/LayoutTests/js/script-tests/string-includes.js</a></li>
<li><a href="#trunkLayoutTestsjsstringincludesexpectedtxt">trunk/LayoutTests/js/string-includes-expected.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStringPrototypecpp">trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (182871 => 182872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-04-16 00:10:57 UTC (rev 182871)
+++ trunk/LayoutTests/ChangeLog 2015-04-16 00:15:11 UTC (rev 182872)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2015-04-15 Jordan Harband <ljharb@gmail.com>
</span><span class="cx">
</span><ins>+ String.prototype.startsWith/endsWith/includes have wrong length in r182673
+ https://bugs.webkit.org/show_bug.cgi?id=143659
+
+ Reviewed by Benjamin Poulain.
+
+ * js/script-tests/string-includes.js:
+ * js/string-includes-expected.txt:
+
+2015-04-15 Jordan Harband <ljharb@gmail.com>
+
</ins><span class="cx"> Math.imul has wrong length in Safari 8.0.4
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=143658
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsstringincludesjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/string-includes.js (182871 => 182872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/string-includes.js 2015-04-16 00:10:57 UTC (rev 182871)
+++ trunk/LayoutTests/js/script-tests/string-includes.js 2015-04-16 00:15:11 UTC (rev 182872)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> description("This test checks the ES6 string functions startsWith(), endsWith() and includes().");
</span><span class="cx">
</span><span class="cx"> // Test includes
</span><ins>+shouldBe("String.prototype.includes.length", "1");
</ins><span class="cx"> shouldBe("'foo bar'.includes('bar')", "true");
</span><span class="cx"> shouldBe("'foo bar'.includes('bar', 4)", "true");
</span><span class="cx"> shouldBe("'foo bar'.includes('ar', 5)", "true");
</span><span class="lines">@@ -31,6 +32,7 @@
</span><span class="cx"> shouldBe("'フーバー'.includes('クー')", "false");
</span><span class="cx">
</span><span class="cx"> // Test startsWith
</span><ins>+shouldBe("String.prototype.startsWith.length", "1");
</ins><span class="cx"> shouldBe("'foo bar'.startsWith('foo')", "true");
</span><span class="cx"> shouldBe("'foo bar'.startsWith('foo', 0)", "true");
</span><span class="cx"> shouldBe("'foo bar'.startsWith('foo', -1)", "true");
</span><span class="lines">@@ -60,6 +62,7 @@
</span><span class="cx"> shouldBe("'foo bar'.startsWith('フー', 1)", "false");
</span><span class="cx">
</span><span class="cx"> // Test endsWith
</span><ins>+shouldBe("String.prototype.endsWith.length", "1");
</ins><span class="cx"> shouldBe("'foo bar'.endsWith('bar')", "true");
</span><span class="cx"> shouldBe("'foo bar'.endsWith('ba', 6)", "true");
</span><span class="cx"> shouldBe("'foo bar'.endsWith(' ba', 6)", "true");
</span></span></pre></div>
<a id="trunkLayoutTestsjsstringincludesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/string-includes-expected.txt (182871 => 182872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/string-includes-expected.txt 2015-04-16 00:10:57 UTC (rev 182871)
+++ trunk/LayoutTests/js/string-includes-expected.txt 2015-04-16 00:15:11 UTC (rev 182872)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><ins>+PASS String.prototype.includes.length is 1
</ins><span class="cx"> PASS 'foo bar'.includes('bar') is true
</span><span class="cx"> PASS 'foo bar'.includes('bar', 4) is true
</span><span class="cx"> PASS 'foo bar'.includes('ar', 5) is true
</span><span class="lines">@@ -31,6 +32,7 @@
</span><span class="cx"> PASS 'foo 1e100 bar'.includes(1e100) is false
</span><span class="cx"> PASS 'フーバー'.includes('ーバ') is true
</span><span class="cx"> PASS 'フーバー'.includes('クー') is false
</span><ins>+PASS String.prototype.startsWith.length is 1
</ins><span class="cx"> PASS 'foo bar'.startsWith('foo') is true
</span><span class="cx"> PASS 'foo bar'.startsWith('foo', 0) is true
</span><span class="cx"> PASS 'foo bar'.startsWith('foo', -1) is true
</span><span class="lines">@@ -58,6 +60,7 @@
</span><span class="cx"> PASS 'フーバー'.startsWith('abc', 1) is false
</span><span class="cx"> PASS 'foo bar'.startsWith('フー') is false
</span><span class="cx"> PASS 'foo bar'.startsWith('フー', 1) is false
</span><ins>+PASS String.prototype.endsWith.length is 1
</ins><span class="cx"> PASS 'foo bar'.endsWith('bar') is true
</span><span class="cx"> PASS 'foo bar'.endsWith('ba', 6) is true
</span><span class="cx"> PASS 'foo bar'.endsWith(' ba', 6) is true
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (182871 => 182872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-04-16 00:10:57 UTC (rev 182871)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-04-16 00:15:11 UTC (rev 182872)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-04-15 Jordan Harband <ljharb@gmail.com>
+
+ String.prototype.startsWith/endsWith/includes have wrong length in r182673
+ https://bugs.webkit.org/show_bug.cgi?id=143659
+
+ Reviewed by Benjamin Poulain.
+
+ Fix lengths of String.prototype.{includes,startsWith,endsWith} per spec
+ https://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.includes
+ https://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.startswith
+ https://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.endswith
+
+ * runtime/StringPrototype.cpp:
+ (JSC::StringPrototype::finishCreation):
+
</ins><span class="cx"> 2015-04-15 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove obsolete VMInspector debugging tool.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStringPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp (182871 => 182872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp 2015-04-16 00:10:57 UTC (rev 182871)
+++ trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp 2015-04-16 00:15:11 UTC (rev 182872)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx"> * Copyright (C) 1999-2001 Harri Porten (porten@kde.org)
</span><span class="cx"> * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2013 Apple Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2009 Torch Mobile, Inc.
</span><ins>+ * Copyright (C) 2015 Jordan Harband (ljharb@gmail.com)
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Lesser General Public
</span><span class="lines">@@ -139,9 +140,9 @@
</span><span class="cx"> JSC_NATIVE_FUNCTION("trim", stringProtoFuncTrim, DontEnum, 0);
</span><span class="cx"> JSC_NATIVE_FUNCTION("trimLeft", stringProtoFuncTrimLeft, DontEnum, 0);
</span><span class="cx"> JSC_NATIVE_FUNCTION("trimRight", stringProtoFuncTrimRight, DontEnum, 0);
</span><del>- JSC_NATIVE_FUNCTION("startsWith", stringProtoFuncStartsWith, DontEnum, 0);
- JSC_NATIVE_FUNCTION("endsWith", stringProtoFuncEndsWith, DontEnum, 0);
- JSC_NATIVE_FUNCTION("includes", stringProtoFuncIncludes, DontEnum, 0);
</del><ins>+ JSC_NATIVE_FUNCTION("startsWith", stringProtoFuncStartsWith, DontEnum, 1);
+ JSC_NATIVE_FUNCTION("endsWith", stringProtoFuncEndsWith, DontEnum, 1);
+ JSC_NATIVE_FUNCTION("includes", stringProtoFuncIncludes, DontEnum, 1);
</ins><span class="cx"> JSC_NATIVE_FUNCTION(vm.propertyNames->iteratorSymbol, stringProtoFuncIterator, DontEnum, 0);
</span><span class="cx">
</span><span class="cx"> JSC_NATIVE_INTRINSIC_FUNCTION(vm.propertyNames->charCodeAtPrivateName, stringProtoFuncCharCodeAt, DontEnum, 1, CharCodeAtIntrinsic);
</span></span></pre>
</div>
</div>
</body>
</html>