| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 #include "web/IndexedDBClientImpl.h" | 30 #include "web/IndexedDBClientImpl.h" |
| 31 | 31 |
| 32 #include "bindings/core/v8/WorkerScriptController.h" | 32 #include "bindings/core/v8/WorkerScriptController.h" |
| 33 #include "core/dom/Document.h" | 33 #include "core/dom/Document.h" |
| 34 #include "core/workers/WorkerGlobalScope.h" | 34 #include "core/workers/WorkerGlobalScope.h" |
| 35 #include "platform/weborigin/SecurityOrigin.h" | 35 #include "platform/weborigin/SecurityOrigin.h" |
| 36 #include "public/web/WebContentSettingsClient.h" | 36 #include "public/web/WebContentSettingsClient.h" |
| 37 #include "public/web/WebKit.h" | 37 #include "public/web/WebKit.h" |
| 38 #include "public/web/WebSecurityOrigin.h" | 38 #include "public/web/WebSecurityOrigin.h" |
| 39 #include "web/WebLocalFrameImpl.h" | 39 #include "web/WebLocalFrameImpl.h" |
| 40 #include "web/WorkerContentSettingsClient.h" | 40 #include "web/WorkerPermissionClient.h" |
| 41 | 41 |
| 42 namespace blink { | 42 namespace blink { |
| 43 | 43 |
| 44 IndexedDBClient* IndexedDBClientImpl::create() | 44 IndexedDBClient* IndexedDBClientImpl::create() |
| 45 { | 45 { |
| 46 return new IndexedDBClientImpl(); | 46 return new IndexedDBClientImpl(); |
| 47 } | 47 } |
| 48 | 48 |
| 49 bool IndexedDBClientImpl::allowIndexedDB(ExecutionContext* context, const String
& name) | 49 bool IndexedDBClientImpl::allowIndexedDB(ExecutionContext* context, const String
& name) |
| 50 { | 50 { |
| 51 ASSERT_WITH_SECURITY_IMPLICATION(context->isDocument() || context->isWorkerG
lobalScope()); | 51 ASSERT_WITH_SECURITY_IMPLICATION(context->isDocument() || context->isWorkerG
lobalScope()); |
| 52 | 52 |
| 53 if (context->isDocument()) { | 53 if (context->isDocument()) { |
| 54 WebSecurityOrigin origin(context->securityOrigin()); | 54 WebSecurityOrigin origin(context->securityOrigin()); |
| 55 Document* document = toDocument(context); | 55 Document* document = toDocument(context); |
| 56 WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(document->fra
me()); | 56 WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(document->fra
me()); |
| 57 // FIXME: webFrame->contentSettingsClient() returns 0 in test_shell and
content_shell http://crbug.com/137269 | 57 // FIXME: webFrame->contentSettingsClient() returns 0 in test_shell and
content_shell http://crbug.com/137269 |
| 58 return !webFrame->contentSettingsClient() || webFrame->contentSettingsCl
ient()->allowIndexedDB(name, origin); | 58 return !webFrame->contentSettingsClient() || webFrame->contentSettingsCl
ient()->allowIndexedDB(name, origin); |
| 59 } | 59 } |
| 60 | 60 |
| 61 WorkerGlobalScope& workerGlobalScope = *toWorkerGlobalScope(context); | 61 WorkerGlobalScope& workerGlobalScope = *toWorkerGlobalScope(context); |
| 62 return WorkerContentSettingsClient::from(workerGlobalScope)->allowIndexedDB(
name); | 62 return WorkerPermissionClient::from(workerGlobalScope)->allowIndexedDB(name)
; |
| 63 } | 63 } |
| 64 | 64 |
| 65 } // namespace blink | 65 } // namespace blink |
| OLD | NEW |