Revert of Refactor content/common/gpu into gpu/ipc/service

content/common/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//content/common/common.gni")
 import("//media/media_options.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 if (is_mac) {
@@ skipping 155 matching lines @@
     "//gpu/blink",
     "//gpu/command_buffer/client:gl_in_process_context",
     "//gpu/command_buffer/client:gles2_c_lib",
     "//gpu/command_buffer/client:gles2_cmd_helper",
     "//gpu/command_buffer/client:gles2_implementation",
     "//gpu/command_buffer/client:gles2_interface",
     "//gpu/command_buffer/common:gles2_utils",
     "//gpu/command_buffer/service",
     "//gpu/ipc/client",
     "//gpu/ipc/common",
-
-    # TODO(markdittmer): This should be removed once content/common/gpu/media
-    # is refactored into media/ipc.
-    "//gpu/ipc/service",
     "//gpu/skia_bindings",
     "//ipc",
     "//ipc/mojo",
     "//media",
     "//media:shared_memory_support",
     "//media/gpu/ipc/common",
     "//media/midi",
     "//mojo/common:common_base",
     "//mojo/converters/network",
     "//mojo/edk/system",
@@ skipping 33 matching lines @@
     set_sources_assignment_filter([])
     sources += [
       "sandbox_linux/sandbox_bpf_base_policy_linux.cc",
       "sandbox_linux/sandbox_bpf_base_policy_linux.h",
     ]
     set_sources_assignment_filter(sources_assignment_filter)
   }
 
   if (is_mac) {
     sources += [
+                 "gpu/gpu_memory_buffer_factory_io_surface.cc",
+                 "gpu/gpu_memory_buffer_factory_io_surface.h",
                  "gpu/media/vt_mac.h",
                  "gpu/media/vt_video_decode_accelerator_mac.cc",
                  "gpu/media/vt_video_decode_accelerator_mac.h",
                  "gpu/media/vt_video_encode_accelerator_mac.cc",
                  "gpu/media/vt_video_encode_accelerator_mac.h",
                ] + get_target_outputs(":libvt_generate_stubs")
 
     sources -= [ "plugin_list_posix.cc" ]
 
     deps += [
@@ skipping 10 matching lines @@
       "CoreMedia.framework",
       "CoreVideo.framework",
       "IOSurface.framework",
       "OpenGL.framework",
       "QuartzCore.framework",
       "sandbox",
     ]
   }
 
   if (is_android) {
+    sources += [
+      "gpu/gpu_memory_buffer_factory_surface_texture.cc",
+      "gpu/gpu_memory_buffer_factory_surface_texture.h",
+    ]
+
     deps += [
       "//content/public/android:common_aidl",
       "//content/public/android:jni",
     ]
 
     libs += [ "android" ]
   }
 
   if (is_debug && !is_component_build && enable_plugins) {
     # Content depends on the PPAPI message logging stuff; if this isn't here,
     # some unit test binaries won't compile. This only worked in release mode
     # because logging is disabled there.
     deps += [ "//ppapi/proxy:ipc_sources" ]
   }
 
   if (use_ozone) {
     deps += [ "//ui/ozone" ]
   } else {
     sources -= [
       "cursors/webcursor_ozone.cc",
       "font_list_ozone.cc",
+      "gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc",
+      "gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h",
     ]
   }
 
   if (!use_aura || is_android) {
     sources -= [ "cursors/webcursor_aura.cc" ]
   }
 
   if (!use_aura || !use_x11) {
     sources -= [ "cursors/webcursor_aurax11.cc" ]
   }
 
   if (use_pango) {
     configs += [ "//build/config/linux:pangocairo" ]
     if (use_ozone) {
       # If we're using pango, never use this ozone file (it was removed in all
       # non-ozone cases above).
       sources -= [ "font_list_ozone.cc" ]
     }
   } else {
     sources -= [ "font_list_pango.cc" ]
   }
 
+  if (use_x11) {
+    configs += [
+      "//build/config/linux:xcomposite",
+      "//third_party/khronos:khronos_headers",
+    ]
+
+    if (current_cpu != "arm" || !is_chromeos) {
+      sources += [ "gpu/x_util.h" ]
+    }
+  }
+
   if (enable_plugins) {
     deps += [ "//ppapi/shared_impl" ]
   } else {
     sources -= [
       "pepper_file_util.cc",
       "pepper_file_util.h",
       "pepper_messages.h",
       "pepper_plugin_list.cc",
       "pepper_plugin_list.h",
       "pepper_renderer_instance_data.cc",
@@ skipping 225 matching lines @@
     "//components/leveldb/public/interfaces",
     "//components/mus/public/interfaces",
     "//content/public/common:mojo_bindings",
     "//mojo/shell/public/interfaces",
     "//skia/public/interfaces",
     "//third_party/WebKit/public:mojo_bindings",
     "//ui/mojo/geometry:interfaces",
     "//url/mojo:url_mojom_origin",
   ]
 }