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 35 matching lines @@
 using testing::_;
 
 namespace blink {
 
 class WebGraphicsContext3DForTests : public MockWebGraphicsContext3D {
 public:
     WebGraphicsContext3DForTests()
         : MockWebGraphicsContext3D()
         , m_boundTexture(0)
         , m_currentMailboxByte(0)
-        , m_mostRecentlyWaitedSyncPoint(0)
-        , m_currentImageId(1) { }
+        , m_mostRecentlyWaitedSyncToken(0)
+        , m_currentImageId(1)
+    {
+    }
 
     void bindTexture(WGC3Denum target, WebGLId texture) override
     {
         if (target == GL_TEXTURE_2D) {
             m_boundTexture = texture;
         }
     }
 
     void texImage2D(WGC3Denum target, WGC3Dint level, WGC3Denum internalformat, WGC3Dsizei width, WGC3Dsizei height, WGC3Dint border, WGC3Denum format, WGC3Denum type, const void* pixels) override
     {
@@ skipping 14 matching lines @@
         ASSERT_EQ(target, static_cast<WGC3Denum>(GL_TEXTURE_2D));
         ASSERT_TRUE(m_textureSizes.contains(texture));
         m_mostRecentlyProducedSize = m_textureSizes.get(texture);
     }
 
     IntSize mostRecentlyProducedSize()
     {
         return m_mostRecentlyProducedSize;
     }
 
-    unsigned insertSyncPoint() override
+    bool insertSyncPoint(WGC3Dbyte* syncToken) override
     {
-        static unsigned syncPointGenerator = 0;
-        return ++syncPointGenerator;
+        static WGC3Duint syncPointGenerator = 0;
+        WGC3Duint newSyncPoint = ++syncPointGenerator;
+        memcpy(syncToken, &newSyncPoint, sizeof(newSyncPoint));
+        return true;
     }
 
-    void waitSyncPoint(unsigned syncPoint) override
+    void waitSyncToken(const WGC3Dbyte* syncToken) override
     {
-        m_mostRecentlyWaitedSyncPoint = syncPoint;
+        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 18 matching lines @@
     MOCK_METHOD1(releaseTexImage2DMock, void(WGC3Dint imageId));
     void releaseTexImage2DCHROMIUM(WGC3Denum target, WGC3Dint imageId)
     {
         if (target == GL_TEXTURE_2D) {
             m_imageSizes.set(m_currentImageId, IntSize());
             m_imageToTextureMap.remove(imageId);
             releaseTexImage2DMock(imageId);
         }
     }
 
-    unsigned mostRecentlyWaitedSyncPoint()
+    WGC3Duint mostRecentlyWaitedSyncToken()
     {
-        return m_mostRecentlyWaitedSyncPoint;
+        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;
+    WGC3Duint m_mostRecentlyWaitedSyncToken;
     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 229 matching lines @@
     EXPECT_TRUE(m_drawingBuffer->prepareMailbox(&recycledMailbox2, 0));
     EXPECT_NE(TextureMailboxWrapper(mailbox1), TextureMailboxWrapper(recycledMailbox2));
     EXPECT_NE(TextureMailboxWrapper(mailbox2), TextureMailboxWrapper(recycledMailbox2));
     EXPECT_NE(TextureMailboxWrapper(mailbox3), TextureMailboxWrapper(recycledMailbox2));
 
     m_drawingBuffer->mailboxReleased(recycledMailbox1, false);
     m_drawingBuffer->mailboxReleased(recycledMailbox2, false);
     m_drawingBuffer->beginDestruction();
 }
 
-TEST_F(DrawingBufferTest, verifyInsertAndWaitSyncPointCorrectly)
+TEST_F(DrawingBufferTest, verifyInsertAndWaitSyncTokenCorrectly)
 {
     WebExternalTextureMailbox mailbox;
 
     // Produce mailboxes.
     m_drawingBuffer->markContentsChanged();
-    EXPECT_EQ(0u, webContext()->mostRecentlyWaitedSyncPoint());
+    EXPECT_EQ(0u, webContext()->mostRecentlyWaitedSyncToken());
     EXPECT_TRUE(m_drawingBuffer->prepareMailbox(&mailbox, 0));
     // prepareMailbox() does not wait for any sync point.
-    EXPECT_EQ(0u, webContext()->mostRecentlyWaitedSyncPoint());
+    EXPECT_EQ(0u, webContext()->mostRecentlyWaitedSyncToken());
 
-    unsigned waitSyncPoint = webContext()->insertSyncPoint();
-    mailbox.syncPoint = waitSyncPoint;
+    WGC3Duint waitSyncToken = 0;
+    webContext()->insertSyncPoint(reinterpret_cast<WGC3Dbyte*>(&waitSyncToken));
+    memcpy(mailbox.syncToken, &waitSyncToken, sizeof(waitSyncToken));
+    mailbox.validSyncToken = true;
     m_drawingBuffer->mailboxReleased(mailbox, false);
     // m_drawingBuffer will wait for the sync point when recycling.
-    EXPECT_EQ(0u, webContext()->mostRecentlyWaitedSyncPoint());
+    EXPECT_EQ(0u, webContext()->mostRecentlyWaitedSyncToken());
 
     m_drawingBuffer->markContentsChanged();
     EXPECT_TRUE(m_drawingBuffer->prepareMailbox(&mailbox, 0));
     // m_drawingBuffer waits for the sync point when recycling in prepareMailbox().
-    EXPECT_EQ(waitSyncPoint, webContext()->mostRecentlyWaitedSyncPoint());
+    EXPECT_EQ(waitSyncToken, webContext()->mostRecentlyWaitedSyncToken());
 
     m_drawingBuffer->beginDestruction();
-    waitSyncPoint = webContext()->insertSyncPoint();
-    mailbox.syncPoint = waitSyncPoint;
+    webContext()->insertSyncPoint(reinterpret_cast<WGC3Dbyte*>(&waitSyncToken));
+    memcpy(mailbox.syncToken, &waitSyncToken, sizeof(waitSyncToken));
+    mailbox.validSyncToken = true;
     m_drawingBuffer->mailboxReleased(mailbox, false);
     // m_drawingBuffer waits for the sync point because the destruction is in progress.
-    EXPECT_EQ(waitSyncPoint, webContext()->mostRecentlyWaitedSyncPoint());
+    EXPECT_EQ(waitSyncToken, webContext()->mostRecentlyWaitedSyncToken());
 }
 
 class DrawingBufferImageChromiumTest : public DrawingBufferTest {
 protected:
     virtual void SetUp()
     {
         OwnPtr<WebGraphicsContext3DForTests> context = adoptPtr(new WebGraphicsContext3DForTests);
         m_context = context.get();
         RuntimeEnabledFeatures::setWebGLImageChromiumEnabled(true);
         m_imageId0 = webContext()->nextImageIdToBeCreated();
@@ skipping 205 matching lines @@
 }
 
 TEST_F(DrawingBufferTest, verifySetIsHiddenProperlyAffectsMailboxes)
 {
     blink::WebExternalTextureMailbox mailbox;
 
     // Produce mailboxes.
     m_drawingBuffer->markContentsChanged();
     EXPECT_TRUE(m_drawingBuffer->prepareMailbox(&mailbox, 0));
 
-    unsigned waitSyncPoint = webContext()->insertSyncPoint();
-    mailbox.syncPoint = waitSyncPoint;
+    mailbox.validSyncToken = webContext()->insertSyncPoint(mailbox.syncToken);
     m_drawingBuffer->setIsHidden(true);
     m_drawingBuffer->mailboxReleased(mailbox);
     // m_drawingBuffer deletes mailbox immediately when hidden.
-    EXPECT_EQ(waitSyncPoint, webContext()->mostRecentlyWaitedSyncPoint());
+
+    WGC3Duint waitSyncToken = 0;
+    memcpy(&waitSyncToken, mailbox.syncToken, sizeof(waitSyncToken));
+    EXPECT_EQ(waitSyncToken, webContext()->mostRecentlyWaitedSyncToken());
 
     m_drawingBuffer->beginDestruction();
 }
 
 } // namespace blink