Add use-surfaces command-line flag

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 356 matching lines @@
       'browser/compositor/browser_compositor_view_mac.mm',
       'browser/compositor/browser_compositor_view_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/no_transport_image_transport_factory.cc',
       'browser/compositor/no_transport_image_transport_factory.h',
+      '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_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',
       'browser/context_factory.cc',
       'browser/cross_site_request_manager.cc',
       'browser/cross_site_request_manager.h',
       'browser/devtools/devtools_agent_host_impl.cc',
       'browser/devtools/devtools_agent_host_impl.h',
       'browser/devtools/devtools_browser_target.cc',
       'browser/devtools/devtools_browser_target.h',
       'browser/devtools/devtools_frontend_host.cc',
       'browser/devtools/devtools_frontend_host.h',
       'browser/devtools/devtools_http_handler_impl.cc',
@@ skipping 1045 matching lines @@
         ['include', '^browser/notification_service_impl\\.cc$'],
         ['include', '^browser/signed_certificate_timestamp_store_impl\\.cc$'],
         ['include', '^browser/user_metrics\\.cc$'],
         ['include', '^browser/web_contents/navigation_entry_impl\\.cc$'],
       ],
     }, {  # OS!="ios"
       'dependencies': [
         'browser/devtools/devtools_resources.gyp:devtools_resources',
         'content_common_mojo_bindings',
         '../cc/cc.gyp:cc',
+        '../cc/cc.gyp:cc_surfaces',
         '../mojo/mojo.gyp:mojo_cpp_bindings',
         '../mojo/mojo.gyp:mojo_js_bindings',
         '../mojo/mojo.gyp:mojo_service_provider_bindings',
         '../net/net.gyp:http_server',
         '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
         '../ui/surface/surface.gyp:surface',
         '../webkit/common/webkit_common.gyp:webkit_common',
         '../webkit/storage_browser.gyp:webkit_storage_browser',
         '../webkit/storage_common.gyp:webkit_storage_common',
         '../webkit/webkit_resources.gyp:webkit_resources',
@@ skipping 278 matching lines @@
         '../build/linux/system.gyp:dbus',
         '../dbus/dbus.gyp:dbus',
       ],
     }, {  # OS != "linux" or use_dbus==0
       'sources!': [
         'browser/geolocation/wifi_data_provider_linux.cc',
       ],
     }],
   ],
 }