mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backed out changeset 17842a2d0c7f (bug 453865) due to test failures

This commit is contained in:
Shawn Wilsher 2008-11-27 14:16:55 -08:00
Родитель 5485c9ba22
Коммит 80e39a2f72
13 изменённых файлов: 25 добавлений и 498 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

14
dom/public/idl/threads/nsIDOMWorkers.idl
Просмотреть файл

@ -45,10 +45,10 @@
interface nsIDOMEventListener;
[scriptable, uuid(ab3725b8-3fca-40cc-a42c-92fb154ef01d)]
[scriptable, uuid(6c32d0c5-6bfa-438b-ad44-be0df80cd4a8)]
interface nsIWorkerMessagePort : nsISupports
{
void postMessage(/* in JSObject aMessage */);
void postMessage(in DOMString aMessage);
};
[scriptable, uuid(508f2d49-e9a0-4fe8-bd33-321820173b4a)]
@ -83,10 +83,11 @@ interface nsIWorkerGlobalScope : nsISupports
readonly attribute nsIWorkerNavigator navigator;
};
[scriptable, uuid(d30a2f61-86e2-434e-837f-4f1985efa865)]
[scriptable, uuid(b10cfe72-91b9-45c6-ab13-33f89c2d0e56)]
interface nsIWorkerScope : nsIWorkerGlobalScope
{
void postMessage(/* in JSObject aMessage */);
void postMessage(in DOMString aMessage,
[optional] in nsIWorkerMessagePort aMessagePort);
attribute nsIDOMEventListener onmessage;
};
@ -97,10 +98,11 @@ interface nsIAbstractWorker : nsIDOMEventTarget
attribute nsIDOMEventListener onerror;
};
[scriptable, uuid(daf945c3-8d29-4724-8939-dd383f7d27a7)]
[scriptable, uuid(3d2ca558-31f7-4893-aa6d-1db9a3cb5bb9)]
interface nsIWorker : nsIAbstractWorker
{
void postMessage(/* in JSObject aMessage */);
void postMessage(in DOMString aMessage,
[optional] in nsIWorkerMessagePort aMessagePort);
attribute nsIDOMEventListener onmessage;

2
dom/src/threads/Makefile.in
Просмотреть файл

@ -61,7 +61,6 @@ REQUIRES = \
pref \
string \
thebes \
uconv \
widget \
xpcom \
xpconnect \
@ -83,7 +82,6 @@ CPPSRCS = \
LOCAL_INCLUDES = \
-I$(topsrcdir)/dom/src/base \
-I$(topsrcdir)/dom/src/json \
-I$(topsrcdir)/content/base/src \
-I$(topsrcdir)/content/events/src \
$(NULL)

139
dom/src/threads/nsDOMWorker.cpp
Просмотреть файл

@ -47,11 +47,9 @@
#include "jsdbgapi.h"
#endif
#include "nsAutoLock.h"
#include "nsAXPCNativeCallContext.h"
#include "nsContentUtils.h"
#include "nsDOMClassInfoID.h"
#include "nsGlobalWindow.h"
#include "nsJSON.h"
#include "nsJSUtils.h"
#include "nsProxyRelease.h"
#include "nsThreadUtils.h"
@ -415,113 +413,6 @@ JSFunctionSpec gDOMWorkerFunctions[] = {
{ nsnull, nsnull, 0, 0, 0 }
};
static JSBool
WriteCallback(const jschar* aBuffer,
uint32 aLength,
void* aData)
{
nsJSONWriter* writer = static_cast<nsJSONWriter*>(aData);
nsresult rv = writer->Write((const PRUnichar*)aBuffer, (PRUint32)aLength);
return NS_SUCCEEDED(rv) ? JS_TRUE : JS_FALSE;
}
static nsresult
GetStringForArgument(nsAString& aString,
PRBool* aIsJSON,
PRBool* aIsPrimitive)
{
NS_ASSERTION(aIsJSON && aIsPrimitive, "Null pointer!");
nsIXPConnect* xpc = nsContentUtils::XPConnect();
NS_ENSURE_TRUE(xpc, NS_ERROR_UNEXPECTED);
nsAXPCNativeCallContext* cc;
nsresult rv = xpc->GetCurrentNativeCallContext(&cc);
NS_ENSURE_SUCCESS(rv, rv);
NS_ENSURE_TRUE(cc, NS_ERROR_UNEXPECTED);
PRUint32 argc;
rv = cc->GetArgc(&argc);
NS_ENSURE_SUCCESS(rv, rv);
if (!argc) {
return NS_ERROR_XPC_NOT_ENOUGH_ARGS;
}
jsval* argv;
rv = cc->GetArgvPtr(&argv);
NS_ENSURE_SUCCESS(rv, rv);
JSContext* cx;
rv = cc->GetJSContext(&cx);
NS_ENSURE_SUCCESS(rv, rv);
JSAutoRequest ar(cx);
if (JSVAL_IS_STRING(argv[0])) {
aString.Assign(nsDependentJSString(JSVAL_TO_STRING(argv[0])));
*aIsJSON = *aIsPrimitive = PR_FALSE;
return NS_OK;
}
nsAutoJSValHolder jsonVal;
JSBool ok = jsonVal.Hold(cx);
NS_ENSURE_TRUE(ok, NS_ERROR_FAILURE);
if (JSVAL_IS_PRIMITIVE(argv[0])) {
// Only objects can be serialized through JSON, currently, so if we've been
// given a primitive we set it as a property on a dummy object before
// sending it to the serializer.
JSObject* obj = JS_NewObject(cx, NULL, NULL, NULL);
NS_ENSURE_TRUE(obj, NS_ERROR_OUT_OF_MEMORY);
jsonVal = obj;
ok = JS_DefineProperty(cx, obj, JSON_PRIMITIVE_PROPNAME, argv[0], NULL,
NULL, JSPROP_ENUMERATE);
NS_ENSURE_TRUE(ok, NS_ERROR_UNEXPECTED);
*aIsPrimitive = PR_TRUE;
}
else {
jsonVal = argv[0];
*aIsPrimitive = PR_FALSE;
}
JSType type;
jsval* vp = jsonVal.ToJSValPtr();
// This may change vp if there is a 'toJSON' function on the object.
ok = JS_TryJSON(cx, vp);
if (!(ok && !JSVAL_IS_PRIMITIVE(*vp) &&
(type = JS_TypeOfValue(cx, *vp)) != JSTYPE_FUNCTION &&
type != JSTYPE_XML)) {
return NS_ERROR_INVALID_ARG;
}
// Make sure to hold the new vp in case it changed.
jsonVal = *vp;
nsJSONWriter writer;
ok = JS_Stringify(cx, jsonVal.ToJSValPtr(), NULL, &WriteCallback, &writer);
if (!ok) {
return NS_ERROR_XPC_BAD_CONVERT_JS;
}
NS_ENSURE_TRUE(writer.DidWrite(), NS_ERROR_UNEXPECTED);
writer.FlushBuffer();
aString.Assign(writer.mOutputString);
*aIsJSON = PR_TRUE;
return NS_OK;
}
class nsDOMWorkerScope : public nsIWorkerScope,
public nsIDOMEventTarget,
public nsIXPCScriptable,
@ -618,7 +509,8 @@ nsDOMWorkerScope::GetNavigator(nsIWorkerNavigator** _retval)
}
NS_IMETHODIMP
nsDOMWorkerScope::PostMessage(/* JSObject aMessage */)
nsDOMWorkerScope::PostMessage(const nsAString& aMessage,
nsIWorkerMessagePort* aMessagePort)
{
NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
@ -626,13 +518,11 @@ nsDOMWorkerScope::PostMessage(/* JSObject aMessage */)
return NS_ERROR_ABORT;
}
nsString message;
PRBool isJSON, isPrimitive;
if (aMessagePort) {
return NS_ERROR_NOT_IMPLEMENTED;
}
nsresult rv = GetStringForArgument(message, &isJSON, &isPrimitive);
NS_ENSURE_SUCCESS(rv, rv);
return mWorker->PostMessageInternal(message, isJSON, isPrimitive, PR_FALSE);
return mWorker->PostMessageInternal(aMessage, PR_FALSE);
}
NS_IMETHODIMP
@ -1116,8 +1006,6 @@ nsDOMWorker::Resume()
nsresult
nsDOMWorker::PostMessageInternal(const nsAString& aMessage,
PRBool aIsJSON,
PRBool aIsPrimitive,
PRBool aToInner)
{
nsRefPtr<nsDOMWorkerMessageEvent> message = new nsDOMWorkerMessageEvent();
@ -1128,8 +1016,6 @@ nsDOMWorker::PostMessageInternal(const nsAString& aMessage,
EmptyString(), nsnull);
NS_ENSURE_SUCCESS(rv, rv);
message->SetJSONData(aIsJSON, aIsPrimitive);
nsRefPtr<nsDOMFireEventRunnable> runnable =
new nsDOMFireEventRunnable(this, message, aToInner);
NS_ENSURE_TRUE(runnable, NS_ERROR_OUT_OF_MEMORY);
@ -1438,19 +1324,18 @@ nsDOMWorker::GetParent()
* See nsIWorker
*/
NS_IMETHODIMP
nsDOMWorker::PostMessage(/* JSObject aMessage */)
nsDOMWorker::PostMessage(const nsAString& aMessage,
nsIWorkerMessagePort* aMessagePort)
{
if (mTerminated) {
return NS_OK;
}
nsString message;
PRBool isJSON, isPrimitive;
if (aMessagePort) {
return NS_ERROR_NOT_IMPLEMENTED;
}
nsresult rv = GetStringForArgument(message, &isJSON, &isPrimitive);
NS_ENSURE_SUCCESS(rv, rv);
return PostMessageInternal(message, isJSON, isPrimitive, PR_TRUE);
return PostMessageInternal(aMessage, PR_TRUE);
}
/**

2
dom/src/threads/nsDOMWorker.h
Просмотреть файл

@ -148,8 +148,6 @@ private:
~nsDOMWorker();
nsresult PostMessageInternal(const nsAString& aMessage,
PRBool aIsJSON,
PRBool aIsPrimitive,
PRBool aToInner);
PRBool CompileGlobalObject(JSContext* aCx);

69
dom/src/threads/nsDOMWorkerEvents.cpp
Просмотреть файл

@ -39,10 +39,7 @@
#include "nsDOMWorkerEvents.h"
#include "nsIXMLHttpRequest.h"
#include "nsIXPConnect.h"
#include "nsAXPCNativeCallContext.h"
#include "nsContentUtils.h"
#include "nsThreadUtils.h"
#include "nsDOMWorkerMessageHandler.h"
@ -243,70 +240,8 @@ NS_IMPL_THREADSAFE_DOM_CI_GETINTERFACES(nsDOMWorkerMessageEvent)
NS_IMETHODIMP
nsDOMWorkerMessageEvent::GetData(nsAString& aData)
{
if (!mIsJSON) {
aData.Assign(mData);
return NS_OK;
}
nsIXPConnect* xpc = nsContentUtils::XPConnect();
NS_ENSURE_TRUE(xpc, NS_ERROR_UNEXPECTED);
nsAXPCNativeCallContext* cc;
nsresult rv = xpc->GetCurrentNativeCallContext(&cc);
NS_ENSURE_SUCCESS(rv, rv);
NS_ENSURE_TRUE(cc, NS_ERROR_UNEXPECTED);
jsval* retval;
rv = cc->GetRetValPtr(&retval);
NS_ENSURE_SUCCESS(rv, rv);
if (mCachedJSVal) {
*retval = mCachedJSVal;
return cc->SetReturnValueWasSet(PR_TRUE);
}
JSContext* cx;
rv = cc->GetJSContext(&cx);
NS_ENSURE_SUCCESS(rv, rv);
JSAutoRequest ar(cx);
JSBool ok = mCachedJSVal.Hold(cx);
NS_ENSURE_TRUE(ok, NS_ERROR_FAILURE);
JSONParser* parser = JS_BeginJSONParse(cx, mCachedJSVal.ToJSValPtr());
NS_ENSURE_TRUE(parser, NS_ERROR_UNEXPECTED);
// This is slightly sneaky, but now that JS_BeginJSONParse succeeded we always
// need call JS_FinishJSONParse even if JS_ConsumeJSONText fails. We'll report
// an error if either failed, though.
ok = JS_ConsumeJSONText(cx, parser, (jschar*)mData.get(),
(uint32)mData.Length());
// Note the '&& ok' after the call here!
ok = JS_FinishJSONParse(cx, parser) && ok;
if (!ok) {
mCachedJSVal = JSVAL_NULL;
return NS_ERROR_UNEXPECTED;
}
NS_ASSERTION(mCachedJSVal.ToJSObject(), "Bad JSON result!");
if (mIsPrimitive) {
jsval primitive;
ok = JS_GetProperty(cx, mCachedJSVal.ToJSObject(), JSON_PRIMITIVE_PROPNAME,
&primitive);
if (!ok) {
mCachedJSVal = JSVAL_NULL;
return NS_ERROR_UNEXPECTED;
}
mCachedJSVal = primitive;
}
*retval = mCachedJSVal;
return cc->SetReturnValueWasSet(PR_TRUE);
aData.Assign(mData);
return NS_OK;
}
NS_IMETHODIMP

14
dom/src/threads/nsDOMWorkerEvents.h
Просмотреть файл

@ -46,8 +46,6 @@
#include "nsIDOMWorkers.h"
#include "nsIRunnable.h"
#include "jsapi.h"
#include "nsAutoJSValHolder.h"
#include "nsAutoPtr.h"
#include "nsCOMPtr.h"
#include "nsStringGlue.h"
@ -188,20 +186,8 @@ public:
NS_DECL_NSIWORKERMESSAGEEVENT
NS_DECL_NSICLASSINFO_GETINTERFACES
nsDOMWorkerMessageEvent()
: mIsJSON(PR_FALSE), mIsPrimitive(PR_FALSE) { }
void SetJSONData(PRBool aIsJSON, PRBool aIsPrimitive) {
mIsJSON = aIsJSON;
mIsPrimitive = aIsPrimitive;
}
protected:
nsString mData;
PRBool mIsJSON;
PRBool mIsPrimitive;
nsAutoJSValHolder mCachedJSVal;
nsString mOrigin;
nsCOMPtr<nsISupports> mSource;
};

3
dom/src/threads/nsDOMWorkerMacros.h
Просмотреть файл

@ -129,7 +129,4 @@ NS_IMPL_THREADSAFE_DOM_CI_ALL_THE_REST(_class)
NS_IMETHOD_(nsrefcnt) AddRef(void) { return _to AddRef(); } \
NS_IMETHOD_(nsrefcnt) Release(void) { return _to Release(); }
#define JSON_PRIMITIVE_PROPNAME \
"primitive"
#endif /* __NSDOMWORKERMACROS_H__ */

2
dom/src/threads/test/Makefile.in
Просмотреть файл

@ -56,8 +56,6 @@ _TEST_FILES = \
importScripts_worker_imported2.js \
importScripts_worker_imported3.js \
importScripts_worker_imported4.js \
test_json.html \
json_worker.js \
test_longThread.html \
longThread_worker.js \
test_navigator.html \

199
dom/src/threads/test/json_worker.js
Просмотреть файл

@ -1,199 +0,0 @@
var messages = [
{
type: "object",
array: false,
exception: false,
shouldCompare: false,
shouldEqual: false,
value: { foo: "bar" }
},
{
type: "object",
array: true,
exception: false,
shouldCompare: false,
shouldEqual: false,
value: [9, 8, 7]
},
{
type: "object",
array: false,
exception: false,
shouldCompare: true,
shouldEqual: true,
value: null
},
{
type: "undefined",
array: false,
exception: false,
shouldCompare: true,
shouldEqual: true,
value: undefined,
compareValue: undefined
},
{
type: "string",
array: false,
exception: false,
shouldCompare: true,
shouldEqual: true,
value: "Hello"
},
{
type: "string",
array: false,
exception: false,
shouldCompare: true,
shouldEqual: true,
value: JSON.stringify({ foo: "bar" })
},
{
type: "number",
array: false,
exception: false,
shouldCompare: true,
shouldEqual: true,
value: 1
},
{
type: "number",
array: false,
exception: false,
shouldCompare: true,
shouldEqual: true,
value: 0
},
{
type: "number",
array: false,
exception: false,
shouldCompare: true,
shouldEqual: true,
value: -1
},
{
type: "number",
array: false,
exception: false,
shouldCompare: true,
shouldEqual: true,
value: 238573459843702923492399923049
},
{
type: "number",
array: false,
exception: false,
shouldCompare: true,
shouldEqual: true,
value: -238573459843702923492399923049
},
{
type: "number",
array: false,
exception: false,
shouldCompare: true,
shouldEqual: true,
value: 0.25
},
{
type: "number",
array: false,
exception: false,
shouldCompare: true,
shouldEqual: true,
value: -0.25
},
{
type: "boolean",
array: false,
exception: false,
shouldCompare: true,
shouldEqual: true,
value: true
},
{
type: "boolean",
array: false,
exception: false,
shouldCompare: true,
shouldEqual: true,
value: false
},
{
type: "function",
array: false,
exception: true,
shouldCompare: false,
shouldEqual: false,
value: function (foo) { return "Bad!"; }
},
{
type: "xml",
array: false,
exception: true,
shouldCompare: true,
shouldEqual: true,
value: <funtimes></funtimes>
},
{
type: "object",
array: false,
exception: false,
shouldCompare: true,
shouldEqual: true,
value: NaN,
compareValue: null
},
{
type: "object",
array: false,
exception: false,
shouldCompare: true,
shouldEqual: true,
value: Infinity,
compareValue: null
},
{
type: "object",
array: false,
exception: false,
shouldCompare: true,
shouldEqual: true,
value: -Infinity,
compareValue: null
},
{
type: "string",
array: false,
exception: false,
shouldCompare: true,
shouldEqual: true,
value: "testFinished"
}
];
for (var index = 0; index < messages.length; index++) {
var message = messages[index];
if (message.hasOwnProperty("compareValue")) {
continue;
}
message.compareValue = message.value;
}
var onmessage = function(event) {
for (var index = 0; index < messages.length; index++) {
var exception = false;
try {
postMessage(messages[index].value);
}
catch (e) {
exception = true;
}
if (messages[index].exception != exception) {
throw "Exception inconsistency!";
}
}
}

67
dom/src/threads/test/test_json.html
Просмотреть файл

@ -1,67 +0,0 @@
<!DOCTYPE HTML>
<html>
<!--
Tests of DOM Worker JSON messages
-->
<head>
<title>Test for DOM Worker Navigator</title>
<script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
<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 src="json_worker.js" language="javascript"></script>
<script class="testbody" language="javascript">
ok(messages.length, "No messages to test!");
var worker = new Worker("json_worker.js");
var index = 0;
worker.onmessage = function(event) {
var key = messages[index++];
// Loop for the ones we shouldn't receive.
while (key.exception) {
key = messages[index++];
}
is(typeof event.data, key.type,
"Bad type! " + messages.indexOf(key));
is(event.data instanceof Array, key.array,
"Array mismatch! " + messages.indexOf(key));
if (key.shouldCompare) {
ok(event.data == key.compareValue,
"Values don't compare! " + messages.indexOf(key));
}
if (key.shouldEqual) {
ok(event.data === key.compareValue,
"Values don't equal!" + messages.indexOf(key));
}
if (event.data == "testFinished") {
is(index, messages.length, "Didn't see the right number of messages!");
SimpleTest.finish();
}
};
worker.onerror = function(event) {
ok(false, "Worker had an error: " + event.data);
SimpleTest.finish();
}
worker.postMessage("start");
SimpleTest.waitForExplicitFinish();
</script>
</pre>
</body>
</html>

2
dom/src/threads/test/test_xhrAbort.html
Просмотреть файл

@ -24,7 +24,7 @@ Tests of DOM Worker Threads XHR(Bug 450452 )
var worker = new Worker("xhrAbort_worker.js");
worker.onmessage = function(event) {
is (data.toString(), event.data.toString(), "Got different results!");
is (data, event.data, "Got different results!");
SimpleTest.finish();
};

6
js/src/json.cpp
Просмотреть файл

@ -300,7 +300,7 @@ js_Stringify(JSContext *cx, jsval *vp, JSObject *replacer,
if (memberWritten) {
output = jschar(',');
ok = callback(&output, 1, data);
if (!ok)
if (!ok)
break;
}
memberWritten = JS_TRUE;
@ -308,10 +308,8 @@ js_Stringify(JSContext *cx, jsval *vp, JSObject *replacer,
JSType type = JS_TypeOfValue(cx, outputValue);
// Can't encode these types, so drop them
if (type == JSTYPE_FUNCTION || type == JSTYPE_XML) {
ok = JS_FALSE;
if (type == JSTYPE_FUNCTION || type == JSTYPE_XML)
break;
}
// Be careful below, this string is weakly rooted.
JSString *s;

4
js/src/xpconnect/public/nsAutoJSValHolder.h
Просмотреть файл

@ -127,10 +127,6 @@ public:
: NULL;
}
jsval* ToJSValPtr() {
return &mVal;
}
/**
* Pretend to be a jsval.
*/