wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1186750 part 9 - Use already_AddRefed&& to initialize mFile of device storage requests. r=dhylands

Browse Source
This commit is contained in:
Xidorn Quan 2015-11-20 18:47:49 +11:00
parent 306516d167
commit 5908b57d86
2 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
dom/devicestorage/nsDeviceStorage.cpp
View File

@ -1534,7 +1534,7 @@ DeviceStorageRequest::~DeviceStorageRequest()
void
DeviceStorageRequest::Initialize(DeviceStorageRequestManager* aManager,
DeviceStorageFile* aFile,
already_AddRefed<DeviceStorageFile>&& aFile,
uint32_t aId)
{
DS_LOG_DEBUG("%p manages %p", aManager, this);
@ -1548,11 +1548,11 @@ DeviceStorageRequest::Initialize(DeviceStorageRequestManager* aManager,
void
DeviceStorageRequest::Initialize(DeviceStorageRequestManager* aManager,
DeviceStorageFile* aFile,
already_AddRefed<DeviceStorageFile>&& aFile,
uint32_t aRequest,
BlobImpl* aBlob)
{
Initialize(aManager, aFile, aRequest);
Initialize(aManager, Move(aFile), aRequest);
mBlob = aBlob;
mCheckBlob = true;
mCheckFile = true;
@ -1561,11 +1561,11 @@ DeviceStorageRequest::Initialize(DeviceStorageRequestManager* aManager,
void
DeviceStorageRequest::Initialize(DeviceStorageRequestManager* aManager,
DeviceStorageFile* aFile,
already_AddRefed<DeviceStorageFile>&& aFile,
uint32_t aRequest,
DeviceStorageFileDescriptor* aDSFileDescriptor)
{
Initialize(aManager, aFile, aRequest);
Initialize(aManager, Move(aFile), aRequest);
mDSFileDescriptor = aDSFileDescriptor;
MOZ_ASSERT(mDSFileDescriptor);
}
@ -1736,11 +1736,11 @@ DeviceStorageCursorRequest::DeviceStorageCursorRequest()
void
DeviceStorageCursorRequest::Initialize(DeviceStorageRequestManager* aManager,
DeviceStorageFile* aFile,
already_AddRefed<DeviceStorageFile>&& aFile,
uint32_t aRequest,
PRTime aSince)
{
Initialize(aManager, aFile, aRequest);
Initialize(aManager, Move(aFile), aRequest);
mStorageType = mFile->mStorageType;
mSince = aSince;
}
@ -1943,11 +1943,11 @@ public:
}
void Initialize(DeviceStorageRequestManager* aManager,
DeviceStorageFile* aFile,
already_AddRefed<DeviceStorageFile>&& aFile,
uint32_t aRequest) override
{
DeviceStorageRequest::Initialize(aManager, aFile, aRequest);
mUseMainThread = aFile->mPath.IsEmpty();
DeviceStorageRequest::Initialize(aManager, Move(aFile), aRequest);
mUseMainThread = mFile->mPath.IsEmpty();
}
protected:
@ -2087,10 +2087,10 @@ public:
}
void Initialize(DeviceStorageRequestManager* aManager,
DeviceStorageFile* aFile,
already_AddRefed<DeviceStorageFile>&& aFile,
uint32_t aRequest) override
{
DeviceStorageRequest::Initialize(aManager, aFile, aRequest);
DeviceStorageRequest::Initialize(aManager, Move(aFile), aRequest);
mAccess = mFile->mEditable ? DEVICE_STORAGE_ACCESS_WRITE
: DEVICE_STORAGE_ACCESS_READ;
}
@ -3112,7 +3112,7 @@ nsDOMDeviceStorage::AddOrAppendNamed(Blob* aBlob, const nsAString& aPath,
} else {
request = new DeviceStorageAppendRequest();
}
request->Initialize(mManager, dsf, id, aBlob->Impl());
request->Initialize(mManager, dsf.forget(), id, aBlob->Impl());
aRv = CheckPermission(request.forget());
return domRequest.forget();
}
@ -3147,7 +3147,7 @@ nsDOMDeviceStorage::GetInternal(const nsAString& aPath, bool aEditable,
}
RefPtr<DeviceStorageRequest> request = new DeviceStorageOpenRequest();
request->Initialize(mManager, dsf, id);
request->Initialize(mManager, dsf.forget(), id);
aRv = CheckPermission(request.forget());
return domRequest.forget();
@ -3181,7 +3181,7 @@ nsDOMDeviceStorage::Delete(const nsAString& aPath, ErrorResult& aRv)
}
RefPtr<DeviceStorageRequest> request = new DeviceStorageDeleteRequest();
request->Initialize(mManager, dsf, id);
request->Initialize(mManager, dsf.forget(), id);
aRv = CheckPermission(request.forget());
return domRequest.forget();
@ -3202,7 +3202,7 @@ nsDOMDeviceStorage::FreeSpace(ErrorResult& aRv)
}
RefPtr<DeviceStorageRequest> request = new DeviceStorageFreeSpaceRequest();
request->Initialize(mManager, dsf, id);
request->Initialize(mManager, dsf.forget(), id);
aRv = CheckPermission(request.forget());
return domRequest.forget();
@ -3227,7 +3227,7 @@ nsDOMDeviceStorage::UsedSpace(ErrorResult& aRv)
}
RefPtr<DeviceStorageRequest> request = new DeviceStorageUsedSpaceRequest();
request->Initialize(mManager, dsf, id);
request->Initialize(mManager, dsf.forget(), id);
aRv = CheckPermission(request.forget());
return domRequest.forget();
@ -3248,7 +3248,7 @@ nsDOMDeviceStorage::Available(ErrorResult& aRv)
}
RefPtr<DeviceStorageRequest> request = new DeviceStorageAvailableRequest();
request->Initialize(mManager, dsf, id);
request->Initialize(mManager, dsf.forget(), id);
aRv = CheckPermission(request.forget());
return domRequest.forget();
@ -3269,7 +3269,7 @@ nsDOMDeviceStorage::StorageStatus(ErrorResult& aRv)
}
RefPtr<DeviceStorageRequest> request = new DeviceStorageStatusRequest();
request->Initialize(mManager, dsf, id);
request->Initialize(mManager, dsf.forget(), id);
aRv = CheckPermission(request.forget());
return domRequest.forget();
@ -3290,7 +3290,7 @@ nsDOMDeviceStorage::Format(ErrorResult& aRv)
}
RefPtr<DeviceStorageRequest> request = new DeviceStorageFormatRequest();
request->Initialize(mManager, dsf, id);
request->Initialize(mManager, dsf.forget(), id);
aRv = CheckPermission(request.forget());
return domRequest.forget();
@ -3311,7 +3311,7 @@ nsDOMDeviceStorage::Mount(ErrorResult& aRv)
}
RefPtr<DeviceStorageRequest> request = new DeviceStorageMountRequest();
request->Initialize(mManager, dsf, id);
request->Initialize(mManager, dsf.forget(), id);
aRv = CheckPermission(request.forget());
return domRequest.forget();
@ -3333,7 +3333,7 @@ nsDOMDeviceStorage::Unmount(ErrorResult& aRv)
RefPtr<DeviceStorageRequest> request = new DeviceStorageUnmountRequest();
request->Initialize(mManager, dsf, id);
request->Initialize(mManager, dsf.forget(), id);
aRv = CheckPermission(request.forget());
return domRequest.forget();
@ -3381,7 +3381,7 @@ nsDOMDeviceStorage::CreateFileDescriptor(const nsAString& aPath,
}
RefPtr<DeviceStorageRequest> request = new DeviceStorageCreateFdRequest();
request->Initialize(mManager, dsf, id, aDSFileDescriptor);
request->Initialize(mManager, dsf.forget(), id, aDSFileDescriptor);
aRv = CheckPermission(request.forget());
return domRequest.forget();
@ -3488,7 +3488,7 @@ nsDOMDeviceStorage::EnumerateInternal(const nsAString& aPath,
if (!dsf->IsSafePath()) {
aRv = mManager->Reject(id, POST_ERROR_EVENT_PERMISSION_DENIED);
} else {
request->Initialize(mManager, dsf, id, since);
request->Initialize(mManager, dsf.forget(), id, since);
aRv = CheckPermission(request.forget());
}
@ -3691,7 +3691,7 @@ nsDOMDeviceStorage::EventListenerWasAdded(const nsAString& aType,
RefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType,
mStorageName);
RefPtr<DeviceStorageRequest> request = new DeviceStorageWatchRequest();
request->Initialize(mManager, dsf, id);
request->Initialize(mManager, dsf.forget(), id);
aRv = CheckPermission(request.forget());
}

8
dom/devicestorage/nsDeviceStorage.h
View File

@ -312,16 +312,16 @@ protected:
public:
virtual void Initialize(DeviceStorageRequestManager* aManager,
DeviceStorageFile* aFile,
already_AddRefed<DeviceStorageFile>&& aFile,
uint32_t aRequest);
virtual void Initialize(DeviceStorageRequestManager* aManager,
DeviceStorageFile* aFile,
already_AddRefed<DeviceStorageFile>&& aFile,
uint32_t aRequest,
mozilla::dom::BlobImpl* aBlob);
virtual void Initialize(DeviceStorageRequestManager* aManager,
DeviceStorageFile* aFile,
already_AddRefed<DeviceStorageFile>&& aFile,
uint32_t aRequest,
DeviceStorageFileDescriptor* aDSFileDescriptor);
@ -412,7 +412,7 @@ public:
using DeviceStorageRequest::Initialize;
virtual void Initialize(DeviceStorageRequestManager* aManager,
DeviceStorageFile* aFile,
already_AddRefed<DeviceStorageFile>&& aFile,
uint32_t aRequest,
PRTime aSince);