Revert of Move ScriptState::GetExecutionContext (Part 5)

third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 16 matching lines @@
 
 #include <memory>
 #include "bindings/core/v8/ExceptionMessages.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptWrappableVisitor.h"
 #include "bindings/core/v8/V8BindingMacros.h"
 #include "bindings/modules/v8/HTMLCanvasElementOrOffscreenCanvas.h"
 #include "bindings/modules/v8/WebGLAny.h"
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/DOMTypedArray.h"
-#include "core/dom/ExecutionContext.h"
 #include "core/dom/FlexibleArrayBufferView.h"
 #include "core/dom/TaskRunnerHelper.h"
 #include "core/frame/ImageBitmap.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/LocalFrameClient.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLImageElement.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/html/ImageData.h"
@@ skipping 593 matching lines @@
     HTMLCanvasElement* canvas,
     ScriptState* script_state,
     const CanvasContextCreationAttributes& attributes,
     unsigned web_gl_version) {
   // Exactly one of these must be provided.
   DCHECK_EQ(!canvas, !!script_state);
   // The canvas is only given on the main thread.
   DCHECK(!canvas || IsMainThread());
 
   auto execution_context = canvas ? canvas->GetDocument().GetExecutionContext()
-                                  : ExecutionContext::From(script_state);
+                                  : script_state->GetExecutionContext();
   Platform::ContextAttributes context_attributes = ToPlatformContextAttributes(
       attributes, web_gl_version,
       SupportOwnOffscreenSurface(execution_context));
 
   Platform::GraphicsInfo gl_info;
   std::unique_ptr<WebGraphicsContext3DProvider> context_provider;
   const auto& url = canvas ? canvas->GetDocument().TopDocument().Url()
-                           : ExecutionContext::From(script_state)->Url();
+                           : script_state->GetExecutionContext()->Url();
   if (IsMainThread()) {
     context_provider = WTF::WrapUnique(
         Platform::Current()->CreateOffscreenGraphicsContext3DProvider(
             context_attributes, url, 0, &gl_info));
   } else {
     context_provider =
         CreateContextProviderOnWorkerThread(context_attributes, &gl_info, url);
   }
   if (context_provider && !context_provider->BindToCurrentThread()) {
     context_provider = nullptr;
@@ skipping 60 matching lines @@
 }
 
 void WebGLRenderingContextBase::ForceNextWebGLContextCreationToFail() {
   g_should_fail_context_creation_for_testing = true;
 }
 
 ImageBitmap* WebGLRenderingContextBase::TransferToImageBitmapBase(
     ScriptState* script_state) {
   UseCounter::Feature feature =
       UseCounter::kOffscreenCanvasTransferToImageBitmapWebGL;
-  UseCounter::Count(ExecutionContext::From(script_state), feature);
+  UseCounter::Count(script_state->GetExecutionContext(), feature);
   if (!GetDrawingBuffer())
     return nullptr;
   return ImageBitmap::Create(GetDrawingBuffer()->TransferToStaticBitmapImage());
 }
 
 ScriptPromise WebGLRenderingContextBase::commit(
     ScriptState* script_state,
     ExceptionState& exception_state) {
   UseCounter::Feature feature = UseCounter::kOffscreenCanvasCommitWebGL;
-  UseCounter::Count(ExecutionContext::From(script_state), feature);
+  UseCounter::Count(script_state->GetExecutionContext(), feature);
   if (!offscreenCanvas()) {
     exception_state.ThrowDOMException(kInvalidStateError,
                                       "Commit() was called on a rendering "
                                       "context that was not created from an "
                                       "OffscreenCanvas.");
     return exception_state.Reject(script_state);
   }
   // no HTMLCanvas associated, thrown InvalidStateError
   if (!offscreenCanvas()->HasPlaceholderCanvas()) {
     exception_state.ThrowDOMException(
@@ skipping 7073 matching lines @@
 
 void WebGLRenderingContextBase::getHTMLOrOffscreenCanvas(
     HTMLCanvasElementOrOffscreenCanvas& result) const {
   if (canvas())
     result.setHTMLCanvasElement(canvas());
   else
     result.setOffscreenCanvas(offscreenCanvas());
 }
 
 }  // namespace blink