| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2013 Samsung Electronics. All rights reserved. | 3 * Copyright (C) 2013 Samsung Electronics. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * | 8 * |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 201 success = storageId->getBoolean("isLocalStorage", &isLocalStorage); | 201 success = storageId->getBoolean("isLocalStorage", &isLocalStorage); |
| 202 if (!success) { | 202 if (!success) { |
| 203 if (errorString) | 203 if (errorString) |
| 204 *errorString = "Invalid storageId format"; | 204 *errorString = "Invalid storageId format"; |
| 205 return nullptr; | 205 return nullptr; |
| 206 } | 206 } |
| 207 | 207 |
| 208 if (!m_page->mainFrame()->isLocalFrame()) | 208 if (!m_page->mainFrame()->isLocalFrame()) |
| 209 return nullptr; | 209 return nullptr; |
| 210 | 210 |
| 211 OwnPtrWillBeRawPtr<InspectedFrames> inspectedFrames = InspectedFrames::creat
e(m_page->deprecatedLocalMainFrame()); | 211 RawPtr<InspectedFrames> inspectedFrames = InspectedFrames::create(m_page->de
precatedLocalMainFrame()); |
| 212 LocalFrame* frame = inspectedFrames->frameWithSecurityOrigin(securityOrigin)
; | 212 LocalFrame* frame = inspectedFrames->frameWithSecurityOrigin(securityOrigin)
; |
| 213 if (!frame) { | 213 if (!frame) { |
| 214 if (errorString) | 214 if (errorString) |
| 215 *errorString = "LocalFrame not found for the given security origin"; | 215 *errorString = "LocalFrame not found for the given security origin"; |
| 216 return nullptr; | 216 return nullptr; |
| 217 } | 217 } |
| 218 targetFrame = frame; | 218 targetFrame = frame; |
| 219 | 219 |
| 220 if (isLocalStorage) | 220 if (isLocalStorage) |
| 221 return StorageNamespace::localStorageArea(frame->document()->securityOri
gin()); | 221 return StorageNamespace::localStorageArea(frame->document()->securityOri
gin()); |
| 222 StorageNamespace* sessionStorage = StorageNamespaceController::from(m_page)-
>sessionStorage(); | 222 StorageNamespace* sessionStorage = StorageNamespaceController::from(m_page)-
>sessionStorage(); |
| 223 if (!sessionStorage) { | 223 if (!sessionStorage) { |
| 224 if (errorString) | 224 if (errorString) |
| 225 *errorString = "SessionStorage is not supported"; | 225 *errorString = "SessionStorage is not supported"; |
| 226 return nullptr; | 226 return nullptr; |
| 227 } | 227 } |
| 228 return sessionStorage->storageArea(frame->document()->securityOrigin()); | 228 return sessionStorage->storageArea(frame->document()->securityOrigin()); |
| 229 } | 229 } |
| 230 | 230 |
| 231 } // namespace blink | 231 } // namespace blink |
| OLD | NEW |