| Index: third_party/WebKit/Source/web/WebDOMFileSystem.cpp
|
| diff --git a/third_party/WebKit/Source/web/WebDOMFileSystem.cpp b/third_party/WebKit/Source/web/WebDOMFileSystem.cpp
|
| index 16e2f587398ec7129255041f430abf0c3e764950..1cbdaeb29f6ddf2f34eee25230339d0f5823c9f4 100644
|
| --- a/third_party/WebKit/Source/web/WebDOMFileSystem.cpp
|
| +++ b/third_party/WebKit/Source/web/WebDOMFileSystem.cpp
|
| @@ -31,30 +31,29 @@
|
| #include "public/web/WebDOMFileSystem.h"
|
|
|
| #include "bindings/core/v8/WrapperTypeInfo.h"
|
| -#include "bindings/modules/v8/V8DOMFileSystem.h"
|
| -#include "bindings/modules/v8/V8DirectoryEntry.h"
|
| -#include "bindings/modules/v8/V8FileEntry.h"
|
| +#include "bindings/modules/v8/V8FileSystem.h"
|
| +#include "bindings/modules/v8/V8FileSystemEntry.h"
|
| #include "core/dom/Document.h"
|
| -#include "modules/filesystem/DOMFileSystem.h"
|
| -#include "modules/filesystem/DirectoryEntry.h"
|
| -#include "modules/filesystem/FileEntry.h"
|
| +#include "modules/filesystem/FileSystem.h"
|
| +#include "modules/filesystem/FileSystemDirectoryEntry.h"
|
| +#include "modules/filesystem/FileSystemFileEntry.h"
|
| #include "web/WebLocalFrameImpl.h"
|
| #include <v8.h>
|
|
|
| namespace blink {
|
|
|
| WebDOMFileSystem WebDOMFileSystem::fromV8Value(v8::Local<v8::Value> value) {
|
| - if (!V8DOMFileSystem::hasInstance(value, v8::Isolate::GetCurrent()))
|
| + if (!V8FileSystem::hasInstance(value, v8::Isolate::GetCurrent()))
|
| return WebDOMFileSystem();
|
| v8::Local<v8::Object> object = v8::Local<v8::Object>::Cast(value);
|
| - DOMFileSystem* domFileSystem = V8DOMFileSystem::toImpl(object);
|
| - DCHECK(domFileSystem);
|
| - return WebDOMFileSystem(domFileSystem);
|
| + FileSystem* fileSystem = V8FileSystem::toImpl(object);
|
| + DCHECK(fileSystem);
|
| + return WebDOMFileSystem(fileSystem);
|
| }
|
|
|
| WebURL WebDOMFileSystem::createFileSystemURL(v8::Local<v8::Value> value) {
|
| - const Entry* const entry =
|
| - V8Entry::toImplWithTypeCheck(v8::Isolate::GetCurrent(), value);
|
| + const FileSystemEntry* const entry =
|
| + V8FileSystemEntry::toImplWithTypeCheck(v8::Isolate::GetCurrent(), value);
|
| if (entry)
|
| return entry->filesystem()->createFileSystemURL(entry);
|
| return WebURL();
|
| @@ -67,12 +66,12 @@ WebDOMFileSystem WebDOMFileSystem::create(WebLocalFrame* frame,
|
| SerializableType serializableType) {
|
| DCHECK(frame);
|
| DCHECK(toWebLocalFrameImpl(frame)->frame());
|
| - DOMFileSystem* domFileSystem =
|
| - DOMFileSystem::create(toWebLocalFrameImpl(frame)->frame()->document(),
|
| - name, static_cast<FileSystemType>(type), rootURL);
|
| + FileSystem* fileSystem =
|
| + FileSystem::create(toWebLocalFrameImpl(frame)->frame()->document(), name,
|
| + static_cast<FileSystemType>(type), rootURL);
|
| if (serializableType == SerializableTypeSerializable)
|
| - domFileSystem->makeClonable();
|
| - return WebDOMFileSystem(domFileSystem);
|
| + fileSystem->makeClonable();
|
| + return WebDOMFileSystem(fileSystem);
|
| }
|
|
|
| void WebDOMFileSystem::reset() {
|
| @@ -132,18 +131,18 @@ v8::Local<v8::Value> WebDOMFileSystem::createV8Entry(
|
| if (!m_private.get())
|
| return v8::Local<v8::Value>();
|
| if (entryType == EntryTypeDirectory)
|
| - return toV8(DirectoryEntry::create(m_private.get(), path),
|
| + return toV8(FileSystemDirectoryEntry::create(m_private.get(), path),
|
| isolate->GetCurrentContext()->Global(), isolate);
|
| DCHECK_EQ(entryType, EntryTypeFile);
|
| - return toV8(FileEntry::create(m_private.get(), path),
|
| + return toV8(FileSystemFileEntry::create(m_private.get(), path),
|
| isolate->GetCurrentContext()->Global(), isolate);
|
| }
|
|
|
| -WebDOMFileSystem::WebDOMFileSystem(DOMFileSystem* domFileSystem)
|
| - : m_private(domFileSystem) {}
|
| +WebDOMFileSystem::WebDOMFileSystem(FileSystem* fileSystem)
|
| + : m_private(fileSystem) {}
|
|
|
| -WebDOMFileSystem& WebDOMFileSystem::operator=(DOMFileSystem* domFileSystem) {
|
| - m_private = domFileSystem;
|
| +WebDOMFileSystem& WebDOMFileSystem::operator=(FileSystem* fileSystem) {
|
| + m_private = fileSystem;
|
| return *this;
|
| }
|
|
|
|
|