| Index: third_party/WebKit/Source/modules/permissions/Permissions.cpp
|
| diff --git a/third_party/WebKit/Source/modules/permissions/Permissions.cpp b/third_party/WebKit/Source/modules/permissions/Permissions.cpp
|
| index 59360846bf9f0357ee3625191734d7d8626b8a99..873b44520749102caae9f42094ff8fb01192500a 100644
|
| --- a/third_party/WebKit/Source/modules/permissions/Permissions.cpp
|
| +++ b/third_party/WebKit/Source/modules/permissions/Permissions.cpp
|
| @@ -95,9 +95,9 @@ PermissionDescriptorPtr parsePermission(ScriptState* scriptState,
|
|
|
| ScriptPromise Permissions::query(ScriptState* scriptState,
|
| const Dictionary& rawPermission) {
|
| - ExceptionState exceptionState(ExceptionState::GetterContext, "query",
|
| - "Permissions", scriptState->context()->Global(),
|
| - scriptState->isolate());
|
| + ExceptionState exceptionState(scriptState->isolate(),
|
| + ExceptionState::GetterContext, "Permissions",
|
| + "query");
|
| PermissionDescriptorPtr descriptor =
|
| parsePermission(scriptState, rawPermission, exceptionState);
|
| if (exceptionState.hadException())
|
| @@ -132,9 +132,9 @@ ScriptPromise Permissions::query(ScriptState* scriptState,
|
|
|
| ScriptPromise Permissions::request(ScriptState* scriptState,
|
| const Dictionary& rawPermission) {
|
| - ExceptionState exceptionState(ExceptionState::GetterContext, "request",
|
| - "Permissions", scriptState->context()->Global(),
|
| - scriptState->isolate());
|
| + ExceptionState exceptionState(scriptState->isolate(),
|
| + ExceptionState::GetterContext, "Permissions",
|
| + "request");
|
| PermissionDescriptorPtr descriptor =
|
| parsePermission(scriptState, rawPermission, exceptionState);
|
| if (exceptionState.hadException())
|
| @@ -165,9 +165,9 @@ ScriptPromise Permissions::request(ScriptState* scriptState,
|
|
|
| ScriptPromise Permissions::revoke(ScriptState* scriptState,
|
| const Dictionary& rawPermission) {
|
| - ExceptionState exceptionState(ExceptionState::GetterContext, "revoke",
|
| - "Permissions", scriptState->context()->Global(),
|
| - scriptState->isolate());
|
| + ExceptionState exceptionState(scriptState->isolate(),
|
| + ExceptionState::GetterContext, "Permissions",
|
| + "revoke");
|
| PermissionDescriptorPtr descriptor =
|
| parsePermission(scriptState, rawPermission, exceptionState);
|
| if (exceptionState.hadException())
|
| @@ -198,9 +198,9 @@ ScriptPromise Permissions::revoke(ScriptState* scriptState,
|
| ScriptPromise Permissions::requestAll(
|
| ScriptState* scriptState,
|
| const Vector<Dictionary>& rawPermissions) {
|
| - ExceptionState exceptionState(ExceptionState::GetterContext, "request",
|
| - "Permissions", scriptState->context()->Global(),
|
| - scriptState->isolate());
|
| + ExceptionState exceptionState(scriptState->isolate(),
|
| + ExceptionState::GetterContext, "Permissions",
|
| + "requestAll");
|
| Vector<PermissionDescriptorPtr> internalPermissions;
|
| Vector<int> callerIndexToInternalIndex;
|
| callerIndexToInternalIndex.resize(rawPermissions.size());
|
|
|