chromium: rebased the vaapi patch against chromium-47.0.2526.73 sources

1 files changed, 202 insertions, 58 deletions

diff --git a/chromium/build/patches/chromium_vaapi.patch b/chromium/build/patches/chromium_vaapi.patch
index a76552eb..5396830b 100644
--- a/chromium/build/patches/chromium_vaapi.patch
+++ b/chromium/build/patches/chromium_vaapi.patch
@@ -1,12 +1,7 @@
-Taken from: https://code.launchpad.net/~saiarcot895
-And rebased against chromium-46.0.2490.71 source.
-
-Description: Enables using VA-API hardware acceleration in Linux. The patch for bpf_gpu_policy_linux.cc initially came from https://codereview.chromium.org/15955009/diff/92001/content/common/sandbox_linux/bpf_gpu_policy_linux.cc.
-
-diff -uarN chromium-46.0.2490.71.orig/chrome/browser/about_flags.cc chromium-46.0.2490.71/chrome/browser/about_flags.cc
---- chromium-46.0.2490.71.orig/chrome/browser/about_flags.cc	2015-10-13 21:04:31.000000000 +0200
-+++ chromium-46.0.2490.71/chrome/browser/about_flags.cc	2015-10-14 11:21:28.934823857 +0200
-@@ -1014,7 +1014,7 @@
+diff -uarN chromium-47.0.2526.73.orig/chrome/browser/about_flags.cc chromium-47.0.2526.73/chrome/browser/about_flags.cc
+--- chromium-47.0.2526.73.orig/chrome/browser/about_flags.cc	2015-11-24 21:00:53.000000000 +0100
++++ chromium-47.0.2526.73/chrome/browser/about_flags.cc	2015-12-03 22:28:49.378613346 +0100
+@@ -1003,7 +1003,7 @@
       "disable-accelerated-video-decode",
       IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_NAME,
       IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_DESCRIPTION,
@@ -15,9 +10,23 @@ diff -uarN chromium-46.0.2490.71.orig/chrome/browser/about_flags.cc chromium-46.
       SINGLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
      },
  #if defined(USE_ASH)
-diff -uarN chromium-46.0.2490.71.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc chromium-46.0.2490.71/content/common/gpu/media/gpu_video_decode_accelerator.cc
---- chromium-46.0.2490.71.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc	2015-10-13 21:04:32.000000000 +0200
-+++ chromium-46.0.2490.71/content/common/gpu/media/gpu_video_decode_accelerator.cc	2015-10-14 11:21:28.727789543 +0200
+diff -uarN chromium-47.0.2526.73.orig/content/common/gpu/client/command_buffer_proxy_impl.cc chromium-47.0.2526.73/content/common/gpu/client/command_buffer_proxy_impl.cc
+--- chromium-47.0.2526.73.orig/content/common/gpu/client/command_buffer_proxy_impl.cc	2015-11-24 21:00:55.000000000 +0100
++++ chromium-47.0.2526.73/content/common/gpu/client/command_buffer_proxy_impl.cc	2015-12-03 22:28:49.427621491 +0100
+@@ -578,8 +578,10 @@
+ 
+ scoped_ptr<media::VideoDecodeAccelerator>
+ CommandBufferProxyImpl::CreateVideoDecoder() {
++  TRACE_EVENT0("gpu", "CommandBufferProxyImpl::CreateVideoDecoder");
+   if (!channel_)
+     return scoped_ptr<media::VideoDecodeAccelerator>();
++  VLOG(1) << "About to create GpuVideoDecodeAcceleratorHost.";
+   return scoped_ptr<media::VideoDecodeAccelerator>(
+       new GpuVideoDecodeAcceleratorHost(channel_, this));
+ }
+diff -uarN chromium-47.0.2526.73.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc chromium-47.0.2526.73/content/common/gpu/media/gpu_video_decode_accelerator.cc
+--- chromium-47.0.2526.73.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc	2015-11-24 21:00:55.000000000 +0100
++++ chromium-47.0.2526.73/content/common/gpu/media/gpu_video_decode_accelerator.cc	2015-12-03 22:28:49.247591567 +0100
 @@ -33,7 +33,7 @@
  #include "content/common/gpu/media/dxva_video_decode_accelerator.h"
  #elif defined(OS_MACOSX)
