| 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 |
| (...skipping 10 matching lines...) Expand all Loading... |
| 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/frame/ContentSettingsClient.h" | 29 #include "core/frame/ContentSettingsClient.h" |
| 30 #include "modules/storage/StorageNamespace.h" | 30 #include "modules/storage/StorageNamespace.h" |
| 31 #include "platform/wtf/PtrUtil.h" |
| 31 #include "public/platform/WebStorageNamespace.h" | 32 #include "public/platform/WebStorageNamespace.h" |
| 32 #include "public/web/WebViewClient.h" | 33 #include "public/web/WebViewClient.h" |
| 33 #include "web/WebViewImpl.h" | 34 #include "web/WebViewImpl.h" |
| 34 #include "wtf/PtrUtil.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(LocalStorage, | 41 STATIC_ASSERT_MATCHING_ENUM(LocalStorage, |
| 42 ContentSettingsClient::StorageType::kLocal); | 42 ContentSettingsClient::StorageType::kLocal); |
| 43 STATIC_ASSERT_MATCHING_ENUM(SessionStorage, | 43 STATIC_ASSERT_MATCHING_ENUM(SessionStorage, |
| 44 ContentSettingsClient::StorageType::kSession); | 44 ContentSettingsClient::StorageType::kSession); |
| (...skipping 10 matching lines...) Expand all Loading... |
| 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->contentSettingsClient()); | 59 DCHECK(frame->contentSettingsClient()); |
| 60 return frame->contentSettingsClient()->allowStorage( | 60 return frame->contentSettingsClient()->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 |