Update to 70.0.3538.67

7 files changed, 126 insertions, 188 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 954d219c2b22..c45bfab9e175 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = chromium-vaapi
 	pkgdesc = Chromium with VA-API support to enable hardware acceleration
-	pkgver = 69.0.3497.100
+	pkgver = 70.0.3538.67
 	pkgrel = 1
 	url = https://www.chromium.org/Home
 	install = chromium.install
@@ -55,24 +55,22 @@ pkgbase = chromium-vaapi
 	optdepends = libva-vdpau-driver-chromium: support HW acceleration on Nvidia graphics cards
 	provides = chromium
 	conflicts = chromium
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-69.0.3497.100.tar.xz
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-70.0.3538.67.tar.xz
 	source = chromium-launcher-6.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v6.tar.gz
-	source = cfi-issues-fix.patch
-	source = fix-cfi-icall-failure-with-use_system_libjpeg-true.patch
-	source = only-disable-cfi-icall-when-use_system_libjpeg-true.patch
+	source = include-stdint.h-in-pdfium_mem_buffer_file_write.h.patch
 	source = chromium-widevine-r2.patch
 	source = chromium-system-icu.patch
 	source = chromium-skia-harmony.patch
-	source = chromium-vaapi-r20.patch
-	sha256sums = e3391560e73e25fb4afc3f2dd5616607e2dbfc58aa88251a2c5d6b7096fe9e35
+	source = cfi-vaapi-fix.patch
+	source = chromium-vaapi-r21.patch
+	sha256sums = e956c2031f634300ada8c09e0777f0c560f4798963f144edaaec8d43e1e30e37
 	sha256sums = 04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1
-	sha256sums = adf301b50b5a03c98b7602c17e1f34e37260c07c88bcb7e1661122af61f50e23
-	sha256sums = 97b421bc60a4abdf37de2d88a51b973e9f68fb44d1eccd464adfb3d9f5d71478
-	sha256sums = 9cae9ded6497afd15ad72d963897425ab6c7f28941bb3c3948e7996610a0d180
+	sha256sums = cd1e87bf3618b7897c5caf7b0f4213cfa5ce917acb0613ecd2ab3f830f0cbfbb
 	sha256sums = 02c69bb3954087db599def7f5b6d65cf8f7cf2ed81dfbdaa4bb7b51863b4df15
 	sha256sums = c4f2d1bed9034c02b8806f00c2e8165df24de467803855904bff709ceaf11af5
 	sha256sums = feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3
-	sha256sums = 86cbb0913edadac7048592c0f94ccc835e7d8dd80d8f191827bb0ec767b69bff
+	sha256sums = adf301b50b5a03c98b7602c17e1f34e37260c07c88bcb7e1661122af61f50e23
+	sha256sums = 7985b5b6820300beeb119b601bb9fe3d2a662daf5dc90619a0f125ea84907ce5
 
 pkgname = chromium-vaapi
 
diff --git a/PKGBUILD b/PKGBUILD
index 6e2b96fb6063..f5874de0c925 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=chromium-vaapi
-pkgver=69.0.3497.100
+pkgver=70.0.3538.67
 pkgrel=1
 _launcher_ver=6
 pkgdesc="Chromium with VA-API support to enable hardware acceleration"
