| 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 10 matching lines...) Expand all Loading... |
| 21 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 21 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
| 22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
| 23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
| 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/WorkerScriptController.h" | 31 #include "bindings/core/v8/IsolatedScriptController.h" |
| 32 #include "core/dom/Document.h" | 32 #include "core/dom/Document.h" |
| 33 #include "core/workers/WorkerGlobalScope.h" | 33 #include "core/workers/WorkerGlobalScope.h" |
| 34 #include "platform/weborigin/SecurityOrigin.h" | 34 #include "platform/weborigin/SecurityOrigin.h" |
| 35 #include "public/platform/WebSecurityOrigin.h" | 35 #include "public/platform/WebSecurityOrigin.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 "web/WebLocalFrameImpl.h" | 38 #include "web/WebLocalFrameImpl.h" |
| 39 #include "web/WorkerContentSettingsClient.h" | 39 #include "web/WorkerContentSettingsClient.h" |
| 40 | 40 |
| 41 namespace blink { | 41 namespace blink { |
| (...skipping 13 matching lines...) Expand all Loading... |
| 55 WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(document->fra
me()); | 55 WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(document->fra
me()); |
| 56 // FIXME: webFrame->contentSettingsClient() returns 0 in test_shell and
content_shell http://crbug.com/137269 | 56 // FIXME: webFrame->contentSettingsClient() returns 0 in test_shell and
content_shell http://crbug.com/137269 |
| 57 return !webFrame->contentSettingsClient() || webFrame->contentSettingsCl
ient()->allowIndexedDB(name, origin); | 57 return !webFrame->contentSettingsClient() || webFrame->contentSettingsCl
ient()->allowIndexedDB(name, origin); |
| 58 } | 58 } |
| 59 | 59 |
| 60 WorkerGlobalScope& workerGlobalScope = *toWorkerGlobalScope(context); | 60 WorkerGlobalScope& workerGlobalScope = *toWorkerGlobalScope(context); |
| 61 return WorkerContentSettingsClient::from(workerGlobalScope)->allowIndexedDB(
name); | 61 return WorkerContentSettingsClient::from(workerGlobalScope)->allowIndexedDB(
name); |
| 62 } | 62 } |
| 63 | 63 |
| 64 } // namespace blink | 64 } // namespace blink |
| OLD | NEW |