Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(972)

Side by Side Diff: third_party/WebKit/Source/modules/canvas/HTMLCanvasElementModule.cpp

Issue 2335903003: Revert of Disallow users modify canvas after it transfers control to offscreen (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "modules/canvas/HTMLCanvasElementModule.h" 5 #include "modules/canvas/HTMLCanvasElementModule.h"
6 6
7 #include "core/dom/DOMNodeIds.h" 7 #include "core/dom/DOMNodeIds.h"
8 #include "core/html/canvas/CanvasContextCreationAttributes.h" 8 #include "core/html/canvas/CanvasContextCreationAttributes.h"
9 #include "core/html/canvas/CanvasRenderingContext.h" 9 #include "core/html/canvas/CanvasRenderingContext.h"
10 #include "core/offscreencanvas/OffscreenCanvas.h" 10 #include "core/offscreencanvas/OffscreenCanvas.h"
11 11
12 namespace blink { 12 namespace blink {
13 13
14 void HTMLCanvasElementModule::getContext(HTMLCanvasElement& canvas, const String & type, const CanvasContextCreationAttributes& attributes, ExceptionState& excep tionState, RenderingContext& result) 14 void HTMLCanvasElementModule::getContext(HTMLCanvasElement& canvas, const String & type, const CanvasContextCreationAttributes& attributes, RenderingContext& res ult)
15 { 15 {
16 if (canvas.surfaceLayerBridge()) {
17 // The existence of canvas surfaceLayerBridge indicates that HTMLCanvasE lement.transferControlToOffscreen() has been called.
18 exceptionState.throwDOMException(InvalidStateError, "Cannot get context from a canvas that has transferred its control to offscreen.");
19 }
20
21 CanvasRenderingContext* context = canvas.getCanvasRenderingContext(type, att ributes); 16 CanvasRenderingContext* context = canvas.getCanvasRenderingContext(type, att ributes);
22 if (context) { 17 if (context) {
23 context->setCanvasGetContextResult(result); 18 context->setCanvasGetContextResult(result);
24 } 19 }
25 } 20 }
26 21
27 OffscreenCanvas* HTMLCanvasElementModule::transferControlToOffscreen(HTMLCanvasE lement& canvas, ExceptionState& exceptionState) 22 OffscreenCanvas* HTMLCanvasElementModule::transferControlToOffscreen(HTMLCanvasE lement& canvas, ExceptionState& exceptionState)
28 { 23 {
29 if (!canvas.createSurfaceLayer()) { 24 if (!canvas.createSurfaceLayer()) {
30 exceptionState.throwDOMException(V8Error, "Offscreen canvas creation fai led due to an internal timeout."); 25 exceptionState.throwDOMException(V8Error, "Offscreen canvas creation fai led due to an internal timeout.");
(...skipping 15 matching lines...) Expand all
46 CanvasSurfaceLayerBridge* bridge = canvas.surfaceLayerBridge(); 41 CanvasSurfaceLayerBridge* bridge = canvas.surfaceLayerBridge();
47 if (bridge) { 42 if (bridge) {
48 // If a bridge exists, it means canvas.createSurfaceLayer() has been cal led 43 // If a bridge exists, it means canvas.createSurfaceLayer() has been cal led
49 // and its SurfaceId has been populated as well. 44 // and its SurfaceId has been populated as well.
50 offscreenCanvas->setSurfaceId(bridge->getSurfaceId().client_id(), bridge ->getSurfaceId().local_id(), bridge->getSurfaceId().nonce()); 45 offscreenCanvas->setSurfaceId(bridge->getSurfaceId().client_id(), bridge ->getSurfaceId().local_id(), bridge->getSurfaceId().nonce());
51 } 46 }
52 return offscreenCanvas; 47 return offscreenCanvas;
53 } 48 }
54 49
55 } 50 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698