Revert of Replaced cc::SurfaceId::nonce_ with base::UnguessableToken

third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp

Index: third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp b/third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp
index 379ef8f1301e4e957b9aa6387aadc71c9aeab83d..a891e84154d7fc68777ffb5ae9eef2f5c63f9781 100644
--- a/third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp
@@ -370,8 +370,7 @@
     uint32_t clientId,
     uint32_t sinkId,
     uint32_t localId,
-    uint64_t nonceHigh,
-    uint64_t nonceLow) {
+    uint64_t nonce) {
   append(OffscreenCanvasTransferTag);
   doWriteUint32(width);
   doWriteUint32(height);
@@ -379,8 +378,7 @@
   doWriteUint32(clientId);
   doWriteUint32(sinkId);
   doWriteUint32(localId);
-  doWriteUint64(nonceHigh);
-  doWriteUint64(nonceLow);
+  doWriteUint64(nonce);
 }
 
 void SerializedScriptValueWriter::writeTransferredSharedArrayBuffer(
@@ -1331,7 +1329,7 @@
       offscreenCanvas->width(), offscreenCanvas->height(),
       offscreenCanvas->getAssociatedCanvasId(), offscreenCanvas->clientId(),
       offscreenCanvas->sinkId(), offscreenCanvas->localId(),
-      offscreenCanvas->nonceHigh(), offscreenCanvas->nonceLow());
+      offscreenCanvas->nonce());
   return nullptr;
 }
 
@@ -1712,7 +1710,7 @@
       if (!m_version)
         return false;
       uint32_t width, height, canvasId, clientId, sinkId, localId;
-      uint64_t nonceHigh, nonceLow;
+      uint64_t nonce;
       if (!doReadUint32(&width))
         return false;
       if (!doReadUint32(&height))
@@ -1725,11 +1723,10 @@
         return false;
       if (!doReadUint32(&localId))
         return false;
-      if (!doReadUint64(&nonceHigh) || !doReadUint64(&nonceLow))
+      if (!doReadUint64(&nonce))
         return false;
       if (!deserializer.tryGetTransferredOffscreenCanvas(
-              width, height, canvasId, clientId, sinkId, localId, nonceHigh,
-              nonceLow, value))
+              width, height, canvasId, clientId, sinkId, localId, nonce, value))
         return false;
       break;
     }
@@ -2596,12 +2593,11 @@
     uint32_t clientId,
     uint32_t sinkId,
     uint32_t localId,
-    uint64_t nonceHigh,
-    uint64_t nonceLow,
+    uint64_t nonce,
     v8::Local<v8::Value>* object) {
   OffscreenCanvas* offscreenCanvas = OffscreenCanvas::create(width, height);
   offscreenCanvas->setAssociatedCanvasId(canvasId);
-  offscreenCanvas->setSurfaceId(clientId, sinkId, localId, nonceHigh, nonceLow);
+  offscreenCanvas->setSurfaceId(clientId, sinkId, localId, nonce);
   *object = toV8(offscreenCanvas, m_reader.getScriptState());
   if ((*object).IsEmpty())
     return false;