Revert 110626 - Reland 110355 - Use shared D3D9 texture to transport the compositor's backing buf...

content/content_common.gypi

 # Copyright (c) 2011 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',
     '../build/temp_gyp/googleurl.gyp:googleurl',
     '../gpu/gpu.gyp:gpu_ipc',
     '../ipc/ipc.gyp:ipc',
@@ skipping 123 matching lines @@
     'common/gpu/gpu_channel_manager.h',
     'common/gpu/gpu_command_buffer_stub.cc',
     'common/gpu/gpu_command_buffer_stub.h',
     'common/gpu/gpu_config.h',
     'common/gpu/gpu_feature_flags.cc',
     'common/gpu/gpu_feature_flags.h',
     'common/gpu/gpu_messages.h',
     'common/gpu/gpu_process_launch_causes.h',
     'common/gpu/gpu_watchdog.h',
     'common/gpu/image_transport_surface.h',
-    'common/gpu/image_transport_surface.cc',
-    'common/gpu/image_transport_surface_linux.cc',
-    'common/gpu/image_transport_surface_mac.cc',
-    'common/gpu/image_transport_surface_win.cc',
     'common/gpu/media/gpu_video_decode_accelerator.cc',
     'common/gpu/media/gpu_video_decode_accelerator.h',
     'common/gpu/transport_texture.cc',
     'common/gpu/transport_texture.h',
     'common/handle_enumerator_win.cc',
     'common/handle_enumerator_win.h',
     'common/hi_res_timer_manager_posix.cc',
     'common/hi_res_timer_manager_win.cc',
     'common/hi_res_timer_manager.h',
     'common/indexed_db_key.cc',
@@ skipping 109 matching lines @@
     ['OS!="win"', {
       'sources!': [
         'common/sandbox_policy.cc',
         'common/sandbox_policy.h',
       ],
     }],
     ['OS=="mac"', {
       'sources!': [
         'common/process_watcher_posix.cc',
       ],
+      'sources': [
+        'common/gpu/image_transport_surface.cc',
+        'common/gpu/image_transport_surface_mac.cc',
+      ],
       'link_settings': {
         'mac_bundle_resources': [
           'common/common.sb',
         ],
       },
     }],
     ['toolkit_uses_gtk == 1', {
       'dependencies': [
         '../build/linux/system.gyp:gtk',
       ],
     }],
     ['use_x11 == 1', {
       'dependencies': [
         '../build/linux/system.gyp:pangocairo',
       ],
     }],
     ['use_x11 == 1 and target_arch != "arm"', {
       'sources': [
         'common/gpu/x_util.cc',
         'common/gpu/x_util.h',
       ],
     }],
-    ['OS=="linux"', {
+    ['ui_compositor_image_transport==1', {
+      'sources': [
+        'common/gpu/image_transport_surface.cc',
+        'common/gpu/image_transport_surface_linux.cc',
+      ],
       'include_dirs': [
         '<(DEPTH)/third_party/angle/include',
       ],
       'link_settings': {
         'libraries': [
           '-lXcomposite',
         ],
       },
     }],
     ['enable_gpu==1', {
@@ skipping 17 matching lines @@
       ],
       'link_settings': {
         'libraries': [
           '-lEGL',
           '-lGLESv2',
         ],
       },
     }],
   ],
 }