Revert of Converted video frame and image callbacks to use new sync tokens.

content/browser/gpu/browser_gpu_memory_buffer_manager.h

 // Copyright 2014 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.
 
 #ifndef CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_
 #define CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_
 
 #include <utility>
 
 #include "base/callback.h"
@@ skipping 47 matching lines @@
   scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer(
       const gfx::Size& size,
       gfx::BufferFormat format,
       gfx::BufferUsage usage) override;
   scoped_ptr<gfx::GpuMemoryBuffer> CreateGpuMemoryBufferFromHandle(
       const gfx::GpuMemoryBufferHandle& handle,
       const gfx::Size& size,
       gfx::BufferFormat format) override;
   gfx::GpuMemoryBuffer* GpuMemoryBufferFromClientBuffer(
       ClientBuffer buffer) override;
-  void SetDestructionSyncToken(gfx::GpuMemoryBuffer* buffer,
-                               const gpu::SyncToken& sync_token) override;
+  void SetDestructionSyncPoint(gfx::GpuMemoryBuffer* buffer,
+                               uint32 sync_point) override;
 
   // Overridden from base::trace_event::MemoryDumpProvider:
   bool OnMemoryDump(const base::trace_event::MemoryDumpArgs& args,
                     base::trace_event::ProcessMemoryDump* pmd) override;
 
   // Virtual for testing.
   virtual scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBufferForScanout(
       const gfx::Size& size,
       gfx::BufferFormat format,
       int32 surface_id);
 
   void AllocateGpuMemoryBufferForChildProcess(
       gfx::GpuMemoryBufferId id,
       const gfx::Size& size,
       gfx::BufferFormat format,
       gfx::BufferUsage usage,
       base::ProcessHandle child_process_handle,
       int child_client_id,
       const AllocationCallback& callback);
   void ChildProcessDeletedGpuMemoryBuffer(
       gfx::GpuMemoryBufferId id,
       base::ProcessHandle child_process_handle,
       int child_client_id,
-      const gpu::SyncToken& sync_token);
+      uint32 sync_point);
   void ProcessRemoved(base::ProcessHandle process_handle, int client_id);
 
   bool IsNativeGpuMemoryBufferConfiguration(gfx::BufferFormat format,
                                             gfx::BufferUsage usage) const;
 
  private:
   struct BufferInfo {
     BufferInfo()
         : type(gfx::EMPTY_BUFFER),
           format(gfx::BufferFormat::RGBA_8888),
@@ skipping 53 matching lines @@
                                  const CreateCallback& callback);
   void GpuMemoryBufferCreatedOnIO(const CreateDelegate& create_delegate,
                                   gfx::GpuMemoryBufferId id,
                                   int client_id,
                                   int gpu_host_id,
                                   bool reused_gpu_process,
                                   const CreateCallback& callback,
                                   const gfx::GpuMemoryBufferHandle& handle);
   void DestroyGpuMemoryBufferOnIO(gfx::GpuMemoryBufferId id,
                                   int client_id,
-                                  const gpu::SyncToken& sync_token);
+                                  uint32 sync_point);
 
   uint64_t ClientIdToTracingProcessId(int client_id) const;
 
   const GpuMemoryBufferConfigurationSet native_configurations_;
   const int gpu_client_id_;
   const uint64_t gpu_client_tracing_id_;
 
   // The GPU process host ID. This should only be accessed on the IO thread.
   int gpu_host_id_;
 
   // Stores info about buffers for all clients. This should only be accessed
   // on the IO thread.
   using BufferMap = base::hash_map<gfx::GpuMemoryBufferId, BufferInfo>;
   using ClientMap = base::hash_map<int, BufferMap>;
   ClientMap clients_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserGpuMemoryBufferManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_