Simplify IOSurface CoreAnimation code: Part 2

content/content_browser.gypi

 # 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.
 
 {
   'dependencies': [
     '../base/base.gyp:base_static',
     '../crypto/crypto.gyp:crypto',
     '../google_apis/google_apis.gyp:google_apis',
     '../net/net.gyp:net',
@@ skipping 888 matching lines @@
       'browser/push_messaging_message_filter.cc',
       'browser/push_messaging_message_filter.h',
       'browser/push_messaging_router.cc',
       'browser/push_messaging_router.h',
       'browser/quota_dispatcher_host.cc',
       'browser/quota_dispatcher_host.h',
       'browser/renderer_data_memoizing_store.h',
       'browser/renderer_host/clipboard_message_filter.cc',
       'browser/renderer_host/clipboard_message_filter.h',
       'browser/renderer_host/clipboard_message_filter_mac.mm',
-      'browser/renderer_host/compositing_iosurface_context_mac.h',
-      'browser/renderer_host/compositing_iosurface_context_mac.mm',
-      'browser/renderer_host/compositing_iosurface_layer_mac.h',
-      'browser/renderer_host/compositing_iosurface_layer_mac.mm',
-      'browser/renderer_host/compositing_iosurface_mac.h',
-      'browser/renderer_host/compositing_iosurface_mac.mm',
       'browser/renderer_host/compositor_impl_android.cc',
       'browser/renderer_host/compositor_impl_android.h',
       'browser/renderer_host/compositor_resize_lock_aura.cc',
       'browser/renderer_host/compositor_resize_lock_aura.h',
       'browser/renderer_host/database_message_filter.cc',
       'browser/renderer_host/database_message_filter.h',
       'browser/renderer_host/delegated_frame_evictor.cc',
       'browser/renderer_host/delegated_frame_evictor.h',
       'browser/renderer_host/dip_util.cc',
       'browser/renderer_host/dip_util.h',
@@ skipping 154 matching lines @@
       'browser/renderer_host/render_widget_host_view_mac.h',
       'browser/renderer_host/render_widget_host_view_mac.mm',
       'browser/renderer_host/render_widget_resize_helper.cc',
       'browser/renderer_host/render_widget_resize_helper.h',
       'browser/renderer_host/renderer_frame_manager.cc',
       'browser/renderer_host/renderer_frame_manager.h',
       'browser/renderer_host/sandbox_ipc_linux.cc',
       'browser/renderer_host/sandbox_ipc_linux.h',
       'browser/renderer_host/software_frame_manager.cc',
       'browser/renderer_host/software_frame_manager.h',
-      'browser/renderer_host/software_layer_mac.mm',
-      'browser/renderer_host/software_layer_mac.h',
       'browser/renderer_host/socket_stream_dispatcher_host.cc',
       'browser/renderer_host/socket_stream_dispatcher_host.h',
       'browser/renderer_host/socket_stream_host.cc',
       'browser/renderer_host/socket_stream_host.h',
       'browser/renderer_host/text_input_client_mac.h',
       'browser/renderer_host/text_input_client_mac.mm',
       'browser/renderer_host/text_input_client_message_filter.h',
       'browser/renderer_host/text_input_client_message_filter.mm',
       'browser/renderer_host/ui_events_helper.cc',
       'browser/renderer_host/ui_events_helper.h',
@@ skipping 316 matching lines @@
       'browser/compositor/browser_compositor_view_mac.mm',
       'browser/compositor/browser_compositor_view_mac.h',
       'browser/compositor/browser_compositor_view_private_mac.mm',
       'browser/compositor/browser_compositor_view_private_mac.h',
       'browser/compositor/delegated_frame_host.cc',
       'browser/compositor/delegated_frame_host.h',
       'browser/compositor/gpu_process_transport_factory.cc',
       'browser/compositor/gpu_process_transport_factory.h',
       'browser/compositor/image_transport_factory.cc',
       'browser/compositor/image_transport_factory.h',
+      'browser/compositor/io_surface_layer_mac.h',
+      'browser/compositor/io_surface_layer_mac.mm',
       'browser/compositor/onscreen_display_client.cc',
       'browser/compositor/onscreen_display_client.h',
       'browser/compositor/overlay_candidate_validator_ozone.cc',
       'browser/compositor/overlay_candidate_validator_ozone.h',
       'browser/compositor/owned_mailbox.h',
       'browser/compositor/owned_mailbox.cc',
       'browser/compositor/reflector_impl.cc',
       'browser/compositor/reflector_impl.h',
       'browser/compositor/resize_lock.cc',
       'browser/compositor/resize_lock.h',
       'browser/compositor/gpu_browser_compositor_output_surface.cc',
       'browser/compositor/gpu_browser_compositor_output_surface.h',
       'browser/compositor/software_browser_compositor_output_surface.cc',
       'browser/compositor/software_browser_compositor_output_surface.h',
+      'browser/compositor/software_layer_mac.mm',
+      'browser/compositor/software_layer_mac.h',
       'browser/compositor/software_output_device_mac.mm',
       'browser/compositor/software_output_device_mac.h',
       'browser/compositor/software_output_device_ozone.cc',
       'browser/compositor/software_output_device_ozone.h',
       'browser/compositor/software_output_device_win.cc',
       'browser/compositor/software_output_device_win.h',
       'browser/compositor/software_output_device_x11.cc',
       'browser/compositor/software_output_device_x11.h',
       'browser/compositor/surface_display_output_surface.cc',
       'browser/compositor/surface_display_output_surface.h',
@@ skipping 418 matching lines @@
       'sources': [
         'browser/media/cdm/browser_cdm_manager.cc',
         'browser/media/cdm/browser_cdm_manager.h',
         # This works on Android because enable_browser_cdms==1 on Android.
         'browser/media/media_web_contents_observer.cc',
         'browser/media/media_web_contents_observer.h',
       ],
     }],
   ],
 }