third_party/WebKit/Source/modules/permissions/PermissionsCallback.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/permissions/PermissionsCallback.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/permissions/Permissions.cpp ('k') | third_party/WebKit/Source/modules/presentation/PresentationAvailability.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/permissions/PermissionsCallback.cpp

diff --git a/third_party/WebKit/Source/modules/permissions/PermissionsCallback.cpp b/third_party/WebKit/Source/modules/permissions/PermissionsCallback.cpp

index 847f4e260fad7506f2777f5a781349ba156eaf0b..7d967abb6103e381ea5c42d7fd39aa4585798a61 100644

--- a/third_party/WebKit/Source/modules/permissions/PermissionsCallback.cpp

+++ b/third_party/WebKit/Source/modules/permissions/PermissionsCallback.cpp

@@ -19,7 +19,7 @@ PermissionsCallback::PermissionsCallback(ScriptPromiseResolver* resolver, PassOw

void PermissionsCallback::onSuccess(WebPassOwnPtr<WebVector<WebPermissionStatus>> permissionStatus)

{

- if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())

+ if (!m_resolver->getExecutionContext() || m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())

return;

OwnPtr<WebVector<WebPermissionStatus>> statusPtr = permissionStatus.release();

@@ -30,14 +30,14 @@ void PermissionsCallback::onSuccess(WebPassOwnPtr<WebVector<WebPermissionStatus>

// using the internal index obtained.

for (size_t i = 0; i < m_callerIndexToInternalIndex->size(); ++i) {

int internalIndex = m_callerIndexToInternalIndex->operator[](i);

- result[i] = PermissionStatus::createAndListen(m_resolver->executionContext(), statusPtr->operator[](internalIndex), m_internalPermissions->operator[](internalIndex));

+ result[i] = PermissionStatus::createAndListen(m_resolver->getExecutionContext(), statusPtr->operator[](internalIndex), m_internalPermissions->operator[](internalIndex));

}

m_resolver->resolve(result);

}

void PermissionsCallback::onError()

{

- if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())

+ if (!m_resolver->getExecutionContext() || m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())

return;

m_resolver->reject();

}