chromium: rebased the vaapi patch against chromium-49.0.2623.75 sources

1 files changed, 89 insertions, 89 deletions

diff --git a/chromium/build/patches/chromium_vaapi.patch b/chromium/build/patches/chromium_vaapi.patch
index d6950378..8e4d6919 100644
--- a/chromium/build/patches/chromium_vaapi.patch
+++ b/chromium/build/patches/chromium_vaapi.patch
@@ -3,26 +3,26 @@ Enables using VA-API hardware acceleration in Linux. The patch for bpf_gpu_polic
 
 Taken from:
 https://code.launchpad.net/~saiarcot895/chromium-browser/chromium-browser.wily.dev
-And rebased against chromium-dev 48.0.2564.82 sources.
+And rebased against chromium-dev 49.0.2623.75 sources.
  
 --------
 
-diff -uar chromium-48.0.2564.82.orig/chrome/browser/about_flags.cc chromium-48.0.2564.82/chrome/browser/about_flags.cc
---- chromium-48.0.2564.82.orig/chrome/browser/about_flags.cc	2016-01-20 21:01:19.000000000 +0100
-+++ chromium-48.0.2564.82/chrome/browser/about_flags.cc	2016-01-24 12:37:54.343633831 +0100
-@@ -1017,7 +1017,7 @@
+diff -uar chromium-49.0.2623.75.orig/chrome/browser/about_flags.cc chromium-49.0.2623.75/chrome/browser/about_flags.cc
+--- chromium-49.0.2623.75.orig/chrome/browser/about_flags.cc	2016-02-25 03:02:29.000000000 +0100
++++ chromium-49.0.2623.75/chrome/browser/about_flags.cc	2016-03-05 23:03:21.549519447 +0100
+@@ -937,7 +937,7 @@
       "disable-accelerated-video-decode",
-      IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_NAME,
-      IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_DESCRIPTION,
+      IDS_FLAGS_ACCELERATED_VIDEO_DECODE_NAME,
+      IDS_FLAGS_ACCELERATED_VIDEO_DECODE_DESCRIPTION,
 -     kOsMac | kOsWin | kOsCrOS,
 +     kOsAll,
-      SINGLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
+      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
      },
  #if defined(USE_ASH)
-diff -uar chromium-48.0.2564.82.orig/content/common/gpu/client/command_buffer_proxy_impl.cc chromium-48.0.2564.82/content/common/gpu/client/command_buffer_proxy_impl.cc
---- chromium-48.0.2564.82.orig/content/common/gpu/client/command_buffer_proxy_impl.cc	2016-01-20 21:01:21.000000000 +0100
-+++ chromium-48.0.2564.82/content/common/gpu/client/command_buffer_proxy_impl.cc	2016-01-24 12:37:54.344633997 +0100
-@@ -667,8 +667,10 @@
+diff -uar chromium-49.0.2623.75.orig/content/common/gpu/client/command_buffer_proxy_impl.cc chromium-49.0.2623.75/content/common/gpu/client/command_buffer_proxy_impl.cc
+--- chromium-49.0.2623.75.orig/content/common/gpu/client/command_buffer_proxy_impl.cc	2016-02-24 21:01:32.000000000 +0100
++++ chromium-49.0.2623.75/content/common/gpu/client/command_buffer_proxy_impl.cc	2016-03-05 23:03:21.569522766 +0100
+@@ -698,8 +698,10 @@
  
  scoped_ptr<media::VideoDecodeAccelerator>
  CommandBufferProxyImpl::CreateVideoDecoder() {
@@ -33,28 +33,28 @@ diff -uar chromium-48.0.2564.82.orig/content/common/gpu/client/command_buffer_pr
    return scoped_ptr<media::VideoDecodeAccelerator>(
        new GpuVideoDecodeAcceleratorHost(channel_, this));
  }
-diff -uar chromium-48.0.2564.82.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc chromium-48.0.2564.82/content/common/gpu/media/gpu_video_decode_accelerator.cc
---- chromium-48.0.2564.82.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc	2016-01-20 21:01:21.000000000 +0100
-+++ chromium-48.0.2564.82/content/common/gpu/media/gpu_video_decode_accelerator.cc	2016-01-24 12:40:38.968995605 +0100
-@@ -33,7 +33,7 @@
- #include "content/common/gpu/media/dxva_video_decode_accelerator.h"
+diff -uar chromium-49.0.2623.75.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc chromium-49.0.2623.75/content/common/gpu/media/gpu_video_decode_accelerator.cc
+--- chromium-49.0.2623.75.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc	2016-02-24 21:01:32.000000000 +0100
++++ chromium-49.0.2623.75/content/common/gpu/media/gpu_video_decode_accelerator.cc	2016-03-05 23:03:21.581524755 +0100
+@@ -34,7 +34,7 @@
+ #include "content/common/gpu/media/dxva_video_decode_accelerator_win.h"
  #elif defined(OS_MACOSX)
