| 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 517b8e137a5f73e6c8283d401b48f1d35994ddc9..ab6e8d2a05526ba898cfe8c15cc5a92c110ee0d3 100644
|
| --- a/third_party/WebKit/Source/modules/permissions/PermissionStatus.cpp
|
| +++ b/third_party/WebKit/Source/modules/permissions/PermissionStatus.cpp
|
| @@ -15,24 +15,24 @@
|
| namespace blink {
|
|
|
| // static
|
| -PermissionStatus* PermissionStatus::take(ScriptPromiseResolver* resolver, MojoPermissionStatus status, MojoPermissionName name)
|
| +PermissionStatus* PermissionStatus::take(ScriptPromiseResolver* resolver, MojoPermissionStatus status, MojoPermissionDescriptor query)
|
| {
|
| - return PermissionStatus::createAndListen(resolver->getExecutionContext(), status, name);
|
| + return PermissionStatus::createAndListen(resolver->getExecutionContext(), status, std::move(query));
|
| }
|
|
|
| -PermissionStatus* PermissionStatus::createAndListen(ExecutionContext* executionContext, MojoPermissionStatus status, MojoPermissionName name)
|
| +PermissionStatus* PermissionStatus::createAndListen(ExecutionContext* executionContext, MojoPermissionStatus status, MojoPermissionDescriptor query)
|
| {
|
| - PermissionStatus* permissionStatus = new PermissionStatus(executionContext, status, name);
|
| + PermissionStatus* permissionStatus = new PermissionStatus(executionContext, status, std::move(query));
|
| permissionStatus->suspendIfNeeded();
|
| permissionStatus->startListening();
|
| return permissionStatus;
|
| }
|
|
|
| -PermissionStatus::PermissionStatus(ExecutionContext* executionContext, MojoPermissionStatus status, MojoPermissionName name)
|
| +PermissionStatus::PermissionStatus(ExecutionContext* executionContext, MojoPermissionStatus status, MojoPermissionDescriptor query)
|
| : ActiveScriptWrappable(this)
|
| , ActiveDOMObject(executionContext)
|
| , m_status(status)
|
| - , m_name(name)
|
| + , m_query(std::move(query))
|
| {
|
| }
|
|
|
| @@ -58,7 +58,8 @@ void PermissionStatus::permissionChanged(MojoPermissionStatus status)
|
|
|
| m_status = status;
|
| dispatchEvent(Event::create(EventTypeNames::change));
|
| - m_service->GetNextPermissionChange(m_name, getExecutionContext()->getSecurityOrigin(), m_status, convertToBaseCallback(WTF::bind(&PermissionStatus::permissionChanged, wrapWeakPersistent(this))));
|
| +
|
| + m_service->GetNextPermissionChange(m_query->Clone(), getExecutionContext()->getSecurityOrigin(), m_status, convertToBaseCallback(WTF::bind(&PermissionStatus::permissionChanged, wrapWeakPersistent(this))));
|
| }
|
|
|
| bool PermissionStatus::hasPendingActivity() const
|
| @@ -85,7 +86,7 @@ void PermissionStatus::startListening()
|
| {
|
| DCHECK(!m_service);
|
| Permissions::connectToService(getExecutionContext(), mojo::GetProxy(&m_service));
|
| - m_service->GetNextPermissionChange(m_name, getExecutionContext()->getSecurityOrigin(), m_status, convertToBaseCallback(WTF::bind(&PermissionStatus::permissionChanged, wrapWeakPersistent(this))));
|
| + m_service->GetNextPermissionChange(m_query->Clone(), getExecutionContext()->getSecurityOrigin(), m_status, convertToBaseCallback(WTF::bind(&PermissionStatus::permissionChanged, wrapWeakPersistent(this))));
|
| }
|
|
|
| void PermissionStatus::stopListening()
|
|
|