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

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

Issue 2379653006: Replaced cc::SurfaceId::nonce_ with base::UnguessableToken (Closed)
Patch Set: Changed SurfaceManager::kRootSurfaceId to a private field to avoid static initialization 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 offscreenCanvas->setAssociatedCanvasId(DOMNodeIds::idForNode(&canvas)); 68 offscreenCanvas->setAssociatedCanvasId(DOMNodeIds::idForNode(&canvas));
69 69
70 CanvasSurfaceLayerBridge* bridge = canvas.surfaceLayerBridge(); 70 CanvasSurfaceLayerBridge* bridge = canvas.surfaceLayerBridge();
71 if (bridge) { 71 if (bridge) {
72 // If a bridge exists, it means canvas.createSurfaceLayer() has been called 72 // If a bridge exists, it means canvas.createSurfaceLayer() has been called
73 // and its SurfaceId has been populated as well. 73 // and its SurfaceId has been populated as well.
74 offscreenCanvas->setSurfaceId( 74 offscreenCanvas->setSurfaceId(
75 bridge->getSurfaceId().frame_sink_id().client_id(), 75 bridge->getSurfaceId().frame_sink_id().client_id(),
76 bridge->getSurfaceId().frame_sink_id().sink_id(), 76 bridge->getSurfaceId().frame_sink_id().sink_id(),
77 bridge->getSurfaceId().local_frame_id().local_id(), 77 bridge->getSurfaceId().local_frame_id().local_id(),
78 bridge->getSurfaceId().local_frame_id().nonce()); 78 bridge->getSurfaceId()
79 .local_frame_id()
80 .nonce()
81 .GetHighForSerialization(),
82 bridge->getSurfaceId()
83 .local_frame_id()
84 .nonce()
85 .GetLowForSerialization());
79 } 86 }
80 return offscreenCanvas; 87 return offscreenCanvas;
81 } 88 }
82 } 89 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698