- #include "content/common/gpu/media/vt_video_decode_accelerator.h"
+ #include "content/common/gpu/media/vt_video_decode_accelerator_mac.h"
 -#elif defined(OS_CHROMEOS)
 +#elif defined(OS_CHROMEOS) || defined(OS_LINUX)
  #if defined(USE_V4L2_CODEC)
  #include "content/common/gpu/media/v4l2_device.h"
  #include "content/common/gpu/media/v4l2_slice_video_decode_accelerator.h"
 @@ -164,7 +164,7 @@
-   // can be initialized by corresponding VDA successfully.
  #if defined(OS_WIN)
-   profiles = DXVAVideoDecodeAccelerator::GetSupportedProfiles();
+   capabilities.supported_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();
-@@ -341,6 +341,8 @@
+@@ -346,6 +346,8 @@
    }
  #endif
  
@@ -63,14 +63,14 @@ diff -uar chromium-48.0.2564.82.orig/content/common/gpu/media/gpu_video_decode_a
    // 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.
-@@ -354,11 +356,14 @@
+@@ -359,11 +361,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))
+         !video_decode_accelerator_->Initialize(config, this))
        continue;
  
 +    VLOG(1) << "Initialization successful.";
@@ -78,7 +78,7 @@ diff -uar chromium-48.0.2564.82.orig/content/common/gpu/media/gpu_video_decode_a
      if (video_decode_accelerator_->CanDecodeOnIOThread()) {
        filter_ = new MessageFilter(this, host_route_id_);
        stub_->channel()->AddFilter(filter_.get());
-@@ -438,7 +443,9 @@
+@@ -444,7 +449,9 @@
  scoped_ptr<media::VideoDecodeAccelerator>
  GpuVideoDecodeAccelerator::CreateVaapiVDA() {
    scoped_ptr<media::VideoDecodeAccelerator> decoder;
@@ -89,10 +89,10 @@ diff -uar chromium-48.0.2564.82.orig/content/common/gpu/media/gpu_video_decode_a
    decoder.reset(new VaapiVideoDecodeAccelerator(
        make_context_current_, base::Bind(&GpuVideoDecodeAccelerator::BindImage,
                                          base::Unretained(this))));
-diff -uar chromium-48.0.2564.82.orig/content/common/gpu/media/vaapi_video_decode_accelerator.cc chromium-48.0.2564.82/content/common/gpu/media/vaapi_video_decode_accelerator.cc
---- chromium-48.0.2564.82.orig/content/common/gpu/media/vaapi_video_decode_accelerator.cc	2016-01-20 21:01:21.000000000 +0100
-+++ chromium-48.0.2564.82/content/common/gpu/media/vaapi_video_decode_accelerator.cc	2016-01-24 12:37:54.345634163 +0100
-@@ -325,17 +325,17 @@
+diff -uar chromium-49.0.2623.75.orig/content/common/gpu/media/vaapi_video_decode_accelerator.cc chromium-49.0.2623.75/content/common/gpu/media/vaapi_video_decode_accelerator.cc
+--- chromium-49.0.2623.75.orig/content/common/gpu/media/vaapi_video_decode_accelerator.cc	2016-02-24 00:02:00.000000000 +0100
++++ chromium-49.0.2623.75/content/common/gpu/media/vaapi_video_decode_accelerator.cc	2016-03-05 23:03:21.581524755 +0100
+@@ -334,17 +334,17 @@
  
    base::AutoLock auto_lock(lock_);
    DCHECK_EQ(state_, kUninitialized);
@@ -113,7 +113,7 @@ diff -uar chromium-48.0.2564.82.orig/content/common/gpu/media/vaapi_video_decode
               << "EGLGLES2.";
      return false;
    }
-@@ -345,7 +345,7 @@
+@@ -354,7 +354,7 @@
        VaapiWrapper::kDecode, profile, base::Bind(&ReportToUMA, VAAPI_ERROR));
  
    if (!vaapi_wrapper_.get()) {
@@ -122,7 +122,7 @@ diff -uar chromium-48.0.2564.82.orig/content/common/gpu/media/vaapi_video_decode
      return false;
    }
  
