Make Mac swap code like other platforms

content/common/gpu_host_messages.h

 // Copyright 2016 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.
 
 // Multiply-included message file, hence no include guard here, but see below
 // for a much smaller-than-usual include guard section.
 
 #include "build/build_config.h"
 #include "content/common/content_export.h"
 #include "content/common/establish_channel_params.h"
 #include "gpu/command_buffer/common/sync_token.h"
 #include "gpu/command_buffer/service/gpu_preferences.h"
 #include "gpu/config/gpu_info.h"
 #include "gpu/ipc/common/gpu_command_buffer_traits.h"
 #include "gpu/ipc/common/gpu_memory_uma_stats.h"
 #include "gpu/ipc/common/gpu_param_traits.h"
 #include "gpu/ipc/common/memory_stats.h"
 #include "gpu/ipc/common/surface_handle.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_message_start.h"
 #include "ui/events/ipc/latency_info_param_traits.h"
 #include "ui/gfx/gpu_memory_buffer.h"
 #include "ui/gfx/ipc/gfx_param_traits.h"
 #include "ui/gfx/ipc/skia/gfx_skia_param_traits.h"
 #include "url/gurl.h"
 #include "url/ipc/url_param_traits.h"
 
-#if defined(OS_MACOSX)
-#include "content/common/accelerated_surface_buffers_swapped_params_mac.h"
-#include "content/common/buffer_presented_params_mac.h"
-#include "ui/base/cocoa/remote_layer_api.h"
-#include "ui/gfx/mac/io_surface.h"
-#endif
-
 #undef IPC_MESSAGE_EXPORT
 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
 
 #define IPC_MESSAGE_START GpuMsgStart
 
 IPC_STRUCT_TRAITS_BEGIN(gpu::GPUMemoryUmaStats)
   IPC_STRUCT_TRAITS_MEMBER(bytes_allocated_current)
   IPC_STRUCT_TRAITS_MEMBER(bytes_allocated_max)
 IPC_STRUCT_TRAITS_END()
 
@@ skipping 26 matching lines @@
 IPC_STRUCT_END()
 
 IPC_STRUCT_TRAITS_BEGIN(content::EstablishChannelParams)
   IPC_STRUCT_TRAITS_MEMBER(client_id)
   IPC_STRUCT_TRAITS_MEMBER(client_tracing_id)
   IPC_STRUCT_TRAITS_MEMBER(preempts)
   IPC_STRUCT_TRAITS_MEMBER(allow_view_command_buffers)
   IPC_STRUCT_TRAITS_MEMBER(allow_real_time_streams)
 IPC_STRUCT_TRAITS_END()
 
-#if defined(OS_MACOSX)
-IPC_STRUCT_TRAITS_BEGIN(content::AcceleratedSurfaceBuffersSwappedParams)
-  IPC_STRUCT_TRAITS_MEMBER(surface_handle)
-  // Only one of ca_context_id or io_surface may be non-0.
-  IPC_STRUCT_TRAITS_MEMBER(ca_context_id)
-  IPC_STRUCT_TRAITS_MEMBER(fullscreen_low_power_ca_context_valid)
-  IPC_STRUCT_TRAITS_MEMBER(fullscreen_low_power_ca_context_id)
-  IPC_STRUCT_TRAITS_MEMBER(io_surface)
-  IPC_STRUCT_TRAITS_MEMBER(size)
-  IPC_STRUCT_TRAITS_MEMBER(scale_factor)
-  IPC_STRUCT_TRAITS_MEMBER(latency_info)
-IPC_STRUCT_TRAITS_END()
-
-IPC_STRUCT_TRAITS_BEGIN(content::BufferPresentedParams)
-  // The vsync parameters, to synchronize presentation with the display.
-  IPC_STRUCT_TRAITS_MEMBER(surface_handle)
-  IPC_STRUCT_TRAITS_MEMBER(vsync_timebase)
-  IPC_STRUCT_TRAITS_MEMBER(vsync_interval)
-IPC_STRUCT_TRAITS_END()
-#endif
-
 IPC_STRUCT_TRAITS_BEGIN(gpu::GpuPreferences)
   IPC_STRUCT_TRAITS_MEMBER(single_process)
   IPC_STRUCT_TRAITS_MEMBER(in_process_gpu)
   IPC_STRUCT_TRAITS_MEMBER(ui_prioritize_in_gpu_process)
   IPC_STRUCT_TRAITS_MEMBER(disable_accelerated_video_decode)
 #if defined(OS_CHROMEOS)
   IPC_STRUCT_TRAITS_MEMBER(disable_vaapi_accelerated_video_encode)
 #endif
 #if defined(ENABLE_WEBRTC)
   IPC_STRUCT_TRAITS_MEMBER(disable_web_rtc_hw_encoding)
