Backed out 4 changesets (bug 1525319) for Android failures in dom/base/test/test_progress_events_for_gzip_data.html

Backed out changeset b73f033efb41 (bug 1525319)
Backed out changeset 1d318d5c6b98 (bug 1525319)
Backed out changeset 6d73418988d4 (bug 1525319)
Backed out changeset 84ca79bd2dc3 (bug 1525319)
This commit is contained in:
Dorel Luca
2019-02-25 04:06:11 +02:00
parent d10ce4d36a
commit 2dfae9a24a
263 changed files with 1236 additions and 1078 deletions

View File

@@ -886,7 +886,8 @@ class MaybeRunCollector : public Runnable {
nsCOMPtr<nsIDocShell> mDocShell;
};
nsresult nsHtml5StreamParser::OnStartRequest(nsIRequest* aRequest) {
nsresult nsHtml5StreamParser::OnStartRequest(nsIRequest* aRequest,
nsISupports* aContext) {
MOZ_RELEASE_ASSERT(STREAM_NOT_STARTED == mStreamState,
"Got OnStartRequest when the stream had already started.");
MOZ_ASSERT(
@@ -894,7 +895,7 @@ nsresult nsHtml5StreamParser::OnStartRequest(nsIRequest* aRequest) {
"Got OnStartRequest at the wrong stage in the executor life cycle.");
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
if (mObserver) {
mObserver->OnStartRequest(aRequest);
mObserver->OnStartRequest(aRequest, aContext);
}
mRequest = aRequest;
@@ -1168,11 +1169,12 @@ class nsHtml5RequestStopper : public Runnable {
};
nsresult nsHtml5StreamParser::OnStopRequest(nsIRequest* aRequest,
nsISupports* aContext,
nsresult status) {
NS_ASSERTION(mRequest == aRequest, "Got Stop on wrong stream.");
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
if (mObserver) {
mObserver->OnStopRequest(aRequest, status);
mObserver->OnStopRequest(aRequest, aContext, status);
}
nsCOMPtr<nsIRunnable> stopper = new nsHtml5RequestStopper(this);
if (NS_FAILED(mEventTarget->Dispatch(stopper, nsIThread::DISPATCH_NORMAL))) {
@@ -1309,6 +1311,7 @@ class nsHtml5DataAvailable : public Runnable {
};
nsresult nsHtml5StreamParser::OnDataAvailable(nsIRequest* aRequest,
nsISupports* aContext,
nsIInputStream* aInStream,
uint64_t aSourceOffset,
uint32_t aLength) {