-@@ -362,7 +362,7 @@
+@@ -371,7 +371,7 @@
      vp9_accelerator_.reset(new VaapiVP9Accelerator(this, vaapi_wrapper_.get()));
      decoder_.reset(new VP9Decoder(vp9_accelerator_.get()));
    } else {
@@ -131,10 +131,10 @@ diff -uar chromium-48.0.2564.82.orig/content/common/gpu/media/vaapi_video_decode
      return false;
    }
  
-diff -uar chromium-48.0.2564.82.orig/content/common/gpu/media/vaapi_wrapper.cc chromium-48.0.2564.82/content/common/gpu/media/vaapi_wrapper.cc
---- chromium-48.0.2564.82.orig/content/common/gpu/media/vaapi_wrapper.cc	2016-01-20 21:01:21.000000000 +0100
-+++ chromium-48.0.2564.82/content/common/gpu/media/vaapi_wrapper.cc	2016-01-24 12:37:54.345634163 +0100
-@@ -152,7 +152,7 @@
+diff -uar chromium-49.0.2623.75.orig/content/common/gpu/media/vaapi_wrapper.cc chromium-49.0.2623.75/content/common/gpu/media/vaapi_wrapper.cc
+--- chromium-49.0.2623.75.orig/content/common/gpu/media/vaapi_wrapper.cc	2016-02-24 21:01:32.000000000 +0100
++++ chromium-49.0.2623.75/content/common/gpu/media/vaapi_wrapper.cc	2016-03-05 23:03:21.587525751 +0100
+@@ -186,7 +186,7 @@
      VAProfile va_profile,
      const base::Closure& report_error_to_uma_cb) {
    if (!profile_infos_.Get().IsProfileSupported(mode, va_profile)) {
@@ -143,7 +143,7 @@ diff -uar chromium-48.0.2564.82.orig/content/common/gpu/media/vaapi_wrapper.cc c
      return nullptr;
    }
  
-@@ -311,15 +311,17 @@
+@@ -345,15 +345,17 @@
  bool VaapiWrapper::VaInitialize(const base::Closure& report_error_to_uma_cb) {
    static bool vaapi_functions_initialized = PostSandboxInitialization();
    if (!vaapi_functions_initialized) {
@@ -166,7 +166,7 @@ diff -uar chromium-48.0.2564.82.orig/content/common/gpu/media/vaapi_wrapper.cc c
      else
        DVLOG(1) << kErrorMsg;
      return false;
-@@ -390,7 +392,7 @@
+@@ -424,7 +426,7 @@
    if (std::find(supported_entrypoints.begin(),
                  supported_entrypoints.end(),
                  entrypoint) == supported_entrypoints.end()) {
@@ -175,7 +175,7 @@ diff -uar chromium-48.0.2564.82.orig/content/common/gpu/media/vaapi_wrapper.cc c
      return false;
    }
    return true;
-@@ -414,8 +416,8 @@
+@@ -448,8 +450,8 @@
      if (attribs[i].type != required_attribs[i].type ||
          (attribs[i].value & required_attribs[i].value) !=
              required_attribs[i].value) {
@@ -186,11 +186,11 @@ diff -uar chromium-48.0.2564.82.orig/content/common/gpu/media/vaapi_wrapper.cc c
        return false;
      }
    }
-diff -uar chromium-48.0.2564.82.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc chromium-48.0.2564.82/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
---- chromium-48.0.2564.82.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc	2016-01-20 21:01:21.000000000 +0100
-+++ chromium-48.0.2564.82/content/common/sandbox_linux/bpf_gpu_policy_linux.cc	2016-01-24 12:37:54.345634163 +0100
-@@ -21,6 +21,8 @@
- #include "base/logging.h"
+diff -uar chromium-49.0.2623.75.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc chromium-49.0.2623.75/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
+--- chromium-49.0.2623.75.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc	2016-02-24 00:02:00.000000000 +0100
++++ chromium-49.0.2623.75/content/common/sandbox_linux/bpf_gpu_policy_linux.cc	2016-03-05 23:03:21.600527904 +0100
+@@ -22,6 +22,8 @@
+ #include "base/macros.h"
  #include "base/memory/scoped_ptr.h"
  #include "build/build_config.h"
 +// Auto-generated for dlopen libva libraries
@@ -198,7 +198,7 @@ diff -uar chromium-48.0.2564.82.orig/content/common/sandbox_linux/bpf_gpu_policy
  #include "content/common/sandbox_linux/sandbox_bpf_base_policy_linux.h"
  #include "content/common/sandbox_linux/sandbox_seccomp_bpf_linux.h"
  #include "content/common/set_process_title.h"
-@@ -31,6 +33,8 @@
+@@ -32,6 +34,8 @@
  #include "sandbox/linux/syscall_broker/broker_file_permission.h"
  #include "sandbox/linux/syscall_broker/broker_process.h"
  #include "sandbox/linux/system_headers/linux_syscalls.h"
@@ -207,7 +207,7 @@ diff -uar chromium-48.0.2564.82.orig/content/common/sandbox_linux/bpf_gpu_policy
  
  using sandbox::arch_seccomp_data;
  using sandbox::bpf_dsl::Allow;
-@@ -40,6 +44,11 @@
+@@ -41,6 +45,11 @@
  using sandbox::syscall_broker::BrokerProcess;
  using sandbox::SyscallSets;
  
@@ -219,7 +219,7 @@ diff -uar chromium-48.0.2564.82.orig/content/common/sandbox_linux/bpf_gpu_policy
  namespace content {
  
  namespace {
-@@ -94,7 +103,7 @@
+@@ -95,7 +104,7 @@
  
  bool IsAcceleratedVaapiVideoEncodeEnabled() {
    bool accelerated_encode_enabled = false;
@@ -228,7 +228,7 @@ diff -uar chromium-48.0.2564.82.orig/content/common/sandbox_linux/bpf_gpu_policy
    const base::CommandLine& command_line =
        *base::CommandLine::ForCurrentProcess();
    accelerated_encode_enabled =
-@@ -299,27 +308,41 @@
+@@ -300,27 +309,41 @@
      // inside the sandbox, so preload them now.
      if (IsAcceleratedVaapiVideoEncodeEnabled() ||
          IsAcceleratedVideoDecodeEnabled()) {
@@ -288,10 +288,10 @@ diff -uar chromium-48.0.2564.82.orig/content/common/sandbox_linux/bpf_gpu_policy
  
    return true;
  }
-diff -uar chromium-48.0.2564.82.orig/content/content_common.gypi chromium-48.0.2564.82/content/content_common.gypi
---- chromium-48.0.2564.82.orig/content/content_common.gypi	2016-01-20 21:01:21.000000000 +0100
-+++ chromium-48.0.2564.82/content/content_common.gypi	2016-01-24 12:37:54.346634329 +0100
-@@ -865,7 +865,7 @@
+diff -uar chromium-49.0.2623.75.orig/content/content_common.gypi chromium-49.0.2623.75/content/content_common.gypi
+--- chromium-49.0.2623.75.orig/content/content_common.gypi	2016-02-24 21:01:32.000000000 +0100
++++ chromium-49.0.2623.75/content/content_common.gypi	2016-03-05 23:03:21.609529397 +0100
+@@ -878,7 +878,7 @@
          },
        ],
      }],
@@ -299,8 +299,8 @@ diff -uar chromium-48.0.2564.82.orig/content/content_common.gypi chromium-48.0.2
 +    ['chromeos==1 or desktop_linux==1', {
        'sources': [
          'common/gpu/media/accelerated_video_decoder.h',
-         'common/gpu/media/h264_decoder.cc',
-@@ -921,7 +921,7 @@
+         'common/gpu/media/gpu_arc_video_service.cc',
+@@ -936,7 +936,7 @@
          'common/gpu/media/tegra_v4l2_device.h',
        ],
      }],
@@ -309,9 +309,9 @@ diff -uar chromium-48.0.2564.82.orig/content/content_common.gypi chromium-48.0.2
        'dependencies': [
          '../media/media.gyp:media',
          '../third_party/libyuv/libyuv.gyp:libyuv',
-diff -uar chromium-48.0.2564.82.orig/content/content_gpu.gypi chromium-48.0.2564.82/content/content_gpu.gypi
---- chromium-48.0.2564.82.orig/content/content_gpu.gypi	2016-01-14 02:49:23.000000000 +0100
-+++ chromium-48.0.2564.82/content/content_gpu.gypi	2016-01-24 12:37:54.346634329 +0100
+diff -uar chromium-49.0.2623.75.orig/content/content_gpu.gypi chromium-49.0.2623.75/content/content_gpu.gypi
+--- chromium-49.0.2623.75.orig/content/content_gpu.gypi	2016-02-24 21:01:32.000000000 +0100
++++ chromium-49.0.2623.75/content/content_gpu.gypi	2016-03-05 23:03:21.620531221 +0100
 @@ -38,7 +38,7 @@
          ],
        },
