Modified old wait sync point functions to also accept new sync tokens.

third_party/WebKit/Source/platform/graphics/gpu/DrawingBufferTest.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 77 matching lines @@
     {
         return m_mostRecentlyProducedSize;
     }
 
     unsigned insertSyncPoint() override
     {
         static unsigned syncPointGenerator = 0;
         return ++syncPointGenerator;
     }
 
-    void waitSyncPoint(unsigned syncPoint) override
+    void waitSyncPoint(unsigned syncPoint, const WGC3Dbyte* syncToken) override
     {
         m_mostRecentlyWaitedSyncPoint = syncPoint;
+        if (syncToken) {
+            memcpy(m_mostRecentlyWaitedSyncToken, syncToken,
+                sizeof(m_mostRecentlyWaitedSyncToken));
+        }
     }
 
     WGC3Duint createGpuMemoryBufferImageCHROMIUM(WGC3Dsizei width, WGC3Dsizei height, WGC3Denum internalformat, WGC3Denum usage) override
     {
         m_imageSizes.set(m_currentImageId, IntSize(width, height));
         return m_currentImageId++;
     }
 
     MOCK_METHOD1(destroyImageMock, void(WGC3Duint imageId));
     void destroyImageCHROMIUM(WGC3Duint imageId)
@@ skipping 23 matching lines @@
             m_imageToTextureMap.remove(imageId);
             releaseTexImage2DMock(imageId);
         }
     }
 
     unsigned mostRecentlyWaitedSyncPoint()
     {
         return m_mostRecentlyWaitedSyncPoint;
     }
 
+    const WGC3Dbyte* mostRecentlyWaitedSyncToken()
+    {
+        return m_mostRecentlyWaitedSyncToken;
+    }
+
     WGC3Duint nextImageIdToBeCreated()
     {
         return m_currentImageId;
     }
 
 private:
     WebGLId m_boundTexture;
     HashMap<WebGLId, IntSize> m_textureSizes;
     WGC3Dbyte m_currentMailboxByte;
     IntSize m_mostRecentlyProducedSize;
     unsigned m_mostRecentlyWaitedSyncPoint;
+    WGC3Dbyte m_mostRecentlyWaitedSyncToken[24];

[Justin Novosad, 2015/10/27 19:24:15]

24 -> GL_SYNC_TOKEN_SIZE_CHROMIUM

[David Yen, 2015/10/28 22:03:43]

Changed so this is no longer relevant.

     WGC3Duint m_currentImageId;
     HashMap<WGC3Duint, IntSize> m_imageSizes;
     HashMap<WGC3Duint, WebGLId> m_imageToTextureMap;
 };
 
 static const int initialWidth = 100;
 static const int initialHeight = 100;
 static const int alternateHeight = 50;
 
 class DrawingBufferForTests : public DrawingBuffer {
@@ skipping 493 matching lines @@
     mailbox.syncPoint = waitSyncPoint;
     m_drawingBuffer->setIsHidden(true);
     m_drawingBuffer->mailboxReleased(mailbox);
     // m_drawingBuffer deletes mailbox immediately when hidden.
     EXPECT_EQ(waitSyncPoint, webContext()->mostRecentlyWaitedSyncPoint());
 
     m_drawingBuffer->beginDestruction();
 }
 
 } // namespace blink