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

Bug 827193: fix typo in WorkerScope, r=khuey

Browse Source 
--HG--
extra : rebase_source : 2ccc411444fd9b16d96d152d4f85931c1706f359
This commit is contained in:
Gavin Sharp 2013-01-07 11:18:19 -08:00
parent 803f2b6799
commit 5c79e70a3f
4 changed files with 68 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dom/workers/WorkerScope.cpp
View File

@ -963,14 +963,12 @@ CreateDedicatedWorkerGlobalScope(JSContext* aCx)
return NULL;
}
if (worker->IsChromeWorker() &&
(!chromeworker::InitClass(aCx, global, workerProto, false) ||
!DefineChromeWorkerFunctions(aCx, global))) {
return NULL;
}
if (!DefineOSFileConstants(aCx, global)) {
return NULL;
if (worker->IsChromeWorker()) {
if (!chromeworker::InitClass(aCx, global, workerProto, false) ||
!DefineChromeWorkerFunctions(aCx, global) ||
!DefineOSFileConstants(aCx, global)) {
return NULL;
}
}
// Init other classes we care about.

2
dom/workers/test/Makefile.in
View File

@ -106,6 +106,8 @@ MOCHITEST_FILES = \
transferable_worker.js \
test_errorwarning.html \
errorwarning_worker.js \
test_contentWorker.html \
content_worker.js \
$(NULL)
_SUBDIRMOCHITEST_FILES = \

12
dom/workers/test/content_worker.js Normal file
View File

@ -0,0 +1,12 @@
/**
* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/
*/
var props = {
'ctypes': 1,
'OS': 1
};
for (var prop in props) {
postMessage({ "prop": prop, "value": self[prop] });
}
postMessage({ "testfinished": 1 });

48
dom/workers/test/test_contentWorker.html Normal file
View File

@ -0,0 +1,48 @@
<!--
Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/
-->
<!DOCTYPE HTML>
<html>
<head>
<title>Test for DOM Worker privileged properties</title>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<p id="display"></p>
<div id="content" style="display: none">
</div>
<pre id="test">
<script class="testbody" language="javascript">
var workerFilename = "content_worker.js";
var worker = new Worker(workerFilename);
var props = {
'ctypes': 1,
'OS': 1
};
worker.onmessage = function(event) {
if (event.data.testfinished) {
SimpleTest.finish();
return;
}
var prop = event.data.prop;
ok(prop in props, "checking " + prop);
is(event.data.value, undefined, prop + " should be undefined");
};
worker.onerror = function(event) {
ok(false, "Worker had an error: " + event.message);
SimpleTest.finish();
}
SimpleTest.waitForExplicitFinish();
</script>
</pre>
</body>
</html>