mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 11:25:00 +00:00
Bug 1397128 P1 Make CacheReadStream ipdl struct contain an OptionalIPCStream. r=tt
This commit is contained in:
parent
2b3ebd2479
commit
66eb21a04b
2
dom/cache/CacheTypes.ipdlh
vendored
2
dom/cache/CacheTypes.ipdlh
vendored
@ -36,7 +36,7 @@ struct CacheReadStream
|
||||
{
|
||||
nsID id;
|
||||
nullable PCacheStreamControl control;
|
||||
IPCStream stream;
|
||||
OptionalIPCStream stream;
|
||||
};
|
||||
|
||||
union CacheReadStreamOrVoid
|
||||
|
4
dom/cache/ReadStream.cpp
vendored
4
dom/cache/ReadStream.cpp
vendored
@ -245,7 +245,7 @@ ReadStream::Inner::Serialize(CacheReadStream* aReadStreamOut,
|
||||
mControl->SerializeStream(aReadStreamOut, mStream, aStreamCleanupList);
|
||||
}
|
||||
|
||||
MOZ_DIAGNOSTIC_ASSERT(aReadStreamOut->stream().type() ==
|
||||
MOZ_DIAGNOSTIC_ASSERT(aReadStreamOut->stream().get_IPCStream().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().type() ==
|
||||
MOZ_DIAGNOSTIC_ASSERT(aReadStream.stream().get_IPCStream().type() ==
|
||||
IPCStream::TInputStreamParamsWithFds);
|
||||
|
||||
// Control is guaranteed to survive this method as ActorDestroy() cannot
|
||||
|
Loading…
Reference in New Issue
Block a user