corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1404845 - Renaming BlobImpl::GetInternalStream to BlobImpl::CreateInputStream, r=smaug

Browse Source
This commit is contained in:
Andrea Marchesini
2017-10-02 13:53:12 +02:00
parent 21a3e165e0
commit 74bc0e9cfd
35 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dom/base/WebSocket.cpp
View File

@@ -2459,7 +2459,7 @@ WebSocket::Send(Blob& aData, ErrorResult& aRv)
AssertIsOnTargetThread();
nsCOMPtr<nsIInputStream> msgStream;
aData.GetInternalStream(getter_AddRefs(msgStream), aRv);
aData.CreateInputStream(getter_AddRefs(msgStream), aRv);
if (NS_WARN_IF(aRv.Failed())){
return;
}

2
dom/base/nsDOMDataChannel.cpp
View File

@@ -274,7 +274,7 @@ nsDOMDataChannel::Send(Blob& aData, ErrorResult& aRv)
MOZ_ASSERT(NS_IsMainThread(), "Not running on main thread");
nsCOMPtr<nsIInputStream> msgStream;
aData.GetInternalStream(getter_AddRefs(msgStream), aRv);
aData.CreateInputStream(getter_AddRefs(msgStream), aRv);
if (NS_WARN_IF(aRv.Failed())){
return;
}

2
dom/canvas/ImageBitmap.cpp
View File

@@ -1082,7 +1082,7 @@ DecodeBlob(Blob& aBlob)
// Get the internal stream of the blob.
nsCOMPtr<nsIInputStream> stream;
ErrorResult error;
aBlob.Impl()->GetInternalStream(getter_AddRefs(stream), error);
aBlob.Impl()->CreateInputStream(getter_AddRefs(stream), error);
if (NS_WARN_IF(error.Failed())) {
error.SuppressException();
return nullptr;

2
dom/file/BaseBlobImpl.cpp
View File

@@ -91,7 +91,7 @@ BaseBlobImpl::GetSendInfo(nsIInputStream** aBody, uint64_t* aContentLength,
ErrorResult rv;
nsCOMPtr<nsIInputStream> stream;
GetInternalStream(getter_AddRefs(stream), rv);
CreateInputStream(getter_AddRefs(stream), rv);
if (NS_WARN_IF(rv.Failed())) {
return rv.StealNSResult();
}

2
dom/file/BaseBlobImpl.h
View File

@@ -117,7 +117,7 @@ public:
return nullptr;
}
virtual void GetInternalStream(nsIInputStream** aStream,
virtual void CreateInputStream(nsIInputStream** aStream,
ErrorResult& aRv) override
{
aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);

4
dom/file/Blob.cpp
View File

@@ -287,9 +287,9 @@ Blob::IsMemoryFile() const
}
void
Blob::GetInternalStream(nsIInputStream** aStream, ErrorResult& aRv)
Blob::CreateInputStream(nsIInputStream** aStream, ErrorResult& aRv)
{
mImpl->GetInternalStream(aStream, aRv);
mImpl->CreateInputStream(aStream, aRv);
}
size_t

2
dom/file/Blob.h
View File

@@ -88,7 +88,7 @@ public:
ErrorResult& aRv);
void
GetInternalStream(nsIInputStream** aStream, ErrorResult& aRv);
CreateInputStream(nsIInputStream** aStream, ErrorResult& aRv);
int64_t
GetFileId();

2
dom/file/BlobImpl.h
View File

