<!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>[201970] 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/201970">201970</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-06-11 10:44:20 -0700 (Sat, 11 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>WorkerNavigator is missing some attributes
https://bugs.webkit.org/show_bug.cgi?id=158593
<rdar://problem/26731334>
Reviewed by Darin Adler.
Source/WebCore:
Add attributes that are missing on WorkerNavigator:
- appCodeName
- hardwareConcurrency
- language
- product
- productSub
- vendor
- vendorSub
Firefox and Chrome already expose those attributes.
Relevant specification:
https://html.spec.whatwg.org/multipage/workers.html#the-workernavigator-object
This patch also refactors the IDL to match the specification more
closely and promote sharing between Navigator and WorkerNavigator.
No new tests, updated existing test.
* CMakeLists.txt:
* DerivedSources.make:
Add new supplemental IDL files.
* page/Navigator.cpp:
* page/Navigator.h:
Moved language() / hardwareConcurrency() from Navigator to NavigatorBase
so that it can be used by NavigatorWorker as well.
* page/NavigatorBase.h:
* page/NavigatorBase.cpp:
(WebCore::NavigatorBase::language):
The implementation still calls defaultLanguage() but I updated it to be
thread safe on all platforms.
(WebCore::NavigatorBase::hardwareConcurrency):
Use std::call_once() for thread safety.
* page/Navigator.idl:
* page/NavigatorConcurrentHardware.idl: Copied from Source/WebCore/page/WorkerNavigator.idl.
* page/NavigatorID.idl: Copied from Source/WebCore/page/WorkerNavigator.idl.
* page/NavigatorLanguage.idl: Copied from Source/WebCore/page/WorkerNavigator.idl.
* page/NavigatorOnLine.idl: Copied from Source/WebCore/page/WorkerNavigator.idl.
* page/WorkerNavigator.idl:
Move several attributes to their own supplemental interfaces to match
the specification and promote sharing with WorkerNavigator.
* platform/Language.cpp:
(WebCore::userPreferredLanguages):
* platform/Language.h:
Made thread-safe on all platforms.
Source/WTF:
* wtf/PlatformUserPreferredLanguages.h:
* wtf/PlatformUserPreferredLanguagesWin.cpp:
(WTF::platformLanguage):
(WTF::platformUserPreferredLanguages):
Make platformUserPreferredLanguages() thread safe on Windows. The
Mac and Unix implementations are already thread-safe.
LayoutTests:
Improved test coverage for WorkerNavigator.
* fast/workers/resources/worker-navigator.js:</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="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformUserPreferredLanguagesh">trunk/Source/WTF/wtf/PlatformUserPreferredLanguages.h</a></li>
<li><a href="#trunkSourceWTFwtfPlatformUserPreferredLanguagesWincpp">trunk/Source/WTF/wtf/PlatformUserPreferredLanguagesWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCorepageNavigatorcpp">trunk/Source/WebCore/page/Navigator.cpp</a></li>
<li><a href="#trunkSourceWebCorepageNavigatorh">trunk/Source/WebCore/page/Navigator.h</a></li>
<li><a href="#trunkSourceWebCorepageNavigatoridl">trunk/Source/WebCore/page/Navigator.idl</a></li>
<li><a href="#trunkSourceWebCorepageNavigatorBasecpp">trunk/Source/WebCore/page/NavigatorBase.cpp</a></li>
<li><a href="#trunkSourceWebCorepageNavigatorBaseh">trunk/Source/WebCore/page/NavigatorBase.h</a></li>
<li><a href="#trunkSourceWebCorepageWorkerNavigatoridl">trunk/Source/WebCore/page/WorkerNavigator.idl</a></li>
<li><a href="#trunkSourceWebCoreplatformLanguagecpp">trunk/Source/WebCore/platform/Language.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformLanguageh">trunk/Source/WebCore/platform/Language.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorepageNavigatorConcurrentHardwareidl">trunk/Source/WebCore/page/NavigatorConcurrentHardware.idl</a></li>
<li><a href="#trunkSourceWebCorepageNavigatorIDidl">trunk/Source/WebCore/page/NavigatorID.idl</a></li>
<li><a href="#trunkSourceWebCorepageNavigatorLanguageidl">trunk/Source/WebCore/page/NavigatorLanguage.idl</a></li>
<li><a href="#trunkSourceWebCorepageNavigatorOnLineidl">trunk/Source/WebCore/page/NavigatorOnLine.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (201969 => 201970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-11 11:46:19 UTC (rev 201969)
+++ trunk/LayoutTests/ChangeLog 2016-06-11 17:44:20 UTC (rev 201970)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-06-11 Chris Dumez <cdumez@apple.com>
+
+ WorkerNavigator is missing some attributes
+ https://bugs.webkit.org/show_bug.cgi?id=158593
+ <rdar://problem/26731334>
+
+ Reviewed by Darin Adler.
+
+ Improved test coverage for WorkerNavigator.
+
+ * fast/workers/resources/worker-navigator.js:
+
</ins><span class="cx"> 2016-06-10 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Vary:Cookie validation doesn't work in private browsing
</span></span></pre></div>
<a id="trunkLayoutTestsfastworkersresourcesworkernavigatorjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/workers/resources/worker-navigator.js (201969 => 201970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/workers/resources/worker-navigator.js 2016-06-11 11:46:19 UTC (rev 201969)
+++ trunk/LayoutTests/fast/workers/resources/worker-navigator.js 2016-06-11 17:44:20 UTC (rev 201970)
</span><span class="lines">@@ -11,11 +11,28 @@
</span><span class="cx"> var worker = createWorker();
</span><span class="cx"> worker.postMessage("eval typeof navigator");
</span><span class="cx"> worker.postMessage("eval navigator");
</span><del>-worker.postMessage("eval navigator.appName");
</del><ins>+
+// NavigatorConcurrentHardware
+worker.postMessage("eval navigator.hardwareConcurrency >= 1 && navigator.hardwareConcurrency <= 8");
+
+// NavigatorID
+worker.postMessage("eval navigator.appCodeName === 'Mozilla'");
+worker.postMessage("eval navigator.appName === 'Netscape'");
</ins><span class="cx"> worker.postMessage("eval navigator.appVersion.indexOf('WebKit') != 0");
</span><del>-worker.postMessage("eval typeof navigator.platform");
</del><ins>+worker.postMessage("eval typeof navigator.platform == 'string'");
+worker.postMessage("eval navigator.product === 'Gecko'");
+worker.postMessage("eval navigator.productSub === '20030107'");
</ins><span class="cx"> worker.postMessage("eval navigator.userAgent.indexOf('WebKit') != 0");
</span><del>-worker.postMessage("eval typeof navigator.onLine");
</del><ins>+worker.postMessage("eval navigator.vendor === 'Apple Computer, Inc.'");
+worker.postMessage("eval navigator.vendorSub === ''");
+
+// NavigatorLanguage
+worker.postMessage("eval typeof navigator.language == 'string'");
+
+// NavigatorOnLine
+worker.postMessage("eval typeof navigator.onLine == 'boolean'");
+
+
</ins><span class="cx"> worker.postMessage("eval foo//bar");
</span><span class="cx">
</span><span class="cx"> worker.onmessage = function(evt) {
</span></span></pre></div>
<a id="trunkLayoutTestsfastworkersworkernavigatorexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/workers/worker-navigator-expected.txt (201969 => 201970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/workers/worker-navigator-expected.txt 2016-06-11 11:46:19 UTC (rev 201969)
+++ trunk/LayoutTests/fast/workers/worker-navigator-expected.txt 2016-06-11 17:44:20 UTC (rev 201970)
</span><span class="lines">@@ -2,10 +2,17 @@
</span><span class="cx">
</span><span class="cx"> typeof navigator: object
</span><span class="cx"> navigator: [object WorkerNavigator]
</span><del>-navigator.appName: Netscape
</del><ins>+navigator.hardwareConcurrency >= 1 && navigator.hardwareConcurrency <= 8: true
+navigator.appCodeName === 'Mozilla': true
+navigator.appName === 'Netscape': true
</ins><span class="cx"> navigator.appVersion.indexOf('WebKit') != 0: true
</span><del>-typeof navigator.platform: string
</del><ins>+typeof navigator.platform == 'string': true
+navigator.product === 'Gecko': true
+navigator.productSub === '20030107': true
</ins><span class="cx"> navigator.userAgent.indexOf('WebKit') != 0: true
</span><del>-typeof navigator.onLine: boolean
</del><ins>+navigator.vendor === 'Apple Computer, Inc.': true
+navigator.vendorSub === '': true
+typeof navigator.language == 'string': true
+typeof navigator.onLine == 'boolean': true
</ins><span class="cx"> DONE
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (201969 => 201970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-06-11 11:46:19 UTC (rev 201969)
+++ trunk/Source/WTF/ChangeLog 2016-06-11 17:44:20 UTC (rev 201970)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-06-11 Chris Dumez <cdumez@apple.com>
+
+ WorkerNavigator is missing some attributes
+ https://bugs.webkit.org/show_bug.cgi?id=158593
+ <rdar://problem/26731334>
+
+ Reviewed by Darin Adler.
+
+ * wtf/PlatformUserPreferredLanguages.h:
+ * wtf/PlatformUserPreferredLanguagesWin.cpp:
+ (WTF::platformLanguage):
+ (WTF::platformUserPreferredLanguages):
+
+ Make platformUserPreferredLanguages() thread safe on Windows. The
+ Mac and Unix implementations are already thread-safe.
+
</ins><span class="cx"> 2016-06-10 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Introduce WTF::UniqueRef
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformUserPreferredLanguagesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PlatformUserPreferredLanguages.h (201969 => 201970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PlatformUserPreferredLanguages.h 2016-06-11 11:46:19 UTC (rev 201969)
+++ trunk/Source/WTF/wtf/PlatformUserPreferredLanguages.h 2016-06-11 17:44:20 UTC (rev 201970)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx">
</span><span class="cx"> WTF_EXPORT_PRIVATE void setPlatformUserPreferredLanguagesChangedCallback(void (*)());
</span><span class="cx">
</span><ins>+// This is thread-safe.
</ins><span class="cx"> WTF_EXPORT_PRIVATE Vector<String> platformUserPreferredLanguages();
</span><span class="cx">
</span><span class="cx"> } // namespace WTF
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformUserPreferredLanguagesWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PlatformUserPreferredLanguagesWin.cpp (201969 => 201970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PlatformUserPreferredLanguagesWin.cpp 2016-06-11 11:46:19 UTC (rev 201969)
+++ trunk/Source/WTF/wtf/PlatformUserPreferredLanguagesWin.cpp 2016-06-11 17:44:20 UTC (rev 201970)
</span><span class="lines">@@ -26,12 +26,16 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "PlatformUserPreferredLanguages.h"
</span><span class="cx">
</span><ins>+#include <mutex>
</ins><span class="cx"> #include <windows.h>
</span><ins>+#include <wtf/Lock.h>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><ins>+static StaticLock platformLanguageMutex;
+
</ins><span class="cx"> void setPlatformUserPreferredLanguagesChangedCallback(void (*)()) { }
</span><span class="cx">
</span><span class="cx"> static String localeInfo(LCTYPE localeType, const String& fallback)
</span><span class="lines">@@ -54,9 +58,11 @@
</span><span class="cx">
</span><span class="cx"> static String platformLanguage()
</span><span class="cx"> {
</span><ins>+ std::lock_guard<StaticLock> lock(platformLanguageMutex);
+
</ins><span class="cx"> static String computedDefaultLanguage;
</span><span class="cx"> if (!computedDefaultLanguage.isEmpty())
</span><del>- return computedDefaultLanguage;
</del><ins>+ return computedDefaultLanguage.isolatedCopy();
</ins><span class="cx">
</span><span class="cx"> String languageName = localeInfo(LOCALE_SISO639LANGNAME, "en");
</span><span class="cx"> String countryName = localeInfo(LOCALE_SISO3166CTRYNAME, String());
</span><span class="lines">@@ -71,9 +77,7 @@
</span><span class="cx">
</span><span class="cx"> Vector<String> platformUserPreferredLanguages()
</span><span class="cx"> {
</span><del>- Vector<String> userPreferredLanguages;
- userPreferredLanguages.append(platformLanguage());
- return userPreferredLanguages;
</del><ins>+ return { platformLanguage() };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WTF
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (201969 => 201970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-06-11 11:46:19 UTC (rev 201969)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-06-11 17:44:20 UTC (rev 201970)
</span><span class="lines">@@ -603,6 +603,10 @@
</span><span class="cx"> page/History.idl
</span><span class="cx"> page/Location.idl
</span><span class="cx"> page/Navigator.idl
</span><ins>+ page/NavigatorConcurrentHardware.idl
+ page/NavigatorID.idl
+ page/NavigatorLanguage.idl
+ page/NavigatorOnLine.idl
</ins><span class="cx"> page/Performance.idl
</span><span class="cx"> page/PerformanceEntry.idl
</span><span class="cx"> page/PerformanceEntryList.idl
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201969 => 201970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-11 11:46:19 UTC (rev 201969)
+++ trunk/Source/WebCore/ChangeLog 2016-06-11 17:44:20 UTC (rev 201970)
</span><span class="lines">@@ -1,3 +1,62 @@
</span><ins>+2016-06-11 Chris Dumez <cdumez@apple.com>
+
+ WorkerNavigator is missing some attributes
+ https://bugs.webkit.org/show_bug.cgi?id=158593
+ <rdar://problem/26731334>
+
+ Reviewed by Darin Adler.
+
+ Add attributes that are missing on WorkerNavigator:
+ - appCodeName
+ - hardwareConcurrency
+ - language
+ - product
+ - productSub
+ - vendor
+ - vendorSub
+
+ Firefox and Chrome already expose those attributes.
+
+ Relevant specification:
+ https://html.spec.whatwg.org/multipage/workers.html#the-workernavigator-object
+
+ This patch also refactors the IDL to match the specification more
+ closely and promote sharing between Navigator and WorkerNavigator.
+
+ No new tests, updated existing test.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ Add new supplemental IDL files.
+
+ * page/Navigator.cpp:
+ * page/Navigator.h:
+ Moved language() / hardwareConcurrency() from Navigator to NavigatorBase
+ so that it can be used by NavigatorWorker as well.
+
+ * page/NavigatorBase.h:
+ * page/NavigatorBase.cpp:
+ (WebCore::NavigatorBase::language):
+ The implementation still calls defaultLanguage() but I updated it to be
+ thread safe on all platforms.
+
+ (WebCore::NavigatorBase::hardwareConcurrency):
+ Use std::call_once() for thread safety.
+
+ * page/Navigator.idl:
+ * page/NavigatorConcurrentHardware.idl: Copied from Source/WebCore/page/WorkerNavigator.idl.
+ * page/NavigatorID.idl: Copied from Source/WebCore/page/WorkerNavigator.idl.
+ * page/NavigatorLanguage.idl: Copied from Source/WebCore/page/WorkerNavigator.idl.
+ * page/NavigatorOnLine.idl: Copied from Source/WebCore/page/WorkerNavigator.idl.
+ * page/WorkerNavigator.idl:
+ Move several attributes to their own supplemental interfaces to match
+ the specification and promote sharing with WorkerNavigator.
+
+ * platform/Language.cpp:
+ (WebCore::userPreferredLanguages):
+ * platform/Language.h:
+ Made thread-safe on all platforms.
+
</ins><span class="cx"> 2016-06-11 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Build fix.
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (201969 => 201970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2016-06-11 11:46:19 UTC (rev 201969)
+++ trunk/Source/WebCore/DerivedSources.make 2016-06-11 17:44:20 UTC (rev 201970)
</span><span class="lines">@@ -514,6 +514,10 @@
</span><span class="cx"> $(WebCore)/page/History.idl \
</span><span class="cx"> $(WebCore)/page/Location.idl \
</span><span class="cx"> $(WebCore)/page/Navigator.idl \
</span><ins>+ $(WebCore)/page/NavigatorConcurrentHardware.idl \
+ $(WebCore)/page/NavigatorID.idl \
+ $(WebCore)/page/NavigatorLanguage.idl \
+ $(WebCore)/page/NavigatorOnLine.idl \
</ins><span class="cx"> $(WebCore)/page/Performance.idl \
</span><span class="cx"> $(WebCore)/page/PerformanceEntry.idl \
</span><span class="cx"> $(WebCore)/page/PerformanceEntryList.idl \
</span></span></pre></div>
<a id="trunkSourceWebCorepageNavigatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Navigator.cpp (201969 => 201970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Navigator.cpp 2016-06-11 11:46:19 UTC (rev 201969)
+++ trunk/Source/WebCore/page/Navigator.cpp 2016-06-11 17:44:20 UTC (rev 201970)
</span><span class="lines">@@ -38,7 +38,6 @@
</span><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include <wtf/HashSet.h>
</span><del>-#include <wtf/NumberOfCores.h>
</del><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx">
</span><span class="cx"> using namespace WTF;
</span><span class="lines">@@ -78,11 +77,6 @@
</span><span class="cx"> return appVersion;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String Navigator::language() const
-{
- return defaultLanguage();
-}
-
</del><span class="cx"> String Navigator::userAgent() const
</span><span class="cx"> {
</span><span class="cx"> if (!m_frame)
</span><span class="lines">@@ -134,29 +128,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if defined(ENABLE_NAVIGATOR_HWCONCURRENCY)
-int Navigator::hardwareConcurrency() const
-{
- // Enforce a maximum for the number of cores reported to mitigate
- // fingerprinting for the minority of machines with large numbers of cores.
- // If machines with more than 8 cores become commonplace, we should bump this number.
- // see https://bugs.webkit.org/show_bug.cgi?id=132588 for the
- // rationale behind this decision.
</del><span class="cx"> #if PLATFORM(IOS)
</span><del>- const int maxCoresToReport = 2;
-#else
- const int maxCoresToReport = 8;
-#endif
- int hardwareConcurrency = numberOfProcessorCores();
-
- if (hardwareConcurrency > maxCoresToReport)
- return maxCoresToReport;
-
- return hardwareConcurrency;
-}
-#endif
-
-#if PLATFORM(IOS)
</del><span class="cx"> bool Navigator::standalone() const
</span><span class="cx"> {
</span><span class="cx"> return m_frame && m_frame->settings().standalone();
</span></span></pre></div>
<a id="trunkSourceWebCorepageNavigatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Navigator.h (201969 => 201970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Navigator.h 2016-06-11 11:46:19 UTC (rev 201969)
+++ trunk/Source/WebCore/page/Navigator.h 2016-06-11 17:44:20 UTC (rev 201970)
</span><span class="lines">@@ -45,14 +45,10 @@
</span><span class="cx"> virtual ~Navigator();
</span><span class="cx">
</span><span class="cx"> String appVersion() const;
</span><del>- String language() const;
</del><span class="cx"> DOMPluginArray* plugins() const;
</span><span class="cx"> DOMMimeTypeArray* mimeTypes() const;
</span><span class="cx"> bool cookieEnabled() const;
</span><span class="cx"> bool javaEnabled() const;
</span><del>-#if defined(ENABLE_NAVIGATOR_HWCONCURRENCY)
- int hardwareConcurrency() const;
-#endif
</del><span class="cx"> virtual String userAgent() const;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebCorepageNavigatoridl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Navigator.idl (201969 => 201970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Navigator.idl 2016-06-11 11:46:19 UTC (rev 201969)
+++ trunk/Source/WebCore/page/Navigator.idl 2016-06-11 17:44:20 UTC (rev 201970)
</span><span class="lines">@@ -20,27 +20,11 @@
</span><span class="cx"> [
</span><span class="cx"> GenerateIsReachable=ImplFrame,
</span><span class="cx"> ] interface Navigator {
</span><del>- [Nondeterministic] readonly attribute DOMString appCodeName;
- [Nondeterministic] readonly attribute DOMString appName;
- [Nondeterministic] readonly attribute DOMString appVersion;
- [Nondeterministic] readonly attribute DOMString language;
- [Nondeterministic] readonly attribute DOMString userAgent;
- [Nondeterministic] readonly attribute DOMString platform;
</del><span class="cx"> readonly attribute DOMPluginArray plugins;
</span><span class="cx"> readonly attribute DOMMimeTypeArray mimeTypes;
</span><del>- [Nondeterministic] readonly attribute DOMString product;
- [Nondeterministic] readonly attribute DOMString productSub;
- [Nondeterministic] readonly attribute DOMString vendor;
- [Nondeterministic] readonly attribute DOMString vendorSub;
</del><span class="cx"> [Nondeterministic] readonly attribute boolean cookieEnabled;
</span><span class="cx"> [Nondeterministic] boolean javaEnabled();
</span><span class="cx">
</span><del>- readonly attribute boolean onLine;
-
-#if defined(ENABLE_NAVIGATOR_HWCONCURRENCY)
- readonly attribute long hardwareConcurrency;
-#endif
-
</del><span class="cx"> // FIXME: Convert this #if'def to an IDL conditional attribute.
</span><span class="cx"> #if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
</span><span class="cx"> readonly attribute boolean standalone;
</span><span class="lines">@@ -49,3 +33,7 @@
</span><span class="cx"> void getStorageUpdates(); // FIXME: Remove this method or rename to yieldForStorageUpdates.
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+Navigator implements NavigatorConcurrentHardware;
+Navigator implements NavigatorID;
+Navigator implements NavigatorLanguage;
+Navigator implements NavigatorOnLine;
</ins></span></pre></div>
<a id="trunkSourceWebCorepageNavigatorBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/NavigatorBase.cpp (201969 => 201970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/NavigatorBase.cpp 2016-06-11 11:46:19 UTC (rev 201969)
+++ trunk/Source/WebCore/page/NavigatorBase.cpp 2016-06-11 17:44:20 UTC (rev 201970)
</span><span class="lines">@@ -27,8 +27,11 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "NavigatorBase.h"
</span><span class="cx">
</span><ins>+#include "Language.h"
</ins><span class="cx"> #include "NetworkStateNotifier.h"
</span><ins>+#include <mutex>
</ins><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><ins>+#include <wtf/NumberOfCores.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> #if OS(LINUX)
</span><span class="lines">@@ -44,30 +47,30 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #define WEBCORE_NAVIGATOR_PLATFORM deviceName()
</span><span class="cx"> #elif OS(MAC_OS_X) && (CPU(PPC) || CPU(PPC64))
</span><del>-#define WEBCORE_NAVIGATOR_PLATFORM "MacPPC"
</del><ins>+#define WEBCORE_NAVIGATOR_PLATFORM ASCIILiteral("MacPPC")
</ins><span class="cx"> #elif OS(MAC_OS_X) && (CPU(X86) || CPU(X86_64))
</span><del>-#define WEBCORE_NAVIGATOR_PLATFORM "MacIntel"
</del><ins>+#define WEBCORE_NAVIGATOR_PLATFORM ASCIILiteral("MacIntel")
</ins><span class="cx"> #elif OS(WINDOWS)
</span><del>-#define WEBCORE_NAVIGATOR_PLATFORM "Win32"
</del><ins>+#define WEBCORE_NAVIGATOR_PLATFORM ASCIILiteral("Win32")
</ins><span class="cx"> #else
</span><del>-#define WEBCORE_NAVIGATOR_PLATFORM ""
</del><ins>+#define WEBCORE_NAVIGATOR_PLATFORM emptyString()
</ins><span class="cx"> #endif
</span><span class="cx"> #endif // ifndef WEBCORE_NAVIGATOR_PLATFORM
</span><span class="cx">
</span><span class="cx"> #ifndef WEBCORE_NAVIGATOR_PRODUCT
</span><del>-#define WEBCORE_NAVIGATOR_PRODUCT "Gecko"
</del><ins>+#define WEBCORE_NAVIGATOR_PRODUCT ASCIILiteral("Gecko")
</ins><span class="cx"> #endif // ifndef WEBCORE_NAVIGATOR_PRODUCT
</span><span class="cx">
</span><span class="cx"> #ifndef WEBCORE_NAVIGATOR_PRODUCT_SUB
</span><del>-#define WEBCORE_NAVIGATOR_PRODUCT_SUB "20030107"
</del><ins>+#define WEBCORE_NAVIGATOR_PRODUCT_SUB ASCIILiteral("20030107")
</ins><span class="cx"> #endif // ifndef WEBCORE_NAVIGATOR_PRODUCT_SUB
</span><span class="cx">
</span><span class="cx"> #ifndef WEBCORE_NAVIGATOR_VENDOR
</span><del>-#define WEBCORE_NAVIGATOR_VENDOR "Apple Computer, Inc."
</del><ins>+#define WEBCORE_NAVIGATOR_VENDOR ASCIILiteral("Apple Computer, Inc.")
</ins><span class="cx"> #endif // ifndef WEBCORE_NAVIGATOR_VENDOR
</span><span class="cx">
</span><span class="cx"> #ifndef WEBCORE_NAVIGATOR_VENDOR_SUB
</span><del>-#define WEBCORE_NAVIGATOR_VENDOR_SUB ""
</del><ins>+#define WEBCORE_NAVIGATOR_VENDOR_SUB emptyString()
</ins><span class="cx"> #endif // ifndef WEBCORE_NAVIGATOR_VENDOR_SUB
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -76,9 +79,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String NavigatorBase::appName() const
</del><ins>+String NavigatorBase::appName()
</ins><span class="cx"> {
</span><del>- return "Netscape";
</del><ins>+ return ASCIILiteral("Netscape");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String NavigatorBase::appVersion() const
</span><span class="lines">@@ -88,7 +91,7 @@
</span><span class="cx"> return agent.substring(agent.find('/') + 1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String NavigatorBase::platform() const
</del><ins>+String NavigatorBase::platform()
</ins><span class="cx"> {
</span><span class="cx"> #if OS(LINUX)
</span><span class="cx"> if (!String(WEBCORE_NAVIGATOR_PLATFORM).isEmpty())
</span><span class="lines">@@ -101,34 +104,65 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String NavigatorBase::appCodeName() const
</del><ins>+String NavigatorBase::appCodeName()
</ins><span class="cx"> {
</span><del>- return "Mozilla";
</del><ins>+ return ASCIILiteral("Mozilla");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-String NavigatorBase::product() const
</del><ins>+String NavigatorBase::product()
</ins><span class="cx"> {
</span><span class="cx"> return WEBCORE_NAVIGATOR_PRODUCT;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String NavigatorBase::productSub() const
</del><ins>+String NavigatorBase::productSub()
</ins><span class="cx"> {
</span><span class="cx"> return WEBCORE_NAVIGATOR_PRODUCT_SUB;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String NavigatorBase::vendor() const
</del><ins>+String NavigatorBase::vendor()
</ins><span class="cx"> {
</span><span class="cx"> return WEBCORE_NAVIGATOR_VENDOR;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String NavigatorBase::vendorSub() const
</del><ins>+String NavigatorBase::vendorSub()
</ins><span class="cx"> {
</span><span class="cx"> return WEBCORE_NAVIGATOR_VENDOR_SUB;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool NavigatorBase::onLine() const
</del><ins>+bool NavigatorBase::onLine()
</ins><span class="cx"> {
</span><span class="cx"> return networkStateNotifier().onLine();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String NavigatorBase::language()
+{
+ return defaultLanguage();
+}
+
+#if ENABLE(NAVIGATOR_HWCONCURRENCY)
+
+int NavigatorBase::hardwareConcurrency()
+{
+ static int numberOfCores;
+
+ static std::once_flag once;
+ std::call_once(once, [] {
+ // Enforce a maximum for the number of cores reported to mitigate
+ // fingerprinting for the minority of machines with large numbers of cores.
+ // If machines with more than 8 cores become commonplace, we should bump this number.
+ // see https://bugs.webkit.org/show_bug.cgi?id=132588 for the
+ // rationale behind this decision.
+#if PLATFORM(IOS)
+ const int maxCoresToReport = 2;
+#else
+ const int maxCoresToReport = 8;
+#endif
+ numberOfCores = std::min(WTF::numberOfProcessorCores(), maxCoresToReport);
+ });
+
+ return numberOfCores;
+}
+
+#endif
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepageNavigatorBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/NavigatorBase.h (201969 => 201970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/NavigatorBase.h 2016-06-11 11:46:19 UTC (rev 201969)
+++ trunk/Source/WebCore/page/NavigatorBase.h 2016-06-11 17:44:20 UTC (rev 201970)
</span><span class="lines">@@ -30,25 +30,31 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>- class NavigatorBase {
- public:
- String appName() const;
- String appVersion() const;
- virtual String userAgent() const = 0;
- String platform() const;
</del><ins>+class NavigatorBase {
+public:
+ static String appName();
+ String appVersion() const;
+ virtual String userAgent() const = 0;
+ static String platform();
</ins><span class="cx">
</span><del>- String appCodeName() const;
- String product() const;
- String productSub() const;
- String vendor() const;
- String vendorSub() const;
</del><ins>+ static String appCodeName();
+ static String product();
+ static String productSub();
+ static String vendor();
+ static String vendorSub();
</ins><span class="cx">
</span><del>- bool onLine() const;
</del><ins>+ static bool onLine();
</ins><span class="cx">
</span><del>- protected:
- virtual ~NavigatorBase();
- };
</del><ins>+ static String language();
</ins><span class="cx">
</span><ins>+#if ENABLE(NAVIGATOR_HWCONCURRENCY)
+ static int hardwareConcurrency();
+#endif
+
+protected:
+ virtual ~NavigatorBase();
+};
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // NavigatorBase_h
</span></span></pre></div>
<a id="trunkSourceWebCorepageNavigatorConcurrentHardwareidlfromrev201969trunkSourceWebCorepageWorkerNavigatoridl"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/page/NavigatorConcurrentHardware.idl (from rev 201969, trunk/Source/WebCore/page/WorkerNavigator.idl) (0 => 201970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/NavigatorConcurrentHardware.idl (rev 0)
+++ trunk/Source/WebCore/page/NavigatorConcurrentHardware.idl 2016-06-11 17:44:20 UTC (rev 201970)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+[
+ NoInterfaceObject
+] interface NavigatorConcurrentHardware {
+ [Conditional=NAVIGATOR_HWCONCURRENCY] readonly attribute unsigned long long hardwareConcurrency;
+};
</ins></span></pre></div>
<a id="trunkSourceWebCorepageNavigatorIDidlfromrev201969trunkSourceWebCorepageWorkerNavigatoridl"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/page/NavigatorID.idl (from rev 201969, trunk/Source/WebCore/page/WorkerNavigator.idl) (0 => 201970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/NavigatorID.idl (rev 0)
+++ trunk/Source/WebCore/page/NavigatorID.idl 2016-06-11 17:44:20 UTC (rev 201970)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+[
+ NoInterfaceObject
+] interface NavigatorID {
+ [Nondeterministic] readonly attribute DOMString appCodeName;
+ [Nondeterministic] readonly attribute DOMString appName;
+ [Nondeterministic] readonly attribute DOMString appVersion;
+ [Nondeterministic] readonly attribute DOMString platform;
+ [Nondeterministic] readonly attribute DOMString product;
+ [Nondeterministic] readonly attribute DOMString productSub;
+ [Nondeterministic] readonly attribute DOMString userAgent;
+ [Nondeterministic] readonly attribute DOMString vendor;
+ [Nondeterministic] readonly attribute DOMString vendorSub;
+};
</ins></span></pre></div>
<a id="trunkSourceWebCorepageNavigatorLanguageidlfromrev201969trunkSourceWebCorepageWorkerNavigatoridl"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/page/NavigatorLanguage.idl (from rev 201969, trunk/Source/WebCore/page/WorkerNavigator.idl) (0 => 201970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/NavigatorLanguage.idl (rev 0)
+++ trunk/Source/WebCore/page/NavigatorLanguage.idl 2016-06-11 17:44:20 UTC (rev 201970)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+[
+ NoInterfaceObject
+] interface NavigatorLanguage {
+ [Nondeterministic] readonly attribute DOMString language;
+ // readonly attribute FrozenArray<DOMString> languages;
+};
</ins></span></pre></div>
<a id="trunkSourceWebCorepageNavigatorOnLineidlfromrev201969trunkSourceWebCorepageWorkerNavigatoridl"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/page/NavigatorOnLine.idl (from rev 201969, trunk/Source/WebCore/page/WorkerNavigator.idl) (0 => 201970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/NavigatorOnLine.idl (rev 0)
+++ trunk/Source/WebCore/page/NavigatorOnLine.idl 2016-06-11 17:44:20 UTC (rev 201970)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+[
+ NoInterfaceObject
+] interface NavigatorOnLine {
+ readonly attribute boolean onLine;
+};
</ins></span></pre></div>
<a id="trunkSourceWebCorepageWorkerNavigatoridl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/WorkerNavigator.idl (201969 => 201970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/WorkerNavigator.idl 2016-06-11 11:46:19 UTC (rev 201969)
+++ trunk/Source/WebCore/page/WorkerNavigator.idl 2016-06-11 17:44:20 UTC (rev 201970)
</span><span class="lines">@@ -30,11 +30,9 @@
</span><span class="cx"> Exposed=Worker,
</span><span class="cx"> GenerateIsReachable=Impl,
</span><span class="cx"> ] interface WorkerNavigator {
</span><del>- readonly attribute DOMString appName;
- readonly attribute DOMString appVersion;
- readonly attribute DOMString platform;
- readonly attribute DOMString userAgent;
-
- readonly attribute boolean onLine;
</del><span class="cx"> };
</span><span class="cx">
</span><ins>+WorkerNavigator implements NavigatorConcurrentHardware;
+WorkerNavigator implements NavigatorID;
+WorkerNavigator implements NavigatorLanguage;
+WorkerNavigator implements NavigatorOnLine;
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformLanguagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Language.cpp (201969 => 201970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Language.cpp 2016-06-11 11:46:19 UTC (rev 201969)
+++ trunk/Source/WebCore/platform/Language.cpp 2016-06-11 17:44:20 UTC (rev 201970)
</span><span class="lines">@@ -38,6 +38,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+static StaticLock userPreferredLanguagesMutex;
+
</ins><span class="cx"> static void registerLanguageDidChangeCallbackIfNecessary()
</span><span class="cx"> {
</span><span class="cx"> static std::once_flag once;
</span><span class="lines">@@ -100,11 +102,23 @@
</span><span class="cx"> languageDidChange();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static Vector<String> isolatedCopy(const Vector<String>& strings)
+{
+ Vector<String> copy;
+ copy.reserveInitialCapacity(strings.size());
+ for (auto& language : strings)
+ copy.uncheckedAppend(language.isolatedCopy());
+ return copy;
+}
+
</ins><span class="cx"> Vector<String> userPreferredLanguages()
</span><span class="cx"> {
</span><del>- Vector<String>& override = preferredLanguagesOverride();
- if (!override.isEmpty())
- return override;
</del><ins>+ {
+ std::lock_guard<StaticLock> lock(userPreferredLanguagesMutex);
+ Vector<String>& override = preferredLanguagesOverride();
+ if (!override.isEmpty())
+ return isolatedCopy(override);
+ }
</ins><span class="cx">
</span><span class="cx"> registerLanguageDidChangeCallbackIfNecessary();
</span><span class="cx"> return platformUserPreferredLanguages();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLanguageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Language.h (201969 => 201970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Language.h 2016-06-11 11:46:19 UTC (rev 201969)
+++ trunk/Source/WebCore/platform/Language.h 2016-06-11 17:44:20 UTC (rev 201970)
</span><span class="lines">@@ -31,8 +31,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-WEBCORE_EXPORT String defaultLanguage();
-WEBCORE_EXPORT Vector<String> userPreferredLanguages();
</del><ins>+WEBCORE_EXPORT String defaultLanguage(); // Thread-safe.
+WEBCORE_EXPORT Vector<String> userPreferredLanguages(); // Thread-safe.
</ins><span class="cx"> Vector<String> userPreferredLanguagesOverride();
</span><span class="cx"> WEBCORE_EXPORT void overrideUserPreferredLanguages(const Vector<String>&);
</span><span class="cx"> size_t indexOfBestMatchingLanguageInList(const String& language, const Vector<String>& languageList, bool& exactMatch);
</span></span></pre>
</div>
</div>
</body>
</html>