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

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "bindings/core/v8/ScriptValueSerializer.h"
 
 #include "bindings/core/v8/Transferables.h"
 #include "bindings/core/v8/V8ArrayBuffer.h"
 #include "bindings/core/v8/V8ArrayBufferView.h"
 #include "bindings/core/v8/V8Blob.h"
@@ skipping 352 matching lines @@
   doWriteUint32(index);
 }
 
 void SerializedScriptValueWriter::writeTransferredOffscreenCanvas(
     uint32_t width,
     uint32_t height,
     uint32_t canvasId,
     uint32_t clientId,
     uint32_t sinkId,
     uint32_t localId,
-    uint64_t nonceHigh,
-    uint64_t nonceLow) {
+    uint64_t nonce) {
   append(OffscreenCanvasTransferTag);
   doWriteUint32(width);
   doWriteUint32(height);
   doWriteUint32(canvasId);
   doWriteUint32(clientId);
   doWriteUint32(sinkId);
   doWriteUint32(localId);
-  doWriteUint64(nonceHigh);
-  doWriteUint64(nonceLow);
+  doWriteUint64(nonce);
 }
 
 void SerializedScriptValueWriter::writeTransferredSharedArrayBuffer(
     uint32_t index) {
   ASSERT(RuntimeEnabledFeatures::sharedArrayBufferEnabled());
   append(SharedArrayBufferTransferTag);
   doWriteUint32(index);
 }
 
 void SerializedScriptValueWriter::writeObjectReference(uint32_t reference) {
@@ skipping 930 matching lines @@
         Status::DataCloneError,
         "An OffscreenCanvas is detached and could not be cloned.", next);
   if (offscreenCanvas->renderingContext())
     return handleError(Status::DataCloneError,
                        "An OffscreenCanvas with a context could not be cloned.",
                        next);
   m_writer.writeTransferredOffscreenCanvas(
       offscreenCanvas->width(), offscreenCanvas->height(),
       offscreenCanvas->getAssociatedCanvasId(), offscreenCanvas->clientId(),
       offscreenCanvas->sinkId(), offscreenCanvas->localId(),
-      offscreenCanvas->nonceHigh(), offscreenCanvas->nonceLow());
+      offscreenCanvas->nonce());
   return nullptr;
 }
 
 ScriptValueSerializer::StateBase*
 ScriptValueSerializer::writeTransferredSharedArrayBuffer(
     v8::Local<v8::Value> value,
     uint32_t index,
     StateBase* next) {
   ASSERT(RuntimeEnabledFeatures::sharedArrayBufferEnabled());
   DOMSharedArrayBuffer* sharedArrayBuffer =
@@ skipping 360 matching lines @@
       if (!doReadUint32(&index))
         return false;
       if (!deserializer.tryGetTransferredImageBitmap(index, value))
         return false;
       break;
     }
     case OffscreenCanvasTransferTag: {
       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))
         return false;
       if (!doReadUint32(&canvasId))
         return false;
       if (!doReadUint32(&clientId))
         return false;
       if (!doReadUint32(&sinkId))
         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;
     }
     case SharedArrayBufferTransferTag: {
       if (!m_version)
         return false;
       uint32_t index;
       if (!doReadUint32(&index))
         return false;
       if (!deserializer.tryGetTransferredSharedArrayBuffer(index, value))
@@ skipping 846 matching lines @@
   return true;
 }
 
 bool ScriptValueDeserializer::tryGetTransferredOffscreenCanvas(
     uint32_t width,
     uint32_t height,
     uint32_t canvasId,
     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;
   return true;
 }
 
 bool ScriptValueDeserializer::tryGetObjectFromObjectReference(
     uint32_t reference,
     v8::Local<v8::Value>* object) {
   if (reference >= m_objectPool.size())
@@ skipping 65 matching lines @@
       m_openCompositeReferenceStack[m_openCompositeReferenceStack.size() - 1];
   m_openCompositeReferenceStack.shrink(m_openCompositeReferenceStack.size() -
                                        1);
   if (objectReference >= m_objectPool.size())
     return false;
   *object = m_objectPool[objectReference];
   return true;
 }
 
 }  // namespace blink