<!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>[206926] 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/206926">206926</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-10-07 12:37:30 -0700 (Fri, 07 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Regression(<a href="http://trac.webkit.org/projects/webkit/changeset/201970">r201970</a>): productSub / vendor / vendorSub should not be exposed on WorkerNavigator
https://bugs.webkit.org/show_bug.cgi?id=163124
Reviewed by Ryosuke Niwa.
Source/WebCore:
productSub / vendor / vendorSub should not be exposed on WorkerNavigator:
- https://html.spec.whatwg.org/#navigatorid
Test case:
- http://w3c-test.org/submissions/3881/html/webappapis/system-state-and-capabilities/the-navigator-object/NavigatorID.worker
Note that the specification also restricts NavigatorID's appCodeName and
product attributes to Window. However, it seems the HTML specification is
about to get updated so that these get exposed to workers:
- https://github.com/whatwg/html/pull/1870
No new tests, updated existing test.
* bindings/scripts/generate-bindings.pl:
(shouldPropertyBeExposed):
* page/NavigatorID.idl:
LayoutTests:
Update existing test to reflect behavior change.
* fast/workers/resources/worker-navigator.js:
* fast/workers/worker-navigator-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastworkersresourcesworkernavigatorjs">trunk/LayoutTests/fast/workers/resources/worker-navigator.js</a></li>
<li><a href="#trunkLayoutTestsfastworkersworkernavigatorexpectedtxt">trunk/LayoutTests/fast/workers/worker-navigator-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsgeneratebindingspl">trunk/Source/WebCore/bindings/scripts/generate-bindings.pl</a></li>
<li><a href="#trunkSourceWebCorepageNavigatorIDidl">trunk/Source/WebCore/page/NavigatorID.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (206925 => 206926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-07 19:03:53 UTC (rev 206925)
+++ trunk/LayoutTests/ChangeLog 2016-10-07 19:37:30 UTC (rev 206926)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-10-07 Chris Dumez <cdumez@apple.com>
+
+ Regression(r201970): productSub / vendor / vendorSub should not be exposed on WorkerNavigator
+ https://bugs.webkit.org/show_bug.cgi?id=163124
+
+ Reviewed by Ryosuke Niwa.
+
+ Update existing test to reflect behavior change.
+
+ * fast/workers/resources/worker-navigator.js:
+ * fast/workers/worker-navigator-expected.txt:
+
</ins><span class="cx"> 2016-10-07 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Marking http/tests/xmlhttprequest/auth-reject-protection-space.html as flaky on mac-wk2.
</span></span></pre></div>
<a id="trunkLayoutTestsfastworkersresourcesworkernavigatorjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/workers/resources/worker-navigator.js (206925 => 206926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/workers/resources/worker-navigator.js 2016-10-07 19:03:53 UTC (rev 206925)
+++ trunk/LayoutTests/fast/workers/resources/worker-navigator.js 2016-10-07 19:37:30 UTC (rev 206926)
</span><span class="lines">@@ -21,10 +21,10 @@
</span><span class="cx"> worker.postMessage("eval navigator.appVersion.indexOf('WebKit') != 0");
</span><span class="cx"> worker.postMessage("eval typeof navigator.platform == 'string'");
</span><span class="cx"> worker.postMessage("eval navigator.product === 'Gecko'");
</span><del>-worker.postMessage("eval navigator.productSub === '20030107'");
</del><ins>+worker.postMessage("eval navigator.productSub === undefined");
</ins><span class="cx"> worker.postMessage("eval navigator.userAgent.indexOf('WebKit') != 0");
</span><del>-worker.postMessage("eval navigator.vendor === 'Apple Computer, Inc.'");
-worker.postMessage("eval navigator.vendorSub === ''");
</del><ins>+worker.postMessage("eval navigator.vendor === undefined");
+worker.postMessage("eval navigator.vendorSub === undefined");
</ins><span class="cx">
</span><span class="cx"> // NavigatorLanguage
</span><span class="cx"> worker.postMessage("eval typeof navigator.language == 'string'");
</span></span></pre></div>
<a id="trunkLayoutTestsfastworkersworkernavigatorexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/workers/worker-navigator-expected.txt (206925 => 206926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/workers/worker-navigator-expected.txt 2016-10-07 19:03:53 UTC (rev 206925)
+++ trunk/LayoutTests/fast/workers/worker-navigator-expected.txt 2016-10-07 19:37:30 UTC (rev 206926)
</span><span class="lines">@@ -8,10 +8,10 @@
</span><span class="cx"> navigator.appVersion.indexOf('WebKit') != 0: true
</span><span class="cx"> typeof navigator.platform == 'string': true
</span><span class="cx"> navigator.product === 'Gecko': true
</span><del>-navigator.productSub === '20030107': true
</del><ins>+navigator.productSub === undefined: true
</ins><span class="cx"> navigator.userAgent.indexOf('WebKit') != 0: true
</span><del>-navigator.vendor === 'Apple Computer, Inc.': true
-navigator.vendorSub === '': true
</del><ins>+navigator.vendor === undefined: true
+navigator.vendorSub === undefined: true
</ins><span class="cx"> typeof navigator.language == 'string': true
</span><span class="cx"> typeof navigator.onLine == 'boolean': true
</span><span class="cx"> DONE
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206925 => 206926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-07 19:03:53 UTC (rev 206925)
+++ trunk/Source/WebCore/ChangeLog 2016-10-07 19:37:30 UTC (rev 206926)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-10-07 Chris Dumez <cdumez@apple.com>
+
+ Regression(r201970): productSub / vendor / vendorSub should not be exposed on WorkerNavigator
+ https://bugs.webkit.org/show_bug.cgi?id=163124
+
+ Reviewed by Ryosuke Niwa.
+
+ productSub / vendor / vendorSub should not be exposed on WorkerNavigator:
+ - https://html.spec.whatwg.org/#navigatorid
+
+ Test case:
+ - http://w3c-test.org/submissions/3881/html/webappapis/system-state-and-capabilities/the-navigator-object/NavigatorID.worker
+
+ Note that the specification also restricts NavigatorID's appCodeName and
+ product attributes to Window. However, it seems the HTML specification is
+ about to get updated so that these get exposed to workers:
+ - https://github.com/whatwg/html/pull/1870
+
+ No new tests, updated existing test.
+
+ * bindings/scripts/generate-bindings.pl:
+ (shouldPropertyBeExposed):
+ * page/NavigatorID.idl:
+
</ins><span class="cx"> 2016-10-07 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Disable URLParser logs by default in all builds
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsgeneratebindingspl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/generate-bindings.pl (206925 => 206926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/generate-bindings.pl 2016-10-07 19:03:53 UTC (rev 206925)
+++ trunk/Source/WebCore/bindings/scripts/generate-bindings.pl 2016-10-07 19:37:30 UTC (rev 206926)
</span><span class="lines">@@ -143,9 +143,13 @@
</span><span class="cx"> foreach my $interface (@{$document->interfaces}) {
</span><span class="cx"> if (!$interface->isPartial || $interface->name eq $targetInterfaceName) {
</span><span class="cx"> my $targetDataNode;
</span><ins>+ my @targetGlobalContexts;
</ins><span class="cx"> foreach my $interface (@{$targetDocument->interfaces}) {
</span><span class="cx"> if ($interface->name eq $targetInterfaceName) {
</span><span class="cx"> $targetDataNode = $interface;
</span><ins>+ my $exposedAttribute = $targetDataNode->extendedAttributes->{"Exposed"} || "Window";
+ $exposedAttribute = substr($exposedAttribute, 1, -1) if substr($exposedAttribute, 0, 1) eq "(";
+ @targetGlobalContexts = split(",", $exposedAttribute);
</ins><span class="cx"> last;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -153,6 +157,8 @@
</span><span class="cx">
</span><span class="cx"> # Support for attributes of partial interfaces.
</span><span class="cx"> foreach my $attribute (@{$interface->attributes}) {
</span><ins>+ next unless shouldPropertyBeExposed($attribute->signature, \@targetGlobalContexts);
+
</ins><span class="cx"> # Record that this attribute is implemented by $interfaceName.
</span><span class="cx"> $attribute->signature->extendedAttributes->{"ImplementedBy"} = $interfaceName if $interface->isPartial;
</span><span class="cx">
</span><span class="lines">@@ -165,6 +171,8 @@
</span><span class="cx">
</span><span class="cx"> # Support for methods of partial interfaces.
</span><span class="cx"> foreach my $function (@{$interface->functions}) {
</span><ins>+ next unless shouldPropertyBeExposed($function->signature, \@targetGlobalContexts);
+
</ins><span class="cx"> # Record that this method is implemented by $interfaceName.
</span><span class="cx"> $function->signature->extendedAttributes->{"ImplementedBy"} = $interfaceName if $interface->isPartial;
</span><span class="cx">
</span><span class="lines">@@ -177,6 +185,8 @@
</span><span class="cx">
</span><span class="cx"> # Support for constants of partial interfaces.
</span><span class="cx"> foreach my $constant (@{$interface->constants}) {
</span><ins>+ next unless shouldPropertyBeExposed($constant, \@targetGlobalContexts);
+
</ins><span class="cx"> # Record that this constant is implemented by $interfaceName.
</span><span class="cx"> $constant->extendedAttributes->{"ImplementedBy"} = $interfaceName if $interface->isPartial;
</span><span class="cx">
</span><span class="lines">@@ -196,6 +206,25 @@
</span><span class="cx"> my $codeGen = CodeGenerator->new(\@idlDirectories, $generator, $outputDirectory, $outputHeadersDirectory, $preprocessor, $writeDependencies, $verbose, $targetIdlFile);
</span><span class="cx"> $codeGen->ProcessDocument($targetDocument, $defines);
</span><span class="cx">
</span><ins>+# Attributes / Operations / Constants of supplemental interfaces can have an [Exposed=XX] attribute which restricts
+# on which global contexts they should be exposed.
+sub shouldPropertyBeExposed
+{
+ my ($signature, $targetGlobalContexts) = @_;
+
+ my $exposed = $signature->extendedAttributes->{Exposed};
+
+ return 1 unless $exposed;
+
+ $exposed = substr($exposed, 1, -1) if substr($exposed, 0, 1) eq "(";
+ my @sourceGlobalContexts = split(",", $exposed);
+
+ for my $targetGlobalContext (@$targetGlobalContexts) {
+ return 1 if grep(/^$targetGlobalContext$/, @sourceGlobalContexts);
+ }
+ return 0;
+}
+
</ins><span class="cx"> sub generateEmptyHeaderAndCpp
</span><span class="cx"> {
</span><span class="cx"> my ($prefix, $targetInterfaceName, $outputHeadersDirectory, $outputDirectory) = @_;
</span></span></pre></div>
<a id="trunkSourceWebCorepageNavigatorIDidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/NavigatorID.idl (206925 => 206926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/NavigatorID.idl 2016-10-07 19:03:53 UTC (rev 206925)
+++ trunk/Source/WebCore/page/NavigatorID.idl 2016-10-07 19:37:30 UTC (rev 206926)
</span><span class="lines">@@ -34,8 +34,8 @@
</span><span class="cx"> [Nondeterministic] readonly attribute DOMString appVersion;
</span><span class="cx"> [Nondeterministic] readonly attribute DOMString platform;
</span><span class="cx"> [Nondeterministic] readonly attribute DOMString product;
</span><del>- [Nondeterministic] readonly attribute DOMString productSub;
</del><ins>+ [Nondeterministic, Exposed=Window] readonly attribute DOMString productSub;
</ins><span class="cx"> [Nondeterministic] readonly attribute DOMString userAgent;
</span><del>- [Nondeterministic] readonly attribute DOMString vendor;
- [Nondeterministic] readonly attribute DOMString vendorSub;
</del><ins>+ [Nondeterministic, Exposed=Window] readonly attribute DOMString vendor;
+ [Nondeterministic, Exposed=Window] readonly attribute DOMString vendorSub;
</ins><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>