diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
| commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
| tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/third_party/WebKit/Source/web/LocalFileSystemClient.cpp | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/third_party/WebKit/Source/web/LocalFileSystemClient.cpp')
| -rw-r--r-- | chromium/third_party/WebKit/Source/web/LocalFileSystemClient.cpp | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/chromium/third_party/WebKit/Source/web/LocalFileSystemClient.cpp b/chromium/third_party/WebKit/Source/web/LocalFileSystemClient.cpp index 1ae4e062228..1e176343a7a 100644 --- a/chromium/third_party/WebKit/Source/web/LocalFileSystemClient.cpp +++ b/chromium/third_party/WebKit/Source/web/LocalFileSystemClient.cpp @@ -33,20 +33,16 @@ #include "WebFrameImpl.h" #include "WebViewImpl.h" +#include "WorkerPermissionClient.h" #include "core/dom/Document.h" -#include "core/platform/AsyncFileSystemCallbacks.h" -#include "public/platform/Platform.h" -#include "public/platform/WebFileError.h" -#include "public/platform/WebFileSystem.h" -#include "public/platform/WebFileSystemCallbacks.h" -#include "public/platform/WebFileSystemType.h" +#include "core/workers/WorkerGlobalScope.h" +#include "platform/weborigin/SecurityOrigin.h" #include "public/web/WebPermissionClient.h" -#include "weborigin/SecurityOrigin.h" #include "wtf/text/WTFString.h" using namespace WebCore; -namespace WebKit { +namespace blink { PassOwnPtr<FileSystemClient> LocalFileSystemClient::create() { @@ -57,17 +53,22 @@ LocalFileSystemClient::~LocalFileSystemClient() { } -bool LocalFileSystemClient::allowFileSystem(ScriptExecutionContext* context) +bool LocalFileSystemClient::allowFileSystem(ExecutionContext* context) { - Document* document = toDocument(context); - WebFrameImpl* webFrame = WebFrameImpl::fromFrame(document->frame()); - WebKit::WebViewImpl* webView = webFrame->viewImpl(); - - return !webView->permissionClient() || webView->permissionClient()->allowFileSystem(webFrame); + if (context->isDocument()) { + Document* document = toDocument(context); + WebFrameImpl* webFrame = WebFrameImpl::fromFrame(document->frame()); + if (webFrame->permissionClient()) + return webFrame->permissionClient()->allowFileSystem(webFrame); + blink::WebViewImpl* webView = webFrame->viewImpl(); + return !webView->permissionClient() || webView->permissionClient()->allowFileSystem(webFrame); + } + ASSERT(context->isWorkerGlobalScope()); + return WorkerPermissionClient::from(toWorkerGlobalScope(context))->allowFileSystem(); } LocalFileSystemClient::LocalFileSystemClient() { } -} // namespace WebKit +} // namespace blink |