зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset ed4fe05c868d (bug 125813) for Android test_basic.html failures.
This commit is contained in:
Родитель
bfae7eddf8
Коммит
04e76674fe
|
@ -62,17 +62,6 @@ DeviceStorageFileSystem::~DeviceStorageFileSystem()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
already_AddRefed<FileSystemBase>
|
|
||||||
DeviceStorageFileSystem::Clone()
|
|
||||||
{
|
|
||||||
RefPtr<DeviceStorageFileSystem> fs =
|
|
||||||
new DeviceStorageFileSystem(mStorageType, mStorageName);
|
|
||||||
|
|
||||||
fs->mWindowId = mWindowId;
|
|
||||||
|
|
||||||
return fs.forget();
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
DeviceStorageFileSystem::Init(nsDOMDeviceStorage* aDeviceStorage)
|
DeviceStorageFileSystem::Init(nsDOMDeviceStorage* aDeviceStorage)
|
||||||
{
|
{
|
||||||
|
|
|
@ -27,9 +27,6 @@ public:
|
||||||
|
|
||||||
// Overrides FileSystemBase
|
// Overrides FileSystemBase
|
||||||
|
|
||||||
virtual already_AddRefed<FileSystemBase>
|
|
||||||
Clone() override;
|
|
||||||
|
|
||||||
virtual void
|
virtual void
|
||||||
Shutdown() override;
|
Shutdown() override;
|
||||||
|
|
||||||
|
|
|
@ -158,6 +158,7 @@ Directory::Directory(nsISupports* aParent,
|
||||||
DirectoryType aType,
|
DirectoryType aType,
|
||||||
FileSystemBase* aFileSystem)
|
FileSystemBase* aFileSystem)
|
||||||
: mParent(aParent)
|
: mParent(aParent)
|
||||||
|
, mFileSystem(aFileSystem)
|
||||||
, mFile(aFile)
|
, mFile(aFile)
|
||||||
, mType(aType)
|
, mType(aType)
|
||||||
{
|
{
|
||||||
|
@ -165,13 +166,6 @@ Directory::Directory(nsISupports* aParent,
|
||||||
MOZ_ASSERT(aFile);
|
MOZ_ASSERT(aFile);
|
||||||
|
|
||||||
// aFileSystem can be null. In this case we create a OSFileSystem when needed.
|
// aFileSystem can be null. In this case we create a OSFileSystem when needed.
|
||||||
if (aFileSystem) {
|
|
||||||
// More likely, this is a OSFileSystem. This object keeps a reference of
|
|
||||||
// mParent but it's not cycle collectable and to avoid manual
|
|
||||||
// addref/release, it's better to have 1 object per directory. For this
|
|
||||||
// reason we clone it here.
|
|
||||||
mFileSystem = aFileSystem->Clone();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Directory::~Directory()
|
Directory::~Directory()
|
||||||
|
|
|
@ -34,9 +34,6 @@ public:
|
||||||
virtual void
|
virtual void
|
||||||
SerializeDOMPath(nsAString& aOutput) const = 0;
|
SerializeDOMPath(nsAString& aOutput) const = 0;
|
||||||
|
|
||||||
virtual already_AddRefed<FileSystemBase>
|
|
||||||
Clone() = 0;
|
|
||||||
|
|
||||||
virtual nsISupports*
|
virtual nsISupports*
|
||||||
GetParentObject() const;
|
GetParentObject() const;
|
||||||
|
|
||||||
|
|
|
@ -30,17 +30,6 @@ OSFileSystem::OSFileSystem(const nsAString& aRootDir)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
already_AddRefed<FileSystemBase>
|
|
||||||
OSFileSystem::Clone()
|
|
||||||
{
|
|
||||||
RefPtr<OSFileSystem> fs = new OSFileSystem(mLocalRootPath);
|
|
||||||
if (mParent) {
|
|
||||||
fs->Init(mParent);
|
|
||||||
}
|
|
||||||
|
|
||||||
return fs.forget();
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
OSFileSystem::Init(nsISupports* aParent)
|
OSFileSystem::Init(nsISupports* aParent)
|
||||||
{
|
{
|
||||||
|
|
|
@ -22,9 +22,6 @@ public:
|
||||||
|
|
||||||
// Overrides FileSystemBase
|
// Overrides FileSystemBase
|
||||||
|
|
||||||
virtual already_AddRefed<FileSystemBase>
|
|
||||||
Clone() override;
|
|
||||||
|
|
||||||
virtual nsISupports*
|
virtual nsISupports*
|
||||||
GetParentObject() const override;
|
GetParentObject() const override;
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,18 @@
|
||||||
var { classes: Cc, interfaces: Ci, utils: Cu } = Components;
|
var { classes: Cc, interfaces: Ci, utils: Cu } = Components;
|
||||||
Cu.importGlobalProperties(["File"]);
|
Cu.importGlobalProperties(["File"]);
|
||||||
|
|
||||||
|
addMessageListener("file.open", function () {
|
||||||
|
var testFile = Cc["@mozilla.org/file/directory_service;1"]
|
||||||
|
.getService(Ci.nsIDirectoryService)
|
||||||
|
.QueryInterface(Ci.nsIProperties)
|
||||||
|
.get("ProfD", Ci.nsIFile);
|
||||||
|
testFile.append("prefs.js");
|
||||||
|
|
||||||
|
sendAsyncMessage("file.opened", {
|
||||||
|
file: new File(testFile)
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
addMessageListener("dir.open", function () {
|
addMessageListener("dir.open", function () {
|
||||||
var testFile = Cc["@mozilla.org/file/directory_service;1"]
|
var testFile = Cc["@mozilla.org/file/directory_service;1"]
|
||||||
.getService(Ci.nsIDirectoryService)
|
.getService(Ci.nsIDirectoryService)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче