revert bug 1034918 r=backout
authorPatrick McManus <mcmanus@ducksong.com>
Mon, 07 Jul 2014 16:16:29 -0400
changeset 192776 d76669861f43548b1f5bd07fcd4341e31e24d906
parent 192775 911d02f2c02a13fbdf80083f6d00886e35523f20
child 192777 ba917bb8b9b4b9ddc1e9ed6c369fd7345ed9651e
push id7651
push usercbook@mozilla.com
push dateTue, 08 Jul 2014 13:28:32 +0000
treeherderfx-team@05cfda67b9db [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1034918
milestone33.0a1
revert bug 1034918 r=backout
netwerk/protocol/http/nsHttpTransaction.cpp
netwerk/protocol/http/nsHttpTransaction.h
--- a/netwerk/protocol/http/nsHttpTransaction.cpp
+++ b/netwerk/protocol/http/nsHttpTransaction.cpp
@@ -1736,19 +1736,19 @@ nsHttpTransaction::ReleaseBlockingTransa
     RemoveDispatchedAsBlocking();
     mLoadGroupCI = nullptr;
 }
 
 //-----------------------------------------------------------------------------
 // nsHttpTransaction deletion event
 //-----------------------------------------------------------------------------
 
-class DeleteHttpTransaction : public nsRunnable {
+class nsDeleteHttpTransaction : public nsRunnable {
 public:
-    DeleteHttpTransaction(nsHttpTransaction *trans)
+    nsDeleteHttpTransaction(nsHttpTransaction *trans)
         : mTrans(trans)
     {}
 
     NS_IMETHOD Run()
     {
         delete mTrans;
         return NS_OK;
     }
@@ -1762,17 +1762,17 @@ nsHttpTransaction::DeleteSelfOnConsumerT
     LOG(("nsHttpTransaction::DeleteSelfOnConsumerThread [this=%p]\n", this));
 
     bool val;
     if (!mConsumerTarget ||
         (NS_SUCCEEDED(mConsumerTarget->IsOnCurrentThread(&val)) && val)) {
         delete this;
     } else {
         LOG(("proxying delete to consumer thread...\n"));
-        nsCOMPtr<nsIRunnable> event = new DeleteHttpTransaction(this);
+        nsCOMPtr<nsIRunnable> event = new nsDeleteHttpTransaction(this);
         if (NS_FAILED(mConsumerTarget->Dispatch(event, NS_DISPATCH_NORMAL)))
             NS_WARNING("failed to dispatch nsHttpDeleteTransaction event");
     }
 }
 
 bool
 nsHttpTransaction::TryToRunPacedRequest()
 {
--- a/netwerk/protocol/http/nsHttpTransaction.h
+++ b/netwerk/protocol/http/nsHttpTransaction.h
@@ -59,16 +59,17 @@ class nsHttpTransaction : public nsAHttp
 {
 public:
     NS_DECL_THREADSAFE_ISUPPORTS
     NS_DECL_NSAHTTPTRANSACTION
     NS_DECL_NSIINPUTSTREAMCALLBACK
     NS_DECL_NSIOUTPUTSTREAMCALLBACK
 
     nsHttpTransaction();
+    virtual ~nsHttpTransaction();
 
     //
     // called to initialize the transaction
     //
     // @param caps
     //        the transaction capabilities (see nsHttp.h)
     // @param connInfo
     //        the connection type for this transaction.
@@ -141,19 +142,16 @@ public:
     nsILoadGroupConnectionInfo *LoadGroupConnectionInfo() { return mLoadGroupCI.get(); }
     void SetLoadGroupConnectionInfo(nsILoadGroupConnectionInfo *aLoadGroupCI) { mLoadGroupCI = aLoadGroupCI; }
     void DispatchedAsBlocking();
     void RemoveDispatchedAsBlocking();
 
     nsHttpTransaction *QueryHttpTransaction() MOZ_OVERRIDE { return this; }
 
 private:
-    friend class DeleteHttpTransaction;
-    virtual ~nsHttpTransaction();
-
     nsresult Restart();
     nsresult RestartInProgress();
     char    *LocateHttpStart(char *buf, uint32_t len,
                              bool aAllowPartialMatch);
     nsresult ParseLine(char *line);
     nsresult ParseLineSegment(char *seg, uint32_t len);
     nsresult ParseHead(char *, uint32_t count, uint32_t *countRead);
     nsresult HandleContentStart();