<!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>[207048] releases/WebKitGTK/webkit-2.14</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/207048">207048</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-10 23:12:39 -0700 (Mon, 10 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/205568">r205568</a> - [INTL] some valid language tags cause errors in Intl constructors
https://bugs.webkit.org/show_bug.cgi?id=161672
Patch by Andy VanWagoner <thetalecrafter@gmail.com> on 2016-09-07
Reviewed by Mark Lam.
Source/JavaScriptCore:
Fix private use tag parsing to match spec, allowing single character parts.
https://www.rfc-editor.org/rfc/bcp/bcp47.txt
```
privateuse = "x" 1*("-" (1*8alphanum))
```
* runtime/IntlObject.cpp:
(JSC::privateUseLangTag): Allow singleton parts in private use tag.
LayoutTests:
Add list of valid language tags that should not throw from test262.
* js/intl-collator-expected.txt:
* js/intl-datetimeformat-expected.txt:
* js/intl-numberformat-expected.txt:
* js/script-tests/intl-collator.js:
* js/script-tests/intl-datetimeformat.js:
* js/script-tests/intl-numberformat.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsjsintlcollatorexpectedtxt">releases/WebKitGTK/webkit-2.14/LayoutTests/js/intl-collator-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsjsintldatetimeformatexpectedtxt">releases/WebKitGTK/webkit-2.14/LayoutTests/js/intl-datetimeformat-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsjsintlnumberformatexpectedtxt">releases/WebKitGTK/webkit-2.14/LayoutTests/js/intl-numberformat-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsjsscripttestsintlcollatorjs">releases/WebKitGTK/webkit-2.14/LayoutTests/js/script-tests/intl-collator.js</a></li>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsjsscripttestsintldatetimeformatjs">releases/WebKitGTK/webkit-2.14/LayoutTests/js/script-tests/intl-datetimeformat.js</a></li>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsjsscripttestsintlnumberformatjs">releases/WebKitGTK/webkit-2.14/LayoutTests/js/script-tests/intl-numberformat.js</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceJavaScriptCoreruntimeIntlObjectcpp">releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/runtime/IntlObject.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog (207047 => 207048)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog 2016-10-11 06:10:49 UTC (rev 207047)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog 2016-10-11 06:12:39 UTC (rev 207048)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-09-07 Andy VanWagoner <thetalecrafter@gmail.com>
+
+ [INTL] some valid language tags cause errors in Intl constructors
+ https://bugs.webkit.org/show_bug.cgi?id=161672
+
+ Reviewed by Mark Lam.
+
+ Add list of valid language tags that should not throw from test262.
+
+ * js/intl-collator-expected.txt:
+ * js/intl-datetimeformat-expected.txt:
+ * js/intl-numberformat-expected.txt:
+ * js/script-tests/intl-collator.js:
+ * js/script-tests/intl-datetimeformat.js:
+ * js/script-tests/intl-numberformat.js:
+
</ins><span class="cx"> 2016-09-06 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Strikethrough positions are erroneously snapped twice
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestsjsintlcollatorexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/LayoutTests/js/intl-collator-expected.txt (207047 => 207048)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/js/intl-collator-expected.txt 2016-10-11 06:10:49 UTC (rev 207047)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/js/intl-collator-expected.txt 2016-10-11 06:12:39 UTC (rev 207048)
</span><span class="lines">@@ -106,6 +106,25 @@
</span><span class="cx"> PASS Intl.Collator.supportedLocalesOf('en-*') threw exception RangeError: invalid language tag: en-*.
</span><span class="cx"> PASS Intl.Collator.supportedLocalesOf('en-') threw exception RangeError: invalid language tag: en-.
</span><span class="cx"> PASS Intl.Collator.supportedLocalesOf('en--US') threw exception RangeError: invalid language tag: en--US.
</span><ins>+PASS Intl.Collator.supportedLocalesOf('de') did not throw exception.
+PASS Intl.Collator.supportedLocalesOf('de-DE') did not throw exception.
+PASS Intl.Collator.supportedLocalesOf('DE-de') did not throw exception.
+PASS Intl.Collator.supportedLocalesOf('cmn') did not throw exception.
+PASS Intl.Collator.supportedLocalesOf('cmn-Hans') did not throw exception.
+PASS Intl.Collator.supportedLocalesOf('CMN-hANS') did not throw exception.
+PASS Intl.Collator.supportedLocalesOf('cmn-hans-cn') did not throw exception.
+PASS Intl.Collator.supportedLocalesOf('es-419') did not throw exception.
+PASS Intl.Collator.supportedLocalesOf('es-419-u-nu-latn-cu-bob') did not throw exception.
+PASS Intl.Collator.supportedLocalesOf('i-klingon') did not throw exception.
+PASS Intl.Collator.supportedLocalesOf('cmn-hans-cn-t-ca-u-ca-x-t-u') did not throw exception.
+PASS Intl.Collator.supportedLocalesOf('enochian-enochian') did not throw exception.
+PASS Intl.Collator.supportedLocalesOf('de-gregory-u-ca-gregory') did not throw exception.
+PASS Intl.Collator.supportedLocalesOf('aa-a-foo-x-a-foo-bar') did not throw exception.
+PASS Intl.Collator.supportedLocalesOf('x-en-US-12345') did not throw exception.
+PASS Intl.Collator.supportedLocalesOf('x-12345-12345-en-US') did not throw exception.
+PASS Intl.Collator.supportedLocalesOf('x-en-US-12345-12345') did not throw exception.
+PASS Intl.Collator.supportedLocalesOf('x-en-u-foo') did not throw exception.
+PASS Intl.Collator.supportedLocalesOf('x-en-u-foo-u-bar') did not throw exception.
</ins><span class="cx"> PASS Intl.Collator.prototype.constructor is Intl.Collator
</span><span class="cx"> PASS Intl.Collator.prototype.compare is an instance of Function
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(Intl.Collator.prototype, 'compare').get is an instance of Function
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestsjsintldatetimeformatexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/LayoutTests/js/intl-datetimeformat-expected.txt (207047 => 207048)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/js/intl-datetimeformat-expected.txt 2016-10-11 06:10:49 UTC (rev 207047)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/js/intl-datetimeformat-expected.txt 2016-10-11 06:12:39 UTC (rev 207048)
</span><span class="lines">@@ -43,6 +43,25 @@
</span><span class="cx"> PASS Intl.DateTimeFormat.supportedLocalesOf('en-*') threw exception RangeError: invalid language tag: en-*.
</span><span class="cx"> PASS Intl.DateTimeFormat.supportedLocalesOf('en-') threw exception RangeError: invalid language tag: en-.
</span><span class="cx"> PASS Intl.DateTimeFormat.supportedLocalesOf('en--US') threw exception RangeError: invalid language tag: en--US.
</span><ins>+PASS Intl.DateTimeFormat.supportedLocalesOf('de') did not throw exception.
+PASS Intl.DateTimeFormat.supportedLocalesOf('de-DE') did not throw exception.
+PASS Intl.DateTimeFormat.supportedLocalesOf('DE-de') did not throw exception.
+PASS Intl.DateTimeFormat.supportedLocalesOf('cmn') did not throw exception.
+PASS Intl.DateTimeFormat.supportedLocalesOf('cmn-Hans') did not throw exception.
+PASS Intl.DateTimeFormat.supportedLocalesOf('CMN-hANS') did not throw exception.
+PASS Intl.DateTimeFormat.supportedLocalesOf('cmn-hans-cn') did not throw exception.
+PASS Intl.DateTimeFormat.supportedLocalesOf('es-419') did not throw exception.
+PASS Intl.DateTimeFormat.supportedLocalesOf('es-419-u-nu-latn-cu-bob') did not throw exception.
+PASS Intl.DateTimeFormat.supportedLocalesOf('i-klingon') did not throw exception.
+PASS Intl.DateTimeFormat.supportedLocalesOf('cmn-hans-cn-t-ca-u-ca-x-t-u') did not throw exception.
+PASS Intl.DateTimeFormat.supportedLocalesOf('enochian-enochian') did not throw exception.
+PASS Intl.DateTimeFormat.supportedLocalesOf('de-gregory-u-ca-gregory') did not throw exception.
+PASS Intl.DateTimeFormat.supportedLocalesOf('aa-a-foo-x-a-foo-bar') did not throw exception.
+PASS Intl.DateTimeFormat.supportedLocalesOf('x-en-US-12345') did not throw exception.
+PASS Intl.DateTimeFormat.supportedLocalesOf('x-12345-12345-en-US') did not throw exception.
+PASS Intl.DateTimeFormat.supportedLocalesOf('x-en-US-12345-12345') did not throw exception.
+PASS Intl.DateTimeFormat.supportedLocalesOf('x-en-u-foo') did not throw exception.
+PASS Intl.DateTimeFormat.supportedLocalesOf('x-en-u-foo-u-bar') did not throw exception.
</ins><span class="cx"> PASS Intl.DateTimeFormat.prototype.constructor is Intl.DateTimeFormat
</span><span class="cx"> PASS Intl.DateTimeFormat.prototype.format is an instance of Function
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(Intl.DateTimeFormat.prototype, 'format').get is an instance of Function
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestsjsintlnumberformatexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/LayoutTests/js/intl-numberformat-expected.txt (207047 => 207048)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/js/intl-numberformat-expected.txt 2016-10-11 06:10:49 UTC (rev 207047)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/js/intl-numberformat-expected.txt 2016-10-11 06:12:39 UTC (rev 207048)
</span><span class="lines">@@ -111,6 +111,25 @@
</span><span class="cx"> PASS Intl.NumberFormat.supportedLocalesOf('en-*') threw exception RangeError: invalid language tag: en-*.
</span><span class="cx"> PASS Intl.NumberFormat.supportedLocalesOf('en-') threw exception RangeError: invalid language tag: en-.
</span><span class="cx"> PASS Intl.NumberFormat.supportedLocalesOf('en--US') threw exception RangeError: invalid language tag: en--US.
</span><ins>+PASS Intl.NumberFormat.supportedLocalesOf('de') did not throw exception.
+PASS Intl.NumberFormat.supportedLocalesOf('de-DE') did not throw exception.
+PASS Intl.NumberFormat.supportedLocalesOf('DE-de') did not throw exception.
+PASS Intl.NumberFormat.supportedLocalesOf('cmn') did not throw exception.
+PASS Intl.NumberFormat.supportedLocalesOf('cmn-Hans') did not throw exception.
+PASS Intl.NumberFormat.supportedLocalesOf('CMN-hANS') did not throw exception.
+PASS Intl.NumberFormat.supportedLocalesOf('cmn-hans-cn') did not throw exception.
+PASS Intl.NumberFormat.supportedLocalesOf('es-419') did not throw exception.
+PASS Intl.NumberFormat.supportedLocalesOf('es-419-u-nu-latn-cu-bob') did not throw exception.
+PASS Intl.NumberFormat.supportedLocalesOf('i-klingon') did not throw exception.
+PASS Intl.NumberFormat.supportedLocalesOf('cmn-hans-cn-t-ca-u-ca-x-t-u') did not throw exception.
+PASS Intl.NumberFormat.supportedLocalesOf('enochian-enochian') did not throw exception.
+PASS Intl.NumberFormat.supportedLocalesOf('de-gregory-u-ca-gregory') did not throw exception.
+PASS Intl.NumberFormat.supportedLocalesOf('aa-a-foo-x-a-foo-bar') did not throw exception.
+PASS Intl.NumberFormat.supportedLocalesOf('x-en-US-12345') did not throw exception.
+PASS Intl.NumberFormat.supportedLocalesOf('x-12345-12345-en-US') did not throw exception.
+PASS Intl.NumberFormat.supportedLocalesOf('x-en-US-12345-12345') did not throw exception.
+PASS Intl.NumberFormat.supportedLocalesOf('x-en-u-foo') did not throw exception.
+PASS Intl.NumberFormat.supportedLocalesOf('x-en-u-foo-u-bar') did not throw exception.
</ins><span class="cx"> PASS Intl.NumberFormat.prototype.constructor is Intl.NumberFormat
</span><span class="cx"> PASS Intl.NumberFormat.prototype.format is an instance of Function
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(Intl.NumberFormat.prototype, 'format').get is an instance of Function
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestsjsscripttestsintlcollatorjs"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/LayoutTests/js/script-tests/intl-collator.js (207047 => 207048)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/js/script-tests/intl-collator.js 2016-10-11 06:10:49 UTC (rev 207047)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/js/script-tests/intl-collator.js 2016-10-11 06:12:39 UTC (rev 207048)
</span><span class="lines">@@ -179,6 +179,31 @@
</span><span class="cx"> shouldThrow("Intl.Collator.supportedLocalesOf('en-*')", "'RangeError: invalid language tag: en-*'");
</span><span class="cx"> shouldThrow("Intl.Collator.supportedLocalesOf('en-')", "'RangeError: invalid language tag: en-'");
</span><span class="cx"> shouldThrow("Intl.Collator.supportedLocalesOf('en--US')", "'RangeError: invalid language tag: en--US'");
</span><ins>+// Accepts valid tags
+var validLanguageTags = [
+ "de", // ISO 639 language code
+ "de-DE", // + ISO 3166-1 country code
+ "DE-de", // tags are case-insensitive
+ "cmn", // ISO 639 language code
+ "cmn-Hans", // + script code
+ "CMN-hANS", // tags are case-insensitive
+ "cmn-hans-cn", // + ISO 3166-1 country code
+ "es-419", // + UN M.49 region code
+ "es-419-u-nu-latn-cu-bob", // + Unicode locale extension sequence
+ "i-klingon", // grandfathered tag
+ "cmn-hans-cn-t-ca-u-ca-x-t-u", // singleton subtags can also be used as private use subtags
+ "enochian-enochian", // language and variant subtags may be the same
+ "de-gregory-u-ca-gregory", // variant and extension subtags may be the same
+ "aa-a-foo-x-a-foo-bar", // variant subtags can also be used as private use subtags
+ "x-en-US-12345", // anything goes in private use tags
+ "x-12345-12345-en-US",
+ "x-en-US-12345-12345",
+ "x-en-u-foo",
+ "x-en-u-foo-u-bar"
+];
+for (var validLanguageTag of validLanguageTags) {
+ shouldNotThrow("Intl.Collator.supportedLocalesOf('" + validLanguageTag + "')");
+}
</ins><span class="cx">
</span><span class="cx"> // 10.3 Properties of the Intl.Collator Prototype Object
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestsjsscripttestsintldatetimeformatjs"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/LayoutTests/js/script-tests/intl-datetimeformat.js (207047 => 207048)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/js/script-tests/intl-datetimeformat.js 2016-10-11 06:10:49 UTC (rev 207047)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/js/script-tests/intl-datetimeformat.js 2016-10-11 06:12:39 UTC (rev 207048)
</span><span class="lines">@@ -73,6 +73,31 @@
</span><span class="cx"> shouldThrow("Intl.DateTimeFormat.supportedLocalesOf('en-*')", "'RangeError: invalid language tag: en-*'");
</span><span class="cx"> shouldThrow("Intl.DateTimeFormat.supportedLocalesOf('en-')", "'RangeError: invalid language tag: en-'");
</span><span class="cx"> shouldThrow("Intl.DateTimeFormat.supportedLocalesOf('en--US')", "'RangeError: invalid language tag: en--US'");
</span><ins>+// Accepts valid tags
+var validLanguageTags = [
+ "de", // ISO 639 language code
+ "de-DE", // + ISO 3166-1 country code
+ "DE-de", // tags are case-insensitive
+ "cmn", // ISO 639 language code
+ "cmn-Hans", // + script code
+ "CMN-hANS", // tags are case-insensitive
+ "cmn-hans-cn", // + ISO 3166-1 country code
+ "es-419", // + UN M.49 region code
+ "es-419-u-nu-latn-cu-bob", // + Unicode locale extension sequence
+ "i-klingon", // grandfathered tag
+ "cmn-hans-cn-t-ca-u-ca-x-t-u", // singleton subtags can also be used as private use subtags
+ "enochian-enochian", // language and variant subtags may be the same
+ "de-gregory-u-ca-gregory", // variant and extension subtags may be the same
+ "aa-a-foo-x-a-foo-bar", // variant subtags can also be used as private use subtags
+ "x-en-US-12345", // anything goes in private use tags
+ "x-12345-12345-en-US",
+ "x-en-US-12345-12345",
+ "x-en-u-foo",
+ "x-en-u-foo-u-bar"
+];
+for (var validLanguageTag of validLanguageTags) {
+ shouldNotThrow("Intl.DateTimeFormat.supportedLocalesOf('" + validLanguageTag + "')");
+}
</ins><span class="cx">
</span><span class="cx"> // 12.3 Properties of the Intl.DateTimeFormat Prototype Object
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestsjsscripttestsintlnumberformatjs"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/LayoutTests/js/script-tests/intl-numberformat.js (207047 => 207048)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/js/script-tests/intl-numberformat.js 2016-10-11 06:10:49 UTC (rev 207047)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/js/script-tests/intl-numberformat.js 2016-10-11 06:12:39 UTC (rev 207048)
</span><span class="lines">@@ -189,6 +189,31 @@
</span><span class="cx"> shouldThrow("Intl.NumberFormat.supportedLocalesOf('en-*')", "'RangeError: invalid language tag: en-*'");
</span><span class="cx"> shouldThrow("Intl.NumberFormat.supportedLocalesOf('en-')", "'RangeError: invalid language tag: en-'");
</span><span class="cx"> shouldThrow("Intl.NumberFormat.supportedLocalesOf('en--US')", "'RangeError: invalid language tag: en--US'");
</span><ins>+// Accepts valid tags
+var validLanguageTags = [
+ "de", // ISO 639 language code
+ "de-DE", // + ISO 3166-1 country code
+ "DE-de", // tags are case-insensitive
+ "cmn", // ISO 639 language code
+ "cmn-Hans", // + script code
+ "CMN-hANS", // tags are case-insensitive
+ "cmn-hans-cn", // + ISO 3166-1 country code
+ "es-419", // + UN M.49 region code
+ "es-419-u-nu-latn-cu-bob", // + Unicode locale extension sequence
+ "i-klingon", // grandfathered tag
+ "cmn-hans-cn-t-ca-u-ca-x-t-u", // singleton subtags can also be used as private use subtags
+ "enochian-enochian", // language and variant subtags may be the same
+ "de-gregory-u-ca-gregory", // variant and extension subtags may be the same
+ "aa-a-foo-x-a-foo-bar", // variant subtags can also be used as private use subtags
+ "x-en-US-12345", // anything goes in private use tags
+ "x-12345-12345-en-US",
+ "x-en-US-12345-12345",
+ "x-en-u-foo",
+ "x-en-u-foo-u-bar"
+];
+for (var validLanguageTag of validLanguageTags) {
+ shouldNotThrow("Intl.NumberFormat.supportedLocalesOf('" + validLanguageTag + "')");
+}
</ins><span class="cx">
</span><span class="cx"> // 11.3 Properties of the Intl.NumberFormat Prototype Object
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/ChangeLog (207047 => 207048)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/ChangeLog 2016-10-11 06:10:49 UTC (rev 207047)
+++ releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/ChangeLog 2016-10-11 06:12:39 UTC (rev 207048)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-09-07 Andy VanWagoner <thetalecrafter@gmail.com>
+
+ [INTL] some valid language tags cause errors in Intl constructors
+ https://bugs.webkit.org/show_bug.cgi?id=161672
+
+ Reviewed by Mark Lam.
+
+ Fix private use tag parsing to match spec, allowing single character parts.
+ https://www.rfc-editor.org/rfc/bcp/bcp47.txt
+
+ ```
+ privateuse = "x" 1*("-" (1*8alphanum))
+ ```
+
+ * runtime/IntlObject.cpp:
+ (JSC::privateUseLangTag): Allow singleton parts in private use tag.
+
</ins><span class="cx"> 2016-09-07 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Make emitAllocateWithNonNullAllocator's sub32() disallow-scratch-friendly
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceJavaScriptCoreruntimeIntlObjectcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/runtime/IntlObject.cpp (207047 => 207048)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/runtime/IntlObject.cpp 2016-10-11 06:10:49 UTC (rev 207047)
+++ releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/runtime/IntlObject.cpp 2016-10-11 06:12:39 UTC (rev 207048)
</span><span class="lines">@@ -258,7 +258,7 @@
</span><span class="cx"> size_t currentIndex = startIndex;
</span><span class="cx">
</span><span class="cx"> // Check for privateuse.
</span><del>- // privateuse = "x" 1*("-" (2*8alphanum))
</del><ins>+ // privateuse = "x" 1*("-" (1*8alphanum))
</ins><span class="cx"> StringBuilder privateuse;
</span><span class="cx"> while (currentIndex < numParts) {
</span><span class="cx"> const String& singleton = parts[currentIndex];
</span><span class="lines">@@ -277,7 +277,7 @@
</span><span class="cx"> const String& extPart = parts[currentIndex];
</span><span class="cx"> unsigned extPartLength = extPart.length();
</span><span class="cx">
</span><del>- bool isValid = (extPartLength >= 2 && extPartLength <= 8 && extPart.isAllSpecialCharacters<isASCIIAlphanumeric>());
</del><ins>+ bool isValid = (extPartLength >= 1 && extPartLength <= 8 && extPart.isAllSpecialCharacters<isASCIIAlphanumeric>());
</ins><span class="cx"> if (!isValid)
</span><span class="cx"> break;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>