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

cc/resources/video_resource_updater_unittest.cc

 // Copyright 2013 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 "cc/resources/video_resource_updater.h"
 
 #include "cc/resources/resource_provider.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_output_surface_client.h"
 #include "cc/test/fake_resource_provider.h"
@@ skipping 81 matching lines @@
         size,                      // natural_size
         size.width(),              // y_stride
         size.width() / 2,          // u_stride
         size.width() / 2,          // v_stride
         y_data,                    // y_data
         u_data,                    // u_data
         v_data,                    // v_data
         base::TimeDelta());        // timestamp
   }
 
-  static void ReleaseMailboxCB(unsigned sync_point) {}
+  static void ReleaseMailboxCB(const gpu::SyncToken& sync_token) {}
 
   scoped_refptr<media::VideoFrame> CreateTestRGBAHardwareVideoFrame() {
     const int kDimension = 10;
     gfx::Size size(kDimension, kDimension);
 
     gpu::Mailbox mailbox;
     mailbox.name[0] = 51;
 
-    const unsigned sync_point = 7;
+    const gpu::SyncToken sync_token(7);
     const unsigned target = GL_TEXTURE_2D;
     return media::VideoFrame::WrapNativeTexture(
         media::PIXEL_FORMAT_ARGB,
-        gpu::MailboxHolder(mailbox, target, sync_point),
+        gpu::MailboxHolder(mailbox, sync_token, target),
         base::Bind(&ReleaseMailboxCB),
         size,                // coded_size
         gfx::Rect(size),     // visible_rect
         size,                // natural_size
         base::TimeDelta());  // timestamp
   }
 
   scoped_refptr<media::VideoFrame> CreateTestYUVHardareVideoFrame() {
     const int kDimension = 10;
     gfx::Size size(kDimension, kDimension);
 
     const int kPlanesNum = 3;
     gpu::Mailbox mailbox[kPlanesNum];
     for (int i = 0; i < kPlanesNum; ++i) {
       mailbox[i].name[0] = 50 + 1;
     }
-    const unsigned sync_point = 7;
+    const gpu::SyncToken sync_token(7);
     const unsigned target = GL_TEXTURE_RECTANGLE_ARB;
     return media::VideoFrame::WrapYUV420NativeTextures(
-        gpu::MailboxHolder(mailbox[media::VideoFrame::kYPlane], target,
-                           sync_point),
-        gpu::MailboxHolder(mailbox[media::VideoFrame::kUPlane], target,
-                           sync_point),
-        gpu::MailboxHolder(mailbox[media::VideoFrame::kVPlane], target,
-                           sync_point),
+        gpu::MailboxHolder(mailbox[media::VideoFrame::kYPlane], sync_token,
+                           target),
+        gpu::MailboxHolder(mailbox[media::VideoFrame::kUPlane], sync_token,
+                           target),
+        gpu::MailboxHolder(mailbox[media::VideoFrame::kVPlane], sync_token,
+                           target),
         base::Bind(&ReleaseMailboxCB),
         size,                // coded_size
         gfx::Rect(size),     // visible_rect
         size,                // natural_size
         base::TimeDelta());  // timestamp
   }
 
   WebGraphicsContext3DUploadCounter* context3d_;
   FakeOutputSurfaceClient client_;
   scoped_ptr<FakeOutputSurface> output_surface3d_;
@@ skipping 26 matching lines @@
   EXPECT_EQ(VideoFrameExternalResources::YUV_RESOURCE, resources.type);
   EXPECT_EQ(size_t(3), resources.mailboxes.size());
   EXPECT_EQ(size_t(3), resources.release_callbacks.size());
   EXPECT_EQ(size_t(0), resources.software_resources.size());
   // Expect exactly three texture uploads, one for each plane.
   EXPECT_EQ(3, context3d_->UploadCount());
 
   // Simulate the ResourceProvider releasing the resources back to the video
   // updater.
   for (ReleaseCallbackImpl& release_callback : resources.release_callbacks)
-    release_callback.Run(0, false, nullptr);
+    release_callback.Run(gpu::SyncToken(), false, nullptr);
 
   // Allocate resources for the same frame.
   context3d_->ResetUploadCount();
   resources = updater.CreateExternalResourcesFromVideoFrame(video_frame);
   EXPECT_EQ(VideoFrameExternalResources::YUV_RESOURCE, resources.type);
   EXPECT_EQ(size_t(3), resources.mailboxes.size());
   EXPECT_EQ(size_t(3), resources.release_callbacks.size());
   // The data should be reused so expect no texture uploads.
   EXPECT_EQ(0, context3d_->UploadCount());
 }
@@ skipping 45 matching lines @@
       updater.CreateExternalResourcesFromVideoFrame(video_frame);
   EXPECT_EQ(VideoFrameExternalResources::SOFTWARE_RESOURCE, resources.type);
   EXPECT_EQ(size_t(0), resources.mailboxes.size());
   EXPECT_EQ(size_t(0), resources.release_callbacks.size());
   EXPECT_EQ(size_t(1), resources.software_resources.size());
   // Expect exactly one allocated shared bitmap.
   EXPECT_EQ(1, shared_bitmap_manager_->AllocationCount());
 
   // Simulate the ResourceProvider releasing the resource back to the video
   // updater.
-  resources.software_release_callback.Run(0, false, nullptr);
+  resources.software_release_callback.Run(gpu::SyncToken(), false, nullptr);
 
   // Allocate resources for the same frame.
   shared_bitmap_manager_->ResetAllocationCount();
   resources = updater.CreateExternalResourcesFromVideoFrame(video_frame);
   EXPECT_EQ(VideoFrameExternalResources::SOFTWARE_RESOURCE, resources.type);
   EXPECT_EQ(size_t(0), resources.mailboxes.size());
   EXPECT_EQ(size_t(0), resources.release_callbacks.size());
   EXPECT_EQ(size_t(1), resources.software_resources.size());
   // The data should be reused so expect no new allocations.
   EXPECT_EQ(0, shared_bitmap_manager_->AllocationCount());
@@ skipping 44 matching lines @@
 
   resources = updater.CreateExternalResourcesFromVideoFrame(video_frame);
   EXPECT_EQ(VideoFrameExternalResources::YUV_RESOURCE, resources.type);
   EXPECT_TRUE(resources.read_lock_fences_enabled);
   EXPECT_EQ(3u, resources.mailboxes.size());
   EXPECT_EQ(3u, resources.release_callbacks.size());
   EXPECT_EQ(0u, resources.software_resources.size());
 }
 }  // namespace
 }  // namespace cc