@@ -27,19 +36,96 @@ diff -uarN chromium-46.0.2490.71.orig/content/common/gpu/media/gpu_video_decode_
  #if defined(USE_V4L2_CODEC)
  #include "content/common/gpu/media/v4l2_device.h"
  #include "content/common/gpu/media/v4l2_slice_video_decode_accelerator.h"
-@@ -346,7 +346,7 @@
+@@ -252,6 +252,8 @@
+   }
+ #endif
+ 
++  VLOG(1) << "Initializing GPU video decode accelerator.";
++
+   // Array of Create..VDA() function pointers, maybe applicable to the current
+   // platform. This list is ordered by priority of use and it should be the
+   // same as the order of querying supported profiles of VDAs.
+@@ -265,11 +267,14 @@
+       &GpuVideoDecodeAccelerator::CreateAndroidVDA};
+ 
+   for (const auto& create_vda_function : create_vda_fps) {
++    VLOG(1) << "Testing create_vda_function.";
+     video_decode_accelerator_ = (this->*create_vda_function)();
+     if (!video_decode_accelerator_ ||
+         !video_decode_accelerator_->Initialize(profile, this))
+       continue;
+ 
++    VLOG(1) << "Initialization successful.";
++
+     if (video_decode_accelerator_->CanDecodeOnIOThread()) {
+       filter_ = new MessageFilter(this, host_route_id_);
+       stub_->channel()->AddFilter(filter_.get());
+@@ -347,7 +352,9 @@
  scoped_ptr<media::VideoDecodeAccelerator>
  GpuVideoDecodeAccelerator::CreateVaapiVDA() {
    scoped_ptr<media::VideoDecodeAccelerator> decoder;
 -#if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
++  VLOG(1) << "About to create new VAAPI video decode accelerator.";
 +#if (defined(OS_CHROMEOS) || defined(OS_LINUX)) && defined(ARCH_CPU_X86_FAMILY)
++  VLOG(1) << "Creating new VAAPI video decode accelerator.";
    decoder.reset(new VaapiVideoDecodeAccelerator(
        make_context_current_, base::Bind(&GpuVideoDecodeAccelerator::BindImage,
                                          base::Unretained(this))));
-diff -uarN chromium-46.0.2490.71.orig/content/common/gpu/media/vaapi_wrapper.cc chromium-46.0.2490.71/content/common/gpu/media/vaapi_wrapper.cc
---- chromium-46.0.2490.71.orig/content/common/gpu/media/vaapi_wrapper.cc	2015-10-13 21:04:32.000000000 +0200
-+++ chromium-46.0.2490.71/content/common/gpu/media/vaapi_wrapper.cc	2015-10-14 11:21:28.944825515 +0200
-@@ -146,7 +146,7 @@
+@@ -401,7 +408,7 @@
+   // can be initialized by corresponding VDA successfully.
+ #if defined(OS_WIN)
+   profiles = DXVAVideoDecodeAccelerator::GetSupportedProfiles();
+-#elif defined(OS_CHROMEOS)
++#elif defined(OS_CHROMEOS) || defined(OS_LINUX)
+   media::VideoDecodeAccelerator::SupportedProfiles vda_profiles;
+ #if defined(USE_V4L2_CODEC)
+   vda_profiles = V4L2VideoDecodeAccelerator::GetSupportedProfiles();
+diff -uarN chromium-47.0.2526.73.orig/content/common/gpu/media/vaapi_video_decode_accelerator.cc chromium-47.0.2526.73/content/common/gpu/media/vaapi_video_decode_accelerator.cc
+--- chromium-47.0.2526.73.orig/content/common/gpu/media/vaapi_video_decode_accelerator.cc	2015-11-24 21:00:55.000000000 +0100
++++ chromium-47.0.2526.73/content/common/gpu/media/vaapi_video_decode_accelerator.cc	2015-12-03 22:28:49.399616836 +0100
+@@ -324,17 +324,17 @@
+ 
+   base::AutoLock auto_lock(lock_);
+   DCHECK_EQ(state_, kUninitialized);
+-  DVLOG(2) << "Initializing VAVDA, profile: " << profile;
++  VLOG(1) << "Initializing VAVDA, profile: " << profile;
+ 
+ #if defined(USE_X11)
+   if (gfx::GetGLImplementation() != gfx::kGLImplementationDesktopGL) {
+-    DVLOG(1) << "HW video decode acceleration not available without "
++    VLOG(1) << "HW video decode acceleration not available without "
+                 "DesktopGL (GLX).";
+     return false;
+   }
+ #elif defined(USE_OZONE)
+   if (gfx::GetGLImplementation() != gfx::kGLImplementationEGLGLES2) {
+-    DVLOG(1) << "HW video decode acceleration not available without "
++    VLOG(1) << "HW video decode acceleration not available without "
+              << "EGLGLES2.";
+     return false;
+   }
+@@ -344,7 +344,7 @@
+       VaapiWrapper::kDecode, profile, base::Bind(&ReportToUMA, VAAPI_ERROR));
+ 
+   if (!vaapi_wrapper_.get()) {
+-    DVLOG(1) << "Failed initializing VAAPI for profile " << profile;
++    VLOG(1) << "Failed initializing VAAPI for profile " << profile;
+     return false;
+   }
+ 
+@@ -361,7 +361,7 @@
+     vp9_accelerator_.reset(new VaapiVP9Accelerator(this, vaapi_wrapper_.get()));
+     decoder_.reset(new VP9Decoder(vp9_accelerator_.get()));
+   } else {
+-    DLOG(ERROR) << "Unsupported profile " << profile;
++    VLOG(1) << "Unsupported profile " << profile;
+     return false;
+   }
+ 
+diff -uarN chromium-47.0.2526.73.orig/content/common/gpu/media/vaapi_wrapper.cc chromium-47.0.2526.73/content/common/gpu/media/vaapi_wrapper.cc
+--- chromium-47.0.2526.73.orig/content/common/gpu/media/vaapi_wrapper.cc	2015-11-24 21:00:55.000000000 +0100
++++ chromium-47.0.2526.73/content/common/gpu/media/vaapi_wrapper.cc	2015-12-03 22:28:49.396616338 +0100
+@@ -147,7 +147,7 @@
      VAProfile va_profile,
      const base::Closure& report_error_to_uma_cb) {
    if (!profile_infos_.Get().IsProfileSupported(mode, va_profile)) {
@@ -48,7 +134,30 @@ diff -uarN chromium-46.0.2490.71.orig/content/common/gpu/media/vaapi_wrapper.cc
      return nullptr;
    }
  
-@@ -384,7 +384,7 @@
+@@ -306,15 +306,17 @@
+ bool VaapiWrapper::VaInitialize(const base::Closure& report_error_to_uma_cb) {
+   static bool vaapi_functions_initialized = PostSandboxInitialization();
+   if (!vaapi_functions_initialized) {
+-    bool running_on_chromeos = false;
+-#if defined(OS_CHROMEOS)
++    bool error_level_logging = false;
++#if defined(OS_LINUX)
++    error_level_logging = true;
++#elif defined(OS_CHROMEOS)
+     // When chrome runs on linux with chromeos=1, do not log error message
+     // without VAAPI libraries.
+-    running_on_chromeos = base::SysInfo::IsRunningOnChromeOS();
++    error_level_logging = base::SysInfo::IsRunningOnChromeOS();
+ #endif
+     static const char kErrorMsg[] = "Failed to initialize VAAPI libs";
+-    if (running_on_chromeos)
+-      LOG(ERROR) << kErrorMsg;
++    if (error_level_logging)
++      VLOG(1) << kErrorMsg;
+     else
+       DVLOG(1) << kErrorMsg;
+     return false;
+@@ -385,7 +387,7 @@
    if (std::find(supported_entrypoints.begin(),
                  supported_entrypoints.end(),
                  entrypoint) == supported_entrypoints.end()) {
@@ -57,7 +166,7 @@ diff -uarN chromium-46.0.2490.71.orig/content/common/gpu/media/vaapi_wrapper.cc
      return false;
    }
    return true;
-@@ -408,8 +408,8 @@
+@@ -409,8 +411,8 @@
      if (attribs[i].type != required_attribs[i].type ||
          (attribs[i].value & required_attribs[i].value) !=
              required_attribs[i].value) {
@@ -68,9 +177,9 @@ diff -uarN chromium-46.0.2490.71.orig/content/common/gpu/media/vaapi_wrapper.cc
        return false;
      }
    }
-diff -uarN chromium-46.0.2490.71.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc chromium-46.0.2490.71/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
---- chromium-46.0.2490.71.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc	2015-10-13 21:04:32.000000000 +0200
-+++ chromium-46.0.2490.71/content/common/sandbox_linux/bpf_gpu_policy_linux.cc	2015-10-14 11:21:28.884815569 +0200
+diff -uarN chromium-47.0.2526.73.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc chromium-47.0.2526.73/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
+--- chromium-47.0.2526.73.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc	2015-11-24 21:00:55.000000000 +0100
++++ chromium-47.0.2526.73/content/common/sandbox_linux/bpf_gpu_policy_linux.cc	2015-12-03 22:37:18.599215359 +0100
 @@ -21,6 +21,8 @@
  #include "base/logging.h"
  #include "base/memory/scoped_ptr.h"
@@ -110,11 +219,12 @@ diff -uarN chromium-46.0.2490.71.orig/content/common/sandbox_linux/bpf_gpu_polic
    const base::CommandLine& command_line =
        *base::CommandLine::ForCurrentProcess();
    accelerated_encode_enabled =
-@@ -299,23 +308,41 @@
+@@ -299,27 +308,41 @@
      // inside the sandbox, so preload them now.
      if (IsAcceleratedVaapiVideoEncodeEnabled() ||
          IsAcceleratedVideoDecodeEnabled()) {
 -      const char* I965DrvVideoPath = NULL;
+-      const char* I965HybridDrvVideoPath = NULL;
 +      VLOG(1) << "Attempting to enable hardware video acceleration.";
 +      StubPathMap paths;
 +      paths[kModuleVa].push_back("libva.so.1");
@@ -126,6 +236,7 @@ diff -uarN chromium-46.0.2490.71.orig/content/common/sandbox_linux/bpf_gpu_polic
  
 -      if (IsArchitectureX86_64()) {
 -        I965DrvVideoPath = "/usr/lib64/va/drivers/i965_drv_video.so";
+-        I965HybridDrvVideoPath = "/usr/lib64/va/drivers/hybrid_drv_video.so";
 -      } else if (IsArchitectureI386()) {
 -        I965DrvVideoPath = "/usr/lib/va/drivers/i965_drv_video.so";
 +      // libva drivers won't get loaded even above two libraries get dlopened.
@@ -147,6 +258,8 @@ diff -uarN chromium-46.0.2490.71.orig/content/common/sandbox_linux/bpf_gpu_polic
        }
  
 -      dlopen(I965DrvVideoPath, RTLD_NOW|RTLD_GLOBAL|RTLD_NODELETE);
+-      if (I965HybridDrvVideoPath)
+-        dlopen(I965HybridDrvVideoPath, RTLD_NOW|RTLD_GLOBAL|RTLD_NODELETE);
 -      dlopen("libva.so.1", RTLD_NOW|RTLD_GLOBAL|RTLD_NODELETE);
 -#if defined(USE_OZONE)
 -      dlopen("libva-drm.so.1", RTLD_NOW|RTLD_GLOBAL|RTLD_NODELETE);
@@ -166,10 +279,10 @@ diff -uarN chromium-46.0.2490.71.orig/content/common/sandbox_linux/bpf_gpu_polic
  
    return true;
  }
-diff -uarN chromium-46.0.2490.71.orig/content/content_common.gypi chromium-46.0.2490.71/content/content_common.gypi
---- chromium-46.0.2490.71.orig/content/content_common.gypi	2015-10-13 21:04:32.000000000 +0200
-+++ chromium-46.0.2490.71/content/content_common.gypi	2015-10-14 11:21:28.755794184 +0200
-@@ -856,7 +856,7 @@
+diff -uarN chromium-47.0.2526.73.orig/content/content_common.gypi chromium-47.0.2526.73/content/content_common.gypi
+--- chromium-47.0.2526.73.orig/content/content_common.gypi	2015-11-24 21:00:55.000000000 +0100
++++ chromium-47.0.2526.73/content/content_common.gypi	2015-12-03 22:28:49.258593396 +0100
+@@ -862,7 +862,7 @@
          },
        ],
      }],