@@ -72,7 +72,7 @@ public:
virtual const nsTArray<RefPtr<BlobImpl>>*
GetSubBlobImpls() const = 0;
virtual void GetInternalStream(nsIInputStream** aStream,
virtual void CreateInputStream(nsIInputStream** aStream,
ErrorResult& aRv) = 0;
virtual int64_t GetFileId() = 0;

2
dom/file/EmptyBlobImpl.cpp
View File

@@ -28,7 +28,7 @@ EmptyBlobImpl::CreateSlice(uint64_t aStart, uint64_t aLength,
}
void
EmptyBlobImpl::GetInternalStream(nsIInputStream** aStream,
EmptyBlobImpl::CreateInputStream(nsIInputStream** aStream,
ErrorResult& aRv)
{
if (NS_WARN_IF(!aStream)) {

2
dom/file/EmptyBlobImpl.h
View File

@@ -31,7 +31,7 @@ public:
mImmutable = true;
}
virtual void GetInternalStream(nsIInputStream** aStream,
virtual void CreateInputStream(nsIInputStream** aStream,
ErrorResult& aRv) override;
virtual already_AddRefed<BlobImpl>

2
dom/file/FileBlobImpl.cpp
View File

@@ -239,7 +239,7 @@ const uint32_t sFileStreamFlags =
nsIFileInputStream::SHARE_DELETE;
void
FileBlobImpl::GetInternalStream(nsIInputStream** aStream, ErrorResult& aRv)
FileBlobImpl::CreateInputStream(nsIInputStream** aStream, ErrorResult& aRv)
{
nsCOMPtr<nsIInputStream> stream;
aRv = NS_NewLocalFileInputStream(getter_AddRefs(stream), mFile, -1, -1,

2
dom/file/FileBlobImpl.h
View File

@@ -41,7 +41,7 @@ public:
virtual void SetLastModified(int64_t aLastModified) override;
virtual void GetMozFullPathInternal(nsAString& aFullPath,
ErrorResult& aRv) const override;
virtual void GetInternalStream(nsIInputStream** aInputStream,
virtual void CreateInputStream(nsIInputStream** aInputStream,
ErrorResult& aRv) override;
virtual bool IsDirectory() const override;

2
dom/file/FileReader.cpp
View File

@@ -378,7 +378,7 @@ FileReader::ReadFileContent(Blob& aBlob,
CopyUTF16toUTF8(aCharset, mCharset);
nsCOMPtr<nsIInputStream> stream;
mBlob->GetInternalStream(getter_AddRefs(stream), aRv);
mBlob->CreateInputStream(getter_AddRefs(stream), aRv);
if (NS_WARN_IF(aRv.Failed())) {
return;
}

2
dom/file/MemoryBlobImpl.cpp
View File

@@ -60,7 +60,7 @@ MemoryBlobImpl::CreateSlice(uint64_t aStart, uint64_t aLength,
}
void
MemoryBlobImpl::GetInternalStream(nsIInputStream** aStream, ErrorResult& aRv)
MemoryBlobImpl::CreateInputStream(nsIInputStream** aStream, ErrorResult& aRv)
{
if (mLength > INT32_MAX) {
aRv.Throw(NS_ERROR_FAILURE);

2
dom/file/MemoryBlobImpl.h
View File

@@ -41,7 +41,7 @@ public:
MOZ_ASSERT(mDataOwner && mDataOwner->mData, "must have data");
}
virtual void GetInternalStream(nsIInputStream** aStream,
virtual void CreateInputStream(nsIInputStream** aStream,
ErrorResult& aRv) override;
virtual already_AddRefed<BlobImpl>

4
dom/file/MultipartBlobImpl.cpp
View File

@@ -57,7 +57,7 @@ MultipartBlobImpl::Create(nsTArray<RefPtr<BlobImpl>>&& aBlobImpls,
}
void
MultipartBlobImpl::GetInternalStream(nsIInputStream** aStream,
MultipartBlobImpl::CreateInputStream(nsIInputStream** aStream,
ErrorResult& aRv)
{
*aStream = nullptr;
@@ -74,7 +74,7 @@ MultipartBlobImpl::GetInternalStream(nsIInputStream** aStream,
nsCOMPtr<nsIInputStream> scratchStream;
BlobImpl* blobImpl = mBlobImpls.ElementAt(i).get();
blobImpl->GetInternalStream(getter_AddRefs(scratchStream), aRv);
blobImpl->CreateInputStream(getter_AddRefs(scratchStream), aRv);
if (NS_WARN_IF(aRv.Failed())) {
return;
}

2
dom/file/MultipartBlobImpl.h
View File

@@ -71,7 +71,7 @@ public:
return mLength;
}
virtual void GetInternalStream(nsIInputStream** aInputStream,
virtual void CreateInputStream(nsIInputStream** aInputStream,
ErrorResult& aRv) override;
virtual const nsTArray<RefPtr<BlobImpl>>* GetSubBlobImpls() const override

2
dom/file/StreamBlobImpl.cpp
View File

@@ -79,7 +79,7 @@ StreamBlobImpl::~StreamBlobImpl()
}
void
StreamBlobImpl::GetInternalStream(nsIInputStream** aStream, ErrorResult& aRv)
StreamBlobImpl::CreateInputStream(nsIInputStream** aStream, ErrorResult& aRv)
{
nsCOMPtr<nsIInputStream> clonedStream;
nsCOMPtr<nsIInputStream> replacementStream;

2
dom/file/StreamBlobImpl.h
View File

@@ -34,7 +34,7 @@ public:
int64_t aLastModifiedDate,
uint64_t aLength);
virtual void GetInternalStream(nsIInputStream** aStream,
virtual void CreateInputStream(nsIInputStream** aStream,
ErrorResult& aRv) override;
virtual already_AddRefed<BlobImpl>

2
dom/file/StringBlobImpl.cpp
View File

@@ -44,7 +44,7 @@ StringBlobImpl::CreateSlice(uint64_t aStart, uint64_t aLength,
}
void
StringBlobImpl::GetInternalStream(nsIInputStream** aStream, ErrorResult& aRv)
StringBlobImpl::CreateInputStream(nsIInputStream** aStream, ErrorResult& aRv)
{
aRv = NS_NewCStringInputStream(aStream, mData);
}

2
dom/file/StringBlobImpl.h
View File

@@ -25,7 +25,7 @@ public:
static already_AddRefed<StringBlobImpl>
Create(const nsACString& aData, const nsAString& aContentType);
virtual void GetInternalStream(nsIInputStream** aStream,
virtual void CreateInputStream(nsIInputStream** aStream,
ErrorResult& aRv) override;
virtual already_AddRefed<BlobImpl>

2
dom/file/TemporaryBlobImpl.cpp
View File

@@ -45,7 +45,7 @@ TemporaryBlobImpl::CreateSlice(uint64_t aStart, uint64_t aLength,
}
void
TemporaryBlobImpl::GetInternalStream(nsIInputStream** aStream,
TemporaryBlobImpl::CreateInputStream(nsIInputStream** aStream,
ErrorResult& aRv)
{
nsCOMPtr<nsIInputStream> stream =

2
dom/file/TemporaryBlobImpl.h
View File

@@ -21,7 +21,7 @@ public:
TemporaryBlobImpl(PRFileDesc* aFD, uint64_t aStartPos,
uint64_t aLength, const nsAString& aContentType);
virtual void GetInternalStream(nsIInputStream** aStream,
virtual void CreateInputStream(nsIInputStream** aStream,
ErrorResult& aRv) override;
virtual already_AddRefed<BlobImpl>

2
dom/file/ipc/IPCBlobUtils.cpp
View File

@@ -221,7 +221,7 @@ SerializeInternal(BlobImpl* aBlobImpl, M* aManager, IPCBlob& aIPCBlob)
aIPCBlob.fileId() = aBlobImpl->GetFileId();
nsCOMPtr<nsIInputStream> inputStream;
aBlobImpl->GetInternalStream(getter_AddRefs(inputStream), rv);
aBlobImpl->CreateInputStream(getter_AddRefs(inputStream), rv);
if (NS_WARN_IF(rv.Failed())) {
return rv.StealNSResult();
}

2
dom/file/ipc/IPCBlobUtils.h
View File

@@ -37,7 +37,7 @@
* - a generic nsIInputStream: StreamBlobImpl
* - an empty blob: EmptyBlobImpl
* - more blobs combined together: MultipartBlobImpl
* Each one of these implementations has a custom ::GetInternalStream method.
* Each one of these implementations has a custom ::CreateInputStream method.
* So, basically, each one has a different kind of nsIInputStream (nsFileStream,
* nsIStringInputStream, SlicedInputStream, and so on).
*

4
dom/file/nsHostObjectProtocolHandler.cpp
View File

@@ -845,7 +845,7 @@ nsHostObjectProtocolHandler::NewChannel2(nsIURI* uri,
ErrorResult rv;
nsCOMPtr<nsIInputStream> stream;
blobImpl->GetInternalStream(getter_AddRefs(stream), rv);
blobImpl->CreateInputStream(getter_AddRefs(stream), rv);
if (NS_WARN_IF(rv.Failed())) {
return rv.StealNSResult();
}
@@ -961,7 +961,7 @@ NS_GetStreamForBlobURI(nsIURI* aURI, nsIInputStream** aStream)
return rv.StealNSResult();
}
blobImpl->GetInternalStream(aStream, rv);
blobImpl->CreateInputStream(aStream, rv);
if (NS_WARN_IF(rv.Failed())) {
return rv.StealNSResult();
}

2
dom/filehandle/ActorsParent.cpp
View File

@@ -2538,7 +2538,7 @@ WriteOp::Init(FileHandle* aFileHandle)
}
IgnoredErrorResult rv;
blobImpl->GetInternalStream(getter_AddRefs(inputStream), rv);
blobImpl->CreateInputStream(getter_AddRefs(inputStream), rv);
if (NS_WARN_IF(rv.Failed())) {
return false;
}

2
dom/html/HTMLFormSubmission.cpp
View File

@@ -513,7 +513,7 @@ FSMultipartFormData::AddNameBlobOrNullPair(const nsAString& aName, Blob* aBlob)
nsLinebreakConverter::eLinebreakSpace));
// Get input stream
aBlob->GetInternalStream(getter_AddRefs(fileStream), error);
aBlob->CreateInputStream(getter_AddRefs(fileStream), error);
if (NS_WARN_IF(error.Failed())) {
return error.StealNSResult();
}

4
dom/indexedDB/ActorsChild.cpp
View File

@@ -3382,14 +3382,14 @@ PreprocessHelper::Init(const nsTArray<StructuredCloneFile>& aFiles)
ErrorResult errorResult;
nsCOMPtr<nsIInputStream> bytecodeStream;
bytecodeFile.mBlob->GetInternalStream(getter_AddRefs(bytecodeStream),
bytecodeFile.mBlob->CreateInputStream(getter_AddRefs(bytecodeStream),
errorResult);
if (NS_WARN_IF(errorResult.Failed())) {
return errorResult.StealNSResult();
}
nsCOMPtr<nsIInputStream> compiledStream;
compiledFile.mBlob->GetInternalStream(getter_AddRefs(compiledStream),
compiledFile.mBlob->CreateInputStream(getter_AddRefs(compiledStream),
errorResult);
if (NS_WARN_IF(errorResult.Failed())) {
return errorResult.StealNSResult();

2
dom/indexedDB/ActorsParent.cpp
View File

@@ -6826,7 +6826,7 @@ DatabaseFile::GetInputStream(ErrorResult &rv) const
}
nsCOMPtr<nsIInputStream> inputStream;
mBlobImpl->GetInternalStream(getter_AddRefs(inputStream), rv);
mBlobImpl->CreateInputStream(getter_AddRefs(inputStream), rv);
if (rv.Failed()) {
return nullptr;
}

4
dom/indexedDB/FileSnapshot.cpp
View File

@@ -205,7 +205,7 @@ BlobImplSnapshot::CreateSlice(uint64_t aStart,
}
void
BlobImplSnapshot::GetInternalStream(nsIInputStream** aStream, ErrorResult& aRv)
BlobImplSnapshot::CreateInputStream(nsIInputStream** aStream, ErrorResult& aRv)
{
nsCOMPtr<EventTarget> et = do_QueryReferent(mFileHandle);
RefPtr<IDBFileHandle> fileHandle = static_cast<IDBFileHandle*>(et.get());
@@ -215,7 +215,7 @@ BlobImplSnapshot::GetInternalStream(nsIInputStream** aStream, ErrorResult& aRv)
}
nsCOMPtr<nsIInputStream> stream;
mBlobImpl->GetInternalStream(getter_AddRefs(stream), aRv);
mBlobImpl->CreateInputStream(getter_AddRefs(stream), aRv);
if (NS_WARN_IF(aRv.Failed())) {
return;
}

2
dom/indexedDB/FileSnapshot.h
View File

@@ -133,7 +133,7 @@ private:
}
virtual void
GetInternalStream(nsIInputStream** aStream,
CreateInputStream(nsIInputStream** aStream,
ErrorResult& aRv) override;
virtual int64_t

2
dom/media/MediaResource.cpp
View File

@@ -104,7 +104,7 @@ BaseMediaResource::Create(MediaResourceCallback* aCallback,
IgnoredErrorResult rv;
nsCOMPtr<nsIInputStream> stream;
blobImpl->GetInternalStream(getter_AddRefs(stream), rv);
blobImpl->CreateInputStream(getter_AddRefs(stream), rv);
if (NS_WARN_IF(rv.Failed())) {
return nullptr;
}

2
dom/network/UDPSocket.cpp
View File

@@ -343,7 +343,7 @@ UDPSocket::Send(const StringOrBlobOrArrayBufferOrArrayBufferView& aData,
if (aData.IsBlob()) {
Blob& blob = aData.GetAsBlob();
blob.GetInternalStream(getter_AddRefs(stream), aRv);
blob.CreateInputStream(getter_AddRefs(stream), aRv);
if (NS_WARN_IF(aRv.Failed())) {
return false;
}

8
dom/workers/FileReaderSync.cpp
View File

@@ -72,7 +72,7 @@ FileReaderSync::ReadAsArrayBuffer(JSContext* aCx,
}
nsCOMPtr<nsIInputStream> stream;
aBlob.GetInternalStream(getter_AddRefs(stream), aRv);
aBlob.CreateInputStream(getter_AddRefs(stream), aRv);
if (NS_WARN_IF(aRv.Failed())) {
return;
}
@@ -107,7 +107,7 @@ FileReaderSync::ReadAsBinaryString(Blob& aBlob,
ErrorResult& aRv)
{
nsCOMPtr<nsIInputStream> stream;
aBlob.GetInternalStream(getter_AddRefs(stream), aRv);
aBlob.CreateInputStream(getter_AddRefs(stream), aRv);
if (NS_WARN_IF(aRv.Failed())) {
return;
}
@@ -136,7 +136,7 @@ FileReaderSync::ReadAsText(Blob& aBlob,
ErrorResult& aRv)
{
nsCOMPtr<nsIInputStream> stream;
aBlob.GetInternalStream(getter_AddRefs(stream), aRv);
aBlob.CreateInputStream(getter_AddRefs(stream), aRv);
if (NS_WARN_IF(aRv.Failed())) {
return;
}
@@ -258,7 +258,7 @@ FileReaderSync::ReadAsDataURL(Blob& aBlob, nsAString& aResult,
scratchResult.AppendLiteral(";base64,");
nsCOMPtr<nsIInputStream> stream;
aBlob.GetInternalStream(getter_AddRefs(stream), aRv);
aBlob.CreateInputStream(getter_AddRefs(stream), aRv);
if (NS_WARN_IF(aRv.Failed())){
return;
}