Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 13:25:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 9cc8465f45a5 (bug 1050104) for mochitest-4 leaks

Browse Source
This commit is contained in:
Ehsan Akhgari 2014-08-08 09:30:25 -04:00
parent ea2dac5c99
commit 1ba20dc5eb
4 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dom/workers/WorkerScope.cpp
View File

@ -80,16 +80,17 @@ WorkerGlobalScope::WrapObject(JSContext* aCx)
MOZ_CRASH("We should never get here!");
}
Console*
already_AddRefed<Console>
WorkerGlobalScope::GetConsole()
{
mWorkerPrivate->AssertIsOnWorkerThread();
if (!mConsole) {
mConsole = new Console(nullptr);
MOZ_ASSERT(mConsole);
}
return mConsole;
return mConsole.forget();
}
already_AddRefed<WorkerLocation>

2
dom/workers/WorkerScope.h
View File

@ -60,7 +60,7 @@ public:
return nsRefPtr<WorkerGlobalScope>(this).forget();
}
Console*
already_AddRefed<Console>
GetConsole();
already_AddRefed<WorkerLocation>

6
dom/workers/test/consoleReplaceable_worker.js
View File

@ -5,12 +5,6 @@
onmessage = function(event) {
postMessage({event: 'console exists', status: !!console, last : false});
var logCalled = false;
console.log = function() {
logCalled = true;
}
console.log("foo");
postMessage({event: 'console.log is replaceable', status: logCalled, last: false});
console = 42;
postMessage({event: 'console is replaceable', status: console === 42, last : true});
}

2
dom/workers/test/console_worker.js
View File

@ -7,8 +7,6 @@ onmessage = function(event) {
// TEST: does console exist?
postMessage({event: 'console exists', status: !!console, last : false});
postMessage({event: 'console is the same object', status: console === console, last: false});
postMessage({event: 'trace without function', status: true, last : false});
for (var i = 0; i < 10; ++i) {