Revert of Refactor Vaapi video decoder/encoder in preparation of Freon support

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("//mojo/public/tools/bindings/mojom.gni")
 
-if (is_chromeos && cpu_arch != "arm") {
+if (is_chromeos && use_x11 && cpu_arch != "arm") {
   action("libva_generate_stubs") {
     extra_header = "gpu/media/va_stub_header.fragment"
 
     script = "../../tools/generate_stubs/generate_stubs.py"
     sources = [
       "gpu/media/va.sigs",
     ]
     inputs = [
       extra_header,
     ]
-    if (use_x11) {
-      sources += [ "content/common/gpu/media/va_x11.sigs" ]
-    }
     stubs_filename_root = "va_stubs"
 
     outputs = [
       "$target_gen_dir/gpu/media/$stubs_filename_root.cc",
       "$target_gen_dir/gpu/media/$stubs_filename_root.h",
     ]
     args = [
       "-i",
       rebase_path("$target_gen_dir/gpu/media", root_build_dir),
       "-o",
@@ skipping 236 matching lines @@
     sources += [
       "gpu/media/android_video_decode_accelerator.cc",
       "gpu/media/android_video_decode_accelerator.h",
     ]
 
     if (enable_webrtc) {
       deps += [ "//third_party/libyuv" ]
     }
   }
 
-  if (is_chromeos) {
-    if (cpu_arch == "arm" && use_x11) {
+  if (is_chromeos && use_x11) {
+    if (cpu_arch == "arm") {
       sources += [
         "gpu/media/exynos_v4l2_video_device.cc",
         "gpu/media/exynos_v4l2_video_device.h",
         "gpu/media/tegra_v4l2_video_device.cc",
         "gpu/media/tegra_v4l2_video_device.h",
         "gpu/media/v4l2_image_processor.cc",
         "gpu/media/v4l2_image_processor.h",
         "gpu/media/v4l2_video_decode_accelerator.cc",
         "gpu/media/v4l2_video_decode_accelerator.h",
         "gpu/media/v4l2_video_device.cc",
         "gpu/media/v4l2_video_device.h",
         "gpu/media/v4l2_video_encode_accelerator.cc",
         "gpu/media/v4l2_video_encode_accelerator.h",
       ]
       libs = [
         "EGL",
         "GLESv2",
       ]
-    }
-    if (cpu_arch != "arm") {
+    } else {  # !arm
       sources += [
                    "gpu/media/h264_dpb.cc",
                    "gpu/media/h264_dpb.h",
                    "gpu/media/va_surface.h",
                    "gpu/media/vaapi_h264_decoder.cc",
                    "gpu/media/vaapi_h264_decoder.h",
-                   "gpu/media/vaapi_picture.cc",
-                   "gpu/media/vaapi_picture.h",
                    "gpu/media/vaapi_video_decode_accelerator.cc",
                    "gpu/media/vaapi_video_decode_accelerator.h",
                    "gpu/media/vaapi_video_encode_accelerator.cc",
                    "gpu/media/vaapi_video_encode_accelerator.h",
                    "gpu/media/vaapi_wrapper.cc",
                    "gpu/media/vaapi_wrapper.h",
                  ] + get_target_outputs(":libva_generate_stubs")
       configs += [
         "//third_party/libva:libva_config",
         "//third_party/libyuv:libyuv_config",
       ]
       deps += [
         ":libva_generate_stubs",
         "//media",
         "//third_party/libyuv",
       ]
-      if (use_x11) {
-        sources += [
-          "gpu/media/vaapi_tfp_picture.cc",
-          "gpu/media/vaapi_tfp_picture.h",
-        ]
-      }
     }
   }
 
   if (is_win) {
     sources += [
       "gpu/media/dxva_video_decode_accelerator.cc",
       "gpu/media/dxva_video_decode_accelerator.h",
     ]
     include_dirs += [ "//third_party/khronos" ]
     deps += [ "//ui/gl" ]
@@ skipping 38 matching lines @@
     "geolocation_service.mojom",
     "permission_service.mojom",
     "render_frame_setup.mojom",
   ]
 
   deps = [
     "//content/public/common:mojo_bindings",
     "//mojo/public/interfaces/application:application",
   ]
 }