Commit 26d7b4d4 authored by Geoff Lankow's avatar Geoff Lankow
Browse files

Backed out changeset b4cf9833464e (bug 715837)

parent 9c020d5d

netwerk/protocol/http/HttpChannelParent.cpp

+3 −6
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include "mozilla/net/NeckoParent.h"

#include "mozilla/unused.h"

#include "HttpChannelParentListener.h"

#include "nsHttpChannel.h"

#include "nsHttpHandler.h"

#include "nsNetUtil.h"

#include "nsISupportsPriority.h"
@@ -393,11 +394,8 @@ HttpChannelParent::RecvDocumentChannelCleanup() 
bool 

HttpChannelParent::RecvMarkOfflineCacheEntryAsForeign()

{

  if (mOfflineForeignMarker) {

    mOfflineForeignMarker->MarkAsForeign();

    mOfflineForeignMarker = 0;

  }



  nsHttpChannel *httpChan = static_cast<nsHttpChannel *>(mChannel.get());

  httpChan->MarkOfflineCacheEntryAsForeign();

  return true;

}
@@ -423,7 +421,6 @@ HttpChannelParent::OnStartRequest(nsIRequest *aRequest, nsISupports *aContext) 
  bool loadedFromApplicationCache;

  chan->GetLoadedFromApplicationCache(&loadedFromApplicationCache);

  if (loadedFromApplicationCache) {

    mOfflineForeignMarker = chan->GetOfflineCacheEntryAsForeignMarker();

    nsCOMPtr<nsIApplicationCache> appCache;

    chan->GetApplicationCache(getter_AddRefs(appCache));

    nsCString appCacheGroupId;

netwerk/protocol/http/HttpChannelParent.h

+0 −3
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ 
#include "nsIParentRedirectingChannel.h"

#include "nsIProgressEventSink.h"

#include "nsITabParent.h"

#include "nsHttpChannel.h"



using namespace mozilla::dom;
@@ -129,8 +128,6 @@ private: 
  nsCOMPtr<nsIChannel> mRedirectChannel;

  nsCOMPtr<nsIAsyncVerifyRedirectCallback> mRedirectCallback;



  nsAutoPtr<class nsHttpChannel::OfflineCacheEntryAsForeignMarker> mOfflineForeignMarker;



  // state for combining OnStatus/OnProgress with OnDataAvailable

  // into one IPDL call to child.

  nsresult mStoredStatus;

netwerk/protocol/http/nsHttpChannel.cpp

+6 −26
Original line number Diff line number Diff line
@@ -5176,40 +5176,20 @@ nsHttpChannel::SetChooseApplicationCache(bool aChoose) 
    return NS_OK;

}



nsHttpChannel::OfflineCacheEntryAsForeignMarker*

nsHttpChannel::GetOfflineCacheEntryAsForeignMarker()

NS_IMETHODIMP

nsHttpChannel::MarkOfflineCacheEntryAsForeign()

{

    if (!mApplicationCache)

        return nsnull;

        return NS_ERROR_NOT_AVAILABLE;



    nsresult rv;



    nsCAutoString cacheKey;

    rv = GenerateCacheKey(mPostID, cacheKey);

    NS_ENSURE_SUCCESS(rv, nsnull);



    return new OfflineCacheEntryAsForeignMarker(mApplicationCache, cacheKey);

}

    NS_ENSURE_SUCCESS(rv, rv);



nsresult

nsHttpChannel::OfflineCacheEntryAsForeignMarker::MarkAsForeign()

{

    return mApplicationCache->MarkEntry(mCacheKey,

    rv = mApplicationCache->MarkEntry(cacheKey,

                                      nsIApplicationCache::ITEM_FOREIGN);

}



NS_IMETHODIMP

nsHttpChannel::MarkOfflineCacheEntryAsForeign()

{

    nsresult rv;



    nsAutoPtr<OfflineCacheEntryAsForeignMarker> marker

        = GetOfflineCacheEntryAsForeignMarker();



    if (!marker)

        return NS_ERROR_NOT_AVAILABLE;



    rv = marker->MarkAsForeign();

    NS_ENSURE_SUCCESS(rv, rv);



    return NS_OK;

netwerk/protocol/http/nsHttpChannel.h

+0 −17
Original line number Diff line number Diff line
@@ -161,23 +161,6 @@ public: /* internal necko use only */ 
        return NS_OK;

    }



    // This allows cache entry to be marked as foreign even after channel itself

    // is gone.  Needed for e10s (see HttpChannelParent::RecvDocumentChannelCleanup)

    class OfflineCacheEntryAsForeignMarker {

        nsCOMPtr<nsIApplicationCache> mApplicationCache;

        nsCString mCacheKey;

    public:

        OfflineCacheEntryAsForeignMarker(nsIApplicationCache* appCache,

                                         const nsCSubstring& key)

             : mApplicationCache(appCache)

             , mCacheKey(key)

        {}



        nsresult MarkAsForeign();

    };



    OfflineCacheEntryAsForeignMarker* GetOfflineCacheEntryAsForeignMarker();



private:

    typedef nsresult (nsHttpChannel::*nsContinueRedirectionFunc)(nsresult result);