@@ -321,10 +321,10 @@ diff -uar chromium-48.0.2564.82.orig/content/content_gpu.gypi chromium-48.0.2564
        'include_dirs': [
          '<(DEPTH)/third_party/libva',
        ],
-diff -uar chromium-48.0.2564.82.orig/content/content_tests.gypi chromium-48.0.2564.82/content/content_tests.gypi
---- chromium-48.0.2564.82.orig/content/content_tests.gypi	2016-01-20 21:01:21.000000000 +0100
-+++ chromium-48.0.2564.82/content/content_tests.gypi	2016-01-24 12:37:54.346634329 +0100
-@@ -1733,7 +1733,7 @@
+diff -uar chromium-49.0.2623.75.orig/content/content_tests.gypi chromium-49.0.2623.75/content/content_tests.gypi
+--- chromium-49.0.2623.75.orig/content/content_tests.gypi	2016-02-24 21:01:32.000000000 +0100
++++ chromium-49.0.2623.75/content/content_tests.gypi	2016-03-05 23:03:21.632533211 +0100
+@@ -1757,7 +1757,7 @@
            },
          ]
      }],
@@ -333,10 +333,10 @@ diff -uar chromium-48.0.2564.82.orig/content/content_tests.gypi chromium-48.0.25
        'targets': [
            {
              'target_name': 'vaapi_jpeg_decoder_unittest',
-diff -uar chromium-48.0.2564.82.orig/content/gpu/gpu_main.cc chromium-48.0.2564.82/content/gpu/gpu_main.cc
---- chromium-48.0.2564.82.orig/content/gpu/gpu_main.cc	2016-01-20 21:01:21.000000000 +0100
-+++ chromium-48.0.2564.82/content/gpu/gpu_main.cc	2016-01-24 12:37:54.347634495 +0100
-@@ -72,7 +72,7 @@
+diff -uar chromium-49.0.2623.75.orig/content/gpu/gpu_main.cc chromium-49.0.2623.75/content/gpu/gpu_main.cc
+--- chromium-49.0.2623.75.orig/content/gpu/gpu_main.cc	2016-02-24 21:01:32.000000000 +0100
++++ chromium-49.0.2623.75/content/gpu/gpu_main.cc	2016-03-05 23:03:21.633533377 +0100
+@@ -76,7 +76,7 @@
  #include "content/common/sandbox_mac.h"
  #endif
  
@@ -345,7 +345,7 @@ diff -uar chromium-48.0.2564.82.orig/content/gpu/gpu_main.cc chromium-48.0.2564.
  #include "content/common/gpu/media/vaapi_wrapper.h"
  #endif
  
-@@ -237,7 +237,7 @@
+@@ -247,7 +247,7 @@
    GetGpuInfoFromCommandLine(gpu_info, command_line);
    gpu_info.in_process_gpu = false;
  
@@ -354,10 +354,10 @@ diff -uar chromium-48.0.2564.82.orig/content/gpu/gpu_main.cc chromium-48.0.2564.
    VaapiWrapper::PreSandboxInitialization();
  #endif
  
-diff -uar chromium-48.0.2564.82.orig/content/public/common/content_switches.cc chromium-48.0.2564.82/content/public/common/content_switches.cc
---- chromium-48.0.2564.82.orig/content/public/common/content_switches.cc	2016-01-20 21:01:21.000000000 +0100
-+++ chromium-48.0.2564.82/content/public/common/content_switches.cc	2016-01-24 12:37:54.347634495 +0100
-@@ -931,7 +931,9 @@
+diff -uar chromium-49.0.2623.75.orig/content/public/common/content_switches.cc chromium-49.0.2623.75/content/public/common/content_switches.cc
+--- chromium-49.0.2623.75.orig/content/public/common/content_switches.cc	2016-02-25 03:02:29.000000000 +0100
++++ chromium-49.0.2623.75/content/public/common/content_switches.cc	2016-03-05 23:03:21.644535200 +0100
+@@ -947,7 +947,9 @@
  #if defined(OS_CHROMEOS)
  // Disables panel fitting (used for mirror mode).
  const char kDisablePanelFitting[]           = "disable-panel-fitting";
@@ -367,10 +367,10 @@ diff -uar chromium-48.0.2564.82.orig/content/public/common/content_switches.cc c
  // Disables VA-API accelerated video encode.
  const char kDisableVaapiAcceleratedVideoEncode[] =
      "disable-vaapi-accelerated-video-encode";
-diff -uar chromium-48.0.2564.82.orig/content/public/common/content_switches.h chromium-48.0.2564.82/content/public/common/content_switches.h
---- chromium-48.0.2564.82.orig/content/public/common/content_switches.h	2016-01-20 21:01:21.000000000 +0100
-+++ chromium-48.0.2564.82/content/public/common/content_switches.h	2016-01-24 12:37:54.347634495 +0100
-@@ -275,6 +275,8 @@
+diff -uar chromium-49.0.2623.75.orig/content/public/common/content_switches.h chromium-49.0.2623.75/content/public/common/content_switches.h
+--- chromium-49.0.2623.75.orig/content/public/common/content_switches.h	2016-02-25 03:02:29.000000000 +0100
++++ chromium-49.0.2623.75/content/public/common/content_switches.h	2016-03-05 23:03:21.663538350 +0100
+@@ -278,6 +278,8 @@
  
  #if defined(OS_CHROMEOS)
  CONTENT_EXPORT extern const char kDisablePanelFitting[];
@@ -379,9 +379,9 @@ diff -uar chromium-48.0.2564.82.orig/content/public/common/content_switches.h ch
  CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[];
  #endif
  
-diff -uar chromium-48.0.2564.82.orig/gpu/config/software_rendering_list_json.cc chromium-48.0.2564.82/gpu/config/software_rendering_list_json.cc
---- chromium-48.0.2564.82.orig/gpu/config/software_rendering_list_json.cc	2016-01-20 21:01:22.000000000 +0100
-+++ chromium-48.0.2564.82/gpu/config/software_rendering_list_json.cc	2016-01-24 12:43:07.497683578 +0100
+diff -uar chromium-49.0.2623.75.orig/gpu/config/software_rendering_list_json.cc chromium-49.0.2623.75/gpu/config/software_rendering_list_json.cc
+--- chromium-49.0.2623.75.orig/gpu/config/software_rendering_list_json.cc	2016-02-24 00:02:01.000000000 +0100
++++ chromium-49.0.2623.75/gpu/config/software_rendering_list_json.cc	2016-03-05 23:03:21.663538350 +0100
 @@ -481,17 +481,6 @@
        ]
      },
