Revert of Move ScriptState::GetExecutionContext (Part 5)

third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.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/canvas2d/BaseRenderingContext2D.h"
 
 #include "bindings/core/v8/ExceptionMessages.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/css/cssom/CSSURLImageValue.h"
 #include "core/css/parser/CSSParser.h"
-#include "core/dom/ExecutionContext.h"
 #include "core/dom/NotShared.h"
 #include "core/frame/ImageBitmap.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLImageElement.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/html/ImageData.h"
 #include "core/offscreencanvas/OffscreenCanvas.h"
 #include "core/svg/SVGImageElement.h"
 #include "modules/canvas2d/CanvasGradient.h"
 #include "modules/canvas2d/CanvasPattern.h"
@@ skipping 1325 matching lines @@
           ExpensiveCanvasHeuristicParameters::kExpensiveImageSizeRatio)
     is_expensive = true;
 
   if (is_expensive) {
     ImageBuffer* buffer = GetImageBuffer();
     if (buffer)
       buffer->SetHasExpensiveOp();
   }
 
   if (OriginClean() &&
-      WouldTaintOrigin(image_source, ExecutionContext::From(script_state)))
+      WouldTaintOrigin(image_source, script_state->GetExecutionContext()))
     SetOriginTainted();
 }
 
 void BaseRenderingContext2D::ClearCanvas() {
   FloatRect canvas_rect(0, 0, Width(), Height());
   CheckOverdraw(canvas_rect, 0, CanvasRenderingContext2DState::kNoImage,
                 kClipFill);
   PaintCanvas* c = DrawingCanvas();
   if (c)
     c->clear(HasAlpha() ? SK_ColorTRANSPARENT : SK_ColorBLACK);
@@ skipping 94 matching lines @@
       break;
     case kIncompleteSourceImageStatus:
       return nullptr;
     default:
       NOTREACHED();
       return nullptr;
   }
   DCHECK(image_for_rendering);
 
   bool origin_clean =
-      !WouldTaintOrigin(image_source, ExecutionContext::From(script_state));
+      !WouldTaintOrigin(image_source, script_state->GetExecutionContext());
 
   return CanvasPattern::Create(image_for_rendering.Release(), repeat_mode,
                                origin_clean);
 }
 
 bool BaseRenderingContext2D::ComputeDirtyRect(const FloatRect& local_rect,
                                               SkIRect* dirty_rect) {
   SkIRect clip_bounds;
   if (!DrawingCanvas()->getDeviceClipBounds(&clip_bounds))
     return false;
@@ skipping 569 matching lines @@
       ExpensiveCanvasHeuristicParameters::kShadowFixedCost[index] *
           usage_counters_.num_blurred_shadows +
       ExpensiveCanvasHeuristicParameters::
               kShadowVariableCostPerAreaTimesShadowBlurSquared[index] *
           usage_counters_.bounding_box_area_times_shadow_blur_squared;
 
   return basic_cost_of_draw_calls + fill_type_adjustment + shadow_adjustment;
 }
 
 }  // namespace blink