Revert of Move ScriptState::GetExecutionContext (Part 5)

third_party/WebKit/Source/modules/vr/VRDisplay.cpp

 // Copyright 2016 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/vr/VRDisplay.h"
 
 #include "core/css/StylePropertySet.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/FrameRequestCallback.h"
 #include "core/dom/ScriptedAnimationController.h"
@@ skipping 18 matching lines @@
 #include "modules/vr/VRStageParameters.h"
 #include "modules/webgl/WebGLRenderingContextBase.h"
 #include "platform/Histogram.h"
 #include "platform/UserGestureIndicator.h"
 #include "platform/instrumentation/tracing/TraceEvent.h"
 #include "platform/wtf/AutoReset.h"
 #include "platform/wtf/Time.h"
 #include "public/platform/Platform.h"
 
 #include <array>
-#include "core/dom/ExecutionContext.h"
 
 namespace blink {
 
 namespace {
 
 VREye StringToVREye(const String& which_eye) {
   if (which_eye == "left")
     return kVREyeLeft;
   if (which_eye == "right")
     return kVREyeRight;
@@ skipping 121 matching lines @@
   // result.
   DEFINE_STATIC_LOCAL(
       EnumerationHistogram, vr_presentation_result_histogram,
       ("VRDisplayPresentResult",
        static_cast<int>(PresentationResult::kPresentationResultMax)));
   vr_presentation_result_histogram.Count(static_cast<int>(result));
 }
 
 ScriptPromise VRDisplay::requestPresent(ScriptState* script_state,
                                         const HeapVector<VRLayer>& layers) {
-  ExecutionContext* execution_context = ExecutionContext::From(script_state);
+  ExecutionContext* execution_context = script_state->GetExecutionContext();
   UseCounter::Count(execution_context, UseCounter::kVRRequestPresent);
   if (!execution_context->IsSecureContext()) {
     UseCounter::Count(execution_context,
                       UseCounter::kVRRequestPresentInsecureOrigin);
   }
 
   ReportPresentationResult(PresentationResult::kRequested);
 
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::Create(script_state);
   ScriptPromise promise = resolver->Promise();
@@ skipping 80 matching lines @@
     return promise;
   }
 
   if (!pending_present_resolvers_.IsEmpty()) {
     // If we are waiting on the results of a previous requestPresent call don't
     // fire a new request, just cache the resolver and resolve it when the
     // original request returns.
     pending_present_resolvers_.push_back(resolver);
   } else if (first_present) {
     bool secure_context =
-        ExecutionContext::From(script_state)->IsSecureContext();
+        script_state->GetExecutionContext()->IsSecureContext();
     if (!display_) {
       ForceExitPresent();
       DOMException* exception = DOMException::Create(
           kInvalidStateError, "The service is no longer active.");
       resolver->Reject(exception);
       return promise;
     }
 
     pending_present_resolvers_.push_back(resolver);
     submit_frame_client_binding_.Close();
@@ skipping 520 matching lines @@
   visitor->Trace(stage_parameters_);
   visitor->Trace(eye_parameters_left_);
   visitor->Trace(eye_parameters_right_);
   visitor->Trace(layer_);
   visitor->Trace(rendering_context_);
   visitor->Trace(scripted_animation_controller_);
   visitor->Trace(pending_present_resolvers_);
 }
 
 }  // namespace blink