Commit b42f9701 authored by Sebastian Hengst's avatar Sebastian Hengst
Browse files

Backed out changeset b28740aedf34 (bug 1397128)

parent f14ea2ac

dom/cache/Cache.cpp

+3 −9
Original line number Diff line number Diff line
@@ -285,9 +285,7 @@ Cache::Match(JSContext* aCx, const RequestOrUSVString& aRequest, 
  CacheQueryParams params;

  ToCacheQueryParams(params, aOptions);



  AutoChildOpArgs args(this,

                       CacheMatchArgs(CacheRequest(), params, OpenMode::Eager),

                       1);

  AutoChildOpArgs args(this, CacheMatchArgs(CacheRequest(), params), 1);



  args.Add(ir, IgnoreBody, IgnoreInvalidScheme, aRv);

  if (NS_WARN_IF(aRv.Failed())) {
@@ -311,9 +309,7 @@ Cache::MatchAll(JSContext* aCx, const Optional<RequestOrUSVString>& aRequest, 
  CacheQueryParams params;

  ToCacheQueryParams(params, aOptions);



  AutoChildOpArgs args(this,

                       CacheMatchAllArgs(void_t(), params, OpenMode::Eager),

                       1);

  AutoChildOpArgs args(this, CacheMatchAllArgs(void_t(), params), 1);



  if (aRequest.WasPassed()) {

    RefPtr<InternalRequest> ir = ToInternalRequest(aCx, aRequest.Value(),
@@ -495,9 +491,7 @@ Cache::Keys(JSContext* aCx, const Optional<RequestOrUSVString>& aRequest, 
  CacheQueryParams params;

  ToCacheQueryParams(params, aOptions);



  AutoChildOpArgs args(this,

                       CacheKeysArgs(void_t(), params, OpenMode::Eager),

                       1);

  AutoChildOpArgs args(this, CacheKeysArgs(void_t(), params), 1);



  if (aRequest.WasPassed()) {

    RefPtr<InternalRequest> ir =

dom/cache/CacheStorage.cpp

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ CacheStorage::Match(JSContext* aCx, const RequestOrUSVString& aRequest, 


  nsAutoPtr<Entry> entry(new Entry());

  entry->mPromise = promise;

  entry->mArgs = StorageMatchArgs(CacheRequest(), params, OpenMode::Eager);

  entry->mArgs = StorageMatchArgs(CacheRequest(), params);

  entry->mRequest = request;



  mPendingRequests.AppendElement(entry.forget());

dom/cache/CacheTypes.ipdlh

+0 −5
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ include ChannelInfo; 
include PBackgroundSharedTypes;



using HeadersGuardEnum from "mozilla/dom/FetchIPCTypes.h";

using OpenMode from "mozilla/dom/cache/IPCUtils.h";

using ReferrerPolicy from "mozilla/dom/FetchIPCTypes.h";

using RequestCredentials from "mozilla/dom/FetchIPCTypes.h";

using RequestMode from "mozilla/dom/FetchIPCTypes.h";
@@ -107,14 +106,12 @@ struct CacheMatchArgs 
{

  CacheRequest request;

  CacheQueryParams params;

  OpenMode openMode;

};



struct CacheMatchAllArgs

{

  CacheRequestOrVoid requestOrVoid;

  CacheQueryParams params;

  OpenMode openMode;

};



struct CachePutAllArgs
@@ -132,14 +129,12 @@ struct CacheKeysArgs 
{

  CacheRequestOrVoid requestOrVoid;

  CacheQueryParams params;

  OpenMode openMode;

};



struct StorageMatchArgs

{

  CacheRequest request;

  CacheQueryParams params;

  OpenMode openMode;

};



struct StorageHasArgs

dom/cache/IPCUtils.h

+0 −7
Original line number Diff line number Diff line
@@ -18,13 +18,6 @@ namespace IPC { 
                                    mozilla::dom::cache::DEFAULT_NAMESPACE,

                                    mozilla::dom::cache::NUMBER_OF_NAMESPACES>

  {};



  template<>

  struct ParamTraits<mozilla::dom::cache::OpenMode> :

    public ContiguousEnumSerializer<mozilla::dom::cache::OpenMode,

                                    mozilla::dom::cache::OpenMode::Eager,

                                    mozilla::dom::cache::OpenMode::NumTypes>

  {};

} // namespace IPC



#endif // mozilla_dom_cache_IPCUtils_h

dom/cache/Manager.cpp

+15 −23
Original line number Diff line number Diff line
@@ -544,11 +544,9 @@ public: 
    }



    nsCOMPtr<nsIInputStream> stream;

    if (mArgs.openMode() == OpenMode::Eager) {

    rv = BodyOpen(aQuotaInfo, aDBDir, mResponse.mBodyId, getter_AddRefs(stream));

    if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }

    if (NS_WARN_IF(!stream)) { return NS_ERROR_FILE_NOT_FOUND; }

    }



    mStreamList->Add(mResponse.mBodyId, Move(stream));
@@ -611,12 +609,10 @@ public: 
      }



      nsCOMPtr<nsIInputStream> stream;

      if (mArgs.openMode() == OpenMode::Eager) {

      rv = BodyOpen(aQuotaInfo, aDBDir, mSavedResponses[i].mBodyId,

                    getter_AddRefs(stream));

      if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }

      if (NS_WARN_IF(!stream)) { return NS_ERROR_FILE_NOT_FOUND; }

      }



      mStreamList->Add(mSavedResponses[i].mBodyId, Move(stream));

    }
@@ -1161,12 +1157,10 @@ public: 
      }



      nsCOMPtr<nsIInputStream> stream;

      if (mArgs.openMode() == OpenMode::Eager) {

      rv = BodyOpen(aQuotaInfo, aDBDir, mSavedRequests[i].mBodyId,

                    getter_AddRefs(stream));

      if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }

      if (NS_WARN_IF(!stream)) { return NS_ERROR_FILE_NOT_FOUND; }

      }



      mStreamList->Add(mSavedRequests[i].mBodyId, Move(stream));

    }
@@ -1227,12 +1221,10 @@ public: 
    }



    nsCOMPtr<nsIInputStream> stream;

    if (mArgs.openMode() == OpenMode::Eager) {

    rv = BodyOpen(aQuotaInfo, aDBDir, mSavedResponse.mBodyId,

                  getter_AddRefs(stream));

    if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }

    if (NS_WARN_IF(!stream)) { return NS_ERROR_FILE_NOT_FOUND; }

    }



    mStreamList->Add(mSavedResponse.mBodyId, Move(stream));