@@ -400,22 +400,22 @@ diff -uar chromium-48.0.2564.82.orig/gpu/config/software_rendering_list_json.cc
        "id": 49,
        "description": "NVidia GeForce GT 650M can cause the system to hang with flash 3D",
        "cr_bugs": [140175],
-@@ -1041,6 +1030,11 @@
-           }
-         },
-         {
+@@ -1048,6 +1037,11 @@
+             "type": "android"
+           },
+           "gl_renderer": ".*Google.*"
++        },
++        {
 +          "os": {
 +            "type": "linux"
 +          }
-+        },
-+        {
-           "os": {
-             "type": "android"
-           },
-diff -uar chromium-48.0.2564.82.orig/media/media.gyp chromium-48.0.2564.82/media/media.gyp
---- chromium-48.0.2564.82.orig/media/media.gyp	2016-01-20 21:01:22.000000000 +0100
-+++ chromium-48.0.2564.82/media/media.gyp	2016-01-24 12:37:54.365637487 +0100
-@@ -764,7 +764,7 @@
+         }
+       ],
+       "features": [
+diff -uar chromium-49.0.2623.75.orig/media/media.gyp chromium-49.0.2623.75/media/media.gyp
+--- chromium-49.0.2623.75.orig/media/media.gyp	2016-02-24 21:01:33.000000000 +0100
++++ chromium-49.0.2623.75/media/media.gyp	2016-03-05 23:03:21.681541334 +0100
+@@ -783,7 +783,7 @@
            ],
          }],
          # For VaapiVideoEncodeAccelerator.
@@ -424,7 +424,7 @@ diff -uar chromium-48.0.2564.82.orig/media/media.gyp chromium-48.0.2564.82/media
            'sources': [
              'filters/h264_bitstream_buffer.cc',
              'filters/h264_bitstream_buffer.h',
-@@ -1398,7 +1398,7 @@
+@@ -1417,7 +1417,7 @@
              'cdm/cdm_adapter_unittest.cc',
            ],
          }],