@@ skipping 67 matching lines @@
                      int32_t,                /* client_id */
                      gpu::SyncToken /* sync_token */)
 
 // Tells the GPU process to create a context for collecting graphics card
 // information.
 IPC_MESSAGE_CONTROL0(GpuMsg_CollectGraphicsInfo)
 
 // Tells the GPU process to report video_memory information for the task manager
 IPC_MESSAGE_CONTROL0(GpuMsg_GetVideoMemoryUsageStats)
 
-#if defined(OS_MACOSX)
-// Tells the GPU process that the browser process has handled the swap
-// buffers or post sub-buffer request.
-IPC_MESSAGE_CONTROL1(AcceleratedSurfaceMsg_BufferPresented,
-                     content::BufferPresentedParams)
-#endif
-
 #if defined(OS_ANDROID)
 // Tells the GPU process to wake up the GPU because we're about to draw.
 IPC_MESSAGE_CONTROL0(GpuMsg_WakeUpGpu)
 
 // Tells the GPU process to release the surface because it's being destroyed.
 IPC_MESSAGE_CONTROL1(GpuMsg_DestroyingVideoSurface, int /* surface_id */)
 #endif
 
 // Tells the GPU process to remove all contexts.
 IPC_MESSAGE_CONTROL0(GpuMsg_Clean)
@@ skipping 40 matching lines @@
                      gfx::GpuMemoryBufferHandle /* handle */)
 
 // Response from GPU to a GpuMsg_CollectGraphicsInfo.
 IPC_MESSAGE_CONTROL1(GpuHostMsg_GraphicsInfoCollected,
                      gpu::GPUInfo /* GPU logging stats */)
 
 // Response from GPU to a GpuMsg_GetVideoMemory.
 IPC_MESSAGE_CONTROL1(GpuHostMsg_VideoMemoryUsageStats,
                      gpu::VideoMemoryUsageStats /* GPU memory stats */)
 
-#if defined(OS_MACOSX)
-// Tells the browser that an accelerated surface has swapped.
-IPC_MESSAGE_CONTROL1(GpuHostMsg_AcceleratedSurfaceBuffersSwapped,
-                     content::AcceleratedSurfaceBuffersSwappedParams)
-#endif
-
 #if defined(OS_WIN)
 IPC_MESSAGE_CONTROL2(GpuHostMsg_AcceleratedSurfaceCreatedChildWindow,
                      gpu::SurfaceHandle /* parent_window */,
                      gpu::SurfaceHandle /* child_window */)
 #endif
 
 #if defined(OS_ANDROID)
 // Response to a GpuMsg_DestroyingVideoSurface message.
 IPC_MESSAGE_CONTROL1(GpuHostMsg_DestroyingVideoSurfaceAck,
                      int /* surface_id */)
@@ skipping 11 matching lines @@
 
 // Tells the browser about GPU memory usage statistics for UMA logging.
 IPC_MESSAGE_CONTROL1(GpuHostMsg_GpuMemoryUmaStats,
                      gpu::GPUMemoryUmaStats /* GPU memory UMA stats */)
 
 // Message from GPU to add a GPU log message to the about:gpu page.
 IPC_MESSAGE_CONTROL3(GpuHostMsg_OnLogMessage,
                      int /*severity*/,
                      std::string /* header */,
                      std::string /* message */)