Bug 1173029 - Remove mFinalURL from InternalResponse; r=baku a=KWierso
☠☠ backed out by f2728a211bf4 ☠ ☠
authorEhsan Akhgari <ehsan@mozilla.com>
Tue, 09 Jun 2015 15:23:13 -0400
changeset 247809 e33db57c3fec9e9f4571a88c724289552dce4bc7
parent 247808 ec31f39d4df8e9de314d22b09ff28735611d0229
child 247810 16ee628ab3676b50edf2676692f85f2766eb237d
push id28885
push usercbook@mozilla.com
push dateWed, 10 Jun 2015 13:18:59 +0000
treeherderautoland@e101c589c242 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbaku, KWierso
bugs1173029
milestone41.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1173029 - Remove mFinalURL from InternalResponse; r=baku a=KWierso
dom/fetch/InternalResponse.cpp
dom/fetch/InternalResponse.h
--- a/dom/fetch/InternalResponse.cpp
+++ b/dom/fetch/InternalResponse.cpp
@@ -9,17 +9,16 @@
 #include "mozilla/dom/InternalHeaders.h"
 #include "nsStreamUtils.h"
 
 namespace mozilla {
 namespace dom {
 
 InternalResponse::InternalResponse(uint16_t aStatus, const nsACString& aStatusText)
   : mType(ResponseType::Default)
-  , mFinalURL(false)
   , mStatus(aStatus)
   , mStatusText(aStatusText)
   , mHeaders(new InternalHeaders(HeadersGuardEnum::Response))
 {
 }
 
 already_AddRefed<InternalResponse>
 InternalResponse::Clone()
--- a/dom/fetch/InternalResponse.h
+++ b/dom/fetch/InternalResponse.h
@@ -43,17 +43,16 @@ public:
   already_AddRefed<InternalResponse>
   OpaqueResponse()
   {
     MOZ_ASSERT(!mWrappedResponse, "Can't OpaqueResponse a already wrapped response");
     nsRefPtr<InternalResponse> response = new InternalResponse(0, EmptyCString());
     response->mType = ResponseType::Opaque;
     response->mTerminationReason = mTerminationReason;
     response->mURL = mURL;
-    response->mFinalURL = mFinalURL;
     response->mChannelInfo = mChannelInfo;
     response->mWrappedResponse = this;
     return response.forget();
   }
 
   already_AddRefed<InternalResponse>
   BasicResponse();
 
@@ -85,28 +84,16 @@ public:
   }
 
   void
   SetUrl(const nsACString& aURL)
   {
     mURL.Assign(aURL);
   }
 
-  bool
-  FinalURL() const
-  {
-    return mFinalURL;
-  }
-
-  void
-  SetFinalURL(bool aFinalURL)
-  {
-    mFinalURL = aFinalURL;
-  }
-
   uint16_t
   GetStatus() const
   {
     return mStatus;
   }
 
   const nsCString&
   GetStatusText() const
@@ -192,25 +179,23 @@ private:
   // InternalResponse, except headers, body and wrapped response (if any) which
   // are left uninitialized. Used for cloning and filtering.
   already_AddRefed<InternalResponse> CreateIncompleteCopy()
   {
     nsRefPtr<InternalResponse> copy = new InternalResponse(mStatus, mStatusText);
     copy->mType = mType;
     copy->mTerminationReason = mTerminationReason;
     copy->mURL = mURL;
-    copy->mFinalURL = mFinalURL;
     copy->mChannelInfo = mChannelInfo;
     return copy.forget();
   }
 
   ResponseType mType;
   nsCString mTerminationReason;
   nsCString mURL;
-  bool mFinalURL;
   const uint16_t mStatus;
   const nsCString mStatusText;
   nsRefPtr<InternalHeaders> mHeaders;
   nsCOMPtr<nsIInputStream> mBody;
   ChannelInfo mChannelInfo;
 
   // For filtered responses.
   // Cache, and SW interception should always serialize/access the underlying