Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(575)

Unified Diff: third_party/WebKit/Source/modules/permissions/PermissionStatus.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
Index: third_party/WebKit/Source/modules/permissions/PermissionStatus.cpp
diff --git a/third_party/WebKit/Source/modules/permissions/PermissionStatus.cpp b/third_party/WebKit/Source/modules/permissions/PermissionStatus.cpp
index b2b14b63e46a5c78b90441a06373fcaa10b8d26d..fcc5159f4cc850f93e324d78b6239a698d8fecba 100644
--- a/third_party/WebKit/Source/modules/permissions/PermissionStatus.cpp
+++ b/third_party/WebKit/Source/modules/permissions/PermissionStatus.cpp
@@ -18,7 +18,7 @@ namespace blink {
// static
PermissionStatus* PermissionStatus::take(ScriptPromiseResolver* resolver, WebPermissionStatus status, WebPermissionType type)
{
- return PermissionStatus::createAndListen(resolver->executionContext(), status, type);
+ return PermissionStatus::createAndListen(resolver->getExecutionContext(), status, type);
}
PermissionStatus* PermissionStatus::createAndListen(ExecutionContext* executionContext, WebPermissionStatus status, WebPermissionType type)
@@ -47,9 +47,9 @@ const AtomicString& PermissionStatus::interfaceName() const
return EventTargetNames::PermissionStatus;
}
-ExecutionContext* PermissionStatus::executionContext() const
+ExecutionContext* PermissionStatus::getExecutionContext() const
{
- return ActiveDOMObject::executionContext();
+ return ActiveDOMObject::getExecutionContext();
}
void PermissionStatus::permissionChanged(WebPermissionType type, WebPermissionStatus status)
@@ -86,11 +86,11 @@ void PermissionStatus::startListening()
{
ASSERT(!m_listening);
- WebPermissionClient* client = Permissions::getClient(executionContext());
+ WebPermissionClient* client = Permissions::getClient(getExecutionContext());
if (!client)
return;
m_listening = true;
- client->startListening(m_type, KURL(KURL(), executionContext()->securityOrigin()->toString()), this);
+ client->startListening(m_type, KURL(KURL(), getExecutionContext()->getSecurityOrigin()->toString()), this);
}
void PermissionStatus::stopListening()
@@ -98,10 +98,10 @@ void PermissionStatus::stopListening()
if (!m_listening)
return;
- ASSERT(executionContext());
+ ASSERT(getExecutionContext());
m_listening = false;
- WebPermissionClient* client = Permissions::getClient(executionContext());
+ WebPermissionClient* client = Permissions::getClient(getExecutionContext());
if (!client)
return;
client->stopListening(this);

Powered by Google App Engine
This is Rietveld 408576698