Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1047483 - patch 2 - Renaming nsDOMFileList to FileList, r=ehsan

Browse Source
This commit is contained in:
Andrea Marchesini 2014-10-08 17:15:23 +01:00
parent 7491bee8c3
commit 090b876c2a
7 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
content/base/public/nsDOMFile.h
View File

@ -61,7 +61,6 @@ class DOMFileImpl;
/* FOLLOWUP TODO:
1. remove nsDOMBlobBuilder.h
2. rename nsDOMFile.h/cpp to DOMFile.h/cpp
3. rename nsDOMFileList to DOMFileList
*/
class DOMFile MOZ_FINAL : public nsIDOMFile
, public nsIXHRSendable
@ -802,18 +801,18 @@ private:
bool mStoredFile;
};
class nsDOMFileList MOZ_FINAL : public nsIDOMFileList,
public nsWrapperCache
class FileList MOZ_FINAL : public nsIDOMFileList,
public nsWrapperCache
{
~nsDOMFileList() {}
~FileList() {}
public:
explicit nsDOMFileList(nsISupports *aParent) : mParent(aParent)
explicit FileList(nsISupports *aParent) : mParent(aParent)
{
}
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(nsDOMFileList)
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(FileList)
NS_DECL_NSIDOMFILELIST
@ -842,7 +841,7 @@ public:
void Clear() { return mFiles.Clear(); }
static nsDOMFileList* FromSupports(nsISupports* aSupports)
static FileList* FromSupports(nsISupports* aSupports)
{
#ifdef DEBUG
{
@ -856,7 +855,7 @@ public:
}
#endif
return static_cast<nsDOMFileList*>(aSupports);
return static_cast<FileList*>(aSupports);
}
DOMFile* Item(uint32_t aIndex)

16
content/base/src/nsDOMFile.cpp
View File

@ -1204,27 +1204,27 @@ DOMFileImplTemporaryFileBlob::GetInternalStream(nsIInputStream** aStream)
}
////////////////////////////////////////////////////////////////////////////
// nsDOMFileList implementation
// FileList implementation
NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(nsDOMFileList, mFiles)
NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(FileList, mFiles)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMFileList)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(FileList)
NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMFileList)
NS_INTERFACE_MAP_ENTRY(nsIDOMFileList)
NS_INTERFACE_MAP_END
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMFileList)
NS_IMPL_CYCLE_COLLECTING_RELEASE(nsDOMFileList)
NS_IMPL_CYCLE_COLLECTING_ADDREF(FileList)
NS_IMPL_CYCLE_COLLECTING_RELEASE(FileList)
JSObject*
nsDOMFileList::WrapObject(JSContext *cx)
FileList::WrapObject(JSContext *cx)
{
return mozilla::dom::FileListBinding::Wrap(cx, this);
}
NS_IMETHODIMP
nsDOMFileList::GetLength(uint32_t* aLength)
FileList::GetLength(uint32_t* aLength)
{
*aLength = Length();
@ -1232,7 +1232,7 @@ nsDOMFileList::GetLength(uint32_t* aLength)
}
NS_IMETHODIMP
nsDOMFileList::Item(uint32_t aIndex, nsIDOMFile **aFile)
FileList::Item(uint32_t aIndex, nsIDOMFile **aFile)
{
nsRefPtr<DOMFile> file = Item(aIndex);
file.forget(aFile);

8
content/html/content/src/HTMLInputElement.cpp
View File

@ -2587,7 +2587,7 @@ void
HTMLInputElement::SetFiles(nsIDOMFileList* aFiles,
bool aSetValueChanged)
{
nsRefPtr<nsDOMFileList> files = static_cast<nsDOMFileList*>(aFiles);
nsRefPtr<FileList> files = static_cast<FileList*>(aFiles);
mFiles.Clear();
if (aFiles) {
@ -2642,7 +2642,7 @@ HTMLInputElement::FireChangeEventIfNeeded()
false);
}
nsDOMFileList*
FileList*
HTMLInputElement::GetFiles()
{
if (mType != NS_FORM_INPUT_FILE) {
@ -2650,7 +2650,7 @@ HTMLInputElement::GetFiles()
}
if (!mFileList) {
mFileList = new nsDOMFileList(static_cast<nsIContent*>(this));
mFileList = new FileList(static_cast<nsIContent*>(this));
UpdateFileList();
}
@ -5377,7 +5377,7 @@ HTMLInputElement::SetSelectionEnd(int32_t aSelectionEnd)
NS_IMETHODIMP
HTMLInputElement::GetFiles(nsIDOMFileList** aFileList)
{
nsRefPtr<nsDOMFileList> list = GetFiles();
nsRefPtr<FileList> list = GetFiles();
list.forget(aFileList);
return NS_OK;
}

6
content/html/content/src/HTMLInputElement.h
View File

@ -38,7 +38,7 @@ namespace dom {
class Date;
class DirPickerFileListBuilderTask;
class DOMFile;
class nsDOMFileList;
class FileList;
class UploadLastDir MOZ_FINAL : public nsIObserver, public nsSupportsWeakReference {
@ -433,7 +433,7 @@ public:
// XPCOM GetForm() is OK
nsDOMFileList* GetFiles();
FileList* GetFiles();
void OpenDirectoryPicker(ErrorResult& aRv);
void CancelDirectoryPickerScanIfRunning();
@ -1254,7 +1254,7 @@ protected:
*/
nsTArray<nsRefPtr<DOMFile>> mFiles;
nsRefPtr<nsDOMFileList> mFileList;
nsRefPtr<FileList> mFileList;
nsRefPtr<DirPickerFileListBuilderTask> mDirPickerFileListBuilderTask;

1
dom/bindings/Bindings.conf
View File

@ -406,7 +406,6 @@ DOMInterfaces = {
},
'FileList': {
'nativeType': 'mozilla::dom::nsDOMFileList',
'headerFile': 'nsDOMFile.h',
},

4
dom/events/DataTransfer.cpp
View File

@ -269,7 +269,7 @@ DataTransfer::GetMozUserCancelled(bool* aUserCancelled)
return NS_OK;
}
nsDOMFileList*
FileList*
DataTransfer::GetFiles(ErrorResult& aRv)
{
if (mEventType != NS_DRAGDROP_DROP && mEventType != NS_DRAGDROP_DRAGDROP &&
@ -278,7 +278,7 @@ DataTransfer::GetFiles(ErrorResult& aRv)
}
if (!mFiles) {
mFiles = new nsDOMFileList(static_cast<nsIDOMDataTransfer*>(this));
mFiles = new FileList(static_cast<nsIDOMDataTransfer*>(this));
uint32_t count = mItems.Length();

4
dom/events/DataTransfer.h
View File

@ -143,7 +143,7 @@ public:
ErrorResult& aRv);
void ClearData(const mozilla::dom::Optional<nsAString>& aFormat,
mozilla::ErrorResult& aRv);
nsDOMFileList* GetFiles(mozilla::ErrorResult& aRv);
FileList* GetFiles(mozilla::ErrorResult& aRv);
void AddElement(Element& aElement, mozilla::ErrorResult& aRv);
uint32_t MozItemCount()
{
@ -278,7 +278,7 @@ protected:
nsTArray<nsTArray<TransferItem> > mItems;
// array of files, containing only the files present in the dataTransfer
nsRefPtr<nsDOMFileList> mFiles;
nsRefPtr<FileList> mFiles;
// the target of the drag. The drag and dragend events will fire at this.
nsCOMPtr<mozilla::dom::Element> mDragTarget;