wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 687220 - 'XHR POST in worker with null body and upload load event listener leads to Assertion failure'. r=mrbkap.

Browse Source
This commit is contained in:
Ben Turner 2011-11-03 19:51:33 -07:00
parent e3bbb80d57
commit d612e0e995
3 changed files with 47 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
dom/workers/XMLHttpRequest.cpp
View File

@ -81,6 +81,12 @@ class XMLHttpRequestUpload : public events::EventTarget
static const char* const sEventStrings[STRING_COUNT];
enum SLOT {
SLOT_xhrParent = 0,
SLOT_COUNT
};
public:
static JSClass*
Class()
@ -96,12 +102,16 @@ public:
}
static JSObject*
Create(JSContext* aCx)
Create(JSContext* aCx, JSObject* aParentObj)
{
JS_ASSERT(aParentObj);
JSObject* obj = JS_NewObject(aCx, &sClass, NULL, NULL);
if (obj) {
XMLHttpRequestUpload* priv = new XMLHttpRequestUpload();
if (!SetJSPrivateSafeish(aCx, obj, priv)) {
if (!JS_SetReservedSlot(aCx, obj, SLOT_xhrParent,
OBJECT_TO_JSVAL(aParentObj)) ||
!SetJSPrivateSafeish(aCx, obj, priv)) {
delete priv;
return NULL;
}
@ -109,6 +119,9 @@ public:
return obj;
}
static bool
UpdateState(JSContext* aCx, JSObject* aObj, const xhr::StateData& aNewState);
private:
XMLHttpRequestUpload()
{
@ -217,7 +230,7 @@ private:
JSClass XMLHttpRequestUpload::sClass = {
"XMLHttpRequestUpload",
JSCLASS_HAS_PRIVATE,
JSCLASS_HAS_PRIVATE | JSCLASS_HAS_RESERVED_SLOTS(SLOT_COUNT),
JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, Finalize,
NULL, NULL, NULL, NULL, NULL, NULL, Trace, NULL
@ -487,7 +500,7 @@ private:
}
if (JSVAL_IS_NULL(uploadVal)) {
JSObject* uploadObj = XMLHttpRequestUpload::Create(aCx);
JSObject* uploadObj = XMLHttpRequestUpload::Create(aCx, aObj);
if (!uploadObj) {
return false;
}
@ -828,6 +841,26 @@ const char* const XMLHttpRequest::sEventStrings[STRING_COUNT] = {
"onloadend"
};
// static
bool
XMLHttpRequestUpload::UpdateState(JSContext* aCx, JSObject* aObj,
const xhr::StateData& aNewState)
{
JS_ASSERT(JS_GET_CLASS(aCx, aObj) == &sClass);
jsval parentVal;
if (!JS_GetReservedSlot(aCx, aObj, SLOT_xhrParent, &parentVal)) {
return false;
}
if (!JSVAL_IS_PRIMITIVE(parentVal)) {
return XMLHttpRequest::UpdateState(aCx, JSVAL_TO_OBJECT(parentVal),
aNewState);
}
return true;
}
} // anonymous namespace
BEGIN_WORKERS_NAMESPACE
@ -842,9 +875,12 @@ InitClasses(JSContext* aCx, JSObject* aGlobal, JSObject* aProto)
}
bool
UpdateXHRState(JSContext* aCx, JSObject* aObj, const StateData& aNewState)
UpdateXHRState(JSContext* aCx, JSObject* aObj, bool aIsUpload,
const StateData& aNewState)
{
return XMLHttpRequest::UpdateState(aCx, aObj, aNewState);
return aIsUpload ?
XMLHttpRequestUpload::UpdateState(aCx, aObj, aNewState) :
XMLHttpRequest::UpdateState(aCx, aObj, aNewState);
}
} // namespace xhr

3
dom/workers/XMLHttpRequest.h
View File

@ -63,7 +63,8 @@ struct StateData
};
bool
UpdateXHRState(JSContext* aCx, JSObject* aObj, const StateData& aNewState);
UpdateXHRState(JSContext* aCx, JSObject* aObj, bool aIsUpload,
const StateData& aNewState);
} // namespace xhr

6
dom/workers/XMLHttpRequestPrivate.cpp
View File

@ -608,7 +608,7 @@ public:
JSVAL_VOID :
INT_TO_JSVAL(mReadyState);
if (!xhr::UpdateXHRState(aCx, target, state)) {
if (!xhr::UpdateXHRState(aCx, target, mUploadEvent, state)) {
return false;
}
@ -1688,7 +1688,7 @@ XMLHttpRequestPrivate::MaybeDispatchPrematureAbortEvents(JSContext* aCx,
JSObject* target = mProxy->mXMLHttpRequestPrivate->GetUploadJSObject();
NS_ASSERTION(target, "Must have a target!");
if (!xhr::UpdateXHRState(aCx, target, state) ||
if (!xhr::UpdateXHRState(aCx, target, true, state) ||
!DispatchPrematureAbortEvent(aCx, target, STRING_abort, true) ||
!DispatchPrematureAbortEvent(aCx, target, STRING_loadend, true)) {
return false;
@ -1701,7 +1701,7 @@ XMLHttpRequestPrivate::MaybeDispatchPrematureAbortEvents(JSContext* aCx,
JSObject* target = mProxy->mXMLHttpRequestPrivate->GetJSObject();
NS_ASSERTION(target, "Must have a target!");
if (!xhr::UpdateXHRState(aCx, target, state) ||
if (!xhr::UpdateXHRState(aCx, target, false, state) ||
!DispatchPrematureAbortEvent(aCx, target, STRING_readystatechange,
false)) {
return false;