| Index: third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp
|
| diff --git a/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp b/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp
|
| index f9a13995a5ae22a94910445d31c6b528760ac555..94fe1557baa06297ce61ee18bca7f9d8a37f8e8b 100644
|
| --- a/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp
|
| +++ b/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp
|
| @@ -9,6 +9,7 @@
|
| #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"
|
| @@ -1354,7 +1355,7 @@ void BaseRenderingContext2D::drawImage(ScriptState* script_state,
|
| }
|
|
|
| if (OriginClean() &&
|
| - WouldTaintOrigin(image_source, script_state->GetExecutionContext()))
|
| + WouldTaintOrigin(image_source, ExecutionContext::From(script_state)))
|
| SetOriginTainted();
|
| }
|
|
|
| @@ -1469,7 +1470,7 @@ CanvasPattern* BaseRenderingContext2D::createPattern(
|
| DCHECK(image_for_rendering);
|
|
|
| bool origin_clean =
|
| - !WouldTaintOrigin(image_source, script_state->GetExecutionContext());
|
| + !WouldTaintOrigin(image_source, ExecutionContext::From(script_state));
|
|
|
| return CanvasPattern::Create(image_for_rendering.Release(), repeat_mode,
|
| origin_clean);
|
|
|