Index: third_party/WebKit/Source/modules/offscreencanvas/OffscreenCanvasModules.cpp |
diff --git a/third_party/WebKit/Source/modules/offscreencanvas/OffscreenCanvasModules.cpp b/third_party/WebKit/Source/modules/offscreencanvas/OffscreenCanvasModules.cpp |
index ea89f7b72db128a7c59a2b1d13142b45dcf12515..b560b2da77c481042eee8f56995a85b93b0deaf6 100644 |
--- a/third_party/WebKit/Source/modules/offscreencanvas/OffscreenCanvasModules.cpp |
+++ b/third_party/WebKit/Source/modules/offscreencanvas/OffscreenCanvasModules.cpp |
@@ -23,6 +23,9 @@ void OffscreenCanvasModules::getContext( |
return; |
} |
+ // OffscreenCanvas cannot be transferred after getContext, so this execution |
+ // context will always be the right one from here on. |
+ offscreenCanvas.setExecutionContext(scriptState->getExecutionContext()); |
CanvasRenderingContext* context = |
offscreenCanvas.getCanvasRenderingContext(scriptState, id, attributes); |
if (context) |