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

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

Issue 2379653006: Replaced cc::SurfaceId::nonce_ with base::UnguessableToken (Closed)
Patch Set: Created 4 years, 2 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"
(...skipping 30 matching lines...) Expand all
41 exceptionState.throwDOMException(InvalidStateError, "Cannot transfer con trol from a canvas that has a rendering context."); 41 exceptionState.throwDOMException(InvalidStateError, "Cannot transfer con trol from a canvas that has a rendering context.");
42 return nullptr; 42 return nullptr;
43 } 43 }
44 OffscreenCanvas* offscreenCanvas = OffscreenCanvas::create(canvas.width(), c anvas.height()); 44 OffscreenCanvas* offscreenCanvas = OffscreenCanvas::create(canvas.width(), c anvas.height());
45 offscreenCanvas->setAssociatedCanvasId(DOMNodeIds::idForNode(&canvas)); 45 offscreenCanvas->setAssociatedCanvasId(DOMNodeIds::idForNode(&canvas));
46 46
47 CanvasSurfaceLayerBridge* bridge = canvas.surfaceLayerBridge(); 47 CanvasSurfaceLayerBridge* bridge = canvas.surfaceLayerBridge();
48 if (bridge) { 48 if (bridge) {
49 // If a bridge exists, it means canvas.createSurfaceLayer() has been cal led 49 // If a bridge exists, it means canvas.createSurfaceLayer() has been cal led
50 // and its SurfaceId has been populated as well. 50 // and its SurfaceId has been populated as well.
51 offscreenCanvas->setSurfaceId(bridge->getSurfaceId().client_id(), bridge ->getSurfaceId().local_id(), bridge->getSurfaceId().nonce()); 51 offscreenCanvas->setSurfaceId(bridge->getSurfaceId().client_id(), bridge ->getSurfaceId().local_id(), bridge->getSurfaceId().nonce().GetHighForSerializat ion(), bridge->getSurfaceId().nonce().GetLowForSerialization());
52 } 52 }
53 return offscreenCanvas; 53 return offscreenCanvas;
54 } 54 }
55 55
56 } 56 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698