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

Bug 1163387 - Rename FileImpl to BlobImpl, r=ehsan

Browse Source
This commit is contained in:
Andrea Marchesini
2015-05-12 13:11:03 +01:00
parent a8f15ce969
commit 41c29ad762
78 changed files with 647 additions and 640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
dom/html/HTMLInputElement.cpp
View File

@@ -218,35 +218,42 @@ class HTMLInputElementState final : public nsISupports
NS_DECLARE_STATIC_IID_ACCESSOR(NS_INPUT_ELEMENT_STATE_IID)
NS_DECL_ISUPPORTS
bool IsCheckedSet() {
bool IsCheckedSet()
{
return mCheckedSet;
}
bool GetChecked() {
bool GetChecked()
{
return mChecked;
}
void SetChecked(bool aChecked) {
void SetChecked(bool aChecked)
{
mChecked = aChecked;
mCheckedSet = true;
}
const nsString& GetValue() {
const nsString& GetValue()
{
return mValue;
}
void SetValue(const nsAString& aValue) {
void SetValue(const nsAString& aValue)
{
mValue = aValue;
}
const nsTArray<nsRefPtr<FileImpl>>& GetFileImpls() {
return mFileImpls;
const nsTArray<nsRefPtr<BlobImpl>>& GetBlobImpls()
{
return mBlobImpls;
}
void SetFileImpls(const nsTArray<nsRefPtr<File>>& aFile) {
mFileImpls.Clear();
void SetBlobImpls(const nsTArray<nsRefPtr<File>>& aFile)
{
mBlobImpls.Clear();
for (uint32_t i = 0, len = aFile.Length(); i < len; ++i) {
mFileImpls.AppendElement(aFile[i]->Impl());
mBlobImpls.AppendElement(aFile[i]->Impl());
}
}
@@ -254,13 +261,13 @@ class HTMLInputElementState final : public nsISupports
: mValue()
, mChecked(false)
, mCheckedSet(false)
{};
{}
protected:
~HTMLInputElementState() {}
nsString mValue;
nsTArray<nsRefPtr<FileImpl>> mFileImpls;
nsTArray<nsRefPtr<BlobImpl>> mBlobImpls;
bool mChecked;
bool mCheckedSet;
};
@@ -394,9 +401,9 @@ public:
MOZ_ASSERT(length >= 0);
if (length > 0) {
// Note that we leave the trailing "/" on the path.
FileImplFile* fileImpl = static_cast<FileImplFile*>(domFile->Impl());
MOZ_ASSERT(fileImpl);
fileImpl->SetPath(Substring(path, 0, uint32_t(length)));
BlobImplFile* blobImpl = static_cast<BlobImplFile*>(domFile->Impl());
MOZ_ASSERT(blobImpl);
blobImpl->SetPath(Substring(path, 0, uint32_t(length)));
}
*aResult = domFile.forget().downcast<nsIDOMFile>().take();
LookupAndCacheNext();
@@ -5809,7 +5816,7 @@ HTMLInputElement::SaveState()
case VALUE_MODE_FILENAME:
if (!mFiles.IsEmpty()) {
inputState = new HTMLInputElementState();
inputState->SetFileImpls(mFiles);
inputState->SetBlobImpls(mFiles);
}
break;
case VALUE_MODE_VALUE:
@@ -6015,14 +6022,14 @@ HTMLInputElement::RestoreState(nsPresState* aState)
break;
case VALUE_MODE_FILENAME:
{
const nsTArray<nsRefPtr<FileImpl>>& fileImpls = inputState->GetFileImpls();
const nsTArray<nsRefPtr<BlobImpl>>& blobImpls = inputState->GetBlobImpls();
nsCOMPtr<nsIGlobalObject> global = OwnerDoc()->GetScopeObject();
MOZ_ASSERT(global);
nsTArray<nsRefPtr<File>> files;
for (uint32_t i = 0, len = fileImpls.Length(); i < len; ++i) {
nsRefPtr<File> file = File::Create(global, fileImpls[i]);
for (uint32_t i = 0, len = blobImpls.Length(); i < len; ++i) {
nsRefPtr<File> file = File::Create(global, blobImpls[i]);
MOZ_ASSERT(file);
files.AppendElement(file);