@@ -178,7 +291,7 @@ diff -uarN chromium-46.0.2490.71.orig/content/content_common.gypi chromium-46.0.
        'sources': [
          'common/gpu/media/accelerated_video_decoder.h',
          'common/gpu/media/h264_decoder.cc',
-@@ -908,7 +908,7 @@
+@@ -918,7 +918,7 @@
          'common/gpu/media/tegra_v4l2_device.h',
        ],
      }],
@@ -187,9 +300,9 @@ diff -uarN chromium-46.0.2490.71.orig/content/content_common.gypi chromium-46.0.
        'dependencies': [
          '../media/media.gyp:media',
          '../third_party/libyuv/libyuv.gyp:libyuv',
-diff -uarN chromium-46.0.2490.71.orig/content/content_gpu.gypi chromium-46.0.2490.71/content/content_gpu.gypi
---- chromium-46.0.2490.71.orig/content/content_gpu.gypi	2015-10-13 21:04:32.000000000 +0200
-+++ chromium-46.0.2490.71/content/content_gpu.gypi	2015-10-14 11:21:28.756794349 +0200
+diff -uarN chromium-47.0.2526.73.orig/content/content_gpu.gypi chromium-47.0.2526.73/content/content_gpu.gypi
+--- chromium-47.0.2526.73.orig/content/content_gpu.gypi	2015-11-24 21:00:55.000000000 +0100
++++ chromium-47.0.2526.73/content/content_gpu.gypi	2015-12-03 22:28:49.269595225 +0100
 @@ -36,7 +36,7 @@
          ],
        },
