diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebKit/chromium/src/WebFileSystemCallbacksImpl.cpp | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebKit/chromium/src/WebFileSystemCallbacksImpl.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/WebFileSystemCallbacksImpl.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/WebKit/chromium/src/WebFileSystemCallbacksImpl.cpp b/Source/WebKit/chromium/src/WebFileSystemCallbacksImpl.cpp index 52a4032..0c71f80 100644 --- a/Source/WebKit/chromium/src/WebFileSystemCallbacksImpl.cpp +++ b/Source/WebKit/chromium/src/WebFileSystemCallbacksImpl.cpp @@ -36,8 +36,9 @@ #include "AsyncFileSystemChromium.h" #include "FileMetadata.h" #include "ScriptExecutionContext.h" -#include "WebFileSystemEntry.h" #include "WebFileInfo.h" +#include "WebFileSystem.h" +#include "WebFileSystemEntry.h" #include "WebString.h" #include "WorkerAsyncFileSystemChromium.h" #include <wtf/Vector.h> @@ -46,8 +47,9 @@ using namespace WebCore; namespace WebKit { -WebFileSystemCallbacksImpl::WebFileSystemCallbacksImpl(PassOwnPtr<AsyncFileSystemCallbacks> callbacks, WebCore::ScriptExecutionContext* context, bool synchronous) +WebFileSystemCallbacksImpl::WebFileSystemCallbacksImpl(PassOwnPtr<AsyncFileSystemCallbacks> callbacks, AsyncFileSystem::Type type, WebCore::ScriptExecutionContext* context, bool synchronous) : m_callbacks(callbacks) + , m_type(type) , m_context(context) , m_synchronous(synchronous) { @@ -85,9 +87,9 @@ void WebFileSystemCallbacksImpl::didReadDirectory(const WebVector<WebFileSystemE void WebFileSystemCallbacksImpl::didOpenFileSystem(const WebString& name, const WebString& path) { if (m_context && m_context->isWorkerContext()) - m_callbacks->didOpenFileSystem(name, WorkerAsyncFileSystemChromium::create(m_context, path, m_synchronous)); + m_callbacks->didOpenFileSystem(name, WorkerAsyncFileSystemChromium::create(m_context, m_type, path, m_synchronous)); else - m_callbacks->didOpenFileSystem(name, AsyncFileSystemChromium::create(path)); + m_callbacks->didOpenFileSystem(name, AsyncFileSystemChromium::create(m_type, path)); delete this; } |