Revert of Move ScriptState::GetExecutionContext (Part 5)

third_party/WebKit/Source/modules/offscreencanvas2d/OffscreenCanvasRenderingContext2D.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/offscreencanvas2d/OffscreenCanvasRenderingContext2D.h"
 
 #include "bindings/modules/v8/OffscreenCanvasRenderingContext2DOrWebGLRenderingContextOrWebGL2RenderingContext.h"
-#include "core/dom/ExecutionContext.h"
 #include "core/frame/ImageBitmap.h"
 #include "core/frame/Settings.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "core/workers/WorkerSettings.h"
 #include "platform/graphics/ImageBuffer.h"
 #include "platform/graphics/StaticBitmapImage.h"
 #include "platform/graphics/UnacceleratedImageBufferSurface.h"
 #include "platform/graphics/gpu/AcceleratedImageBufferSurface.h"
 #include "platform/graphics/paint/PaintCanvas.h"
 #include "platform/wtf/Assertions.h"
 #include "platform/wtf/CurrentTime.h"
 
 namespace blink {
 
 OffscreenCanvasRenderingContext2D::~OffscreenCanvasRenderingContext2D() {}
 
 OffscreenCanvasRenderingContext2D::OffscreenCanvasRenderingContext2D(
     ScriptState* script_state,
     OffscreenCanvas* canvas,
     const CanvasContextCreationAttributes& attrs)
     : CanvasRenderingContext(nullptr, canvas, attrs) {
-  ExecutionContext* execution_context = ExecutionContext::From(script_state);
+  ExecutionContext* execution_context = script_state->GetExecutionContext();
   if (execution_context->IsDocument()) {
     if (ToDocument(execution_context)
             ->GetSettings()
             ->GetDisableReadingFromCanvas())
       canvas->SetDisableReadingFromCanvasTrue();
     return;
   }
 
   WorkerSettings* worker_settings =
       ToWorkerGlobalScope(execution_context)->GetWorkerSettings();
   if (worker_settings && worker_settings->DisableReadingFromCanvas())
     canvas->SetDisableReadingFromCanvasTrue();
 }
 
 DEFINE_TRACE(OffscreenCanvasRenderingContext2D) {
   CanvasRenderingContext::Trace(visitor);
   BaseRenderingContext2D::Trace(visitor);
 }
 
 ScriptPromise OffscreenCanvasRenderingContext2D::commit(
     ScriptState* script_state,
     ExceptionState& exception_state) {
   UseCounter::Feature feature = UseCounter::kOffscreenCanvasCommit2D;
-  UseCounter::Count(ExecutionContext::From(script_state), feature);
+  UseCounter::Count(script_state->GetExecutionContext(), feature);
   if (!offscreenCanvas()->HasPlaceholderCanvas()) {
     // If an OffscreenCanvas has no associated canvas Id, it indicates that
     // it is not an OffscreenCanvas created by transfering control from html
     // canvas.
     exception_state.ThrowDOMException(
         kInvalidStateError,
         "Commit() was called on a context whose "
         "OffscreenCanvas is not associated with a "
         "canvas element.");
     return exception_state.Reject(script_state);
@@ skipping 86 matching lines @@
   RefPtr<StaticBitmapImage> image =
       StaticBitmapImage::Create(std::move(sk_image));
   image->SetOriginClean(this->OriginClean());
   return image;
 }
 
 ImageBitmap* OffscreenCanvasRenderingContext2D::TransferToImageBitmap(
     ScriptState* script_state) {
   UseCounter::Feature feature =
       UseCounter::kOffscreenCanvasTransferToImageBitmap2D;
-  UseCounter::Count(ExecutionContext::From(script_state), feature);
+  UseCounter::Count(script_state->GetExecutionContext(), feature);
   RefPtr<StaticBitmapImage> image = TransferToStaticBitmapImage();
   if (!image)
     return nullptr;
   image_buffer_.reset();  // "Transfer" means no retained buffer
   needs_matrix_clip_restore_ = true;
   return ImageBitmap::Create(std::move(image));
 }
 
 PassRefPtr<Image> OffscreenCanvasRenderingContext2D::GetImage(
     AccelerationHint hint,
@@ skipping 81 matching lines @@
 }
 
 bool OffscreenCanvasRenderingContext2D::IsPaintable() const {
   return this->GetImageBuffer();
 }
 
 bool OffscreenCanvasRenderingContext2D::IsAccelerated() const {
   return image_buffer_ && image_buffer_->IsAccelerated();
 }
 }