@@ -199,10 +312,10 @@ diff -uarN chromium-46.0.2490.71.orig/content/content_gpu.gypi chromium-46.0.249
        'include_dirs': [
          '<(DEPTH)/third_party/libva',
        ],
-diff -uarN chromium-46.0.2490.71.orig/content/content_tests.gypi chromium-46.0.2490.71/content/content_tests.gypi
---- chromium-46.0.2490.71.orig/content/content_tests.gypi	2015-10-13 21:04:32.000000000 +0200
-+++ chromium-46.0.2490.71/content/content_tests.gypi	2015-10-14 11:21:28.766796007 +0200
-@@ -1705,7 +1705,7 @@
+diff -uarN chromium-47.0.2526.73.orig/content/content_tests.gypi chromium-47.0.2526.73/content/content_tests.gypi
+--- chromium-47.0.2526.73.orig/content/content_tests.gypi	2015-11-24 21:00:55.000000000 +0100
++++ chromium-47.0.2526.73/content/content_tests.gypi	2015-12-03 22:28:49.272595723 +0100
+@@ -1743,7 +1743,7 @@
            },
          ]
      }],
@@ -211,33 +324,55 @@ diff -uarN chromium-46.0.2490.71.orig/content/content_tests.gypi chromium-46.0.2
        'targets': [
            {
              'target_name': 'vaapi_jpeg_decoder_unittest',
-diff -uarN chromium-46.0.2490.71.orig/content/public/common/content_switches.cc chromium-46.0.2490.71/content/public/common/content_switches.cc
---- chromium-46.0.2490.71.orig/content/public/common/content_switches.cc	2015-10-13 21:04:32.000000000 +0200
-+++ chromium-46.0.2490.71/content/public/common/content_switches.cc	2015-10-14 11:21:28.775797499 +0200
-@@ -943,7 +943,7 @@
- // Disable web audio API.
- const char kDisableWebAudio[]               = "disable-webaudio";
+diff -uarN chromium-47.0.2526.73.orig/content/gpu/gpu_main.cc chromium-47.0.2526.73/content/gpu/gpu_main.cc
+--- chromium-47.0.2526.73.orig/content/gpu/gpu_main.cc	2015-11-24 21:00:55.000000000 +0100
++++ chromium-47.0.2526.73/content/gpu/gpu_main.cc	2015-12-03 22:28:49.417619829 +0100
+@@ -66,7 +66,7 @@
+ #include "content/common/sandbox_mac.h"
+ #endif
  
--#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || defined(OS_LINUX)
- // Disables panel fitting (used for mirror mode).
- const char kDisablePanelFitting[]           = "disable-panel-fitting";
+-#if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
++#if (defined(OS_CHROMEOS) || defined(OS_LINUX)) && defined(ARCH_CPU_X86_FAMILY)
+ #include "content/common/gpu/media/vaapi_wrapper.h"
+ #endif
  
-diff -uarN chromium-46.0.2490.71.orig/content/public/common/content_switches.h chromium-46.0.2490.71/content/public/common/content_switches.h
---- chromium-46.0.2490.71.orig/content/public/common/content_switches.h	2015-10-13 21:04:32.000000000 +0200
-+++ chromium-46.0.2490.71/content/public/common/content_switches.h	2015-10-14 11:21:28.776797665 +0200
-@@ -275,7 +275,7 @@
+@@ -231,7 +231,7 @@
+   GetGpuInfoFromCommandLine(gpu_info, command_line);
+   gpu_info.in_process_gpu = false;
  
- CONTENT_EXPORT extern const char kDisableWebAudio[];
+-#if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
++#if (defined(OS_CHROMEOS) || defined(OS_LINUX)) && defined(ARCH_CPU_X86_FAMILY)
+   VaapiWrapper::PreSandboxInitialization();
+ #endif
+ 
+diff -uarN chromium-47.0.2526.73.orig/content/public/common/content_switches.cc chromium-47.0.2526.73/content/public/common/content_switches.cc
+--- chromium-47.0.2526.73.orig/content/public/common/content_switches.cc	2015-11-24 21:00:55.000000000 +0100
++++ chromium-47.0.2526.73/content/public/common/content_switches.cc	2015-12-03 22:28:49.298600046 +0100
+@@ -908,7 +908,9 @@
+ #if defined(OS_CHROMEOS)
+ // Disables panel fitting (used for mirror mode).
+ const char kDisablePanelFitting[]           = "disable-panel-fitting";
++#endif
  
--#if defined(OS_CHROMEOS)
 +#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+ // Disables VA-API accelerated video encode.
+ const char kDisableVaapiAcceleratedVideoEncode[] =
+     "disable-vaapi-accelerated-video-encode";
+diff -uarN chromium-47.0.2526.73.orig/content/public/common/content_switches.h chromium-47.0.2526.73/content/public/common/content_switches.h
+--- chromium-47.0.2526.73.orig/content/public/common/content_switches.h	2015-11-24 21:00:55.000000000 +0100
++++ chromium-47.0.2526.73/content/public/common/content_switches.h	2015-12-03 22:28:49.299600212 +0100
+@@ -269,6 +269,8 @@
+ 
+ #if defined(OS_CHROMEOS)
  CONTENT_EXPORT extern const char kDisablePanelFitting[];
++#endif
++#if defined(OS_CHROMEOS) || defined(OS_LINUX)
  CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[];
  #endif
-diff -uarN chromium-46.0.2490.71.orig/gpu/config/software_rendering_list_json.cc chromium-46.0.2490.71/gpu/config/software_rendering_list_json.cc
---- chromium-46.0.2490.71.orig/gpu/config/software_rendering_list_json.cc	2015-10-07 04:42:12.000000000 +0200
-+++ chromium-46.0.2490.71/gpu/config/software_rendering_list_json.cc	2015-10-14 11:21:28.855810761 +0200
+ 
+diff -uarN chromium-47.0.2526.73.orig/gpu/config/software_rendering_list_json.cc chromium-47.0.2526.73/gpu/config/software_rendering_list_json.cc
+--- chromium-47.0.2526.73.orig/gpu/config/software_rendering_list_json.cc	2015-11-24 21:00:55.000000000 +0100
++++ chromium-47.0.2526.73/gpu/config/software_rendering_list_json.cc	2015-12-03 22:28:49.341607193 +0100
 @@ -481,17 +481,6 @@
        ]
      },