@@ -33,22 +33,20 @@ optdepends=('pepper-flash: support for Flash content'
 install=chromium.install
 source=(https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz
         chromium-launcher-$_launcher_ver.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver.tar.gz
-        cfi-issues-fix.patch
-        fix-cfi-icall-failure-with-use_system_libjpeg-true.patch
-        only-disable-cfi-icall-when-use_system_libjpeg-true.patch
+        include-stdint.h-in-pdfium_mem_buffer_file_write.h.patch
         chromium-widevine-r2.patch
         chromium-system-icu.patch
         chromium-skia-harmony.patch
-        chromium-vaapi-r20.patch)
-sha256sums=('e3391560e73e25fb4afc3f2dd5616607e2dbfc58aa88251a2c5d6b7096fe9e35'
+        cfi-vaapi-fix.patch
+        chromium-vaapi-r21.patch)
+sha256sums=('e956c2031f634300ada8c09e0777f0c560f4798963f144edaaec8d43e1e30e37'
             '04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1'
-            'adf301b50b5a03c98b7602c17e1f34e37260c07c88bcb7e1661122af61f50e23'
-            '97b421bc60a4abdf37de2d88a51b973e9f68fb44d1eccd464adfb3d9f5d71478'
-            '9cae9ded6497afd15ad72d963897425ab6c7f28941bb3c3948e7996610a0d180'
+            'cd1e87bf3618b7897c5caf7b0f4213cfa5ce917acb0613ecd2ab3f830f0cbfbb'
             '02c69bb3954087db599def7f5b6d65cf8f7cf2ed81dfbdaa4bb7b51863b4df15'
             'c4f2d1bed9034c02b8806f00c2e8165df24de467803855904bff709ceaf11af5'
             'feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3'
-            '86cbb0913edadac7048592c0f94ccc835e7d8dd80d8f191827bb0ec767b69bff')
+            'adf301b50b5a03c98b7602c17e1f34e37260c07c88bcb7e1661122af61f50e23'
+            '7985b5b6820300beeb119b601bb9fe3d2a662daf5dc90619a0f125ea84907ce5')
 
 # Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
 # Keys are the names in the above script; values are the dependencies in Arch
