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

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

Issue 2468263002: Handle exception when user call canvas.transferControlToOffscreen() twice (Closed)
Patch Set: Created 4 years, 1 month 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"
(...skipping 19 matching lines...) Expand all
30 CanvasRenderingContext* context = 30 CanvasRenderingContext* context =
31 canvas.getCanvasRenderingContext(type, attributes); 31 canvas.getCanvasRenderingContext(type, attributes);
32 if (context) { 32 if (context) {
33 context->setCanvasGetContextResult(result); 33 context->setCanvasGetContextResult(result);
34 } 34 }
35 } 35 }
36 36
37 OffscreenCanvas* HTMLCanvasElementModule::transferControlToOffscreen( 37 OffscreenCanvas* HTMLCanvasElementModule::transferControlToOffscreen(
38 HTMLCanvasElement& canvas, 38 HTMLCanvasElement& canvas,
39 ExceptionState& exceptionState) { 39 ExceptionState& exceptionState) {
40 if (!!canvas.surfaceLayerBridge()) {
Justin Novosad 2016/11/02 20:00:11 No need for !!
xlai (Olivia) 2016/11/02 20:07:50 Done.
41 exceptionState.throwDOMException(
42 InvalidStateError,
43 "Cannot transfer control from a canvas for more than one time.");
44 return nullptr;
45 }
46
40 if (!canvas.createSurfaceLayer()) { 47 if (!canvas.createSurfaceLayer()) {
41 exceptionState.throwDOMException( 48 exceptionState.throwDOMException(
42 V8Error, 49 V8Error,
43 "Offscreen canvas creation failed due to an internal timeout."); 50 "Offscreen canvas creation failed due to an internal timeout.");
44 return nullptr; 51 return nullptr;
45 } 52 }
46 53
47 return transferControlToOffscreenInternal(canvas, exceptionState); 54 return transferControlToOffscreenInternal(canvas, exceptionState);
48 } 55 }
49 56
(...skipping 16 matching lines...) Expand all
66 // and its SurfaceId has been populated as well. 73 // and its SurfaceId has been populated as well.
67 offscreenCanvas->setSurfaceId( 74 offscreenCanvas->setSurfaceId(
68 bridge->getSurfaceId().frame_sink_id().client_id(), 75 bridge->getSurfaceId().frame_sink_id().client_id(),
69 bridge->getSurfaceId().frame_sink_id().sink_id(), 76 bridge->getSurfaceId().frame_sink_id().sink_id(),
70 bridge->getSurfaceId().local_frame_id().local_id(), 77 bridge->getSurfaceId().local_frame_id().local_id(),
71 bridge->getSurfaceId().local_frame_id().nonce()); 78 bridge->getSurfaceId().local_frame_id().nonce());
72 } 79 }
73 return offscreenCanvas; 80 return offscreenCanvas;
74 } 81 }
75 } 82 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698