@@ -268,10 +403,10 @@ diff -uarN chromium-46.0.2490.71.orig/gpu/config/software_rendering_list_json.cc
          }
        ],
        "features": [
-diff -uarN chromium-46.0.2490.71.orig/media/media.gyp chromium-46.0.2490.71/media/media.gyp
---- chromium-46.0.2490.71.orig/media/media.gyp	2015-10-13 21:04:33.000000000 +0200
-+++ chromium-46.0.2490.71/media/media.gyp	2015-10-14 11:21:28.820804959 +0200
-@@ -756,7 +756,7 @@
+diff -uarN chromium-47.0.2526.73.orig/media/media.gyp chromium-47.0.2526.73/media/media.gyp
+--- chromium-47.0.2526.73.orig/media/media.gyp	2015-11-24 21:00:55.000000000 +0100
++++ chromium-47.0.2526.73/media/media.gyp	2015-12-03 22:28:49.320603703 +0100
+@@ -761,7 +761,7 @@
            ],
          }],
          # For VaapiVideoEncodeAccelerator.
@@ -280,3 +415,12 @@ diff -uarN chromium-46.0.2490.71.orig/media/media.gyp chromium-46.0.2490.71/medi
            'sources': [
              'filters/h264_bitstream_buffer.cc',
              'filters/h264_bitstream_buffer.h',
+@@ -1381,7 +1381,7 @@
+             'player_android',
+           ],
+         }],
+-        ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
++        ['target_arch != "arm" and (chromeos == 1 or desktop_linux == 1) and use_x11 == 1', {
+           'sources': [
+             'filters/h264_bitstream_buffer_unittest.cc',
+           ],