Revert of Move ScriptState::GetExecutionContext (Part 5)

third_party/WebKit/Source/modules/permissions/Permissions.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/permissions/Permissions.h"
 
 #include <memory>
 #include "bindings/core/v8/Dictionary.h"
 #include "bindings/core/v8/Nullable.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/modules/v8/V8MidiPermissionDescriptor.h"
 #include "bindings/modules/v8/V8PermissionDescriptor.h"
 #include "bindings/modules/v8/V8PushPermissionDescriptor.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
-#include "core/dom/ExecutionContext.h"
 #include "core/frame/LocalFrame.h"
 #include "modules/permissions/PermissionDescriptor.h"
 #include "modules/permissions/PermissionStatus.h"
 #include "modules/permissions/PermissionUtils.h"
 #include "platform/UserGestureIndicator.h"
 #include "platform/wtf/Functional.h"
 #include "platform/wtf/NotFound.h"
 #include "platform/wtf/PtrUtil.h"
 #include "platform/wtf/Vector.h"
 #include "public/platform/Platform.h"
@@ skipping 73 matching lines @@
   ExceptionState exception_state(script_state->GetIsolate(),
                                  ExceptionState::kGetterContext, "Permissions",
                                  "query");
   PermissionDescriptorPtr descriptor =
       ParsePermission(script_state, raw_permission, exception_state);
   if (exception_state.HadException())
     return exception_state.Reject(script_state);
 
   // This must be called after `parsePermission` because the website might
   // be able to run code.
-  PermissionService* service = GetService(ExecutionContext::From(script_state));
+  PermissionService* service = GetService(script_state->GetExecutionContext());
   if (!service)
     return ScriptPromise::RejectWithDOMException(
         script_state,
         DOMException::Create(
             kInvalidStateError,
             "In its current state, the global scope can't query permissions."));
 
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::Create(script_state);
   ScriptPromise promise = resolver->Promise();
 
   // If the current origin is a file scheme, it will unlikely return a
   // meaningful value because most APIs are broken on file scheme and no
   // permission prompt will be shown even if the returned permission will most
   // likely be "prompt".
   PermissionDescriptorPtr descriptor_copy = descriptor->Clone();
   service->HasPermission(
       std::move(descriptor),
-      ExecutionContext::From(script_state)->GetSecurityOrigin(),
+      script_state->GetExecutionContext()->GetSecurityOrigin(),
       ConvertToBaseCallback(WTF::Bind(
           &Permissions::TaskComplete, WrapPersistent(this),
           WrapPersistent(resolver), WTF::Passed(std::move(descriptor_copy)))));
   return promise;
 }
 
 ScriptPromise Permissions::request(ScriptState* script_state,
                                    const Dictionary& raw_permission) {
   ExceptionState exception_state(script_state->GetIsolate(),
                                  ExceptionState::kGetterContext, "Permissions",
                                  "request");
   PermissionDescriptorPtr descriptor =
       ParsePermission(script_state, raw_permission, exception_state);
   if (exception_state.HadException())
     return exception_state.Reject(script_state);
 
   // This must be called after `parsePermission` because the website might
   // be able to run code.
-  PermissionService* service = GetService(ExecutionContext::From(script_state));
+  PermissionService* service = GetService(script_state->GetExecutionContext());
   if (!service)
     return ScriptPromise::RejectWithDOMException(
         script_state, DOMException::Create(kInvalidStateError,
                                            "In its current state, the global "
                                            "scope can't request permissions."));
 
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::Create(script_state);
   ScriptPromise promise = resolver->Promise();
 
   PermissionDescriptorPtr descriptor_copy = descriptor->Clone();
   service->RequestPermission(
       std::move(descriptor),
-      ExecutionContext::From(script_state)->GetSecurityOrigin(),
+      script_state->GetExecutionContext()->GetSecurityOrigin(),
       UserGestureIndicator::ProcessingUserGestureThreadSafe(),
       ConvertToBaseCallback(WTF::Bind(
           &Permissions::TaskComplete, WrapPersistent(this),
           WrapPersistent(resolver), WTF::Passed(std::move(descriptor_copy)))));
   return promise;
 }
 
 ScriptPromise Permissions::revoke(ScriptState* script_state,
                                   const Dictionary& raw_permission) {
   ExceptionState exception_state(script_state->GetIsolate(),
                                  ExceptionState::kGetterContext, "Permissions",
                                  "revoke");
   PermissionDescriptorPtr descriptor =
       ParsePermission(script_state, raw_permission, exception_state);
   if (exception_state.HadException())
     return exception_state.Reject(script_state);
 
   // This must be called after `parsePermission` because the website might
   // be able to run code.
-  PermissionService* service = GetService(ExecutionContext::From(script_state));
+  PermissionService* service = GetService(script_state->GetExecutionContext());
   if (!service)
     return ScriptPromise::RejectWithDOMException(
         script_state, DOMException::Create(kInvalidStateError,
                                            "In its current state, the global "
                                            "scope can't revoke permissions."));
 
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::Create(script_state);
   ScriptPromise promise = resolver->Promise();
 
   PermissionDescriptorPtr descriptor_copy = descriptor->Clone();
   service->RevokePermission(
       std::move(descriptor),
-      ExecutionContext::From(script_state)->GetSecurityOrigin(),
+      script_state->GetExecutionContext()->GetSecurityOrigin(),
       ConvertToBaseCallback(WTF::Bind(
           &Permissions::TaskComplete, WrapPersistent(this),
           WrapPersistent(resolver), WTF::Passed(std::move(descriptor_copy)))));
   return promise;
 }
 
 ScriptPromise Permissions::requestAll(
     ScriptState* script_state,
     const Vector<Dictionary>& raw_permissions) {
   ExceptionState exception_state(script_state->GetIsolate(),
@@ skipping 20 matching lines @@
     }
     if (internal_index == kNotFound) {
       internal_index = internal_permissions.size();
       internal_permissions.push_back(std::move(descriptor));
     }
     caller_index_to_internal_index[i] = internal_index;
   }
 
   // This must be called after `parsePermission` because the website might
   // be able to run code.
