| 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);
|
|
|