<!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>[201808] 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/201808">201808</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-06-08 10:31:12 -0700 (Wed, 08 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>self.hasOwnProperty() does not work inside Web workers
https://bugs.webkit.org/show_bug.cgi?id=158446
<rdar://problem/26638397>
Reviewed by Geoffrey Garen.
Source/JavaScriptCore:
Add a factory function to JSProxy to create a JSProxy without a target.
Also make the setTarget() method public so that the target can now be
set after creation. This is needed so that we can create a proxy for
JSWorkerGlobalScope, then create the JSWorkerGlobalScope object,
passing it the proxy and finally set the target on the proxy.
* runtime/JSProxy.h:
(JSC::JSProxy::create):
Source/WebCore:
W3C tests for workers were severely broken on WebKit because
self.hasOwnProperty() did not work inside workers. The reason is that
hasOwnProperty() (and other methods like toString()) call toThis() in
StrictMode on thisValue. However, in the case of 'self' in workers,
self was a DedicatedWorkerGlobalScope, which is a JSGlobalObject.
JSGlobalObject::toThis() returns jsUndefined() when called in strict
mode. As a result, we would end up with exceptions such as "undefined
is not an object" when calling self.hasOwnProperty() in workers.
To address the problem, this patch introduces a JSProxy whose proxy
type is PureForwardingProxyType and whose target is the
WorkerGlobalScope. This JSProxy is what we expose to the JavaScript,
instead of the JSWorkerGlobalScope itself. As a result, toThis() now
behaves as expected and self.hasOwnProperty() works inside workers.
This patch greatly improves our pass rate on several W3C tests:
http://w3c-test.org/workers/interfaces.worker: 20 passes -> 50 passes (out of 128)
http://w3c-test.org/IndexedDB/interfaces.worker 0 passes -> 145 passes (out of 156)
Tests: fast/workers/self-hasOwnProperty.html
fast/workers/self-toString.html
* bindings/js/JSWorkerGlobalScopeBase.cpp:
(WebCore::JSWorkerGlobalScopeBase::finishCreation):
(WebCore::JSWorkerGlobalScopeBase::visitChildren):
(WebCore::toJS):
* bindings/js/JSWorkerGlobalScopeBase.h:
(WebCore::JSWorkerGlobalScopeBase::proxy):
* bindings/js/WorkerScriptController.cpp:
(WebCore::WorkerScriptController::initScript):
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateHeader):
(GenerateImplementation):
LayoutTests:
Add tests to make sure that self.toString() and self.hasOwnProperty()
now work in workers.
* fast/workers/self-hasOwnProperty-expected.txt: Added.
* fast/workers/self-hasOwnProperty.html: Added.
* fast/workers/self-toString-expected.txt: Added.
* fast/workers/self-toString.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSProxyh">trunk/Source/JavaScriptCore/runtime/JSProxy.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSWorkerGlobalScopeBasecpp">trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSWorkerGlobalScopeBaseh">trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsWorkerScriptControllercpp">trunk/Source/WebCore/bindings/js/WorkerScriptController.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastworkersselfhasOwnPropertyexpectedtxt">trunk/LayoutTests/fast/workers/self-hasOwnProperty-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastworkersselfhasOwnPropertyhtml">trunk/LayoutTests/fast/workers/self-hasOwnProperty.html</a></li>
<li><a href="#trunkLayoutTestsfastworkersselftoStringexpectedtxt">trunk/LayoutTests/fast/workers/self-toString-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastworkersselftoStringhtml">trunk/LayoutTests/fast/workers/self-toString.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (201807 => 201808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-08 17:21:52 UTC (rev 201807)
+++ trunk/LayoutTests/ChangeLog 2016-06-08 17:31:12 UTC (rev 201808)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-06-08 Chris Dumez <cdumez@apple.com>
+
+ self.hasOwnProperty() does not work inside Web workers
+ https://bugs.webkit.org/show_bug.cgi?id=158446
+ <rdar://problem/26638397>
+
+ Reviewed by Geoffrey Garen.
+
+ Add tests to make sure that self.toString() and self.hasOwnProperty()
+ now work in workers.
+
+ * fast/workers/self-hasOwnProperty-expected.txt: Added.
+ * fast/workers/self-hasOwnProperty.html: Added.
+ * fast/workers/self-toString-expected.txt: Added.
+ * fast/workers/self-toString.html: Added.
+
</ins><span class="cx"> 2016-06-06 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> WebKit memory cache doesn't respect Vary header
</span></span></pre></div>
<a id="trunkLayoutTestsfastworkersselfhasOwnPropertyexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/workers/self-hasOwnProperty-expected.txt (0 => 201808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/workers/self-hasOwnProperty-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/workers/self-hasOwnProperty-expected.txt 2016-06-08 17:31:12 UTC (rev 201808)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+Tests that self.hasOwnProperty() works in workers
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+self.hasOwnProperty('DedicatedWorkerGlobalScope'): true
+self.hasOwnProperty('WorkerGlobalScope'): true
+self.hasOwnProperty('navigator'): true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastworkersselfhasOwnPropertyhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/workers/self-hasOwnProperty.html (0 => 201808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/workers/self-hasOwnProperty.html (rev 0)
+++ trunk/LayoutTests/fast/workers/self-hasOwnProperty.html 2016-06-08 17:31:12 UTC (rev 201808)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<!DOCTYPE html>
+<script src="../../resources/js-test-pre.js"></script>
+<script src="resources/worker-create-common.js"></script>
+<script>
+
+var jsTestIsAsync = true;
+
+description('Tests that self.hasOwnProperty() works in workers');
+
+var worker = createWorker();
+worker.postMessage("eval self.hasOwnProperty('DedicatedWorkerGlobalScope')");
+worker.postMessage("eval self.hasOwnProperty('WorkerGlobalScope')");
+worker.postMessage("eval self.hasOwnProperty('navigator')");
+worker.postMessage("eval DONE");
+
+worker.onmessage = function(evt) {
+ if (!/DONE/.test(evt.data))
+ debug(evt.data.replace(new RegExp("/.*LayoutTests"), "<...>"));
+ else
+ finishJSTest();
+};
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastworkersselftoStringexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/workers/self-toString-expected.txt (0 => 201808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/workers/self-toString-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/workers/self-toString-expected.txt 2016-06-08 17:31:12 UTC (rev 201808)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+Tests that self.toString() works in workers
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+self.toString(): [object DedicatedWorkerGlobalScope]
+'self: ' + self: self: [object DedicatedWorkerGlobalScope]
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastworkersselftoStringhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/workers/self-toString.html (0 => 201808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/workers/self-toString.html (rev 0)
+++ trunk/LayoutTests/fast/workers/self-toString.html 2016-06-08 17:31:12 UTC (rev 201808)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<!DOCTYPE html>
+<script src="../../resources/js-test-pre.js"></script>
+<script src="resources/worker-create-common.js"></script>
+<script>
+
+var jsTestIsAsync = true;
+
+description('Tests that self.toString() works in workers');
+
+var worker = createWorker();
+worker.postMessage("eval self.toString()");
+worker.postMessage("eval 'self: ' + self");
+worker.postMessage("eval DONE");
+
+worker.onmessage = function(evt) {
+ if (!/DONE/.test(evt.data))
+ debug(evt.data.replace(new RegExp("/.*LayoutTests"), "<...>"));
+ else
+ finishJSTest();
+};
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (201807 => 201808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-06-08 17:21:52 UTC (rev 201807)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-06-08 17:31:12 UTC (rev 201808)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-06-08 Chris Dumez <cdumez@apple.com>
+
+ self.hasOwnProperty() does not work inside Web workers
+ https://bugs.webkit.org/show_bug.cgi?id=158446
+ <rdar://problem/26638397>
+
+ Reviewed by Geoffrey Garen.
+
+ Add a factory function to JSProxy to create a JSProxy without a target.
+ Also make the setTarget() method public so that the target can now be
+ set after creation. This is needed so that we can create a proxy for
+ JSWorkerGlobalScope, then create the JSWorkerGlobalScope object,
+ passing it the proxy and finally set the target on the proxy.
+
+ * runtime/JSProxy.h:
+ (JSC::JSProxy::create):
+
</ins><span class="cx"> 2016-06-07 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Add result validation to JSAir
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSProxy.h (201807 => 201808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSProxy.h 2016-06-08 17:21:52 UTC (rev 201807)
+++ trunk/Source/JavaScriptCore/runtime/JSProxy.h 2016-06-08 17:31:12 UTC (rev 201808)
</span><span class="lines">@@ -42,6 +42,13 @@
</span><span class="cx"> return proxy;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ static JSProxy* create(VM& vm, Structure* structure)
+ {
+ JSProxy* proxy = new (NotNull, allocateCell<JSProxy>(vm.heap)) JSProxy(vm, structure);
+ proxy->finishCreation(vm);
+ return proxy;
+ }
+
</ins><span class="cx"> static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype, JSType proxyType)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(proxyType == ImpureProxyType || proxyType == PureForwardingProxyType);
</span><span class="lines">@@ -53,6 +60,8 @@
</span><span class="cx"> JSObject* target() const { return m_target.get(); }
</span><span class="cx"> static ptrdiff_t targetOffset() { return OBJECT_OFFSETOF(JSProxy, m_target); }
</span><span class="cx">
</span><ins>+ JS_EXPORT_PRIVATE void setTarget(VM&, JSGlobalObject*);
+
</ins><span class="cx"> protected:
</span><span class="cx"> JSProxy(VM& vm, Structure* structure)
</span><span class="cx"> : JSDestructibleObject(vm, structure)
</span><span class="lines">@@ -72,8 +81,6 @@
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE static void visitChildren(JSCell*, SlotVisitor&);
</span><span class="cx">
</span><del>- JS_EXPORT_PRIVATE void setTarget(VM&, JSGlobalObject*);
-
</del><span class="cx"> JS_EXPORT_PRIVATE static String className(const JSObject*);
</span><span class="cx"> JS_EXPORT_PRIVATE static bool getOwnPropertySlot(JSObject*, ExecState*, PropertyName, PropertySlot&);
</span><span class="cx"> JS_EXPORT_PRIVATE static bool getOwnPropertySlotByIndex(JSObject*, ExecState*, unsigned, PropertySlot&);
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201807 => 201808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-08 17:21:52 UTC (rev 201807)
+++ trunk/Source/WebCore/ChangeLog 2016-06-08 17:31:12 UTC (rev 201808)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2016-06-08 Chris Dumez <cdumez@apple.com>
+
+ self.hasOwnProperty() does not work inside Web workers
+ https://bugs.webkit.org/show_bug.cgi?id=158446
+ <rdar://problem/26638397>
+
+ Reviewed by Geoffrey Garen.
+
+ W3C tests for workers were severely broken on WebKit because
+ self.hasOwnProperty() did not work inside workers. The reason is that
+ hasOwnProperty() (and other methods like toString()) call toThis() in
+ StrictMode on thisValue. However, in the case of 'self' in workers,
+ self was a DedicatedWorkerGlobalScope, which is a JSGlobalObject.
+ JSGlobalObject::toThis() returns jsUndefined() when called in strict
+ mode. As a result, we would end up with exceptions such as "undefined
+ is not an object" when calling self.hasOwnProperty() in workers.
+
+ To address the problem, this patch introduces a JSProxy whose proxy
+ type is PureForwardingProxyType and whose target is the
+ WorkerGlobalScope. This JSProxy is what we expose to the JavaScript,
+ instead of the JSWorkerGlobalScope itself. As a result, toThis() now
+ behaves as expected and self.hasOwnProperty() works inside workers.
+
+ This patch greatly improves our pass rate on several W3C tests:
+ http://w3c-test.org/workers/interfaces.worker: 20 passes -> 50 passes (out of 128)
+ http://w3c-test.org/IndexedDB/interfaces.worker 0 passes -> 145 passes (out of 156)
+
+ Tests: fast/workers/self-hasOwnProperty.html
+ fast/workers/self-toString.html
+
+ * bindings/js/JSWorkerGlobalScopeBase.cpp:
+ (WebCore::JSWorkerGlobalScopeBase::finishCreation):
+ (WebCore::JSWorkerGlobalScopeBase::visitChildren):
+ (WebCore::toJS):
+ * bindings/js/JSWorkerGlobalScopeBase.h:
+ (WebCore::JSWorkerGlobalScopeBase::proxy):
+ * bindings/js/WorkerScriptController.cpp:
+ (WebCore::WorkerScriptController::initScript):
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateHeader):
+ (GenerateImplementation):
+
</ins><span class="cx"> 2016-06-08 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> WebKit memory cache doesn't respect Vary header
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSWorkerGlobalScopeBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp (201807 => 201808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp 2016-06-08 17:21:52 UTC (rev 201807)
+++ trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp 2016-06-08 17:31:12 UTC (rev 201808)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "JSWorkerGlobalScope.h"
</span><span class="cx"> #include "Language.h"
</span><span class="cx"> #include "WorkerGlobalScope.h"
</span><ins>+#include <runtime/JSCInlines.h>
</ins><span class="cx"> #include <runtime/JSCJSValueInlines.h>
</span><span class="cx"> #include <runtime/Microtask.h>
</span><span class="cx">
</span><span class="lines">@@ -52,12 +53,22 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JSWorkerGlobalScopeBase::finishCreation(VM& vm)
</del><ins>+void JSWorkerGlobalScopeBase::finishCreation(VM& vm, JSProxy* proxy)
</ins><span class="cx"> {
</span><del>- Base::finishCreation(vm);
</del><ins>+ m_proxy.set(vm, this, proxy);
+
+ Base::finishCreation(vm, m_proxy.get());
</ins><span class="cx"> ASSERT(inherits(info()));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void JSWorkerGlobalScopeBase::visitChildren(JSCell* cell, SlotVisitor& visitor)
+{
+ JSWorkerGlobalScopeBase* thisObject = jsCast<JSWorkerGlobalScopeBase*>(cell);
+ ASSERT_GC_OBJECT_INHERITS(thisObject, info());
+ Base::visitChildren(thisObject, visitor);
+ visitor.append(&thisObject->m_proxy);
+}
+
</ins><span class="cx"> void JSWorkerGlobalScopeBase::destroy(JSCell* cell)
</span><span class="cx"> {
</span><span class="cx"> static_cast<JSWorkerGlobalScopeBase*>(cell)->JSWorkerGlobalScopeBase::~JSWorkerGlobalScopeBase();
</span><span class="lines">@@ -111,7 +122,7 @@
</span><span class="cx"> return jsNull();
</span><span class="cx"> JSWorkerGlobalScope* contextWrapper = script->workerGlobalScopeWrapper();
</span><span class="cx"> ASSERT(contextWrapper);
</span><del>- return contextWrapper;
</del><ins>+ return contextWrapper->proxy();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSDedicatedWorkerGlobalScope* toJSDedicatedWorkerGlobalScope(JSValue value)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSWorkerGlobalScopeBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.h (201807 => 201808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.h 2016-06-08 17:21:52 UTC (rev 201807)
+++ trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.h 2016-06-08 17:31:12 UTC (rev 201808)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> DECLARE_INFO;
</span><span class="cx">
</span><span class="cx"> WorkerGlobalScope& wrapped() const { return *m_wrapped; }
</span><ins>+ JSC::JSProxy* proxy() const { ASSERT(m_proxy); return m_proxy.get(); }
</ins><span class="cx"> ScriptExecutionContext* scriptExecutionContext() const;
</span><span class="cx">
</span><span class="cx"> static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::JSValue prototype)
</span><span class="lines">@@ -61,10 +62,13 @@
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> JSWorkerGlobalScopeBase(JSC::VM&, JSC::Structure*, RefPtr<WorkerGlobalScope>&&);
</span><del>- void finishCreation(JSC::VM&);
</del><ins>+ void finishCreation(JSC::VM&, JSC::JSProxy*);
</ins><span class="cx">
</span><ins>+ static void visitChildren(JSC::JSCell*, JSC::SlotVisitor&);
+
</ins><span class="cx"> private:
</span><span class="cx"> RefPtr<WorkerGlobalScope> m_wrapped;
</span><ins>+ JSC::WriteBarrier<JSC::JSProxy> m_proxy;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // Returns a JSWorkerGlobalScope or jsNull()
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWorkerScriptControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WorkerScriptController.cpp (201807 => 201808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WorkerScriptController.cpp 2016-06-08 17:21:52 UTC (rev 201807)
+++ trunk/Source/WebCore/bindings/js/WorkerScriptController.cpp 2016-06-08 17:31:12 UTC (rev 201808)
</span><span class="lines">@@ -88,8 +88,10 @@
</span><span class="cx"> Structure* dedicatedContextPrototypeStructure = JSDedicatedWorkerGlobalScopePrototype::createStructure(*m_vm, 0, workerGlobalScopePrototype.get());
</span><span class="cx"> Strong<JSDedicatedWorkerGlobalScopePrototype> dedicatedContextPrototype(*m_vm, JSDedicatedWorkerGlobalScopePrototype::create(*m_vm, 0, dedicatedContextPrototypeStructure));
</span><span class="cx"> Structure* structure = JSDedicatedWorkerGlobalScope::createStructure(*m_vm, 0, dedicatedContextPrototype.get());
</span><ins>+ auto* proxyStructure = JSProxy::createStructure(*m_vm, nullptr, jsNull(), PureForwardingProxyType);
+ auto* proxy = JSProxy::create(*m_vm, proxyStructure);
</ins><span class="cx">
</span><del>- m_workerGlobalScopeWrapper.set(*m_vm, JSDedicatedWorkerGlobalScope::create(*m_vm, structure, static_cast<DedicatedWorkerGlobalScope&>(*m_workerGlobalScope)));
</del><ins>+ m_workerGlobalScopeWrapper.set(*m_vm, JSDedicatedWorkerGlobalScope::create(*m_vm, structure, static_cast<DedicatedWorkerGlobalScope&>(*m_workerGlobalScope), proxy));
</ins><span class="cx"> workerGlobalScopePrototypeStructure->setGlobalObject(*m_vm, m_workerGlobalScopeWrapper.get());
</span><span class="cx"> dedicatedContextPrototypeStructure->setGlobalObject(*m_vm, m_workerGlobalScopeWrapper.get());
</span><span class="cx"> ASSERT(structure->globalObject() == m_workerGlobalScopeWrapper);
</span><span class="lines">@@ -97,6 +99,9 @@
</span><span class="cx"> workerGlobalScopePrototype->structure()->setGlobalObject(*m_vm, m_workerGlobalScopeWrapper.get());
</span><span class="cx"> workerGlobalScopePrototype->structure()->setPrototypeWithoutTransition(*m_vm, JSEventTarget::prototype(*m_vm, m_workerGlobalScopeWrapper.get()));
</span><span class="cx"> dedicatedContextPrototype->structure()->setGlobalObject(*m_vm, m_workerGlobalScopeWrapper.get());
</span><ins>+
+ proxy->setTarget(*m_vm, m_workerGlobalScopeWrapper.get());
+ proxy->structure()->setGlobalObject(*m_vm, m_workerGlobalScopeWrapper.get());
</ins><span class="cx"> }
</span><span class="cx"> ASSERT(m_workerGlobalScopeWrapper->globalObject() == m_workerGlobalScopeWrapper);
</span><span class="cx"> ASSERT(asObject(m_workerGlobalScopeWrapper->getPrototypeDirect())->globalObject() == m_workerGlobalScopeWrapper);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (201807 => 201808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-06-08 17:21:52 UTC (rev 201807)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-06-08 17:31:12 UTC (rev 201808)
</span><span class="lines">@@ -1101,10 +1101,10 @@
</span><span class="cx"> push(@headerContent, " return ptr;\n");
</span><span class="cx"> push(@headerContent, " }\n\n");
</span><span class="cx"> } elsif ($codeGenerator->InheritsInterface($interface, "WorkerGlobalScope")) {
</span><del>- push(@headerContent, " static $className* create(JSC::VM& vm, JSC::Structure* structure, Ref<$implType>&& impl)\n");
</del><ins>+ push(@headerContent, " static $className* create(JSC::VM& vm, JSC::Structure* structure, Ref<$implType>&& impl, JSC::JSProxy* proxy)\n");
</ins><span class="cx"> push(@headerContent, " {\n");
</span><span class="cx"> push(@headerContent, " $className* ptr = new (NotNull, JSC::allocateCell<$className>(vm.heap)) ${className}(vm, structure, WTFMove(impl));\n");
</span><del>- push(@headerContent, " ptr->finishCreation(vm);\n");
</del><ins>+ push(@headerContent, " ptr->finishCreation(vm, proxy);\n");
</ins><span class="cx"> push(@headerContent, " vm.heap.addFinalizer(ptr, destroy);\n");
</span><span class="cx"> push(@headerContent, " return ptr;\n");
</span><span class="cx"> push(@headerContent, " }\n\n");
</span><span class="lines">@@ -1416,7 +1416,7 @@
</span><span class="cx"> if ($interfaceName eq "DOMWindow") {
</span><span class="cx"> push(@headerContent, " void finishCreation(JSC::VM&, JSDOMWindowShell*);\n");
</span><span class="cx"> } else {
</span><del>- push(@headerContent, " void finishCreation(JSC::VM&);\n");
</del><ins>+ push(@headerContent, " void finishCreation(JSC::VM&, JSC::JSProxy*);\n");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2359,9 +2359,9 @@
</span><span class="cx"> push(@implContent, "{\n");
</span><span class="cx"> push(@implContent, " Base::finishCreation(vm, shell);\n\n");
</span><span class="cx"> } else {
</span><del>- push(@implContent, "void ${className}::finishCreation(VM& vm)\n");
</del><ins>+ push(@implContent, "void ${className}::finishCreation(VM& vm, JSProxy* proxy)\n");
</ins><span class="cx"> push(@implContent, "{\n");
</span><del>- push(@implContent, " Base::finishCreation(vm);\n\n");
</del><ins>+ push(@implContent, " Base::finishCreation(vm, proxy);\n\n");
</ins><span class="cx"> }
</span><span class="cx"> # Support for RuntimeEnabled attributes on global objects.
</span><span class="cx"> foreach my $attribute (@{$interface->attributes}) {
</span></span></pre>
</div>
</div>
</body>
</html>