<!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>[166248] 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/166248">166248</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2014-03-25 13:40:34 -0700 (Tue, 25 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/166126">r166126</a>.
Rollout <a href="http://trac.webkit.org/projects/webkit/changeset/166126">r166126</a> in prepartion to roll out prerequisite <a href="http://trac.webkit.org/projects/webkit/changeset/166070">r166070</a>
Reverted changeset:
"toThis() on a JSWorkerGlobalScope should return a JSProxy and
not undefined"
https://bugs.webkit.org/show_bug.cgi?id=130554
http://trac.webkit.org/changeset/166126</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIJSContextRefcpp">trunk/Source/JavaScriptCore/API/JSContextRef.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIteststestapic">trunk/Source/JavaScriptCore/API/tests/testapi.c</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorejsccpp">trunk/Source/JavaScriptCore/jsc.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjecth">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.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="#trunkSourceWebCorebindingsjsWorkerScriptControllercpp">trunk/Source/WebCore/bindings/js/WorkerScriptController.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersDedicatedWorkerGlobalScopeidl">trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.idl</a></li>
<li><a href="#trunkSourceWebCoreworkersSharedWorkerGlobalScopeidl">trunk/Source/WebCore/workers/SharedWorkerGlobalScope.idl</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerGlobalScopeidl">trunk/Source/WebCore/workers/WorkerGlobalScope.idl</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastworkersresourcesworkerstrictjs">trunk/LayoutTests/fast/workers/resources/worker-strict.js</a></li>
<li><a href="#trunkLayoutTestsfastworkersworkerstrictexpectedtxt">trunk/LayoutTests/fast/workers/worker-strict-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastworkersworkerstricthtml">trunk/LayoutTests/fast/workers/worker-strict.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (166247 => 166248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-25 20:25:52 UTC (rev 166247)
+++ trunk/LayoutTests/ChangeLog 2014-03-25 20:40:34 UTC (rev 166248)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-03-25 Michael Saboff <msaboff@apple.com>
+
+ Unreviewed, rolling out r166126.
+
+ Rollout r166126 in prepartion to roll out prerequisite r166070
+
+ Reverted changeset:
+
+ "toThis() on a JSWorkerGlobalScope should return a JSProxy and
+ not undefined"
+ https://bugs.webkit.org/show_bug.cgi?id=130554
+ http://trac.webkit.org/changeset/166126
+
</ins><span class="cx"> 2014-03-25 Dirk Schulze <krit@webkit.org>
</span><span class="cx">
</span><span class="cx"> Implement ImageData constructors and WebWorkers exposure
</span></span></pre></div>
<a id="trunkLayoutTestsfastworkersresourcesworkerstrictjs"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/workers/resources/worker-strict.js (166247 => 166248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/workers/resources/worker-strict.js 2014-03-25 20:25:52 UTC (rev 166247)
+++ trunk/LayoutTests/fast/workers/resources/worker-strict.js 2014-03-25 20:40:34 UTC (rev 166248)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>-"use strict";
-
-postMessage("SUCCESS: postMessage() called directly");
-
-(function () {
- this.done = function() { return "SUCCESS: called function via attribute on WorkerGlobalScope"; };
-
- this.postMessage(this.done());
-
- this.postMessage("DONE");
-}).call(this);
</del></span></pre></div>
<a id="trunkLayoutTestsfastworkersworkerstrictexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/workers/worker-strict-expected.txt (166247 => 166248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/workers/worker-strict-expected.txt 2014-03-25 20:25:52 UTC (rev 166247)
+++ trunk/LayoutTests/fast/workers/worker-strict-expected.txt 2014-03-25 20:40:34 UTC (rev 166248)
</span><span class="lines">@@ -1,6 +0,0 @@
</span><del>-Test calling functions in strict mode script from WorkerContext. Should print SUCCESS lines, followed by DONE.
-
-SUCCESS: postMessage() called directly
-SUCCESS: called function via attribute on WorkerGlobalScope
-DONE
-
</del></span></pre></div>
<a id="trunkLayoutTestsfastworkersworkerstricthtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/workers/worker-strict.html (166247 => 166248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/workers/worker-strict.html 2014-03-25 20:25:52 UTC (rev 166247)
+++ trunk/LayoutTests/fast/workers/worker-strict.html 2014-03-25 20:40:34 UTC (rev 166248)
</span><span class="lines">@@ -1,25 +0,0 @@
</span><del>-<body>
-<p>Test calling functions in strict mode script from WorkerContext. Should print SUCCESS lines, followed by DONE.</p>
-<div id=result></div>
-<script>
-
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-}
-
-function log(message)
-{
- document.getElementById("result").innerHTML += message + "<br>";
-}
-
-var worker = new Worker("resources/worker-strict.js");
-worker.onmessage = function(event) {
- log(event.data);
- if (event.data == "DONE") {
- if (window.testRunner)
- testRunner.notifyDone();
- }
-};
-</script>
-</body>
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIJSContextRefcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSContextRef.cpp (166247 => 166248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSContextRef.cpp 2014-03-25 20:25:52 UTC (rev 166247)
+++ trunk/Source/JavaScriptCore/API/JSContextRef.cpp 2014-03-25 20:40:34 UTC (rev 166248)
</span><span class="lines">@@ -129,6 +129,7 @@
</span><span class="cx">
</span><span class="cx"> if (!globalObjectClass) {
</span><span class="cx"> JSGlobalObject* globalObject = JSGlobalObject::create(*vm, JSGlobalObject::createStructure(*vm, jsNull()));
</span><ins>+ globalObject->setGlobalThis(*vm, JSProxy::create(*vm, JSProxy::createStructure(*vm, globalObject, globalObject->prototype()), globalObject));
</ins><span class="cx"> return JSGlobalContextRetain(toGlobalRef(globalObject->globalExec()));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIteststestapic"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/tests/testapi.c (166247 => 166248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/tests/testapi.c 2014-03-25 20:25:52 UTC (rev 166247)
+++ trunk/Source/JavaScriptCore/API/tests/testapi.c 2014-03-25 20:40:34 UTC (rev 166248)
</span><span class="lines">@@ -891,8 +891,10 @@
</span><span class="cx"> // Ensure that an execution context is passed in
</span><span class="cx"> ASSERT(context);
</span><span class="cx">
</span><ins>+ // Ensure that the global object is set to the object that we were passed
</ins><span class="cx"> JSObjectRef globalObject = JSContextGetGlobalObject(context);
</span><span class="cx"> ASSERT(globalObject);
</span><ins>+ ASSERT(object == globalObject);
</ins><span class="cx">
</span><span class="cx"> // Ensure that the standard global properties have been set on the global object
</span><span class="cx"> JSStringRef array = JSStringCreateWithUTF8CString("Array");
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (166247 => 166248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-03-25 20:25:52 UTC (rev 166247)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-03-25 20:40:34 UTC (rev 166248)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-03-25 Michael Saboff <msaboff@apple.com>
+
+ Unreviewed, rolling out r166126.
+
+ Rollout r166126 in prepartion to roll out prerequisite r166070
+
+ Reverted changeset:
+
+ "toThis() on a JSWorkerGlobalScope should return a JSProxy and
+ not undefined"
+ https://bugs.webkit.org/show_bug.cgi?id=130554
+ http://trac.webkit.org/changeset/166126
+
</ins><span class="cx"> 2014-03-25 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> AST incorrectly conflates readable and writable locations
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejsccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jsc.cpp (166247 => 166248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jsc.cpp 2014-03-25 20:25:52 UTC (rev 166247)
+++ trunk/Source/JavaScriptCore/jsc.cpp 2014-03-25 20:40:34 UTC (rev 166248)
</span><span class="lines">@@ -351,6 +351,7 @@
</span><span class="cx"> GlobalObject* object = new (NotNull, allocateCell<GlobalObject>(vm.heap)) GlobalObject(vm, structure);
</span><span class="cx"> object->finishCreation(vm, arguments);
</span><span class="cx"> vm.heap.addFinalizer(object, destroy);
</span><ins>+ object->setGlobalThis(vm, JSProxy::create(vm, JSProxy::createStructure(vm, object, object->prototype()), object));
</ins><span class="cx"> return object;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp (166247 => 166248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2014-03-25 20:25:52 UTC (rev 166247)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2014-03-25 20:40:34 UTC (rev 166248)
</span><span class="lines">@@ -197,10 +197,11 @@
</span><span class="cx"> m_globalThis.set(vm, this, globalThis);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JSGlobalObject::init()
</del><ins>+void JSGlobalObject::init(JSObject* thisValue)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(vm().currentThreadIsHoldingAPILock());
</span><span class="cx">
</span><ins>+ setGlobalThis(vm(), thisValue);
</ins><span class="cx"> JSGlobalObject::globalExec()->init(0, 0, this, CallFrame::noCaller(), 0, 0);
</span><span class="cx">
</span><span class="cx"> m_debugger = 0;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h (166247 => 166248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h 2014-03-25 20:25:52 UTC (rev 166247)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h 2014-03-25 20:40:34 UTC (rev 166248)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #include "JSArray.h"
</span><span class="cx"> #include "JSArrayBufferPrototype.h"
</span><span class="cx"> #include "JSClassRef.h"
</span><del>-#include "JSProxy.h"
</del><span class="cx"> #include "JSSegmentedVariableObject.h"
</span><span class="cx"> #include "JSWeakObjectMapRefInternal.h"
</span><span class="cx"> #include "NumberPrototype.h"
</span><span class="lines">@@ -297,8 +296,7 @@
</span><span class="cx"> Base::finishCreation(vm);
</span><span class="cx"> structure()->setGlobalObject(vm, this);
</span><span class="cx"> m_experimentsEnabled = m_globalObjectMethodTable->javaScriptExperimentsEnabled(this);
</span><del>- init();
- setGlobalThis(vm, JSProxy::create(vm, JSProxy::createStructure(vm, this, prototype()), this));
</del><ins>+ init(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void finishCreation(VM& vm, JSObject* thisValue)
</span><span class="lines">@@ -306,8 +304,7 @@
</span><span class="cx"> Base::finishCreation(vm);
</span><span class="cx"> structure()->setGlobalObject(vm, this);
</span><span class="cx"> m_experimentsEnabled = m_globalObjectMethodTable->javaScriptExperimentsEnabled(this);
</span><del>- init();
- setGlobalThis(vm, thisValue);
</del><ins>+ init(thisValue);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> struct NewGlobalVar {
</span><span class="lines">@@ -540,6 +537,7 @@
</span><span class="cx">
</span><span class="cx"> VM& vm() const { return m_vm; }
</span><span class="cx"> JSObject* globalThis() const;
</span><ins>+ JS_EXPORT_PRIVATE void setGlobalThis(VM&, JSObject* globalThis);
</ins><span class="cx">
</span><span class="cx"> static Structure* createStructure(VM& vm, JSValue prototype)
</span><span class="cx"> {
</span><span class="lines">@@ -592,11 +590,9 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend class LLIntOffsetsExtractor;
</span><del>-
- JS_EXPORT_PRIVATE void setGlobalThis(VM&, JSObject* globalThis);
-
</del><ins>+
</ins><span class="cx"> // FIXME: Fold reset into init.
</span><del>- JS_EXPORT_PRIVATE void init();
</del><ins>+ JS_EXPORT_PRIVATE void init(JSObject* thisValue);
</ins><span class="cx"> void reset(JSValue prototype);
</span><span class="cx">
</span><span class="cx"> void createThrowTypeError(VM&);
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166247 => 166248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-25 20:25:52 UTC (rev 166247)
+++ trunk/Source/WebCore/ChangeLog 2014-03-25 20:40:34 UTC (rev 166248)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-03-25 Michael Saboff <msaboff@apple.com>
+
+ Unreviewed, rolling out r166126.
+
+ Rollout r166126 in prepartion to roll out prerequisite r166070
+
+ Reverted changeset:
+
+ "toThis() on a JSWorkerGlobalScope should return a JSProxy and
+ not undefined"
+ https://bugs.webkit.org/show_bug.cgi?id=130554
+ http://trac.webkit.org/changeset/166126
+
</ins><span class="cx"> 2014-03-25 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Playing video does not disable display sleep.
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSWorkerGlobalScopeBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp (166247 => 166248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp 2014-03-25 20:25:52 UTC (rev 166247)
+++ trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp 2014-03-25 20:40:34 UTC (rev 166248)
</span><span class="lines">@@ -130,8 +130,6 @@
</span><span class="cx"> const ClassInfo* classInfo = asObject(value)->classInfo();
</span><span class="cx"> if (classInfo == JSDedicatedWorkerGlobalScope::info())
</span><span class="cx"> return jsCast<JSDedicatedWorkerGlobalScope*>(asObject(value));
</span><del>- if (classInfo == JSProxy::info())
- return jsDynamicCast<JSDedicatedWorkerGlobalScope*>(jsCast<JSProxy*>(asObject(value))->target());
</del><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -143,8 +141,6 @@
</span><span class="cx"> const ClassInfo* classInfo = asObject(value)->classInfo();
</span><span class="cx"> if (classInfo == JSSharedWorkerGlobalScope::info())
</span><span class="cx"> return jsCast<JSSharedWorkerGlobalScope*>(asObject(value));
</span><del>- if (classInfo == JSProxy::info())
- return jsDynamicCast<JSSharedWorkerGlobalScope*>(jsCast<JSProxy*>(asObject(value))->target());
</del><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWorkerScriptControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WorkerScriptController.cpp (166247 => 166248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WorkerScriptController.cpp 2014-03-25 20:25:52 UTC (rev 166247)
+++ trunk/Source/WebCore/bindings/js/WorkerScriptController.cpp 2014-03-25 20:40:34 UTC (rev 166248)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> JSLockHolder lock(exec);
</span><span class="cx">
</span><span class="cx"> JSValue evaluationException;
</span><del>- JSC::evaluate(exec, sourceCode.jsSourceCode(), m_workerGlobalScopeWrapper->globalThis(), &evaluationException);
</del><ins>+ JSC::evaluate(exec, sourceCode.jsSourceCode(), m_workerGlobalScopeWrapper.get(), &evaluationException);
</ins><span class="cx">
</span><span class="cx"> if ((evaluationException && isTerminatedExecutionException(evaluationException)) || m_workerGlobalScopeWrapper->vm().watchdog.didFire()) {
</span><span class="cx"> forbidExecution();
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersDedicatedWorkerGlobalScopeidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.idl (166247 => 166248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.idl 2014-03-25 20:25:52 UTC (rev 166247)
+++ trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.idl 2014-03-25 20:40:34 UTC (rev 166248)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx">
</span><span class="cx"> [
</span><span class="cx"> GlobalContext=DedicatedWorkerGlobalScope,
</span><del>- CustomProxyToJSObject,
</del><span class="cx"> JSGenerateToNativeObject,
</span><span class="cx"> JSNoStaticTables,
</span><span class="cx"> ] interface DedicatedWorkerGlobalScope : WorkerGlobalScope {
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersSharedWorkerGlobalScopeidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/SharedWorkerGlobalScope.idl (166247 => 166248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/SharedWorkerGlobalScope.idl 2014-03-25 20:25:52 UTC (rev 166247)
+++ trunk/Source/WebCore/workers/SharedWorkerGlobalScope.idl 2014-03-25 20:40:34 UTC (rev 166248)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx">
</span><span class="cx"> [
</span><span class="cx"> GlobalContext=SharedWorkerGlobalScope,
</span><del>- CustomProxyToJSObject,
</del><span class="cx"> Conditional=SHARED_WORKERS,
</span><span class="cx"> JSGenerateToNativeObject,
</span><span class="cx"> JSNoStaticTables,
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopeidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.idl (166247 => 166248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.idl 2014-03-25 20:25:52 UTC (rev 166247)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.idl 2014-03-25 20:40:34 UTC (rev 166248)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx">
</span><span class="cx"> [
</span><span class="cx"> GlobalContext=WorkerGlobalScope,
</span><del>- CustomProxyToJSObject,
</del><span class="cx"> JSCustomMarkFunction,
</span><span class="cx"> JSCustomGetOwnPropertySlotAndDescriptor,
</span><span class="cx"> EventTarget,
</span></span></pre>
</div>
</div>
</body>
</html>