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

third_party/WebKit/Source/platform/graphics/OffscreenCanvasFrameDispatcherImpl.cpp

 // Copyright 2016 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 "platform/graphics/OffscreenCanvasFrameDispatcherImpl.h"
 
 #include "cc/output/compositor_frame.h"
 #include "cc/output/delegated_frame_data.h"
 #include "cc/quads/render_pass.h"
 #include "cc/quads/shared_quad_state.h"
 #include "cc/quads/solid_color_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/resources/returned_resource.h"
 #include "public/platform/InterfaceProvider.h"
 #include "public/platform/Platform.h"
 #include "public/platform/modules/offscreencanvas/offscreen_canvas_surface.mojom-blink.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkXfermode.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/transform.h"
 
 namespace blink {
 
-OffscreenCanvasFrameDispatcherImpl::OffscreenCanvasFrameDispatcherImpl(uint32_t clientId, uint32_t localId, uint64_t nonce, int width, int height)
-    : m_surfaceId(cc::SurfaceId(clientId, localId, nonce))
+OffscreenCanvasFrameDispatcherImpl::OffscreenCanvasFrameDispatcherImpl(uint32_t clientId, uint32_t localId, uint64_t nonceHigh, uint64_t nonceLow, int width, int height)
+    : m_surfaceId(cc::SurfaceId(clientId, localId, base::UnguessableToken::Deserialize(nonceHigh, nonceLow)))
     , m_width(width)
     , m_height(height)
     , m_nextResourceId(1u)
     , m_binding(this)
 {
     DCHECK(!m_sink.is_bound());
     mojom::blink::OffscreenCanvasCompositorFrameSinkProviderPtr provider;
     Platform::current()->interfaceProvider()->getInterface(mojo::GetProxy(&provider));
     provider->CreateCompositorFrameSink(m_surfaceId, m_binding.CreateInterfacePtrAndBind(), mojo::GetProxy(&m_sink));
 }
@@ skipping 70 matching lines @@
 }
 
 bool OffscreenCanvasFrameDispatcherImpl::verifyImageSize(const sk_sp<SkImage>& image)
 {
     if (image && image->width() == m_width && image->height() == m_height)
         return true;
     return false;
 }
 
 } // namespace blink