Make Mac swap code like other platforms

gpu/ipc/service/gpu_channel_manager.h

 // Copyright (c) 2012 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 GPU_IPC_SERVICE_GPU_CHANNEL_MANAGER_H_
 #define GPU_IPC_SERVICE_GPU_CHANNEL_MANAGER_H_
 
 #include <stdint.h>
 
 #include <deque>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "build/build_config.h"
 #include "gpu/command_buffer/common/constants.h"
 #include "gpu/config/gpu_driver_bug_workarounds.h"
 #include "gpu/gpu_export.h"
 #include "gpu/ipc/service/gpu_memory_manager.h"
 #include "ui/gfx/gpu_memory_buffer.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gl/gl_surface.h"
 #include "url/gurl.h"
 
-#if defined(OS_MACOSX)
-#include "base/callback.h"
-#include "base/containers/hash_tables.h"
-#include "gpu/ipc/common/surface_handle.h"
-#endif
-
 namespace base {
 class WaitableEvent;
 }
 
 namespace gfx {
 class GLShareGroup;
 }
 
 namespace gpu {
 struct GpuPreferences;
@@ skipping 17 matching lines @@
 class GpuChannel;
 class GpuChannelManagerDelegate;
 class GpuMemoryBufferFactory;
 class GpuWatchdog;
 
 // A GpuChannelManager is a thread responsible for issuing rendering commands
 // managing the lifetimes of GPU channels and forwarding IPC requests from the
 // browser process to them based on the corresponding renderer ID.
 class GPU_EXPORT GpuChannelManager {
  public:
-#if defined(OS_MACOSX)
-  typedef base::Callback<
-      void(int32_t, const base::TimeTicks&, const base::TimeDelta&)>
-      BufferPresentedCallback;
-#endif
   GpuChannelManager(const GpuPreferences& gpu_preferences,
                     GpuChannelManagerDelegate* delegate,
                     GpuWatchdog* watchdog,
                     base::SingleThreadTaskRunner* task_runner,
                     base::SingleThreadTaskRunner* io_task_runner,
                     base::WaitableEvent* shutdown_event,
                     SyncPointManager* sync_point_manager,
                     GpuMemoryBufferFactory* gpu_memory_buffer_factory);
   virtual ~GpuChannelManager();
 
@@ skipping 13 matching lines @@
   void WakeUpGpu();
 #endif
   void DestroyAllChannels();
 
   // Remove the channel for a particular renderer.
   void RemoveChannel(int client_id);
 
   void LoseAllContexts();
   void MaybeExitOnContextLost();
 
-#if defined(OS_MACOSX)
-  void AddBufferPresentedCallback(int32_t routing_id,
-                                  const BufferPresentedCallback& callback);
-  void RemoveBufferPresentedCallback(int32_t routing_id);
-  void BufferPresented(gpu::SurfaceHandle surface_handle,
-                       const base::TimeTicks& vsync_timebase,
-                       const base::TimeDelta& vsync_interval);
-#endif
-
   const GpuPreferences& gpu_preferences() const {
     return gpu_preferences_;
   }
   const GpuDriverBugWorkarounds& gpu_driver_bug_workarounds() const {
     return gpu_driver_bug_workarounds_;
   }
   gles2::ProgramCache* program_cache();
   gles2::ShaderTranslatorCache* shader_translator_cache();
   gles2::FramebufferCompletenessCache* framebuffer_completeness_cache();
 
@@ skipping 57 matching lines @@
                                           int client_id);
 #if defined(OS_ANDROID)
   void ScheduleWakeUpGpu();
   void DoWakeUpGpu();
 #endif
 
   const GpuPreferences& gpu_preferences_;
   GpuDriverBugWorkarounds gpu_driver_bug_workarounds_;
 
   GpuChannelManagerDelegate* const delegate_;
-#if defined(OS_MACOSX)
-  base::hash_map<gpu::SurfaceHandle, BufferPresentedCallback>
-      buffer_presented_callback_map_;
-#endif
 
   GpuWatchdog* watchdog_;
 
   base::WaitableEvent* shutdown_event_;
 
   scoped_refptr<gfx::GLShareGroup> share_group_;
   scoped_refptr<gles2::MailboxManager> mailbox_manager_;
   scoped_refptr<PreemptionFlag> preemption_flag_;
   GpuMemoryManager gpu_memory_manager_;
   // SyncPointManager guaranteed to outlive running MessageLoop.
@@ skipping 19 matching lines @@
   // that any WeakPtrs to Controller are invalidated before its members
   // variable's destructors are executed, rendering them invalid.
   base::WeakPtrFactory<GpuChannelManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuChannelManager);
 };
 
 }  // namespace gpu
 
 #endif  // GPU_IPC_SERVICE_GPU_CHANNEL_MANAGER_H_