From de254dd8d17ca24efe266a48ccec029b3d636bef Mon Sep 17 00:00:00 2001 From: "darin%meer.net" Date: Tue, 3 Jan 2006 22:08:05 +0000 Subject: [PATCH] additional follow-up patch for bug 318193, r=bz git-svn-id: svn://10.0.0.236/trunk@186877 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/netwerk/base/src/nsInputStreamPump.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/mozilla/netwerk/base/src/nsInputStreamPump.cpp b/mozilla/netwerk/base/src/nsInputStreamPump.cpp index 16efe085dee..3413aab5753 100644 --- a/mozilla/netwerk/base/src/nsInputStreamPump.cpp +++ b/mozilla/netwerk/base/src/nsInputStreamPump.cpp @@ -38,16 +38,15 @@ #include "nsInputStreamPump.h" #include "nsIServiceManager.h" #include "nsIStreamTransportService.h" -#include "nsIEventQueueService.h" #include "nsIInterfaceRequestorUtils.h" #include "nsISeekableStream.h" #include "nsITransport.h" #include "nsNetUtil.h" +#include "nsEventQueueUtils.h" #include "nsCOMPtr.h" #include "prlog.h" static NS_DEFINE_CID(kStreamTransportServiceCID, NS_STREAMTRANSPORTSERVICE_CID); -static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); #if defined(PR_LOGGING) // @@ -292,10 +291,7 @@ nsInputStreamPump::AsyncRead(nsIStreamListener *listener, nsISupports *ctxt) // grab event queue (we must do this here by contract, since all notifications // must go to the thread which called AsyncRead) - nsCOMPtr eqs = do_GetService(kEventQueueServiceCID, &rv); - if (NS_FAILED(rv)) return rv; - - rv = eqs->ResolveEventQueue(NS_CURRENT_EVENTQ, getter_AddRefs(mEventQ)); + rv = NS_GetCurrentEventQ(getter_AddRefs(mEventQ)); if (NS_FAILED(rv)) return rv; rv = EnsureWaiting(); @@ -425,10 +421,12 @@ nsInputStreamPump::OnStateTransfer() // in most cases this QI will succeed (mAsyncStream is almost always // a nsPipeInputStream, which implements nsISeekableStream::Tell). - PRInt64 offsetBefore = 0; + PRInt64 offsetBefore; nsCOMPtr seekable = do_QueryInterface(mAsyncStream); - if (seekable) - seekable->Tell(&offsetBefore); + if (seekable && NS_FAILED(seekable->Tell(&offsetBefore))) { + NS_NOTREACHED("Tell failed on readable stream"); + offsetBefore = 0; + } // report the current stream offset to our listener... if we've // streamed more than PR_UINT32_MAX, then avoid overflowing the