@@ -92,10 +90,14 @@ prepare() {
   sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
     tools/generate_shim_headers/generate_shim_headers.py
 
-  # https://crbug.com/866290
-  patch -Np1 -i ../cfi-issues-fix.patch # Fixes VA-API when used with patches below
-  patch -Np1 -i ../fix-cfi-icall-failure-with-use_system_libjpeg-true.patch
-  patch -Np1 -i ../only-disable-cfi-icall-when-use_system_libjpeg-true.patch
+  # https://crbug.com/893950
+  sed -i -e 's/\<xmlMalloc\>/malloc/' -e 's/\<xmlFree\>/free/' \
+    third_party/blink/renderer/core/xml/*.cc \
+    third_party/blink/renderer/core/xml/parser/xml_document_parser.cc \
+    third_party/libxml/chromium/libxml_utils.cc
+
+  # https://crbug.com/879900
+  patch -Np1 -i ../include-stdint.h-in-pdfium_mem_buffer_file_write.h.patch
 
   # https://crbug.com/skia/6663#c10
   patch -Np4 -i ../chromium-skia-harmony.patch
@@ -106,11 +108,6 @@ prepare() {
   # https://bugs.gentoo.org/661880#c21
   patch -Np1 -i ../chromium-system-icu.patch
 
-  # Remove compiler flags not supported by our system clang
-  sed -i \
-    -e '/"-Wno-ignored-pragma-optimize"/d' \
-    build/config/compiler/BUILD.gn
-
   # Force script incompatible with Python 3 to use /usr/bin/python2
   sed -i '1s|python$|&2|' third_party/dom_distiller_js/protoc_plugins/*.py
 
@@ -119,7 +116,8 @@ prepare() {
 
   # VA-API patch
   msg2 'Applying VA-API patches'
-  patch -Np1 -i ../chromium-vaapi-r20.patch
+  patch -Np1 -i ../cfi-vaapi-fix.patch
+  patch -Np1 -i ../chromium-vaapi-r21.patch
 
   # Remove bundled libraries for which we will use the system copies; this
   # *should* do what the remove_bundled_libraries.py script does, with the
@@ -158,10 +156,8 @@ build() {
     'host_toolchain="//build/toolchain/linux/unbundle:default"'
     'clang_use_chrome_plugins=false'
     'is_official_build=true' # implies is_cfi=true on x86_64
-    'is_debug=false'
     'treat_warnings_as_errors=false'
     'fieldtrial_testing_like_official_build=true'
-    'remove_webcore_debug_symbols=true'
     'ffmpeg_branding="Chrome"'
     'proprietary_codecs=true'
     'link_pulseaudio=true'
diff --git a/cfi-issues-fix.patch b/cfi-vaapi-fix.patch
index 8d11721bad9e..8d11721bad9e 100644
--- a/cfi-issues-fix.patch
+++ b/cfi-vaapi-fix.patch
diff --git a/chromium-vaapi-r20.patch b/chromium-vaapi-r21.patch
index cdfd6d08d33e..67b9b29d69dd 100644
--- a/chromium-vaapi-r20.patch
+++ b/chromium-vaapi-r21.patch
@@ -1,5 +1,5 @@
 From e95d904578c265a84f117d7d5eff598423f9283d Mon Sep 17 00:00:00 2001
-From: Daniel Charles <daniel.charles@intel.com>
+From: Daniel Charles
 Date: Fri, 09 Feb 2018 14:39:27 -0800
 Subject: [PATCH] Enable VAVDA, VAVEA and VAJDA on linux with VAAPI only
 
@@ -31,12 +31,12 @@ TEST=subjective testing with VAVDA,VAVEA and VAJDA, autotest for encoder
 
 Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
 Change-Id: Ifbbf5c9e5221a8b5733fc6d4d0cf984a1f103171
-Signed-off-by: Daniel Charles <daniel.charles@intel.com>
+Signed-off-by: Daniel Charles
 ---
 
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -1273,12 +1273,14 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1429,12 +1429,14 @@ const FeatureEntry kFeatureEntries[] = {
      {"ui-disable-partial-swap", flag_descriptions::kUiPartialSwapName,
       flag_descriptions::kUiPartialSwapDescription, kOsAll,
       SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)},
@@ -51,7 +51,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
      {"enable-webrtc-hw-h264-encoding",
       flag_descriptions::kWebrtcHwH264EncodingName,
       flag_descriptions::kWebrtcHwH264EncodingDescription, kOsAndroid | kOsCrOS,
-@@ -1647,6 +1649,13 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1815,6 +1817,13 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kShowTouchHudDescription, kOsCrOS,
       SINGLE_VALUE_TYPE(ash::switches::kAshTouchHud)},
  #endif  // OS_CHROMEOS
@@ -65,7 +65,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
      {
          "disable-accelerated-video-decode",
          flag_descriptions::kAcceleratedVideoDecodeName,
-@@ -1654,6 +1663,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1822,6 +1831,7 @@ const FeatureEntry kFeatureEntries[] = {
          kOsMac | kOsWin | kOsCrOS | kOsAndroid,
          SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
      },
@@ -73,7 +73,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
  #if defined(OS_WIN)
      {"enable-hdr", flag_descriptions::kEnableHDRName,
       flag_descriptions::kEnableHDRDescription, kOsWin,
-@@ -2326,12 +2336,17 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2501,12 +2511,17 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(features::kOpenVR)},
  #endif  // ENABLE_OPENVR
  #endif  // ENABLE_VR
@@ -134,7 +134,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
 @@ -14,6 +14,13 @@ const char kAccelerated2dCanvasDescripti
      "Enables the use of the GPU to perform 2d canvas rendering instead of "
      "using software rendering.";
- 
+
 +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
 +const char kAcceleratedVideoName[] = "Hardware-accelerated video";
 +const char kAcceleratedVideoDescription[] =
@@ -145,36 +145,36 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
  const char kAcceleratedVideoDecodeName[] = "Hardware-accelerated video decode";
  const char kAcceleratedVideoDecodeDescription[] =
      "Hardware-accelerated video decode where available.";
-@@ -1986,6 +1993,7 @@ const char kWebrtcEchoCanceller3Name[] =
- const char kWebrtcEchoCanceller3Description[] =
-     "Experimental WebRTC echo canceller (AEC3).";
- 
+@@ -2121,6 +2128,7 @@ const char kWebrtcHybridAgcName[] = "Web
+ const char kWebrtcHybridAgcDescription[] =
+     "WebRTC Agc2 digital adaptation with Agc1 analog adaptation.";
+
 +#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
  const char kWebrtcHwDecodingName[] = "WebRTC hardware video decoding";
  const char kWebrtcHwDecodingDescription[] =
      "Support in WebRTC for decoding video streams using platform hardware.";
-@@ -1993,6 +2001,7 @@ const char kWebrtcHwDecodingDescription[
+@@ -2128,6 +2136,7 @@ const char kWebrtcHwDecodingDescription[
  const char kWebrtcHwEncodingName[] = "WebRTC hardware video encoding";
  const char kWebrtcHwEncodingDescription[] =
      "Support in WebRTC for encoding video streams using platform hardware.";
 +#endif
- 
+
  const char kWebrtcHwH264EncodingName[] = "WebRTC hardware h264 video encoding";
  const char kWebrtcHwH264EncodingDescription[] =
-@@ -2892,14 +2901,16 @@ const char kTabStripKeyboardFocusDescrip
- 
+@@ -3059,14 +3068,16 @@ const char kTextSuggestionsTouchBarDescr
+
  // Chrome OS -------------------------------------------------------------------
- 
+
 -#if defined(OS_CHROMEOS)
 +#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
- 
+
  const char kAcceleratedMjpegDecodeName[] =
      "Hardware-accelerated mjpeg decode for captured frame";
  const char kAcceleratedMjpegDecodeDescription[] =
      "Enable hardware-accelerated mjpeg decode for captured frame where "
      "available.";
 +#endif
- 
+
 +#if defined(OS_CHROMEOS)
  const char kAllowTouchpadThreeFingerClickName[] = "Touchpad three-finger-click";
  const char kAllowTouchpadThreeFingerClickDescription[] =
@@ -184,26 +184,26 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
 @@ -37,6 +37,10 @@ namespace flag_descriptions {
  extern const char kAccelerated2dCanvasName[];
  extern const char kAccelerated2dCanvasDescription[];
- 
+
 +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
 +extern const char kAcceleratedVideoName[];
 +extern const char kAcceleratedVideoDescription[];
 +#endif
  extern const char kAcceleratedVideoDecodeName[];
  extern const char kAcceleratedVideoDecodeDescription[];
- 
-@@ -1762,13 +1766,17 @@ extern const char kPermissionPromptPersi
- 
+
+@@ -1849,13 +1853,17 @@ extern const char kPermissionPromptPersi
+
  #endif  // defined(OS_MACOSX)
- 
+
 -// Chrome OS ------------------------------------------------------------------
 -
 -#if defined(OS_CHROMEOS)
 +#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
- 
+
  extern const char kAcceleratedMjpegDecodeName[];
  extern const char kAcceleratedMjpegDecodeDescription[];
- 
+
 +#endif
 +
 +// Chrome OS ------------------------------------------------------------------
@@ -212,10 +212,10 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
 +
  extern const char kAllowTouchpadThreeFingerClickName[];
  extern const char kAllowTouchpadThreeFingerClickDescription[];
- 
+
 --- a/content/browser/gpu/compositor_util.cc
 +++ b/content/browser/gpu/compositor_util.cc
-@@ -149,7 +149,11 @@ const GpuFeatureData GetGpuFeatureData(
+@@ -150,7 +150,11 @@ const GpuFeatureData GetGpuFeatureData(
        {"video_decode",
         SafeGetFeatureStatus(gpu_feature_info,
                              gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE),
@@ -229,7 +229,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
         true, true},
 --- a/content/browser/gpu/gpu_process_host.cc
 +++ b/content/browser/gpu/gpu_process_host.cc
-@@ -209,7 +209,9 @@ static const char* const kSwitchNames[]
+@@ -210,7 +210,9 @@ static const char* const kSwitchNames[]
      switches::kDisableLogging,
      switches::kDisableShaderNameHashing,
      switches::kDisableSkiaRuntimeOpts,
@@ -241,7 +241,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
  #endif
 --- a/content/browser/renderer_host/media/video_capture_browsertest.cc
 +++ b/content/browser/renderer_host/media/video_capture_browsertest.cc
-@@ -165,8 +165,13 @@ class VideoCaptureBrowserTest : public C
+@@ -166,8 +166,13 @@ class VideoCaptureBrowserTest : public C
        base::CommandLine::ForCurrentProcess()->AppendSwitch(
            switches::kUseFakeJpegDecodeAccelerator);
      } else {
@@ -254,10 +254,10 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
 +#endif
      }
    }
- 
+
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -2799,7 +2799,11 @@ void RenderProcessHostImpl::PropagateBro
+@@ -2932,7 +2932,11 @@ void RenderProcessHostImpl::PropagateBro
      switches::kDefaultTileHeight,
      switches::kDisable2dCanvasImageChromium,
      switches::kDisableAcceleratedJpegDecoding,
@@ -269,7 +269,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
      switches::kDisableBackgroundTasks,
      switches::kDisableBackgroundTimerThrottling,
      switches::kDisableBreakpad,
-@@ -2936,8 +2940,10 @@ void RenderProcessHostImpl::PropagateBro
+@@ -3072,8 +3076,10 @@ void RenderProcessHostImpl::PropagateBro
  #if BUILDFLAG(ENABLE_RUNTIME_MEDIA_RENDERER_SELECTION)
      switches::kDisableMojoRenderer,
  #endif
@@ -294,11 +294,11 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
 +#endif
 +        );
    }
- 
+
   private:
 --- a/content/gpu/BUILD.gn
 +++ b/content/gpu/BUILD.gn
-@@ -133,4 +133,8 @@ target(link_target_type, "gpu_sources")
+@@ -134,4 +134,8 @@ target(link_target_type, "gpu_sources")
        (!is_chromecast || is_cast_desktop_build)) {
      configs += [ "//build/config/linux/dri" ]
    }
@@ -309,27 +309,27 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
  }
 --- a/content/gpu/gpu_main.cc
 +++ b/content/gpu/gpu_main.cc
-@@ -284,7 +284,7 @@ int GpuMain(const MainFunctionParams& pa
- 
+@@ -283,7 +283,7 @@ int GpuMain(const MainFunctionParams& pa
+
    base::PlatformThread::SetName("CrGpuMain");
- 
+
 -#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
 +#if defined(OS_LINUX)
    // Set thread priority before sandbox initialization.
    base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY);
  #endif
-@@ -317,7 +317,7 @@ int GpuMain(const MainFunctionParams& pa
+@@ -316,7 +316,7 @@ int GpuMain(const MainFunctionParams& pa
    GetContentClient()->SetGpuInfo(gpu_init->gpu_info());
- 
+
    base::ThreadPriority io_thread_priority = base::ThreadPriority::NORMAL;
 -#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
 +#if defined(OS_LINUX)
    io_thread_priority = base::ThreadPriority::DISPLAY;
  #endif
- 
+
 --- a/content/public/browser/gpu_utils.cc
 +++ b/content/public/browser/gpu_utils.cc
-@@ -57,9 +57,17 @@ const gpu::GpuPreferences GetGpuPreferen
+@@ -58,9 +58,17 @@ const gpu::GpuPreferences GetGpuPreferen
    gpu_preferences.in_process_gpu =
        command_line->HasSwitch(switches::kInProcessGPU);
    gpu_preferences.disable_accelerated_video_decode =
@@ -349,10 +349,10 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
        gpu::GpuPreferences::VPX_VENDOR_MICROSOFT;
 --- a/content/public/common/content_switches.cc
 +++ b/content/public/common/content_switches.cc
-@@ -79,6 +79,11 @@ const char kDisable3DAPIs[]
+@@ -64,6 +64,11 @@ const char kDisable3DAPIs[]
  // Disable gpu-accelerated 2d canvas.
  const char kDisableAccelerated2dCanvas[]    = "disable-accelerated-2d-canvas";
- 
+
 +#if defined(OS_LINUX)
 +// Enables hardware acceleration of video for Linux only. VA-API driver
 +// is required to be present on the system installation.
@@ -361,23 +361,23 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
  // Disables hardware acceleration of video decode, where available.
  const char kDisableAcceleratedVideoDecode[] =
      "disable-accelerated-video-decode";
-@@ -868,11 +873,13 @@ const char kWaitForDebuggerChildren[]
+@@ -853,11 +858,13 @@ const char kWaitForDebuggerChildren[]
  // ignores this switch on its stable and beta channels.
  const char kDisableWebRtcEncryption[]      = "disable-webrtc-encryption";
- 
+
 +#if defined(OS_CHROMEOS)
  // Disables HW decode acceleration for WebRTC.
  const char kDisableWebRtcHWDecoding[]       = "disable-webrtc-hw-decoding";
- 
+
  // Disables HW encode acceleration for WebRTC.
  const char kDisableWebRtcHWEncoding[] = "disable-webrtc-hw-encoding";
 +#endif
- 
+
  // Enables negotiation of GCM cipher suites from RFC 7714 for SRTP in WebRTC.
  // See https://tools.ietf.org/html/rfc7714 for further information.
 --- a/content/public/common/content_switches.h
 +++ b/content/public/common/content_switches.h
-@@ -104,6 +104,9 @@ CONTENT_EXPORT extern const char kDisabl
+@@ -102,6 +102,9 @@ CONTENT_EXPORT extern const char kDisabl
  CONTENT_EXPORT extern const char kDomAutomationController[];
  extern const char kDisable2dCanvasClipAntialiasing[];
  CONTENT_EXPORT extern const char kDumpBlinkRuntimeCallStats[];
@@ -387,9 +387,9 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
  CONTENT_EXPORT extern const char kEnableAccessibilityObjectModel[];
  CONTENT_EXPORT extern const char kEnableAggressiveDOMStorageFlushing[];
  CONTENT_EXPORT extern const char kEnableAutomation[];
-@@ -241,8 +244,10 @@ CONTENT_EXPORT extern const char kValida
+@@ -239,8 +242,10 @@ CONTENT_EXPORT extern const char kValida
  CONTENT_EXPORT extern const char kWaitForDebuggerChildren[];
- 
+
  CONTENT_EXPORT extern const char kDisableWebRtcEncryption[];
 +#if defined(OS_CHROMEOS)
  CONTENT_EXPORT extern const char kDisableWebRtcHWDecoding[];
@@ -401,7 +401,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
 --- a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
 +++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
 @@ -276,10 +276,18 @@ void PeerConnectionDependencyFactory::In
- 
+
    const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
    if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled()) {
 +#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
@@ -410,7 +410,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
      if (!cmd_line->HasSwitch(switches::kDisableWebRtcHWDecoding))
 +#endif
        decoder_factory.reset(new RTCVideoDecoderFactory(gpu_factories));
- 
+
 +#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +    if (cmd_line->HasSwitch(switches::kEnableAcceleratedVideo))
 +#else
@@ -418,12 +418,12 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
 +#endif
        encoder_factory.reset(new RTCVideoEncoderFactory(gpu_factories));
    }
- 
+
 --- a/content/renderer/render_thread_impl.cc
 +++ b/content/renderer/render_thread_impl.cc
-@@ -1441,7 +1441,11 @@ media::GpuVideoAcceleratorFactories* Ren
-                              kGpuStreamIdMedia, kGpuStreamPriorityMedia);
- 
+@@ -1415,7 +1415,11 @@ media::GpuVideoAcceleratorFactories* Ren
+           kGpuStreamPriorityMedia);
+
    const bool enable_video_accelerator =
 +#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +      cmd_line->HasSwitch(switches::kEnableAcceleratedVideo) &&
@@ -435,7 +435,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
         gpu::kGpuFeatureStatusEnabled);
 --- a/gpu/config/software_rendering_list.json
 +++ b/gpu/config/software_rendering_list.json
-@@ -377,17 +377,6 @@
+@@ -374,17 +374,6 @@
        ]
      },
      {
@@ -455,10 +455,10 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
        "cr_bugs": [145531, 332596, 571899, 629434],
 --- a/media/gpu/BUILD.gn
 +++ b/media/gpu/BUILD.gn
-@@ -495,6 +495,14 @@ if (use_v4l2_codec || use_vaapi || is_ma
+@@ -501,6 +501,14 @@ if (use_v4l2_codec || use_vaapi || is_ma
    }
  }
- 
+
 +if (is_desktop_linux && use_vaapi) {
 +  import("//build/config/linux/pkg_config.gni")
 +
@@ -470,7 +470,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
  if (use_vaapi) {
    test("jpeg_encode_accelerator_unittest") {
      deps = [
-@@ -559,6 +567,10 @@ if (use_v4l2_codec || use_vaapi) {
+@@ -571,6 +579,10 @@ if (use_v4l2_codec || use_vaapi) {
      if (use_ozone) {
        deps += [ "//ui/ozone" ]
      }
@@ -480,13 +480,13 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
 +    }
    }
  }
- 
+
 --- a/media/base/media_switches.cc
 +++ b/media/base/media_switches.cc
-@@ -117,10 +117,15 @@ const char kUseFileForFakeAudioCapture[]
+@@ -108,10 +108,15 @@ const char kUseFileForFakeAudioCapture[]
  // accelerator hardware to be present.
  const char kUseFakeJpegDecodeAccelerator[] = "use-fake-jpeg-decode-accelerator";
- 
+
 +#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +// Enable hardware accelerated mjpeg decode on linux
 +const char kEnableAcceleratedMjpegDecode[] = "enable-accelerated-mjpeg-decode";
@@ -496,12 +496,12 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
  const char kDisableAcceleratedMjpegDecode[] =
      "disable-accelerated-mjpeg-decode";
 +#endif
- 
+
  // When running tests on a system without the required hardware or libraries,
  // this flag will cause the tests to fail. Otherwise, they silently succeed.
-@@ -462,15 +467,22 @@ const base::Feature kPreloadMediaEngagem
+@@ -460,15 +465,22 @@ const base::Feature kPreloadMediaEngagem
  #endif
- 
+
  bool IsVideoCaptureAcceleratedJpegDecodingEnabled() {
 +
 +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
@@ -526,7 +526,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
    return false;
 --- a/media/base/media_switches.h
 +++ b/media/base/media_switches.h
-@@ -66,7 +66,11 @@ MEDIA_EXPORT extern const char kUseFakeD
+@@ -64,7 +64,11 @@ MEDIA_EXPORT extern const char kUseFakeD
  MEDIA_EXPORT extern const char kUseFileForFakeVideoCapture[];
  MEDIA_EXPORT extern const char kUseFileForFakeAudioCapture[];
  MEDIA_EXPORT extern const char kUseFakeJpegDecodeAccelerator[];
@@ -535,12 +535,12 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
 +#else
  MEDIA_EXPORT extern const char kDisableAcceleratedMjpegDecode[];
 +#endif
- 
+
  MEDIA_EXPORT extern const char kRequireAudioHardwareForTesting[];
  MEDIA_EXPORT extern const char kMuteAudio[];
 --- a/content/browser/utility_process_host.cc
 +++ b/content/browser/utility_process_host.cc
-@@ -296,7 +296,11 @@ bool UtilityProcessHost::StartProcess()
+@@ -304,7 +304,11 @@ bool UtilityProcessHost::StartProcess()
        switches::kOverrideUseSoftwareGLForTests,
        switches::kOverrideEnabledCdmInterfaceVersion,
        switches::kProxyServer,
diff --git a/fix-cfi-icall-failure-with-use_system_libjpeg-true.patch b/fix-cfi-icall-failure-with-use_system_libjpeg-true.patch
deleted file mode 100644
index 3c27898ed2e1..000000000000
--- a/fix-cfi-icall-failure-with-use_system_libjpeg-true.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From db82db1b609f30d144d45477f55697818bcd363c Mon Sep 17 00:00:00 2001
-From: Vlad Tsyrklevich <vtsyrklevich@chromium.org>
-Date: Tue, 31 Jul 2018 01:03:22 +0000
-Subject: [PATCH] Fix cfi-icall failure with use_system_libjpeg=true
-
-JPEGImageReader::AllocateSampleArray() can call the function pointer
-(*info_.mem->alloc_sarray) which can be set by the systems non-CFI
-enabled libjpeg DSO when chromium is built with use_system_libjpeg=true.
-Disable cfi-icall for that method.
-
-Bug: 866290
-Change-Id: I6d9bbf08c514d6d5f48ad34c3802c63419ed1223
-Reviewed-on: https://chromium-review.googlesource.com/1155927
-Reviewed-by: Kentaro Hara <haraken@chromium.org>
-Commit-Queue: Vlad Tsyrklevich <vtsyrklevich@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#579270}
----
- .../renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc | 2 +-
- third_party/blink/renderer/platform/wtf/compiler.h              | 2 ++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc b/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc
-index a1e440f6eed5..fd4e72ba053c 100644
---- a/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc
-+++ b/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc
-@@ -643,7 +643,7 @@ class JPEGImageReader final {
-   IntSize UvSize() const { return uv_size_; }
- 
-  private:
--  JSAMPARRAY AllocateSampleArray() {
-+  NO_SANITIZE_CFI_ICALL JSAMPARRAY AllocateSampleArray() {
- // Some output color spaces don't need the sample array: don't allocate in that
- // case.
- #if defined(TURBO_JPEG_RGB_SWIZZLE)
-diff --git a/third_party/blink/renderer/platform/wtf/compiler.h b/third_party/blink/renderer/platform/wtf/compiler.h
-index 51595afdc955..5225a70309d6 100644
---- a/third_party/blink/renderer/platform/wtf/compiler.h
-+++ b/third_party/blink/renderer/platform/wtf/compiler.h
-@@ -57,8 +57,10 @@
- #if defined(__clang__)
- #define NO_SANITIZE_UNRELATED_CAST \
-   __attribute__((no_sanitize("cfi-unrelated-cast", "vptr")))
-+#define NO_SANITIZE_CFI_ICALL __attribute__((no_sanitize("cfi-icall")))
- #else
- #define NO_SANITIZE_UNRELATED_CAST
-+#define NO_SANITIZE_CFI_ICALL
- #endif
- 
- #endif /* WTF_Compiler_h */
--- 
-2.18.0
-
diff --git a/include-stdint.h-in-pdfium_mem_buffer_file_write.h.patch b/include-stdint.h-in-pdfium_mem_buffer_file_write.h.patch
new file mode 100644
index 000000000000..1cfa4c55c29e
--- /dev/null
+++ b/include-stdint.h-in-pdfium_mem_buffer_file_write.h.patch
@@ -0,0 +1,30 @@
+From e3ad3deb6a6e79284f3748fa7410311d87df91c5 Mon Sep 17 00:00:00 2001
+From: Henrique Nakashima <hnakashima@chromium.org>
+Date: Tue, 4 Sep 2018 16:49:51 +0000
+Subject: [PATCH] IWYU: stdint.h in pdfium_mem_buffer_file_write.h for uint8_t
+
+Bug: 879900
+Change-Id: I9c15d1c280a23c53d31f2d72c9d0d1db79eab886
+Reviewed-on: https://chromium-review.googlesource.com/1204410
+Reviewed-by: Lei Zhang <thestig@chromium.org>
+Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#588547}
+---
+ pdf/pdfium/pdfium_mem_buffer_file_write.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/pdf/pdfium/pdfium_mem_buffer_file_write.h b/pdf/pdfium/pdfium_mem_buffer_file_write.h
+index 03c54bb63800..82e82d23684d 100644
+--- a/pdf/pdfium/pdfium_mem_buffer_file_write.h
++++ b/pdf/pdfium/pdfium_mem_buffer_file_write.h
+@@ -6,6 +6,7 @@
+ #define PDF_PDFIUM_PDFIUM_MEM_BUFFER_FILE_WRITE_H_
+ 
+ #include <stddef.h>
++#include <stdint.h>
+ 
+ #include <vector>
+ 
+-- 
+2.19.0
+
diff --git a/only-disable-cfi-icall-when-use_system_libjpeg-true.patch b/only-disable-cfi-icall-when-use_system_libjpeg-true.patch
deleted file mode 100644
index 3a71f8c05719..000000000000
--- a/only-disable-cfi-icall-when-use_system_libjpeg-true.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 20f81a066ffdf6bd30fb4b696b8b3e101368e2f6 Mon Sep 17 00:00:00 2001
-From: Vlad Tsyrklevich <vtsyrklevich@chromium.org>
-Date: Tue, 31 Jul 2018 23:21:09 +0000
-Subject: [PATCH] Only disable cfi-icall when use_system_libjpeg=true
-
-Bug: 866290
-Change-Id: Ic5d175b3b854665f50781650406d599d09ee9849
-Reviewed-on: https://chromium-review.googlesource.com/1157136
-Reviewed-by: Kentaro Hara <haraken@chromium.org>
-Commit-Queue: Vlad Tsyrklevich <vtsyrklevich@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#579614}
----
- .../platform/image-decoders/jpeg/jpeg_image_decoder.cc       | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc b/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc
-index fd4e72ba053c..afa90d83efee 100644
---- a/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc
-+++ b/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc
-@@ -643,7 +643,10 @@ class JPEGImageReader final {
-   IntSize UvSize() const { return uv_size_; }
- 
-  private:
--  NO_SANITIZE_CFI_ICALL JSAMPARRAY AllocateSampleArray() {
-+#if defined(USE_SYSTEM_LIBJPEG)
-+  NO_SANITIZE_CFI_ICALL
-+#endif
-+  JSAMPARRAY AllocateSampleArray() {
- // Some output color spaces don't need the sample array: don't allocate in that
- // case.
- #if defined(TURBO_JPEG_RGB_SWIZZLE)
--- 
-2.18.0
-