| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All Rights Reserved. | 2 * Copyright (C) 2009 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 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``AS IS'' AND ANY |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC. OR |
| 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "web/StorageClientImpl.h" | 26 #include "web/StorageClientImpl.h" |
| 27 | 27 |
| 28 #include <memory> | 28 #include <memory> |
| 29 #include "core/exported/WebViewBase.h" |
| 29 #include "core/frame/ContentSettingsClient.h" | 30 #include "core/frame/ContentSettingsClient.h" |
| 30 #include "modules/storage/StorageNamespace.h" | 31 #include "modules/storage/StorageNamespace.h" |
| 31 #include "platform/wtf/PtrUtil.h" | 32 #include "platform/wtf/PtrUtil.h" |
| 32 #include "public/platform/WebStorageNamespace.h" | 33 #include "public/platform/WebStorageNamespace.h" |
| 33 #include "public/web/WebViewClient.h" | 34 #include "public/web/WebViewClient.h" |
| 34 #include "web/WebViewImpl.h" | |
| 35 | 35 |
| 36 namespace blink { | 36 namespace blink { |
| 37 | 37 |
| 38 #define STATIC_ASSERT_MATCHING_ENUM(enum_name1, enum_name2) \ | 38 #define STATIC_ASSERT_MATCHING_ENUM(enum_name1, enum_name2) \ |
| 39 static_assert(static_cast<int>(enum_name1) == static_cast<int>(enum_name2), \ | 39 static_assert(static_cast<int>(enum_name1) == static_cast<int>(enum_name2), \ |
| 40 "mismatching enums: " #enum_name1) | 40 "mismatching enums: " #enum_name1) |
| 41 STATIC_ASSERT_MATCHING_ENUM(kLocalStorage, | 41 STATIC_ASSERT_MATCHING_ENUM(kLocalStorage, |
| 42 ContentSettingsClient::StorageType::kLocal); | 42 ContentSettingsClient::StorageType::kLocal); |
| 43 STATIC_ASSERT_MATCHING_ENUM(kSessionStorage, | 43 STATIC_ASSERT_MATCHING_ENUM(kSessionStorage, |
| 44 ContentSettingsClient::StorageType::kSession); | 44 ContentSettingsClient::StorageType::kSession); |
| 45 | 45 |
| 46 StorageClientImpl::StorageClientImpl(WebViewImpl* web_view) | 46 StorageClientImpl::StorageClientImpl(WebViewBase* web_view) |
| 47 : web_view_(web_view) {} | 47 : web_view_(web_view) {} |
| 48 | 48 |
| 49 std::unique_ptr<StorageNamespace> | 49 std::unique_ptr<StorageNamespace> |
| 50 StorageClientImpl::CreateSessionStorageNamespace() { | 50 StorageClientImpl::CreateSessionStorageNamespace() { |
| 51 if (!web_view_->Client()) | 51 if (!web_view_->Client()) |
| 52 return nullptr; | 52 return nullptr; |
| 53 return WTF::WrapUnique(new StorageNamespace( | 53 return WTF::WrapUnique(new StorageNamespace( |
| 54 WTF::WrapUnique(web_view_->Client()->CreateSessionStorageNamespace()))); | 54 WTF::WrapUnique(web_view_->Client()->CreateSessionStorageNamespace()))); |
| 55 } | 55 } |
| 56 | 56 |
| 57 bool StorageClientImpl::CanAccessStorage(LocalFrame* frame, | 57 bool StorageClientImpl::CanAccessStorage(LocalFrame* frame, |
| 58 StorageType type) const { | 58 StorageType type) const { |
| 59 DCHECK(frame->GetContentSettingsClient()); | 59 DCHECK(frame->GetContentSettingsClient()); |
| 60 return frame->GetContentSettingsClient()->AllowStorage( | 60 return frame->GetContentSettingsClient()->AllowStorage( |
| 61 static_cast<ContentSettingsClient::StorageType>(type)); | 61 static_cast<ContentSettingsClient::StorageType>(type)); |
| 62 } | 62 } |
| 63 | 63 |
| 64 } // namespace blink | 64 } // namespace blink |
| OLD | NEW |