Move buffer_presented_params_mac to content/common

content/common/gpu/gpu_channel_manager.cc

 // 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.
 
 #include "content/common/gpu/gpu_channel_manager.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/gpu_channel_manager_delegate.h"
 #include "content/common/gpu/gpu_memory_buffer_factory.h"
 #include "content/common/gpu/gpu_memory_manager.h"
 #include "gpu/command_buffer/common/sync_token.h"
 #include "gpu/command_buffer/common/value_state.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/mailbox_manager.h"
 #include "gpu/command_buffer/service/memory_program_cache.h"
 #include "gpu/command_buffer/service/shader_translator_cache.h"
 #include "gpu/command_buffer/service/sync_point_manager.h"
 #include "gpu/ipc/common/gpu_messages.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_share_group.h"
 
-#if defined(OS_MACOSX)
-#include "content/common/gpu/buffer_presented_params_mac.h"
-#endif
-
 namespace content {
 
 namespace {
 #if defined(OS_ANDROID)
 // Amount of time we expect the GPU to stay powered up without being used.
 const int kMaxGpuIdleTimeMs = 40;
 // Maximum amount of time we keep pinging the GPU waiting for the client to
 // draw.
 const int kMaxKeepAliveTimeMs = 200;
 #endif
@@ skipping 80 matching lines @@
          buffer_presented_callback_map_.end());
   buffer_presented_callback_map_[surface_id] = callback;
 }
 
 void GpuChannelManager::RemoveBufferPresentedCallback(int32_t surface_id) {
   auto it = buffer_presented_callback_map_.find(surface_id);
   DCHECK(it != buffer_presented_callback_map_.end());
   buffer_presented_callback_map_.erase(it);
 }
 
-void GpuChannelManager::BufferPresented(const BufferPresentedParams& params) {
-  auto it = buffer_presented_callback_map_.find(params.surface_id);
+void GpuChannelManager::BufferPresented(int32_t surface_id,
+                                        const base::TimeTicks& vsync_timebase,
+                                        const base::TimeDelta& vsync_interval) {
+  auto it = buffer_presented_callback_map_.find(surface_id);
   if (it != buffer_presented_callback_map_.end())
-    it->second.Run(params);
+    it->second.Run(surface_id, vsync_timebase, vsync_interval);
 }
 #endif
 
 GpuChannel* GpuChannelManager::LookupChannel(int32_t client_id) const {
   const auto& it = gpu_channels_.find(client_id);
   return it != gpu_channels_.end() ? it->second : nullptr;
 }
 
 scoped_ptr<GpuChannel> GpuChannelManager::CreateGpuChannel(
     int client_id,
@@ skipping 154 matching lines @@
     }
   }
   if (!stub || !stub->decoder()->MakeCurrent())
     return;
   glFinish();
   DidAccessGpu();
 }
 #endif
 
 }  // namespace content