-  PermissionService* service = GetService(ExecutionContext::From(script_state));
+  PermissionService* service = GetService(script_state->GetExecutionContext());
   if (!service)
     return ScriptPromise::RejectWithDOMException(
         script_state, DOMException::Create(kInvalidStateError,
                                            "In its current state, the global "
                                            "scope can't request permissions."));
 
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::Create(script_state);
   ScriptPromise promise = resolver->Promise();
 
   Vector<PermissionDescriptorPtr> internal_permissions_copy;
   internal_permissions_copy.ReserveCapacity(internal_permissions.size());
   for (const auto& descriptor : internal_permissions)
     internal_permissions_copy.push_back(descriptor->Clone());
 
   service->RequestPermissions(
       std::move(internal_permissions),
-      ExecutionContext::From(script_state)->GetSecurityOrigin(),
+      script_state->GetExecutionContext()->GetSecurityOrigin(),
       UserGestureIndicator::ProcessingUserGestureThreadSafe(),
       ConvertToBaseCallback(
           WTF::Bind(&Permissions::BatchTaskComplete, WrapPersistent(this),
                     WrapPersistent(resolver),
                     WTF::Passed(std::move(internal_permissions_copy)),
                     WTF::Passed(std::move(caller_index_to_internal_index)))));
   return promise;
 }
 
 PermissionService* Permissions::GetService(
@@ skipping 35 matching lines @@
   result.ReserveInitialCapacity(caller_index_to_internal_index.size());
   for (int internal_index : caller_index_to_internal_index) {
     result.push_back(PermissionStatus::CreateAndListen(
         resolver->GetExecutionContext(), results[internal_index],
         descriptors[internal_index]->Clone()));
   }
   resolver->Resolve(result);
 }
 
 }  // namespace blink