| Index: Source/core/fileapi/File.cpp
|
| diff --git a/Source/core/fileapi/File.cpp b/Source/core/fileapi/File.cpp
|
| index 239c9c7f44533b526454c5d4a7cdaab150eaedc2..d885dd1b7481906d9be10220007fc79ef468fcde 100644
|
| --- a/Source/core/fileapi/File.cpp
|
| +++ b/Source/core/fileapi/File.cpp
|
| @@ -88,14 +88,15 @@ static PassOwnPtr<BlobData> createBlobDataForFileSystemURL(const KURL& fileSyste
|
|
|
| PassRefPtrWillBeRawPtr<File> File::createWithRelativePath(const String& path, const String& relativePath)
|
| {
|
| - RefPtrWillBeRawPtr<File> file = adoptRefWillBeNoop(new File(path, AllContentTypes));
|
| + RefPtrWillBeRawPtr<File> file = adoptRefWillBeNoop(new File(path, File::AllContentTypes, File::IsUserVisible));
|
| file->m_relativePath = relativePath;
|
| return file.release();
|
| }
|
|
|
| -File::File(const String& path, ContentTypeLookupPolicy policy)
|
| +File::File(const String& path, ContentTypeLookupPolicy policy, UserVisibility userVisibility)
|
| : Blob(BlobDataHandle::create(createBlobDataForFile(path, policy), -1))
|
| , m_hasBackingFile(true)
|
| + , m_userVisibility(userVisibility)
|
| , m_path(path)
|
| , m_name(blink::Platform::current()->fileUtilities()->baseName(path))
|
| , m_snapshotSize(-1)
|
| @@ -104,9 +105,10 @@ File::File(const String& path, ContentTypeLookupPolicy policy)
|
| ScriptWrappable::init(this);
|
| }
|
|
|
| -File::File(const String& path, const String& name, ContentTypeLookupPolicy policy)
|
| +File::File(const String& path, const String& name, ContentTypeLookupPolicy policy, UserVisibility userVisibility)
|
| : Blob(BlobDataHandle::create(createBlobDataForFileWithName(path, name, policy), -1))
|
| , m_hasBackingFile(true)
|
| + , m_userVisibility(userVisibility)
|
| , m_path(path)
|
| , m_name(name)
|
| , m_snapshotSize(-1)
|
| @@ -118,6 +120,7 @@ File::File(const String& path, const String& name, ContentTypeLookupPolicy polic
|
| File::File(const String& path, const String& name, const String& relativePath, bool hasSnaphotData, uint64_t size, double lastModified, PassRefPtr<BlobDataHandle> blobDataHandle)
|
| : Blob(blobDataHandle)
|
| , m_hasBackingFile(!path.isEmpty() || !relativePath.isEmpty())
|
| + , m_userVisibility(File::IsNotUserVisible)
|
| , m_path(path)
|
| , m_name(name)
|
| , m_snapshotSize(hasSnaphotData ? static_cast<long long>(size) : -1)
|
| @@ -130,6 +133,7 @@ File::File(const String& path, const String& name, const String& relativePath, b
|
| File::File(const String& name, double modificationTime, PassRefPtr<BlobDataHandle> blobDataHandle)
|
| : Blob(blobDataHandle)
|
| , m_hasBackingFile(false)
|
| + , m_userVisibility(File::IsNotUserVisible)
|
| , m_name(name)
|
| , m_snapshotSize(Blob::size())
|
| , m_snapshotModificationTime(modificationTime)
|
| @@ -138,8 +142,9 @@ File::File(const String& name, double modificationTime, PassRefPtr<BlobDataHandl
|
| }
|
|
|
| File::File(const String& name, const FileMetadata& metadata)
|
| - : Blob(BlobDataHandle::create(createBlobDataForFileWithMetadata(name, metadata), metadata.length))
|
| + : Blob(BlobDataHandle::create(createBlobDataForFileWithMetadata(name, metadata), metadata.length))
|
| , m_hasBackingFile(true)
|
| + , m_userVisibility(File::IsNotUserVisible)
|
| , m_path(metadata.platformPath)
|
| , m_name(name)
|
| , m_snapshotSize(metadata.length)
|
| @@ -151,6 +156,7 @@ File::File(const String& name, const FileMetadata& metadata)
|
| File::File(const KURL& fileSystemURL, const FileMetadata& metadata)
|
| : Blob(BlobDataHandle::create(createBlobDataForFileSystemURL(fileSystemURL, metadata), metadata.length))
|
| , m_hasBackingFile(true)
|
| + , m_userVisibility(File::IsNotUserVisible)
|
| , m_name(decodeURLEscapeSequences(fileSystemURL.lastPathComponent()))
|
| , m_fileSystemURL(fileSystemURL)
|
| , m_snapshotSize(metadata.length)
|
|
|