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 13 matching lines...) Expand all Loading... |
24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
27 */ | 27 */ |
28 | 28 |
29 #include "web/IndexedDBClientImpl.h" | 29 #include "web/IndexedDBClientImpl.h" |
30 | 30 |
31 #include "bindings/core/v8/WorkerOrWorkletScriptController.h" | 31 #include "bindings/core/v8/WorkerOrWorkletScriptController.h" |
32 #include "core/dom/Document.h" | 32 #include "core/dom/Document.h" |
33 #include "core/dom/ExecutionContext.h" | 33 #include "core/dom/ExecutionContext.h" |
| 34 #include "core/frame/ContentSettingsClient.h" |
34 #include "core/workers/WorkerGlobalScope.h" | 35 #include "core/workers/WorkerGlobalScope.h" |
35 #include "platform/weborigin/SecurityOrigin.h" | 36 #include "platform/weborigin/SecurityOrigin.h" |
36 #include "public/platform/WebSecurityOrigin.h" | 37 #include "public/platform/WebSecurityOrigin.h" |
37 #include "public/web/WebContentSettingsClient.h" | |
38 #include "public/web/WebKit.h" | 38 #include "public/web/WebKit.h" |
39 #include "web/WebLocalFrameImpl.h" | 39 #include "web/WebLocalFrameImpl.h" |
40 #include "web/WorkerContentSettingsClient.h" | 40 #include "web/WorkerContentSettingsClient.h" |
41 | 41 |
42 namespace blink { | 42 namespace blink { |
43 | 43 |
44 IndexedDBClient* IndexedDBClientImpl::create(LocalFrame& frame) { | 44 IndexedDBClient* IndexedDBClientImpl::create(LocalFrame& frame) { |
45 return new IndexedDBClientImpl(frame); | 45 return new IndexedDBClientImpl(frame); |
46 } | 46 } |
47 | 47 |
48 IndexedDBClient* IndexedDBClientImpl::create(WorkerClients& workerClients) { | 48 IndexedDBClient* IndexedDBClientImpl::create(WorkerClients& workerClients) { |
49 return new IndexedDBClientImpl(workerClients); | 49 return new IndexedDBClientImpl(workerClients); |
50 } | 50 } |
51 | 51 |
52 IndexedDBClientImpl::IndexedDBClientImpl(LocalFrame& frame) | 52 IndexedDBClientImpl::IndexedDBClientImpl(LocalFrame& frame) |
53 : IndexedDBClient(frame) {} | 53 : IndexedDBClient(frame) {} |
54 | 54 |
55 IndexedDBClientImpl::IndexedDBClientImpl(WorkerClients& workerClients) | 55 IndexedDBClientImpl::IndexedDBClientImpl(WorkerClients& workerClients) |
56 : IndexedDBClient(workerClients) {} | 56 : IndexedDBClient(workerClients) {} |
57 | 57 |
58 bool IndexedDBClientImpl::allowIndexedDB(ExecutionContext* context, | 58 bool IndexedDBClientImpl::allowIndexedDB(ExecutionContext* context, |
59 const String& name) { | 59 const String& name) { |
60 DCHECK(context->isContextThread()); | 60 DCHECK(context->isContextThread()); |
61 SECURITY_DCHECK(context->isDocument() || context->isWorkerGlobalScope()); | 61 SECURITY_DCHECK(context->isDocument() || context->isWorkerGlobalScope()); |
62 | 62 |
63 if (context->isDocument()) { | 63 if (context->isDocument()) { |
64 WebSecurityOrigin origin(context->getSecurityOrigin()); | |
65 Document* document = toDocument(context); | 64 Document* document = toDocument(context); |
66 WebLocalFrameImpl* webFrame = | 65 LocalFrame* frame = document->frame(); |
67 WebLocalFrameImpl::fromFrame(document->frame()); | 66 if (!frame) |
68 if (!webFrame) | |
69 return false; | 67 return false; |
70 if (webFrame->contentSettingsClient()) | 68 DCHECK(frame->contentSettingsClient()); |
71 return webFrame->contentSettingsClient()->allowIndexedDB(name, origin); | 69 return frame->contentSettingsClient()->allowIndexedDB( |
72 return true; | 70 name, context->getSecurityOrigin()); |
73 } | 71 } |
74 | 72 |
75 WorkerGlobalScope& workerGlobalScope = *toWorkerGlobalScope(context); | 73 WorkerGlobalScope& workerGlobalScope = *toWorkerGlobalScope(context); |
76 return WorkerContentSettingsClient::from(workerGlobalScope) | 74 return WorkerContentSettingsClient::from(workerGlobalScope) |
77 ->allowIndexedDB(name); | 75 ->allowIndexedDB(name); |
78 } | 76 } |
79 | 77 |
80 } // namespace blink | 78 } // namespace blink |
OLD | NEW |