third_party/WebKit/Source/modules/storage/DOMWindowStorage.cpp - Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide.

Unified Diff: third_party/WebKit/Source/modules/storage/DOMWindowStorage.cpp

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clash-modules: rebase-fixes Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/modules/speech/SpeechSynthesisUtterance.cpp ('k') | third_party/WebKit/Source/modules/storage/InspectorDOMStorageAgent.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/storage/DOMWindowStorage.cpp

diff --git a/third_party/WebKit/Source/modules/storage/DOMWindowStorage.cpp b/third_party/WebKit/Source/modules/storage/DOMWindowStorage.cpp

index f197df59e7f53cc93cde03b23d71feed7964f2ac..878a11e17b98518e513f2285c93a039e7e542a21 100644

--- a/third_party/WebKit/Source/modules/storage/DOMWindowStorage.cpp

+++ b/third_party/WebKit/Source/modules/storage/DOMWindowStorage.cpp

@@ -73,7 +73,7 @@ Storage* DOMWindowStorage::sessionStorage(ExceptionState& exceptionState) const

return nullptr;

String accessDeniedMessage = "Access is denied for this document.";

- if (!document->securityOrigin()->canAccessLocalStorage()) {

+ if (!document->getSecurityOrigin()->canAccessLocalStorage()) {

if (document->isSandboxed(SandboxOrigin))

exceptionState.throwSecurityError("The document is sandboxed and lacks the 'allow-same-origin' flag.");

else if (document->url().protocolIs("data"))

@@ -95,7 +95,7 @@ Storage* DOMWindowStorage::sessionStorage(ExceptionState& exceptionState) const

if (!page)

return nullptr;

- StorageArea* storageArea = StorageNamespaceController::from(page)->sessionStorage()->storageArea(document->securityOrigin());

+ StorageArea* storageArea = StorageNamespaceController::from(page)->sessionStorage()->storageArea(document->getSecurityOrigin());

if (!storageArea->canAccessStorage(m_window->frame())) {

exceptionState.throwSecurityError(accessDeniedMessage);

return nullptr;

@@ -113,7 +113,7 @@ Storage* DOMWindowStorage::localStorage(ExceptionState& exceptionState) const

if (!document)

return nullptr;

String accessDeniedMessage = "Access is denied for this document.";

- if (!document->securityOrigin()->canAccessLocalStorage()) {

+ if (!document->getSecurityOrigin()->canAccessLocalStorage()) {

if (document->isSandboxed(SandboxOrigin))

exceptionState.throwSecurityError("The document is sandboxed and lacks the 'allow-same-origin' flag.");

else if (document->url().protocolIs("data"))

@@ -133,7 +133,7 @@ Storage* DOMWindowStorage::localStorage(ExceptionState& exceptionState) const

FrameHost* host = document->frameHost();

if (!host || !host->settings().localStorageEnabled())

return nullptr;

- StorageArea* storageArea = StorageNamespace::localStorageArea(document->securityOrigin());

+ StorageArea* storageArea = StorageNamespace::localStorageArea(document->getSecurityOrigin());

if (!storageArea->canAccessStorage(m_window->frame())) {

exceptionState.throwSecurityError(accessDeniedMessage);

return nullptr;