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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Index: third_party/WebKit/Source/modules/quota/StorageQuota.cpp

diff --git a/third_party/WebKit/Source/modules/quota/StorageQuota.cpp b/third_party/WebKit/Source/modules/quota/StorageQuota.cpp

index 9ec34fece1eea7cbf480f9f15bcc46efc6c2020a..3a92298240e4cb5df064f3a8c961e8660aef52d0 100644

--- a/third_party/WebKit/Source/modules/quota/StorageQuota.cpp

+++ b/third_party/WebKit/Source/modules/quota/StorageQuota.cpp

@@ -86,7 +86,7 @@ ScriptPromise StorageQuota::queryInfo(ScriptState* scriptState, String type)

ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);

ScriptPromise promise = resolver->promise();

- SecurityOrigin* securityOrigin = scriptState->executionContext()->securityOrigin();

+ SecurityOrigin* securityOrigin = scriptState->getExecutionContext()->getSecurityOrigin();

if (securityOrigin->isUnique()) {

resolver->reject(DOMError::create(NotSupportedError));

return promise;

@@ -100,7 +100,7 @@ ScriptPromise StorageQuota::queryInfo(ScriptState* scriptState, String type)

ScriptPromise StorageQuota::requestPersistentQuota(ScriptState* scriptState, unsigned long long newQuota)

{

- StorageQuotaClient* client = StorageQuotaClient::from(scriptState->executionContext());

+ StorageQuotaClient* client = StorageQuotaClient::from(scriptState->getExecutionContext());

if (!client) {

ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);

ScriptPromise promise = resolver->promise();