Revert of Move ScriptState::GetExecutionContext (Part 5)

third_party/WebKit/Source/modules/shapedetection/ShapeDetector.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/shapedetection/ShapeDetector.h"
 
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
-#include "core/dom/ExecutionContext.h"
 #include "core/frame/ImageBitmap.h"
 #include "core/frame/LocalFrame.h"
 #include "core/geometry/DOMRect.h"
 #include "core/html/HTMLImageElement.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/html/ImageData.h"
 #include "core/loader/resource/ImageResourceContent.h"
 #include "platform/graphics/Image.h"
 #include "platform/wtf/CheckedNumeric.h"
 #include "third_party/skia/include/core/SkImage.h"
@@ skipping 51 matching lines @@
   } else if (image_source.isOffscreenCanvas()) {
     canvas_image_source = image_source.getAsOffscreenCanvas();
   } else {
     NOTREACHED() << "Unsupported CanvasImageSource";
     resolver->Reject(
         DOMException::Create(kNotSupportedError, "Unsupported source."));
     return promise;
   }
 
   if (canvas_image_source->WouldTaintOrigin(
-          ExecutionContext::From(script_state)->GetSecurityOrigin())) {
+          script_state->GetExecutionContext()->GetSecurityOrigin())) {
     resolver->Reject(
         DOMException::Create(kSecurityError, "Source would taint origin."));
     return promise;
   }
 
   if (image_source.isHTMLImageElement()) {
     return DetectShapesOnImageElement(resolver,
                                       image_source.getAsHTMLImageElement());
   }
 
@@ skipping 139 matching lines @@
         kInvalidStateError,
         "Failed to read pixels: Unable to decompress or unsupported format."));
     return promise;
   }
 
   return DoDetect(resolver, std::move(shared_buffer_handle),
                   img->naturalWidth(), img->naturalHeight());
 }
 
 }  // namespace blink