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

Bug 1144759 - Switch file picker to FileImpl (r=bent)

Browse Source
This commit is contained in:
Bill McCloskey 2015-03-18 14:21:02 -07:00
parent 91d1ea7de7
commit dafb69d1a7
2 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
dom/ipc/FilePickerParent.cpp
View File

@ -55,10 +55,10 @@ FilePickerParent::~FilePickerParent()
// the same runnable on the main thread.
// 3. The main thread sends the results over IPC.
FilePickerParent::FileSizeAndDateRunnable::FileSizeAndDateRunnable(FilePickerParent *aFPParent,
nsCOMArray<nsIDOMFile>& aDomfiles)
nsTArray<nsRefPtr<FileImpl>>& aFiles)
: mFilePickerParent(aFPParent)
{
mDomfiles.SwapElements(aDomfiles);
mFiles.SwapElements(aFiles);
}
bool
@ -82,16 +82,16 @@ FilePickerParent::FileSizeAndDateRunnable::Run()
// results.
if (NS_IsMainThread()) {
if (mFilePickerParent) {
mFilePickerParent->SendFiles(mDomfiles);
mFilePickerParent->SendFiles(mFiles);
}
return NS_OK;
}
// We're not on the main thread, so do the stat().
for (unsigned i = 0; i < mDomfiles.Length(); i++) {
uint64_t size, lastModified;
mDomfiles[i]->GetSize(&size);
mDomfiles[i]->GetMozLastModifiedDate(&lastModified);
for (unsigned i = 0; i < mFiles.Length(); i++) {
ErrorResult rv;
mFiles[i]->GetSize(rv);
mFiles[i]->GetLastModified(rv);
}
// Dispatch ourselves back on the main thread.
@ -111,14 +111,14 @@ FilePickerParent::FileSizeAndDateRunnable::Destroy()
}
void
FilePickerParent::SendFiles(const nsCOMArray<nsIDOMFile>& aDomfiles)
FilePickerParent::SendFiles(const nsTArray<nsRefPtr<FileImpl>>& aFiles)
{
nsIContentParent* parent = TabParent::GetFrom(Manager())->Manager();
InfallibleTArray<PBlobParent*> files;
for (unsigned i = 0; i < aDomfiles.Length(); i++) {
BlobParent* blob = parent->GetOrCreateActorForBlob(
static_cast<File*>(aDomfiles[i]));
for (unsigned i = 0; i < aFiles.Length(); i++) {
nsRefPtr<File> file = new File(nullptr, aFiles[i]);
BlobParent* blob = parent->GetOrCreateActorForBlob(file);
if (blob) {
files.AppendElement(blob);
}
@ -139,7 +139,7 @@ FilePickerParent::Done(int16_t aResult)
return;
}
nsCOMArray<nsIDOMFile> domfiles;
nsTArray<nsRefPtr<FileImpl>> files;
if (mMode == nsIFilePicker::modeOpenMultiple) {
nsCOMPtr<nsISimpleEnumerator> iter;
NS_ENSURE_SUCCESS_VOID(mFilePicker->GetFiles(getter_AddRefs(iter)));
@ -151,25 +151,21 @@ FilePickerParent::Done(int16_t aResult)
if (supports) {
nsCOMPtr<nsIFile> file = do_QueryInterface(supports);
// A null parent is fine because File are not used in this process
// but only in the child.
nsCOMPtr<nsIDOMFile> domfile = File::CreateFromFile(nullptr, file);
domfiles.AppendElement(domfile);
nsRefPtr<FileImpl> fileimpl = new FileImplFile(file);
files.AppendElement(fileimpl);
}
}
} else {
nsCOMPtr<nsIFile> file;
mFilePicker->GetFile(getter_AddRefs(file));
if (file) {
// A null parent is fine because File are not used in this process
// but only in the child.
nsCOMPtr<nsIDOMFile> domfile = File::CreateFromFile(nullptr, file);
domfiles.AppendElement(domfile);
nsRefPtr<FileImpl> fileimpl = new FileImplFile(file);
files.AppendElement(fileimpl);
}
}
MOZ_ASSERT(!mRunnable);
mRunnable = new FileSizeAndDateRunnable(this, domfiles);
mRunnable = new FileSizeAndDateRunnable(this, files);
if (!mRunnable->Dispatch()) {
unused << Send__delete__(this, void_t(), nsIFilePicker::returnCancel);
}

7
dom/ipc/FilePickerParent.h
View File

@ -12,6 +12,7 @@
#include "nsIFilePicker.h"
#include "nsCOMArray.h"
#include "nsThreadUtils.h"
#include "mozilla/dom/File.h"
#include "mozilla/dom/PFilePickerParent.h"
namespace mozilla {
@ -29,7 +30,7 @@ class FilePickerParent : public PFilePickerParent
virtual ~FilePickerParent();
void Done(int16_t aResult);
void SendFiles(const nsCOMArray<nsIDOMFile>& aDomfiles);
void SendFiles(const nsTArray<nsRefPtr<FileImpl>>& aDomfiles);
virtual bool RecvOpen(const int16_t& aSelectedType,
const bool& aAddToRecentDocs,
@ -64,11 +65,11 @@ class FilePickerParent : public PFilePickerParent
class FileSizeAndDateRunnable : public nsRunnable
{
FilePickerParent* mFilePickerParent;
nsCOMArray<nsIDOMFile> mDomfiles;
nsTArray<nsRefPtr<FileImpl>> mFiles;
nsCOMPtr<nsIEventTarget> mEventTarget;
public:
FileSizeAndDateRunnable(FilePickerParent *aFPParent, nsCOMArray<nsIDOMFile>& aDomfiles);
FileSizeAndDateRunnable(FilePickerParent *aFPParent, nsTArray<nsRefPtr<FileImpl>>& aFiles);
bool Dispatch();
NS_IMETHOD Run();
void Destroy();