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

Unified Diff: third_party/WebKit/Source/modules/storage/StorageArea.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/storage/InspectorDOMStorageAgent.cpp ('k') | third_party/WebKit/Source/modules/storage/StorageNamespaceController.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 3cd823539d931546be49f2e7c6735c7244c5c04d..c92f40260a5abe24b466263d8fc1528c9c7e885c 100644

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

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

@@ -147,7 +147,7 @@ bool StorageArea::canAccessStorage(LocalFrame* frame)

StorageNamespaceController* controller = StorageNamespaceController::from(frame->page());

if (!controller)

return false;

- bool result = controller->storageClient()->canAccessStorage(frame, m_storageType);

+ bool result = controller->getStorageClient()->canAccessStorage(frame, m_storageType);

// Move attention to the new LocalFrame.

LocalFrameLifecycleObserver::setContext(frame);

m_canAccessStorageCachedResult = result;

@@ -165,7 +165,7 @@ void StorageArea::dispatchLocalStorageEvent(const String& key, const String& old

LocalFrame* localFrame = toLocalFrame(frame);

LocalDOMWindow* localWindow = localFrame->localDOMWindow();

Storage* storage = DOMWindowStorage::from(*localWindow).optionalLocalStorage();

- if (storage && localFrame->document()->securityOrigin()->canAccess(securityOrigin) && !isEventSource(storage, sourceAreaInstance))

+ if (storage && localFrame->document()->getSecurityOrigin()->canAccess(securityOrigin) && !isEventSource(storage, sourceAreaInstance))

localFrame->localDOMWindow()->enqueueWindowEvent(StorageEvent::create(EventTypeNames::storage, key, oldValue, newValue, pageURL, storage));

}

if (InspectorDOMStorageAgent* agent = StorageNamespaceController::from(page)->inspectorAgent())

@@ -198,7 +198,7 @@ void StorageArea::dispatchSessionStorageEvent(const String& key, const String& o