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

Unified Diff: third_party/WebKit/Source/bindings/core/v8/serialization/V8ScriptValueDeserializer.cpp

Issue 2494833002: Revert of Replaced cc::SurfaceId::nonce_ with base::UnguessableToken (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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/bindings/core/v8/serialization/V8ScriptValueDeserializer.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/serialization/V8ScriptValueDeserializer.cpp b/third_party/WebKit/Source/bindings/core/v8/serialization/V8ScriptValueDeserializer.cpp
index 62c40201544db510fa70ea2d94d29978c9e683f7..0984478747948cea40a6a06a54fde621e53d48de 100644
--- a/third_party/WebKit/Source/bindings/core/v8/serialization/V8ScriptValueDeserializer.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/serialization/V8ScriptValueDeserializer.cpp
@@ -236,15 +236,14 @@
case OffscreenCanvasTransferTag: {
uint32_t width = 0, height = 0, canvasId = 0, clientId = 0, sinkId = 0,
localId = 0;
- uint64_t nonceHigh = 0, nonceLow = 0;
+ uint64_t nonce = 0;
if (!readUint32(&width) || !readUint32(&height) ||
!readUint32(&canvasId) || !readUint32(&clientId) ||
- !readUint32(&sinkId) || !readUint32(&localId) ||
- !readUint64(&nonceHigh) || !readUint64(&nonceLow))
+ !readUint32(&sinkId) || !readUint32(&localId) || !readUint64(&nonce))
return nullptr;
OffscreenCanvas* canvas = OffscreenCanvas::create(width, height);
canvas->setAssociatedCanvasId(canvasId);
- canvas->setSurfaceId(clientId, sinkId, localId, nonceHigh, nonceLow);
+ canvas->setSurfaceId(clientId, sinkId, localId, nonce);
return canvas;
}
default:

Powered by Google App Engine
This is Rietveld 408576698