зеркало из https://github.com/mozilla/pjs.git
Bug 458321 - 'Workers: Fix multipart to not use a cached variable'. r+sr=jst.
This commit is contained in:
Родитель
178b8b7405
Коммит
1bf4edef4e
|
@ -255,6 +255,8 @@ namespace nsDOMWorkerProxiedXHRFunctions
|
|||
MAKE_PROXIED_FUNCTION1(OverrideMimeType, const nsACString&);
|
||||
|
||||
MAKE_PROXIED_FUNCTION1(SetMultipart, PRBool);
|
||||
|
||||
MAKE_PROXIED_FUNCTION1(GetMultipart, PRBool*);
|
||||
}
|
||||
|
||||
#endif /* __NSDOMWORKERXHRPROXIEDFUNCTIONS_H__ */
|
||||
|
|
|
@ -444,7 +444,6 @@ nsDOMWorkerXHRProxy::nsDOMWorkerXHRProxy(nsDOMWorkerXHR* aWorkerXHR)
|
|||
mUpload(nsnull),
|
||||
mSyncEventQueue(nsnull),
|
||||
mOwnedByXHR(PR_FALSE),
|
||||
mMultipart(PR_FALSE),
|
||||
mCanceled(PR_FALSE)
|
||||
{
|
||||
NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
|
||||
|
@ -1015,11 +1014,13 @@ nsDOMWorkerXHRProxy::OverrideMimeType(const nsACString& aMimetype)
|
|||
nsresult
|
||||
nsDOMWorkerXHRProxy::GetMultipart(PRBool* aMultipart)
|
||||
{
|
||||
NS_ASSERTION(aMultipart, "Null pointer!");
|
||||
|
||||
if (mCanceled) {
|
||||
return NS_ERROR_ABORT;
|
||||
}
|
||||
|
||||
*aMultipart = mMultipart;
|
||||
RUN_PROXIED_FUNCTION(GetMultipart, (this, &queue, aMultipart));
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
@ -1027,7 +1028,6 @@ nsresult
|
|||
nsDOMWorkerXHRProxy::SetMultipart(PRBool aMultipart)
|
||||
{
|
||||
RUN_PROXIED_FUNCTION(SetMultipart, (this, &queue, aMultipart));
|
||||
mMultipart = aMultipart;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
|
|
@ -172,7 +172,6 @@ protected:
|
|||
// Whether or not this object is owned by the real XHR object.
|
||||
PRPackedBool mOwnedByXHR;
|
||||
|
||||
PRPackedBool mMultipart;
|
||||
PRPackedBool mCanceled;
|
||||
};
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче