Revamp OffscreenCanvas commit flow

third_party/WebKit/Source/core/offscreencanvas/OffscreenCanvas.h

Index: third_party/WebKit/Source/core/offscreencanvas/OffscreenCanvas.h
diff --git a/third_party/WebKit/Source/core/offscreencanvas/OffscreenCanvas.h b/third_party/WebKit/Source/core/offscreencanvas/OffscreenCanvas.h
index 7640b0b5a2a5d8be0578df046356d5a1f21473bd..e3f175ad4e58cfa3b8be7c47300784bd4838327a 100644
--- a/third_party/WebKit/Source/core/offscreencanvas/OffscreenCanvas.h
+++ b/third_party/WebKit/Source/core/offscreencanvas/OffscreenCanvas.h
@@ -75,22 +75,12 @@ class CORE_EXPORT OffscreenCanvas final : public EventTargetWithInlineData,
 
   OffscreenCanvasFrameDispatcher* getOrCreateFrameDispatcher();
 
-  void setSurfaceId(uint32_t clientId,
-                    uint32_t sinkId,
-                    uint32_t localId,
-                    uint64_t nonceHigh,
-                    uint64_t nonceLow) {
+  void setFrameSinkId(uint32_t clientId, uint32_t sinkId) {
     m_clientId = clientId;
     m_sinkId = sinkId;
-    m_localId = localId;
-    m_nonceHigh = nonceHigh;
-    m_nonceLow = nonceLow;
   }
   uint32_t clientId() const { return m_clientId; }
   uint32_t sinkId() const { return m_sinkId; }
-  uint32_t localId() const { return m_localId; }
-  uint64_t nonceHigh() const { return m_nonceHigh; }
-  uint64_t nonceLow() const { return m_nonceLow; }
 
   void setExecutionContext(ExecutionContext* context) {
     m_executionContext = context;
@@ -155,16 +145,13 @@ class CORE_EXPORT OffscreenCanvas final : public EventTargetWithInlineData,
   bool isPaintable() const;
 
   std::unique_ptr<OffscreenCanvasFrameDispatcher> m_frameDispatcher;
-  // cc::SurfaceId is broken into three integer components as this can be used
+  // cc::FrameSinkId is broken into two integer components as this can be used
   // in transfer of OffscreenCanvas across threads
   // If this object is not created via
   // HTMLCanvasElement.transferControlToOffscreen(),
   // then the following members would remain as initialized zero values.
   uint32_t m_clientId = 0;
   uint32_t m_sinkId = 0;
-  uint32_t m_localId = 0;
-  uint64_t m_nonceHigh = 0;
-  uint64_t m_nonceLow = 0;
 };
 
 }  // namespace blink