| Index: third_party/WebKit/Source/modules/filesystem/Entry.cpp
|
| diff --git a/third_party/WebKit/Source/modules/filesystem/Entry.cpp b/third_party/WebKit/Source/modules/filesystem/Entry.cpp
|
| index 68dc6bf4217a34b887b7ac8cae52d414316db07e..b3bbbe81c4451e64ca7f41086b65bd3727f57c03 100644
|
| --- a/third_party/WebKit/Source/modules/filesystem/Entry.cpp
|
| +++ b/third_party/WebKit/Source/modules/filesystem/Entry.cpp
|
| @@ -29,7 +29,7 @@
|
| */
|
| #include "modules/filesystem/Entry.h"
|
|
|
| -#include "core/dom/ExecutionContext.h"
|
| +#include "bindings/core/v8/ScriptState.h"
|
| #include "core/fileapi/FileError.h"
|
| #include "core/frame/UseCounter.h"
|
| #include "core/html/VoidCallback.h"
|
| @@ -46,71 +46,71 @@ namespace blink {
|
| Entry::Entry(DOMFileSystemBase* fileSystem, const String& fullPath)
|
| : EntryBase(fileSystem, fullPath) {}
|
|
|
| -DOMFileSystem* Entry::filesystem(ExecutionContext* context) const {
|
| +DOMFileSystem* Entry::filesystem(ScriptState* scriptState) const {
|
| if (m_fileSystem->type() == FileSystemTypeIsolated)
|
| UseCounter::count(
|
| - context,
|
| + scriptState->getExecutionContext(),
|
| UseCounter::Entry_Filesystem_AttributeGetter_IsolatedFileSystem);
|
| return filesystem();
|
| }
|
|
|
| -void Entry::getMetadata(ExecutionContext* context,
|
| +void Entry::getMetadata(ScriptState* scriptState,
|
| MetadataCallback* successCallback,
|
| ErrorCallback* errorCallback) {
|
| if (m_fileSystem->type() == FileSystemTypeIsolated)
|
| - UseCounter::count(context,
|
| + UseCounter::count(scriptState->getExecutionContext(),
|
| UseCounter::Entry_GetMetadata_Method_IsolatedFileSystem);
|
| m_fileSystem->getMetadata(this, successCallback,
|
| ScriptErrorCallback::wrap(errorCallback));
|
| }
|
|
|
| -void Entry::moveTo(ExecutionContext* context,
|
| +void Entry::moveTo(ScriptState* scriptState,
|
| DirectoryEntry* parent,
|
| const String& name,
|
| EntryCallback* successCallback,
|
| ErrorCallback* errorCallback) const {
|
| if (m_fileSystem->type() == FileSystemTypeIsolated)
|
| - UseCounter::count(context,
|
| + UseCounter::count(scriptState->getExecutionContext(),
|
| UseCounter::Entry_MoveTo_Method_IsolatedFileSystem);
|
| m_fileSystem->move(this, parent, name, successCallback,
|
| ScriptErrorCallback::wrap(errorCallback));
|
| }
|
|
|
| -void Entry::copyTo(ExecutionContext* context,
|
| +void Entry::copyTo(ScriptState* scriptState,
|
| DirectoryEntry* parent,
|
| const String& name,
|
| EntryCallback* successCallback,
|
| ErrorCallback* errorCallback) const {
|
| if (m_fileSystem->type() == FileSystemTypeIsolated)
|
| - UseCounter::count(context,
|
| + UseCounter::count(scriptState->getExecutionContext(),
|
| UseCounter::Entry_CopyTo_Method_IsolatedFileSystem);
|
| m_fileSystem->copy(this, parent, name, successCallback,
|
| ScriptErrorCallback::wrap(errorCallback));
|
| }
|
|
|
| -void Entry::remove(ExecutionContext* context,
|
| +void Entry::remove(ScriptState* scriptState,
|
| VoidCallback* successCallback,
|
| ErrorCallback* errorCallback) const {
|
| if (m_fileSystem->type() == FileSystemTypeIsolated)
|
| - UseCounter::count(context,
|
| + UseCounter::count(scriptState->getExecutionContext(),
|
| UseCounter::Entry_Remove_Method_IsolatedFileSystem);
|
| m_fileSystem->remove(this, successCallback,
|
| ScriptErrorCallback::wrap(errorCallback));
|
| }
|
|
|
| -void Entry::getParent(ExecutionContext* context,
|
| +void Entry::getParent(ScriptState* scriptState,
|
| EntryCallback* successCallback,
|
| ErrorCallback* errorCallback) const {
|
| if (m_fileSystem->type() == FileSystemTypeIsolated)
|
| - UseCounter::count(context,
|
| + UseCounter::count(scriptState->getExecutionContext(),
|
| UseCounter::Entry_GetParent_Method_IsolatedFileSystem);
|
| m_fileSystem->getParent(this, successCallback,
|
| ScriptErrorCallback::wrap(errorCallback));
|
| }
|
|
|
| -String Entry::toURL(ExecutionContext* context) const {
|
| +String Entry::toURL(ScriptState* scriptState) const {
|
| if (m_fileSystem->type() == FileSystemTypeIsolated)
|
| - UseCounter::count(context,
|
| + UseCounter::count(scriptState->getExecutionContext(),
|
| UseCounter::Entry_ToURL_Method_IsolatedFileSystem);
|
| return static_cast<const EntryBase*>(this)->toURL();
|
| }
|
|
|