| Index: third_party/WebKit/Source/core/html/HTMLIFrameElementPermissions.cpp
|
| diff --git a/third_party/WebKit/Source/core/html/HTMLIFrameElementPermissions.cpp b/third_party/WebKit/Source/core/html/HTMLIFrameElementPermissions.cpp
|
| index 8e22e8b423f4e83299e8bf0496d21c3c74e72954..32c6a5e07a02709efac26c1d0b8d34cd855f66b0 100644
|
| --- a/third_party/WebKit/Source/core/html/HTMLIFrameElementPermissions.cpp
|
| +++ b/third_party/WebKit/Source/core/html/HTMLIFrameElementPermissions.cpp
|
| @@ -14,17 +14,18 @@ namespace {
|
|
|
| struct SupportedPermission {
|
| const char* name;
|
| - WebPermissionType type;
|
| + mojom::blink::PermissionName type;
|
| };
|
|
|
| const SupportedPermission kSupportedPermissions[] = {
|
| - {"geolocation", WebPermissionTypeGeolocation},
|
| - {"notifications", WebPermissionTypeNotifications},
|
| - {"midi", WebPermissionTypeMidiSysEx},
|
| + {"geolocation", mojom::blink::PermissionName::GEOLOCATION},
|
| + {"notifications", mojom::blink::PermissionName::NOTIFICATIONS},
|
| + {"midi", mojom::blink::PermissionName::MIDI},
|
| };
|
|
|
| // Returns true if the name is valid and the type is stored in |result|.
|
| -bool getPermissionType(const AtomicString& name, WebPermissionType* result) {
|
| +bool getPermissionType(const AtomicString& name,
|
| + mojom::blink::PermissionName* result) {
|
| for (const SupportedPermission& permission : kSupportedPermissions) {
|
| if (name == permission.name) {
|
| if (result)
|
| @@ -49,16 +50,16 @@ DEFINE_TRACE(HTMLIFrameElementPermissions) {
|
| DOMTokenListObserver::trace(visitor);
|
| }
|
|
|
| -Vector<WebPermissionType>
|
| +Vector<mojom::blink::PermissionName>
|
| HTMLIFrameElementPermissions::parseDelegatedPermissions(
|
| String& invalidTokensErrorMessage) const {
|
| - Vector<WebPermissionType> permissions;
|
| + Vector<blink::mojom::blink::PermissionName> permissions;
|
| unsigned numTokenErrors = 0;
|
| StringBuilder tokenErrors;
|
| const SpaceSplitString& tokens = this->tokens();
|
|
|
| for (size_t i = 0; i < tokens.size(); ++i) {
|
| - WebPermissionType type;
|
| + blink::mojom::blink::PermissionName type;
|
| if (getPermissionType(tokens[i], &type)) {
|
| permissions.push_back(type);
|
| } else {
|
| @@ -86,7 +87,7 @@ HTMLIFrameElementPermissions::parseDelegatedPermissions(
|
| bool HTMLIFrameElementPermissions::validateTokenValue(
|
| const AtomicString& tokenValue,
|
| ExceptionState&) const {
|
| - WebPermissionType unused;
|
| + mojom::blink::PermissionName unused;
|
| return getPermissionType(tokenValue, &unused);
|
| }
|
|
|
|
|