Commit 285f502f authored by Sebastian Hengst's avatar Sebastian Hengst
Browse files

Backed out changeset 3f1e68da9634 (bug 1397128) for bustage at... 

Backed out changeset 3f1e68da9634 (bug 1397128) for bustage at mozilla/dom/cache/CacheStorage.h:108. r=backout on a CLOSED TREE
parent 150c6ab2

dom/cache/CacheTypes.ipdlh

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ struct CacheReadStream 
{

  nsID id;

  nullable PCacheStreamControl control;

  OptionalIPCStream stream;

  IPCStream stream;

};



union CacheReadStreamOrVoid

dom/cache/ReadStream.cpp

+2 −2
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ ReadStream::Inner::Serialize(CacheReadStream* aReadStreamOut, 
    mControl->SerializeStream(aReadStreamOut, mStream, aStreamCleanupList);

  }



  MOZ_DIAGNOSTIC_ASSERT(aReadStreamOut->stream().get_IPCStream().type() ==

  MOZ_DIAGNOSTIC_ASSERT(aReadStreamOut->stream().type() ==

                        IPCStream::TInputStreamParamsWithFds);



  // We're passing ownership across the IPC barrier with the control, so
@@ -474,7 +474,7 @@ ReadStream::Create(const CacheReadStream& aReadStream) 
    return nullptr;

  }



  MOZ_DIAGNOSTIC_ASSERT(aReadStream.stream().get_IPCStream().type() ==

  MOZ_DIAGNOSTIC_ASSERT(aReadStream.stream().type() ==

                        IPCStream::TInputStreamParamsWithFds);



  // Control is guaranteed to survive this method as ActorDestroy() cannot