<!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>[204481] 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/204481">204481</a></dd>
<dt>Author</dt> <dd>jiewen_tan@apple.com</dd>
<dt>Date</dt> <dd>2016-08-15 14:08:25 -0700 (Mon, 15 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Expose crypto.getRandomValues to Web Workers
https://bugs.webkit.org/show_bug.cgi?id=104851
<rdar://problem/27285714>
Reviewed by Darin Adler.
Source/WebCore:
Tests: crypto/webkitSubtle/disallowed-in-worker.html
crypto/workers/crypto-gc-worker.html
crypto/workers/crypto-random-values-limits-worker.html
crypto/workers/crypto-random-values-types-worker.html
crypto/workers/crypto-random-values-worker.html
Expose both crypto and crypto.getRandomValues to Web Workers. However, webkitSubtle is
disabled in Web Workers. This change also refactors a bit on IDLs related to Crypto
interface.
* CMakeLists.txt:
* DerivedSources.cpp:
* DerivedSources.make:
* WebCore.xcodeproj/project.pbxproj:
Introduce GlobalCrypto Interface which is used to repalace the partial IDL in both
DOMWindow and WorkerGlobalScope with sub-implememtations.
* bindings/js/JSDocumentCustom.cpp:
(WebCore::JSDocument::visitAdditionalChildren):
* bindings/js/JSWorkerGlobalScopeCustom.cpp:
(WebCore::JSWorkerGlobalScope::visitAdditionalChildren):
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateImplementation):
* bindings/scripts/IDLAttributes.txt:
* dom/Document.idl:
Add support of GenerateIsReachable=ImplScriptExecutionContext, which allow registered
JS Objects to live as long as ScriptExecutionContext lives, i.e. Document and
WorkerGlobalScope.
* page/Crypto.cpp:
(WebCore::Crypto::Crypto):
(WebCore::Crypto::webkitSubtle):
(WebCore::Crypto::document): Deleted.
* page/Crypto.h:
(WebCore::Crypto::create):
* page/Crypto.idl:
Change the opaque root of Crypto to ScriptExecutionContext such that it perserves
the same live time in both Window and Web Worker. And disable WebKitSubtle in Web
Workers.
* page/DOMWindow.idl:
* page/GlobalCrypto.idl: Added.
Replace partial IDL to sub-implementation of crypto attribute.
* workers/WorkerGlobalScope.cpp:
(WebCore::WorkerGlobalScope::crypto):
* workers/WorkerGlobalScope.h:
* workers/WorkerGlobalScope.idl:
Introduce crypto attribute to Web Workers.
LayoutTests:
* crypto/crypto-random-values-limits.html:
* crypto/crypto-random-values-types.html:
* crypto/crypto-random-values.html:
* crypto/webkitSubtle/disallowed-in-worker-expected.txt: Added.
* crypto/webkitSubtle/disallowed-in-worker.html: Added.
* crypto/webkitSubtle/resources/disallowed-in-worker.js: Added.
* crypto/workers/crypto-gc-worker-expected.txt: Added.
* crypto/workers/crypto-gc-worker.html: Added.
* crypto/workers/crypto-random-values-limits-worker-expected.txt: Added.
* crypto/workers/crypto-random-values-limits-worker.html: Added.
* crypto/workers/crypto-random-values-types-worker-expected.txt: Added.
* crypto/workers/crypto-random-values-types-worker.html: Added.
* crypto/workers/crypto-random-values-worker-expected.txt: Added.
* crypto/workers/crypto-random-values-worker.html: Added.
* crypto/workers/resources/crypto-gc-worker.js: Added.
(startTest):
(continueTest):
(finishTest):
* crypto/workers/resources/crypto-random-limits-worker.js: Added.
(catch):
* crypto/workers/resources/crypto-random-values-types-worker.js: Copied from LayoutTests/crypto/crypto-random-values-types.html.
(checkIntegerTypes):
(checkNonIntegerTypes):
* crypto/workers/resources/crypto-random-values-worker.js: Copied from LayoutTests/crypto/crypto-random-values.html.
(catch):
* js/dom/global-constructors-attributes-dedicated-worker-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscryptocryptorandomvalueslimitshtml">trunk/LayoutTests/crypto/crypto-random-values-limits.html</a></li>
<li><a href="#trunkLayoutTestscryptocryptorandomvaluestypeshtml">trunk/LayoutTests/crypto/crypto-random-values-types.html</a></li>
<li><a href="#trunkLayoutTestscryptocryptorandomvalueshtml">trunk/LayoutTests/crypto/crypto-random-values.html</a></li>
<li><a href="#trunkLayoutTestsjsdomglobalconstructorsattributesdedicatedworkerexpectedtxt">trunk/LayoutTests/js/dom/global-constructors-attributes-dedicated-worker-expected.txt</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="#trunkSourceWebCoreDerivedSourcescpp">trunk/Source/WebCore/DerivedSources.cpp</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDocumentCustomcpp">trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSWorkerGlobalScopeCustomcpp">trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsIDLAttributestxt">trunk/Source/WebCore/bindings/scripts/IDLAttributes.txt</a></li>
<li><a href="#trunkSourceWebCoredomDocumentidl">trunk/Source/WebCore/dom/Document.idl</a></li>
<li><a href="#trunkSourceWebCorepageCryptocpp">trunk/Source/WebCore/page/Crypto.cpp</a></li>
<li><a href="#trunkSourceWebCorepageCryptoh">trunk/Source/WebCore/page/Crypto.h</a></li>
<li><a href="#trunkSourceWebCorepageCryptoidl">trunk/Source/WebCore/page/Crypto.idl</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowidl">trunk/Source/WebCore/page/DOMWindow.idl</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerGlobalScopecpp">trunk/Source/WebCore/workers/WorkerGlobalScope.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerGlobalScopeh">trunk/Source/WebCore/workers/WorkerGlobalScope.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerGlobalScopeidl">trunk/Source/WebCore/workers/WorkerGlobalScope.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscryptowebkitSubtledisallowedinworkerexpectedtxt">trunk/LayoutTests/crypto/webkitSubtle/disallowed-in-worker-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptowebkitSubtledisallowedinworkerhtml">trunk/LayoutTests/crypto/webkitSubtle/disallowed-in-worker.html</a></li>
<li>trunk/LayoutTests/crypto/webkitSubtle/resources/</li>
<li><a href="#trunkLayoutTestscryptowebkitSubtleresourcesdisallowedinworkerjs">trunk/LayoutTests/crypto/webkitSubtle/resources/disallowed-in-worker.js</a></li>
<li>trunk/LayoutTests/crypto/workers/</li>
<li><a href="#trunkLayoutTestscryptoworkerscryptogcworkerexpectedtxt">trunk/LayoutTests/crypto/workers/crypto-gc-worker-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptoworkerscryptogcworkerhtml">trunk/LayoutTests/crypto/workers/crypto-gc-worker.html</a></li>
<li><a href="#trunkLayoutTestscryptoworkerscryptorandomvalueslimitsworkerexpectedtxt">trunk/LayoutTests/crypto/workers/crypto-random-values-limits-worker-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptoworkerscryptorandomvalueslimitsworkerhtml">trunk/LayoutTests/crypto/workers/crypto-random-values-limits-worker.html</a></li>
<li><a href="#trunkLayoutTestscryptoworkerscryptorandomvaluestypesworkerexpectedtxt">trunk/LayoutTests/crypto/workers/crypto-random-values-types-worker-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptoworkerscryptorandomvaluestypesworkerhtml">trunk/LayoutTests/crypto/workers/crypto-random-values-types-worker.html</a></li>
<li><a href="#trunkLayoutTestscryptoworkerscryptorandomvaluesworkerexpectedtxt">trunk/LayoutTests/crypto/workers/crypto-random-values-worker-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptoworkerscryptorandomvaluesworkerhtml">trunk/LayoutTests/crypto/workers/crypto-random-values-worker.html</a></li>
<li>trunk/LayoutTests/crypto/workers/resources/</li>
<li><a href="#trunkLayoutTestscryptoworkersresourcescryptogcworkerjs">trunk/LayoutTests/crypto/workers/resources/crypto-gc-worker.js</a></li>
<li><a href="#trunkLayoutTestscryptoworkersresourcescryptorandomlimitsworkerjs">trunk/LayoutTests/crypto/workers/resources/crypto-random-limits-worker.js</a></li>
<li><a href="#trunkLayoutTestscryptoworkersresourcescryptorandomvaluestypesworkerjs">trunk/LayoutTests/crypto/workers/resources/crypto-random-values-types-worker.js</a></li>
<li><a href="#trunkLayoutTestscryptoworkersresourcescryptorandomvaluesworkerjs">trunk/LayoutTests/crypto/workers/resources/crypto-random-values-worker.js</a></li>
<li><a href="#trunkSourceWebCorepageGlobalCryptoidl">trunk/Source/WebCore/page/GlobalCrypto.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (204480 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-08-15 21:04:49 UTC (rev 204480)
+++ trunk/LayoutTests/ChangeLog 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2016-08-15 Jiewen Tan <jiewen_tan@apple.com>
+
+ Expose crypto.getRandomValues to Web Workers
+ https://bugs.webkit.org/show_bug.cgi?id=104851
+ <rdar://problem/27285714>
+
+ Reviewed by Darin Adler.
+
+ * crypto/crypto-random-values-limits.html:
+ * crypto/crypto-random-values-types.html:
+ * crypto/crypto-random-values.html:
+ * crypto/webkitSubtle/disallowed-in-worker-expected.txt: Added.
+ * crypto/webkitSubtle/disallowed-in-worker.html: Added.
+ * crypto/webkitSubtle/resources/disallowed-in-worker.js: Added.
+ * crypto/workers/crypto-gc-worker-expected.txt: Added.
+ * crypto/workers/crypto-gc-worker.html: Added.
+ * crypto/workers/crypto-random-values-limits-worker-expected.txt: Added.
+ * crypto/workers/crypto-random-values-limits-worker.html: Added.
+ * crypto/workers/crypto-random-values-types-worker-expected.txt: Added.
+ * crypto/workers/crypto-random-values-types-worker.html: Added.
+ * crypto/workers/crypto-random-values-worker-expected.txt: Added.
+ * crypto/workers/crypto-random-values-worker.html: Added.
+ * crypto/workers/resources/crypto-gc-worker.js: Added.
+ (startTest):
+ (continueTest):
+ (finishTest):
+ * crypto/workers/resources/crypto-random-limits-worker.js: Added.
+ (catch):
+ * crypto/workers/resources/crypto-random-values-types-worker.js: Copied from LayoutTests/crypto/crypto-random-values-types.html.
+ (checkIntegerTypes):
+ (checkNonIntegerTypes):
+ * crypto/workers/resources/crypto-random-values-worker.js: Copied from LayoutTests/crypto/crypto-random-values.html.
+ (catch):
+ * js/dom/global-constructors-attributes-dedicated-worker-expected.txt:
+
</ins><span class="cx"> 2016-08-15 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Rebaseline js/dom/global-constructors-attributes.html for mac-wk1, mark as failing on Yosemite.
</span></span></pre></div>
<a id="trunkLayoutTestscryptocryptorandomvalueslimitshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/crypto-random-values-limits.html (204480 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/crypto-random-values-limits.html 2016-08-15 21:04:49 UTC (rev 204480)
+++ trunk/LayoutTests/crypto/crypto-random-values-limits.html 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -2,7 +2,6 @@
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><span class="cx"> <script src="../resources/js-test-pre.js"></script>
</span><del>-<script src="resources/utilities.js"></script>
</del><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <p id="description"></p>
</span></span></pre></div>
<a id="trunkLayoutTestscryptocryptorandomvaluestypeshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/crypto-random-values-types.html (204480 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/crypto-random-values-types.html 2016-08-15 21:04:49 UTC (rev 204480)
+++ trunk/LayoutTests/crypto/crypto-random-values-types.html 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -2,7 +2,6 @@
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><span class="cx"> <script src="../resources/js-test-pre.js"></script>
</span><del>-<script src="resources/utilities.js"></script>
</del><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <p id="description"></p>
</span></span></pre></div>
<a id="trunkLayoutTestscryptocryptorandomvalueshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/crypto-random-values.html (204480 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/crypto-random-values.html 2016-08-15 21:04:49 UTC (rev 204480)
+++ trunk/LayoutTests/crypto/crypto-random-values.html 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -2,7 +2,6 @@
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><span class="cx"> <script src="../resources/js-test-pre.js"></script>
</span><del>-<script src="resources/utilities.js"></script>
</del><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <p id="description"></p>
</span></span></pre></div>
<a id="trunkLayoutTestscryptowebkitSubtledisallowedinworkerexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/webkitSubtle/disallowed-in-worker-expected.txt (0 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/webkitSubtle/disallowed-in-worker-expected.txt (rev 0)
+++ trunk/LayoutTests/crypto/webkitSubtle/disallowed-in-worker-expected.txt 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+[Worker] Tests that crypto.webkitSubtle will throw in workers.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Starting worker: resources/disallowed-in-worker.js
+PASS [Worker] crypto.webkitSubtle threw exception NotSupportedError (DOM Exception 9): The operation is not supported..
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscryptowebkitSubtledisallowedinworkerhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/webkitSubtle/disallowed-in-worker.html (0 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/webkitSubtle/disallowed-in-worker.html (rev 0)
+++ trunk/LayoutTests/crypto/webkitSubtle/disallowed-in-worker.html 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+ <script>
+ worker = startWorker('resources/disallowed-in-worker.js');
+ </script>
+ <script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscryptowebkitSubtleresourcesdisallowedinworkerjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/webkitSubtle/resources/disallowed-in-worker.js (0 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/webkitSubtle/resources/disallowed-in-worker.js (rev 0)
+++ trunk/LayoutTests/crypto/webkitSubtle/resources/disallowed-in-worker.js 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+importScripts('../../../resources/js-test-pre.js');
+
+description("Tests that crypto.webkitSubtle will throw in workers.");
+
+shouldThrow("crypto.webkitSubtle", "'NotSupportedError (DOM Exception 9): The operation is not supported.'");
+
+finishJSTest();
</ins></span></pre></div>
<a id="trunkLayoutTestscryptoworkerscryptogcworkerexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/workers/crypto-gc-worker-expected.txt (0 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/workers/crypto-gc-worker-expected.txt (rev 0)
+++ trunk/LayoutTests/crypto/workers/crypto-gc-worker-expected.txt 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+[Worker] Test that self.crypto wrapper preserves custom properties.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Starting worker: resources/crypto-gc-worker.js
+PASS [Worker] self.crypto.foo is "bar"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscryptoworkerscryptogcworkerhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/workers/crypto-gc-worker.html (0 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/workers/crypto-gc-worker.html (rev 0)
+++ trunk/LayoutTests/crypto/workers/crypto-gc-worker.html 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+ <script>
+ worker = startWorker('resources/crypto-gc-worker.js');
+ </script>
+ <script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscryptoworkerscryptorandomvalueslimitsworkerexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/workers/crypto-random-values-limits-worker-expected.txt (0 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/workers/crypto-random-values-limits-worker-expected.txt (rev 0)
+++ trunk/LayoutTests/crypto/workers/crypto-random-values-limits-worker-expected.txt 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+[Worker] Tests the limits of crypto.randomValues.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Starting worker: resources/crypto-random-limits-worker.js
+PASS [Worker] 'crypto' in self is true
+PASS [Worker] 'getRandomValues' in self.crypto is true
+PASS [Worker] crypto.getRandomValues(almostTooLargeArray) did not throw exception.
+PASS [Worker] crypto.getRandomValues(tooLargeArray) threw exception QuotaExceededError (DOM Exception 22): The quota has been exceeded..
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscryptoworkerscryptorandomvalueslimitsworkerhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/workers/crypto-random-values-limits-worker.html (0 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/workers/crypto-random-values-limits-worker.html (rev 0)
+++ trunk/LayoutTests/crypto/workers/crypto-random-values-limits-worker.html 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+ <script>
+ worker = startWorker('resources/crypto-random-limits-worker.js');
+ </script>
+ <script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscryptoworkerscryptorandomvaluestypesworkerexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/workers/crypto-random-values-types-worker-expected.txt (0 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/workers/crypto-random-values-types-worker-expected.txt (rev 0)
+++ trunk/LayoutTests/crypto/workers/crypto-random-values-types-worker-expected.txt 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -0,0 +1,53 @@
</span><ins>+[Worker] Tests which types are valid for crypto.randomValues.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Starting worker: resources/crypto-random-values-types-worker.js
+PASS [Worker] 'crypto' in self is true
+PASS [Worker] 'getRandomValues' in self.crypto is true
+PASS [Worker] random = crypto.getRandomValues(new Uint8Array(3)) is defined.
+PASS [Worker] random is an instance of Uint8Array
+PASS [Worker] view = new Uint8Array(3) is defined.
+PASS [Worker] random = crypto.getRandomValues(view) is defined.
+PASS [Worker] random is view
+PASS [Worker] random = crypto.getRandomValues(new Int8Array(3)) is defined.
+PASS [Worker] random is an instance of Int8Array
+PASS [Worker] view = new Int8Array(3) is defined.
+PASS [Worker] random = crypto.getRandomValues(view) is defined.
+PASS [Worker] random is view
+PASS [Worker] random = crypto.getRandomValues(new Uint8ClampedArray(3)) is defined.
+PASS [Worker] random is an instance of Uint8ClampedArray
+PASS [Worker] view = new Uint8ClampedArray(3) is defined.
+PASS [Worker] random = crypto.getRandomValues(view) is defined.
+PASS [Worker] random is view
+PASS [Worker] random = crypto.getRandomValues(new Uint16Array(3)) is defined.
+PASS [Worker] random is an instance of Uint16Array
+PASS [Worker] view = new Uint16Array(3) is defined.
+PASS [Worker] random = crypto.getRandomValues(view) is defined.
+PASS [Worker] random is view
+PASS [Worker] random = crypto.getRandomValues(new Int16Array(3)) is defined.
+PASS [Worker] random is an instance of Int16Array
+PASS [Worker] view = new Int16Array(3) is defined.
+PASS [Worker] random = crypto.getRandomValues(view) is defined.
+PASS [Worker] random is view
+PASS [Worker] random = crypto.getRandomValues(new Uint32Array(3)) is defined.
+PASS [Worker] random is an instance of Uint32Array
+PASS [Worker] view = new Uint32Array(3) is defined.
+PASS [Worker] random = crypto.getRandomValues(view) is defined.
+PASS [Worker] random is view
+PASS [Worker] random = crypto.getRandomValues(new Int32Array(3)) is defined.
+PASS [Worker] random is an instance of Int32Array
+PASS [Worker] view = new Int32Array(3) is defined.
+PASS [Worker] random = crypto.getRandomValues(view) is defined.
+PASS [Worker] random is view
+PASS [Worker] crypto.getRandomValues(new Float32Array(3)) threw exception TypeMismatchError (DOM Exception 17): The type of an object was incompatible with the expected type of the parameter associated to the object..
+PASS [Worker] crypto.getRandomValues(new Float64Array(3)) threw exception TypeMismatchError (DOM Exception 17): The type of an object was incompatible with the expected type of the parameter associated to the object..
+PASS [Worker] buffer = new Uint8Array(32) is defined.
+PASS [Worker] buffer.buffer is defined.
+PASS [Worker] view = new DataView(buffer.buffer) is defined.
+PASS [Worker] crypto.getRandomValues(view) threw exception TypeMismatchError (DOM Exception 17): The type of an object was incompatible with the expected type of the parameter associated to the object..
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscryptoworkerscryptorandomvaluestypesworkerhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/workers/crypto-random-values-types-worker.html (0 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/workers/crypto-random-values-types-worker.html (rev 0)
+++ trunk/LayoutTests/crypto/workers/crypto-random-values-types-worker.html 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+ <script>
+ worker = startWorker('resources/crypto-random-values-types-worker.js');
+ </script>
+ <script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscryptoworkerscryptorandomvaluesworkerexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/workers/crypto-random-values-worker-expected.txt (0 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/workers/crypto-random-values-worker-expected.txt (rev 0)
+++ trunk/LayoutTests/crypto/workers/crypto-random-values-worker-expected.txt 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+[Worker] Tests crypto.randomValues.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Starting worker: resources/crypto-random-values-worker.js
+PASS [Worker] 'crypto' in self is true
+PASS [Worker] 'getRandomValues' in self.crypto is true
+PASS [Worker] matchingBytes < 100 is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscryptoworkerscryptorandomvaluesworkerhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/workers/crypto-random-values-worker.html (0 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/workers/crypto-random-values-worker.html (rev 0)
+++ trunk/LayoutTests/crypto/workers/crypto-random-values-worker.html 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+ <script>
+ worker = startWorker('resources/crypto-random-values-worker.js');
+ </script>
+ <script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscryptoworkersresourcescryptogcworkerjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/workers/resources/crypto-gc-worker.js (0 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/workers/resources/crypto-gc-worker.js (rev 0)
+++ trunk/LayoutTests/crypto/workers/resources/crypto-gc-worker.js 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+importScripts('../../../resources/js-test-pre.js');
+
+description("Test that self.crypto wrapper preserves custom properties.");
+jsTestIsAsync = true;
+
+function startTest()
+{
+ self.crypto.foo = "bar";
+ gc();
+ setTimeout(continueTest, 10);
+}
+
+function continueTest()
+{
+ gc();
+ setTimeout(finishTest, 10);
+}
+
+function finishTest()
+{
+ gc();
+ shouldBe('self.crypto.foo', '"bar"');
+ finishJSTest();
+}
+
+startTest();
</ins></span></pre></div>
<a id="trunkLayoutTestscryptoworkersresourcescryptorandomlimitsworkerjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/workers/resources/crypto-random-limits-worker.js (0 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/workers/resources/crypto-random-limits-worker.js (rev 0)
+++ trunk/LayoutTests/crypto/workers/resources/crypto-random-limits-worker.js 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+importScripts('../../../resources/js-test-pre.js');
+
+description("Tests the limits of crypto.randomValues.");
+
+shouldBe("'crypto' in self", "true");
+shouldBe("'getRandomValues' in self.crypto", "true");
+
+try {
+ var almostTooLargeArray = new Uint8Array(65536);
+ var tooLargeArray = new Uint8Array(65537);
+
+ shouldNotThrow("crypto.getRandomValues(almostTooLargeArray)");
+ shouldThrow("crypto.getRandomValues(tooLargeArray)");
+} catch(ex) {
+ debug(ex);
+}
+
+finishJSTest();
</ins></span></pre></div>
<a id="trunkLayoutTestscryptoworkersresourcescryptorandomvaluestypesworkerjsfromrev204480trunkLayoutTestscryptocryptorandomvaluestypeshtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/crypto/workers/resources/crypto-random-values-types-worker.js (from rev 204480, trunk/LayoutTests/crypto/crypto-random-values-types.html) (0 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/workers/resources/crypto-random-values-types-worker.js (rev 0)
+++ trunk/LayoutTests/crypto/workers/resources/crypto-random-values-types-worker.js 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+importScripts('../../../resources/js-test-pre.js');
+
+description("Tests which types are valid for crypto.randomValues.");
+
+shouldBe("'crypto' in self", "true");
+shouldBe("'getRandomValues' in self.crypto", "true");
+
+function checkIntegerTypes() {
+ var integerTypes = [
+ "Uint8Array", "Int8Array", "Uint8ClampedArray",
+ "Uint16Array", "Int16Array",
+ "Uint32Array", "Int32Array",
+ ];
+ integerTypes.forEach(function(arrayType) {
+ shouldBeDefined("random = crypto.getRandomValues(new "+arrayType+"(3))");
+ shouldBeType("random", arrayType);
+
+ shouldBeDefined("view = new "+arrayType+"(3)");
+ shouldBeDefined("random = crypto.getRandomValues(view)");
+ shouldBe("random", "view");
+ });
+}
+
+function checkNonIntegerTypes() {
+ var floatTypes = [
+ "Float32Array", "Float64Array",
+ ];
+ floatTypes.forEach(function(arrayType) {
+ shouldThrow("crypto.getRandomValues(new "+arrayType+"(3))");
+ });
+
+ shouldBeDefined("buffer = new Uint8Array(32)");
+ shouldBeDefined("buffer.buffer");
+ shouldBeDefined("view = new DataView(buffer.buffer)");
+ shouldThrow("crypto.getRandomValues(view)");
+}
+
+checkIntegerTypes();
+checkNonIntegerTypes();
+
+finishJSTest();
</ins></span></pre></div>
<a id="trunkLayoutTestscryptoworkersresourcescryptorandomvaluesworkerjsfromrev204480trunkLayoutTestscryptocryptorandomvalueshtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/crypto/workers/resources/crypto-random-values-worker.js (from rev 204480, trunk/LayoutTests/crypto/crypto-random-values.html) (0 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/workers/resources/crypto-random-values-worker.js (rev 0)
+++ trunk/LayoutTests/crypto/workers/resources/crypto-random-values-worker.js 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+importScripts('../../../resources/js-test-pre.js');
+
+description("Tests crypto.randomValues.");
+
+shouldBe("'crypto' in self", "true");
+shouldBe("'getRandomValues' in self.crypto", "true");
+
+try {
+ // FIXME: This test is flaky. If we ran this test every second since the
+ // beginning of the universe, on average, it would have failed
+ // 2^{-748} times.
+
+ var reference = new Uint8Array(100);
+ var sample = new Uint8Array(100);
+
+ crypto.getRandomValues(reference);
+ crypto.getRandomValues(sample);
+
+ var matchingBytes = 0;
+
+ for (var i = 0; i < reference.length; i++) {
+ if (reference[i] == sample[i])
+ matchingBytes++;
+ }
+
+ shouldBe("matchingBytes < 100", "true");
+} catch(ex) {
+ debug(ex);
+}
+
+finishJSTest();
</ins></span></pre></div>
<a id="trunkLayoutTestsjsdomglobalconstructorsattributesdedicatedworkerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/dom/global-constructors-attributes-dedicated-worker-expected.txt (204480 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/dom/global-constructors-attributes-dedicated-worker-expected.txt 2016-08-15 21:04:49 UTC (rev 204480)
+++ trunk/LayoutTests/js/dom/global-constructors-attributes-dedicated-worker-expected.txt 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -34,6 +34,11 @@
</span><span class="cx"> PASS [Worker] Object.getOwnPropertyDescriptor(global, 'CountQueuingStrategy').hasOwnProperty('set') is false
</span><span class="cx"> PASS [Worker] Object.getOwnPropertyDescriptor(global, 'CountQueuingStrategy').enumerable is false
</span><span class="cx"> PASS [Worker] Object.getOwnPropertyDescriptor(global, 'CountQueuingStrategy').configurable is true
</span><ins>+PASS [Worker] Object.getOwnPropertyDescriptor(global, 'Crypto').value is Crypto
+PASS [Worker] Object.getOwnPropertyDescriptor(global, 'Crypto').hasOwnProperty('get') is false
+PASS [Worker] Object.getOwnPropertyDescriptor(global, 'Crypto').hasOwnProperty('set') is false
+PASS [Worker] Object.getOwnPropertyDescriptor(global, 'Crypto').enumerable is false
+PASS [Worker] Object.getOwnPropertyDescriptor(global, 'Crypto').configurable is true
</ins><span class="cx"> PASS [Worker] Object.getOwnPropertyDescriptor(global, 'DOMException').value is DOMException
</span><span class="cx"> PASS [Worker] Object.getOwnPropertyDescriptor(global, 'DOMException').hasOwnProperty('get') is false
</span><span class="cx"> PASS [Worker] Object.getOwnPropertyDescriptor(global, 'DOMException').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (204480 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-08-15 21:04:49 UTC (rev 204480)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -604,6 +604,7 @@
</span><span class="cx"> page/DOMSelection.idl
</span><span class="cx"> page/DOMWindow.idl
</span><span class="cx"> page/EventSource.idl
</span><ins>+ page/GlobalCrypto.idl
</ins><span class="cx"> page/History.idl
</span><span class="cx"> page/Location.idl
</span><span class="cx"> page/Navigator.idl
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204480 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-15 21:04:49 UTC (rev 204480)
+++ trunk/Source/WebCore/ChangeLog 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -1,3 +1,57 @@
</span><ins>+2016-08-15 Jiewen Tan <jiewen_tan@apple.com>
+
+ Expose crypto.getRandomValues to Web Workers
+ https://bugs.webkit.org/show_bug.cgi?id=104851
+ <rdar://problem/27285714>
+
+ Reviewed by Darin Adler.
+
+ Tests: crypto/webkitSubtle/disallowed-in-worker.html
+ crypto/workers/crypto-gc-worker.html
+ crypto/workers/crypto-random-values-limits-worker.html
+ crypto/workers/crypto-random-values-types-worker.html
+ crypto/workers/crypto-random-values-worker.html
+
+ Expose both crypto and crypto.getRandomValues to Web Workers. However, webkitSubtle is
+ disabled in Web Workers. This change also refactors a bit on IDLs related to Crypto
+ interface.
+
+ * CMakeLists.txt:
+ * DerivedSources.cpp:
+ * DerivedSources.make:
+ * WebCore.xcodeproj/project.pbxproj:
+ Introduce GlobalCrypto Interface which is used to repalace the partial IDL in both
+ DOMWindow and WorkerGlobalScope with sub-implememtations.
+ * bindings/js/JSDocumentCustom.cpp:
+ (WebCore::JSDocument::visitAdditionalChildren):
+ * bindings/js/JSWorkerGlobalScopeCustom.cpp:
+ (WebCore::JSWorkerGlobalScope::visitAdditionalChildren):
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateImplementation):
+ * bindings/scripts/IDLAttributes.txt:
+ * dom/Document.idl:
+ Add support of GenerateIsReachable=ImplScriptExecutionContext, which allow registered
+ JS Objects to live as long as ScriptExecutionContext lives, i.e. Document and
+ WorkerGlobalScope.
+ * page/Crypto.cpp:
+ (WebCore::Crypto::Crypto):
+ (WebCore::Crypto::webkitSubtle):
+ (WebCore::Crypto::document): Deleted.
+ * page/Crypto.h:
+ (WebCore::Crypto::create):
+ * page/Crypto.idl:
+ Change the opaque root of Crypto to ScriptExecutionContext such that it perserves
+ the same live time in both Window and Web Worker. And disable WebKitSubtle in Web
+ Workers.
+ * page/DOMWindow.idl:
+ * page/GlobalCrypto.idl: Added.
+ Replace partial IDL to sub-implementation of crypto attribute.
+ * workers/WorkerGlobalScope.cpp:
+ (WebCore::WorkerGlobalScope::crypto):
+ * workers/WorkerGlobalScope.h:
+ * workers/WorkerGlobalScope.idl:
+ Introduce crypto attribute to Web Workers.
+
</ins><span class="cx"> 2016-08-15 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Use #pragma once in inspector headers
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.cpp (204480 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.cpp 2016-08-15 21:04:49 UTC (rev 204480)
+++ trunk/Source/WebCore/DerivedSources.cpp 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -210,6 +210,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #include "JSGeolocation.cpp"
</span><span class="cx"> #include "JSGeoposition.cpp"
</span><ins>+#include "JSGlobalCrypto.cpp"
</ins><span class="cx"> #include "JSGlobalEventHandlers.cpp"
</span><span class="cx"> #include "JSHashChangeEvent.cpp"
</span><span class="cx"> #include "JSHistory.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (204480 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2016-08-15 21:04:49 UTC (rev 204480)
+++ trunk/Source/WebCore/DerivedSources.make 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -513,6 +513,7 @@
</span><span class="cx"> $(WebCore)/page/DOMSelection.idl \
</span><span class="cx"> $(WebCore)/page/DOMWindow.idl \
</span><span class="cx"> $(WebCore)/page/EventSource.idl \
</span><ins>+ $(WebCore)/page/GlobalCrypto.idl \
</ins><span class="cx"> $(WebCore)/page/History.idl \
</span><span class="cx"> $(WebCore)/page/Location.idl \
</span><span class="cx"> $(WebCore)/page/Navigator.idl \
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (204480 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-08-15 21:04:49 UTC (rev 204480)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -9709,6 +9709,7 @@
</span><span class="cx"> 5709E8CC1D413CE3003244AC /* WebKitSubtleCrypto.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebKitSubtleCrypto.idl; sourceTree = "<group>"; };
</span><span class="cx"> 572A7F201C6E5719009C6149 /* SimulatedClick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimulatedClick.h; sourceTree = "<group>"; };
</span><span class="cx"> 572A7F221C6E5A66009C6149 /* SimulatedClick.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SimulatedClick.cpp; sourceTree = "<group>"; };
</span><ins>+ 574D42791D594FF6002CF50E /* GlobalCrypto.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = GlobalCrypto.idl; sourceTree = "<group>"; };
</ins><span class="cx"> 57EF5E5F1D20C83900171E60 /* TextCodecReplacement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextCodecReplacement.h; sourceTree = "<group>"; };
</span><span class="cx"> 57EF5E611D20D28700171E60 /* TextCodecReplacement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextCodecReplacement.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 5803715F1A66F00A00BAF519 /* ClipRect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ClipRect.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -18199,6 +18200,7 @@
</span><span class="cx"> 65A21483097A3F5300B9050A /* FrameTree.h */,
</span><span class="cx"> 65CBFEF70974F607001DAC25 /* FrameView.cpp */,
</span><span class="cx"> 65CBFEF80974F607001DAC25 /* FrameView.h */,
</span><ins>+ 574D42791D594FF6002CF50E /* GlobalCrypto.idl */,
</ins><span class="cx"> BC94D1500C275C8B006BC617 /* History.cpp */,
</span><span class="cx"> BC94D1510C275C8B006BC617 /* History.h */,
</span><span class="cx"> BC94D1520C275C8B006BC617 /* History.idl */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDocumentCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp (204480 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp 2016-08-15 21:04:49 UTC (rev 204480)
+++ trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -141,4 +141,9 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+void JSDocument::visitAdditionalChildren(SlotVisitor& visitor)
+{
+ visitor.addOpaqueRoot(wrapped().scriptExecutionContext());
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSWorkerGlobalScopeCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeCustom.cpp (204480 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeCustom.cpp 2016-08-15 21:04:49 UTC (rev 204480)
+++ trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeCustom.cpp 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -57,6 +57,7 @@
</span><span class="cx"> visitor.addOpaqueRoot(location);
</span><span class="cx"> if (WorkerNavigator* navigator = wrapped().optionalNavigator())
</span><span class="cx"> visitor.addOpaqueRoot(navigator);
</span><ins>+ visitor.addOpaqueRoot(wrapped().scriptExecutionContext());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue JSWorkerGlobalScope::importScripts(ExecState& state)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (204480 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-08-15 21:04:49 UTC (rev 204480)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -3534,6 +3534,10 @@
</span><span class="cx"> $implIncludes{"Element.h"} = 1;
</span><span class="cx"> $implIncludes{"JSNodeCustom.h"} = 1;
</span><span class="cx"> $rootString = " void* root = WebCore::root(js${interfaceName}->wrapped().ownerNode());\n";
</span><ins>+ } elsif (GetGenerateIsReachable($interface) eq "ImplScriptExecutionContext") {
+ $rootString = " ScriptExecutionContext* root = WTF::getPtr(js${interfaceName}->wrapped().scriptExecutionContext());\n";
+ $rootString .= " if (!root)\n";
+ $rootString .= " return false;\n";
</ins><span class="cx"> } else {
</span><span class="cx"> $rootString = " void* root = WebCore::root(&js${interfaceName}->wrapped());\n";
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsIDLAttributestxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/IDLAttributes.txt (204480 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/IDLAttributes.txt 2016-08-15 21:04:49 UTC (rev 204480)
+++ trunk/Source/WebCore/bindings/scripts/IDLAttributes.txt 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> ExportMacro=WEBCORE_EXPORT|WEBCORE_TESTSUPPORT_EXPORT
</span><span class="cx"> Exposed=*
</span><span class="cx"> ForwardDeclareInHeader
</span><del>-GenerateIsReachable=|Impl|ImplWebGLRenderingContext|ImplDocument|ImplElementRoot|ImplFrame|ImplOwnerNodeRoot
</del><ins>+GenerateIsReachable=|Impl|ImplWebGLRenderingContext|ImplDocument|ImplElementRoot|ImplFrame|ImplOwnerNodeRoot|ImplScriptExecutionContext
</ins><span class="cx"> GetterRaisesException
</span><span class="cx"> GetterRaisesExceptionWithMessage
</span><span class="cx"> Immutable
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.idl (204480 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.idl 2016-08-15 21:04:49 UTC (rev 204480)
+++ trunk/Source/WebCore/dom/Document.idl 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -22,9 +22,10 @@
</span><span class="cx"> Constructor,
</span><span class="cx"> ConstructorCallWith=ScriptExecutionContext,
</span><span class="cx"> CustomToJSObject,
</span><ins>+ ExportMacro=WEBCORE_EXPORT,
</ins><span class="cx"> JSCustomHeader,
</span><ins>+ JSCustomMarkFunction,
</ins><span class="cx"> JSGenerateToNativeObject,
</span><del>- ExportMacro=WEBCORE_EXPORT,
</del><span class="cx"> ] interface Document : Node {
</span><span class="cx">
</span><span class="cx"> // DOM Level 1 Core
</span></span></pre></div>
<a id="trunkSourceWebCorepageCryptocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Crypto.cpp (204480 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Crypto.cpp 2016-08-15 21:04:49 UTC (rev 204480)
+++ trunk/Source/WebCore/page/Crypto.cpp 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -39,8 +39,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-Crypto::Crypto(Document& document)
- : ContextDestructionObserver(&document)
</del><ins>+Crypto::Crypto(ScriptExecutionContext& context)
+ : ContextDestructionObserver(&context)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -48,11 +48,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Document* Crypto::document() const
-{
- return downcast<Document>(scriptExecutionContext());
-}
-
</del><span class="cx"> void Crypto::getRandomValues(ArrayBufferView* array, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> if (!array || !JSC::isInt(array->getType())) {
</span><span class="lines">@@ -67,11 +62,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SUBTLE_CRYPTO)
</span><del>-WebKitSubtleCrypto* Crypto::webkitSubtle()
</del><ins>+WebKitSubtleCrypto* Crypto::webkitSubtle(ExceptionCode& ec)
</ins><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ if (!isMainThread()) {
+ ec = NOT_SUPPORTED_ERR;
+ return 0;
+ }
+
</ins><span class="cx"> if (!m_webkitSubtle)
</span><del>- m_webkitSubtle = WebKitSubtleCrypto::create(*document());
</del><ins>+ m_webkitSubtle = WebKitSubtleCrypto::create(*downcast<Document>(scriptExecutionContext()));
</ins><span class="cx">
</span><span class="cx"> return m_webkitSubtle.get();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageCryptoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Crypto.h (204480 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Crypto.h 2016-08-15 21:04:49 UTC (rev 204480)
+++ trunk/Source/WebCore/page/Crypto.h 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -48,19 +48,17 @@
</span><span class="cx">
</span><span class="cx"> class Crypto : public ContextDestructionObserver, public RefCounted<Crypto> {
</span><span class="cx"> public:
</span><del>- static Ref<Crypto> create(Document& document) { return adoptRef(*new Crypto(document)); }
</del><ins>+ static Ref<Crypto> create(ScriptExecutionContext& context) { return adoptRef(*new Crypto(context)); }
</ins><span class="cx"> virtual ~Crypto();
</span><span class="cx">
</span><del>- Document* document() const;
-
</del><span class="cx"> void getRandomValues(JSC::ArrayBufferView*, ExceptionCode&);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SUBTLE_CRYPTO)
</span><del>- WebKitSubtleCrypto* webkitSubtle();
</del><ins>+ WebKitSubtleCrypto* webkitSubtle(ExceptionCode&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- Crypto(Document&);
</del><ins>+ Crypto(ScriptExecutionContext&);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(SUBTLE_CRYPTO)
</span><span class="cx"> RefPtr<WebKitSubtleCrypto> m_webkitSubtle;
</span></span></pre></div>
<a id="trunkSourceWebCorepageCryptoidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Crypto.idl (204480 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Crypto.idl 2016-08-15 21:04:49 UTC (rev 204480)
+++ trunk/Source/WebCore/page/Crypto.idl 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -28,9 +28,10 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [
</span><del>- GenerateIsReachable=ImplDocument,
</del><ins>+ Exposed=(Window,Worker),
+ GenerateIsReachable=ImplScriptExecutionContext,
</ins><span class="cx"> ] interface Crypto {
</span><span class="cx"> [Custom, RaisesException] ArrayBufferView getRandomValues(ArrayBufferView array);
</span><span class="cx">
</span><del>- [Conditional=SUBTLE_CRYPTO] readonly attribute WebKitSubtleCrypto webkitSubtle;
</del><ins>+ [Conditional=SUBTLE_CRYPTO, GetterRaisesException] readonly attribute WebKitSubtleCrypto webkitSubtle;
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.idl (204480 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.idl 2016-08-15 21:04:49 UTC (rev 204480)
+++ trunk/Source/WebCore/page/DOMWindow.idl 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -50,7 +50,6 @@
</span><span class="cx"> [Replaceable] readonly attribute BarProp toolbar;
</span><span class="cx"> readonly attribute Navigator navigator;
</span><span class="cx"> [Replaceable] readonly attribute Navigator clientInformation;
</span><del>- readonly attribute Crypto crypto;
</del><span class="cx"> [DoNotCheckSecurity, CustomSetter, Unforgeable] attribute Location location;
</span><span class="cx"> [Replaceable, CustomGetter] readonly attribute Event event;
</span><span class="cx">
</span><span class="lines">@@ -234,6 +233,7 @@
</span><span class="cx"> unrestricted double top;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+DOMWindow implements GlobalCrypto;
</ins><span class="cx"> DOMWindow implements GlobalEventHandlers;
</span><span class="cx"> DOMWindow implements WindowEventHandlers;
</span><span class="cx"> DOMWindow implements WindowOrWorkerGlobalScope;
</span></span></pre></div>
<a id="trunkSourceWebCorepageGlobalCryptoidl"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/page/GlobalCrypto.idl (0 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/GlobalCrypto.idl (rev 0)
+++ trunk/Source/WebCore/page/GlobalCrypto.idl 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -0,0 +1,30 @@
</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.
+*
+* THIS SOFTWARE IS PROVIDED BY APPLE INC. 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 INC. 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 GlobalCrypto {
+ readonly attribute Crypto crypto;
+};
</ins></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.cpp (204480 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2016-08-15 21:04:49 UTC (rev 204480)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include "ActiveDOMObject.h"
</span><span class="cx"> #include "ContentSecurityPolicy.h"
</span><ins>+#include "Crypto.h"
</ins><span class="cx"> #include "DOMTimer.h"
</span><span class="cx"> #include "DOMURL.h"
</span><span class="cx"> #include "DOMWindow.h"
</span><span class="lines">@@ -390,4 +391,11 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(SUBTLE_CRYPTO)
</span><span class="cx">
</span><ins>+Crypto& WorkerGlobalScope::crypto() const
+{
+ if (!m_crypto)
+ m_crypto = Crypto::create(*scriptExecutionContext());
+ return *m_crypto;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.h (204480 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.h 2016-08-15 21:04:49 UTC (rev 204480)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.h 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx">
</span><span class="cx"> class Blob;
</span><span class="cx"> class ContentSecurityPolicyResponseHeaders;
</span><ins>+class Crypto;
</ins><span class="cx"> class ScheduledAction;
</span><span class="cx"> class WorkerLocation;
</span><span class="cx"> class WorkerNavigator;
</span><span class="lines">@@ -148,6 +149,8 @@
</span><span class="cx"> bool unwrapCryptoKey(const Vector<uint8_t>& wrappedKey, Vector<uint8_t>& key) override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ Crypto& crypto() const;
+
</ins><span class="cx"> protected:
</span><span class="cx"> WorkerGlobalScope(const URL&, const String& userAgent, WorkerThread&, bool shouldBypassMainWorldContentSecurityPolicy, RefPtr<SecurityOrigin>&& topOrigin, IDBClient::IDBConnectionProxy*, SocketProvider*);
</span><span class="cx"> void applyContentSecurityPolicyResponseHeaders(const ContentSecurityPolicyResponseHeaders&);
</span><span class="lines">@@ -193,6 +196,8 @@
</span><span class="cx"> #if ENABLE(WEB_SOCKETS)
</span><span class="cx"> RefPtr<SocketProvider> m_socketProvider;
</span><span class="cx"> #endif
</span><ins>+
+ mutable RefPtr<Crypto> m_crypto;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopeidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.idl (204480 => 204481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.idl 2016-08-15 21:04:49 UTC (rev 204480)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.idl 2016-08-15 21:08:25 UTC (rev 204481)
</span><span class="lines">@@ -64,4 +64,5 @@
</span><span class="cx"> [Conditional=INDEXED_DATABASE_IN_WORKERS, EnabledAtRuntime=IndexedDBWorkers] attribute IDBVersionChangeEventConstructor IDBVersionChangeEvent;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+WorkerGlobalScope implements GlobalCrypto;
</ins><span class="cx"> WorkerGlobalScope implements WindowOrWorkerGlobalScope;
</span></span></pre>
</div>
</div>
</body>
</html>