diff --git a/dom/file/ipc/RemoteLazyInputStream.cpp b/dom/file/ipc/RemoteLazyInputStream.cpp index 936438df132f..51b33d9da2d1 100644 --- a/dom/file/ipc/RemoteLazyInputStream.cpp +++ b/dom/file/ipc/RemoteLazyInputStream.cpp @@ -932,7 +932,7 @@ void RemoteLazyInputStream::SerializedComplexity(uint32_t aMaxSize, void RemoteLazyInputStream::Serialize(mozilla::ipc::InputStreamParams& aParams, uint32_t aMaxSize, uint32_t* aSizeUsed) { *aSizeUsed = 0; - aParams = mozilla::ipc::RemoteLazyInputStreamParams(this); + aParams = mozilla::ipc::RemoteLazyInputStreamParams(WrapNotNull(this)); } bool RemoteLazyInputStream::Deserialize( diff --git a/ipc/glue/DataPipe.cpp b/ipc/glue/DataPipe.cpp index 55e38ddd67b9..650dd5d1ca2b 100644 --- a/ipc/glue/DataPipe.cpp +++ b/ipc/glue/DataPipe.cpp @@ -679,7 +679,7 @@ void DataPipeReceiver::SerializedComplexity(uint32_t aMaxSize, void DataPipeReceiver::Serialize(InputStreamParams& aParams, uint32_t aMaxSize, uint32_t* aSizeUsed) { *aSizeUsed = 0; - aParams = DataPipeReceiverStreamParams(this); + aParams = DataPipeReceiverStreamParams(WrapNotNull(this)); } bool DataPipeReceiver::Deserialize(const InputStreamParams& aParams) { diff --git a/ipc/glue/IPCStreamUtils.cpp b/ipc/glue/IPCStreamUtils.cpp index 265cb1cff8d3..b884bf5d5d0f 100644 --- a/ipc/glue/IPCStreamUtils.cpp +++ b/ipc/glue/IPCStreamUtils.cpp @@ -90,7 +90,7 @@ static bool SerializeLazyInputStream(nsIInputStream* aStream, return false; } - aValue.stream() = RemoteLazyInputStreamParams(lazyStream); + aValue.stream() = RemoteLazyInputStreamParams(WrapNotNull(lazyStream)); return true; } diff --git a/ipc/glue/InputStreamParams.ipdlh b/ipc/glue/InputStreamParams.ipdlh index 8d1f727ecab8..2491c477af06 100644 --- a/ipc/glue/InputStreamParams.ipdlh +++ b/ipc/glue/InputStreamParams.ipdlh @@ -48,12 +48,12 @@ struct SlicedInputStreamParams struct RemoteLazyInputStreamParams { - nullable RemoteLazyInputStream stream; + RemoteLazyInputStream stream; }; struct DataPipeReceiverStreamParams { - nullable DataPipeReceiver pipe; + DataPipeReceiver pipe; }; union InputStreamParams diff --git a/ipc/glue/InputStreamUtils.cpp b/ipc/glue/InputStreamUtils.cpp index 888afce859ee..039582c94aa2 100644 --- a/ipc/glue/InputStreamUtils.cpp +++ b/ipc/glue/InputStreamUtils.cpp @@ -108,7 +108,7 @@ void InputStreamHelper::SerializeInputStreamAsPipe(nsIInputStream* aInputStream, return; } - aParams = DataPipeReceiverStreamParams(receiver); + aParams = DataPipeReceiverStreamParams(WrapNotNull(receiver)); if (length != -1) { aParams = InputStreamLengthWrapperParams(aParams, length, false); } @@ -130,13 +130,13 @@ already_AddRefed InputStreamHelper::DeserializeInputStream( params.stream()->TakeInternalStream(getter_AddRefs(innerStream)))) { return innerStream.forget(); } - return do_AddRef(params.stream()); + return do_AddRef(params.stream().get()); } if (aParams.type() == InputStreamParams::TDataPipeReceiverStreamParams) { const DataPipeReceiverStreamParams& pipeParams = aParams.get_DataPipeReceiverStreamParams(); - return do_AddRef(pipeParams.pipe()); + return do_AddRef(pipeParams.pipe().get()); } nsCOMPtr serializable;