update to 114.0.5735.198

- Enable AllowQt feature flag
- Fix Qt deps
- Fix Qt logical scale factor

.gitignore

@@ -1,51 +1,7 @@
 /chromium-52.0.2743.75-clean.tar.xz
 /depot_tools.git-master.tar.gz
 /policy_templates.zip
-/chromium-52.0.2743.82-clean.tar.xz
-/chromium-52.0.2743.116-clean.tar.xz
-/chromium-53.0.2785.92-clean.tar.xz
-/chromium-53.0.2785.101-clean.tar.xz
-/chromium-53.0.2785.113-clean.tar.xz
-/chromium-53.0.2785.116-clean.tar.xz
-/chromium-53.0.2785.143-clean.tar.xz
-/chromium-54.0.2840.59-clean.tar.xz
-/chromium-54.0.2840.71-clean.tar.xz
-/chromium-54.0.2840.90-clean.tar.xz
-/chromium-54.0.2840.100.tar.xz
-/chromium-54.0.2840.100-clean.tar.xz
-/chromium-55.0.2883.75-clean.tar.xz
-/chromium-55.0.2883.87-clean.tar.xz
-/chromium-56.0.2924.87-clean.tar.xz
-/chromium-57.0.2987.110-clean.tar.xz
-/chromium-57.0.2987.133-clean.tar.xz
-/chromium-58.0.3029.81-clean.tar.xz
-/chromium-58.0.3029.110-clean.tar.xz
-/chromium-59.0.3071.86-clean.tar.xz
-/chromium-59.0.3071.104-clean.tar.xz
-/chromium-59.0.3071.109-clean.tar.xz
-/chromium-59.0.3071.115-clean.tar.xz
-/chromium-59.0.3071.109-freetype.tar.bz2
-/chromium-60.0.3112.90-clean.tar.xz
-/chromium-60.0.3112.101-clean.tar.xz
-/chromium-60.0.3112.113-clean.tar.xz
-/chromium-60.0.3112.113.tar.xz
-/chromium-61.0.3163.79-clean.tar.xz
-/chromium-61.0.3163.100-clean.tar.xz
-/chromium-62.0.3202.75-clean.tar.xz
-/chromium-62.0.3202.89-clean.tar.xz
-/chromium-63.0.3239.84-clean.tar.xz
-/chromium-63.0.3239.108-clean.tar.xz
-/chromium-64.0.3282.119-clean.tar.xz
-/chromium-64.0.3282.140-clean.tar.xz
-/chromium-64.0.3282.167-clean.tar.xz
-/chromium-64.0.3282.186-clean.tar.xz
-/chromium-65.0.3325.146-clean.tar.xz
-/chromium-65.0.3325.162-clean.tar.xz
-/chromium-65.0.3325.181-clean.tar.xz
-/chromium-66.0.3359.139-clean.tar.xz
-/chromium-66.0.3359.170-clean.tar.xz
-/chromium-66.0.3359.181-clean.tar.xz
-/chromium-67.0.3396.62-clean.tar.xz
+/chromium-*.tar.xz
 /gelasio.zip
 /MuktiNarrow-0.94.tar.bz2
 /NotoSansCJKjp-hinted.zip
@@ -62,11 +18,16 @@
 /Tinos-Bold.ttf
 /Tinos-Italic.ttf
 /Tinos-Regular.ttf
-/chromium-67.0.3396.79-clean.tar.xz
-/chromium-67.0.3396.87-clean.tar.xz
-/chromium-67.0.3396.99-clean.tar.xz
-/chromium-68.0.3440.106-clean.tar.xz
 /Ahem.ttf
-/chromium-69.0.3497.92-clean.tar.xz
-/chromium-69.0.3497.100-clean.tar.xz
-/chromium-70.0.3538.77-clean.tar.xz
+/node-v8.9.1-linux-x64.tar.gz
+/node-v10.15.3-linux-x64.tar.gz
+/xcb-proto-1.14.tar.xz
+/NotoSansSymbols2-Regular.ttf
+/NotoSansTibetan-Regular.ttf
+/node-v12.22.6-linux-arm64.tar.xz
+/node-v12.22.6-linux-x64.tar.xz
+/node-v16.17.0-linux-x64.tar.xz
+/node-v16.17.0-linux-arm64.tar.xz
+/testupload
+/node-v19.8.1-linux-arm64.tar.xz
+/node-v19.8.1-linux-x64.tar.xz

0001-vpx_sum_squares_2d_i16_neon-Make-s2-a-uint64x1_t.patch

@@ -1,54 +0,0 @@
-Upstream-Status: Submitted
-
-GCC aarch64 build fix [this is actually a libvpx patch, not a Chromium one]
-
-Sent to: https://chromium-review.googlesource.com/c/webm/libvpx/+/1136449
-
-Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
----
-From c20bd394f18c47bf133b51d6a40399273c3f24e0 Mon Sep 17 00:00:00 2001
-From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
-Date: Fri, 13 Jul 2018 14:29:09 +0200
-Subject: [PATCH] vpx_sum_squares_2d_i16_neon(): Make |s2| a uint64x1_t.
-
-This fixes the build with at least GCC 7.3, where it was previously failing
-with:
-
-../../third_party/libvpx/source/libvpx/vpx_dsp/arm/sum_squares_neon.c: In function 'vpx_sum_squares_2d_i16_neon':
-../../third_party/libvpx/source/libvpx/vpx_dsp/arm/sum_squares_neon.c:34:5: note: use -flax-vector-conversions to permit conversions between vectors with differing element types or numbers of subparts
-     s2 = vpaddl_u32(s1);
-     ^~
-../../third_party/libvpx/source/libvpx/vpx_dsp/arm/sum_squares_neon.c:34:8: error: incompatible types when assigning to type 'int64x1_t' from type 'uint64x1_t'
-     s2 = vpaddl_u32(s1);
-        ^
-../../third_party/libvpx/source/libvpx/vpx_dsp/arm/sum_squares_neon.c:81:8: error: incompatible types when assigning to type 'int64x1_t' from type 'uint64x1_t'
-     s2 = vadd_u64(vget_low_u64(s1), vget_high_u64(s1));
-        ^
-../../third_party/libvpx/source/libvpx/vpx_dsp/arm/sum_squares_neon.c:84:24: error: incompatible type for argument 1 of 'vget_lane_u64'
-   return vget_lane_u64(s2, 0);
-                        ^~
-
-The generated assembly was verified to remain identical with both GCC and
-LLVM.
-
-Change-Id: I2778428ee1fee0a674d0d4910347c2a717de21ac
----
- vpx_dsp/arm/sum_squares_neon.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/vpx_dsp/arm/sum_squares_neon.c b/vpx_dsp/arm/sum_squares_neon.c
-index 8942ba83b..cfefad993 100644
---- a/third_party/libvpx/source/libvpx/vpx_dsp/arm/sum_squares_neon.c
-+++ b/third_party/libvpx/source/libvpx/vpx_dsp/arm/sum_squares_neon.c
-@@ -14,7 +14,7 @@
- #include "./vpx_dsp_rtcd.h"
- 
- uint64_t vpx_sum_squares_2d_i16_neon(const int16_t *src, int stride, int size) {
--  int64x1_t s2;
-+  uint64x1_t s2;
- 
-   if (size == 4) {
-     int16x4_t s[4];
--- 
-2.14.4
-

README.fedora

@@ -0,0 +1,9 @@
+- Widevine is not a free library and cannot be shipped in fedora.
+  You have to get it from Google first and install it under
+  /usr/lib64/chromium-browser or /opt/google/chrome if you want
+  Chromium to use widevine.
+
+- Chromium uses the system ffmpeg-free library which is included in
+  fedora >= 36 and centos-stream 9. This library contains free video
+  codecs. If you want Chromium to use non-free video codecs, you need
+  to install libavcodec-freeworld from rpmfusion-free.

chromium-101.0.4951.41-fedora-user-agent.patch

@@ -0,0 +1,12 @@
+diff -up chromium-101.0.4951.41/content/common/user_agent.cc.fedora-user-agent chromium-101.0.4951.41/content/common/user_agent.cc
+--- chromium-101.0.4951.41/content/common/user_agent.cc.fedora-user-agent	2022-04-27 20:03:36.913767022 +0000
++++ chromium-101.0.4951.41/content/common/user_agent.cc	2022-04-27 20:04:30.591942420 +0000
+@@ -34,7 +34,7 @@ std::string GetUserAgentPlatform() {
+ #elif BUILDFLAG(IS_MAC)
+   return "Macintosh; ";
+ #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+-  return "X11; ";  // strange, but that's what Firefox uses
++  return "X11; Fedora; ";  // strange, but that's what Firefox uses
+ #elif BUILDFLAG(IS_ANDROID)
+   return "Linux; ";
+ #elif BUILDFLAG(IS_FUCHSIA)

chromium-105.0.5195.52-python-six-1.16.0.patch

@@ -0,0 +1,134 @@
+diff -up chromium-103.0.5060.53/third_party/catapult/third_party/six/six.py.116 chromium-103.0.5060.53/third_party/catapult/third_party/six/six.py
+--- chromium-103.0.5060.53/third_party/catapult/third_party/six/six.py.116	2022-07-05 13:31:29.434673638 +0000
++++ chromium-103.0.5060.53/third_party/catapult/third_party/six/six.py	2022-07-05 21:52:01.884578748 +0000
+@@ -29,7 +29,7 @@ import sys
+ import types
+ 
+ __author__ = "Benjamin Peterson <benjamin@python.org>"
+-__version__ = "1.15.0"
++__version__ = "1.16.0"
+ 
+ 
+ # Useful for very coarse version differentiation.
+@@ -71,6 +71,11 @@ else:
+             MAXSIZE = int((1 << 63) - 1)
+         del X
+ 
++if PY34:
++    from importlib.util import spec_from_loader
++else:
++    spec_from_loader = None
++
+ 
+ def _add_doc(func, doc):
+     """Add documentation to a function."""
+@@ -186,6 +191,11 @@ class _SixMetaPathImporter(object):
+             return self
+         return None
+ 
++    def find_spec(self, fullname, path, target=None):
++        if fullname in self.known_modules:
++            return spec_from_loader(fullname, self)
++        return None
++
+     def __get_module(self, fullname):
+         try:
+             return self.known_modules[fullname]
+@@ -223,6 +233,12 @@ class _SixMetaPathImporter(object):
+         return None
+     get_source = get_code  # same as get_code
+ 
++    def create_module(self, spec):
++        return self.load_module(spec.name)
++
++    def exec_module(self, module):
++        pass
++
+ _importer = _SixMetaPathImporter(__name__)
+ 
+ 
+diff -up chromium-103.0.5060.53/third_party/six/src/six.py.116 chromium-103.0.5060.53/third_party/six/src/six.py
+--- chromium-103.0.5060.53/third_party/six/src/six.py.116	2022-07-05 13:32:28.916687658 +0000
++++ chromium-103.0.5060.53/third_party/six/src/six.py	2022-07-05 21:59:42.561240407 +0000
+@@ -29,7 +29,7 @@ import sys
+ import types
+ 
+ __author__ = "Benjamin Peterson <benjamin@python.org>"
+-__version__ = "1.14.0"
++__version__ = "1.16.0"
+ 
+ 
+ # Useful for very coarse version differentiation.
+@@ -71,6 +71,11 @@ else:
+             MAXSIZE = int((1 << 63) - 1)
+         del X
+ 
++if PY34:
++    from importlib.util import spec_from_loader
++else:
++    spec_from_loader = None
++
+ 
+ def _add_doc(func, doc):
+     """Add documentation to a function."""
+@@ -186,6 +191,11 @@ class _SixMetaPathImporter(object):
+             return self
+         return None
+ 
++    def find_spec(self, fullname, path, target=None):
++        if fullname in self.known_modules:
++            return spec_from_loader(fullname, self)
++        return None
++
+     def __get_module(self, fullname):
+         try:
+             return self.known_modules[fullname]
+@@ -223,6 +233,12 @@ class _SixMetaPathImporter(object):
+         return None
+     get_source = get_code  # same as get_code
+ 
++    def create_module(self, spec):
++        return self.load_module(spec.name)
++
++    def exec_module(self, module):
++        pass
++
+ _importer = _SixMetaPathImporter(__name__)
+ 
+ 
+@@ -890,12 +906,11 @@ def ensure_binary(s, encoding='utf-8', e
+       - `str` -> encoded to `bytes`
+       - `bytes` -> `bytes`
+     """
++    if isinstance(s, binary_type):
++        return s
+     if isinstance(s, text_type):
+         return s.encode(encoding, errors)
+-    elif isinstance(s, binary_type):
+-        return s
+-    else:
+-        raise TypeError("not expecting type '%s'" % type(s))
++    raise TypeError("not expecting type '%s'" % type(s))
+ 
+ 
+ def ensure_str(s, encoding='utf-8', errors='strict'):
+@@ -909,12 +924,15 @@ def ensure_str(s, encoding='utf-8', erro
+       - `str` -> `str`
+       - `bytes` -> decoded to `str`
+     """
+-    if not isinstance(s, (text_type, binary_type)):
+-        raise TypeError("not expecting type '%s'" % type(s))
++    # Optimization: Fast return for the common case.
++    if type(s) is str:
++        return s
+     if PY2 and isinstance(s, text_type):
+-        s = s.encode(encoding, errors)
++        return s.encode(encoding, errors)
+     elif PY3 and isinstance(s, binary_type):
+-        s = s.decode(encoding, errors)
++        return s.decode(encoding, errors)
++    elif not isinstance(s, (text_type, binary_type)):
++        raise TypeError("not expecting type '%s'" % type(s))
+     return s
+ 
+ 

chromium-107-ffmpeg-duration.patch

@@ -0,0 +1,16 @@
+diff -up chromium-107.0.5304.121/media/filters/audio_file_reader.cc.me chromium-107.0.5304.121/media/filters/audio_file_reader.cc
+--- chromium-107.0.5304.121/media/filters/audio_file_reader.cc.me	2022-12-17 08:27:12.204753071 +0100
++++ chromium-107.0.5304.121/media/filters/audio_file_reader.cc	2022-12-17 08:28:40.908211808 +0100
+@@ -243,10 +243,10 @@ bool AudioFileReader::OnNewFrame(
+   // silence from being output. In the case where we are also discarding some
+   // portion of the packet (as indicated by a negative pts), we further want to
+   // adjust the duration downward by however much exists before zero.
+-  if (audio_codec_ == AudioCodec::kAAC && frame->duration) {
++  if (audio_codec_ == AudioCodec::kAAC && frame->pkt_duration) {
+     const base::TimeDelta pkt_duration = ConvertFromTimeBase(
+         glue_->format_context()->streams[stream_index_]->time_base,
+-        frame->duration + std::min(static_cast<int64_t>(0), frame->pts));
++        frame->pkt_duration + std::min(static_cast<int64_t>(0), frame->pts));
+     const base::TimeDelta frame_duration =
+         base::Seconds(frames_read / static_cast<double>(sample_rate_));
+ 

chromium-107-proprietary-codecs.patch

@@ -0,0 +1,16 @@
+diff -up chromium-107.0.5304.121/media/BUILD.gn.me chromium-107.0.5304.121/media/BUILD.gn
+--- chromium-107.0.5304.121/media/BUILD.gn.me	2022-12-17 12:35:44.546779129 +0100
++++ chromium-107.0.5304.121/media/BUILD.gn	2022-12-17 12:35:59.296047028 +0100
+@@ -64,12 +64,6 @@ buildflag_header("media_buildflags") {
+   }
+ }
+ 
+-if (proprietary_codecs && media_use_ffmpeg) {
+-  assert(
+-      ffmpeg_branding != "Chromium",
+-      "proprietary codecs and ffmpeg_branding set to Chromium are incompatible")
+-}
+-
+ # Common configuration for targets in the media directory; these must not be
+ # exported since things like USE_NEON and USE_CRAS have different meanings
+ # elsewhere in the code base.

chromium-107.0.5304.110-gn-system.patch

@@ -0,0 +1,39 @@
+diff -up chromium-105.0.5195.52/build/linux/unbundle/libusb.gn.gnsystem chromium-105.0.5195.52/build/linux/unbundle/libusb.gn
+--- chromium-105.0.5195.52/build/linux/unbundle/libusb.gn.gnsystem	2022-09-01 12:23:27.557313611 +0000
++++ chromium-105.0.5195.52/build/linux/unbundle/libusb.gn	2022-09-01 12:23:27.557313611 +0000
+@@ -0,0 +1,24 @@
++# Copyright 2016 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/linux/pkg_config.gni")
++import("//build/shim_headers.gni")
++
++pkg_config("system_libusb") {
++  packages = [ "libusb-1.0" ]
++}
++
++shim_headers("libusb_shim") {
++  root_path = "src/libusb"
++  headers = [
++    "libusb.h",
++  ]
++}
++
++source_set("libusb") {
++  deps = [
++    ":libusb_shim",
++  ]
++  public_configs = [ ":system_libusb" ]
++}
+diff -up chromium-105.0.5195.52/build/linux/unbundle/replace_gn_files.py.gnsystem chromium-105.0.5195.52/build/linux/unbundle/replace_gn_files.py
+--- chromium-105.0.5195.52/build/linux/unbundle/replace_gn_files.py.gnsystem	2022-09-01 12:23:27.558313577 +0000
++++ chromium-105.0.5195.52/build/linux/unbundle/replace_gn_files.py	2022-09-01 12:36:01.870847125 +0000
+@@ -52,6 +52,7 @@ REPLACEMENTS = {
+   'libjpeg': 'third_party/libjpeg.gni',
+   'libjxl' : 'third_party/libjxl/BUILD.gn',
+   'libpng': 'third_party/libpng/BUILD.gn',
++  'libusb': 'third_party/libusb/BUILD.gn',
+   'libvpx': 'third_party/libvpx/BUILD.gn',
+   'libwebp': 'third_party/libwebp/BUILD.gn',
+   'libxml': 'third_party/libxml/BUILD.gn',

chromium-108-el7-include-fcntl-memfd.patch

@@ -0,0 +1,36 @@
+diff -up chromium-108.0.5359.124/third_party/wayland/src/src/wayland-shm.c.me chromium-108.0.5359.124/third_party/wayland/src/src/wayland-shm.c
+--- chromium-108.0.5359.124/third_party/wayland/src/src/wayland-shm.c.me	2022-12-24 11:08:03.212333476 +0100
++++ chromium-108.0.5359.124/third_party/wayland/src/src/wayland-shm.c	2022-12-24 11:08:18.316606155 +0100
+@@ -44,7 +44,7 @@
+ #include <signal.h>
+ #include <pthread.h>
+ #include <errno.h>
+-#include <fcntl.h>
++#include <linux/fcntl.h>
+ 
+ #include "wayland-os.h"
+ #include "wayland-util.h"
+diff -up chromium-102.0.5005.115/v8/src/base/platform/platform-posix.cc.el7-memfd-include chromium-102.0.5005.115/v8/src/base/platform/platform-posix.cc
+--- chromium-102.0.5005.115/v8/src/base/platform/platform-posix.cc.el7-memfd-include	2022-06-15 10:52:49.553817031 -0400
++++ chromium-102.0.5005.115/v8/src/base/platform/platform-posix.cc	2022-06-15 10:56:15.775173013 -0400
+@@ -56,6 +56,7 @@
+ 
+ #if V8_OS_LINUX
+ #include <sys/prctl.h>  // for prctl
++#include <linux/memfd.h> // for MFD_CLOEXEC
+ #endif
+ 
+ #if defined(V8_OS_FUCHSIA)
+diff -up iridium-browser-2022.12.108.1/third_party/wayland/src/cursor/os-compatibility.c.me iridium-browser-2022.12.108.1/third_party/wayland/src/cursor/os-compatibility.c
+--- iridium-browser-2022.12.108.1/third_party/wayland/src/cursor/os-compatibility.c.me	2022-12-08 21:59:43.502200984 +0100
++++ iridium-browser-2022.12.108.1/third_party/wayland/src/cursor/os-compatibility.c	2022-12-08 22:13:53.375653343 +0100
+@@ -29,7 +29,8 @@
+ 
+ #include <sys/types.h>
+ #include <unistd.h>
+-#include <fcntl.h>
++#include <linux/fcntl.h> // for F_SEAL_SHRINK, F_ADD_SEALS, F_SEAL_SEAL
++#include <linux/memfd.h> // for MFD_CLOEXEC
+ #include <errno.h>
+ #include <signal.h>
+ #include <string.h>

chromium-108-el7-wayland-strndup-error.patch

@@ -0,0 +1,11 @@
+diff -up chromium-108.0.5359.124/third_party/wayland/src/src/scanner.c.me chromium-108.0.5359.124/third_party/wayland/src/src/scanner.c
+--- chromium-108.0.5359.124/third_party/wayland/src/src/scanner.c.me	2022-12-27 16:14:22.507496575 +0100
++++ chromium-108.0.5359.124/third_party/wayland/src/src/scanner.c	2022-12-27 16:35:17.617573610 +0100
+@@ -26,6 +26,7 @@
+  */
+ 
+ #include "wayland-version.h"
++#include "config.h" // HAVE_STRNDUP
+ 
+ #include <stdbool.h>
+ #include <stdio.h>

chromium-108-ffmpeg-revert-new-channel-layout-api.patch

@@ -0,0 +1,294 @@
+diff -up chromium-108.0.5359.124/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc.revert-new-channel-layout-api chromium-108.0.5359.124/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc
+--- chromium-108.0.5359.124/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc.revert-new-channel-layout-api	2022-12-14 01:39:52.000000000 +0100
++++ chromium-108.0.5359.124/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc	2023-01-04 21:44:23.098276796 +0100
+@@ -74,7 +74,7 @@ void CdmAudioDecoderConfigToAVCodecConte
+       codec_context->sample_fmt = AV_SAMPLE_FMT_NONE;
+   }
+ 
+-  codec_context->ch_layout.nb_channels = config.channel_count;
++  codec_context->channels = config.channel_count;
+   codec_context->sample_rate = config.samples_per_second;
+ 
+   if (config.extra_data) {
+@@ -124,8 +124,8 @@ void CopySamples(cdm::AudioFormat cdm_fo
+     case cdm::kAudioFormatPlanarS16:
+     case cdm::kAudioFormatPlanarF32: {
+       const int decoded_size_per_channel =
+-          decoded_audio_size / av_frame.ch_layout.nb_channels;
+-      for (int i = 0; i < av_frame.ch_layout.nb_channels; ++i) {
++          decoded_audio_size / av_frame.channels;
++      for (int i = 0; i < av_frame.channels; ++i) {
+         memcpy(output_buffer, av_frame.extended_data[i],
+                decoded_size_per_channel);
+         output_buffer += decoded_size_per_channel;
+@@ -185,14 +185,13 @@ bool FFmpegCdmAudioDecoder::Initialize(
+   // Success!
+   decoding_loop_ = std::make_unique<FFmpegDecodingLoop>(codec_context_.get());
+   samples_per_second_ = config.samples_per_second;
+-  bytes_per_frame_ =
+-      codec_context_->ch_layout.nb_channels * config.bits_per_channel / 8;
++  bytes_per_frame_ = codec_context_->channels * config.bits_per_channel / 8;
+   output_timestamp_helper_ =
+       std::make_unique<AudioTimestampHelper>(config.samples_per_second);
+   is_initialized_ = true;
+ 
+   // Store initial values to guard against midstream configuration changes.
+-  channels_ = codec_context_->ch_layout.nb_channels;
++  channels_ = codec_context_->channels;
+   av_sample_format_ = codec_context_->sample_fmt;
+ 
+   return true;
+@@ -292,19 +291,17 @@ cdm::Status FFmpegCdmAudioDecoder::Decod
+   for (auto& frame : audio_frames) {
+     int decoded_audio_size = 0;
+     if (frame->sample_rate != samples_per_second_ ||
+-        frame->ch_layout.nb_channels != channels_ ||
+-        frame->format != av_sample_format_) {
++        frame->channels != channels_ || frame->format != av_sample_format_) {
+       DLOG(ERROR) << "Unsupported midstream configuration change!"
+                   << " Sample Rate: " << frame->sample_rate << " vs "
+-                  << samples_per_second_
+-                  << ", Channels: " << frame->ch_layout.nb_channels << " vs "
+-                  << channels_ << ", Sample Format: " << frame->format << " vs "
+-                  << av_sample_format_;
++                  << samples_per_second_ << ", Channels: " << frame->channels
++                  << " vs " << channels_ << ", Sample Format: " << frame->format
++                  << " vs " << av_sample_format_;
+       return cdm::kDecodeError;
+     }
+ 
+     decoded_audio_size = av_samples_get_buffer_size(
+-        nullptr, codec_context_->ch_layout.nb_channels, frame->nb_samples,
++        nullptr, codec_context_->channels, frame->nb_samples,
+         codec_context_->sample_fmt, 1);
+     if (!decoded_audio_size)
+       continue;
+@@ -323,9 +320,9 @@ bool FFmpegCdmAudioDecoder::OnNewFrame(
+     size_t* total_size,
+     std::vector<std::unique_ptr<AVFrame, ScopedPtrAVFreeFrame>>* audio_frames,
+     AVFrame* frame) {
+-  *total_size += av_samples_get_buffer_size(
+-      nullptr, codec_context_->ch_layout.nb_channels, frame->nb_samples,
+-      codec_context_->sample_fmt, 1);
++  *total_size += av_samples_get_buffer_size(nullptr, codec_context_->channels,
++                                            frame->nb_samples,
++                                            codec_context_->sample_fmt, 1);
+   audio_frames->emplace_back(av_frame_clone(frame));
+   return true;
+ }
+diff -up chromium-108.0.5359.124/media/ffmpeg/ffmpeg_common.cc.revert-new-channel-layout-api chromium-108.0.5359.124/media/ffmpeg/ffmpeg_common.cc
+--- chromium-108.0.5359.124/media/ffmpeg/ffmpeg_common.cc.revert-new-channel-layout-api	2022-12-14 01:39:52.000000000 +0100
++++ chromium-108.0.5359.124/media/ffmpeg/ffmpeg_common.cc	2023-01-04 21:52:59.674165082 +0100
+@@ -353,11 +353,9 @@ bool AVCodecContextToAudioDecoderConfig(
+       codec_context->sample_fmt, codec_context->codec_id);
+ 
+   ChannelLayout channel_layout =
+-      codec_context->ch_layout.nb_channels > 8
++      codec_context->channels > 8
+           ? CHANNEL_LAYOUT_DISCRETE
+-          : ChannelLayoutToChromeChannelLayout(
+-                codec_context->ch_layout.u.mask,
+-                codec_context->ch_layout.nb_channels);
++          : ChannelLayoutToChromeChannelLayout(codec_context->channel_layout, codec_context->channels);
+ 
+   switch (codec) {
+     // For AC3/EAC3 we enable only demuxing, but not decoding, so FFmpeg does
+@@ -409,7 +407,7 @@ bool AVCodecContextToAudioDecoderConfig(
+                      extra_data, encryption_scheme, seek_preroll,
+                      codec_context->delay);
+   if (channel_layout == CHANNEL_LAYOUT_DISCRETE)
+-    config->SetChannelsForDiscrete(codec_context->ch_layout.nb_channels);
++    config->SetChannelsForDiscrete(codec_context->channels);
+ 
+ #if BUILDFLAG(ENABLE_PLATFORM_AC3_EAC3_AUDIO)
+   // These are bitstream formats unknown to ffmpeg, so they don't have
+@@ -478,7 +476,7 @@ void AudioDecoderConfigToAVCodecContext(
+ 
+   // TODO(scherkus): should we set |channel_layout|? I'm not sure if FFmpeg uses
+   // said information to decode.
+-  codec_context->ch_layout.nb_channels = config.channels();
++  codec_context->channels = config.channels();
+   codec_context->sample_rate = config.samples_per_second();
+ 
+   if (config.extra_data().empty()) {
+diff -up chromium-108.0.5359.124/media/filters/audio_file_reader.cc.revert-new-channel-layout-api chromium-108.0.5359.124/media/filters/audio_file_reader.cc
+--- chromium-108.0.5359.124/media/filters/audio_file_reader.cc.revert-new-channel-layout-api	2023-01-04 21:44:23.095276762 +0100
++++ chromium-108.0.5359.124/media/filters/audio_file_reader.cc	2023-01-04 21:44:23.098276796 +0100
+@@ -113,15 +113,14 @@ bool AudioFileReader::OpenDecoder() {
+ 
+   // Verify the channel layout is supported by Chrome.  Acts as a sanity check
+   // against invalid files.  See http://crbug.com/171962
+-  if (ChannelLayoutToChromeChannelLayout(
+-          codec_context_->ch_layout.u.mask,
+-          codec_context_->ch_layout.nb_channels) ==
++  if (ChannelLayoutToChromeChannelLayout(codec_context_->channel_layout,
++                                         codec_context_->channels) ==
+       CHANNEL_LAYOUT_UNSUPPORTED) {
+     return false;
+   }
+ 
+   // Store initial values to guard against midstream configuration changes.
+-  channels_ = codec_context_->ch_layout.nb_channels;
++  channels_ = codec_context_->channels;
+   audio_codec_ = CodecIDToAudioCodec(codec_context_->codec_id);
+   sample_rate_ = codec_context_->sample_rate;
+   av_sample_format_ = codec_context_->sample_fmt;
+@@ -224,7 +223,7 @@ bool AudioFileReader::OnNewFrame(
+   if (frames_read < 0)
+     return false;
+ 
+-  const int channels = frame->ch_layout.nb_channels;
++  const int channels = frame->channels;
+   if (frame->sample_rate != sample_rate_ || channels != channels_ ||
+       frame->format != av_sample_format_) {
+     DLOG(ERROR) << "Unsupported midstream configuration change!"
+diff -up chromium-108.0.5359.124/media/filters/audio_file_reader_unittest.cc.revert-new-channel-layout-api chromium-108.0.5359.124/media/filters/audio_file_reader_unittest.cc
+--- chromium-108.0.5359.124/media/filters/audio_file_reader_unittest.cc.revert-new-channel-layout-api	2022-12-14 01:39:52.000000000 +0100
++++ chromium-108.0.5359.124/media/filters/audio_file_reader_unittest.cc	2023-01-04 21:44:23.098276796 +0100
+@@ -121,11 +121,11 @@ class AudioFileReaderTest : public testi
+     EXPECT_FALSE(reader_->Open());
+   }
+ 
+-  void RunTestFailingDecode(const char* fn, int expect_read = 0) {
++  void RunTestFailingDecode(const char* fn) {
+     Initialize(fn);
+     EXPECT_TRUE(reader_->Open());
+     std::vector<std::unique_ptr<AudioBus>> decoded_audio_packets;
+-    EXPECT_EQ(reader_->Read(&decoded_audio_packets), expect_read);
++    EXPECT_EQ(reader_->Read(&decoded_audio_packets), 0);
+   }
+ 
+   void RunTestPartialDecode(const char* fn) {
+@@ -219,7 +219,7 @@ TEST_F(AudioFileReaderTest, AAC_ADTS) {
+ }
+ 
+ TEST_F(AudioFileReaderTest, MidStreamConfigChangesFail) {
+-  RunTestFailingDecode("midstream_config_change.mp3", 42624);
++  RunTestFailingDecode("midstream_config_change.mp3");
+ }
+ #endif
+ 
+diff -up chromium-108.0.5359.124/media/filters/audio_video_metadata_extractor.cc.revert-new-channel-layout-api chromium-108.0.5359.124/media/filters/audio_video_metadata_extractor.cc
+--- chromium-108.0.5359.124/media/filters/audio_video_metadata_extractor.cc.revert-new-channel-layout-api	2022-12-14 01:39:52.000000000 +0100
++++ chromium-108.0.5359.124/media/filters/audio_video_metadata_extractor.cc	2023-01-04 21:44:23.098276796 +0100
+@@ -113,15 +113,6 @@ bool AudioVideoMetadataExtractor::Extrac
+     if (!stream)
+       continue;
+ 
+-    void* display_matrix =
+-        av_stream_get_side_data(stream, AV_PKT_DATA_DISPLAYMATRIX, nullptr);
+-    if (display_matrix) {
+-      rotation_ = VideoTransformation::FromFFmpegDisplayMatrix(
+-                      static_cast<int32_t*>(display_matrix))
+-                      .rotation;
+-      info.tags["rotate"] = base::NumberToString(rotation_);
+-    }
+-
+     // Extract dictionary from streams also. Needed for containers that attach
+     // metadata to contained streams instead the container itself, like OGG.
+     ExtractDictionary(stream->metadata, &info.tags);
+@@ -264,6 +255,8 @@ void AudioVideoMetadataExtractor::Extrac
+     if (raw_tags->find(tag->key) == raw_tags->end())
+       (*raw_tags)[tag->key] = tag->value;
+ 
++    if (ExtractInt(tag, "rotate", &rotation_))
++      continue;
+     if (ExtractString(tag, "album", &album_))
+       continue;
+     if (ExtractString(tag, "artist", &artist_))
+diff -up chromium-108.0.5359.124/media/filters/ffmpeg_aac_bitstream_converter.cc.revert-new-channel-layout-api chromium-108.0.5359.124/media/filters/ffmpeg_aac_bitstream_converter.cc
+--- chromium-108.0.5359.124/media/filters/ffmpeg_aac_bitstream_converter.cc.revert-new-channel-layout-api	2022-12-14 01:39:52.000000000 +0100
++++ chromium-108.0.5359.124/media/filters/ffmpeg_aac_bitstream_converter.cc	2023-01-04 21:44:23.099276807 +0100
+@@ -195,15 +195,14 @@ bool FFmpegAACBitstreamConverter::Conver
+   if (!header_generated_ || codec_ != stream_codec_parameters_->codec_id ||
+       audio_profile_ != stream_codec_parameters_->profile ||
+       sample_rate_index_ != sample_rate_index ||
+-      channel_configuration_ !=
+-          stream_codec_parameters_->ch_layout.nb_channels ||
++      channel_configuration_ != stream_codec_parameters_->channels ||
+       frame_length_ != header_plus_packet_size) {
+     header_generated_ =
+         GenerateAdtsHeader(stream_codec_parameters_->codec_id,
+                            0,  // layer
+                            stream_codec_parameters_->profile, sample_rate_index,
+                            0,  // private stream
+-                           stream_codec_parameters_->ch_layout.nb_channels,
++                           stream_codec_parameters_->channels,
+                            0,  // originality
+                            0,  // home
+                            0,  // copyrighted_stream
+@@ -215,7 +214,7 @@ bool FFmpegAACBitstreamConverter::Conver
+     codec_ = stream_codec_parameters_->codec_id;
+     audio_profile_ = stream_codec_parameters_->profile;
+     sample_rate_index_ = sample_rate_index;
+-    channel_configuration_ = stream_codec_parameters_->ch_layout.nb_channels;
++    channel_configuration_ = stream_codec_parameters_->channels;
+     frame_length_ = header_plus_packet_size;
+   }
+ 
+diff -up chromium-108.0.5359.124/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc.revert-new-channel-layout-api chromium-108.0.5359.124/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc
+--- chromium-108.0.5359.124/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc.revert-new-channel-layout-api	2022-12-14 01:39:52.000000000 +0100
++++ chromium-108.0.5359.124/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc	2023-01-04 21:44:23.099276807 +0100
+@@ -34,7 +34,7 @@ class FFmpegAACBitstreamConverterTest :
+     memset(&test_parameters_, 0, sizeof(AVCodecParameters));
+     test_parameters_.codec_id = AV_CODEC_ID_AAC;
+     test_parameters_.profile = FF_PROFILE_AAC_MAIN;
+-    test_parameters_.ch_layout.nb_channels = 2;
++    test_parameters_.channels = 2;
+     test_parameters_.extradata = extradata_header_;
+     test_parameters_.extradata_size = sizeof(extradata_header_);
+   }
+diff -up chromium-108.0.5359.124/media/filters/ffmpeg_audio_decoder.cc.revert-new-channel-layout-api chromium-108.0.5359.124/media/filters/ffmpeg_audio_decoder.cc
+--- chromium-108.0.5359.124/media/filters/ffmpeg_audio_decoder.cc.revert-new-channel-layout-api	2022-12-14 01:39:52.000000000 +0100
++++ chromium-108.0.5359.124/media/filters/ffmpeg_audio_decoder.cc	2023-01-04 21:44:23.099276807 +0100
+@@ -28,7 +28,7 @@ namespace media {
+ 
+ // Return the number of channels from the data in |frame|.
+ static inline int DetermineChannels(AVFrame* frame) {
+-  return frame->ch_layout.nb_channels;
++  return frame->channels;
+ }
+ 
+ // Called by FFmpeg's allocation routine to allocate a buffer. Uses
+@@ -233,7 +233,7 @@ bool FFmpegAudioDecoder::OnNewFrame(cons
+   // Translate unsupported into discrete layouts for discrete configurations;
+   // ffmpeg does not have a labeled discrete configuration internally.
+   ChannelLayout channel_layout = ChannelLayoutToChromeChannelLayout(
+-      codec_context_->ch_layout.u.mask, codec_context_->ch_layout.nb_channels);
++      codec_context_->channel_layout, codec_context_->channels);
+   if (channel_layout == CHANNEL_LAYOUT_UNSUPPORTED &&
+       config_.channel_layout() == CHANNEL_LAYOUT_DISCRETE) {
+     channel_layout = CHANNEL_LAYOUT_DISCRETE;
+@@ -350,11 +350,11 @@ bool FFmpegAudioDecoder::ConfigureDecode
+   // Success!
+   av_sample_format_ = codec_context_->sample_fmt;
+ 
+-  if (codec_context_->ch_layout.nb_channels != config.channels()) {
++  if (codec_context_->channels != config.channels()) {
+     MEDIA_LOG(ERROR, media_log_)
+         << "Audio configuration specified " << config.channels()
+         << " channels, but FFmpeg thinks the file contains "
+-        << codec_context_->ch_layout.nb_channels << " channels";
++        << codec_context_->channels << " channels";
+     ReleaseFFmpegResources();
+     state_ = DecoderState::kUninitialized;
+     return false;
+@@ -405,7 +405,7 @@ int FFmpegAudioDecoder::GetAudioBuffer(s
+   if (frame->nb_samples <= 0)
+     return AVERROR(EINVAL);
+ 
+-  if (s->ch_layout.nb_channels != channels) {
++  if (s->channels != channels) {
+     DLOG(ERROR) << "AVCodecContext and AVFrame disagree on channel count.";
+     return AVERROR(EINVAL);
+   }
+@@ -438,8 +438,7 @@ int FFmpegAudioDecoder::GetAudioBuffer(s
+   ChannelLayout channel_layout =
+       config_.channel_layout() == CHANNEL_LAYOUT_DISCRETE
+           ? CHANNEL_LAYOUT_DISCRETE
+-          : ChannelLayoutToChromeChannelLayout(s->ch_layout.u.mask,
+-                                               s->ch_layout.nb_channels);
++          : ChannelLayoutToChromeChannelLayout(s->channel_layout, s->channels);
+ 
+   if (channel_layout == CHANNEL_LAYOUT_UNSUPPORTED) {
+     DLOG(ERROR) << "Unsupported channel layout.";

chromium-108-system-brotli.patch

@@ -0,0 +1,36 @@
+diff -up chromium-108.0.5359.124/net/filter/brotli_source_stream.cc.me chromium-108.0.5359.124/net/filter/brotli_source_stream.cc
+--- chromium-108.0.5359.124/net/filter/brotli_source_stream.cc.me	2022-12-30 16:00:58.320318310 +0100
++++ chromium-108.0.5359.124/net/filter/brotli_source_stream.cc	2022-12-30 16:01:24.928581631 +0100
+@@ -10,7 +10,7 @@
+ #include "base/memory/raw_ptr.h"
+ #include "base/metrics/histogram_macros.h"
+ #include "net/base/io_buffer.h"
+-#include "third_party/brotli/include/brotli/decode.h"
++#include <brotli/decode.h>
+ 
+ namespace net {
+ 
+diff -up chromium-108.0.5359.124/net/ssl/cert_compression.cc.me chromium-108.0.5359.124/net/ssl/cert_compression.cc
+--- chromium-108.0.5359.124/net/ssl/cert_compression.cc.me	2022-12-30 15:57:59.859543993 +0100
++++ chromium-108.0.5359.124/net/ssl/cert_compression.cc	2022-12-30 16:00:48.560221723 +0100
+@@ -9,7 +9,7 @@
+ #include "third_party/boringssl/src/include/openssl/ssl.h"
+ 
+ #if !defined(NET_DISABLE_BROTLI)
+-#include "third_party/brotli/include/brotli/decode.h"
++#include <brotli/decode.h>
+ #endif
+ 
+ namespace net {
+diff -up chromium-108.0.5359.124/ui/base/resource/resource_bundle.cc.me chromium-108.0.5359.124/ui/base/resource/resource_bundle.cc
+--- chromium-108.0.5359.124/ui/base/resource/resource_bundle.cc.me	2022-12-30 21:12:27.058346797 +0100
++++ chromium-108.0.5359.124/ui/base/resource/resource_bundle.cc	2022-12-30 21:13:58.363183795 +0100
+@@ -31,7 +31,7 @@
+ #include "build/build_config.h"
+ #include "net/filter/gzip_header.h"
+ #include "skia/ext/image_operations.h"
+-#include "third_party/brotli/include/brotli/decode.h"
++#include <brotli/decode.h>
+ #include "third_party/skia/include/core/SkBitmap.h"
+ #include "third_party/skia/include/core/SkColor.h"
+ #include "third_party/zlib/google/compression_utils.h"

chromium-108-system-opus.patch

@@ -0,0 +1,12 @@
+diff -up chromium-108.0.5359.124/media/audio/audio_opus_encoder.h.me chromium-108.0.5359.124/media/audio/audio_opus_encoder.h
+--- chromium-108.0.5359.124/media/audio/audio_opus_encoder.h.me	2022-12-31 09:49:17.100277502 +0100
++++ chromium-108.0.5359.124/media/audio/audio_opus_encoder.h	2022-12-31 09:49:57.101016710 +0100
+@@ -12,7 +12,7 @@
+ #include "media/base/audio_converter.h"
+ #include "media/base/audio_encoder.h"
+ #include "media/base/audio_timestamp_helper.h"
+-#include "third_party/opus/src/include/opus.h"
++#include <opus/opus.h>
+ 
+ namespace media {
+ 

chromium-108-widevine-other-locations.patch

@@ -0,0 +1,32 @@
+diff -up chromium-108.0.5359.124/chrome/common/chrome_paths.cc.widevine-other-locations chromium-108.0.5359.124/chrome/common/chrome_paths.cc
+--- chromium-108.0.5359.124/chrome/common/chrome_paths.cc.widevine-other-locations	2023-01-02 11:10:03.951330305 +0100
++++ chromium-108.0.5359.124/chrome/common/chrome_paths.cc	2023-01-02 13:42:26.781022150 +0100
+@@ -319,6 +319,16 @@ bool PathProvider(int key, base::FilePat
+ 
+ #if BUILDFLAG(ENABLE_WIDEVINE)
+     case chrome::DIR_BUNDLED_WIDEVINE_CDM:
++      base::PathService::Get(base::DIR_HOME, &cur);
++      cur = cur.Append(FILE_PATH_LITERAL(".config/chromium/WidevineCdm"));
++      if (base::PathExists(cur)) {
++        break;
++      }
++      // Yes, this has an arch hardcoded in the path, but at this time, it is the only place to find libwidevinecdm.so
++      if (base::PathExists(base::FilePath(FILE_PATH_LITERAL("/opt/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so")))) {
++        cur = base::FilePath(FILE_PATH_LITERAL("/opt/google/chrome/WidevineCdm"));
++        break;
++      }
+       if (!GetComponentDirectory(&cur))
+         return false;
+       cur = cur.AppendASCII(kWidevineCdmBaseDirectory);
+diff -up chromium-108.0.5359.124/third_party/widevine/cdm/BUILD.gn.widevine-other-locations chromium-108.0.5359.124/third_party/widevine/cdm/BUILD.gn
+--- chromium-108.0.5359.124/third_party/widevine/cdm/BUILD.gn.widevine-other-locations	2023-01-02 11:10:45.953114153 +0100
++++ chromium-108.0.5359.124/third_party/widevine/cdm/BUILD.gn	2023-01-02 11:10:45.953114153 +0100
+@@ -22,7 +22,7 @@ buildflag_header("buildflags") {
+ 
+   flags = [
+     "ENABLE_WIDEVINE=$enable_widevine",
+-    "BUNDLE_WIDEVINE_CDM=$bundle_widevine_cdm",
++    "BUNDLE_WIDEVINE_CDM=true",
+     "ENABLE_WIDEVINE_CDM_COMPONENT=$enable_widevine_cdm_component",
+     "ENABLE_MEDIA_FOUNDATION_WIDEVINE_CDM=$enable_media_foundation_widevine_cdm",
+   ]

chromium-109-system-minizip-header-fix.patch

@@ -0,0 +1,64 @@
+diff -up chromium-109.0.5414.74/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc.system-minizip chromium-109.0.5414.74/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc
+--- chromium-109.0.5414.74/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc.system-minizip	2023-01-04 20:20:37.000000000 +0100
++++ chromium-109.0.5414.74/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc	2023-01-08 15:48:08.654793086 +0100
+@@ -27,8 +27,8 @@ limitations under the License.
+ #include "tensorflow_lite_support/cc/port/status_macros.h"
+ #include "tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h"
+ #include "tensorflow_lite_support/metadata/metadata_schema_generated.h"
+-#include "third_party/zlib/contrib/minizip/ioapi.h"
+-#include "third_party/zlib/contrib/minizip/unzip.h"
++#include <minizip/ioapi.h>
++#include <minizip/unzip.h>
+ 
+ namespace tflite {
+ namespace metadata {
+diff -up chromium-109.0.5414.74/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc.system-minizip chromium-109.0.5414.74/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc
+--- chromium-109.0.5414.74/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc.system-minizip	2023-01-04 20:20:37.000000000 +0100
++++ chromium-109.0.5414.74/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc	2023-01-08 15:48:08.655793097 +0100
+@@ -26,8 +26,8 @@ limitations under the License.
+ #include "tensorflow_lite_support/cc/port/statusor.h"
+ #include "tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h"
+ #include "tensorflow_lite_support/metadata/metadata_schema_generated.h"
+-#include "third_party/zlib/contrib/minizip/ioapi.h"
+-#include "third_party/zlib/contrib/minizip/unzip.h"
++#include <minizip/ioapi.h>
++#include <minizip/zip.h>
+ 
+ namespace tflite {
+ namespace metadata {
+diff -up chromium-109.0.5414.74/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc.system-minizip chromium-109.0.5414.74/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc
+--- chromium-109.0.5414.74/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc.system-minizip	2023-01-08 15:48:08.655793097 +0100
++++ chromium-109.0.5414.74/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc	2023-01-08 15:53:17.498329640 +0100
+@@ -19,7 +19,7 @@ limitations under the License.
+ #include <cstdio>
+ 
+ #include "absl/strings/string_view.h"  // from @com_google_absl
+-#include "third_party/zlib/contrib/minizip/ioapi.h"
++#include <minizip/ioapi.h>
+ 
+ namespace tflite {
+ namespace metadata {
+diff -up chromium-109.0.5414.74/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc.system-minizip chromium-109.0.5414.74/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc
+--- chromium-109.0.5414.74/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc.system-minizip	2023-01-04 20:20:37.000000000 +0100
++++ chromium-109.0.5414.74/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc	2023-01-08 15:48:08.655793097 +0100
+@@ -19,7 +19,7 @@ limitations under the License.
+ #include <cstdio>
+ 
+ #include "absl/strings/string_view.h"  // from @com_google_absl
+-#include "third_party/zlib/contrib/minizip/ioapi.h"
++#include <minizip/ioapi.h>
+ 
+ namespace tflite {
+ namespace metadata {
+diff -up chromium-109.0.5414.74/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h.system-minizip chromium-109.0.5414.74/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h
+--- chromium-109.0.5414.74/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h.system-minizip	2023-01-04 20:20:37.000000000 +0100
++++ chromium-109.0.5414.74/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h	2023-01-08 15:48:08.655793097 +0100
+@@ -19,7 +19,7 @@ limitations under the License.
+ #include <cstdlib>
+ 
+ #include "absl/strings/string_view.h"  // from @com_google_absl
+-#include "third_party/zlib/contrib/minizip/ioapi.h"
++#include <minizip/ioapi.h>
+ 
+ namespace tflite {
+ namespace metadata {

chromium-110-epel7-old-headers-workarounds.patch

@@ -0,0 +1,141 @@
+diff -up chromium-110.0.5481.77/sandbox/policy/linux/bpf_hardware_video_decoding_policy_linux.cc.me chromium-110.0.5481.77/sandbox/policy/linux/bpf_hardware_video_decoding_policy_linux.cc
+--- chromium-110.0.5481.77/sandbox/policy/linux/bpf_hardware_video_decoding_policy_linux.cc.me	2023-02-08 20:34:02.700010846 +0100
++++ chromium-110.0.5481.77/sandbox/policy/linux/bpf_hardware_video_decoding_policy_linux.cc	2023-02-08 20:35:30.455580670 +0100
+@@ -4,7 +4,9 @@
+ 
+ #include "sandbox/policy/linux/bpf_hardware_video_decoding_policy_linux.h"
+ 
+-#include <linux/kcmp.h>
++#ifndef KCMP_FILE
++#define KCMP_FILE 0
++#endif
+ 
+ #include "media/gpu/buildflags.h"
+ #include "sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h"
+diff -up chromium-99.0.4844.51/mojo/core/channel_linux.cc.epel7-header-workarounds chromium-99.0.4844.51/mojo/core/channel_linux.cc
+--- chromium-99.0.4844.51/mojo/core/channel_linux.cc.epel7-header-workarounds	2022-02-28 19:05:54.000000000 -0500
++++ chromium-99.0.4844.51/mojo/core/channel_linux.cc	2022-03-05 14:50:49.876812909 -0500
+@@ -44,6 +44,25 @@
+ #include "base/android/build_info.h"
+ #endif
+ 
++#ifndef F_LINUX_SPECIFIC_BASE
++#define F_LINUX_SPECIFIC_BASE 1024
++#endif
++#ifndef F_SEAL_SEAL
++#define F_SEAL_SEAL 0x0001
++#endif
++#ifndef F_SEAL_SHRINK
++#define F_SEAL_SHRINK 0x0002
++#endif
++#ifndef F_SEAL_GROW
++#define F_SEAL_GROW 0x0004
++#endif
++#ifndef F_ADD_SEALS
++#define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9)
++#endif
++#ifndef F_GET_SEALS
++#define F_GET_SEALS (F_LINUX_SPECIFIC_BASE + 10)
++#endif
++
+ #ifndef EFD_ZERO_ON_WAKE
+ #define EFD_ZERO_ON_WAKE O_NOFOLLOW
+ #endif
+diff -up chromium-99.0.4844.51/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc.epel7-header-workarounds chromium-99.0.4844.51/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+--- chromium-99.0.4844.51/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc.epel7-header-workarounds	2022-03-05 14:50:49.877812915 -0500
++++ chromium-99.0.4844.51/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc	2022-03-05 15:15:02.536867009 -0500
+@@ -53,6 +53,25 @@
+ 
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
++#ifndef F_LINUX_SPECIFIC_BASE
++#define F_LINUX_SPECIFIC_BASE 1024
++#endif
++#ifndef F_SEAL_SEAL
++#define F_SEAL_SEAL 0x0001
++#endif
++#ifndef F_SEAL_SHRINK
++#define F_SEAL_SHRINK 0x0002
++#endif
++#ifndef F_SEAL_GROW
++#define F_SEAL_GROW 0x0004
++#endif
++#ifndef F_ADD_SEALS
++#define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9)
++#endif
++#ifndef F_GET_SEALS
++#define F_GET_SEALS (F_LINUX_SPECIFIC_BASE + 10)
++#endif
++
+ #if defined(__arm__) && !defined(MAP_STACK)
+ #define MAP_STACK 0x20000  // Daisy build environment has old headers.
+ #endif
+diff -up chromium-99.0.4844.51/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc.epel7-header-workarounds chromium-99.0.4844.51/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc
+--- chromium-99.0.4844.51/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc.epel7-header-workarounds	2022-02-28 19:05:55.000000000 -0500
++++ chromium-99.0.4844.51/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc	2022-03-05 14:50:49.877812915 -0500
+@@ -6,7 +6,24 @@
+ 
+ #include <errno.h>
+ #include <fcntl.h>
+-#include <linux/kcmp.h>
++#ifndef KCMP_FILE
++#define KCMP_FILE 0
++#endif
++#ifndef F_LINUX_SPECIFIC_BASE
++#define F_LINUX_SPECIFIC_BASE 1024
++#endif
++#ifndef F_SEAL_SEAL
++#define F_SEAL_SEAL 0x0001
++#endif
++#ifndef F_SEAL_SHRINK
++#define F_SEAL_SHRINK 0x0002
++#endif
++#ifndef F_SEAL_GROW
++#define F_SEAL_GROW 0x0004
++#endif
++#ifndef F_ADD_SEALS
++#define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9)
++#endif
+ #include <sys/socket.h>
+ 
+ // Some arch's (arm64 for instance) unistd.h don't pull in symbols used here
+diff -up chromium-99.0.4844.51/sandbox/policy/linux/bpf_gpu_policy_linux.cc.epel7-header-workarounds chromium-99.0.4844.51/sandbox/policy/linux/bpf_gpu_policy_linux.cc
+--- chromium-99.0.4844.51/sandbox/policy/linux/bpf_gpu_policy_linux.cc.epel7-header-workarounds	2022-02-28 19:05:55.000000000 -0500
++++ chromium-99.0.4844.51/sandbox/policy/linux/bpf_gpu_policy_linux.cc	2022-03-05 14:50:49.877812915 -0500
+@@ -22,6 +22,22 @@
+ #include "sandbox/policy/linux/sandbox_linux.h"
+ #include "sandbox/policy/linux/sandbox_seccomp_bpf_linux.h"
+ 
++#ifndef F_LINUX_SPECIFIC_BASE
++#define F_LINUX_SPECIFIC_BASE 1024
++#endif
++#ifndef F_SEAL_SEAL
++#define F_SEAL_SEAL 0x0001
++#endif
++#ifndef F_SEAL_SHRINK
++#define F_SEAL_SHRINK 0x0002
++#endif
++#ifndef F_SEAL_GROW
++#define F_SEAL_GROW 0x0004
++#endif
++#ifndef F_ADD_SEALS
++#define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9)
++#endif
++
+ using sandbox::bpf_dsl::AllOf;
+ using sandbox::bpf_dsl::Allow;
+ using sandbox::bpf_dsl::Arg;
+diff -up chromium-99.0.4844.51/ui/events/ozone/evdev/event_converter_evdev_impl.cc.epel7-header-workarounds chromium-99.0.4844.51/ui/events/ozone/evdev/event_converter_evdev_impl.cc
+--- chromium-99.0.4844.51/ui/events/ozone/evdev/event_converter_evdev_impl.cc.epel7-header-workarounds	2022-02-28 19:06:49.000000000 -0500
++++ chromium-99.0.4844.51/ui/events/ozone/evdev/event_converter_evdev_impl.cc	2022-03-05 14:50:49.877812915 -0500
+@@ -23,6 +23,10 @@
+ #include "ui/events/ozone/evdev/numberpad_metrics.h"
+ #endif
+ 
++#ifndef SW_PEN_INSERTED
++#define SW_PEN_INSERTED                0x0f  /* set = pen inserted */
++#endif
++
+ namespace ui {
+ 
+ namespace {

chromium-110-limits.patch

@@ -0,0 +1,11 @@
+diff -up chromium-110.0.5481.177/base/memory/ref_counted.h.me chromium-110.0.5481.177/base/memory/ref_counted.h
+--- chromium-110.0.5481.177/base/memory/ref_counted.h.me	2023-02-23 13:34:33.174817255 -0500
++++ chromium-110.0.5481.177/base/memory/ref_counted.h	2023-02-23 13:42:28.646052469 -0500
+@@ -6,6 +6,7 @@
+ #define BASE_MEMORY_REF_COUNTED_H_
+ 
+ #include <stddef.h>
++#include <limits>
+ 
+ #include <utility>
+ 

chromium-112-ffmpeg-first_dts.patch

@@ -0,0 +1,120 @@
+From 2aef9000a1c8d76d3072365ffcb471ebffa20d3d Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@cryptomilk.org>
+Date: Tue, 15 Mar 2022 14:26:16 +0100
+Subject: [PATCH] Track first_dts instead of using non-upstream functions
+
+The function av_stream_get_first_dts() is not an upstream ffmpeg function and
+is not available if you build with system ffmpeg. We can easily track the
+first_dts on our own.
+
+See also
+https://ffmpeg.org/pipermail/ffmpeg-devel/2021-September/285401.html
+
+Bug: 1306560
+
+Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
+Change-Id: I90ba3cf2f2e16f56a0b405f26c67f911349fb71d
+---
+ media/filters/ffmpeg_demuxer.cc | 18 ++++++++++++------
+ media/filters/ffmpeg_demuxer.h  |  3 +++
+ 3 files changed, 16 insertions(+), 6 deletions(-)
+
+diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
+index 111899b661..799fc6e941 100644
+--- a/media/filters/ffmpeg_demuxer.cc
++++ b/media/filters/ffmpeg_demuxer.cc
+@@ -97,7 +97,7 @@ static base::TimeDelta FramesToTimeDelta(int frames, double sample_rate) {
+                             sample_rate);
+ }
+ 
+-static base::TimeDelta ExtractStartTime(AVStream* stream) {
++static base::TimeDelta ExtractStartTime(AVStream* stream, int64_t first_dts) {
+   // The default start time is zero.
+   base::TimeDelta start_time;
+ 
+@@ -107,12 +107,12 @@ static base::TimeDelta ExtractStartTime(AVStream* stream) {
+ 
+   // Next try to use the first DTS value, for codecs where we know PTS == DTS
+   // (excludes all H26x codecs). The start time must be returned in PTS.
+-  if (av_stream_get_first_dts(stream) != kNoFFmpegTimestamp &&
++  if (first_dts != AV_NOPTS_VALUE &&
+       stream->codecpar->codec_id != AV_CODEC_ID_HEVC &&
+       stream->codecpar->codec_id != AV_CODEC_ID_H264 &&
+       stream->codecpar->codec_id != AV_CODEC_ID_MPEG4) {
+     const base::TimeDelta first_pts =
+-        ConvertFromTimeBase(stream->time_base, av_stream_get_first_dts(stream));
++        ConvertFromTimeBase(stream->time_base, first_dts);
+     if (first_pts < start_time)
+       start_time = first_pts;
+   }
+@@ -283,6 +283,7 @@ FFmpegDemuxerStream::FFmpegDemuxerStream(
+       fixup_negative_timestamps_(false),
+       fixup_chained_ogg_(false),
+       num_discarded_packet_warnings_(0),
++      first_dts_(AV_NOPTS_VALUE),
+       last_packet_pos_(AV_NOPTS_VALUE),
+       last_packet_dts_(AV_NOPTS_VALUE) {
+   DCHECK(demuxer_);
+@@ -349,6 +350,10 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
+   int64_t packet_dts =
+       packet->dts == AV_NOPTS_VALUE ? packet->pts : packet->dts;
+ 
++  if (first_dts_ == AV_NOPTS_VALUE) {
++    first_dts_ = packet_dts;
++  }
++
+   // Chained ogg files have non-monotonically increasing position and time stamp
+   // values, which prevents us from using them to determine if a packet should
+   // be dropped. Since chained ogg is only allowed on single track audio only
+@@ -1442,7 +1447,8 @@ void FFmpegDemuxer::OnFindStreamInfoDone(int result) {
+ 
+     max_duration = std::max(max_duration, streams_[i]->duration());
+ 
+-    base::TimeDelta start_time = ExtractStartTime(stream);
++    base::TimeDelta start_time =
++        ExtractStartTime(stream, streams_[i]->first_dts());
+ 
+     // Note: This value is used for seeking, so we must take the true value and
+     // not the one possibly clamped to zero below.
+@@ -1599,7 +1605,7 @@ FFmpegDemuxerStream* FFmpegDemuxer::FindStreamWithLowestStartTimestamp(
+   for (const auto& stream : streams_) {
+     if (!stream || stream->IsEnabled() != enabled)
+       continue;
+-    if (av_stream_get_first_dts(stream->av_stream()) == kInvalidPTSMarker)
++    if (stream->first_dts() == AV_NOPTS_VALUE)
+       continue;
+     if (!lowest_start_time_stream ||
+         stream->start_time() < lowest_start_time_stream->start_time()) {
+@@ -1620,7 +1626,7 @@ FFmpegDemuxerStream* FFmpegDemuxer::FindPreferredStreamForSeeking(
+     if (stream->type() != DemuxerStream::VIDEO)
+       continue;
+ 
+-    if (av_stream_get_first_dts(stream->av_stream()) == kInvalidPTSMarker)
++    if (stream->first_dts() == AV_NOPTS_VALUE)
+       continue;
+ 
+     if (!stream->IsEnabled())
+diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h
+index c147309d6f..48a8f6ad8c 100644
+--- a/media/filters/ffmpeg_demuxer.h
++++ b/media/filters/ffmpeg_demuxer.h
+@@ -151,6 +151,8 @@ class MEDIA_EXPORT FFmpegDemuxerStream : public DemuxerStream {
+   base::TimeDelta start_time() const { return start_time_; }
+   void set_start_time(base::TimeDelta time) { start_time_ = time; }
+ 
++  int64_t first_dts() const { return first_dts_; }
++
+  private:
+   friend class FFmpegDemuxerTest;
+ 
+@@ -208,6 +210,7 @@ class MEDIA_EXPORT FFmpegDemuxerStream : public DemuxerStream {
+   bool fixup_chained_ogg_;
+ 
+   int num_discarded_packet_warnings_;
++  int64_t first_dts_;
+   int64_t last_packet_pos_;
+   int64_t last_packet_dts_;
+ };
+-- 
+2.35.1
+

chromium-113-disable-GlobalMediaControlsCastStartStop.patch

@@ -0,0 +1,12 @@
+diff -up chromium-113.0.5672.24/chrome/browser/media/router/media_router_feature.cc.disable-GlobalMediaControlsCastStartStop chromium-113.0.5672.24/chrome/browser/media/router/media_router_feature.cc
+--- chromium-113.0.5672.24/chrome/browser/media/router/media_router_feature.cc.disable-GlobalMediaControlsCastStartStop	2023-04-07 13:54:52.562292026 +0200
++++ chromium-113.0.5672.24/chrome/browser/media/router/media_router_feature.cc	2023-04-07 13:57:41.470414086 +0200
+@@ -68,7 +68,7 @@ BASE_FEATURE(kGlobalMediaControlsCastSta
+ #else
+ BASE_FEATURE(kGlobalMediaControlsCastStartStop,
+              "GlobalMediaControlsCastStartStop",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             base::FEATURE_DISABLED_BY_DEFAULT);
+ #endif  // BUILDFLAG(IS_CHROMEOS)
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 

chromium-113-rhel8-force-disable-use_gnome_keyring.patch

@@ -0,0 +1,12 @@
+diff -up chromium-113.0.5672.24/components/os_crypt/sync/features.gni.disblegnomekeyring chromium-113.0.5672.24/components/os_crypt/sync/features.gni
+--- chromium-113.0.5672.24/components/os_crypt/sync/features.gni.disblegnomekeyring	2023-04-07 14:23:11.083985460 +0200
++++ chromium-113.0.5672.24/components/os_crypt/sync/features.gni	2023-04-07 14:23:44.276599353 +0200
+@@ -8,7 +8,7 @@ import("//build/config/ui.gni")
+ declare_args() {
+   # Whether to use libgnome-keyring (deprecated by libsecret).
+   # See http://crbug.com/466975 and http://crbug.com/355223.
+-  use_gnome_keyring = is_linux && use_glib
++  use_gnome_keyring = false
+ 
+   # Whether to make account and service names for the crypto key storage
+   # configurable at runtime for embedders.

chromium-114-add_qt6_linuxui_backend.patch

@@ -0,0 +1,545 @@
+commit 75f4b48eb71d4872ba3ac6c9fc3662a60eb4175d
+Author: Tom Anderson <thomasanderson@chromium.org>
+Date:   Thu Apr 27 02:21:34 2023 +0000
+
+    Add QT6 LinuxUi backend
+    
+    - Enable QT6 by default on KDE6
+    - If QT6 load fails, fallback to QT5 (and vice versa)
+    - Add use_qt6 build flag for packager control
+    - Add --qt-version runtime flag for user control
+    
+    R=thestig
+    
+    Change-Id: Ib1d9f6183663ecf7b9ddfe9d7f3e3442e534ccda
+    Fixed: 1434754
+    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4475369
+    Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
+    Reviewed-by: Lei Zhang <thestig@chromium.org>
+    Cr-Commit-Position: refs/heads/main@{#1136295}
+
+diff --git a/chrome/installer/linux/BUILD.gn b/chrome/installer/linux/BUILD.gn
+index 5639b9ffc996e..3bacd3398d4a2 100644
+--- a/chrome/installer/linux/BUILD.gn
++++ b/chrome/installer/linux/BUILD.gn
+@@ -109,6 +109,9 @@ if (use_qt) {
+   # to prevent a hard dependency on QT for the package.
+   packaging_files += [ "$root_out_dir/libqt5_shim.so" ]
+ }
++if (use_qt6) {
++  packaging_files += [ "$root_out_dir/libqt6_shim.so" ]
++}
+ 
+ action_foreach("calculate_deb_dependencies") {
+   deps = [ ":installer_deps" ]
+@@ -249,6 +252,12 @@ if (use_qt) {
+     deps = [ "//ui/qt:qt5_shim" ]
+   }
+ }
++if (use_qt6) {
++  strip_binary("strip_qt6_shim") {
++    binary_input = "$root_out_dir/libqt6_shim.so"
++    deps = [ "//ui/qt:qt6_shim" ]
++  }
++}
+ 
+ # This target builds all "normal" Linux installers.  You must set
+ # is_component_build=false before building this target.
+@@ -447,6 +456,12 @@ group("installer_deps") {
+       "//ui/qt:qt5_shim",
+     ]
+   }
++  if (use_qt6) {
++    public_deps += [
++      ":strip_qt6_shim",
++      "//ui/qt:qt6_shim",
++    ]
++  }
+ }
+ 
+ # Creates .deb and .rpm (RPM for non-ChromeOS only) installer packages.
+diff --git a/chrome/installer/linux/common/installer.include b/chrome/installer/linux/common/installer.include
+index 8d76f1f280b01..439ef5ccb0f52 100644
+--- a/chrome/installer/linux/common/installer.include
++++ b/chrome/installer/linux/common/installer.include
+@@ -254,6 +254,11 @@ stage_install_common() {
+     strippedfile="${OUTPUTDIR}/${file}.stripped"
+     install -m ${SHLIB_PERMS} "${strippedfile}" "${STAGEDIR}/${INSTALLDIR}/${file}"
+   fi
++  if [ -f "${OUTPUTDIR}/libqt6_shim.so" ]; then
++    file="libqt6_shim.so"
++    strippedfile="${OUTPUTDIR}/${file}.stripped"
++    install -m ${SHLIB_PERMS} "${strippedfile}" "${STAGEDIR}/${INSTALLDIR}/${file}"
++  fi
+ 
+   # libc++
+   if [ -f "${OUTPUTDIR}/lib/libc++.so" ]; then
+diff --git a/ui/qt/BUILD.gn b/ui/qt/BUILD.gn
+index bbede00daa4d0..6a67961edc2f7 100644
+--- a/ui/qt/BUILD.gn
++++ b/ui/qt/BUILD.gn
+@@ -11,13 +11,6 @@ assert(use_qt)
+ assert(is_linux)
+ assert(!is_castos)
+ 
+-pkg_config("qt5_config") {
+-  packages = [
+-    "Qt5Core",
+-    "Qt5Widgets",
+-  ]
+-}
+-
+ config("qt_internal_config") {
+   if (is_clang) {
+     # libstdc++ headers are incompatible with -fcomplete-member-pointers.
+@@ -56,40 +49,57 @@ if (!use_sysroot) {
+   }
+ }
+ 
+-shared_library("qt5_shim") {
+-  visibility = [
+-    ":qt",
+-    "//chrome/installer/linux:*",
+-  ]
+-
+-  # Since qt_shim is a shared library even in non-component builds, it shouldn't
+-  # depend on any other targets since that would duplicate code between binaries
+-  # leading to increased size and potential issues from duplicated global state.
+-  no_default_deps = true
+-  assert_no_deps = [
+-    "//base",
+-    "//buildtools/third_party/libc++",
+-  ]
+-  deps = [ ":qt_interface" ]
+-
+-  configs -= [ "//build/config/compiler:runtime_library" ]
+-  configs += [
+-    ":qt_internal_config",
+-    ":qt5_config",
+-  ]
++template("qt_shim") {
++  pkg_config("qt" + invoker.qt_version + "_config") {
++    packages = [
++      "Qt" + invoker.qt_version + "Core",
++      "Qt" + invoker.qt_version + "Widgets",
++    ]
++  }
+ 
+-  public = []
+-  sources = [
+-    "qt_shim.cc",
+-    "qt_shim.h",
+-  ]
+-  if (use_sysroot) {
+-    # This file is generated with gen_qt_shim_moc.sh on an amd64 system to
+-    # avoid a build-time dependency on `moc` when using the sysroot.
+-    sources += [ "qt_shim_moc.cc" ]
+-  } else {
+-    sources += get_target_outputs(":generate_moc")
+-    deps += [ ":generate_moc" ]
++  shared_library(target_name) {
++    visibility = [
++      ":qt",
++      "//chrome/installer/linux:*",
++    ]
++
++    # Since qt_shim is a shared library even in non-component builds, it shouldn't
++    # depend on any other targets since that would duplicate code between binaries
++    # leading to increased size and potential issues from duplicated global state.
++    no_default_deps = true
++    assert_no_deps = [
++      "//base",
++      "//buildtools/third_party/libc++",
++    ]
++    deps = [ ":qt_interface" ]
++
++    configs -= [ "//build/config/compiler:runtime_library" ]
++    configs += [
++      ":qt_internal_config",
++      ":qt" + invoker.qt_version + "_config",
++    ]
++
++    public = []
++    sources = [
++      "qt_shim.cc",
++      "qt_shim.h",
++    ]
++    if (use_sysroot) {
++      # This file is generated with gen_qt_shim_moc.sh on an amd64 system to
++      # avoid a build-time dependency on `moc` when using the sysroot.
++      sources += [ "qt" + invoker.qt_version + "_shim_moc.cc" ]
++    } else {
++      sources += get_target_outputs(":generate_moc")
++      deps += [ ":generate_moc" ]
++    }
++  }
++}
++qt_shim("qt5_shim") {
++  qt_version = "5"
++}
++if (use_qt6) {
++  qt_shim("qt6_shim") {
++    qt_version = "6"
+   }
+ }
+ 
+@@ -100,6 +110,9 @@ component("qt") {
+ 
+   # qt_shim is in data_deps since we want to load it manually.
+   data_deps = [ ":qt5_shim" ]
++  if (use_qt6) {
++    data_deps += [ ":qt6_shim" ]
++  }
+   deps = [
+     ":qt_interface",
+     "//base",
+diff --git a/ui/qt/gen_qt_shim_moc.sh b/ui/qt/gen_qt_shim_moc.sh
+index 74272d5611dab..9d02c2dfcb12f 100755
+--- a/ui/qt/gen_qt_shim_moc.sh
++++ b/ui/qt/gen_qt_shim_moc.sh
+@@ -6,11 +6,15 @@
+ set -o nounset
+ set -o errexit
+ 
+-URL="http://archive.debian.org/debian/pool/main/q/qtbase-opensource-src"
+-PACKAGE="qtbase5-dev-tools_5.3.2+dfsg-4+deb8u2_amd64.deb"
+-SHA256="7703754f2c230ce6b8b6030b6c1e7e030899aa9f45a415498df04bd5ec061a76"
+-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
++URL5="http://archive.debian.org/debian/pool/main/q/qtbase-opensource-src"
++PACKAGE5="qtbase5-dev-tools_5.3.2+dfsg-4+deb8u2_amd64.deb"
++SHA256_5="7703754f2c230ce6b8b6030b6c1e7e030899aa9f45a415498df04bd5ec061a76"
++
++URL6="http://archive.ubuntu.com/ubuntu/pool/universe/q/qt6-base"
++PACKAGE6="qt6-base-dev-tools_6.2.4+dfsg-2ubuntu1_amd64.deb"
++SHA256_6="8dddfc79e7743185b07c478ca0f96a4ccc13d48ecccc42f44d2578c33c7d9b8b"
+ 
++SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+ TMP_DIR=$(mktemp -d -p "$SCRIPT_DIR")
+ function cleanup {
+     rm -rf "$TMP_DIR"
+@@ -18,16 +22,22 @@ function cleanup {
+ trap cleanup EXIT
+ 
+ cd "$TMP_DIR"
+-wget "$URL/$PACKAGE"
+-echo "$SHA256  $PACKAGE" | shasum -a 256 -c
+-dpkg -x "$PACKAGE" .
+-cat > ../qt_shim_moc.cc <<EOF
+-// Copyright 2022 The Chromium Authors
++wget "$URL5/$PACKAGE5"
++echo "$SHA256_5  $PACKAGE5" | shasum -a 256 -c
++dpkg -x "$PACKAGE5" .
++wget "$URL6/$PACKAGE6"
++echo "$SHA256_6  $PACKAGE6" | shasum -a 256 -c
++dpkg -x "$PACKAGE6" .
++cat > ../qt5_shim_moc.cc <<EOF
++// Copyright 2023 The Chromium Authors
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+ 
+ EOF
+ cd "$SCRIPT_DIR/../.."
++cp ui/qt/qt5_shim_moc.cc ui/qt/qt6_shim_moc.cc
+ "$TMP_DIR/usr/lib/x86_64-linux-gnu/qt5/bin/moc" ui/qt/qt_shim.h \
+-    >> ui/qt/qt_shim_moc.cc
+-git cl format ui/qt/qt_shim_moc.cc
++    >> ui/qt/qt5_shim_moc.cc
++"$TMP_DIR//usr/lib/qt6/libexec/moc" ui/qt/qt_shim.h \
++    >> ui/qt/qt6_shim_moc.cc
++git cl format ui/qt/qt5_shim_moc.cc ui/qt/qt6_shim_moc.cc
+diff --git a/ui/qt/qt.gni b/ui/qt/qt.gni
+index 27bb6375880b7..f45823270cb91 100644
+--- a/ui/qt/qt.gni
++++ b/ui/qt/qt.gni
+@@ -4,9 +4,17 @@
+ 
+ import("//build/config/chromecast_build.gni")
+ import("//build/config/sanitizers/sanitizers.gni")
++import("//build/config/sysroot.gni")
+ 
+ declare_args() {
+   # TODO(https://crbug.com/1424435): Allow QT in MSAN builds once QT is
+   # added to the instrumented libraries.
+   use_qt = is_linux && !is_castos && !is_msan
+ }
++
++declare_args() {
++  use_qt6 = use_qt && use_sysroot
++}
++
++# use_qt6 => use_qt
++assert(!use_qt6 || use_qt)
+diff --git a/ui/qt/qt_shim_moc.cc b/ui/qt/qt5_shim_moc.cc
+similarity index 95%
+rename from ui/qt/qt_shim_moc.cc
+rename to ui/qt/qt5_shim_moc.cc
+index dafbfadce56ba..8f8b6b57784a8 100644
+--- a/ui/qt/qt_shim_moc.cc
++++ b/ui/qt/qt5_shim_moc.cc
+@@ -1,4 +1,4 @@
+-// Copyright 2022 The Chromium Authors
++// Copyright 2023 The Chromium Authors
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+ 
+@@ -89,26 +89,32 @@ const QMetaObject* qt::QtShim::metaObject() const {
+ }
+ 
+ void* qt::QtShim::qt_metacast(const char* _clname) {
+-  if (!_clname)
++  if (!_clname) {
+     return 0;
+-  if (!strcmp(_clname, qt_meta_stringdata_qt__QtShim.stringdata))
++  }
++  if (!strcmp(_clname, qt_meta_stringdata_qt__QtShim.stringdata)) {
+     return static_cast<void*>(const_cast<QtShim*>(this));
+-  if (!strcmp(_clname, "QtInterface"))
++  }
++  if (!strcmp(_clname, "QtInterface")) {
+     return static_cast<QtInterface*>(const_cast<QtShim*>(this));
++  }
+   return QObject::qt_metacast(_clname);
+ }
+ 
+ int qt::QtShim::qt_metacall(QMetaObject::Call _c, int _id, void** _a) {
+   _id = QObject::qt_metacall(_c, _id, _a);
+-  if (_id < 0)
++  if (_id < 0) {
+     return _id;
++  }
+   if (_c == QMetaObject::InvokeMetaMethod) {
+-    if (_id < 2)
++    if (_id < 2) {
+       qt_static_metacall(this, _c, _id, _a);
++    }
+     _id -= 2;
+   } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
+-    if (_id < 2)
++    if (_id < 2) {
+       *reinterpret_cast<int*>(_a[0]) = -1;
++    }
+     _id -= 2;
+   }
+   return _id;
+diff --git a/ui/qt/qt6_shim_moc.cc b/ui/qt/qt6_shim_moc.cc
+new file mode 100644
+index 0000000000000..6d02ca317b65d
+--- /dev/null
++++ b/ui/qt/qt6_shim_moc.cc
+@@ -0,0 +1,143 @@
++// Copyright 2023 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++/****************************************************************************
++** Meta object code from reading C++ file 'qt_shim.h'
++**
++** Created by: The Qt Meta Object Compiler version 68 (Qt 6.2.4)
++**
++** WARNING! All changes made in this file will be lost!
++*****************************************************************************/
++
++#include <QtCore/qbytearray.h>
++#include <QtCore/qmetatype.h>
++#include <memory>
++#include "ui/qt/qt_shim.h"
++#if !defined(Q_MOC_OUTPUT_REVISION)
++#error "The header file 'qt_shim.h' doesn't include <QObject>."
++#elif Q_MOC_OUTPUT_REVISION != 68
++#error "This file was generated using the moc from 6.2.4. It"
++#error "cannot be used with the include files from this version of Qt."
++#error "(The moc has changed too much.)"
++#endif
++
++QT_BEGIN_MOC_NAMESPACE
++QT_WARNING_PUSH
++QT_WARNING_DISABLE_DEPRECATED
++struct qt_meta_stringdata_qt__QtShim_t {
++  const uint offsetsAndSize[12];
++  char stringdata0[52];
++};
++#define QT_MOC_LITERAL(ofs, len) \
++  uint(offsetof(qt_meta_stringdata_qt__QtShim_t, stringdata0) + ofs), len
++static const qt_meta_stringdata_qt__QtShim_t qt_meta_stringdata_qt__QtShim = {
++    {
++        QT_MOC_LITERAL(0, 10),   // "qt::QtShim"
++        QT_MOC_LITERAL(11, 11),  // "FontChanged"
++        QT_MOC_LITERAL(23, 0),   // ""
++        QT_MOC_LITERAL(24, 4),   // "font"
++        QT_MOC_LITERAL(29, 14),  // "PaletteChanged"
++        QT_MOC_LITERAL(44, 7)    // "palette"
++
++    },
++    "qt::QtShim\0FontChanged\0\0font\0"
++    "PaletteChanged\0palette"};
++#undef QT_MOC_LITERAL
++
++static const uint qt_meta_data_qt__QtShim[] = {
++
++    // content:
++    10,     // revision
++    0,      // classname
++    0, 0,   // classinfo
++    2, 14,  // methods
++    0, 0,   // properties
++    0, 0,   // enums/sets
++    0, 0,   // constructors
++    0,      // flags
++    0,      // signalCount
++
++    // slots: name, argc, parameters, tag, flags, initial metatype offsets
++    1, 1, 26, 2, 0x08, 1 /* Private */, 4, 1, 29, 2, 0x08, 3 /* Private */,
++
++    // slots: parameters
++    QMetaType::Void, QMetaType::QFont, 3, QMetaType::Void, QMetaType::QPalette,
++    5,
++
++    0  // eod
++};
++
++void qt::QtShim::qt_static_metacall(QObject* _o,
++                                    QMetaObject::Call _c,
++                                    int _id,
++                                    void** _a) {
++  if (_c == QMetaObject::InvokeMetaMethod) {
++    auto* _t = static_cast<QtShim*>(_o);
++    (void)_t;
++    switch (_id) {
++      case 0:
++        _t->FontChanged((*reinterpret_cast<std::add_pointer_t<QFont>>(_a[1])));
++        break;
++      case 1:
++        _t->PaletteChanged(
++            (*reinterpret_cast<std::add_pointer_t<QPalette>>(_a[1])));
++        break;
++      default:;
++    }
++  }
++}
++
++const QMetaObject qt::QtShim::staticMetaObject = {
++    {QMetaObject::SuperData::link<QObject::staticMetaObject>(),
++     qt_meta_stringdata_qt__QtShim.offsetsAndSize, qt_meta_data_qt__QtShim,
++     qt_static_metacall, nullptr,
++     qt_incomplete_metaTypeArray<
++         qt_meta_stringdata_qt__QtShim_t,
++         QtPrivate::TypeAndForceComplete<QtShim, std::true_type>,
++         QtPrivate::TypeAndForceComplete<void, std::false_type>,
++         QtPrivate::TypeAndForceComplete<const QFont&, std::false_type>,
++         QtPrivate::TypeAndForceComplete<void, std::false_type>,
++         QtPrivate::TypeAndForceComplete<const QPalette&, std::false_type>
++
++         >,
++     nullptr}};
++
++const QMetaObject* qt::QtShim::metaObject() const {
++  return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject()
++                                    : &staticMetaObject;
++}
++
++void* qt::QtShim::qt_metacast(const char* _clname) {
++  if (!_clname) {
++    return nullptr;
++  }
++  if (!strcmp(_clname, qt_meta_stringdata_qt__QtShim.stringdata0)) {
++    return static_cast<void*>(this);
++  }
++  if (!strcmp(_clname, "QtInterface")) {
++    return static_cast<QtInterface*>(this);
++  }
++  return QObject::qt_metacast(_clname);
++}
++
++int qt::QtShim::qt_metacall(QMetaObject::Call _c, int _id, void** _a) {
++  _id = QObject::qt_metacall(_c, _id, _a);
++  if (_id < 0) {
++    return _id;
++  }
++  if (_c == QMetaObject::InvokeMetaMethod) {
++    if (_id < 2) {
++      qt_static_metacall(this, _c, _id, _a);
++    }
++    _id -= 2;
++  } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
++    if (_id < 2) {
++      *reinterpret_cast<QMetaType*>(_a[0]) = QMetaType();
++    }
++    _id -= 2;
++  }
++  return _id;
++}
++QT_WARNING_POP
++QT_END_MOC_NAMESPACE
+diff --git a/ui/qt/qt_ui.cc b/ui/qt/qt_ui.cc
+index d4052b7e8bc3d..6a3b58e9f930b 100644
+--- a/ui/qt/qt_ui.cc
++++ b/ui/qt/qt_ui.cc
+@@ -14,7 +14,9 @@
+ #include "base/check.h"
+ #include "base/command_line.h"
+ #include "base/compiler_specific.h"
++#include "base/environment.h"
+ #include "base/memory/raw_ptr.h"
++#include "base/nix/xdg_util.h"
+ #include "base/notreached.h"
+ #include "base/path_service.h"
+ #include "base/time/time.h"
+@@ -47,6 +49,45 @@ namespace qt {
+ 
+ namespace {
+ 
++const char kQtVersionFlag[] = "qt-version";
++
++void* LoadLibrary(const base::FilePath& path) {
++  return dlopen(path.value().c_str(), RTLD_NOW | RTLD_GLOBAL);
++}
++
++void* LoadLibraryOrFallback(const base::FilePath& path,
++                            const char* preferred,
++                            const char* fallback) {
++  if (void* library = LoadLibrary(path.Append(preferred))) {
++    return library;
++  }
++  return LoadLibrary(path.Append(fallback));
++}
++
++bool PreferQt6() {
++  auto* cmd = base::CommandLine::ForCurrentProcess();
++  if (cmd->HasSwitch(kQtVersionFlag)) {
++    std::string qt_version_string = cmd->GetSwitchValueASCII(kQtVersionFlag);
++    unsigned int qt_version = 0;
++    if (base::StringToUint(qt_version_string, &qt_version)) {
++      switch (qt_version) {
++        case 5:
++          return false;
++        case 6:
++          return true;
++        default:
++          LOG(ERROR) << "Unsupported QT version " << qt_version;
++      }
++    } else {
++      LOG(ERROR) << "Unable to parse QT version " << qt_version_string;
++    }
++  }
++
++  auto env = base::Environment::Create();
++  auto desktop = base::nix::GetDesktopEnvironment(env.get());
++  return desktop == base::nix::DESKTOP_ENVIRONMENT_KDE6;
++}
++
+ int QtWeightToCssWeight(int weight) {
+   struct {
+     int qt_weight;
+@@ -179,8 +220,10 @@ bool QtUi::Initialize() {
+   base::FilePath path;
+   if (!base::PathService::Get(base::DIR_MODULE, &path))
+     return false;
+-  path = path.Append("libqt5_shim.so");
+-  void* libqt_shim = dlopen(path.value().c_str(), RTLD_NOW | RTLD_GLOBAL);
++  void* libqt_shim =
++      PreferQt6()
++          ? LoadLibraryOrFallback(path, "libqt6_shim.so", "libqt5_shim.so")
++          : LoadLibraryOrFallback(path, "libqt5_shim.so", "libqt6_shim.so");
+   if (!libqt_shim)
+     return false;
+   void* create_qt_interface = dlsym(libqt_shim, "CreateQtInterface");

chromium-114-buildflag-el7.patch

@@ -0,0 +1,21 @@
+diff -up chromium-114.0.5735.26/components/omnibox/browser/omnibox_edit_model.cc.me chromium-114.0.5735.26/components/omnibox/browser/omnibox_edit_model.cc
+--- chromium-114.0.5735.26/components/omnibox/browser/omnibox_edit_model.cc.me	2023-05-14 09:14:10.886314480 +0200
++++ chromium-114.0.5735.26/components/omnibox/browser/omnibox_edit_model.cc	2023-05-14 09:16:59.380054720 +0200
+@@ -79,7 +79,7 @@
+ #include "ui/gfx/vector_icon_types.h"
+ #endif
+ 
+-#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
++#ifdef GOOGLE_CHROME_BRANDING
+ #include "components/vector_icons/vector_icons.h"  // nogncheck
+ #endif
+ 
+@@ -628,7 +628,7 @@ bool OmniboxEditModel::ShouldShowCurrent
+ }
+ 
+ ui::ImageModel OmniboxEditModel::GetSuperGIcon(int image_size, bool dark_mode) {
+-#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
++#ifdef GOOGLE_CHROME_BRANDING
+   if (dark_mode) {
+     return ui::ImageModel::FromVectorIcon(
+         vector_icons::kGoogleGLogoMonochromeIcon, ui::kColorRefPrimary100,

chromium-114-constexpr-el7.patch

@@ -0,0 +1,62 @@
+diff -up chromium-114.0.5735.26/components/version_info/version_info.cc.constexpr-el7 chromium-114.0.5735.26/components/version_info/version_info.cc
+diff -up chromium-114.0.5735.26/components/version_info/version_info.h.constexpr-el7 chromium-114.0.5735.26/components/version_info/version_info.h
+--- chromium-114.0.5735.26/components/version_info/version_info.h.constexpr-el7	2023-05-11 03:36:19.000000000 +0200
++++ chromium-114.0.5735.26/components/version_info/version_info.h	2023-05-14 10:59:19.921578645 +0200
+@@ -27,18 +27,18 @@ const std::string GetProductNameAndVersi
+     const std::string& build_version);
+ 
+ // Returns the product name, e.g. "Chromium" or "Google Chrome".
+-constexpr std::string GetProductName() {
++static const std::string GetProductName() {
+   return PRODUCT_NAME;
+ }
+ 
+ // Returns the version number, e.g. "6.0.490.1".
+-constexpr std::string GetVersionNumber() {
++static const std::string GetVersionNumber() {
+   return PRODUCT_VERSION;
+ }
+ 
+ // Returns the product name and version information for the User-Agent header,
+ // in the format: Chrome/<major_version>.<minor_version>.<build>.<patch>.
+-constexpr std::string GetProductNameAndVersionForUserAgent() {
++static const std::string GetProductNameAndVersionForUserAgent() {
+   return "Chrome/" + GetVersionNumber();
+ }
+ 
+@@ -53,7 +53,7 @@ std::string GetMajorVersionNumber();
+ const base::Version& GetVersion();
+ 
+ // Returns a version control specific identifier of this release.
+-constexpr std::string GetLastChange() {
++static const std::string GetLastChange() {
+   return LAST_CHANGE;
+ }
+ 
+@@ -65,7 +65,7 @@ constexpr bool IsOfficialBuild() {
+ }
+ 
+ // Returns the OS type, e.g. "Windows", "Linux", "FreeBSD", ...
+-constexpr std::string GetOSType() {
++static const std::string GetOSType() {
+ #if BUILDFLAG(IS_WIN)
+   return "Windows";
+ #elif BUILDFLAG(IS_IOS)
+@@ -97,7 +97,7 @@ constexpr std::string GetOSType() {
+ 
+ // Returns a string equivalent of |channel|, independent of whether the build
+ // is branded or not and without any additional modifiers.
+-constexpr std::string GetChannelString(Channel channel) {
++static const std::string GetChannelString(Channel channel) {
+   switch (channel) {
+     case Channel::STABLE:
+       return "stable";
+@@ -114,7 +114,7 @@ constexpr std::string GetChannelString(C
+ }
+ 
+ // Returns a list of sanitizers enabled in this build.
+-constexpr std::string GetSanitizerList() {
++static const std::string GetSanitizerList() {
+   return ""
+ #if defined(ADDRESS_SANITIZER)
+          "address "

chromium-114-gcc13.patch

@@ -0,0 +1,389 @@
+diff -up chromium-109.0.5414.74/base/check_op.h.me chromium-109.0.5414.74/base/check_op.h
+--- chromium-109.0.5414.74/base/check_op.h.me	2023-01-17 17:39:27.620875883 +0100
++++ chromium-109.0.5414.74/base/check_op.h	2023-01-17 17:39:42.546060957 +0100
+@@ -5,6 +5,7 @@
+ #ifndef BASE_CHECK_OP_H_
+ #define BASE_CHECK_OP_H_
+ 
++#include <cstdint>
+ #include <cstddef>
+ #include <string>
+ #include <type_traits>
+diff -up chromium-109.0.5414.74/base/debug/profiler.h.me chromium-109.0.5414.74/base/debug/profiler.h
+--- chromium-109.0.5414.74/base/debug/profiler.h.me	2023-01-17 16:29:26.368090073 +0100
++++ chromium-109.0.5414.74/base/debug/profiler.h	2023-01-17 16:59:41.190628679 +0100
+@@ -7,6 +7,7 @@
+ 
+ #include <stddef.h>
+ 
++#include <cstdint>
+ #include <string>
+ 
+ #include "base/base_export.h"
+diff -up chromium-109.0.5414.74/components/viz/common/view_transition_element_resource_id.h.me chromium-109.0.5414.74/components/viz/common/view_transition_element_resource_id.h
+--- chromium-109.0.5414.74/components/viz/common/view_transition_element_resource_id.h.me	2023-01-17 19:03:10.920014806 +0100
++++ chromium-109.0.5414.74/components/viz/common/view_transition_element_resource_id.h	2023-01-17 19:03:48.736395274 +0100
+@@ -5,6 +5,7 @@
+ #ifndef COMPONENTS_VIZ_COMMON_VIEW_TRANSITION_ELEMENT_RESOURCE_ID_H_
+ #define COMPONENTS_VIZ_COMMON_VIEW_TRANSITION_ELEMENT_RESOURCE_ID_H_
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+diff -up chromium-109.0.5414.74/gpu/config/gpu_feature_info.h.me chromium-109.0.5414.74/gpu/config/gpu_feature_info.h
+--- chromium-109.0.5414.74/gpu/config/gpu_feature_info.h.me	2023-01-17 19:06:53.530675129 +0100
++++ chromium-109.0.5414.74/gpu/config/gpu_feature_info.h	2023-01-17 19:07:08.874849879 +0100
+@@ -5,6 +5,7 @@
+ #ifndef GPU_CONFIG_GPU_FEATURE_INFO_H_
+ #define GPU_CONFIG_GPU_FEATURE_INFO_H_
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+diff -up chromium-109.0.5414.74/net/base/net_export.h.me chromium-109.0.5414.74/net/base/net_export.h
+--- chromium-109.0.5414.74/net/base/net_export.h.me	2023-01-17 18:16:34.133854615 +0100
++++ chromium-109.0.5414.74/net/base/net_export.h	2023-01-17 18:16:15.945623153 +0100
+@@ -5,6 +5,8 @@
+ #ifndef NET_BASE_NET_EXPORT_H_
+ #define NET_BASE_NET_EXPORT_H_
+ 
++#include <cstdint>
++
+ // Defines NET_EXPORT so that functionality implemented by the net module can
+ // be exported to consumers, and NET_EXPORT_PRIVATE that allows unit tests to
+ // access features not intended to be used directly by real consumers.
+diff -up chromium-109.0.5414.74/sandbox/linux/syscall_broker/broker_file_permission.h.me chromium-109.0.5414.74/sandbox/linux/syscall_broker/broker_file_permission.h
+--- chromium-109.0.5414.74/sandbox/linux/syscall_broker/broker_file_permission.h.me	2023-01-17 17:12:34.184686515 +0100
++++ chromium-109.0.5414.74/sandbox/linux/syscall_broker/broker_file_permission.h	2023-01-17 17:13:16.537162420 +0100
+@@ -5,6 +5,7 @@
+ #ifndef SANDBOX_LINUX_SYSCALL_BROKER_BROKER_FILE_PERMISSION_H_
+ #define SANDBOX_LINUX_SYSCALL_BROKER_BROKER_FILE_PERMISSION_H_
+ 
++#include <cstdint>
+ #include <bitset>
+ #include <string>
+ 
+diff -up chromium-109.0.5414.74/third_party/abseil-cpp/absl/strings/string_view.h.me chromium-109.0.5414.74/third_party/abseil-cpp/absl/strings/string_view.h
+--- chromium-109.0.5414.74/third_party/abseil-cpp/absl/strings/string_view.h.me	2023-01-17 17:33:20.895717307 +0100
++++ chromium-109.0.5414.74/third_party/abseil-cpp/absl/strings/string_view.h	2023-01-17 17:34:03.456185365 +0100
+@@ -27,6 +27,7 @@
+ #ifndef ABSL_STRINGS_STRING_VIEW_H_
+ #define ABSL_STRINGS_STRING_VIEW_H_
+ 
++#include <cstdint>
+ #include <algorithm>
+ #include <cassert>
+ #include <cstddef>
+diff -up chromium-109.0.5414.74/third_party/angle/include/GLSLANG/ShaderVars.h.me chromium-109.0.5414.74/third_party/angle/include/GLSLANG/ShaderVars.h
+--- chromium-109.0.5414.74/third_party/angle/include/GLSLANG/ShaderVars.h.me	2023-01-17 17:36:15.017616250 +0100
++++ chromium-109.0.5414.74/third_party/angle/include/GLSLANG/ShaderVars.h	2023-01-17 17:36:48.960982195 +0100
+@@ -10,6 +10,7 @@
+ #ifndef GLSLANG_SHADERVARS_H_
+ #define GLSLANG_SHADERVARS_H_
+ 
++#include <cstdint>
+ #include <algorithm>
+ #include <array>
+ #include <string>
+diff -up chromium-109.0.5414.74/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h.me chromium-109.0.5414.74/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h
+--- chromium-109.0.5414.74/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h.me	2023-01-17 19:17:40.480876171 +0100
++++ chromium-109.0.5414.74/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h	2023-01-17 19:17:46.803958320 +0100
+@@ -5,6 +5,7 @@
+ #ifndef THIRD_PARTY_BLINK_PUBLIC_COMMON_BLUETOOTH_WEB_BLUETOOTH_DEVICE_ID_H_
+ #define THIRD_PARTY_BLINK_PUBLIC_COMMON_BLUETOOTH_WEB_BLUETOOTH_DEVICE_ID_H_
+ 
++#include <cstdint>
+ #include <array>
+ #include <string>
+ 
+diff -up chromium-109.0.5414.74/third_party/dawn/src/tint/reader/spirv/namer.h.me chromium-109.0.5414.74/third_party/dawn/src/tint/reader/spirv/namer.h
+--- chromium-109.0.5414.74/third_party/dawn/src/tint/reader/spirv/namer.h.me	2023-01-17 18:02:44.681538107 +0100
++++ chromium-109.0.5414.74/third_party/dawn/src/tint/reader/spirv/namer.h	2023-01-17 18:02:57.208679140 +0100
+@@ -15,6 +15,7 @@
+ #ifndef SRC_TINT_READER_SPIRV_NAMER_H_
+ #define SRC_TINT_READER_SPIRV_NAMER_H_
+ 
++#include <cstdint>
+ #include <string>
+ #include <unordered_map>
+ #include <vector>
+diff -up chromium-109.0.5414.74/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h.me chromium-109.0.5414.74/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h
+--- chromium-109.0.5414.74/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h.me	2023-01-18 15:22:38.472940648 +0100
++++ chromium-109.0.5414.74/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h	2023-01-18 15:23:09.380255101 +0100
+@@ -5,6 +5,7 @@
+ #ifndef DISCOVERY_DNSSD_PUBLIC_DNS_SD_TXT_RECORD_H_
+ #define DISCOVERY_DNSSD_PUBLIC_DNS_SD_TXT_RECORD_H_
+ 
++#include <cstdint>
+ #include <functional>
+ #include <map>
+ #include <set>
+diff -up chromium-109.0.5414.74/third_party/swiftshader/src/System/LRUCache.hpp.me chromium-109.0.5414.74/third_party/swiftshader/src/System/LRUCache.hpp
+--- chromium-109.0.5414.74/third_party/swiftshader/src/System/LRUCache.hpp.me	2023-01-17 15:37:48.530626516 +0100
++++ chromium-109.0.5414.74/third_party/swiftshader/src/System/LRUCache.hpp	2023-01-17 16:57:46.025548092 +0100
+@@ -17,6 +17,7 @@
+ 
+ #include "System/Debug.hpp"
+ 
++#include <cstdint>
+ #include <cstddef>
+ #include <functional>
+ #include <unordered_set>
+diff -up chromium-109.0.5414.74/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h.me chromium-109.0.5414.74/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
+--- chromium-109.0.5414.74/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h.me	2023-01-17 15:40:23.854386206 +0100
++++ chromium-109.0.5414.74/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h	2023-01-17 16:58:19.397862885 +0100
+@@ -2388,6 +2388,7 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeV
+ #ifdef VMA_IMPLEMENTATION
+ #undef VMA_IMPLEMENTATION
+ 
++#include <cstdio>
+ #include <cstdint>
+ #include <cstdlib>
+ #include <cstring>
+diff -up chromium-109.0.5414.74/ui/gfx/geometry/linear_gradient.h.me chromium-109.0.5414.74/ui/gfx/geometry/linear_gradient.h
+--- chromium-109.0.5414.74/ui/gfx/geometry/linear_gradient.h.me	2023-01-17 18:08:25.745491353 +0100
++++ chromium-109.0.5414.74/ui/gfx/geometry/linear_gradient.h	2023-01-17 18:08:35.777667632 +0100
+@@ -5,6 +5,7 @@
+ #ifndef UI_GFX_LINEAR_GRADIENT_H_
+ #define UI_GFX_LINEAR_GRADIENT_H_
+ 
++#include <cstdint>
+ #include <array>
+ #include <string>
+ 
+diff -up chromium-109.0.5414.74/third_party/ruy/src/ruy/profiler/instrumentation.h.me chromium-109.0.5414.74/third_party/ruy/src/ruy/profiler/instrumentation.h
+--- chromium-109.0.5414.74/third_party/ruy/src/ruy/profiler/instrumentation.h.me	2023-01-19 10:10:21.287876736 +0100
++++ chromium-109.0.5414.74/third_party/ruy/src/ruy/profiler/instrumentation.h	2023-01-19 10:11:21.714778896 +0100
+@@ -17,6 +17,7 @@ limitations under the License.
+ #define RUY_RUY_PROFILER_INSTRUMENTATION_H_
+ 
+ #ifdef RUY_PROFILER
++#include <string>
+ #include <cstdio>
+ #include <mutex>
+ #include <vector>
+diff -up chromium-109.0.5414.74/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.h.me chromium-109.0.5414.74/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.h
+--- chromium-109.0.5414.74/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.h.me	2023-01-19 10:30:27.533861985 +0100
++++ chromium-109.0.5414.74/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.h	2023-01-19 10:31:12.585554183 +0100
+@@ -31,6 +31,7 @@ limitations under the License.
+ #ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_SPECTROGRAM_H_
+ #define TENSORFLOW_LITE_KERNELS_INTERNAL_SPECTROGRAM_H_
+ 
++#include <cstdint>
+ #include <complex>
+ #include <deque>
+ #include <vector>
+diff -up chromium-109.0.5414.74/base/containers/flat_map.h.mee chromium-109.0.5414.74/base/containers/flat_map.h
+--- chromium-109.0.5414.74/base/containers/flat_map.h.mee	2023-01-19 10:59:52.214957773 +0100
++++ chromium-109.0.5414.74/base/containers/flat_map.h	2023-01-19 11:00:06.415215309 +0100
+@@ -5,6 +5,7 @@
+ #ifndef BASE_CONTAINERS_FLAT_MAP_H_
+ #define BASE_CONTAINERS_FLAT_MAP_H_
+ 
++#include <cstdint>
+ #include <functional>
+ #include <tuple>
+ #include <utility>
+diff -up chromium-109.0.5414.74/components/crash/core/app/crash_reporter_client.h.mee chromium-109.0.5414.74/components/crash/core/app/crash_reporter_client.h
+--- chromium-109.0.5414.74/components/crash/core/app/crash_reporter_client.h.mee	2023-01-19 10:36:40.571422826 +0100
++++ chromium-109.0.5414.74/components/crash/core/app/crash_reporter_client.h	2023-01-19 10:36:49.343565294 +0100
+@@ -5,6 +5,7 @@
+ #ifndef COMPONENTS_CRASH_CORE_APP_CRASH_REPORTER_CLIENT_H_
+ #define COMPONENTS_CRASH_CORE_APP_CRASH_REPORTER_CLIENT_H_
+ 
++#include <cstdint>
+ #include <string>
+ 
+ #include "build/build_config.h"
+diff -up chromium-109.0.5414.74/ui/base/prediction/kalman_filter.h.mee chromium-109.0.5414.74/ui/base/prediction/kalman_filter.h
+--- chromium-109.0.5414.74/ui/base/prediction/kalman_filter.h.mee	2023-01-19 11:45:15.953159755 +0100
++++ chromium-109.0.5414.74/ui/base/prediction/kalman_filter.h	2023-01-19 11:45:22.320246241 +0100
+@@ -5,6 +5,8 @@
+ #ifndef UI_BASE_PREDICTION_KALMAN_FILTER_H_
+ #define UI_BASE_PREDICTION_KALMAN_FILTER_H_
+ 
++#include <cstdint>
++
+ #include "base/component_export.h"
+ #include "ui/gfx/geometry/matrix3_f.h"
+ 
+diff -up chromium-109.0.5414.74/components/password_manager/core/browser/generation/password_generator.h.me chromium-109.0.5414.74/components/password_manager/core/browser/generation/password_generator.h
+--- chromium-109.0.5414.74/components/password_manager/core/browser/generation/password_generator.h.me	2023-01-19 15:20:07.620987949 +0100
++++ chromium-109.0.5414.74/components/password_manager/core/browser/generation/password_generator.h	2023-01-19 15:20:18.324173702 +0100
+@@ -5,6 +5,7 @@
+ #ifndef COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_GENERATION_PASSWORD_GENERATOR_H_
+ #define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_GENERATION_PASSWORD_GENERATOR_H_
+ 
++#include <cstdint>
+ #include <string>
+ 
+ 
+diff -up chromium-109.0.5414.74/components/feature_engagement/internal/event_storage_validator.h.me chromium-109.0.5414.74/components/feature_engagement/internal/event_storage_validator.h
+--- chromium-109.0.5414.74/components/feature_engagement/internal/event_storage_validator.h.me	2023-01-19 16:00:14.350186515 +0100
++++ chromium-109.0.5414.74/components/feature_engagement/internal/event_storage_validator.h	2023-01-19 16:00:21.643307993 +0100
+@@ -5,6 +5,7 @@
+ #ifndef COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_EVENT_STORAGE_VALIDATOR_H_
+ #define COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_EVENT_STORAGE_VALIDATOR_H_
+ 
++#include <cstdint>
+ #include <string>
+ 
+ namespace feature_engagement {
+diff -up chromium-109.0.5414.74/components/feature_engagement/internal/never_event_storage_validator.h.me chromium-109.0.5414.74/components/feature_engagement/internal/never_event_storage_validator.h
+--- chromium-109.0.5414.74/components/feature_engagement/internal/never_event_storage_validator.h.me	2023-01-19 15:59:18.210239416 +0100
++++ chromium-109.0.5414.74/components/feature_engagement/internal/never_event_storage_validator.h	2023-01-19 15:59:34.513515030 +0100
+@@ -5,6 +5,7 @@
+ #ifndef COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_NEVER_EVENT_STORAGE_VALIDATOR_H_
+ #define COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_NEVER_EVENT_STORAGE_VALIDATOR_H_
+ 
++#include <cstdint>
+ #include <string>
+ 
+ #include "components/feature_engagement/internal/event_storage_validator.h"
+diff -up chromium-109.0.5414.74/third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/Support/Signals.h.me chromium-109.0.5414.74/third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/Support/Signals.h
+--- chromium-109.0.5414.74/third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/Support/Signals.h.me	2023-01-19 16:06:17.548272878 +0100
++++ chromium-109.0.5414.74/third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/Support/Signals.h	2023-01-19 16:06:25.685410592 +0100
+@@ -14,6 +14,7 @@
+ #ifndef LLVM_SUPPORT_SIGNALS_H
+ #define LLVM_SUPPORT_SIGNALS_H
+ 
++#include <cstdint>
+ #include <string>
+ 
+ namespace llvm {
+diff -up chromium-109.0.5414.74/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc.me chromium-109.0.5414.74/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc
+--- chromium-109.0.5414.74/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc.me	2023-01-19 16:09:29.216477182 +0100
++++ chromium-109.0.5414.74/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc	2023-01-19 16:10:05.657089208 +0100
+@@ -45,6 +45,7 @@
+ #include "llvm/Support/SaveAndRestore.h"
+ #include "llvm/Support/raw_ostream.h"
+ #include <algorithm>
++#include <cstdint>
+ #include <string>
+ #include <sysexits.h>
+ #ifdef HAVE_BACKTRACE
+diff -up chromium-109.0.5414.74/chrome/browser/privacy_budget/encountered_surface_tracker.h.me chromium-109.0.5414.74/chrome/browser/privacy_budget/encountered_surface_tracker.h
+--- chromium-109.0.5414.74/chrome/browser/privacy_budget/encountered_surface_tracker.h.me	2023-01-19 16:32:05.338160131 +0100
++++ chromium-109.0.5414.74/chrome/browser/privacy_budget/encountered_surface_tracker.h	2023-01-19 16:32:16.213326798 +0100
+@@ -5,6 +5,7 @@
+ #ifndef CHROME_BROWSER_PRIVACY_BUDGET_ENCOUNTERED_SURFACE_TRACKER_H_
+ #define CHROME_BROWSER_PRIVACY_BUDGET_ENCOUNTERED_SURFACE_TRACKER_H_
+ 
++#include <cstdint>
+ #include <map>
+ 
+ #include "base/containers/flat_set.h"
+diff -up chromium-109.0.5414.74/components/autofill/core/browser/autofill_ablation_study.h.me chromium-109.0.5414.74/components/autofill/core/browser/autofill_ablation_study.h
+--- chromium-109.0.5414.74/components/autofill/core/browser/autofill_ablation_study.h.me	2023-01-19 16:47:55.548571102 +0100
++++ chromium-109.0.5414.74/components/autofill/core/browser/autofill_ablation_study.h	2023-01-19 16:48:29.214146529 +0100
+@@ -5,6 +5,7 @@
+ #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_ABLATION_STUDY_H_
+ #define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_ABLATION_STUDY_H_
+ 
++#include <cstdint>
+ #include <string>
+ 
+ class GURL;
+diff -up chromium-109.0.5414.74/components/omnibox/browser/on_device_head_model.h.me chromium-109.0.5414.74/components/omnibox/browser/on_device_head_model.h
+--- chromium-109.0.5414.74/components/omnibox/browser/on_device_head_model.h.me	2023-01-19 16:57:29.525372814 +0100
++++ chromium-109.0.5414.74/components/omnibox/browser/on_device_head_model.h	2023-01-19 16:58:02.667979288 +0100
+@@ -5,6 +5,7 @@
+ #ifndef COMPONENTS_OMNIBOX_BROWSER_ON_DEVICE_HEAD_MODEL_H_
+ #define COMPONENTS_OMNIBOX_BROWSER_ON_DEVICE_HEAD_MODEL_H_
+ 
++#include <cstdint>
+ #include <string>
+ #include <utility>
+ #include <vector>
+diff -up chromium-109.0.5414.74/components/payments/content/utility/fingerprint_parser.h.me chromium-109.0.5414.74/components/payments/content/utility/fingerprint_parser.h
+--- chromium-109.0.5414.74/components/payments/content/utility/fingerprint_parser.h.me	2023-01-19 17:02:45.258544665 +0100
++++ chromium-109.0.5414.74/components/payments/content/utility/fingerprint_parser.h	2023-01-19 17:02:52.577611757 +0100
+@@ -5,6 +5,7 @@
+ #ifndef COMPONENTS_PAYMENTS_CONTENT_UTILITY_FINGERPRINT_PARSER_H_
+ #define COMPONENTS_PAYMENTS_CONTENT_UTILITY_FINGERPRINT_PARSER_H_
+ 
++#include <cstdint>
+ #include <stddef.h>
+ 
+ #include <string>
+diff -up chromium-109.0.5414.74/pdf/document_attachment_info.h.me chromium-109.0.5414.74/pdf/document_attachment_info.h
+--- chromium-109.0.5414.74/pdf/document_attachment_info.h.me	2023-01-19 17:28:28.552063534 +0100
++++ chromium-109.0.5414.74/pdf/document_attachment_info.h	2023-01-19 17:28:48.072379953 +0100
+@@ -5,6 +5,7 @@
+ #ifndef PDF_DOCUMENT_ATTACHMENT_INFO_H_
+ #define PDF_DOCUMENT_ATTACHMENT_INFO_H_
+ 
++#include <cstdint>
+ #include <string>
+ 
+ 
+diff -up chromium-109.0.5414.74/third_party/pdfium/constants/annotation_flags.h.me chromium-109.0.5414.74/third_party/pdfium/constants/annotation_flags.h
+--- chromium-109.0.5414.74/third_party/pdfium/constants/annotation_flags.h.me	2023-01-19 18:25:47.648193710 +0100
++++ chromium-109.0.5414.74/third_party/pdfium/constants/annotation_flags.h	2023-01-19 18:26:11.488593556 +0100
+@@ -5,6 +5,8 @@
+ #ifndef CONSTANTS_ANNOTATION_FLAGS_H_
+ #define CONSTANTS_ANNOTATION_FLAGS_H_
+ 
++#include <cstdint>
++
+ namespace pdfium {
+ namespace annotation_flags {
+ 
+diff -up chromium-109.0.5414.74/base/cpu.h.me chromium-109.0.5414.74/base/cpu.h
+--- chromium-109.0.5414.74/base/cpu.h.me	2023-01-19 21:31:02.905062987 +0100
++++ chromium-109.0.5414.74/base/cpu.h	2023-01-19 21:31:32.298573267 +0100
+@@ -5,6 +5,7 @@
+ #ifndef BASE_CPU_H_
+ #define BASE_CPU_H_
+ 
++#include <cstdint>
+ #include <string>
+ 
+ #include "base/base_export.h"
+diff -up chromium-113.0.5672.24/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h.me chromium-113.0.5672.24/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h
+--- chromium-113.0.5672.24/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h.me	2023-04-15 16:44:55.344305412 +0200
++++ chromium-113.0.5672.24/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h	2023-04-15 16:47:09.028666995 +0200
+@@ -2854,6 +2854,7 @@ static void vma_aligned_free(void* VMA_N
+ 
+ // Define this macro to 1 to enable functions: vmaBuildStatsString, vmaFreeStatsString.
+ #if VMA_STATS_STRING_ENABLED
++#include <stdio.h>
+     static inline void VmaUint32ToStr(char* VMA_NOT_NULL outStr, size_t strLen, uint32_t num)
+     {
+         snprintf(outStr, strLen, "%u", static_cast<unsigned int>(num));
+diff -up chromium-113.0.5672.37/chrome/browser/webauthn/authenticator_request_dialog_model.h.me chromium-113.0.5672.37/chrome/browser/webauthn/authenticator_request_dialog_model.h
+--- chromium-113.0.5672.37/chrome/browser/webauthn/authenticator_request_dialog_model.h.me	2023-04-18 15:55:44.774916319 +0200
++++ chromium-113.0.5672.37/chrome/browser/webauthn/authenticator_request_dialog_model.h	2023-04-18 15:55:54.441085882 +0200
+@@ -8,6 +8,7 @@
+ #include <memory>
+ #include <string>
+ #include <vector>
++#include <variant>
+ 
+ #include "base/containers/span.h"
+ #include "base/functional/callback_forward.h"
+diff -up chromium-113.0.5672.37/gin/time_clamper.h.me chromium-113.0.5672.37/gin/time_clamper.h
+--- chromium-113.0.5672.37/gin/time_clamper.h.me	2023-04-18 16:38:41.180437467 +0200
++++ chromium-113.0.5672.37/gin/time_clamper.h	2023-04-18 16:39:43.857049432 +0200
+@@ -48,7 +48,7 @@ class GIN_EXPORT TimeClamper {
+     const int64_t micros = now_micros % 1000;
+     // abs() is necessary for devices with times before unix-epoch (most likely
+     // configured incorrectly).
+-    if (abs(micros) + kResolutionMicros < 1000) {
++    if (std::abs(micros) + kResolutionMicros < 1000) {
+       return now_micros / 1000;
+     }
+     return ClampTimeResolution(now_micros) / 1000;
+diff -up chromium-113.0.5672.53/chrome/test/chromedriver/chrome/web_view_impl.cc.me chromium-113.0.5672.53/chrome/test/chromedriver/chrome/web_view_impl.cc
+--- chromium-113.0.5672.53/chrome/test/chromedriver/chrome/web_view_impl.cc.me	2023-04-21 08:07:55.362714544 +0200
++++ chromium-113.0.5672.53/chrome/test/chromedriver/chrome/web_view_impl.cc	2023-04-21 08:14:35.424158693 +0200
+@@ -10,6 +10,7 @@
+ #include <queue>
+ #include <utility>
+ #include <vector>
++#include <cstring>
+ 
+ #include "base/check.h"
+ #include "base/files/file_path.h"

chromium-114-norar.patch

@@ -0,0 +1,105 @@
+diff -up chromium-114.0.5735.35/chrome/browser/safe_browsing/download_protection/file_analyzer.cc.nounrar chromium-114.0.5735.35/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
+--- chromium-114.0.5735.35/chrome/browser/safe_browsing/download_protection/file_analyzer.cc.nounrar	2023-05-18 00:37:47.000000000 +0200
++++ chromium-114.0.5735.35/chrome/browser/safe_browsing/download_protection/file_analyzer.cc	2023-05-21 18:12:30.368425080 +0200
+@@ -77,8 +77,6 @@ void FileAnalyzer::Start(const base::Fil
+ 
+   if (inspection_type == DownloadFileType::ZIP) {
+     StartExtractZipFeatures();
+-  } else if (inspection_type == DownloadFileType::RAR) {
+-    StartExtractRarFeatures();
+ #if BUILDFLAG(IS_MAC)
+   } else if (inspection_type == DownloadFileType::DMG) {
+     StartExtractDmgFeatures();
+diff -up chromium-114.0.5735.35/chrome/common/safe_browsing/archive_analyzer.cc.nounrar chromium-114.0.5735.35/chrome/common/safe_browsing/archive_analyzer.cc
+--- chromium-114.0.5735.35/chrome/common/safe_browsing/archive_analyzer.cc.nounrar	2023-05-18 00:37:48.000000000 +0200
++++ chromium-114.0.5735.35/chrome/common/safe_browsing/archive_analyzer.cc	2023-05-21 18:11:14.870058635 +0200
+@@ -8,7 +8,6 @@
+ #include "build/build_config.h"
+ #include "build/buildflag.h"
+ #include "chrome/common/safe_browsing/archive_analyzer_results.h"
+-#include "chrome/common/safe_browsing/rar_analyzer.h"
+ #include "chrome/common/safe_browsing/seven_zip_analyzer.h"
+ #include "chrome/common/safe_browsing/zip_analyzer.h"
+ #include "components/safe_browsing/content/common/proto/download_file_types.pb.h"
+@@ -23,9 +22,7 @@ namespace safe_browsing {
+ // static
+ std::unique_ptr<ArchiveAnalyzer> ArchiveAnalyzer::CreateForArchiveType(
+     DownloadFileType_InspectionType file_type) {
+-  if (file_type == DownloadFileType::RAR) {
+-    return std::make_unique<RarAnalyzer>();
+-  } else if (file_type == DownloadFileType::ZIP) {
++  if (file_type == DownloadFileType::ZIP) {
+     return std::make_unique<ZipAnalyzer>();
+   } else if (file_type == DownloadFileType::SEVEN_ZIP) {
+     return std::make_unique<SevenZipAnalyzer>();
+diff -up chromium-114.0.5735.35/chrome/common/safe_browsing/BUILD.gn.nounrar chromium-114.0.5735.35/chrome/common/safe_browsing/BUILD.gn
+--- chromium-114.0.5735.35/chrome/common/safe_browsing/BUILD.gn.nounrar	2023-05-18 00:37:48.000000000 +0200
++++ chromium-114.0.5735.35/chrome/common/safe_browsing/BUILD.gn	2023-05-21 18:11:14.869058617 +0200
+@@ -145,8 +145,6 @@ source_set("safe_browsing") {
+       "protobuf_message_log_macros.h",
+       "protobuf_message_read_macros.h",
+       "protobuf_message_write_macros.h",
+-      "rar_analyzer.cc",
+-      "rar_analyzer.h",
+       "seven_zip_analyzer.cc",
+       "seven_zip_analyzer.h",
+       "zip_analyzer.cc",
+@@ -162,7 +160,6 @@ source_set("safe_browsing") {
+       "//components/safe_browsing/content/common:file_type_policies",
+       "//components/safe_browsing/core/common",
+       "//third_party/lzma_sdk/google:seven_zip_reader",
+-      "//third_party/unrar:unrar",
+     ]
+ 
+     if (is_linux) {
+diff -up chromium-114.0.5735.35/chrome/common/safe_browsing/zip_analyzer.cc.nounrar chromium-114.0.5735.35/chrome/common/safe_browsing/zip_analyzer.cc
+--- chromium-114.0.5735.35/chrome/common/safe_browsing/zip_analyzer.cc.nounrar	2023-05-18 00:37:48.000000000 +0200
++++ chromium-114.0.5735.35/chrome/common/safe_browsing/zip_analyzer.cc	2023-05-21 18:11:14.869058617 +0200
+@@ -18,7 +18,6 @@
+ #include "base/time/time.h"
+ #include "build/build_config.h"
+ #include "chrome/common/safe_browsing/archive_analyzer_results.h"
+-#include "chrome/common/safe_browsing/rar_analyzer.h"
+ #include "components/safe_browsing/content/common/file_type_policies.h"
+ #include "components/safe_browsing/core/common/features.h"
+ #include "components/safe_browsing/core/common/proto/csd.pb.h"
+diff -up chromium-114.0.5735.35/chrome/services/file_util/safe_archive_analyzer.cc.nounrar chromium-114.0.5735.35/chrome/services/file_util/safe_archive_analyzer.cc
+--- chromium-114.0.5735.35/chrome/services/file_util/safe_archive_analyzer.cc.nounrar	2023-05-18 00:37:48.000000000 +0200
++++ chromium-114.0.5735.35/chrome/services/file_util/safe_archive_analyzer.cc	2023-05-21 18:11:14.870058635 +0200
+@@ -71,6 +71,7 @@ void SafeArchiveAnalyzer::AnalyzeRarFile
+     base::File rar_file,
+     mojo::PendingRemote<chrome::mojom::TemporaryFileGetter> temp_file_getter,
+     AnalyzeRarFileCallback callback) {
++#if 0
+   DCHECK(rar_file.IsValid());
+   temp_file_getter_.Bind(std::move(temp_file_getter));
+   callback_ = std::move(callback);
+@@ -86,6 +87,9 @@ void SafeArchiveAnalyzer::AnalyzeRarFile
+   rar_analyzer_.Analyze(std::move(rar_file), base::FilePath(),
+                         std::move(analysis_finished_callback),
+                         std::move(temp_file_getter_callback), &results_);
++#else
++  NOTREACHED();
++#endif
+ }
+ 
+ void SafeArchiveAnalyzer::AnalyzeSevenZipFile(
+diff -up chromium-114.0.5735.35/chrome/services/file_util/safe_archive_analyzer.h.nounrar chromium-114.0.5735.35/chrome/services/file_util/safe_archive_analyzer.h
+--- chromium-114.0.5735.35/chrome/services/file_util/safe_archive_analyzer.h.nounrar	2023-05-18 00:37:48.000000000 +0200
++++ chromium-114.0.5735.35/chrome/services/file_util/safe_archive_analyzer.h	2023-05-21 18:11:14.870058635 +0200
+@@ -6,7 +6,6 @@
+ #define CHROME_SERVICES_FILE_UTIL_SAFE_ARCHIVE_ANALYZER_H_
+ 
+ #include "chrome/common/safe_browsing/archive_analyzer_results.h"
+-#include "chrome/common/safe_browsing/rar_analyzer.h"
+ #include "chrome/common/safe_browsing/seven_zip_analyzer.h"
+ #include "chrome/common/safe_browsing/zip_analyzer.h"
+ #include "chrome/services/file_util/public/mojom/safe_archive_analyzer.mojom.h"
+@@ -63,7 +62,6 @@ class SafeArchiveAnalyzer : public chrom
+   void Timeout();
+ 
+   safe_browsing::ZipAnalyzer zip_analyzer_;
+-  safe_browsing::RarAnalyzer rar_analyzer_;
+   safe_browsing::SevenZipAnalyzer seven_zip_analyzer_;
+ #if BUILDFLAG(IS_MAC)
+   safe_browsing::dmg::DMGAnalyzer dmg_analyzer_;

chromium-114-qt-fix_font_double_scaling.patch

@@ -0,0 +1,21 @@
+diff --git a/ui/qt/qt_ui.cc b/ui/qt/qt_ui.cc
+index bac5245a..a97fa8b 100644
+--- a/ui/qt/qt_ui.cc
++++ b/ui/qt/qt_ui.cc
+@@ -422,12 +422,14 @@
+   auto desc = shim_->GetFontDescription();
+ 
+   font_family_ = desc.family.c_str();
++  // Points are defined at 72 DPI and pixels are 96 DPI by default.
++  constexpr double kPointToPixelRatio = 96.0 / 72.0;
+   if (desc.size_pixels > 0) {
+     font_size_pixels_ = desc.size_pixels;
+-    font_size_points_ = font_size_pixels_ / GetDeviceScaleFactor();
++    font_size_points_ = std::round(font_size_pixels_ / kPointToPixelRatio);
+   } else {
+     font_size_points_ = desc.size_points;
+-    font_size_pixels_ = font_size_points_ * GetDeviceScaleFactor();
++    font_size_pixels_ = std::round(font_size_points_ * kPointToPixelRatio);
+   }
+   font_style_ = desc.is_italic ? gfx::Font::ITALIC : gfx::Font::NORMAL;
+   font_weight_ = QtWeightToCssWeight(desc.weight);

chromium-114-qt-handle_scale_factor_changes.patch

@@ -0,0 +1,574 @@
+commit c51d6447fd0d124903d16bf5952efccbf9e1ca92
+Author: Tom Anderson <thomasanderson@chromium.org>
+Date:   Wed May 24 22:53:20 2023 +0000
+
+    [Qt] Handle scale factor changes
+    
+    This is a speculative fix for https://crbug.com/1439149.  I suspect
+    the scale factor is not set immediately on QT initialization, but
+    is set asynchronously shortly after.  This CL adds a listener for
+    QT scale changes.
+    
+    R=thestig
+    
+    Low-Coverage-Reason: No QT tests currently
+    Change-Id: I7dea23e16a6bb26237564af2dc4e43480f6aea9f
+    Bug: 1439149
+    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4559732
+    Reviewed-by: Lei Zhang <thestig@chromium.org>
+    Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
+    Auto-Submit: Thomas Anderson <thomasanderson@chromium.org>
+    Cr-Commit-Position: refs/heads/main@{#1148805}
+
+diff --git a/ui/qt/qt5_shim_moc.cc b/ui/qt/qt5_shim_moc.cc
+index 8f8b6b57784a8..6e504f23c603a 100644
+--- a/ui/qt/qt5_shim_moc.cc
++++ b/ui/qt/qt5_shim_moc.cc
+@@ -23,8 +23,8 @@
+ 
+ QT_BEGIN_MOC_NAMESPACE
+ struct qt_meta_stringdata_qt__QtShim_t {
+-  QByteArrayData data[6];
+-  char stringdata[52];
++  QByteArrayData data[13];
++  char stringdata[151];
+ };
+ #define QT_MOC_LITERAL(idx, ofs, len)                                       \
+   Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(                  \
+@@ -33,9 +33,16 @@ struct qt_meta_stringdata_qt__QtShim_t {
+ static const qt_meta_stringdata_qt__QtShim_t qt_meta_stringdata_qt__QtShim = {
+     {QT_MOC_LITERAL(0, 0, 10), QT_MOC_LITERAL(1, 11, 11),
+      QT_MOC_LITERAL(2, 23, 0), QT_MOC_LITERAL(3, 24, 4),
+-     QT_MOC_LITERAL(4, 29, 14), QT_MOC_LITERAL(5, 44, 7)},
++     QT_MOC_LITERAL(4, 29, 14), QT_MOC_LITERAL(5, 44, 7),
++     QT_MOC_LITERAL(6, 52, 11), QT_MOC_LITERAL(7, 64, 8),
++     QT_MOC_LITERAL(8, 73, 6), QT_MOC_LITERAL(9, 80, 13),
++     QT_MOC_LITERAL(10, 94, 25), QT_MOC_LITERAL(11, 120, 3),
++     QT_MOC_LITERAL(12, 124, 26)},
+     "qt::QtShim\0FontChanged\0\0font\0"
+-    "PaletteChanged\0palette"};
++    "PaletteChanged\0palette\0ScreenAdded\0"
++    "QScreen*\0screen\0ScreenRemoved\0"
++    "LogicalDotsPerInchChanged\0dpi\0"
++    "PhysicalDotsPerInchChanged"};
+ #undef QT_MOC_LITERAL
+ 
+ static const uint qt_meta_data_qt__QtShim[] = {
+@@ -44,7 +51,7 @@ static const uint qt_meta_data_qt__QtShim[] = {
+     7,      // revision
+     0,      // classname
+     0, 0,   // classinfo
+-    2, 14,  // methods
++    6, 14,  // methods
+     0, 0,   // properties
+     0, 0,   // enums/sets
+     0, 0,   // constructors
+@@ -52,11 +59,15 @@ static const uint qt_meta_data_qt__QtShim[] = {
+     0,      // signalCount
+ 
+     // slots: name, argc, parameters, tag, flags
+-    1, 1, 24, 2, 0x08 /* Private */, 4, 1, 27, 2, 0x08 /* Private */,
++    1, 1, 44, 2, 0x08 /* Private */, 4, 1, 47, 2, 0x08 /* Private */, 6, 1, 50,
++    2, 0x08 /* Private */, 9, 1, 53, 2, 0x08 /* Private */, 10, 1, 56, 2,
++    0x08 /* Private */, 12, 1, 59, 2, 0x08 /* Private */,
+ 
+     // slots: parameters
+     QMetaType::Void, QMetaType::QFont, 3, QMetaType::Void, QMetaType::QPalette,
+-    5,
++    5, QMetaType::Void, 0x80000000 | 7, 8, QMetaType::Void, 0x80000000 | 7, 8,
++    QMetaType::Void, QMetaType::QReal, 11, QMetaType::Void, QMetaType::QReal,
++    11,
+ 
+     0  // eod
+ };
+@@ -74,6 +85,18 @@ void qt::QtShim::qt_static_metacall(QObject* _o,
+       case 1:
+         _t->PaletteChanged((*reinterpret_cast<const QPalette(*)>(_a[1])));
+         break;
++      case 2:
++        _t->ScreenAdded((*reinterpret_cast<QScreen*(*)>(_a[1])));
++        break;
++      case 3:
++        _t->ScreenRemoved((*reinterpret_cast<QScreen*(*)>(_a[1])));
++        break;
++      case 4:
++        _t->LogicalDotsPerInchChanged((*reinterpret_cast<qreal(*)>(_a[1])));
++        break;
++      case 5:
++        _t->PhysicalDotsPerInchChanged((*reinterpret_cast<qreal(*)>(_a[1])));
++        break;
+       default:;
+     }
+   }
+@@ -107,15 +130,15 @@ int qt::QtShim::qt_metacall(QMetaObject::Call _c, int _id, void** _a) {
+     return _id;
+   }
+   if (_c == QMetaObject::InvokeMetaMethod) {
+-    if (_id < 2) {
++    if (_id < 6) {
+       qt_static_metacall(this, _c, _id, _a);
+     }
+-    _id -= 2;
++    _id -= 6;
+   } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
+-    if (_id < 2) {
++    if (_id < 6) {
+       *reinterpret_cast<int*>(_a[0]) = -1;
+     }
+-    _id -= 2;
++    _id -= 6;
+   }
+   return _id;
+ }
+diff --git a/ui/qt/qt6_shim_moc.cc b/ui/qt/qt6_shim_moc.cc
+index 6d02ca317b65d..a16515008d892 100644
+--- a/ui/qt/qt6_shim_moc.cc
++++ b/ui/qt/qt6_shim_moc.cc
+@@ -26,8 +26,8 @@ QT_BEGIN_MOC_NAMESPACE
+ QT_WARNING_PUSH
+ QT_WARNING_DISABLE_DEPRECATED
+ struct qt_meta_stringdata_qt__QtShim_t {
+-  const uint offsetsAndSize[12];
+-  char stringdata0[52];
++  const uint offsetsAndSize[26];
++  char stringdata0[151];
+ };
+ #define QT_MOC_LITERAL(ofs, len) \
+   uint(offsetof(qt_meta_stringdata_qt__QtShim_t, stringdata0) + ofs), len
+@@ -38,11 +38,21 @@ static const qt_meta_stringdata_qt__QtShim_t qt_meta_stringdata_qt__QtShim = {
+         QT_MOC_LITERAL(23, 0),   // ""
+         QT_MOC_LITERAL(24, 4),   // "font"
+         QT_MOC_LITERAL(29, 14),  // "PaletteChanged"
+-        QT_MOC_LITERAL(44, 7)    // "palette"
++        QT_MOC_LITERAL(44, 7),   // "palette"
++        QT_MOC_LITERAL(52, 11),  // "ScreenAdded"
++        QT_MOC_LITERAL(64, 8),   // "QScreen*"
++        QT_MOC_LITERAL(73, 6),   // "screen"
++        QT_MOC_LITERAL(80, 13),  // "ScreenRemoved"
++        QT_MOC_LITERAL(94, 25),  // "LogicalDotsPerInchChanged"
++        QT_MOC_LITERAL(120, 3),  // "dpi"
++        QT_MOC_LITERAL(124, 26)  // "PhysicalDotsPerInchChanged"
+ 
+     },
+     "qt::QtShim\0FontChanged\0\0font\0"
+-    "PaletteChanged\0palette"};
++    "PaletteChanged\0palette\0ScreenAdded\0"
++    "QScreen*\0screen\0ScreenRemoved\0"
++    "LogicalDotsPerInchChanged\0dpi\0"
++    "PhysicalDotsPerInchChanged"};
+ #undef QT_MOC_LITERAL
+ 
+ static const uint qt_meta_data_qt__QtShim[] = {
+@@ -51,7 +61,7 @@ static const uint qt_meta_data_qt__QtShim[] = {
+     10,     // revision
+     0,      // classname
+     0, 0,   // classinfo
+-    2, 14,  // methods
++    6, 14,  // methods
+     0, 0,   // properties
+     0, 0,   // enums/sets
+     0, 0,   // constructors
+@@ -59,11 +69,15 @@ static const uint qt_meta_data_qt__QtShim[] = {
+     0,      // signalCount
+ 
+     // slots: name, argc, parameters, tag, flags, initial metatype offsets
+-    1, 1, 26, 2, 0x08, 1 /* Private */, 4, 1, 29, 2, 0x08, 3 /* Private */,
++    1, 1, 50, 2, 0x08, 1 /* Private */, 4, 1, 53, 2, 0x08, 3 /* Private */, 6,
++    1, 56, 2, 0x08, 5 /* Private */, 9, 1, 59, 2, 0x08, 7 /* Private */, 10, 1,
++    62, 2, 0x08, 9 /* Private */, 12, 1, 65, 2, 0x08, 11 /* Private */,
+ 
+     // slots: parameters
+     QMetaType::Void, QMetaType::QFont, 3, QMetaType::Void, QMetaType::QPalette,
+-    5,
++    5, QMetaType::Void, 0x80000000 | 7, 8, QMetaType::Void, 0x80000000 | 7, 8,
++    QMetaType::Void, QMetaType::QReal, 11, QMetaType::Void, QMetaType::QReal,
++    11,
+ 
+     0  // eod
+ };
+@@ -83,6 +97,22 @@ void qt::QtShim::qt_static_metacall(QObject* _o,
+         _t->PaletteChanged(
+             (*reinterpret_cast<std::add_pointer_t<QPalette>>(_a[1])));
+         break;
++      case 2:
++        _t->ScreenAdded(
++            (*reinterpret_cast<std::add_pointer_t<QScreen*>>(_a[1])));
++        break;
++      case 3:
++        _t->ScreenRemoved(
++            (*reinterpret_cast<std::add_pointer_t<QScreen*>>(_a[1])));
++        break;
++      case 4:
++        _t->LogicalDotsPerInchChanged(
++            (*reinterpret_cast<std::add_pointer_t<qreal>>(_a[1])));
++        break;
++      case 5:
++        _t->PhysicalDotsPerInchChanged(
++            (*reinterpret_cast<std::add_pointer_t<qreal>>(_a[1])));
++        break;
+       default:;
+     }
+   }
+@@ -98,7 +128,15 @@ const QMetaObject qt::QtShim::staticMetaObject = {
+          QtPrivate::TypeAndForceComplete<void, std::false_type>,
+          QtPrivate::TypeAndForceComplete<const QFont&, std::false_type>,
+          QtPrivate::TypeAndForceComplete<void, std::false_type>,
+-         QtPrivate::TypeAndForceComplete<const QPalette&, std::false_type>
++         QtPrivate::TypeAndForceComplete<const QPalette&, std::false_type>,
++         QtPrivate::TypeAndForceComplete<void, std::false_type>,
++         QtPrivate::TypeAndForceComplete<QScreen*, std::false_type>,
++         QtPrivate::TypeAndForceComplete<void, std::false_type>,
++         QtPrivate::TypeAndForceComplete<QScreen*, std::false_type>,
++         QtPrivate::TypeAndForceComplete<void, std::false_type>,
++         QtPrivate::TypeAndForceComplete<qreal, std::false_type>,
++         QtPrivate::TypeAndForceComplete<void, std::false_type>,
++         QtPrivate::TypeAndForceComplete<qreal, std::false_type>
+ 
+          >,
+      nullptr}};
+@@ -127,15 +165,15 @@ int qt::QtShim::qt_metacall(QMetaObject::Call _c, int _id, void** _a) {
+     return _id;
+   }
+   if (_c == QMetaObject::InvokeMetaMethod) {
+-    if (_id < 2) {
++    if (_id < 6) {
+       qt_static_metacall(this, _c, _id, _a);
+     }
+-    _id -= 2;
++    _id -= 6;
+   } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
+-    if (_id < 2) {
++    if (_id < 6) {
+       *reinterpret_cast<QMetaType*>(_a[0]) = QMetaType();
+     }
+-    _id -= 2;
++    _id -= 6;
+   }
+   return _id;
+ }
+diff --git a/ui/qt/qt_interface.h b/ui/qt/qt_interface.h
+index 6a362bc66c0e3..28dfc6603544f 100644
+--- a/ui/qt/qt_interface.h
++++ b/ui/qt/qt_interface.h
+@@ -118,6 +118,7 @@ class QtInterface {
+ 
+     virtual void FontChanged() = 0;
+     virtual void ThemeChanged() = 0;
++    virtual void ScaleFactorMaybeChanged() = 0;
+   };
+ 
+   QtInterface() = default;
+diff --git a/ui/qt/qt_shim.cc b/ui/qt/qt_shim.cc
+index 74d34ad196f18..0aec9c3aed4ad 100644
+--- a/ui/qt/qt_shim.cc
++++ b/ui/qt/qt_shim.cc
+@@ -16,6 +16,7 @@
+ #include <QMimeType>
+ #include <QPainter>
+ #include <QPalette>
++#include <QScreen>
+ #include <QStyle>
+ #include <QStyleOptionTitleBar>
+ 
+@@ -52,8 +53,9 @@ FontHinting QtHintingToFontHinting(QFont::HintingPreference hinting) {
+ // Obtain the average color of a gradient.
+ SkColor GradientColor(const QGradient& gradient) {
+   QGradientStops stops = gradient.stops();
+-  if (stops.empty())
++  if (stops.empty()) {
+     return qRgba(0, 0, 0, 0);
++  }
+ 
+   float a = 0;
+   float r = 0;
+@@ -86,11 +88,13 @@ SkColor GradientColor(const QGradient& gradient) {
+ // Obtain the average color of a texture.
+ SkColor TextureColor(QImage image) {
+   size_t size = image.width() * image.height();
+-  if (!size)
++  if (!size) {
+     return qRgba(0, 0, 0, 0);
++  }
+ 
+-  if (image.format() != QImage::Format_ARGB32_Premultiplied)
++  if (image.format() != QImage::Format_ARGB32_Premultiplied) {
+     image = image.convertToFormat(QImage::Format_ARGB32_Premultiplied);
++  }
+ 
+   size_t a = 0;
+   size_t r = 0;
+@@ -203,6 +207,13 @@ QtShim::QtShim(QtInterface::Delegate* delegate, int* argc, char** argv)
+           SLOT(FontChanged(const QFont&)));
+   connect(&app_, SIGNAL(paletteChanged(const QPalette&)), this,
+           SLOT(PaletteChanged(const QPalette&)));
++  connect(&app_, SIGNAL(screenAdded(QScreen*)), this,
++          SLOT(ScreenAdded(QScreen*)));
++  connect(&app_, SIGNAL(screenRemoved(QScreen*)), this,
++          SLOT(ScreenRemoved(QScreen*)));
++  for (QScreen* screen : app_.screens()) {
++    ScreenAdded(screen);
++  }
+ }
+ 
+ QtShim::~QtShim() = default;
+@@ -241,8 +252,9 @@ Image QtShim::GetIconForContentType(const String& content_type,
+       auto icon = QIcon::fromTheme(name);
+       auto pixmap = icon.pixmap(size);
+       auto image = pixmap.toImage();
+-      if (image.format() != QImage::Format_ARGB32_Premultiplied)
++      if (image.format() != QImage::Format_ARGB32_Premultiplied) {
+         image = image.convertToFormat(QImage::Format_ARGB32_Premultiplied);
++      }
+       if (auto bytes = image.sizeInBytes()) {
+         return {image.width(), image.height(),
+                 static_cast<float>(image.devicePixelRatio()),
+@@ -283,6 +295,30 @@ void QtShim::PaletteChanged(const QPalette& palette) {
+   delegate_->ThemeChanged();
+ }
+ 
++DISABLE_CFI_VCALL
++void QtShim::ScreenAdded(QScreen* screen) {
++  connect(screen, SIGNAL(logicalDotsPerInchChanged(qreal)), this,
++          SLOT(LogicalDotsPerInchChanged(qreal)));
++  connect(screen, SIGNAL(physicalDotsPerInchChanged(qreal)), this,
++          SLOT(PhysicalDotsPerInchChanged(qreal)));
++  delegate_->ScaleFactorMaybeChanged();
++}
++
++DISABLE_CFI_VCALL
++void QtShim::ScreenRemoved(QScreen* screen) {
++  delegate_->ScaleFactorMaybeChanged();
++}
++
++DISABLE_CFI_VCALL
++void QtShim::LogicalDotsPerInchChanged(qreal dpi) {
++  delegate_->ScaleFactorMaybeChanged();
++}
++
++DISABLE_CFI_VCALL
++void QtShim::PhysicalDotsPerInchChanged(qreal dpi) {
++  delegate_->ScaleFactorMaybeChanged();
++}
++
+ Image QtShim::DrawHeader(int width,
+                          int height,
+                          SkColor default_color,
+@@ -309,8 +345,9 @@ QImage QtShim::DrawHeaderImpl(int width,
+     QStyleOptionTitleBar opt;
+     opt.rect = QRect(-kBorderWidth, -kBorderWidth, width + 2 * kBorderWidth,
+                      height + 2 * kBorderWidth);
+-    if (state == ColorState::kNormal)
++    if (state == ColorState::kNormal) {
+       opt.titleBarState = QStyle::State_Active;
++    }
+     app_.style()->drawComplexControl(QStyle::CC_TitleBar, &opt, &painter,
+                                      nullptr);
+   } else {
+diff --git a/ui/qt/qt_shim.h b/ui/qt/qt_shim.h
+index 607e6fe22dfc0..d979c47d589d4 100644
+--- a/ui/qt/qt_shim.h
++++ b/ui/qt/qt_shim.h
+@@ -42,6 +42,10 @@ class QtShim : public QObject, public QtInterface {
+  private slots:
+   void FontChanged(const QFont& font);
+   void PaletteChanged(const QPalette& palette);
++  void ScreenAdded(QScreen* screen);
++  void ScreenRemoved(QScreen* screen);
++  void LogicalDotsPerInchChanged(qreal dpi);
++  void PhysicalDotsPerInchChanged(qreal dpi);
+ 
+  private:
+   QImage DrawHeaderImpl(int width,
+diff --git a/ui/qt/qt_ui.cc b/ui/qt/qt_ui.cc
+index 6a3b58e9f930b..bac5245a069f9 100644
+--- a/ui/qt/qt_ui.cc
++++ b/ui/qt/qt_ui.cc
+@@ -19,6 +19,7 @@
+ #include "base/nix/xdg_util.h"
+ #include "base/notreached.h"
+ #include "base/path_service.h"
++#include "base/task/single_thread_task_runner.h"
+ #include "base/time/time.h"
+ #include "cc/paint/paint_canvas.h"
+ #include "chrome/browser/themes/theme_properties.h"  // nogncheck
+@@ -36,6 +37,7 @@
+ #include "ui/gfx/image/image.h"
+ #include "ui/gfx/image/image_skia_rep.h"
+ #include "ui/gfx/image/image_skia_source.h"
++#include "ui/linux/device_scale_factor_observer.h"
+ #include "ui/linux/linux_ui.h"
+ #include "ui/linux/nav_button_provider.h"
+ #include "ui/native_theme/native_theme_aura.h"
+@@ -194,16 +196,21 @@ void QtUi::GetDefaultFontDescription(std::string* family_out,
+                                      int* style_out,
+                                      int* weight_out,
+                                      gfx::FontRenderParams* params_out) const {
+-  if (family_out)
++  if (family_out) {
+     *family_out = font_family_;
+-  if (size_pixels_out)
++  }
++  if (size_pixels_out) {
+     *size_pixels_out = font_size_pixels_;
+-  if (style_out)
++  }
++  if (style_out) {
+     *style_out = font_style_;
+-  if (weight_out)
++  }
++  if (weight_out) {
+     *weight_out = font_weight_;
+-  if (params_out)
++  }
++  if (params_out) {
+     *params_out = font_params_;
++  }
+ }
+ 
+ ui::SelectFileDialog* QtUi::CreateSelectFileDialog(
+@@ -236,6 +245,7 @@ bool QtUi::Initialize() {
+   ui::ColorProviderManager::Get().AppendColorProviderInitializer(
+       base::BindRepeating(&QtUi::AddNativeColorMixer, base::Unretained(this)));
+   FontChanged();
++  scale_factor_ = shim_->GetScaleFactor();
+ 
+   return true;
+ }
+@@ -246,8 +256,9 @@ ui::NativeTheme* QtUi::GetNativeTheme() const {
+ 
+ bool QtUi::GetColor(int id, SkColor* color, bool use_custom_frame) const {
+   auto value = GetColor(id, use_custom_frame);
+-  if (value)
++  if (value) {
+     *color = *value;
++  }
+   return value.has_value();
+ }
+ 
+@@ -297,8 +308,9 @@ gfx::Image QtUi::GetIconForContentType(const std::string& content_type,
+                                        float scale) const {
+   Image image =
+       shim_->GetIconForContentType(String(content_type.c_str()), size * scale);
+-  if (!image.data_argb.size())
++  if (!image.data_argb.size()) {
+     return {};
++  }
+ 
+   SkImageInfo image_info = SkImageInfo::Make(
+       image.width, image.height, kBGRA_8888_SkColorType, kPremul_SkAlphaType);
+@@ -345,14 +357,16 @@ bool QtUi::AnimationsEnabled() const {
+ 
+ void QtUi::AddWindowButtonOrderObserver(
+     ui::WindowButtonOrderObserver* observer) {
+-  if (fallback_linux_ui_)
++  if (fallback_linux_ui_) {
+     fallback_linux_ui_->AddWindowButtonOrderObserver(observer);
++  }
+ }
+ 
+ void QtUi::RemoveWindowButtonOrderObserver(
+     ui::WindowButtonOrderObserver* observer) {
+-  if (fallback_linux_ui_)
++  if (fallback_linux_ui_) {
+     fallback_linux_ui_->RemoveWindowButtonOrderObserver(observer);
++  }
+ }
+ 
+ std::unique_ptr<ui::NavButtonProvider> QtUi::CreateNavButtonProvider() {
+@@ -441,11 +455,24 @@ void QtUi::ThemeChanged() {
+   native_theme_->ThemeChanged(PreferDarkTheme());
+ }
+ 
++void QtUi::ScaleFactorMaybeChanged() {
++  // This gets called whenever the monitor configuration changes.  Handle the
++  // scale change asynchronously to allow the change to propagate to QT's scale
++  // factor. This also coalesces scale change events together.
++  if (!scale_factor_task_active_) {
++    scale_factor_task_active_ = true;
++    base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
++        FROM_HERE, base::BindOnce(&QtUi::ScaleFactorMaybeChangedImpl,
++                                  weak_factory_.GetWeakPtr()));
++  }
++}
++
+ DISABLE_CFI_VCALL
+ void QtUi::AddNativeColorMixer(ui::ColorProvider* provider,
+                                const ui::ColorProviderManager::Key& key) {
+-  if (key.system_theme != ui::SystemTheme::kQt)
++  if (key.system_theme != ui::SystemTheme::kQt) {
+     return;
++  }
+ 
+   ui::ColorMixer& mixer = provider->AddMixer();
+   // These color constants are required by native_chrome_color_mixer_linux.cc
+@@ -494,8 +521,9 @@ void QtUi::AddNativeColorMixer(ui::ColorProvider* provider,
+        ColorState::kInactive},
+       {ui::kColorNativeToolbarBackground, ColorType::kButtonBg},
+   };
+-  for (const auto& map : kMaps)
++  for (const auto& map : kMaps) {
+     mixer[map.id] = {shim_->GetColor(map.role, map.state)};
++  }
+ 
+   const bool use_custom_frame =
+       key.frame_type == ui::ColorProviderManager::FrameType::kChromium;
+@@ -578,6 +606,20 @@ absl::optional<SkColor> QtUi::GetColor(int id, bool use_custom_frame) const {
+   }
+ }
+ 
++DISABLE_CFI_VCALL
++void QtUi::ScaleFactorMaybeChangedImpl() {
++  scale_factor_task_active_ = false;
++  double scale = shim_->GetScaleFactor();
++  if (scale == scale_factor_) {
++    return;
++  }
++  scale_factor_ = scale;
++  for (ui::DeviceScaleFactorObserver& observer :
++       device_scale_factor_observer_list()) {
++    observer.OnDeviceScaleFactorChanged();
++  }
++}
++
+ std::unique_ptr<ui::LinuxUiAndTheme> CreateQtUi(
+     ui::LinuxUi* fallback_linux_ui) {
+   return std::make_unique<QtUi>(fallback_linux_ui);
+diff --git a/ui/qt/qt_ui.h b/ui/qt/qt_ui.h
+index b53ed93240708..3319edf1ea9bc 100644
+--- a/ui/qt/qt_ui.h
++++ b/ui/qt/qt_ui.h
+@@ -8,6 +8,7 @@
+ #include <memory>
+ 
+ #include "base/component_export.h"
++#include "base/memory/weak_ptr.h"
+ #include "printing/buildflags/buildflags.h"
+ #include "third_party/abseil-cpp/absl/types/optional.h"
+ #include "ui/color/color_provider.h"
+@@ -88,11 +89,14 @@ class QtUi : public ui::LinuxUiAndTheme, QtInterface::Delegate {
+   // QtInterface::Delegate:
+   void FontChanged() override;
+   void ThemeChanged() override;
++  void ScaleFactorMaybeChanged() override;
+ 
+  private:
+   void AddNativeColorMixer(ui::ColorProvider* provider,
+                            const ui::ColorProviderManager::Key& key);
+ 
++  void ScaleFactorMaybeChangedImpl();
++
+   absl::optional<SkColor> GetColor(int id, bool use_custom_frame) const;
+ 
+   // TODO(https://crbug.com/1317782): This is a fallback for any unimplemented
+@@ -114,6 +118,11 @@ class QtUi : public ui::LinuxUiAndTheme, QtInterface::Delegate {
+   std::unique_ptr<QtInterface> shim_;
+ 
+   std::unique_ptr<QtNativeTheme> native_theme_;
++
++  bool scale_factor_task_active_ = false;
++  double scale_factor_ = 1.0;
++
++  base::WeakPtrFactory<QtUi> weak_factory_{this};
+ };
+ 
+ // This should be the only symbol exported from this component.

chromium-114-qt_deps.patch

@@ -0,0 +1,46 @@
+commit 7b1d747a599a752e493e34e7bbf841d8b4c7882f
+Author: Tomasz Śniatowski <tomasz.sniatowski@xperi.com>
+Date:   Thu May 25 16:09:27 2023 +0000
+
+    Dep on //printing in //ui/qt if printing is enabled
+    
+    qt_ui.h can use printing/printing_context_linux.h, and needs to dep
+    on //printing if it does, to avoid a missing dependency build break.
+    
+    Without this fix, a clean build can fail on obj/ui/qt/qt/qt_ui.o with
+      In file included from ../../ui/qt/qt_ui.cc:8:
+      In file included from ../../ui/qt/qt_ui.h:21:
+      ../../printing/printing_context_linux.h:12:10: fatal error:
+      'printing/mojom/print.mojom.h' file not found
+    
+    (the #include is a // NOGNCHECK one, which is how this came to be)
+    
+    Change-Id: I70af37071e232ffbf462a05e026051efae044b69
+    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4566944
+    Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
+    Auto-Submit: Tomasz Śniatowski <tomasz.sniatowski@xperi.com>
+    Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
+    Cr-Commit-Position: refs/heads/main@{#1149138}
+
+diff --git a/ui/qt/BUILD.gn b/ui/qt/BUILD.gn
+index 6a67961edc2f7..89fffcf3089f9 100644
+--- a/ui/qt/BUILD.gn
++++ b/ui/qt/BUILD.gn
+@@ -5,6 +5,7 @@
+ import("//build/config/chromecast_build.gni")
+ import("//build/config/linux/pkg_config.gni")
+ import("//build/config/sysroot.gni")
++import("//printing/buildflags/buildflags.gni")
+ import("//ui/qt/qt.gni")
+ 
+ assert(use_qt)
+@@ -127,6 +128,9 @@ component("qt") {
+     "//ui/views",
+   ]
+   public_deps = [ "//skia" ]
++  if (enable_printing) {
++    public_deps += [ "//printing" ]
++  }
+ 
+   sources = [
+     "qt_ui.cc",

chromium-114-qt_enable_AllowQt_feature_flag.patch

@@ -0,0 +1,12 @@
+diff -up chromium-114.0.5735.106/ui/linux/linux_ui_factory.cc.me chromium-114.0.5735.106/ui/linux/linux_ui_factory.cc
+--- chromium-114.0.5735.106/ui/linux/linux_ui_factory.cc.me	2023-06-11 18:47:09.742886578 +0200
++++ chromium-114.0.5735.106/ui/linux/linux_ui_factory.cc	2023-06-11 18:48:42.231584886 +0200
+@@ -127,7 +127,7 @@ LinuxUiAndTheme* GetDefaultLinuxUiAndThe
+ 
+ }  // namespace
+ 
+-BASE_FEATURE(kAllowQt, "AllowQt", base::FEATURE_DISABLED_BY_DEFAULT);
++BASE_FEATURE(kAllowQt, "AllowQt", base::FEATURE_ENABLED_BY_DEFAULT);
+ 
+ LinuxUi* GetDefaultLinuxUi() {
+   auto* linux_ui = GetDefaultLinuxUiAndTheme();

chromium-114-qt_logical_scale_factor.patch

@@ -0,0 +1,59 @@
+commit ff39a278ddccf61716a7dbcb575415801bbf8ded
+Author: Tom Anderson <thomasanderson@chromium.org>
+Date:   Wed May 31 18:31:09 2023 +0000
+
+    [QT] Account for logical scale factor
+    
+    Previously we were only using the device pixel ratio.  But QT UI
+    scales with both the device pixel ratio and the logical DPI.  This CL
+    sets Chrome's scale factor to be the product of these two.
+    
+    R=thestig
+    CC=jkummerow
+    
+    Change-Id: I9bd414046058e741450fabae4913d47a16ca48c3
+    Bug: 1439149
+    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4575572
+    Reviewed-by: Lei Zhang <thestig@chromium.org>
+    Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
+    Cr-Commit-Position: refs/heads/main@{#1151380}
+
+diff --git a/ui/qt/qt_shim.cc b/ui/qt/qt_shim.cc
+index 0aec9c3aed4ad..3780f8c3988b4 100644
+--- a/ui/qt/qt_shim.cc
++++ b/ui/qt/qt_shim.cc
+@@ -7,7 +7,7 @@
+ 
+ #include "ui/qt/qt_shim.h"
+ 
+-#include <stdio.h>
++#include <cmath>
+ 
+ #include <QApplication>
+ #include <QFont>
+@@ -219,7 +219,24 @@ QtShim::QtShim(QtInterface::Delegate* delegate, int* argc, char** argv)
+ QtShim::~QtShim() = default;
+ 
+ double QtShim::GetScaleFactor() const {
+-  return app_.devicePixelRatio();
++  constexpr double kDefaultPixelDpi = 96.0;
++  // Use the largest scale factor across all displays as the global scale
++  // factor.  This matches the behavior of `app_.devicePixelRatio()`, except
++  // this also takes into account the logical DPI.
++  // TODO(https://crbug.com/1450301): Unlike GTK, QT supports per-display
++  // scaling. Use this instead of the max scale factor.
++  double scale = 0.0;
++  for (QScreen* screen : app_.screens()) {
++    scale =
++        std::max(scale, screen->devicePixelRatio() *
++                            screen->logicalDotsPerInch() / kDefaultPixelDpi);
++  }
++  // Round to the nearest 16th so that UI can losslessly multiply and divide
++  // by the scale factor using floating point arithmetic.  GtkUi also rounds
++  // in this way, but to 1/64th.  1/16th is chosen here since that's what
++  // KDE settings uses.
++  scale = std::round(scale * 16) / 16;
++  return scale > 0 ? scale : 1.0;
+ }
+ 
+ FontRenderParams QtShim::GetFontRenderParams() const {

chromium-114-revert-av1enc-el9.patch

@@ -0,0 +1,87 @@
+diff -up chromium-114.0.5735.35/media/gpu/vaapi/vaapi_video_encode_accelerator.cc.me chromium-114.0.5735.35/media/gpu/vaapi/vaapi_video_encode_accelerator.cc
+--- chromium-114.0.5735.35/media/gpu/vaapi/vaapi_video_encode_accelerator.cc.me	2023-05-21 10:05:00.357860329 +0200
++++ chromium-114.0.5735.35/media/gpu/vaapi/vaapi_video_encode_accelerator.cc	2023-05-21 10:18:09.665432735 +0200
+@@ -41,7 +41,6 @@
+ #include "media/gpu/gpu_video_encode_accelerator_helpers.h"
+ #include "media/gpu/h264_dpb.h"
+ #include "media/gpu/macros.h"
+-#include "media/gpu/vaapi/av1_vaapi_video_encoder_delegate.h"
+ #include "media/gpu/vaapi/h264_vaapi_video_encoder_delegate.h"
+ #include "media/gpu/vaapi/va_surface.h"
+ #include "media/gpu/vaapi/vaapi_common.h"
+@@ -200,7 +199,7 @@ bool VaapiVideoEncodeAccelerator::Initia
+ 
+   const VideoCodec codec = VideoCodecProfileToVideoCodec(config.output_profile);
+   if (codec != VideoCodec::kH264 && codec != VideoCodec::kVP8 &&
+-      codec != VideoCodec::kVP9 && codec != VideoCodec::kAV1) {
++      codec != VideoCodec::kVP9) {
+     MEDIA_LOG(ERROR, media_log.get())
+         << "Unsupported profile: " << GetProfileName(config.output_profile);
+     return false;
+@@ -293,7 +292,6 @@ void VaapiVideoEncodeAccelerator::Initia
+         break;
+       case VideoCodec::kVP8:
+       case VideoCodec::kVP9:
+-      case VideoCodec::kAV1:
+         mode = VaapiWrapper::kEncodeConstantQuantizationParameter;
+         break;
+       default:
+@@ -356,12 +354,6 @@ void VaapiVideoEncodeAccelerator::Initia
+             vaapi_wrapper_, error_cb);
+       }
+       break;
+-    case VideoCodec::kAV1:
+-      if (!IsConfiguredForTesting()) {
+-        encoder_ = std::make_unique<AV1VaapiVideoEncoderDelegate>(
+-            vaapi_wrapper_, error_cb);
+-      }
+-      break;
+     default:
+       NOTREACHED() << "Unsupported codec type " << GetCodecName(output_codec_);
+       return;
+@@ -835,10 +827,6 @@ VaapiVideoEncodeAccelerator::CreateEncod
+     case VideoCodec::kVP9:
+       picture = new VaapiVP9Picture(std::move(reconstructed_surface));
+       break;
+-    case VideoCodec::kAV1:
+-      picture = new VaapiAV1Picture(/*display_va_surface=*/nullptr,
+-                                    std::move(reconstructed_surface));
+-      break;
+     default:
+       return nullptr;
+   }
+diff -up chromium-114.0.5735.35/media/gpu/BUILD.gn.revert-av1enc chromium-114.0.5735.35/media/gpu/BUILD.gn
+--- chromium-114.0.5735.35/media/gpu/BUILD.gn.revert-av1enc	2023-05-18 00:37:57.000000000 +0200
++++ chromium-114.0.5735.35/media/gpu/BUILD.gn	2023-05-20 13:14:10.755183630 +0200
+@@ -373,10 +373,7 @@ source_set("common") {
+       "vp9_svc_layers.h",
+     ]
+     configs += [ "//third_party/libvpx:libvpx_config" ]
+-    deps += [
+-      "//third_party/libaom:libaomrc",
+-      "//third_party/libvpx:libvpxrc",
+-    ]
++    deps += [ "//third_party/libvpx:libvpxrc" ]
+   }
+   if (use_libgav1_parser) {
+     sources += [
+diff -up chromium-114.0.5735.35/media/gpu/vaapi/BUILD.gn.revert-av1enc chromium-114.0.5735.35/media/gpu/vaapi/BUILD.gn
+--- chromium-114.0.5735.35/media/gpu/vaapi/BUILD.gn.revert-av1enc	2023-05-18 00:37:57.000000000 +0200
++++ chromium-114.0.5735.35/media/gpu/vaapi/BUILD.gn	2023-05-20 13:14:10.756183626 +0200
+@@ -38,8 +38,6 @@ source_set("vaapi") {
+   sources = [
+     "av1_vaapi_video_decoder_delegate.cc",
+     "av1_vaapi_video_decoder_delegate.h",
+-    "av1_vaapi_video_encoder_delegate.cc",
+-    "av1_vaapi_video_encoder_delegate.h",
+     "h264_vaapi_video_decoder_delegate.cc",
+     "h264_vaapi_video_decoder_delegate.h",
+     "h264_vaapi_video_encoder_delegate.cc",
+@@ -107,7 +105,6 @@ source_set("vaapi") {
+     "//media/gpu/chromeos:common",
+     "//media/parsers",
+     "//mojo/public/cpp/bindings",
+-    "//third_party/libaom:libaomrc",
+     "//third_party/libvpx:libvpxrc",
+     "//third_party/libyuv",
+     "//ui/gfx",

chromium-114-typename.patch

@@ -0,0 +1,62 @@
+diff -up chromium-113.0.5672.63/chrome/browser/download/bubble/download_bubble_update_service.cc.me chromium-113.0.5672.63/chrome/browser/download/bubble/download_bubble_update_service.cc
+--- chromium-113.0.5672.63/chrome/browser/download/bubble/download_bubble_update_service.cc.me	2023-05-03 17:46:37.194000834 +0200
++++ chromium-113.0.5672.63/chrome/browser/download/bubble/download_bubble_update_service.cc	2023-05-03 17:48:05.170317575 +0200
+@@ -87,7 +87,7 @@ ItemSortKey GetSortKey(const Item& item)
+ // Helper to get an iterator to the last element in the cache. The cache
+ // must not be empty.
+ template <typename Item>
+-SortedItems<Item>::iterator GetLastIter(SortedItems<Item>& cache) {
++typename SortedItems<Item>::iterator GetLastIter(SortedItems<Item>& cache) {
+   CHECK(!cache.empty());
+   auto it = cache.end();
+   return std::prev(it);
+@@ -789,9 +789,9 @@ bool DownloadBubbleUpdateService::Remove
+ }
+ 
+ template <typename Id, typename Item>
+-SortedItems<Item>::iterator
++typename SortedItems<Item>::iterator
+ DownloadBubbleUpdateService::RemoveItemFromCacheByIter(
+-    SortedItems<Item>::iterator iter,
++    typename SortedItems<Item>::iterator iter,
+     SortedItems<Item>& cache,
+     IterMap<Id, Item>& iter_map) {
+   CHECK(iter != cache.end());
+diff -up chromium-113.0.5672.63/chrome/browser/download/bubble/download_bubble_update_service.h.me chromium-113.0.5672.63/chrome/browser/download/bubble/download_bubble_update_service.h
+--- chromium-113.0.5672.63/chrome/browser/download/bubble/download_bubble_update_service.h.me	2023-05-03 17:48:14.079551820 +0200
++++ chromium-113.0.5672.63/chrome/browser/download/bubble/download_bubble_update_service.h	2023-05-03 17:49:24.702387180 +0200
+@@ -208,8 +208,8 @@ class DownloadBubbleUpdateService
+ 
+   // Removes item if we already have the iterator to it. Returns next iterator.
+   template <typename Id, typename Item>
+-  SortedItems<Item>::iterator RemoveItemFromCacheByIter(
+-      SortedItems<Item>::iterator iter,
++  typename SortedItems<Item>::iterator RemoveItemFromCacheByIter(
++      typename SortedItems<Item>::iterator iter,
+       SortedItems<Item>& cache,
+       IterMap<Id, Item>& iter_map);
+ 
+diff -up chromium-114.0.5735.26/chrome/browser/printing/print_backend_service_manager.h.me chromium-114.0.5735.26/chrome/browser/printing/print_backend_service_manager.h
+--- chromium-114.0.5735.26/chrome/browser/printing/print_backend_service_manager.h.me	2023-05-14 00:03:48.455961696 +0200
++++ chromium-114.0.5735.26/chrome/browser/printing/print_backend_service_manager.h	2023-05-14 00:04:24.776589164 +0200
+@@ -587,7 +587,7 @@ class PrintBackendServiceManager {
+   template <class... T>
+   void RunSavedCallbacks(RemoteSavedCallbacks<T...>& saved_callbacks,
+                          const RemoteId& remote_id,
+-                         std::remove_reference<T>::type... result);
++                         typename std::remove_reference<T>::type... result);
+ 
+   // Test support for client ID management.
+   static void SetClientsForTesting(
+diff -up chromium-114.0.5735.26/chrome/browser/printing/print_backend_service_manager.cc.me chromium-114.0.5735.26/chrome/browser/printing/print_backend_service_manager.cc
+--- chromium-114.0.5735.26/chrome/browser/printing/print_backend_service_manager.cc.me	2023-05-14 12:40:29.555926646 +0200
++++ chromium-114.0.5735.26/chrome/browser/printing/print_backend_service_manager.cc	2023-05-14 12:41:12.150471791 +0200
+@@ -1477,7 +1477,7 @@ template <class... T>
+ void PrintBackendServiceManager::RunSavedCallbacks(
+     RemoteSavedCallbacks<T...>& saved_callbacks,
+     const RemoteId& remote_id,
+-    std::remove_reference<T>::type... result) {
++    typename std::remove_reference<T>::type... result) {
+   auto found_callbacks_map = saved_callbacks.find(remote_id);
+   if (found_callbacks_map == saved_callbacks.end())
+     return;  // No callbacks to run.

chromium-114-wireless-el7.patch

@@ -0,0 +1,22 @@
+diff -up chromium-114.0.5735.26/sandbox/policy/linux/bpf_network_policy_linux.cc.me chromium-114.0.5735.26/sandbox/policy/linux/bpf_network_policy_linux.cc
+--- chromium-114.0.5735.26/sandbox/policy/linux/bpf_network_policy_linux.cc.me	2023-05-13 12:09:44.423727385 +0200
++++ chromium-114.0.5735.26/sandbox/policy/linux/bpf_network_policy_linux.cc	2023-05-13 17:52:19.934347246 +0200
+@@ -11,7 +11,6 @@
+ #include <linux/net.h>
+ #include <linux/netlink.h>
+ #include <linux/sockios.h>
+-#include <linux/wireless.h>
+ #include <netinet/in.h>
+ #include <netinet/tcp.h>
+ #include <sys/inotify.h>
+@@ -48,6 +47,10 @@ using sandbox::syscall_broker::BrokerPro
+ #define F2FS_IOC_GET_FEATURES _IOR(0xf5, 12, uint32_t)
+ #endif
+ 
++#if !defined(SIOCGIWNAME)
++#define SIOCGIWNAME  0x8B01
++#endif
++
+ namespace sandbox::policy {
+ 
+ namespace {

chromium-114-workaround_clang_bug-structured_binding.patch

@@ -0,0 +1,81 @@
+diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
+--- chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding	2023-05-11 03:36:27.000000000 +0200
++++ chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc	2023-05-14 11:49:42.558129164 +0200
+@@ -238,7 +238,10 @@ const NGLayoutResult* NGGridLayoutAlgori
+                               : BuildGridSizingTree(&oof_children);
+ 
+   LayoutUnit intrinsic_block_size;
+-  auto& [grid_items, layout_data, tree_size] = grid_sizing_tree.TreeRootData();
++  auto& [g_i, l_d, t_s] = grid_sizing_tree.TreeRootData();
++  auto& grid_items = g_i;
++  auto& layout_data = l_d;
++  auto& tree_size = t_s;
+ 
+   if (IsBreakInside(BreakToken())) {
+     // TODO(layout-dev): When we support variable inline-size fragments we'll
+@@ -520,8 +523,10 @@ wtf_size_t NGGridLayoutAlgorithm::BuildG
+                                 row_auto_repetitions);
+ 
+   bool has_nested_subgrid = false;
+-  auto& [grid_items, layout_data, subtree_size] =
+-      sizing_tree->CreateSizingData(opt_subgrid_data);
++  auto& [g_i, l_d, s_s] = sizing_tree->CreateSizingData(opt_subgrid_data);
++  auto& grid_items = g_i;
++  auto& layout_data = l_d;
++  auto& subtree_size = s_s;
+ 
+   if (!must_ignore_children) {
+     // Construct grid items that are not subgridded.
+@@ -650,8 +655,10 @@ NGGridSizingTree NGGridLayoutAlgorithm::
+   NGGridSizingTree sizing_tree;
+ 
+   if (const auto* layout_subtree = ConstraintSpace().GridLayoutSubtree()) {
+-    auto& [grid_items, layout_data, subtree_size] =
+-        sizing_tree.CreateSizingData();
++    auto& [g_i, l_d, s_s] = sizing_tree.CreateSizingData();
++    auto& grid_items = g_i;
++    auto& layout_data = l_d;
++    auto& subtree_size = s_s;
+ 
+     const auto& node = Node();
+     grid_items =
+@@ -1640,8 +1647,10 @@ void NGGridLayoutAlgorithm::InitializeTr
+     const absl::optional<GridTrackSizingDirection>& opt_track_direction) const {
+   DCHECK(sizing_subtree);
+ 
+-  auto& [grid_items, layout_data, subtree_size] =
+-      sizing_subtree.SubtreeRootData();
++  auto& [g_i, l_d, s_s] = sizing_subtree.SubtreeRootData();
++  auto& grid_items = g_i;
++  auto& layout_data = l_d;
++  auto& subtree_size = s_s;
+ 
+   auto InitAndCacheTrackSizes = [&](GridTrackSizingDirection track_direction) {
+     InitializeTrackCollection(opt_subgrid_data, track_direction, &layout_data);
+@@ -1825,8 +1834,10 @@ void NGGridLayoutAlgorithm::CompleteTrac
+     bool* opt_needs_additional_pass) const {
+   DCHECK(sizing_subtree);
+ 
+-  auto& [grid_items, layout_data, subtree_size] =
+-      sizing_subtree.SubtreeRootData();
++  auto& [g_i, l_d, s_s] = sizing_subtree.SubtreeRootData();
++  auto& grid_items = g_i;
++  auto& layout_data = l_d;
++  auto& subtree_size = s_s;
+ 
+   const bool is_for_columns = track_direction == kForColumns;
+   const bool has_non_definite_track =
+diff -up chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc.me chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc
+--- chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc.me	2023-05-14 17:35:00.446844465 +0200
++++ chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc	2023-05-14 17:39:22.991733926 +0200
+@@ -94,7 +94,9 @@ void CdmPromiseAdapter::RejectPromise(ui
+ void CdmPromiseAdapter::Clear(ClearReason reason) {
+   // Reject all outstanding promises.
+   DCHECK(thread_checker_.CalledOnValidThread());
+-  for (auto& [promise_id, promise] : promises_) {
++  for (auto& [p_i, p_e] : promises_) {
++    auto& promise_id = p_i;
++    auto& promise = p_e;
+     TRACE_EVENT_NESTABLE_ASYNC_END1(
+         "media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise_id),
+         "status", "cleared");

chromium-45.0.2454.101-linux-path-max.patch

@@ -1,44 +0,0 @@
-diff -up chromium-45.0.2454.101/native_client_sdk/src/libraries/nacl_io/path.h.pathmax chromium-45.0.2454.101/native_client_sdk/src/libraries/nacl_io/path.h
---- chromium-45.0.2454.101/native_client_sdk/src/libraries/nacl_io/path.h.pathmax	2015-10-07 11:26:11.813477839 -0400
-+++ chromium-45.0.2454.101/native_client_sdk/src/libraries/nacl_io/path.h	2015-10-07 11:26:40.845845054 -0400
-@@ -12,6 +12,11 @@
- 
- #include "sdk_util/macros.h"
- 
-+/* Needed for PATH_MAX */
-+#ifndef PATH_MAX
-+#define PATH_MAX 4096
-+#endif
-+
- namespace nacl_io {
- 
- class Path {
-diff -up chromium-45.0.2454.101/native_client/src/untrusted/nacl/getcwd.c.pathmax chromium-45.0.2454.101/native_client/src/untrusted/nacl/getcwd.c
---- chromium-45.0.2454.101/native_client/src/untrusted/nacl/getcwd.c.pathmax	2015-08-22 15:02:08.000000000 -0400
-+++ chromium-45.0.2454.101/native_client/src/untrusted/nacl/getcwd.c	2015-10-07 10:58:56.172018783 -0400
-@@ -11,6 +11,10 @@
- 
- #include <errno.h>
- #include <limits.h>
-+/* Needed for PATH_MAX */
-+#ifndef PATH_MAX
-+#define PATH_MAX 4096
-+#endif
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-diff -up chromium-45.0.2454.101/native_client_sdk/src/libraries/nacl_io/syscalls/realpath.c.pathmax chromium-45.0.2454.101/native_client_sdk/src/libraries/nacl_io/syscalls/realpath.c
---- chromium-45.0.2454.101/native_client_sdk/src/libraries/nacl_io/syscalls/realpath.c.pathmax	2015-10-09 10:57:38.424348662 -0400
-+++ chromium-45.0.2454.101/native_client_sdk/src/libraries/nacl_io/syscalls/realpath.c	2015-10-09 10:57:51.541059938 -0400
-@@ -13,6 +13,11 @@
- 
- #include "sdk_util/macros.h"
- 
-+/* Needed for PATH_MAX */
-+#ifndef PATH_MAX
-+#define PATH_MAX 4096
-+#endif
-+
- EXTERN_C_BEGIN
- 
- #if defined(__native_client__)

chromium-46.0.2490.71-notest.patch

@@ -1,11 +0,0 @@
-diff -up chromium-46.0.2490.71/chrome/test/data/webui_test_resources.grd.notest chromium-46.0.2490.71/chrome/test/data/webui_test_resources.grd
---- chromium-46.0.2490.71/chrome/test/data/webui_test_resources.grd.notest	2015-10-16 02:01:56.644149741 -0400
-+++ chromium-46.0.2490.71/chrome/test/data/webui_test_resources.grd	2015-10-16 02:02:36.217285227 -0400
-@@ -8,7 +8,6 @@
-   </outputs>
-   <release seq="1">
-     <includes>
--      <include name="IDR_WEBUI_TEST_I18N_PROCESS_CSS_TEST" file="webui/i18n_process_css_test.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
-     </includes>
-   </release>
- </grit>

chromium-47.0.2526.80-nacl-ignore-broken-fd-counter.patch

@@ -1,27 +0,0 @@
-diff -up chromium-47.0.2526.80/components/nacl/loader/sandbox_linux/nacl_sandbox_linux.cc.ignore-fd-count chromium-47.0.2526.80/components/nacl/loader/sandbox_linux/nacl_sandbox_linux.cc
---- chromium-47.0.2526.80/components/nacl/loader/sandbox_linux/nacl_sandbox_linux.cc.ignore-fd-count	2015-12-15 14:48:07.119011866 -0500
-+++ chromium-47.0.2526.80/components/nacl/loader/sandbox_linux/nacl_sandbox_linux.cc	2015-12-15 14:48:14.151850055 -0500
-@@ -153,6 +153,14 @@ void NaClSandbox::InitializeLayerOneSand
- }
- 
- void NaClSandbox::CheckForExpectedNumberOfOpenFds() {
-+  // Whatever logic this code is using is wrong more often than it is right.
-+  // If you set expected_num_fds to 6, it finds 7.
-+  // If you set expected_num_fds to 7, it finds 6.
-+  // Code like this makes a packager drink. And not the good stuff either.
-+  // Instead, we're just going to smile and tell it to never care about the
-+  // number of FDs open. Stupid code. We hates it.
-+
-+#if 0  
-   // We expect to have the following FDs open:
-   //  1-3) stdin, stdout, stderr.
-   //  4) The /dev/urandom FD used by base::GetUrandomFD().
-@@ -171,6 +179,8 @@ void NaClSandbox::CheckForExpectedNumber
-   }
- 
-   CHECK_EQ(expected_num_fds, sandbox::ProcUtil::CountOpenFds(proc_fd_.get()));
-+#endif
-+
- }
- 
- void NaClSandbox::InitializeLayerTwoSandbox(bool uses_nonsfi_mode) {

chromium-47.0.2526.80-pnacl-fgnu-inline-asm.patch

@@ -1,11 +0,0 @@
-diff -up chromium-47.0.2526.80/native_client/build/untrusted.gypi.fixme chromium-47.0.2526.80/native_client/build/untrusted.gypi
---- chromium-47.0.2526.80/native_client/build/untrusted.gypi.fixme	2015-12-09 11:54:27.584962337 -0500
-+++ chromium-47.0.2526.80/native_client/build/untrusted.gypi	2015-12-09 11:54:45.033571750 -0500
-@@ -1564,6 +1564,7 @@
-         '-Wno-char-subscripts',
-         '-Wno-unused-function',
-         '-std=gnu++11',
-+        '-fgnu-inline-asm',
-       ],
-       'native_irt_compile_flags': [
-         # IRT compile/link flags to make the binary smaller.

chromium-48.0.2564.116-libusb_interrupt_event_handler.patch

@@ -1,15 +0,0 @@
-diff -up chromium-48.0.2564.116/device/usb/usb_context.cc.modern-libusbx chromium-48.0.2564.116/device/usb/usb_context.cc
---- chromium-48.0.2564.116/device/usb/usb_context.cc.modern-libusbx	2016-02-24 10:21:10.534996028 -0500
-+++ chromium-48.0.2564.116/device/usb/usb_context.cc	2016-02-24 10:22:28.270499864 -0500
-@@ -57,7 +57,11 @@ void UsbContext::UsbEventHandler::Run()
- 
- void UsbContext::UsbEventHandler::Stop() {
-   base::subtle::Release_Store(&running_, 0);
-+#ifdef LIBUSB_API_VERSION >= 0x01000105
-+  libusb_interrupt_event_handler(context_);
-+#else
-   libusb_interrupt_handle_event(context_);
-+#endif
- }
- 
- UsbContext::UsbContext(PlatformUsbContext context) : context_(context) {

chromium-52.0.2743.116-unset-madv_free.patch

@@ -1,15 +0,0 @@
-diff -up chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp.madv_free chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp
---- chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp.madv_free	2016-08-15 13:07:29.279655676 -0400
-+++ chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp	2016-08-15 13:08:38.447317416 -0400
-@@ -41,6 +41,11 @@
- #include <errno.h>
- #include <sys/mman.h>
- 
-+#if OS(LINUX) && defined(MADV_FREE)
-+// Added in Linux 4.5, but it breaks the sandbox.
-+#undef MADV_FREE
-+#endif
-+
- #ifndef MADV_FREE
- #define MADV_FREE MADV_DONTNEED
- #endif

chromium-52.0.2743.82-arm-webrtc.patch

@@ -1,51 +0,0 @@
-diff -up chromium-52.0.2743.82/third_party/webrtc/system_wrappers/source/cpu_features.cc.armwebrtc chromium-52.0.2743.82/third_party/webrtc/system_wrappers/source/cpu_features.cc
---- chromium-52.0.2743.82/third_party/webrtc/system_wrappers/source/cpu_features.cc.armwebrtc	2016-08-03 09:30:53.922861020 +0200
-+++ chromium-52.0.2743.82/third_party/webrtc/system_wrappers/source/cpu_features.cc	2016-08-03 09:32:00.337498174 +0200
-@@ -18,6 +18,47 @@
- 
- #include "webrtc/typedefs.h"
- 
-+#include <elf.h>
-+#ifdef __arm__
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include <linux/auxvec.h>
-+#include <asm/hwcap.h>
-+#endif
-+
-+#ifdef __arm__
-+uint64_t WebRtc_GetCPUFeaturesARM() {
-+	static bool detected = false;
-+	static uint64_t have_neon = 0;
-+
-+	int fd;
-+	Elf32_auxv_t auxv;
-+	unsigned int hwcaps;
-+
-+	if (!detected) {
-+		int fd;
-+		Elf32_auxv_t auxv;
-+		unsigned int hwcaps;
-+
-+		fd = open("/proc/self/auxv", O_RDONLY);
-+		if (fd >= 0) {
-+			while (read(fd, &auxv, sizeof(Elf32_auxv_t)) == sizeof(Elf32_auxv_t)) {
-+				if (auxv.a_type == AT_HWCAP) {
-+					have_neon = (auxv.a_un.a_val & HWCAP_NEON) ? kCPUFeatureNEON : 0;
-+					break;
-+				}
-+			}
-+			close (fd);
-+		} else {
-+			have_neon = 0;
-+		}
-+		detected = true;
-+	}
-+
-+	return 0 | have_neon; // others here as we need them
-+}
-+#endif
-+
- // No CPU feature is available => straight C path.
- int GetCPUInfoNoASM(CPUFeature feature) {
-   (void)feature;

chromium-52.0.2743.82-master-prefs-path.patch

@@ -1,15 +0,0 @@
-diff -up chromium-52.0.2743.82/chrome/browser/first_run/first_run_internal_linux.cc.etc chromium-52.0.2743.82/chrome/browser/first_run/first_run_internal_linux.cc
---- chromium-52.0.2743.82/chrome/browser/first_run/first_run_internal_linux.cc.etc	2016-08-03 10:15:57.980692109 +0200
-+++ chromium-52.0.2743.82/chrome/browser/first_run/first_run_internal_linux.cc	2016-08-03 10:16:44.553325229 +0200
-@@ -19,9 +19,9 @@ bool IsOrganicFirstRun() {
- 
- base::FilePath MasterPrefsPath() {
-   // The standard location of the master prefs is next to the chrome binary.
-+  // ...but we patch it to use /etc/chromium
-   base::FilePath master_prefs;
--  if (!PathService::Get(base::DIR_EXE, &master_prefs))
--    return base::FilePath();
-+  master_prefs = base::FilePath("/etc/chromium");
-   return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
- }
- 

chromium-53.0.2785.92-boringssl-time-fix.patch

@@ -1,11 +0,0 @@
-diff -up chromium-53.0.2785.92/third_party/boringssl/src/crypto/x509/by_dir.c.timefix chromium-53.0.2785.92/third_party/boringssl/src/crypto/x509/by_dir.c
---- chromium-53.0.2785.92/third_party/boringssl/src/crypto/x509/by_dir.c.timefix	2016-09-06 15:20:06.094396255 -0400
-+++ chromium-53.0.2785.92/third_party/boringssl/src/crypto/x509/by_dir.c	2016-09-06 15:20:16.893187930 -0400
-@@ -56,6 +56,7 @@
-  * [including the GNU Public Licence.] */
- 
- #include <string.h>
-+#include <time.h>
- #include <sys/stat.h>
- #include <sys/types.h>
- 

chromium-54.0.2840.59-jpeg-include-dir.patch

@@ -1,11 +0,0 @@
-diff -up chromium-54.0.2840.59/third_party/BUILD.gn.jpegfix chromium-54.0.2840.59/third_party/BUILD.gn
---- chromium-54.0.2840.59/third_party/BUILD.gn.jpegfix	2016-10-17 11:45:44.995340495 -0400
-+++ chromium-54.0.2840.59/third_party/BUILD.gn	2016-10-17 11:46:35.254289872 -0400
-@@ -20,6 +20,7 @@ declare_args() {
- config("system_libjpeg_config") {
-   libs = [ "jpeg" ]
-   defines = [ "USE_SYSTEM_LIBJPEG" ]
-+  include_dirs = [ "/usr/include/" ]
- }
- 
- config("libjpeg_turbo_config") {

chromium-55.0.2883.75-addrfix.patch

@@ -1,11 +0,0 @@
-diff -up chromium-55.0.2883.75/third_party/boringssl/BUILD.gn.addrfix chromium-55.0.2883.75/third_party/boringssl/BUILD.gn
---- chromium-55.0.2883.75/third_party/boringssl/BUILD.gn.addrfix	2016-12-12 15:30:27.727834891 -0500
-+++ chromium-55.0.2883.75/third_party/boringssl/BUILD.gn	2016-12-12 15:30:53.095709352 -0500
-@@ -24,6 +24,7 @@ config("internal_config") {
-     "BORINGSSL_IMPLEMENTATION",
-     "BORINGSSL_NO_STATIC_INITIALIZER",
-     "OPENSSL_SMALL",
-+    "_POSIX_C_SOURCE=200112L",
-   ]
-   configs = [
-     # TODO(davidben): Fix size_t truncations in BoringSSL.

chromium-55.0.2883.75-cups22.patch

@@ -1,29 +0,0 @@
-diff -up chromium-52.0.2743.82/printing/backend/print_backend_cups.cc.cups22 chromium-52.0.2743.82/printing/backend/print_backend_cups.cc
---- chromium-52.0.2743.82/printing/backend/print_backend_cups.cc.cups22	2016-07-22 09:20:15.794340886 -0400
-+++ chromium-52.0.2743.82/printing/backend/print_backend_cups.cc	2016-07-22 09:20:26.338261197 -0400
-@@ -16,6 +16,7 @@
- #include "base/synchronization/lock.h"
- #include "base/values.h"
- #include "printing/backend/cups_helper.h"
-+#include <cups/ppd.h>
- #include "printing/backend/print_backend_consts.h"
- #include "url/gurl.h"
- 
-diff -up chromium-52.0.2743.82/printing/BUILD.gn.cups22 chromium-52.0.2743.82/printing/BUILD.gn
---- chromium-52.0.2743.82/printing/BUILD.gn.cups22	2016-07-21 11:27:05.597507544 -0400
-+++ chromium-52.0.2743.82/printing/BUILD.gn	2016-07-21 14:36:45.574137758 -0400
-@@ -147,12 +147,13 @@ component("printing") {
-                                  ],
-                                  "trim string")
- 
--      if (cups_version == "1.6" || cups_version == "1.7") {
-+      if (cups_version == "1.6" || cups_version == "1.7" || cups_version == "2.2") {
-         cflags += [
-           # CUPS 1.6 deprecated the PPD APIs, but we will stay with this
-           # API for now as supported Linux and Mac OS'es are still using
-           # older versions of CUPS. More info: crbug.com/226176
-           "-Wno-deprecated-declarations",
-+          "-D_PPD_DEPRECATED=",
-           # CUPS 1.7 deprecates httpConnectEncrypt(), see the mac section
-           # below.
-         ]

chromium-55.0.2883.75-sandbox-pie.patch

@@ -1,30 +0,0 @@
-diff -up chromium-55.0.2883.75/sandbox/linux/BUILD.gn.sandboxpie chromium-55.0.2883.75/sandbox/linux/BUILD.gn
---- chromium-55.0.2883.75/sandbox/linux/BUILD.gn.sandboxpie	2016-12-01 18:02:17.000000000 -0500
-+++ chromium-55.0.2883.75/sandbox/linux/BUILD.gn	2016-12-12 16:26:06.863426221 -0500
-@@ -279,11 +279,17 @@ if (is_linux) {
-       # For ULLONG_MAX
-       "-std=gnu99",
- 
-+      "-fPIE",
-+
-       # These files have a suspicious comparison.
-       # TODO fix this and re-enable this warning.
-       "-Wno-sign-compare",
-     ]
- 
-+    ldflags = [
-+      "-pie",
-+    ]
-+
-     import("//build/config/compiler/compiler.gni")
-     import("//build/config/sanitizers/sanitizers.gni")
-     if (is_component_build || using_sanitizer) {
-@@ -293,7 +299,7 @@ if (is_linux) {
-       # other flags that executable_config might have.
-       configs -= [ "//build/config:executable_config" ]
-       if (!use_gold) {
--        ldflags = [ "-Wl,--disable-new-dtags" ]
-+        ldflags += [ "-Wl,--disable-new-dtags" ]
-       }
-     }
- 

chromium-56.0.2924.87-fpermissive.patch

@@ -1,13 +0,0 @@
-diff -up chromium-56.0.2924.87/third_party/WebKit/Source/BUILD.gn.permissive chromium-56.0.2924.87/third_party/WebKit/Source/BUILD.gn
---- chromium-56.0.2924.87/third_party/WebKit/Source/BUILD.gn.permissive	2017-02-13 12:32:23.419665971 -0500
-+++ chromium-56.0.2924.87/third_party/WebKit/Source/BUILD.gn	2017-02-13 12:33:16.146629190 -0500
-@@ -54,6 +54,9 @@ config("config") {
-   cflags = []
-   defines = []
- 
-+  # error: there are no arguments to 'swapAnchor' that depend on a template parameter, so a declaration of 'swapAnchor' must be available [-fpermissive]
-+  cflags += [ "-fpermissive" ]
-+
-   if (is_win) {
-     cflags += [
-       "/wd4305",  # Truncation from 'type1' to 'type2'.

chromium-56.0.2924.87-gcc5.patch

@@ -1,354 +0,0 @@
-diff -up chromium-56.0.2924.87/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc.gcc5 chromium-56.0.2924.87/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc
---- chromium-56.0.2924.87/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc.gcc5	2017-02-01 21:03:47.000000000 -0500
-+++ chromium-56.0.2924.87/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc	2017-02-09 10:38:38.319790897 -0500
-@@ -165,8 +165,8 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
- // state[16 + 2] 0x000000 Byte 2 of 3 (relative offsets)
- X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__,
- X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__,
---14,-14,-14,-14,-14,-14,-14,-14, -14,-14,-14,-14,-14,-14,-14,-14,
---14,-14,-14,-14,-14,-14,-14,-14, -14,-14,-14,-14,-14,-14,-14,-14,
-+(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14, (uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,
-+(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14, (uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,
- 
- // state[17 + 2] 0x0031c0 Byte 3 of 3 (property)
-   0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,  0,  0,  0,  0,
-@@ -259,10 +259,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
- 229,229,229,  3,208,  0,229,  5, 233,  0,229,229,229,208,229,229,
- 
- // state[32 + 2] 0x002000 Byte 2 of 3 (relative offsets)
---30,-30,-30,-30,-30,-30,-30,-30, -30,-30,-30,-30,-30,-30,-30,-30,
---30,-30,-30,-30,-30,-30,-30,-30, -30,-30,-30,-30,-30,-30,-30,-30,
---30,-30,-30,-30,-30,-30,-30,-30, -30,-30,-30,-30,-30,-30,-30,-30,
---30,-30,-30,-30,-30,-30,-30,-30, -30,-30,-30,-30,-30,-30,-30,-30,
-+(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30, (uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,
-+(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30, (uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,
-+(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30, (uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,
-+(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30, (uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,
- 
- // state[33 + 2] 0x003780 Byte 3 of 3 (property)
- 229,208,229,229,208,229,229,229, 208,208,208,208,208,  4,  6,208,
-@@ -355,10 +355,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
- 228,229,229,229,229,233,233,  6, 208,229,  3,229,233,  6,  6,  0,
- 
- // state[48 + 2] 0x001000 Byte 2 of 3 (relative offsets)
---46,-46,-46,-46,-42,-41,-40,-39, -46,-46,-46,-46,-46,-46,-46,-46,
---46,-46,-46,-46,-46,-46,-46,-46, -46,-46,-46,-46,-46,-46,-46,-46,
---46,-46,-46,-46,-46,-46,-46,-46, -46,-46,-46,-46,-46,-46,-46,-46,
---46,-46,-46,-46,-46,-46,-46,-46, -46,-46,-46,-46,-46,-46,-46,-46,
-+(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-42,(uint8)-41,(uint8)-40,(uint8)-39, (uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,
-+(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46, (uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,
-+(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46, (uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,
-+(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46, (uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,
- 
- // state[49 + 2] 0x003b40 Byte 3 of 3 (property)
-   6,227,208,233,208,  3,  3,208, 208,229,  0,229,233,219,  0,  6,
-@@ -451,10 +451,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
- 229,208,208,208,217,208,229,229, 229,229,208,217,208,229,229,229,
- 
- // state[64 + 2] 0x003000 Byte 2 of 3 (relative offsets)
---54,-53,-52,-51,-50,-58,-49,-47, -62,-62,-62,-62,-62,-62,-62,-62,
---46,-45,-44,-43,-42,-41,-40,-39, -38,-37,-36,-35,-34,-33,-31,-30,
---29,-28,-27,-26,-25,-24,-23,-22, -21,-20,-19,-18,-17,-15,-14,-13,
---12,-11,-10, -9, -8, -7, -6, -5,  -4, -3, -2, -1,  1,  2,  3,  4,
-+(uint8)-54,(uint8)-53,(uint8)-52,(uint8)-51,(uint8)-50,(uint8)-58,(uint8)-49,(uint8)-47, (uint8)-62,(uint8)-62,(uint8)-62,(uint8)-62,(uint8)-62,(uint8)-62,(uint8)-62,(uint8)-62,
-+(uint8)-46,(uint8)-45,(uint8)-44,(uint8)-43,(uint8)-42,(uint8)-41,(uint8)-40,(uint8)-39, (uint8)-38,(uint8)-37,(uint8)-36,(uint8)-35,(uint8)-34,(uint8)-33,(uint8)-31,(uint8)-30,
-+(uint8)-29,(uint8)-28,(uint8)-27,(uint8)-26,(uint8)-25,(uint8)-24,(uint8)-23,(uint8)-22, (uint8)-21,(uint8)-20,(uint8)-19,(uint8)-18,(uint8)-17,(uint8)-15,(uint8)-14,(uint8)-13,
-+(uint8)-12,(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5,  (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,  1,  2,  3,  4,
- 
- // state[65 + 2] 0x003f00 Byte 3 of 3 (property)
- 217,217,208,  3,208,217,208,208,   6,229,208,228,229,229,208,229,
-@@ -547,10 +547,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
- 229,208,229,229,208,229,233,  0, 208,208,229,208,227,229,229,229,
- 
- // state[80 + 2] 0x004000 Byte 2 of 3 (relative offsets)
---11,-10, -9, -8, -7, -6, -5, -4,  -3, -2, -1,  1,  2,  3,  4,  5,
-+(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4,  (uint8)-3, (uint8)-2, (uint8)-1,  1,  2,  3,  4,  5,
-   6,  7,  8,  9, 10, 11, 12, 13,  14, 15, 16, 17, 18, 19, 20, 21,
-  22, 23, 24, 25, 26, 27, 28, 29,  30, 31, 32, 33, 34, 35, 36, 37,
-- 38, 39, 40, 41, 42, 43, 44,-78,  45, 46, 47, 48, 49, 50, 51, 52,
-+ 38, 39, 40, 41, 42, 43, 44,(uint8)-78,  45, 46, 47, 48, 49, 50, 51, 52,
- 
- // state[81 + 2] 0x0042c0 Byte 3 of 3 (property)
- 229,  0,229,229,229,  3,  4,  4, 229,229,229,229,208,229,  0,208,
-@@ -931,7 +931,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
-   0,142, 98, 28,117,206,212,212, 220, 15,  0,231,199,231,111, 28,
- 
- // state[144 + 2] 0x005000 Byte 2 of 3 (relative offsets)
---11,-10, -9, -8, -7, -6, -5, -4,  -3, -2, -1,  1,  2,  3,  4,  5,
-+(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4,  (uint8)-3, (uint8)-2, (uint8)-1,  1,  2,  3,  4,  5,
-   6,  7,  8,  9, 10, 11, 12, 13,  14, 15, 16, 17, 18, 19, 20, 21,
-  22, 23, 24, 25, 26, 27, 28, 29,  30, 31, 32, 33, 34, 35, 36, 37,
-  38, 39, 40, 41, 42, 43, 44, 45,  46, 47, 48, 49, 50, 51, 52, 53,
-@@ -1315,7 +1315,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
-  16, 15,211,118,  0,231, 68,231,   0, 99,161,  0,115,221,144,140,
- 
- // state[208 + 2] 0x006000 Byte 2 of 3 (relative offsets)
---10, -9, -8, -7, -6, -5, -4, -3,  -2, -1,  1,  2,  3,  4,  5,  6,
-+(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3,  (uint8)-2, (uint8)-1,  1,  2,  3,  4,  5,  6,
-   7,  8,  9, 10, 11, 12, 13, 14,  15, 16, 17, 18, 19, 20, 21, 22,
-  23, 24, 25, 26, 27, 28, 29, 30,  31, 32, 33, 34, 35, 36, 37, 38,
-  39, 40, 41, 42, 43, 44, 45, 46,  47, 48, 49, 50, 51, 52, 53, 54,
-@@ -1699,7 +1699,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
- 119, 16, 51,  0,  0, 68,136, 72, 144,118, 87,201,191,136, 78,233,
- 
- // state[272 + 2] 0x007000 Byte 2 of 3 (relative offsets)
-- -9, -8, -7, -6, -5, -4, -3, -2,  -1,  1,  2,  3,  4,  5,  6,  7,
-+ (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2,  (uint8)-1,  1,  2,  3,  4,  5,  6,  7,
-   8,  9, 10, 11, 12, 13, 14, 15,  16, 17, 18, 19, 20, 21, 22, 23,
-  24, 25, 26, 27, 28, 29, 30, 31,  32, 33, 34, 35, 36, 37, 38, 39,
-  40, 41, 42, 43, 44, 45, 46, 47,  48, 49, 50, 51, 52, 53, 54, 55,
-@@ -2083,7 +2083,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
- 212,212,  0,126,140,220,220,  0,   0,  0,127,118,106,  0,199,  0,
- 
- // state[336 + 2] 0x008000 Byte 2 of 3 (relative offsets)
-- -8, -7, -6, -5, -4, -3, -2, -1,   1,  2,  3,  4,  5,  6,  7,  8,
-+ (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,   1,  2,  3,  4,  5,  6,  7,  8,
-   9, 10, 11, 12, 13, 14, 15, 16,  17, 18, 19, 20, 21, 22, 23, 24,
-  25, 26, 27, 28, 29, 30, 31, 32,  33, 34, 35, 36, 37, 38, 39, 40,
-  41, 42, 43, 44, 45, 46, 47, 48,  49, 50, 51, 52, 53, 54, 55, 56,
-@@ -2467,7 +2467,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
-   0,122,  0,231,100,232,  0,  0, 117,  0,206,231,  0,  0,231,  0,
- 
- // state[400 + 2] 0x009000 Byte 2 of 3 (relative offsets)
-- -7, -6, -5, -4, -3, -2, -1,  1,   2,  3,  4,  5,  6,  7,  8,  9,
-+ (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,  1,   2,  3,  4,  5,  6,  7,  8,  9,
-  10, 11, 12, 13, 14, 15, 16, 17,  18, 19, 20, 21, 22, 23, 24, 25,
-  26, 27, 28, 29, 30, 31, 32, 33,  34, 35, 36, 37, 38, 39, 40, 41,
-  42, 43, 44, 45, 46, 47, 48, 49,  50, 51, 52, 53, 54, 55, 56, 57,
-@@ -2851,10 +2851,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
-   0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,  0,  0,  0,  0,
- 
- // state[464 + 2] 0x00a000 Byte 2 of 3 (relative offsets)
-- -6, -6, -6, -6, -6, -6, -6, -6,  -6, -6, -6, -6, -6, -6, -6, -6,
-- -6, -6, -6, -6, -6, -6, -6, -6,  -6, -6, -6, -6, -6, -6, -6, -6,
-- -6, -6, -6, -6, -6, -6, -6, -6,  -6, -6, -6, -6, -6, -6, -6, -6,
-- -5, -5, -5, -5, -5, -5, -5, -5,  -5, -5, -5, -5, -5, -5, -5, -5,
-+ (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6,  (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6,
-+ (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6,  (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6,
-+ (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6,  (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6,
-+ (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5,  (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5,
- 
- // state[465 + 2] 0x000080 Byte 2 of 2 (property)
-   0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,  0,  0,  0,  0,
-@@ -2947,10 +2947,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
- 208,208,208,208,  5,  6,208,  2,   0,  6,  6,  5,208,208,208,  6,
- 
- // state[480 + 2] 0x00b000 Byte 2 of 3 (relative offsets)
---20,-20,-20,-20,-20,-20,-20,-20, -20,-20,-20,-20,-20,-20,-20,-20,
---20,-20,-20,-20,-20,-20,-20,-20, -20,-20,-20,-20,-20,-20,-20,-20,
---20,-20,-20,-20,-20,-20,-20,-20, -20,-20,-20,-20,-20,-20,-20,-20,
---20,-20,-20,-20,-20,-20,-20,-20, -20,-20,-20,-20,-20,-20,-20,-20,
-+(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20, (uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,
-+(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20, (uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,
-+(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20, (uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,
-+(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20, (uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,
- 
- // state[481 + 2] 0x020100 Byte 4 of 4 (property)
-   2,  6,  5,  6,  5,229,  5,208, 208,208,208,208,208,208,208,229,
-@@ -3043,10 +3043,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
- 208,208,  5,  5,  5,208,208,  2, 229,  5,  5,  5,  5,  5,  6,208,
- 
- // state[496 + 2] 0x00d000 Byte 2 of 3 (relative offsets)
---35,-35,-35,-35,-35,-35,-35,-35, -35,-35,-35,-35,-35,-35,-35,-35,
---35,-35,-35,-35,-35,-35,-35,-35, -35,-35,-35,-35,-35,-35,-34,-33,
---33,-33,-33,-33,-33,-33,-33,-33, -33,-33,-33,-33,-33,-33,-33,-33,
---33,-33,-33,-33,-33,-33,-33,-33, -33,-33,-33,-33,-33,-33,-33,-33,
-+(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35, (uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,
-+(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35, (uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-34,(uint8)-33,
-+(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33, (uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,
-+(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33, (uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,
- 
- // state[497 + 2] 0x0204c0 Byte 4 of 4 (property)
-   2,  2,  5,  5,  5,  2,208,  2,   5,  5,  6,208,208,  5,  5,  5,
-@@ -3139,10 +3139,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
- 208,208,  5,  5,  5,  5,  6,  6, 208,208,  2,208,208,208,208,208,
- 
- // state[512 + 2] 0x00f000 Byte 2 of 3 (relative offsets)
---47,-47,-47,-47,-47,-47,-47,-47, -47,-47,-47,-47,-47,-47,-47,-47,
---47,-47,-47,-47,-47,-47,-47,-47, -47,-47,-47,-47,-47,-47,-47,-47,
---47,-47,-47,-47,-46,-45,-44,-43, -42,-41,-44,-40,-47,-47,-47,-47,
---47,-47,-47,-47,-47,-47,-47,-47, -47,-47,-47,-47,-47,-39,-38,-37,
-+(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47, (uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,
-+(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47, (uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,
-+(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-46,(uint8)-45,(uint8)-44,(uint8)-43, (uint8)-42,(uint8)-41,(uint8)-44,(uint8)-40,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,
-+(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47, (uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-39,(uint8)-38,(uint8)-37,
- 
- // state[513 + 2] 0x020880 Byte 4 of 4 (property)
-   5,  5,  5,  6,208,208,208,208, 208,208,  5,  5,  6,  6,208,208,
-@@ -3235,10 +3235,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
-   5,  6,208,218,208,208,208,218, 208,  6,227,229,  6,  6,  6,208,
- 
- // state[528 + 2] 0x020000 Byte 3 of 4 (relative offsets)
---52,-51,-50,-49,-47,-46,-45,-44, -43,-42,-41,-40,-39,-38,-37,-36,
---35,-34,-33,-31,-30,-29,-28,-27, -26,-25,-24,-23,-22,-21,-20,-19,
---18,-17,-15,-14,-13,-12,-11,-10,  -9, -8, -7, -6, -5, -4, -3, -2,
-- -1,  1,  2,  3,  4,  5,  6,  7,   8,  9, 10, 11, 12, 13, 14, 15,
-+(uint8)-52,(uint8)-51,(uint8)-50,(uint8)-49,(uint8)-47,(uint8)-46,(uint8)-45,(uint8)-44, (uint8)-43,(uint8)-42,(uint8)-41,(uint8)-40,(uint8)-39,(uint8)-38,(uint8)-37,(uint8)-36,
-+(uint8)-35,(uint8)-34,(uint8)-33,(uint8)-31,(uint8)-30,(uint8)-29,(uint8)-28,(uint8)-27, (uint8)-26,(uint8)-25,(uint8)-24,(uint8)-23,(uint8)-22,(uint8)-21,(uint8)-20,(uint8)-19,
-+(uint8)-18,(uint8)-17,(uint8)-15,(uint8)-14,(uint8)-13,(uint8)-12,(uint8)-11,(uint8)-10,  (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2,
-+ (uint8)-1,  1,  2,  3,  4,  5,  6,  7,   8,  9, 10, 11, 12, 13, 14, 15,
- 
- // state[529 + 2] 0x020c40 Byte 4 of 4 (property)
- 227,  5,  5,  5,  2,  2,  2,  2, 213,  2,  2,  2,  2,  2,208,  6,
-@@ -3427,7 +3427,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
- 208,208,208,208,208,208,208,208, 208,  6,  6,  6,  6,  2,  5,  5,
- 
- // state[560 + 2] 0x021000 Byte 3 of 4 (relative offsets)
---16,-15,-14,-13,-12,-11,-10, -9,  -8, -7, -6, -5, -4, -3, -2, -1,
-+(uint8)-16,(uint8)-15,(uint8)-14,(uint8)-13,(uint8)-12,(uint8)-11,(uint8)-10, (uint8)-9,  (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,
-   1,  2,  3,  4,  5,  6,  7,  8,   9, 10, 11, 12, 13, 14, 15, 16,
-  17, 18, 19, 20, 21, 22, 23, 24,  25, 26, 27, 28, 29, 30, 31, 32,
-  33, 34, 35, 36, 37, 38, 39, 40,  41, 42, 43, 44, 45, 46, 47, 48,
-@@ -3811,7 +3811,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
-   5,  5,  5,  6,  6,  6,  5,208, 208,229,208,208,  5,  5,  5,  5,
- 
- // state[624 + 2] 0x022000 Byte 3 of 4 (relative offsets)
---15,-14,-13,-12,-11,-10, -9, -8,  -7, -6, -5, -4, -3, -2, -1,  1,
-+(uint8)-15,(uint8)-14,(uint8)-13,(uint8)-12,(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8,  (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,  1,
-   2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17,
-  18, 19, 20, 21, 22, 23, 24, 25,  26, 27, 28, 29, 30, 31, 32, 33,
-  34, 35, 36, 37, 38, 39, 40, 41,  42, 43, 44, 45, 46, 47, 48, 49,
-@@ -4195,7 +4195,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
-   6,  6,  4,  5,208,208,208,208, 208,208,229,  6,  5,  6,  6,  6,
- 
- // state[688 + 2] 0x023000 Byte 3 of 4 (relative offsets)
---14,-13,-12,-11,-10, -9, -8, -7,  -6, -5, -4, -3, -2, -1,  1,  2,
-+(uint8)-14,(uint8)-13,(uint8)-12,(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7,  (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,  1,  2,
-   3,  4,  5,  6,  7,  8,  9, 10,  11, 12, 13, 14, 15, 16, 17, 18,
-  19, 20, 21, 22, 23, 24, 25, 26,  27, 28, 29, 30, 31, 32, 33, 34,
-  35, 36, 37, 38, 39, 40, 41, 42,  43, 44, 45, 46, 47, 48, 49, 50,
-@@ -4579,7 +4579,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
-   5,  5,  5,  5,  5,  5,  5,  6, 208,208,208,208,208,208,  6,  6,
- 
- // state[752 + 2] 0x024000 Byte 3 of 4 (relative offsets)
---13,-12,-11,-10, -9, -8, -7, -6,  -5, -4, -3, -2, -1,  1,  2,  3,
-+(uint8)-13,(uint8)-12,(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6,  (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,  1,  2,  3,
-   4,  5,  6,  7,  8,  9, 10, 11,  12, 13, 14, 15, 16, 17, 18, 19,
-  20, 21, 22, 23, 24, 25, 26, 27,  28, 29, 30, 31, 32, 33, 34, 35,
-  36, 37, 38, 39, 40, 41, 42, 43,  44, 45, 46, 47, 48, 49, 50, 51,
-@@ -4963,7 +4963,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
- 229,  6,  2,  2,  2,  2,  2,  2,   2,  2,  2,  5,  2,  2,  6,229,
- 
- // state[816 + 2] 0x025000 Byte 3 of 4 (relative offsets)
---12,-11,-10, -9, -8, -7, -6, -5,  -4, -3, -2, -1,  1,  2,  3,  4,
-+(uint8)-12,(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5,  (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,  1,  2,  3,  4,
-   5,  6,  7,  8,  9, 10, 11, 12,  13, 14, 15, 16, 17, 18, 19, 20,
-  21, 22, 23, 24, 25, 26, 27, 28,  29, 30, 31, 32, 33, 34, 35, 36,
-  37, 38, 39, 40, 41, 42, 43, 44,  45, 46, 47, 48, 49, 50, 51, 52,
-@@ -5347,7 +5347,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
-   6,  6,  6,  5,  5,  5,  5,  6,   6,  6,  3,  6,229,208,208,229,
- 
- // state[880 + 2] 0x026000 Byte 3 of 4 (relative offsets)
---11,-10, -9, -8, -7, -6, -5, -4,  -3, -2, -1,  1,  2,  3,  4,  5,
-+(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4,  (uint8)-3, (uint8)-2, (uint8)-1,  1,  2,  3,  4,  5,
-   6,  7,  8,  9, 10, 11, 12, 13,  14, 15, 16, 17, 18, 19, 20, 21,
-  22, 23, 24, 25, 26, 27, 28, 29,  30, 31, 32, 33, 34, 35, 36, 37,
-  38, 39, 40, 41, 42, 43, 44, 45,  46, 47, 48, 49, 50, 51, 52, 53,
-@@ -5731,7 +5731,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
- 208,  6,  6,208,208,208,208,208,   6,  6,  6,216,  5,  5,  5,  5,
- 
- // state[944 + 2] 0x027000 Byte 3 of 4 (relative offsets)
---10, -9, -8, -7, -6, -5, -4, -3,  -2, -1,  1,  2,  3,  4,  5,  6,
-+(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3,  (uint8)-2, (uint8)-1,  1,  2,  3,  4,  5,  6,
-   7,  8,  9, 10, 11, 12, 13, 14,  15, 16, 17, 18, 19, 20, 21, 22,
-  23, 24, 25, 26, 27, 28, 29, 30,  31, 32, 33, 34, 35, 36, 37, 38,
-  39, 40, 41, 42, 43, 44, 45, 46,  47, 48, 49, 50, 51, 52, 53, 54,
-@@ -6115,7 +6115,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
-   5,  5,  5,  6,208,208,  6,  6, 208,229,208,208,208,  5,  5,  5,
- 
- // state[1008 + 2] 0x028000 Byte 3 of 4 (relative offsets)
-- -9, -8, -7, -6, -5, -4, -3, -2,  -1,  1,  2,  3,  4,  5,  6,  7,
-+ (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2,  (uint8)-1,  1,  2,  3,  4,  5,  6,  7,
-   8,  9, 10, 11, 12, 13, 14, 15,  16, 17, 18, 19, 20, 21, 22, 23,
-  24, 25, 26, 27, 28, 29, 30, 31,  32, 33, 34, 35, 36, 37, 38, 39,
-  40, 41, 42, 43, 44, 45, 46, 47,  48, 49, 50, 51, 52, 53, 54, 55,
-@@ -6499,7 +6499,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
- 208,208,  5,  5,  6,208,208,  5, 208,208,208,  6,208,  6,208,208,
- 
- // state[1072 + 2] 0x029000 Byte 3 of 4 (relative offsets)
-- -8, -7, -6, -5, -4, -3, -2, -1,   1,  2,  3,  4,  5,  6,  7,  8,
-+ (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,   1,  2,  3,  4,  5,  6,  7,  8,
-   9, 10, 11, 12, 13, 14, 15, 16,  17, 18, 19, 20, 21, 22, 23, 24,
-  25, 26, 27, 28, 29, 30, 31, 32,  33, 34, 35, 36, 37, 38, 39, 40,
-  41, 42, 43, 44, 45, 46, 47, 48,  49, 50, 51, 52, 53, 54, 55, 56,
-@@ -6883,7 +6883,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
- 229,229,229,229,208,208,208,229, 208,208,208,229,  0,229,208,208,
- 
- // state[1136 + 2] 0x02a000 Byte 3 of 4 (relative offsets)
-- -7, -6, -5, -4, -3, -2, -1,  1,   2,  3,  4,  5,  6,  7,  8,  9,
-+ (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,  1,   2,  3,  4,  5,  6,  7,  8,  9,
-  10, 11, 12, 13, 14, 15, 16, 17,  18, 19, 20, 21, 22, 22, 22, 22,
-  22, 22, 22, 22, 22, 22, 22, 22,  22, 22, 22, 22, 22, 22, 22, 22,
-  22, 22, 22, 22, 22, 22, 22, 22,  22, 22, 22, 22, 22, 22, 22, 22,
-@@ -7075,10 +7075,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
-   5,  5,  5,  5,  5,  5,  5,  5,   5,  5,  5,  5,  5,  5,  5,  5,
- 
- // state[1168 + 2] 0x02f000 Byte 3 of 4 (relative offsets)
-- -9, -9, -9, -9, -9, -9, -9, -9,  -9, -9, -9, -9, -9, -9, -9, -9,
-- -9, -9, -9, -9, -9, -9, -9, -9,  -9, -9, -9, -9, -9, -9, -9, -9,
-- -8, -7, -6, -5, -4, -3, -2, -1,   1, -9, -9, -9, -9, -9, -9, -9,
-- -9, -9, -9, -9, -9, -9, -9, -9,  -9, -9, -9, -9, -9, -9, -9, -9,
-+ (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9,  (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9,
-+ (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9,  (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9,
-+ (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,   1, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9,
-+ (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9,  (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9,
- 
- // state[1169 + 2] 0x02fa00 Byte 4 of 4 (property)
- 217,  5,  5,  5,  5,  5,  5,  5,   5,  5,  5,  5,  5,217,  5,  5,
-diff -up chromium-56.0.2924.87/third_party/webgl/src/specs/latest/2.0/webgl2.idl.gcc5 chromium-56.0.2924.87/third_party/webgl/src/specs/latest/2.0/webgl2.idl
---- chromium-56.0.2924.87/third_party/webgl/src/specs/latest/2.0/webgl2.idl.gcc5	2017-02-01 21:03:57.000000000 -0500
-+++ chromium-56.0.2924.87/third_party/webgl/src/specs/latest/2.0/webgl2.idl	2017-02-09 10:38:38.380789675 -0500
-@@ -265,7 +265,7 @@ interface WebGL2RenderingContextBase
-   const GLenum UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES          = 0x8A43;
-   const GLenum UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER     = 0x8A44;
-   const GLenum UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER   = 0x8A46;
--  const GLenum INVALID_INDEX                                 = 0xFFFFFFFF;
-+  const GLenum INVALID_INDEX                                 = 256;
-   const GLenum MAX_VERTEX_OUTPUT_COMPONENTS                  = 0x9122;
-   const GLenum MAX_FRAGMENT_INPUT_COMPONENTS                 = 0x9125;
-   const GLenum MAX_SERVER_WAIT_TIMEOUT                       = 0x9111;
-diff -up chromium-56.0.2924.87/third_party/WebKit/Source/core/dom/NodeFilter.h.gcc5 chromium-56.0.2924.87/third_party/WebKit/Source/core/dom/NodeFilter.h
---- chromium-56.0.2924.87/third_party/WebKit/Source/core/dom/NodeFilter.h.gcc5	2017-02-01 21:03:09.000000000 -0500
-+++ chromium-56.0.2924.87/third_party/WebKit/Source/core/dom/NodeFilter.h	2017-02-09 10:38:38.387789535 -0500
-@@ -49,7 +49,7 @@ class NodeFilter final : public GarbageC
-      * to the value of NodeType for the equivalent node type.
-      */
-   enum {
--    kShowAll = 0xFFFFFFFF,
-+    kShowAll = 256 /* 0xFFFFFFFF */,
-     kShowElement = 0x00000001,
-     kShowAttribute = 0x00000002,
-     kShowText = 0x00000004,
-diff -up chromium-56.0.2924.87/third_party/WebKit/Source/core/dom/NodeFilter.idl.gcc5 chromium-56.0.2924.87/third_party/WebKit/Source/core/dom/NodeFilter.idl
---- chromium-56.0.2924.87/third_party/WebKit/Source/core/dom/NodeFilter.idl.gcc5	2017-02-01 21:03:09.000000000 -0500
-+++ chromium-56.0.2924.87/third_party/WebKit/Source/core/dom/NodeFilter.idl	2017-02-09 10:38:38.394789395 -0500
-@@ -30,7 +30,7 @@
-     const unsigned short FILTER_SKIP = 3;
- 
-     // Constants for whatToShow
--    const unsigned long SHOW_ALL = 0xFFFFFFFF;
-+    const unsigned long SHOW_ALL = 256; // 0xFFFFFFFF
-     const unsigned long SHOW_ELEMENT = 0x1;
-     const unsigned long SHOW_ATTRIBUTE = 0x2; // historical
-     const unsigned long SHOW_TEXT = 0x4;
-diff -up chromium-56.0.2924.87/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl.gcc5 chromium-56.0.2924.87/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl
---- chromium-56.0.2924.87/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl.gcc5	2017-02-01 21:03:09.000000000 -0500
-+++ chromium-56.0.2924.87/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl	2017-02-09 11:07:32.828682863 -0500
-@@ -239,7 +239,7 @@ typedef unsigned long long GLuint64;
-     const GLenum UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES          = 0x8A43;
-     const GLenum UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER     = 0x8A44;
-     const GLenum UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER   = 0x8A46;
--    const GLenum INVALID_INDEX                                 = 0xFFFFFFFF;
-+    const GLenum INVALID_INDEX                                 = 256;
-     const GLenum MAX_VERTEX_OUTPUT_COMPONENTS                  = 0x9122;
-     const GLenum MAX_FRAGMENT_INPUT_COMPONENTS                 = 0x9125;
-     const GLenum MAX_SERVER_WAIT_TIMEOUT                       = 0x9111;
-@@ -269,7 +269,7 @@ typedef unsigned long long GLuint64;
-     const GLenum TEXTURE_IMMUTABLE_FORMAT                      = 0x912F;
-     const GLenum MAX_ELEMENT_INDEX                             = 0x8D6B;
-     const GLenum TEXTURE_IMMUTABLE_LEVELS                      = 0x82DF;
--    const GLint TIMEOUT_IGNORED                                = -1;
-+    const GLint TIMEOUT_IGNORED                                = 256;
- 
-     /* WebGL-specific enums */
-     const GLenum MAX_CLIENT_WAIT_TIMEOUT_WEBGL                 = 0x9247;

chromium-58.0.3029.96-revert-b794998819088f76b4cf44c8db6940240c563cf4.patch

@@ -1,19 +0,0 @@
-diff -up chromium-58.0.3029.96/ui/events/devices/x11/device_data_manager_x11.cc.revert chromium-58.0.3029.96/ui/events/devices/x11/device_data_manager_x11.cc
---- chromium-58.0.3029.96/ui/events/devices/x11/device_data_manager_x11.cc.revert	2017-05-08 14:58:11.767482431 -0400
-+++ chromium-58.0.3029.96/ui/events/devices/x11/device_data_manager_x11.cc	2017-05-08 14:58:37.722960109 -0400
-@@ -790,15 +790,6 @@ void DeviceDataManagerX11::UpdateScrollC
-   DCHECK(deviceid >= 0 && deviceid < kMaxDeviceNum);
-   ScrollInfo& info = scroll_data_[deviceid];
- 
--  bool legacy_scroll_available =
--      (scroll_class_info->flags & XIScrollFlagNoEmulation) == 0;
--  // If the device's highest resolution is lower than the resolution of xinput1
--  // then use xinput1's events instead (ie. don't configure smooth scrolling).
--  if (legacy_scroll_available &&
--      std::abs(scroll_class_info->increment) <= 1.0) {
--    return;
--  }
--
-   switch (scroll_class_info->scroll_type) {
-     case XIScrollTypeVertical:
-       info.vertical.number = scroll_class_info->number;

chromium-59.0.3071.115-ucontext-fix.patch

@@ -1,214 +0,0 @@
-diff -up chromium-59.0.3071.115/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc.ucontextfix chromium-59.0.3071.115/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
---- chromium-59.0.3071.115/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc.ucontextfix	2017-07-12 15:23:33.019591380 -0400
-+++ chromium-59.0.3071.115/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc	2017-07-12 15:32:52.069197546 -0400
-@@ -36,19 +36,19 @@ namespace google_breakpad {
- 
- // Minidump defines register structures which are different from the raw
- // structures which we get from the kernel. These are platform specific
--// functions to juggle the ucontext and user structures into minidump format.
-+// functions to juggle the ucontext_t and user structures into minidump format.
- 
- #if defined(__i386__)
- 
--uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
-   return uc->uc_mcontext.gregs[REG_ESP];
- }
- 
--uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
-   return uc->uc_mcontext.gregs[REG_EIP];
- }
- 
--void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
-+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
-                                     const struct _libc_fpstate* fp) {
-   const greg_t* regs = uc->uc_mcontext.gregs;
- 
-@@ -88,15 +88,15 @@ void UContextReader::FillCPUContext(RawC
- 
- #elif defined(__x86_64)
- 
--uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
-   return uc->uc_mcontext.gregs[REG_RSP];
- }
- 
--uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
-   return uc->uc_mcontext.gregs[REG_RIP];
- }
- 
--void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
-+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
-                                     const struct _libc_fpstate* fpregs) {
-   const greg_t* regs = uc->uc_mcontext.gregs;
- 
-@@ -145,15 +145,15 @@ void UContextReader::FillCPUContext(RawC
- 
- #elif defined(__ARM_EABI__)
- 
--uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
-   return uc->uc_mcontext.arm_sp;
- }
- 
--uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
-   return uc->uc_mcontext.arm_pc;
- }
- 
--void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
-+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
-   out->context_flags = MD_CONTEXT_ARM_FULL;
- 
-   out->iregs[0] = uc->uc_mcontext.arm_r0;
-@@ -184,15 +184,15 @@ void UContextReader::FillCPUContext(RawC
- 
- #elif defined(__aarch64__)
- 
--uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
-   return uc->uc_mcontext.sp;
- }
- 
--uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
-   return uc->uc_mcontext.pc;
- }
- 
--void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
-+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
-                                     const struct fpsimd_context* fpregs) {
-   out->context_flags = MD_CONTEXT_ARM64_FULL;
- 
-@@ -210,15 +210,15 @@ void UContextReader::FillCPUContext(RawC
- 
- #elif defined(__mips__)
- 
--uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
-   return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP];
- }
- 
--uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
-   return uc->uc_mcontext.pc;
- }
- 
--void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
-+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
- #if _MIPS_SIM == _ABI64
-   out->context_flags = MD_CONTEXT_MIPS64_FULL;
- #elif _MIPS_SIM == _ABIO32
-diff -up chromium-59.0.3071.115/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h.ucontextfix chromium-59.0.3071.115/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
---- chromium-59.0.3071.115/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h.ucontextfix	2017-07-12 15:33:08.486806743 -0400
-+++ chromium-59.0.3071.115/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h	2017-07-12 15:33:57.299644808 -0400
-@@ -39,23 +39,23 @@
- 
- namespace google_breakpad {
- 
--// Wraps platform-dependent implementations of accessors to ucontext structs.
-+// Wraps platform-dependent implementations of accessors to ucontext_t structs.
- struct UContextReader {
--  static uintptr_t GetStackPointer(const struct ucontext* uc);
-+  static uintptr_t GetStackPointer(const ucontext_t* uc);
- 
--  static uintptr_t GetInstructionPointer(const struct ucontext* uc);
-+  static uintptr_t GetInstructionPointer(const ucontext_t* uc);
- 
--  // Juggle a arch-specific ucontext into a minidump format
-+  // Juggle a arch-specific ucontext_t into a minidump format
-   //   out: the minidump structure
-   //   info: the collection of register structures.
- #if defined(__i386__) || defined(__x86_64)
--  static void FillCPUContext(RawContextCPU *out, const ucontext *uc,
-+  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
-                              const struct _libc_fpstate* fp);
- #elif defined(__aarch64__)
--  static void FillCPUContext(RawContextCPU *out, const ucontext *uc,
-+  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
-                              const struct fpsimd_context* fpregs);
- #else
--  static void FillCPUContext(RawContextCPU *out, const ucontext *uc);
-+  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc);
- #endif
- };
- 
-diff -up chromium-59.0.3071.115/breakpad/src/client/linux/handler/exception_handler.cc.ucontextfix chromium-59.0.3071.115/breakpad/src/client/linux/handler/exception_handler.cc
---- chromium-59.0.3071.115/breakpad/src/client/linux/handler/exception_handler.cc.ucontextfix	2017-07-12 15:34:09.094364048 -0400
-+++ chromium-59.0.3071.115/breakpad/src/client/linux/handler/exception_handler.cc	2017-07-12 15:35:36.483283853 -0400
-@@ -439,9 +439,9 @@ bool ExceptionHandler::HandleSignal(int
-   // Fill in all the holes in the struct to make Valgrind happy.
-   memset(&g_crash_context_, 0, sizeof(g_crash_context_));
-   memcpy(&g_crash_context_.siginfo, info, sizeof(siginfo_t));
--  memcpy(&g_crash_context_.context, uc, sizeof(struct ucontext));
-+  memcpy(&g_crash_context_.context, uc, sizeof(ucontext_t));
- #if defined(__aarch64__)
--  struct ucontext* uc_ptr = (struct ucontext*)uc;
-+  ucontext_t* uc_ptr = (ucontext_t*)uc;
-   struct fpsimd_context* fp_ptr =
-       (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved;
-   if (fp_ptr->head.magic == FPSIMD_MAGIC) {
-@@ -450,9 +450,9 @@ bool ExceptionHandler::HandleSignal(int
-   }
- #elif !defined(__ARM_EABI__) && !defined(__mips__)
-   // FP state is not part of user ABI on ARM Linux.
--  // In case of MIPS Linux FP state is already part of struct ucontext
-+  // In case of MIPS Linux FP state is already part of ucontext_t
-   // and 'float_state' is not a member of CrashContext.
--  struct ucontext* uc_ptr = (struct ucontext*)uc;
-+  ucontext_t* uc_ptr = (ucontext_t*)uc;
-   if (uc_ptr->uc_mcontext.fpregs) {
-     memcpy(&g_crash_context_.float_state, uc_ptr->uc_mcontext.fpregs,
-            sizeof(g_crash_context_.float_state));
-@@ -476,7 +476,7 @@ bool ExceptionHandler::SimulateSignalDel
-   // ExceptionHandler::HandleSignal().
-   siginfo.si_code = SI_USER;
-   siginfo.si_pid = getpid();
--  struct ucontext context;
-+  ucontext_t context;
-   getcontext(&context);
-   return HandleSignal(sig, &siginfo, &context);
- }
-diff -up chromium-59.0.3071.115/breakpad/src/client/linux/handler/exception_handler.h.ucontextfix chromium-59.0.3071.115/breakpad/src/client/linux/handler/exception_handler.h
---- chromium-59.0.3071.115/breakpad/src/client/linux/handler/exception_handler.h.ucontextfix	2017-07-12 15:35:48.559996380 -0400
-+++ chromium-59.0.3071.115/breakpad/src/client/linux/handler/exception_handler.h	2017-07-12 15:36:32.615948562 -0400
-@@ -191,11 +191,11 @@ class ExceptionHandler {
-   struct CrashContext {
-     siginfo_t siginfo;
-     pid_t tid;  // the crashing thread.
--    struct ucontext context;
-+    ucontext_t context;
- #if !defined(__ARM_EABI__) && !defined(__mips__)
-     // #ifdef this out because FP state is not part of user ABI for Linux ARM.
-     // In case of MIPS Linux FP state is already part of struct
--    // ucontext so 'float_state' is not required.
-+    // ucontext_t so 'float_state' is not required.
-     fpstate_t float_state;
- #endif
-   };
-diff -up chromium-59.0.3071.115/breakpad/src/client/linux/microdump_writer/microdump_writer.cc.ucontextfix chromium-59.0.3071.115/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
---- chromium-59.0.3071.115/breakpad/src/client/linux/microdump_writer/microdump_writer.cc.ucontextfix	2017-07-12 15:37:26.232674196 -0400
-+++ chromium-59.0.3071.115/breakpad/src/client/linux/microdump_writer/microdump_writer.cc	2017-07-12 15:37:39.032369973 -0400
-@@ -579,7 +579,7 @@ class MicrodumpWriter {
- 
-   void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
- 
--  const struct ucontext* const ucontext_;
-+  const ucontext_t* const ucontext_;
- #if !defined(__ARM_EABI__) && !defined(__mips__)
-   const google_breakpad::fpstate_t* const float_state_;
- #endif
-diff -up chromium-59.0.3071.115/breakpad/src/client/linux/minidump_writer/minidump_writer.cc.ucontextfix chromium-59.0.3071.115/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
---- chromium-59.0.3071.115/breakpad/src/client/linux/minidump_writer/minidump_writer.cc.ucontextfix	2017-07-12 15:37:54.041013246 -0400
-+++ chromium-59.0.3071.115/breakpad/src/client/linux/minidump_writer/minidump_writer.cc	2017-07-12 15:38:19.600405748 -0400
-@@ -1323,7 +1323,7 @@ class MinidumpWriter {
-   const int fd_;  // File descriptor where the minidum should be written.
-   const char* path_;  // Path to the file where the minidum should be written.
- 
--  const struct ucontext* const ucontext_;  // also from the signal handler
-+  const ucontext_t* const ucontext_;  // also from the signal handler
- #if !defined(__ARM_EABI__) && !defined(__mips__)
-   const google_breakpad::fpstate_t* const float_state_;  // ditto
- #endif

chromium-59.0.3071.86-ffmpeg-stdatomic.patch

@@ -1,17 +0,0 @@
-diff -up chromium-59.0.3071.86/third_party/ffmpeg/libavutil/cpu.c.ffmpeg-stdatomic chromium-59.0.3071.86/third_party/ffmpeg/libavutil/cpu.c
---- chromium-59.0.3071.86/third_party/ffmpeg/libavutil/cpu.c.ffmpeg-stdatomic	2017-06-07 17:15:24.993945430 -0400
-+++ chromium-59.0.3071.86/third_party/ffmpeg/libavutil/cpu.c	2017-06-07 17:18:41.625997601 -0400
-@@ -17,7 +17,13 @@
-  */
- 
- #include <stdint.h>
-+// GCC 4.8 didn't have stdatomic, but was advertising it.
-+// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58016
-+#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ == 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ == 8)))
-+#include <compat/atomics/gcc/stdatomic.h>
-+#else
- #include <stdatomic.h>
-+#endif
- 
- #include "cpu.h"
- #include "cpu_internal.h"

chromium-59.0.3071.86-i686-ld-memory-tricks.patch

@@ -1,12 +0,0 @@
-diff -up chromium-59.0.3071.86/build/toolchain/linux/BUILD.gn.ldmemory chromium-59.0.3071.86/build/toolchain/linux/BUILD.gn
---- chromium-59.0.3071.86/build/toolchain/linux/BUILD.gn.ldmemory	2017-06-07 15:37:09.436616113 -0400
-+++ chromium-59.0.3071.86/build/toolchain/linux/BUILD.gn	2017-06-07 15:38:04.508519102 -0400
-@@ -93,7 +93,7 @@ gcc_toolchain("x86") {
-   nm = "nm"
-   ar = "ar"
-   ld = cxx
--  extra_cppflags = "-fno-delete-null-pointer-checks"
-+  extra_cppflags = "-fno-delete-null-pointer-checks -g1"
- 
-   # Output linker map files for binary size analysis.
-   enable_linker_map = true

chromium-59.0.3071.86-nullfix.patch

@@ -1,43 +0,0 @@
-diff -up chromium-59.0.3071.86/build/toolchain/linux/BUILD.gn.nullfix chromium-59.0.3071.86/build/toolchain/linux/BUILD.gn
---- chromium-59.0.3071.86/build/toolchain/linux/BUILD.gn.nullfix	2017-06-05 15:03:01.000000000 -0400
-+++ chromium-59.0.3071.86/build/toolchain/linux/BUILD.gn	2017-06-07 15:32:43.531911624 -0400
-@@ -31,6 +31,7 @@ gcc_toolchain("arm64") {
-   ld = cxx
-   readelf = "${toolprefix}readelf"
-   nm = "${toolprefix}nm"
-+  extra_cppflags = "-fno-delete-null-pointer-checks"
- 
-   toolchain_args = {
-     current_cpu = "arm64"
-@@ -49,6 +50,7 @@ gcc_toolchain("arm") {
-   ld = cxx
-   readelf = "${toolprefix}readelf"
-   nm = "${toolprefix}nm"
-+  extra_cppflags = "-fno-delete-null-pointer-checks"
- 
-   toolchain_args = {
-     current_cpu = "arm"
-@@ -91,6 +93,7 @@ gcc_toolchain("x86") {
-   nm = "nm"
-   ar = "ar"
-   ld = cxx
-+  extra_cppflags = "-fno-delete-null-pointer-checks"
- 
-   # Output linker map files for binary size analysis.
-   enable_linker_map = true
-@@ -136,6 +139,7 @@ gcc_toolchain("x64") {
-   nm = "nm"
-   ar = "ar"
-   ld = cxx
-+  extra_cppflags = "-fno-delete-null-pointer-checks"
- 
-   # Output linker map files for binary size analysis.
-   enable_linker_map = true
-@@ -161,6 +165,7 @@ gcc_toolchain("mipsel") {
-   ld = cxx
-   readelf = "mipsel-linux-gnu-readelf"
-   nm = "mipsel-linux-gnu-nm"
-+  extra_cppflags = "-fno-delete-null-pointer-checks"
- 
-   toolchain_args = {
-     cc_wrapper = ""

chromium-59.0.3071.86-system-clang.patch

@@ -1,10 +0,0 @@
-diff -up chromium-59.0.3071.86/build/config/clang/clang.gni.system-clang chromium-59.0.3071.86/build/config/clang/clang.gni
---- chromium-59.0.3071.86/build/config/clang/clang.gni.system-clang	2017-06-11 20:57:07.327949687 -0400
-+++ chromium-59.0.3071.86/build/config/clang/clang.gni	2017-06-11 20:57:24.085620826 -0400
-@@ -9,5 +9,5 @@ declare_args() {
-   # coding guidelines, etc. Only used when compiling with Clang.
-   clang_use_chrome_plugins = is_clang && !is_nacl && !use_xcode_clang
- 
--  clang_base_path = "//third_party/llvm-build/Release+Asserts"
-+  clang_base_path = "/usr"
- }

chromium-60.0.3112.113-libavutil-timer-include-path-fix.patch

@@ -1,21 +0,0 @@
-diff -up chromium-60.0.3112.113/third_party/ffmpeg/libavutil/timer.h.pathfix chromium-60.0.3112.113/third_party/ffmpeg/libavutil/timer.h
---- chromium-60.0.3112.113/third_party/ffmpeg/libavutil/timer.h.pathfix	2017-08-25 15:29:12.143242471 -0400
-+++ chromium-60.0.3112.113/third_party/ffmpeg/libavutil/timer.h	2017-08-25 15:29:36.941835865 -0400
-@@ -39,13 +39,13 @@
- #include "log.h"
- 
- #if   ARCH_AARCH64
--#   include "aarch64/timer.h"
-+#   include "libavutil/aarch64/timer.h"
- #elif ARCH_ARM
--#   include "arm/timer.h"
-+#   include "libavutil/arm/timer.h"
- #elif ARCH_PPC
--#   include "ppc/timer.h"
-+#   include "libavutil/ppc/timer.h"
- #elif ARCH_X86
--#   include "x86/timer.h"
-+#   include "libavutil/x86/timer.h"
- #endif
- 
- #if !defined(AV_READ_TIME)

chromium-60.0.3112.78-gn-system.patch

@@ -1,221 +0,0 @@
-diff -up chromium-60.0.3112.78/build/linux/unbundle/libjpeg.gn.gnsystem chromium-60.0.3112.78/build/linux/unbundle/libjpeg.gn
---- chromium-60.0.3112.78/build/linux/unbundle/libjpeg.gn.gnsystem	2017-07-25 15:04:48.000000000 -0400
-+++ chromium-60.0.3112.78/build/linux/unbundle/libjpeg.gn	2017-07-31 10:38:25.879951641 -0400
-@@ -16,6 +16,10 @@ source_set("libjpeg") {
-   libs = [ "jpeg" ]
- }
- 
-+config("system_libjpeg") {
-+  defines = [ "USE_SYSTEM_LIBJPEG=1" ]
-+}
-+
- source_set("simd") {
- }
- 
-diff -up chromium-60.0.3112.78/build/linux/unbundle/libusb.gn.gnsystem chromium-60.0.3112.78/build/linux/unbundle/libusb.gn
---- chromium-60.0.3112.78/build/linux/unbundle/libusb.gn.gnsystem	2017-07-31 10:38:25.880951622 -0400
-+++ chromium-60.0.3112.78/build/linux/unbundle/libusb.gn	2017-07-31 10:38:25.879951641 -0400
-@@ -0,0 +1,24 @@
-+# Copyright 2016 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/linux/pkg_config.gni")
-+import("//build/shim_headers.gni")
-+
-+pkg_config("system_libusb") {
-+  packages = [ "libusb-1.0" ]
-+}
-+
-+shim_headers("libusb_shim") {
-+  root_path = "src/libusb"
-+  headers = [
-+    "libusb.h",
-+  ]
-+}
-+
-+source_set("libusb") {
-+  deps = [
-+    ":libusb_shim",
-+  ]
-+  public_configs = [ ":system_libusb" ]
-+}
-diff -up chromium-60.0.3112.78/build/linux/unbundle/opus.gn.gnsystem chromium-60.0.3112.78/build/linux/unbundle/opus.gn
---- chromium-60.0.3112.78/build/linux/unbundle/opus.gn.gnsystem	2017-07-25 15:04:48.000000000 -0400
-+++ chromium-60.0.3112.78/build/linux/unbundle/opus.gn	2017-07-31 10:38:25.880951622 -0400
-@@ -1,3 +1,164 @@
-+# Copyright 2016 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/linux/pkg_config.gni")
-+import("//build/shim_headers.gni")
-+import("//testing/test.gni")
-+
-+pkg_config("system_opus") {
-+  packages = [ "opus" ]
-+}
-+
-+shim_headers("opus_shim") {
-+  root_path = "src/include"
-+  headers = [
-+    "opus_custom.h",
-+    "opus_defines.h",
-+    "opus_multistream.h",
-+    "opus_types.h",
-+    "opus.h",
-+  ]
-+}
-+
-+source_set("opus") {
-+  deps = [
-+    ":opus_shim",
-+  ]
-+  public_configs = [ ":system_opus" ]
-+}
-+
-+config("opus_test_config") {
-+  include_dirs = [
-+    "src/celt",
-+    "src/silk",
-+  ]
-+
-+  if (is_win) {
-+    defines = [ "inline=__inline" ]
-+  }
-+  if (is_android) {
-+    libs = [ "log" ]
-+  }
-+  if (is_clang) {
-+    cflags = [ "-Wno-absolute-value" ]
-+  }
-+}
-+
-+executable("opus_compare") {
-+  sources = [
-+    "src/src/opus_compare.c",
-+  ]
-+
-+  configs -= [ "//build/config/compiler:chromium_code" ]
-+  configs += [
-+    "//build/config/compiler:no_chromium_code",
-+    ":opus_test_config",
-+  ]
-+
-+  deps = [
-+    ":opus",
-+    "//build/config/sanitizers:deps",
-+    "//build/win:default_exe_manifest",
-+  ]
-+}
-+
-+executable("opus_demo") {
-+  sources = [
-+    "src/src/opus_demo.c",
-+  ]
-+
-+  configs -= [ "//build/config/compiler:chromium_code" ]
-+  configs += [
-+    "//build/config/compiler:no_chromium_code",
-+    ":opus_test_config",
-+  ]
-+
-+  deps = [
-+    ":opus",
-+    "//build/config/sanitizers:deps",
-+    "//build/win:default_exe_manifest",
-+  ]
-+}
-+
-+test("test_opus_api") {
-+  sources = [
-+    "src/tests/test_opus_api.c",
-+  ]
-+
-+  configs -= [ "//build/config/compiler:chromium_code" ]
-+  configs += [
-+    "//build/config/compiler:no_chromium_code",
-+    ":opus_test_config",
-+  ]
-+
-+  deps = [
-+    ":opus",
-+  ]
-+}
-+
-+test("test_opus_encode") {
-+  sources = [
-+    "src/tests/test_opus_encode.c",
-+  ]
-+
-+  configs -= [ "//build/config/compiler:chromium_code" ]
-+  configs += [
-+    "//build/config/compiler:no_chromium_code",
-+    ":opus_test_config",
-+  ]
-+
-+  deps = [
-+    ":opus",
-+  ]
-+}
-+
-+# GN orders flags on a target before flags from configs. The default config
-+# adds -Wall, and this flag have to be after -Wall -- so they need to
-+# come from a config and can't be on the target directly.
-+config("test_opus_decode_config") {
-+  # test_opus_decode passes a null pointer to opus_decode() for an argument
-+  # marked as requiring a non-null value by the nonnull function attribute,
-+  # and expects opus_decode() to fail. Disable the -Wnonnull option to avoid
-+  # a compilation error if -Werror is specified.
-+  if (is_posix) {
-+    cflags = [ "-Wno-nonnull" ]
-+  }
-+}
-+
-+test("test_opus_decode") {
-+  sources = [
-+    "src/tests/test_opus_decode.c",
-+  ]
-+
-+  configs -= [ "//build/config/compiler:chromium_code" ]
-+  configs += [
-+    "//build/config/compiler:no_chromium_code",
-+    ":opus_test_config",
-+    ":test_opus_decode_config",
-+  ]
-+
-+  deps = [
-+    ":opus",
-+  ]
-+}
-+
-+test("test_opus_padding") {
-+  sources = [
-+    "src/tests/test_opus_padding.c",
-+  ]
-+
-+  configs -= [ "//build/config/compiler:chromium_code" ]
-+  configs += [
-+    "//build/config/compiler:no_chromium_code",
-+    ":opus_test_config",
-+  ]
-+
-+  deps = [
-+    ":opus",
-+  ]
-+}
-+
- # Copyright 2017 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.
-diff -up chromium-60.0.3112.78/build/linux/unbundle/replace_gn_files.py.gnsystem chromium-60.0.3112.78/build/linux/unbundle/replace_gn_files.py
---- chromium-60.0.3112.78/build/linux/unbundle/replace_gn_files.py.gnsystem	2017-07-31 10:38:25.880951622 -0400
-+++ chromium-60.0.3112.78/build/linux/unbundle/replace_gn_files.py	2017-07-31 10:39:58.067159914 -0400
-@@ -26,6 +26,7 @@ REPLACEMENTS = {
-   'libevent': 'base/third_party/libevent/BUILD.gn',
-   'libjpeg': 'build/secondary/third_party/libjpeg_turbo/BUILD.gn',
-   'libpng': 'third_party/libpng/BUILD.gn',
-+  'libusb': 'third_party/libusb/BUILD.gn',
-   'libvpx': 'third_party/libvpx/BUILD.gn',
-   'libwebp': 'third_party/libwebp/BUILD.gn',
-   'libxml': 'third_party/libxml/BUILD.gn',

chromium-60.0.3112.78-jpeg-nomangle.patch

@@ -1,14 +0,0 @@
-diff -up chromium-60.0.3112.78/third_party/libjpeg_turbo/jpeglib.h.nomangle chromium-60.0.3112.78/third_party/libjpeg_turbo/jpeglib.h
---- chromium-60.0.3112.78/third_party/libjpeg_turbo/jpeglib.h.nomangle	2017-08-01 15:29:00.870759406 -0400
-+++ chromium-60.0.3112.78/third_party/libjpeg_turbo/jpeglib.h	2017-08-01 15:29:09.326593414 -0400
-@@ -18,10 +18,6 @@
- #ifndef JPEGLIB_H
- #define JPEGLIB_H
- 
--/* Begin chromium edits */
--#include "jpeglibmangler.h"
--/* End chromium edits */
--
- /*
-  * First we include the configuration files that record how this
-  * installation of the JPEG library is set up.  jconfig.h can be

chromium-60.0.3112.78-last-commit-position.patch

@@ -1,28 +0,0 @@
-diff -up chromium-60.0.3112.78/tools/gn/BUILD.gn.lastcommit chromium-60.0.3112.78/tools/gn/BUILD.gn
---- chromium-60.0.3112.78/tools/gn/BUILD.gn.lastcommit	2017-07-31 10:42:38.568041044 -0400
-+++ chromium-60.0.3112.78/tools/gn/BUILD.gn	2017-07-31 10:47:50.760974587 -0400
-@@ -268,7 +268,6 @@ executable("gn") {
- 
-   deps = [
-     ":gn_lib",
--    ":last_commit_position",
-     "//base",
-     "//build/config:exe_and_shlib_deps",
-     "//build/win:default_exe_manifest",
-diff -up chromium-60.0.3112.78/tools/gn/gn_main.cc.lastcommit chromium-60.0.3112.78/tools/gn/gn_main.cc
---- chromium-60.0.3112.78/tools/gn/gn_main.cc.lastcommit	2017-07-25 15:05:19.000000000 -0400
-+++ chromium-60.0.3112.78/tools/gn/gn_main.cc	2017-07-31 10:42:38.568041044 -0400
-@@ -12,13 +12,7 @@
- #include "tools/gn/standard_out.h"
- #include "tools/gn/switches.h"
- 
--// Only the GN-generated build makes this header for now.
--// TODO(brettw) consider adding this if we need it in GYP.
--#if defined(GN_BUILD)
--#include "tools/gn/last_commit_position.h"
--#else
- #define LAST_COMMIT_POSITION "UNKNOWN"
--#endif
- 
- namespace {
- 

chromium-60.0.3112.78-no-libpng-prefix.patch

@@ -1,17 +0,0 @@
-diff -up chromium-60.0.3112.78/third_party/libpng/pnglibconf.h.noprefix chromium-60.0.3112.78/third_party/libpng/pnglibconf.h
---- chromium-60.0.3112.78/third_party/libpng/pnglibconf.h.noprefix	2017-08-01 14:42:54.321986758 -0400
-+++ chromium-60.0.3112.78/third_party/libpng/pnglibconf.h	2017-08-01 14:43:01.493845832 -0400
-@@ -225,13 +225,4 @@
- #define PNG_USER_CHUNK_MALLOC_MAX 4000000L
- /* end of chromium settings */
- 
--/* chromium prefixing */
--/*
-- * This is necessary to build multiple copies of libpng.  We need this while pdfium builds
-- * its own copy of libpng.
-- */
--#define PNG_PREFIX
--#include "pngprefix.h"
--/* end of chromium prefixing */
--
- #endif /* PNGLCONF_H */

chromium-60.0.3112.78-no-zlib-mangle.patch

@@ -1,13 +0,0 @@
-diff -up chromium-60.0.3112.78/third_party/zlib/zconf.h.nozmangle chromium-60.0.3112.78/third_party/zlib/zconf.h
---- chromium-60.0.3112.78/third_party/zlib/zconf.h.nozmangle	2017-08-04 10:45:17.509152089 -0400
-+++ chromium-60.0.3112.78/third_party/zlib/zconf.h	2017-08-04 10:45:30.451902380 -0400
-@@ -8,9 +8,6 @@
- #ifndef ZCONF_H
- #define ZCONF_H
- 
--/* This include does prefixing as below, but with an updated set of names */
--#include "names.h"
--
- /*
-  * If you *really* need a unique prefix for all types and library functions,
-  * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.

chromium-60.0.3112.90-vulkan-force-c99.patch

@@ -1,11 +0,0 @@
-diff -up chromium-60.0.3112.90/third_party/angle/src/vulkan_support/BUILD.gn.c99 chromium-60.0.3112.90/third_party/angle/src/vulkan_support/BUILD.gn
---- chromium-60.0.3112.90/third_party/angle/src/vulkan_support/BUILD.gn.c99	2017-08-14 10:40:48.028799820 -0400
-+++ chromium-60.0.3112.90/third_party/angle/src/vulkan_support/BUILD.gn	2017-08-14 10:41:43.054734910 -0400
-@@ -180,6 +180,7 @@ config("vulkan_internal_config") {
-     cflags += [ "-Wno-ignored-attributes" ]
-   }
-   if (is_linux) {
-+    cflags += [ "-std=c99" ]
-     defines += [
-       "SYSCONFDIR=\"/etc\"",
-       "FALLBACK_CONFIG_DIRS=\"/etc/xdg\"",

chromium-61.0.3163.79-aarch64-glibc-2.26.90.patch

@@ -1,12 +0,0 @@
-diff -up chromium-61.0.3163.79/breakpad/src/client/linux/handler/exception_handler.cc.aarch64glibc chromium-61.0.3163.79/breakpad/src/client/linux/handler/exception_handler.cc
---- chromium-61.0.3163.79/breakpad/src/client/linux/handler/exception_handler.cc.aarch64glibc	2017-09-12 10:12:25.375736650 -0400
-+++ chromium-61.0.3163.79/breakpad/src/client/linux/handler/exception_handler.cc	2017-09-12 10:14:42.339638321 -0400
-@@ -461,7 +461,7 @@ bool ExceptionHandler::HandleSignal(int
- #if defined(__aarch64__)
-   ucontext_t* uc_ptr = (ucontext_t*)uc;
-   struct fpsimd_context* fp_ptr =
--      (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved;
-+      (struct fpsimd_context*)&uc_ptr->uc_mcontext.__glibc_reserved1;
-   if (fp_ptr->head.magic == FPSIMD_MAGIC) {
-     memcpy(&g_crash_context_.float_state, fp_ptr,
-            sizeof(g_crash_context_.float_state));

chromium-61.0.3163.79-fix-ffmpeg-aarch64.patch

@@ -1,12 +0,0 @@
-diff -up chromium-61.0.3163.79/third_party/ffmpeg/ffmpeg_generated.gni.aarch64 chromium-61.0.3163.79/third_party/ffmpeg/ffmpeg_generated.gni
---- chromium-61.0.3163.79/third_party/ffmpeg/ffmpeg_generated.gni.aarch64	2017-09-06 14:34:36.247232957 -0400
-+++ chromium-61.0.3163.79/third_party/ffmpeg/ffmpeg_generated.gni	2017-09-06 14:36:37.632892363 -0400
-@@ -537,7 +537,7 @@ if (use_linux_config && current_cpu == "
-   ]
- }
- 
--if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) {
-+if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "Chromium")) {
-   ffmpeg_c_sources += [
-     "libavcodec/aarch64/mpegaudiodsp_init.c",
-   ]

chromium-61.0.3163.79-gcc-no-opt-safe-math.patch

@@ -1,13 +0,0 @@
-diff -up chromium-61.0.3163.79/base/numerics/safe_math_shared_impl.h.fixgcc3 chromium-61.0.3163.79/base/numerics/safe_math_shared_impl.h
---- chromium-61.0.3163.79/base/numerics/safe_math_shared_impl.h.fixgcc3	2017-09-06 16:30:15.898454585 -0400
-+++ chromium-61.0.3163.79/base/numerics/safe_math_shared_impl.h	2017-09-06 16:30:27.570229539 -0400
-@@ -21,8 +21,7 @@
- #if !defined(__native_client__) &&                         \
-     ((defined(__clang__) &&                                \
-       ((__clang_major__ > 3) ||                            \
--       (__clang_major__ == 3 && __clang_minor__ >= 4))) || \
--     (defined(__GNUC__) && __GNUC__ >= 5))
-+       (__clang_major__ == 3 && __clang_minor__ >= 4))))
- #include "base/numerics/safe_math_clang_gcc_impl.h"
- #define BASE_HAS_OPTIMIZED_SAFE_MATH (1)
- #else

chromium-61.0.3163.79-setopaque.patch

@@ -1,12 +0,0 @@
-diff -up chromium-61.0.3163.79/cc/blink/web_layer_impl.h.setopaque chromium-61.0.3163.79/cc/blink/web_layer_impl.h
---- chromium-61.0.3163.79/cc/blink/web_layer_impl.h.setopaque	2017-09-06 13:55:45.454175023 -0400
-+++ chromium-61.0.3163.79/cc/blink/web_layer_impl.h	2017-09-06 13:58:02.395533936 -0400
-@@ -71,7 +71,7 @@ class CC_BLINK_EXPORT WebLayerImpl : pub
-   bool IsRootForIsolatedGroup() override;
-   void SetShouldHitTest(bool should_hit_test) override;
-   bool ShouldHitTest() override;
--  void SetOpaque(bool opaque) override;
-+  CC_BLINK_EXPORT void SetOpaque(bool opaque) override;
-   bool Opaque() const override;
-   void SetPosition(const blink::WebFloatPoint& position) override;
-   blink::WebFloatPoint GetPosition() const override;

chromium-62.0.3202.62-correct-cplusplus-check.patch

@@ -1,20 +0,0 @@
-diff -up chromium-62.0.3202.62/third_party/crc32c/src/include/crc32c/crc32c.h.fix-cplusplus-conditional chromium-62.0.3202.62/third_party/crc32c/src/include/crc32c/crc32c.h
---- chromium-62.0.3202.62/third_party/crc32c/src/include/crc32c/crc32c.h.fix-cplusplus-conditional	2017-10-17 15:12:35.000000000 -0400
-+++ chromium-62.0.3202.62/third_party/crc32c/src/include/crc32c/crc32c.h	2017-10-19 11:41:45.860279576 -0400
-@@ -38,6 +38,8 @@ inline uint32_t Crc32c(const std::string
- // Visual Studio provides a <string_view> header even in C++11 mode. When
- // included, the header issues an #error. (C1189)
- #if !defined(_MSC_VER) || __cplusplus >= 201703L
-+// GCC issues an #error if __cplusplus <= 201402L
-+#if defined(__GNUC__) && __cplusplus > 201402L
- #include <string_view>
- 
- // Comptues the CRC32C of the bytes in the string_view.
-@@ -46,6 +48,7 @@ inline uint32_t Crc32c(const std::string
-                 string_view.size());
- }
- 
-+#endif  // defined(__GNUC__) && __cplusplus > 201402L
- #endif  // !defined(_MSC_VER) || __cplusplus >= 201703L
- #endif  // __has_include(<string_view>)
- #endif  // defined(__has_include)

chromium-62.0.3202.62-dde535-gcc-fix.patch

@@ -1,13 +0,0 @@
-diff -up chromium-62.0.3202.62/services/resource_coordinator/resource_coordinator_service.cc.dde535 chromium-62.0.3202.62/services/resource_coordinator/resource_coordinator_service.cc
---- chromium-62.0.3202.62/services/resource_coordinator/resource_coordinator_service.cc.dde535	2017-10-18 10:04:33.237966223 -0400
-+++ chromium-62.0.3202.62/services/resource_coordinator/resource_coordinator_service.cc	2017-10-18 10:05:00.442438694 -0400
-@@ -18,7 +18,8 @@ std::unique_ptr<service_manager::Service
-   auto resource_coordinator_service =
-       base::MakeUnique<ResourceCoordinatorService>();
- 
--  return resource_coordinator_service;
-+  return std::unique_ptr<service_manager::Service>(
-+      resource_coordinator_service.release());
- }
- 
- ResourceCoordinatorService::ResourceCoordinatorService()

chromium-62.0.3202.62-enable-mp3.patch

@@ -1,484 +0,0 @@
-diff -up chromium-62.0.3202.62/components/neterror/resources/sounds/button-press.mp3 chromium-62.0.3202.62/components/neterror/resources/sounds/button-press
-diff -up chromium-62.0.3202.62/components/neterror/resources/sounds/hit.mp3 chromium-62.0.3202.62/components/neterror/resources/sounds/hit
-diff -up chromium-62.0.3202.62/components/neterror/resources/sounds/score-reached.mp3 chromium-62.0.3202.62/components/neterror/resources/sounds/score-reached
-diff -up chromium-62.0.3202.62/media/base/mime_util_internal.cc.mp3 chromium-62.0.3202.62/media/base/mime_util_internal.cc
---- chromium-62.0.3202.62/media/base/mime_util_internal.cc.mp3	2017-10-17 15:10:44.000000000 -0400
-+++ chromium-62.0.3202.62/media/base/mime_util_internal.cc	2017-10-18 09:32:16.957562156 -0400
-@@ -266,15 +266,19 @@ void MimeUtil::AddSupportedMediaFormats(
-   CodecSet webm_codecs(webm_audio_codecs);
-   webm_codecs.insert(webm_video_codecs.begin(), webm_video_codecs.end());
- 
--#if BUILDFLAG(USE_PROPRIETARY_CODECS)
-   const CodecSet mp3_codecs{MP3};
-+#if BUILDFLAG(USE_PROPRIETARY_CODECS)
-   const CodecSet aac{MPEG2_AAC, MPEG4_AAC};
-+#else
-+  const CodecSet aac{};
-+#endif
-+  CodecSet mp4_audio_codecs(aac);
-+  mp4_audio_codecs.emplace(MP3);
- 
-+#if BUILDFLAG(USE_PROPRIETARY_CODECS)
-   CodecSet avc_and_aac(aac);
-   avc_and_aac.emplace(H264);
- 
--  CodecSet mp4_audio_codecs(aac);
--  mp4_audio_codecs.emplace(MP3);
-   mp4_audio_codecs.emplace(FLAC);
- #if BUILDFLAG(ENABLE_AC3_EAC3_AUDIO_DEMUXING)
-   mp4_audio_codecs.emplace(AC3);
-@@ -311,10 +315,10 @@ void MimeUtil::AddSupportedMediaFormats(
-   AddContainerWithCodecs("application/ogg", ogg_codecs, false);
-   AddContainerWithCodecs("audio/flac", implicit_codec, false);
- 
--#if BUILDFLAG(USE_PROPRIETARY_CODECS)
-   AddContainerWithCodecs("audio/mpeg", mp3_codecs, true);  // Allow "mp3".
-   AddContainerWithCodecs("audio/mp3", implicit_codec, true);
-   AddContainerWithCodecs("audio/x-mp3", implicit_codec, true);
-+#if BUILDFLAG(USE_PROPRIETARY_CODECS)
-   AddContainerWithCodecs("audio/aac", implicit_codec, true);  // AAC / ADTS.
-   AddContainerWithCodecs("audio/mp4", mp4_audio_codecs, true);
-   DCHECK(!mp4_video_codecs.empty());
-@@ -920,7 +924,6 @@ bool MimeUtil::IsCodecProprietary(Codec
-     case INVALID_CODEC:
-     case AC3:
-     case EAC3:
--    case MP3:
-     case MPEG2_AAC:
-     case MPEG4_AAC:
-     case H264:
-@@ -928,6 +931,7 @@ bool MimeUtil::IsCodecProprietary(Codec
-     case DOLBY_VISION:
-       return true;
- 
-+    case MP3:
-     case PCM:
-     case VORBIS:
-     case OPUS:
-diff -up chromium-62.0.3202.62/media/formats/BUILD.gn.mp3 chromium-62.0.3202.62/media/formats/BUILD.gn
---- chromium-62.0.3202.62/media/formats/BUILD.gn.mp3	2017-10-17 15:10:45.000000000 -0400
-+++ chromium-62.0.3202.62/media/formats/BUILD.gn	2017-10-18 09:25:18.353676481 -0400
-@@ -17,6 +17,14 @@ source_set("formats") {
-     "ac3/ac3_util.h",
-     "common/offset_byte_queue.cc",
-     "common/offset_byte_queue.h",
-+    "mpeg/adts_constants.cc",
-+    "mpeg/adts_constants.h",
-+    "mpeg/adts_stream_parser.cc",
-+    "mpeg/adts_stream_parser.h",
-+    "mpeg/mpeg1_audio_stream_parser.cc",
-+    "mpeg/mpeg1_audio_stream_parser.h",
-+    "mpeg/mpeg_audio_stream_parser_base.cc",
-+    "mpeg/mpeg_audio_stream_parser_base.h",
-     "webm/webm_audio_client.cc",
-     "webm/webm_audio_client.h",
-     "webm/webm_cluster_parser.cc",
-@@ -78,14 +86,6 @@ source_set("formats") {
-       "mp4/sample_to_group_iterator.h",
-       "mp4/track_run_iterator.cc",
-       "mp4/track_run_iterator.h",
--      "mpeg/adts_constants.cc",
--      "mpeg/adts_constants.h",
--      "mpeg/adts_stream_parser.cc",
--      "mpeg/adts_stream_parser.h",
--      "mpeg/mpeg1_audio_stream_parser.cc",
--      "mpeg/mpeg1_audio_stream_parser.h",
--      "mpeg/mpeg_audio_stream_parser_base.cc",
--      "mpeg/mpeg_audio_stream_parser_base.h",
-     ]
-   }
- 
-diff -up chromium-62.0.3202.62/third_party/catapult/third_party/gsutil/gslib/tests/test_data/test.mp3 chromium-62.0.3202.62/third_party/catapult/third_party/gsutil/gslib/tests/test_data/test
-diff -up chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h.mp3 chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h
---- chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h.mp3	2017-10-18 09:05:31.000000000 -0400
-+++ chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h	2017-10-18 09:25:18.354676462 -0400
-@@ -1,7 +1,7 @@
- /* Automatically generated by configure - do not modify! */
- #ifndef FFMPEG_CONFIG_H
- #define FFMPEG_CONFIG_H
--#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/chrome/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic"
-+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/chrome/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
- #define FFMPEG_LICENSE "LGPL version 2.1 or later"
- #define CONFIG_THIS_YEAR 2017
- #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
-@@ -542,7 +542,7 @@
- #define CONFIG_FFPROBE 0
- #define CONFIG_FFSERVER 0
- #define CONFIG_FFMPEG 0
--#define CONFIG_DCT 0
-+#define CONFIG_DCT 1
- #define CONFIG_DWT 0
- #define CONFIG_ERROR_RESILIENCE 0
- #define CONFIG_FAAN 1
-@@ -620,9 +620,9 @@
- #define CONFIG_LZF 0
- #define CONFIG_ME_CMP 0
- #define CONFIG_MPEG_ER 0
--#define CONFIG_MPEGAUDIO 0
--#define CONFIG_MPEGAUDIODSP 0
--#define CONFIG_MPEGAUDIOHEADER 0
-+#define CONFIG_MPEGAUDIO 1
-+#define CONFIG_MPEGAUDIODSP 1
-+#define CONFIG_MPEGAUDIOHEADER 1
- #define CONFIG_MPEGVIDEO 0
- #define CONFIG_MPEGVIDEOENC 0
- #define CONFIG_MSS34DSP 0
-@@ -968,7 +968,7 @@
- #define CONFIG_MP1FLOAT_DECODER 0
- #define CONFIG_MP2_DECODER 0
- #define CONFIG_MP2FLOAT_DECODER 0
--#define CONFIG_MP3_DECODER 0
-+#define CONFIG_MP3_DECODER 1
- #define CONFIG_MP3FLOAT_DECODER 0
- #define CONFIG_MP3ADU_DECODER 0
- #define CONFIG_MP3ADUFLOAT_DECODER 0
-@@ -1275,7 +1275,7 @@
- #define CONFIG_MM_DEMUXER 0
- #define CONFIG_MMF_DEMUXER 0
- #define CONFIG_MOV_DEMUXER 0
--#define CONFIG_MP3_DEMUXER 0
-+#define CONFIG_MP3_DEMUXER 1
- #define CONFIG_MPC_DEMUXER 0
- #define CONFIG_MPC8_DEMUXER 0
- #define CONFIG_MPEGPS_DEMUXER 0
-@@ -2217,7 +2217,7 @@
- #define CONFIG_MJPEG_PARSER 0
- #define CONFIG_MLP_PARSER 0
- #define CONFIG_MPEG4VIDEO_PARSER 0
--#define CONFIG_MPEGAUDIO_PARSER 0
-+#define CONFIG_MPEGAUDIO_PARSER 1
- #define CONFIG_MPEGVIDEO_PARSER 0
- #define CONFIG_OPUS_PARSER 1
- #define CONFIG_PNG_PARSER 0
-diff -up chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h.mp3 chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h
---- chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h.mp3	2017-10-18 09:05:31.000000000 -0400
-+++ chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h	2017-10-18 09:25:18.355676443 -0400
-@@ -1,7 +1,7 @@
- /* Automatically generated by configure - do not modify! */
- #ifndef FFMPEG_CONFIG_H
- #define FFMPEG_CONFIG_H
--#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/jrummell/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --disable-neon --extra-cflags='-mfpu=vfpv3-d16' --enable-pic"
-+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/jrummell/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --disable-neon --extra-cflags='-mfpu=vfpv3-d16' --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
- #define FFMPEG_LICENSE "LGPL version 2.1 or later"
- #define CONFIG_THIS_YEAR 2017
- #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
-@@ -542,7 +542,7 @@
- #define CONFIG_FFPROBE 0
- #define CONFIG_FFSERVER 0
- #define CONFIG_FFMPEG 0
--#define CONFIG_DCT 0
-+#define CONFIG_DCT 1
- #define CONFIG_DWT 0
- #define CONFIG_ERROR_RESILIENCE 0
- #define CONFIG_FAAN 1
-@@ -620,9 +620,9 @@
- #define CONFIG_LZF 0
- #define CONFIG_ME_CMP 0
- #define CONFIG_MPEG_ER 0
--#define CONFIG_MPEGAUDIO 0
--#define CONFIG_MPEGAUDIODSP 0
--#define CONFIG_MPEGAUDIOHEADER 0
-+#define CONFIG_MPEGAUDIO 1
-+#define CONFIG_MPEGAUDIODSP 1
-+#define CONFIG_MPEGAUDIOHEADER 1
- #define CONFIG_MPEGVIDEO 0
- #define CONFIG_MPEGVIDEOENC 0
- #define CONFIG_MSS34DSP 0
-@@ -968,7 +968,7 @@
- #define CONFIG_MP1FLOAT_DECODER 0
- #define CONFIG_MP2_DECODER 0
- #define CONFIG_MP2FLOAT_DECODER 0
--#define CONFIG_MP3_DECODER 0
-+#define CONFIG_MP3_DECODER 1
- #define CONFIG_MP3FLOAT_DECODER 0
- #define CONFIG_MP3ADU_DECODER 0
- #define CONFIG_MP3ADUFLOAT_DECODER 0
-@@ -1275,7 +1275,7 @@
- #define CONFIG_MM_DEMUXER 0
- #define CONFIG_MMF_DEMUXER 0
- #define CONFIG_MOV_DEMUXER 0
--#define CONFIG_MP3_DEMUXER 0
-+#define CONFIG_MP3_DEMUXER 1
- #define CONFIG_MPC_DEMUXER 0
- #define CONFIG_MPC8_DEMUXER 0
- #define CONFIG_MPEGPS_DEMUXER 0
-@@ -2217,7 +2217,7 @@
- #define CONFIG_MJPEG_PARSER 0
- #define CONFIG_MLP_PARSER 0
- #define CONFIG_MPEG4VIDEO_PARSER 0
--#define CONFIG_MPEGAUDIO_PARSER 0
-+#define CONFIG_MPEGAUDIO_PARSER 1
- #define CONFIG_MPEGVIDEO_PARSER 0
- #define CONFIG_OPUS_PARSER 1
- #define CONFIG_PNG_PARSER 0
-diff -up chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h.mp3 chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h
---- chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h.mp3	2017-10-18 09:05:31.000000000 -0400
-+++ chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h	2017-10-18 09:25:18.360676348 -0400
-@@ -1,7 +1,7 @@
- /* Automatically generated by configure - do not modify! */
- #ifndef FFMPEG_CONFIG_H
- #define FFMPEG_CONFIG_H
--#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/jrummell/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --enable-neon --extra-cflags='-mfpu=neon' --enable-pic"
-+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/jrummell/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --enable-neon --extra-cflags='-mfpu=neon' --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
- #define FFMPEG_LICENSE "LGPL version 2.1 or later"
- #define CONFIG_THIS_YEAR 2017
- #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
-@@ -542,7 +542,7 @@
- #define CONFIG_FFPROBE 0
- #define CONFIG_FFSERVER 0
- #define CONFIG_FFMPEG 0
--#define CONFIG_DCT 0
-+#define CONFIG_DCT 1
- #define CONFIG_DWT 0
- #define CONFIG_ERROR_RESILIENCE 0
- #define CONFIG_FAAN 1
-@@ -620,9 +620,9 @@
- #define CONFIG_LZF 0
- #define CONFIG_ME_CMP 0
- #define CONFIG_MPEG_ER 0
--#define CONFIG_MPEGAUDIO 0
--#define CONFIG_MPEGAUDIODSP 0
--#define CONFIG_MPEGAUDIOHEADER 0
-+#define CONFIG_MPEGAUDIO 1
-+#define CONFIG_MPEGAUDIODSP 1
-+#define CONFIG_MPEGAUDIOHEADER 1
- #define CONFIG_MPEGVIDEO 0
- #define CONFIG_MPEGVIDEOENC 0
- #define CONFIG_MSS34DSP 0
-@@ -968,7 +968,7 @@
- #define CONFIG_MP1FLOAT_DECODER 0
- #define CONFIG_MP2_DECODER 0
- #define CONFIG_MP2FLOAT_DECODER 0
--#define CONFIG_MP3_DECODER 0
-+#define CONFIG_MP3_DECODER 1
- #define CONFIG_MP3FLOAT_DECODER 0
- #define CONFIG_MP3ADU_DECODER 0
- #define CONFIG_MP3ADUFLOAT_DECODER 0
-@@ -1275,7 +1275,7 @@
- #define CONFIG_MM_DEMUXER 0
- #define CONFIG_MMF_DEMUXER 0
- #define CONFIG_MOV_DEMUXER 0
--#define CONFIG_MP3_DEMUXER 0
-+#define CONFIG_MP3_DEMUXER 1
- #define CONFIG_MPC_DEMUXER 0
- #define CONFIG_MPC8_DEMUXER 0
- #define CONFIG_MPEGPS_DEMUXER 0
-@@ -2217,7 +2217,7 @@
- #define CONFIG_MJPEG_PARSER 0
- #define CONFIG_MLP_PARSER 0
- #define CONFIG_MPEG4VIDEO_PARSER 0
--#define CONFIG_MPEGAUDIO_PARSER 0
-+#define CONFIG_MPEGAUDIO_PARSER 1
- #define CONFIG_MPEGVIDEO_PARSER 0
- #define CONFIG_OPUS_PARSER 1
- #define CONFIG_PNG_PARSER 0
-diff -up chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.mp3 chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h
---- chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.mp3	2017-10-18 09:05:31.000000000 -0400
-+++ chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h	2017-10-18 09:25:18.360676348 -0400
-@@ -1,7 +1,7 @@
- /* Automatically generated by configure - do not modify! */
- #ifndef FFMPEG_CONFIG_H
- #define FFMPEG_CONFIG_H
--#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/chrome/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-yasm --enable-pic"
-+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/chrome/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-yasm --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
- #define FFMPEG_LICENSE "LGPL version 2.1 or later"
- #define CONFIG_THIS_YEAR 2017
- #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
-@@ -542,7 +542,7 @@
- #define CONFIG_FFPROBE 0
- #define CONFIG_FFSERVER 0
- #define CONFIG_FFMPEG 0
--#define CONFIG_DCT 0
-+#define CONFIG_DCT 1
- #define CONFIG_DWT 0
- #define CONFIG_ERROR_RESILIENCE 0
- #define CONFIG_FAAN 1
-@@ -620,9 +620,9 @@
- #define CONFIG_LZF 0
- #define CONFIG_ME_CMP 0
- #define CONFIG_MPEG_ER 0
--#define CONFIG_MPEGAUDIO 0
--#define CONFIG_MPEGAUDIODSP 0
--#define CONFIG_MPEGAUDIOHEADER 0
-+#define CONFIG_MPEGAUDIO 1
-+#define CONFIG_MPEGAUDIODSP 1
-+#define CONFIG_MPEGAUDIOHEADER 1
- #define CONFIG_MPEGVIDEO 0
- #define CONFIG_MPEGVIDEOENC 0
- #define CONFIG_MSS34DSP 0
-@@ -968,7 +968,7 @@
- #define CONFIG_MP1FLOAT_DECODER 0
- #define CONFIG_MP2_DECODER 0
- #define CONFIG_MP2FLOAT_DECODER 0
--#define CONFIG_MP3_DECODER 0
-+#define CONFIG_MP3_DECODER 1
- #define CONFIG_MP3FLOAT_DECODER 0
- #define CONFIG_MP3ADU_DECODER 0
- #define CONFIG_MP3ADUFLOAT_DECODER 0
-@@ -1275,7 +1275,7 @@
- #define CONFIG_MM_DEMUXER 0
- #define CONFIG_MMF_DEMUXER 0
- #define CONFIG_MOV_DEMUXER 0
--#define CONFIG_MP3_DEMUXER 0
-+#define CONFIG_MP3_DEMUXER 1
- #define CONFIG_MPC_DEMUXER 0
- #define CONFIG_MPC8_DEMUXER 0
- #define CONFIG_MPEGPS_DEMUXER 0
-@@ -2217,7 +2217,7 @@
- #define CONFIG_MJPEG_PARSER 0
- #define CONFIG_MLP_PARSER 0
- #define CONFIG_MPEG4VIDEO_PARSER 0
--#define CONFIG_MPEGAUDIO_PARSER 0
-+#define CONFIG_MPEGAUDIO_PARSER 1
- #define CONFIG_MPEGVIDEO_PARSER 0
- #define CONFIG_OPUS_PARSER 1
- #define CONFIG_PNG_PARSER 0
-diff -up chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h.mp3 chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h
---- chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h.mp3	2017-10-18 09:05:31.000000000 -0400
-+++ chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h	2017-10-18 09:25:18.361676329 -0400
-@@ -1,7 +1,7 @@
- /* Automatically generated by configure - do not modify! */
- #ifndef FFMPEG_CONFIG_H
- #define FFMPEG_CONFIG_H
--#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/chrome/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --enable-pic"
-+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/chrome/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
- #define FFMPEG_LICENSE "LGPL version 2.1 or later"
- #define CONFIG_THIS_YEAR 2017
- #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
-@@ -542,7 +542,7 @@
- #define CONFIG_FFPROBE 0
- #define CONFIG_FFSERVER 0
- #define CONFIG_FFMPEG 0
--#define CONFIG_DCT 0
-+#define CONFIG_DCT 1
- #define CONFIG_DWT 0
- #define CONFIG_ERROR_RESILIENCE 0
- #define CONFIG_FAAN 1
-@@ -620,9 +620,9 @@
- #define CONFIG_LZF 0
- #define CONFIG_ME_CMP 0
- #define CONFIG_MPEG_ER 0
--#define CONFIG_MPEGAUDIO 0
--#define CONFIG_MPEGAUDIODSP 0
--#define CONFIG_MPEGAUDIOHEADER 0
-+#define CONFIG_MPEGAUDIO 1
-+#define CONFIG_MPEGAUDIODSP 1
-+#define CONFIG_MPEGAUDIOHEADER 1
- #define CONFIG_MPEGVIDEO 0
- #define CONFIG_MPEGVIDEOENC 0
- #define CONFIG_MSS34DSP 0
-@@ -968,7 +968,7 @@
- #define CONFIG_MP1FLOAT_DECODER 0
- #define CONFIG_MP2_DECODER 0
- #define CONFIG_MP2FLOAT_DECODER 0
--#define CONFIG_MP3_DECODER 0
-+#define CONFIG_MP3_DECODER 1
- #define CONFIG_MP3FLOAT_DECODER 0
- #define CONFIG_MP3ADU_DECODER 0
- #define CONFIG_MP3ADUFLOAT_DECODER 0
-@@ -1275,7 +1275,7 @@
- #define CONFIG_MM_DEMUXER 0
- #define CONFIG_MMF_DEMUXER 0
- #define CONFIG_MOV_DEMUXER 0
--#define CONFIG_MP3_DEMUXER 0
-+#define CONFIG_MP3_DEMUXER 1
- #define CONFIG_MPC_DEMUXER 0
- #define CONFIG_MPC8_DEMUXER 0
- #define CONFIG_MPEGPS_DEMUXER 0
-@@ -2217,7 +2217,7 @@
- #define CONFIG_MJPEG_PARSER 0
- #define CONFIG_MLP_PARSER 0
- #define CONFIG_MPEG4VIDEO_PARSER 0
--#define CONFIG_MPEGAUDIO_PARSER 0
-+#define CONFIG_MPEGAUDIO_PARSER 1
- #define CONFIG_MPEGVIDEO_PARSER 0
- #define CONFIG_OPUS_PARSER 1
- #define CONFIG_PNG_PARSER 0
-diff -up chromium-62.0.3202.62/third_party/ffmpeg/ffmpeg_generated.gni.mp3 chromium-62.0.3202.62/third_party/ffmpeg/ffmpeg_generated.gni
---- chromium-62.0.3202.62/third_party/ffmpeg/ffmpeg_generated.gni.mp3	2017-10-18 09:05:28.000000000 -0400
-+++ chromium-62.0.3202.62/third_party/ffmpeg/ffmpeg_generated.gni	2017-10-18 09:25:18.362676310 -0400
-@@ -182,17 +182,9 @@ if ((is_mac) || (is_win) || (use_linux_c
-   ]
- }
- 
--if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) {
-+if ((current_cpu == "x64") || (is_android && current_cpu == "arm" && arm_use_neon) || (is_android && current_cpu == "arm64") || (is_android && current_cpu == "mips64el") || (is_android && current_cpu == "mipsel") || (is_android && current_cpu == "x86") || (is_win) || (use_linux_config && current_cpu == "arm" && arm_use_neon) || (use_linux_config && current_cpu == "arm" && arm_use_neon) || (use_linux_config && current_cpu == "arm") || (use_linux_config && current_cpu == "arm") || (use_linux_config && current_cpu == "arm64") || (use_linux_config && current_cpu == "mipsel") || (use_linux_config && current_cpu == "x64") || (use_linux_config && current_cpu == "x86")) {
-   ffmpeg_c_sources += [
--    "libavcodec/aac_ac3_parser.c",
--    "libavcodec/aac_parser.c",
--    "libavcodec/aacadtsdec.c",
--    "libavcodec/aacps_float.c",
--    "libavcodec/aacpsdsp_float.c",
--    "libavcodec/aacsbr.c",
--    "libavcodec/aactab.c",
-     "libavcodec/ac3tab.c",
--    "libavcodec/autorename_libavcodec_aacdec.c",
-     "libavcodec/autorename_libavcodec_mpegaudiodsp.c",
-     "libavcodec/autorename_libavcodec_sbrdsp.c",
-     "libavcodec/cbrt_data.c",
-@@ -210,7 +202,6 @@ if ((current_cpu == "x64" && ffmpeg_bran
-     "libavcodec/mpegaudiodsp_float.c",
-     "libavcodec/sinewin.c",
-     "libavcodec/sinewin_fixed.c",
--    "libavformat/aacdec.c",
-     "libavformat/apetag.c",
-     "libavformat/img2.c",
-     "libavformat/mov.c",
-@@ -219,6 +210,20 @@ if ((current_cpu == "x64" && ffmpeg_bran
-   ]
- }
- 
-+if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) {
-+  ffmpeg_c_sources += [
-+    "libavcodec/aac_ac3_parser.c",
-+    "libavcodec/aac_parser.c",
-+    "libavcodec/aacadtsdec.c",
-+    "libavcodec/aacps_float.c",
-+    "libavcodec/aacpsdsp_float.c",
-+    "libavcodec/aacsbr.c",
-+    "libavcodec/aactab.c",
-+    "libavcodec/autorename_libavcodec_aacdec.c",
-+    "libavformat/aacdec.c",
-+  ]
-+}
-+
- if ((is_android && current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_mac) || (is_win) || (use_linux_config && current_cpu == "x64") || (use_linux_config && current_cpu == "x86")) {
-   ffmpeg_c_sources += [
-     "libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c",
-@@ -322,15 +327,19 @@ if ((is_mac) || (is_win) || (use_linux_c
- if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) {
-   ffmpeg_c_sources += [
-     "libavcodec/x86/aacpsdsp_init.c",
-+  ]
-+  ffmpeg_yasm_sources += [
-+    "libavcodec/x86/aacpsdsp.asm",
-+  ]
-+}
-+
-+if ((current_cpu == "x64") || (is_android && current_cpu == "x86") || (use_linux_config && current_cpu == "x64") || (use_linux_config && current_cpu == "x86") || (is_win)) {
-+  ffmpeg_c_sources += [
-     "libavcodec/x86/dct_init.c",
-     "libavcodec/x86/mpegaudiodsp.c",
-     "libavcodec/x86/sbrdsp_init.c",
-   ]
--}
--
--if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) {
-   ffmpeg_yasm_sources += [
--    "libavcodec/x86/aacpsdsp.asm",
-     "libavcodec/x86/dct32.asm",
-     "libavcodec/x86/imdct36.asm",
-     "libavcodec/x86/sbrdsp.asm",
-diff -up chromium-62.0.3202.62/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 chromium-62.0.3202.62/third_party/ffmpeg/libavcodec/sbrdsp.c
---- chromium-62.0.3202.62/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3	2017-10-18 09:05:30.000000000 -0400
-+++ chromium-62.0.3202.62/third_party/ffmpeg/libavcodec/sbrdsp.c	2017-10-18 09:25:18.362676310 -0400
-@@ -23,6 +23,7 @@
- #define USE_FIXED 0
- 
- #include "aac.h"
-+#include "aacsbrdata.h"
- #include "config.h"
- #include "libavutil/attributes.h"
- #include "libavutil/intfloat.h"
-diff -up chromium-62.0.3202.62/third_party/webrtc/examples/objc/AppRTCMobile/ios/resources/mozart.mp3 chromium-62.0.3202.62/third_party/webrtc/examples/objc/AppRTCMobile/ios/resources/mozart
-diff -up chromium-62.0.3202.62/tools/android/audio_focus_grabber/java/res/raw/ping.mp3 chromium-62.0.3202.62/tools/android/audio_focus_grabber/java/res/raw/ping

chromium-62.0.3202.62-epel7-no-nullptr-assignment-on-StructPtr.patch

@@ -1,12 +0,0 @@
-diff -up chromium-62.0.3202.62/third_party/WebKit/Source/platform/blob/BlobData.cpp.nonullptr chromium-62.0.3202.62/third_party/WebKit/Source/platform/blob/BlobData.cpp
---- chromium-62.0.3202.62/third_party/WebKit/Source/platform/blob/BlobData.cpp.nonullptr	2017-10-18 10:10:14.216353575 -0400
-+++ chromium-62.0.3202.62/third_party/WebKit/Source/platform/blob/BlobData.cpp	2017-10-18 10:10:23.657170980 -0400
-@@ -295,7 +295,7 @@ BlobDataHandle::BlobDataHandle(std::uniq
- 
-     size_t current_memory_population = 0;
-     Vector<DataElementPtr> elements;
--    const DataElementPtr null_element = nullptr;
-+    const DataElementPtr null_element;
-     BlobBytesProvider* last_bytes_provider = nullptr;
-     RefPtr<WebTaskRunner> file_runner = Platform::Current()->FileTaskRunner();
- 

chromium-62.0.3202.62-gcc-nc.patch

@@ -1,11 +0,0 @@
-diff -up chromium-62.0.3202.62/content/network/network_service_impl.cc.gcc-nc chromium-62.0.3202.62/content/network/network_service_impl.cc
---- chromium-62.0.3202.62/content/network/network_service_impl.cc.gcc-nc	2017-10-18 10:07:04.045041261 -0400
-+++ chromium-62.0.3202.62/content/network/network_service_impl.cc	2017-10-18 10:07:53.175088528 -0400
-@@ -90,6 +90,7 @@ NetworkServiceImpl::CreateNetworkContext
-       base::MakeUnique<NetworkContext>(this, std::move(request),
-                                        std::move(params), std::move(builder));
-   *url_request_context = network_context->url_request_context();
-+  return std::unique_ptr<content::NetworkContext>(network_context.release());
-   return network_context;
- }
- 

chromium-62.0.3202.62-gcc7.patch

@@ -1,11 +0,0 @@
-diff -up chromium-62.0.3202.62/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.gcc7 chromium-62.0.3202.62/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h
---- chromium-62.0.3202.62/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.gcc7	2017-10-18 09:20:04.072765163 -0400
-+++ chromium-62.0.3202.62/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h	2017-10-18 09:21:40.156905187 -0400
-@@ -9,6 +9,7 @@
- #include "platform/graphics/WebGraphicsContext3DProviderWrapper.h"
- #include "platform/wtf/ThreadSpecific.h"
- 
-+#include <functional>
- #include <memory>
- 
- namespace blink {

chromium-62.0.3202.62-kmaxskip-constexpr.patch

@@ -1,12 +0,0 @@
-diff -up chromium-62.0.3202.62/cc/paint/paint_op_buffer.cc.kmaxskip chromium-62.0.3202.62/cc/paint/paint_op_buffer.cc
---- chromium-62.0.3202.62/cc/paint/paint_op_buffer.cc.kmaxskip	2017-10-18 10:00:28.503714392 -0400
-+++ chromium-62.0.3202.62/cc/paint/paint_op_buffer.cc	2017-10-18 10:00:43.153430212 -0400
-@@ -336,7 +336,7 @@ TYPES(M);
- #undef TYPES
- 
- const SkRect PaintOp::kUnsetRect = {SK_ScalarInfinity, 0, 0, 0};
--const size_t PaintOp::kMaxSkip;
-+constexpr size_t PaintOp::kMaxSkip;
- 
- std::string PaintOpTypeToString(PaintOpType type) {
-   switch (type) {

chromium-62.0.3202.62-rvalue-fix.patch

@@ -1,45 +0,0 @@
-diff -up chromium-62.0.3202.62/chrome/browser/ui/webui/settings/on_startup_handler.cc.another-rvalue-fix chromium-62.0.3202.62/chrome/browser/ui/webui/settings/on_startup_handler.cc
---- chromium-62.0.3202.62/chrome/browser/ui/webui/settings/on_startup_handler.cc.another-rvalue-fix	2017-10-18 10:15:58.855675480 -0400
-+++ chromium-62.0.3202.62/chrome/browser/ui/webui/settings/on_startup_handler.cc	2017-10-18 10:16:28.925093301 -0400
-@@ -77,7 +77,7 @@ std::unique_ptr<base::Value> OnStartupHa
-                    !extensions::ExtensionSystem::Get(profile_)
-                         ->management_policy()
-                         ->MustRemainEnabled(ntp_extension, nullptr));
--  return dict;
-+  return std::move(dict);
- }
- 
- void OnStartupHandler::HandleGetNtpExtension(const base::ListValue* args) {
-diff -up chromium-62.0.3202.62/ui/views/animation/ink_drop_host_view.cc.another-rvalue-fix chromium-62.0.3202.62/ui/views/animation/ink_drop_host_view.cc
---- chromium-62.0.3202.62/ui/views/animation/ink_drop_host_view.cc.another-rvalue-fix	2017-10-18 10:15:16.408497853 -0400
-+++ chromium-62.0.3202.62/ui/views/animation/ink_drop_host_view.cc	2017-10-18 10:15:43.793967075 -0400
-@@ -305,7 +305,7 @@ std::unique_ptr<InkDropImpl> InkDropHost
-       base::MakeUnique<InkDropImpl>(this, size());
-   ink_drop->SetAutoHighlightMode(
-       views::InkDropImpl::AutoHighlightMode::HIDE_ON_RIPPLE);
--  return ink_drop;
-+  return std:move(ink_drop);
- }
- 
- std::unique_ptr<InkDropImpl>
-@@ -314,7 +314,7 @@ InkDropHostView::CreateDefaultFloodFillI
-       InkDropHostView::CreateDefaultInkDropImpl();
-   ink_drop->SetAutoHighlightMode(
-       views::InkDropImpl::AutoHighlightMode::SHOW_ON_RIPPLE);
--  return ink_drop;
-+  return std:move(ink_drop);
- }
- 
- }  // namespace views
-diff -up chromium-62.0.3202.62/ui/views/controls/button/checkbox.cc.another-rvalue-fix chromium-62.0.3202.62/ui/views/controls/button/checkbox.cc
---- chromium-62.0.3202.62/ui/views/controls/button/checkbox.cc.another-rvalue-fix	2017-10-18 10:14:18.054627919 -0400
-+++ chromium-62.0.3202.62/ui/views/controls/button/checkbox.cc	2017-10-18 10:14:42.265159378 -0400
-@@ -198,7 +198,7 @@ std::unique_ptr<InkDrop> Checkbox::Creat
-   std::unique_ptr<InkDropImpl> ink_drop = CreateDefaultInkDropImpl();
-   ink_drop->SetShowHighlightOnHover(false);
-   ink_drop->SetAutoHighlightMode(InkDropImpl::AutoHighlightMode::NONE);
--  return ink_drop;
-+  return std::move(ink_drop);
- }
- 
- std::unique_ptr<InkDropRipple> Checkbox::CreateInkDropRipple() const {

chromium-63.0.3289.84-aarch64-glibc-2.26.90.patch

@@ -1,12 +0,0 @@
-diff -up chromium-63.0.3239.84/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.aarch64glibc chromium-63.0.3239.84/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
---- chromium-63.0.3239.84/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.aarch64glibc	2017-12-12 09:56:24.469343868 -0500
-+++ chromium-63.0.3239.84/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc	2017-12-12 09:56:38.468071095 -0500
-@@ -461,7 +461,7 @@ bool ExceptionHandler::HandleSignal(int
- #if defined(__aarch64__)
-   ucontext_t* uc_ptr = (ucontext_t*)uc;
-   struct fpsimd_context* fp_ptr =
--      (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved;
-+      (struct fpsimd_context*)&uc_ptr->uc_mcontext.__glibc_reserved1;
-   if (fp_ptr->head.magic == FPSIMD_MAGIC) {
-     memcpy(&g_crash_context_.float_state, fp_ptr,
-            sizeof(g_crash_context_.float_state));

chromium-63.0.3289.84-enable-mp3.patch

@@ -1,485 +0,0 @@
-diff -up chromium-63.0.3239.84/components/neterror/resources/sounds/button-press.mp3 chromium-63.0.3239.84/components/neterror/resources/sounds/button-press
-diff -up chromium-63.0.3239.84/components/neterror/resources/sounds/hit.mp3 chromium-63.0.3239.84/components/neterror/resources/sounds/hit
-diff -up chromium-63.0.3239.84/components/neterror/resources/sounds/score-reached.mp3 chromium-63.0.3239.84/components/neterror/resources/sounds/score-reached
-diff -up chromium-63.0.3239.84/media/base/mime_util_internal.cc.mp3 chromium-63.0.3239.84/media/base/mime_util_internal.cc
---- chromium-63.0.3239.84/media/base/mime_util_internal.cc.mp3	2017-12-06 15:05:29.000000000 -0500
-+++ chromium-63.0.3239.84/media/base/mime_util_internal.cc	2017-12-07 10:52:02.472510232 -0500
-@@ -266,15 +266,19 @@ void MimeUtil::AddSupportedMediaFormats(
-   CodecSet webm_codecs(webm_audio_codecs);
-   webm_codecs.insert(webm_video_codecs.begin(), webm_video_codecs.end());
- 
--#if BUILDFLAG(USE_PROPRIETARY_CODECS)
-   const CodecSet mp3_codecs{MP3};
-+#if BUILDFLAG(USE_PROPRIETARY_CODECS)
-   const CodecSet aac{MPEG2_AAC, MPEG4_AAC};
-+#else
-+  const CodecSet aac{};
-+#endif
-+  CodecSet mp4_audio_codecs(aac);
-+  mp4_audio_codecs.emplace(MP3);
- 
-+#if BUILDFLAG(USE_PROPRIETARY_CODECS)
-   CodecSet avc_and_aac(aac);
-   avc_and_aac.emplace(H264);
- 
--  CodecSet mp4_audio_codecs(aac);
--  mp4_audio_codecs.emplace(MP3);
-   mp4_audio_codecs.emplace(FLAC);
- #if BUILDFLAG(ENABLE_AC3_EAC3_AUDIO_DEMUXING)
-   mp4_audio_codecs.emplace(AC3);
-@@ -311,10 +315,10 @@ void MimeUtil::AddSupportedMediaFormats(
-   AddContainerWithCodecs("application/ogg", ogg_codecs, false);
-   AddContainerWithCodecs("audio/flac", implicit_codec, false);
- 
--#if BUILDFLAG(USE_PROPRIETARY_CODECS)
-   AddContainerWithCodecs("audio/mpeg", mp3_codecs, true);  // Allow "mp3".
-   AddContainerWithCodecs("audio/mp3", implicit_codec, true);
-   AddContainerWithCodecs("audio/x-mp3", implicit_codec, true);
-+#if BUILDFLAG(USE_PROPRIETARY_CODECS)
-   AddContainerWithCodecs("audio/aac", implicit_codec, true);  // AAC / ADTS.
-   AddContainerWithCodecs("audio/mp4", mp4_audio_codecs, true);
-   DCHECK(!mp4_video_codecs.empty());
-@@ -935,7 +939,6 @@ bool MimeUtil::IsCodecProprietary(Codec
-     case INVALID_CODEC:
-     case AC3:
-     case EAC3:
--    case MP3:
-     case MPEG2_AAC:
-     case MPEG4_AAC:
-     case H264:
-@@ -943,6 +946,7 @@ bool MimeUtil::IsCodecProprietary(Codec
-     case DOLBY_VISION:
-       return true;
- 
-+    case MP3:
-     case PCM:
-     case VORBIS:
-     case OPUS:
-diff -up chromium-63.0.3239.84/media/formats/BUILD.gn.mp3 chromium-63.0.3239.84/media/formats/BUILD.gn
---- chromium-63.0.3239.84/media/formats/BUILD.gn.mp3	2017-12-06 15:05:29.000000000 -0500
-+++ chromium-63.0.3239.84/media/formats/BUILD.gn	2017-12-07 10:52:02.473510212 -0500
-@@ -20,6 +20,14 @@ source_set("formats") {
-     "ac3/ac3_util.h",
-     "common/offset_byte_queue.cc",
-     "common/offset_byte_queue.h",
-+    "mpeg/adts_constants.cc",
-+    "mpeg/adts_constants.h",
-+    "mpeg/adts_stream_parser.cc",
-+    "mpeg/adts_stream_parser.h",
-+    "mpeg/mpeg1_audio_stream_parser.cc",
-+    "mpeg/mpeg1_audio_stream_parser.h",
-+    "mpeg/mpeg_audio_stream_parser_base.cc",
-+    "mpeg/mpeg_audio_stream_parser_base.h",
-     "webm/webm_audio_client.cc",
-     "webm/webm_audio_client.h",
-     "webm/webm_cluster_parser.cc",
-@@ -81,14 +89,6 @@ source_set("formats") {
-       "mp4/sample_to_group_iterator.h",
-       "mp4/track_run_iterator.cc",
-       "mp4/track_run_iterator.h",
--      "mpeg/adts_constants.cc",
--      "mpeg/adts_constants.h",
--      "mpeg/adts_stream_parser.cc",
--      "mpeg/adts_stream_parser.h",
--      "mpeg/mpeg1_audio_stream_parser.cc",
--      "mpeg/mpeg1_audio_stream_parser.h",
--      "mpeg/mpeg_audio_stream_parser_base.cc",
--      "mpeg/mpeg_audio_stream_parser_base.h",
-     ]
-   }
- 
-diff -up chromium-63.0.3239.84/third_party/catapult/third_party/gsutil/gslib/tests/test_data/test.mp3 chromium-63.0.3239.84/third_party/catapult/third_party/gsutil/gslib/tests/test_data/test
-diff -up chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h.mp3 chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h
---- chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h.mp3	2017-12-07 09:51:37.000000000 -0500
-+++ chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h	2017-12-07 11:08:41.116117073 -0500
-@@ -1,7 +1,7 @@
- /* Automatically generated by configure - do not modify! */
- #ifndef FFMPEG_CONFIG_H
- #define FFMPEG_CONFIG_H
--#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/blink3/src/third_party/opus/src/include --disable-linux-perf --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic"
-+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/blink3/src/third_party/opus/src/include --disable-linux-perf --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
- #define FFMPEG_LICENSE "LGPL version 2.1 or later"
- #define CONFIG_THIS_YEAR 2017
- #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
-@@ -547,7 +547,7 @@
- #define CONFIG_FFPROBE 0
- #define CONFIG_FFSERVER 0
- #define CONFIG_FFMPEG 0
--#define CONFIG_DCT 0
-+#define CONFIG_DCT 1
- #define CONFIG_DWT 0
- #define CONFIG_ERROR_RESILIENCE 0
- #define CONFIG_FAAN 1
-@@ -626,9 +626,9 @@
- #define CONFIG_LZF 0
- #define CONFIG_ME_CMP 0
- #define CONFIG_MPEG_ER 0
--#define CONFIG_MPEGAUDIO 0
--#define CONFIG_MPEGAUDIODSP 0
--#define CONFIG_MPEGAUDIOHEADER 0
-+#define CONFIG_MPEGAUDIO 1
-+#define CONFIG_MPEGAUDIODSP 1
-+#define CONFIG_MPEGAUDIOHEADER 1
- #define CONFIG_MPEGVIDEO 0
- #define CONFIG_MPEGVIDEOENC 0
- #define CONFIG_MSS34DSP 0
-@@ -979,7 +979,7 @@
- #define CONFIG_MP1FLOAT_DECODER 0
- #define CONFIG_MP2_DECODER 0
- #define CONFIG_MP2FLOAT_DECODER 0
--#define CONFIG_MP3_DECODER 0
-+#define CONFIG_MP3_DECODER 1
- #define CONFIG_MP3FLOAT_DECODER 0
- #define CONFIG_MP3ADU_DECODER 0
- #define CONFIG_MP3ADUFLOAT_DECODER 0
-@@ -1292,7 +1292,7 @@
- #define CONFIG_MM_DEMUXER 0
- #define CONFIG_MMF_DEMUXER 0
- #define CONFIG_MOV_DEMUXER 0
--#define CONFIG_MP3_DEMUXER 0
-+#define CONFIG_MP3_DEMUXER 1
- #define CONFIG_MPC_DEMUXER 0
- #define CONFIG_MPC8_DEMUXER 0
- #define CONFIG_MPEGPS_DEMUXER 0
-@@ -2267,7 +2267,7 @@
- #define CONFIG_MJPEG_PARSER 0
- #define CONFIG_MLP_PARSER 0
- #define CONFIG_MPEG4VIDEO_PARSER 0
--#define CONFIG_MPEGAUDIO_PARSER 0
-+#define CONFIG_MPEGAUDIO_PARSER 1
- #define CONFIG_MPEGVIDEO_PARSER 0
- #define CONFIG_OPUS_PARSER 1
- #define CONFIG_PNG_PARSER 0
-diff -up chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h.mp3 chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h
---- chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h.mp3	2017-12-07 09:51:37.000000000 -0500
-+++ chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h	2017-12-07 11:09:23.602291820 -0500
-@@ -1,7 +1,7 @@
- /* Automatically generated by configure - do not modify! */
- #ifndef FFMPEG_CONFIG_H
- #define FFMPEG_CONFIG_H
--#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/chcunningham/chrome_root/src/third_party/opus/src/include --disable-linux-perf --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --disable-neon --extra-cflags='-mfpu=vfpv3-d16' --enable-pic"
-+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/chcunningham/chrome_root/src/third_party/opus/src/include --disable-linux-perf --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --disable-neon --extra-cflags='-mfpu=vfpv3-d16' --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
- #define FFMPEG_LICENSE "LGPL version 2.1 or later"
- #define CONFIG_THIS_YEAR 2017
- #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
-@@ -547,7 +547,7 @@
- #define CONFIG_FFPROBE 0
- #define CONFIG_FFSERVER 0
- #define CONFIG_FFMPEG 0
--#define CONFIG_DCT 0
-+#define CONFIG_DCT 1
- #define CONFIG_DWT 0
- #define CONFIG_ERROR_RESILIENCE 0
- #define CONFIG_FAAN 1
-@@ -626,9 +626,9 @@
- #define CONFIG_LZF 0
- #define CONFIG_ME_CMP 0
- #define CONFIG_MPEG_ER 0
--#define CONFIG_MPEGAUDIO 0
--#define CONFIG_MPEGAUDIODSP 0
--#define CONFIG_MPEGAUDIOHEADER 0
-+#define CONFIG_MPEGAUDIO 1
-+#define CONFIG_MPEGAUDIODSP 1
-+#define CONFIG_MPEGAUDIOHEADER 1
- #define CONFIG_MPEGVIDEO 0
- #define CONFIG_MPEGVIDEOENC 0
- #define CONFIG_MSS34DSP 0
-@@ -979,7 +979,7 @@
- #define CONFIG_MP1FLOAT_DECODER 0
- #define CONFIG_MP2_DECODER 0
- #define CONFIG_MP2FLOAT_DECODER 0
--#define CONFIG_MP3_DECODER 0
-+#define CONFIG_MP3_DECODER 1
- #define CONFIG_MP3FLOAT_DECODER 0
- #define CONFIG_MP3ADU_DECODER 0
- #define CONFIG_MP3ADUFLOAT_DECODER 0
-@@ -1292,7 +1292,7 @@
- #define CONFIG_MM_DEMUXER 0
- #define CONFIG_MMF_DEMUXER 0
- #define CONFIG_MOV_DEMUXER 0
--#define CONFIG_MP3_DEMUXER 0
-+#define CONFIG_MP3_DEMUXER 1
- #define CONFIG_MPC_DEMUXER 0
- #define CONFIG_MPC8_DEMUXER 0
- #define CONFIG_MPEGPS_DEMUXER 0
-@@ -2267,7 +2267,7 @@
- #define CONFIG_MJPEG_PARSER 0
- #define CONFIG_MLP_PARSER 0
- #define CONFIG_MPEG4VIDEO_PARSER 0
--#define CONFIG_MPEGAUDIO_PARSER 0
-+#define CONFIG_MPEGAUDIO_PARSER 1
- #define CONFIG_MPEGVIDEO_PARSER 0
- #define CONFIG_OPUS_PARSER 1
- #define CONFIG_PNG_PARSER 0
-diff -up chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h.mp3 chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h
---- chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h.mp3	2017-12-07 09:51:37.000000000 -0500
-+++ chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h	2017-12-07 11:09:49.945779754 -0500
-@@ -1,7 +1,7 @@
- /* Automatically generated by configure - do not modify! */
- #ifndef FFMPEG_CONFIG_H
- #define FFMPEG_CONFIG_H
--#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/chcunningham/chrome_root/src/third_party/opus/src/include --disable-linux-perf --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --enable-neon --extra-cflags='-mfpu=neon' --enable-pic"
-+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/chcunningham/chrome_root/src/third_party/opus/src/include --disable-linux-perf --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --enable-neon --extra-cflags='-mfpu=neon' --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
- #define FFMPEG_LICENSE "LGPL version 2.1 or later"
- #define CONFIG_THIS_YEAR 2017
- #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
-@@ -547,7 +547,7 @@
- #define CONFIG_FFPROBE 0
- #define CONFIG_FFSERVER 0
- #define CONFIG_FFMPEG 0
--#define CONFIG_DCT 0
-+#define CONFIG_DCT 1
- #define CONFIG_DWT 0
- #define CONFIG_ERROR_RESILIENCE 0
- #define CONFIG_FAAN 1
-@@ -626,9 +626,9 @@
- #define CONFIG_LZF 0
- #define CONFIG_ME_CMP 0
- #define CONFIG_MPEG_ER 0
--#define CONFIG_MPEGAUDIO 0
--#define CONFIG_MPEGAUDIODSP 0
--#define CONFIG_MPEGAUDIOHEADER 0
-+#define CONFIG_MPEGAUDIO 1
-+#define CONFIG_MPEGAUDIODSP 1
-+#define CONFIG_MPEGAUDIOHEADER 1
- #define CONFIG_MPEGVIDEO 0
- #define CONFIG_MPEGVIDEOENC 0
- #define CONFIG_MSS34DSP 0
-@@ -979,7 +979,7 @@
- #define CONFIG_MP1FLOAT_DECODER 0
- #define CONFIG_MP2_DECODER 0
- #define CONFIG_MP2FLOAT_DECODER 0
--#define CONFIG_MP3_DECODER 0
-+#define CONFIG_MP3_DECODER 1
- #define CONFIG_MP3FLOAT_DECODER 0
- #define CONFIG_MP3ADU_DECODER 0
- #define CONFIG_MP3ADUFLOAT_DECODER 0
-@@ -1292,7 +1292,7 @@
- #define CONFIG_MM_DEMUXER 0
- #define CONFIG_MMF_DEMUXER 0
- #define CONFIG_MOV_DEMUXER 0
--#define CONFIG_MP3_DEMUXER 0
-+#define CONFIG_MP3_DEMUXER 1
- #define CONFIG_MPC_DEMUXER 0
- #define CONFIG_MPC8_DEMUXER 0
- #define CONFIG_MPEGPS_DEMUXER 0
-@@ -2267,7 +2267,7 @@
- #define CONFIG_MJPEG_PARSER 0
- #define CONFIG_MLP_PARSER 0
- #define CONFIG_MPEG4VIDEO_PARSER 0
--#define CONFIG_MPEGAUDIO_PARSER 0
-+#define CONFIG_MPEGAUDIO_PARSER 1
- #define CONFIG_MPEGVIDEO_PARSER 0
- #define CONFIG_OPUS_PARSER 1
- #define CONFIG_PNG_PARSER 0
-diff -up chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.mp3 chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h
---- chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.mp3	2017-12-07 09:51:37.000000000 -0500
-+++ chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h	2017-12-07 11:10:25.513089579 -0500
-@@ -1,7 +1,7 @@
- /* Automatically generated by configure - do not modify! */
- #ifndef FFMPEG_CONFIG_H
- #define FFMPEG_CONFIG_H
--#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/blink3/src/third_party/opus/src/include --disable-linux-perf --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-yasm --enable-pic"
-+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/blink3/src/third_party/opus/src/include --disable-linux-perf --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-yasm --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
- #define FFMPEG_LICENSE "LGPL version 2.1 or later"
- #define CONFIG_THIS_YEAR 2017
- #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
-@@ -547,7 +547,7 @@
- #define CONFIG_FFPROBE 0
- #define CONFIG_FFSERVER 0
- #define CONFIG_FFMPEG 0
--#define CONFIG_DCT 0
-+#define CONFIG_DCT 1
- #define CONFIG_DWT 0
- #define CONFIG_ERROR_RESILIENCE 0
- #define CONFIG_FAAN 1
-@@ -626,9 +626,9 @@
- #define CONFIG_LZF 0
- #define CONFIG_ME_CMP 0
- #define CONFIG_MPEG_ER 0
--#define CONFIG_MPEGAUDIO 0
--#define CONFIG_MPEGAUDIODSP 0
--#define CONFIG_MPEGAUDIOHEADER 0
-+#define CONFIG_MPEGAUDIO 1
-+#define CONFIG_MPEGAUDIODSP 1
-+#define CONFIG_MPEGAUDIOHEADER 1
- #define CONFIG_MPEGVIDEO 0
- #define CONFIG_MPEGVIDEOENC 0
- #define CONFIG_MSS34DSP 0
-@@ -979,7 +979,7 @@
- #define CONFIG_MP1FLOAT_DECODER 0
- #define CONFIG_MP2_DECODER 0
- #define CONFIG_MP2FLOAT_DECODER 0
--#define CONFIG_MP3_DECODER 0
-+#define CONFIG_MP3_DECODER 1
- #define CONFIG_MP3FLOAT_DECODER 0
- #define CONFIG_MP3ADU_DECODER 0
- #define CONFIG_MP3ADUFLOAT_DECODER 0
-@@ -1292,7 +1292,7 @@
- #define CONFIG_MM_DEMUXER 0
- #define CONFIG_MMF_DEMUXER 0
- #define CONFIG_MOV_DEMUXER 0
--#define CONFIG_MP3_DEMUXER 0
-+#define CONFIG_MP3_DEMUXER 1
- #define CONFIG_MPC_DEMUXER 0
- #define CONFIG_MPC8_DEMUXER 0
- #define CONFIG_MPEGPS_DEMUXER 0
-@@ -2267,7 +2267,7 @@
- #define CONFIG_MJPEG_PARSER 0
- #define CONFIG_MLP_PARSER 0
- #define CONFIG_MPEG4VIDEO_PARSER 0
--#define CONFIG_MPEGAUDIO_PARSER 0
-+#define CONFIG_MPEGAUDIO_PARSER 1
- #define CONFIG_MPEGVIDEO_PARSER 0
- #define CONFIG_OPUS_PARSER 1
- #define CONFIG_PNG_PARSER 0
-diff -up chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h.mp3 chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h
---- chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h.mp3	2017-12-07 09:51:37.000000000 -0500
-+++ chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h	2017-12-07 11:10:50.721599547 -0500
-@@ -1,7 +1,7 @@
- /* Automatically generated by configure - do not modify! */
- #ifndef FFMPEG_CONFIG_H
- #define FFMPEG_CONFIG_H
--#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/blink3/src/third_party/opus/src/include --disable-linux-perf --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --enable-pic"
-+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/blink3/src/third_party/opus/src/include --disable-linux-perf --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
- #define FFMPEG_LICENSE "LGPL version 2.1 or later"
- #define CONFIG_THIS_YEAR 2017
- #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
-@@ -547,7 +547,7 @@
- #define CONFIG_FFPROBE 0
- #define CONFIG_FFSERVER 0
- #define CONFIG_FFMPEG 0
--#define CONFIG_DCT 0
-+#define CONFIG_DCT 1
- #define CONFIG_DWT 0
- #define CONFIG_ERROR_RESILIENCE 0
- #define CONFIG_FAAN 1
-@@ -626,9 +626,9 @@
- #define CONFIG_LZF 0
- #define CONFIG_ME_CMP 0
- #define CONFIG_MPEG_ER 0
--#define CONFIG_MPEGAUDIO 0
--#define CONFIG_MPEGAUDIODSP 0
--#define CONFIG_MPEGAUDIOHEADER 0
-+#define CONFIG_MPEGAUDIO 1
-+#define CONFIG_MPEGAUDIODSP 1
-+#define CONFIG_MPEGAUDIOHEADER 1
- #define CONFIG_MPEGVIDEO 0
- #define CONFIG_MPEGVIDEOENC 0
- #define CONFIG_MSS34DSP 0
-@@ -979,7 +979,7 @@
- #define CONFIG_MP1FLOAT_DECODER 0
- #define CONFIG_MP2_DECODER 0
- #define CONFIG_MP2FLOAT_DECODER 0
--#define CONFIG_MP3_DECODER 0
-+#define CONFIG_MP3_DECODER 1
- #define CONFIG_MP3FLOAT_DECODER 0
- #define CONFIG_MP3ADU_DECODER 0
- #define CONFIG_MP3ADUFLOAT_DECODER 0
-@@ -1292,7 +1292,7 @@
- #define CONFIG_MM_DEMUXER 0
- #define CONFIG_MMF_DEMUXER 0
- #define CONFIG_MOV_DEMUXER 0
--#define CONFIG_MP3_DEMUXER 0
-+#define CONFIG_MP3_DEMUXER 1
- #define CONFIG_MPC_DEMUXER 0
- #define CONFIG_MPC8_DEMUXER 0
- #define CONFIG_MPEGPS_DEMUXER 0
-@@ -2267,7 +2267,7 @@
- #define CONFIG_MJPEG_PARSER 0
- #define CONFIG_MLP_PARSER 0
- #define CONFIG_MPEG4VIDEO_PARSER 0
--#define CONFIG_MPEGAUDIO_PARSER 0
-+#define CONFIG_MPEGAUDIO_PARSER 1
- #define CONFIG_MPEGVIDEO_PARSER 0
- #define CONFIG_OPUS_PARSER 1
- #define CONFIG_PNG_PARSER 0
-diff -up chromium-63.0.3239.84/third_party/ffmpeg/ffmpeg_generated.gni.mp3 chromium-63.0.3239.84/third_party/ffmpeg/ffmpeg_generated.gni
---- chromium-63.0.3239.84/third_party/ffmpeg/ffmpeg_generated.gni.mp3	2017-12-07 09:51:36.000000000 -0500
-+++ chromium-63.0.3239.84/third_party/ffmpeg/ffmpeg_generated.gni	2017-12-07 11:16:58.728447124 -0500
-@@ -183,17 +183,9 @@ if ((is_mac) || (is_win) || (use_linux_c
-   ]
- }
- 
--if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) {
-+if ((current_cpu == "x64") || (is_android && current_cpu == "arm" && arm_use_neon) || (is_android && current_cpu == "arm64") || (is_android && current_cpu == "mips64el") || (is_android && current_cpu == "mipsel") || (is_android && current_cpu == "x86") || (is_win) || (use_linux_config && current_cpu == "arm" && arm_use_neon) || (use_linux_config && current_cpu == "arm") || (use_linux_config && current_cpu == "arm64") || (use_linux_config && current_cpu == "mipsel") || (use_linux_config && current_cpu == "x64") || (use_linux_config && current_cpu == "x86")) {
-   ffmpeg_c_sources += [
--    "libavcodec/aac_ac3_parser.c",
--    "libavcodec/aac_parser.c",
--    "libavcodec/aacadtsdec.c",
--    "libavcodec/aacps_float.c",
--    "libavcodec/aacpsdsp_float.c",
--    "libavcodec/aacsbr.c",
--    "libavcodec/aactab.c",
-     "libavcodec/ac3tab.c",
--    "libavcodec/autorename_libavcodec_aacdec.c",
-     "libavcodec/autorename_libavcodec_mdct15.c",
-     "libavcodec/autorename_libavcodec_mpegaudiodsp.c",
-     "libavcodec/autorename_libavcodec_sbrdsp.c",
-@@ -211,7 +203,6 @@ if ((current_cpu == "x64" && ffmpeg_bran
-     "libavcodec/mpegaudiodsp_float.c",
-     "libavcodec/sinewin.c",
-     "libavcodec/sinewin_fixed.c",
--    "libavformat/aacdec.c",
-     "libavformat/apetag.c",
-     "libavformat/img2.c",
-     "libavformat/mov.c",
-@@ -220,6 +211,20 @@ if ((current_cpu == "x64" && ffmpeg_bran
-   ]
- }
- 
-+if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) {
-+  ffmpeg_c_sources += [
-+    "libavcodec/aac_ac3_parser.c",
-+    "libavcodec/aac_parser.c",
-+    "libavcodec/aacadtsdec.c",
-+    "libavcodec/aacps_float.c",
-+    "libavcodec/aacpsdsp_float.c",
-+    "libavcodec/aacsbr.c",
-+    "libavcodec/aactab.c",
-+    "libavcodec/autorename_libavcodec_aacdec.c",
-+    "libavformat/aacdec.c",
-+  ]
-+}
-+
- if ((is_android && current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_mac) || (is_win) || (use_linux_config && current_cpu == "x64") || (use_linux_config && current_cpu == "x86")) {
-   ffmpeg_c_sources += [
-     "libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c",
-@@ -323,16 +328,20 @@ if ((is_mac) || (is_win) || (use_linux_c
- if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) {
-   ffmpeg_c_sources += [
-     "libavcodec/x86/aacpsdsp_init.c",
-+  ]
-+  ffmpeg_yasm_sources += [
-+    "libavcodec/x86/aacpsdsp.asm",
-+  ]
-+}
-+
-+if ((current_cpu == "x64") || (is_android && current_cpu == "x86") || (use_linux_config && current_cpu == "x64") || (use_linux_config && current_cpu == "x86") || (is_win)) {
-+  ffmpeg_c_sources += [
-     "libavcodec/x86/dct_init.c",
-     "libavcodec/x86/mdct15_init.c",
-     "libavcodec/x86/mpegaudiodsp.c",
-     "libavcodec/x86/sbrdsp_init.c",
-   ]
--}
--
--if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) {
-   ffmpeg_yasm_sources += [
--    "libavcodec/x86/aacpsdsp.asm",
-     "libavcodec/x86/dct32.asm",
-     "libavcodec/x86/imdct36.asm",
-     "libavcodec/x86/mdct15.asm",
-diff -up chromium-63.0.3239.84/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 chromium-63.0.3239.84/third_party/ffmpeg/libavcodec/sbrdsp.c
---- chromium-63.0.3239.84/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3	2017-12-07 09:51:37.000000000 -0500
-+++ chromium-63.0.3239.84/third_party/ffmpeg/libavcodec/sbrdsp.c	2017-12-07 10:52:02.484509992 -0500
-@@ -23,6 +23,7 @@
- #define USE_FIXED 0
- 
- #include "aac.h"
-+#include "aacsbrdata.h"
- #include "config.h"
- #include "libavutil/attributes.h"
- #include "libavutil/intfloat.h"
-diff -up chromium-63.0.3239.84/third_party/webrtc/examples/objc/AppRTCMobile/ios/resources/mozart.mp3 chromium-63.0.3239.84/third_party/webrtc/examples/objc/AppRTCMobile/ios/resources/mozart
-diff -up chromium-63.0.3239.84/tools/android/audio_focus_grabber/java/res/raw/ping.mp3 chromium-63.0.3239.84/tools/android/audio_focus_grabber/java/res/raw/ping

chromium-63.0.3289.84-fix-ffmpeg-aarch64.patch

@@ -1,12 +0,0 @@
-diff -up chromium-63.0.3239.84/third_party/ffmpeg/ffmpeg_generated.gni.aarch64 chromium-63.0.3239.84/third_party/ffmpeg/ffmpeg_generated.gni
---- chromium-63.0.3239.84/third_party/ffmpeg/ffmpeg_generated.gni.aarch64	2017-12-07 11:23:07.077290535 -0500
-+++ chromium-63.0.3239.84/third_party/ffmpeg/ffmpeg_generated.gni	2017-12-07 11:27:30.354175021 -0500
-@@ -541,7 +541,7 @@ if (use_linux_config && current_cpu == "
-   ]
- }
- 
--if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) {
-+if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64")) {
-   ffmpeg_c_sources += [
-     "libavcodec/aarch64/aacpsdsp_init_aarch64.c",
-     "libavcodec/aarch64/mpegaudiodsp_init.c",

chromium-63.0.3289.84-fix-ft-hb-unbundle.patch

@@ -1,36 +0,0 @@
-diff -up chromium-63.0.3239.84/build/linux/unbundle/freetype.gn.fixunbundle chromium-63.0.3239.84/build/linux/unbundle/freetype.gn
---- chromium-63.0.3239.84/build/linux/unbundle/freetype.gn.fixunbundle	2017-12-07 12:07:48.652161826 -0500
-+++ chromium-63.0.3239.84/build/linux/unbundle/freetype.gn	2017-12-07 12:08:52.514919585 -0500
-@@ -117,6 +117,14 @@ source_set("freetype") {
-   public_configs = [ ":freetype_config" ]
- }
- 
-+source_set("freetype_source") {
-+  visibility = [ "//third_party:freetype_harfbuzz" ]
-+  deps = [
-+    ":freetype_shim",
-+  ]
-+  public_configs = [ ":freetype_config" ]
-+}
-+
- source_set("bootstrap_freetype_for_harfbuzz") {
-   deps = [
-     ":freetype_shim",
-diff -up chromium-63.0.3239.84/build/linux/unbundle/harfbuzz-ng.gn.fixunbundle chromium-63.0.3239.84/build/linux/unbundle/harfbuzz-ng.gn
---- chromium-63.0.3239.84/build/linux/unbundle/harfbuzz-ng.gn.fixunbundle	2017-12-07 12:09:57.057661738 -0500
-+++ chromium-63.0.3239.84/build/linux/unbundle/harfbuzz-ng.gn	2017-12-07 12:10:03.225541404 -0500
-@@ -24,6 +24,14 @@ group("harfbuzz-ng") {
-   ]
- }
- 
-+source_set("harfbuzz_source") {
-+  visibility = [ "//third_party:freetype_harfbuzz" ]
-+  deps = [
-+    ":harfbuzz_shim",
-+  ]
-+  public_configs = [ ":system_harfbuzz" ]
-+}
-+
- source_set("harfbuzz-ng-ft") {
-   deps = [
-     ":harfbuzz_shim",

chromium-63.0.3289.84-gcc-round-fix.patch

@@ -1,11 +0,0 @@
-diff -up chromium-63.0.3239.84/third_party/webrtc/p2p/base/port.cc.gcc-round-fix chromium-63.0.3239.84/third_party/webrtc/p2p/base/port.cc
---- chromium-63.0.3239.84/third_party/webrtc/p2p/base/port.cc.gcc-round-fix	2017-12-07 16:20:01.521717091 -0500
-+++ chromium-63.0.3239.84/third_party/webrtc/p2p/base/port.cc	2017-12-07 16:20:13.025491739 -0500
-@@ -11,6 +11,7 @@
- #include "p2p/base/port.h"
- 
- #include <algorithm>
-+#include <cmath>
- #include <vector>
- 
- #include "p2p/base/common.h"

chromium-63.0.3289.84-gcc5-r3.patch

@@ -1,104 +0,0 @@
-diff -up chromium-63.0.3239.84/gpu/ipc/common/mailbox_struct_traits.h.gcc5-r3 chromium-63.0.3239.84/gpu/ipc/common/mailbox_struct_traits.h
---- chromium-63.0.3239.84/gpu/ipc/common/mailbox_struct_traits.h.gcc5-r3	2017-12-06 15:05:28.000000000 -0500
-+++ chromium-63.0.3239.84/gpu/ipc/common/mailbox_struct_traits.h	2017-12-07 11:32:15.416636125 -0500
-@@ -15,7 +15,7 @@ namespace mojo {
- template <>
- struct StructTraits<gpu::mojom::MailboxDataView, gpu::Mailbox> {
-   static base::span<const int8_t> name(const gpu::Mailbox& mailbox) {
--    return mailbox.name;
-+    return base::make_span(mailbox.name);
-   }
-   static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out);
- };
-diff -up chromium-63.0.3239.84/services/viz/public/cpp/compositing/filter_operation_struct_traits.h.gcc5-r3 chromium-63.0.3239.84/services/viz/public/cpp/compositing/filter_operation_struct_traits.h
---- chromium-63.0.3239.84/services/viz/public/cpp/compositing/filter_operation_struct_traits.h.gcc5-r3	2017-12-06 15:05:31.000000000 -0500
-+++ chromium-63.0.3239.84/services/viz/public/cpp/compositing/filter_operation_struct_traits.h	2017-12-07 11:32:15.422636011 -0500
-@@ -134,7 +134,7 @@ struct StructTraits<viz::mojom::FilterOp
-   static base::span<const float> matrix(const cc::FilterOperation& operation) {
-     if (operation.type() != cc::FilterOperation::COLOR_MATRIX)
-       return base::span<const float>();
--    return operation.matrix();
-+    return base::make_span(operation.matrix());
-   }
- 
-   static base::span<const gfx::Rect> shape(
-diff -up chromium-63.0.3239.84/services/viz/public/cpp/compositing/quads_struct_traits.h.gcc5-r3 chromium-63.0.3239.84/services/viz/public/cpp/compositing/quads_struct_traits.h
---- chromium-63.0.3239.84/services/viz/public/cpp/compositing/quads_struct_traits.h.gcc5-r3	2017-12-07 11:32:15.429635877 -0500
-+++ chromium-63.0.3239.84/services/viz/public/cpp/compositing/quads_struct_traits.h	2017-12-07 11:34:00.081601880 -0500
-@@ -309,7 +309,7 @@ struct StructTraits<viz::mojom::TextureQ
-   static base::span<const float> vertex_opacity(const viz::DrawQuad& input) {
-     const viz::TextureDrawQuad* quad =
-         viz::TextureDrawQuad::MaterialCast(&input);
--    return quad->vertex_opacity;
-+    return base::make_span(quad->vertex_opacity);
-   }
- 
-   static bool y_flipped(const viz::DrawQuad& input) {
-diff -up chromium-63.0.3239.84/third_party/WebKit/Source/platform/exported/WebCORS.cpp.gcc5-r3 chromium-63.0.3239.84/third_party/WebKit/Source/platform/exported/WebCORS.cpp
---- chromium-63.0.3239.84/third_party/WebKit/Source/platform/exported/WebCORS.cpp.gcc5-r3	2017-12-06 15:05:46.000000000 -0500
-+++ chromium-63.0.3239.84/third_party/WebKit/Source/platform/exported/WebCORS.cpp	2017-12-07 11:32:15.430635859 -0500
-@@ -480,7 +480,7 @@ WebString AccessControlErrorString(
-     }
-     default:
-       NOTREACHED();
--      return "";
-+      return WebString();
-   }
- }
- 
-@@ -512,7 +512,7 @@ WebString PreflightErrorString(const Pre
-     }
-     default:
-       NOTREACHED();
--      return "";
-+      return WebString();
-   }
- }
- 
-@@ -533,7 +533,7 @@ WebString RedirectErrorString(const Redi
-     }
-     default:
-       NOTREACHED();
--      return "";
-+      return WebString();
-   }
- }
- 
-diff -up chromium-63.0.3239.84/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h.gcc5-r3 chromium-63.0.3239.84/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
---- chromium-63.0.3239.84/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h.gcc5-r3	2017-12-06 15:05:46.000000000 -0500
-+++ chromium-63.0.3239.84/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h	2017-12-07 11:32:15.408636277 -0500
-@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents {
-           allocation_length_(0),
-           data_(data),
-           data_length_(0),
--          kind_(AllocationKind::kNormal),
-+          kind_(WTF::ArrayBufferContents::AllocationKind::kNormal),
-           deleter_(deleter) {}
-     DataHandle(void* allocation_base,
-                size_t allocation_length,
-@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents {
-              reinterpret_cast<uintptr_t>(allocation_base_) +
-                  allocation_length_);
-       switch (kind_) {
--        case AllocationKind::kNormal:
-+        case WTF::ArrayBufferContents::AllocationKind::kNormal:
-           DCHECK(deleter_);
-           deleter_(data_);
-           return;
--        case AllocationKind::kReservation:
-+        case WTF::ArrayBufferContents::AllocationKind::kReservation:
-           ReleaseReservedMemory(allocation_base_, allocation_length_);
-           return;
-       }
-diff -up chromium-63.0.3239.84/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5-r3 chromium-63.0.3239.84/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc
---- chromium-63.0.3239.84/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5-r3	2017-12-07 11:32:15.409636258 -0500
-+++ chromium-63.0.3239.84/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc	2017-12-07 11:33:10.714561105 -0500
-@@ -10,7 +10,7 @@
- 
- #include "modules/audio_processing/aec3/aec_state.h"
- 
--#include <math.h>
-+#include <cmath>
- #include <numeric>
- #include <vector>
- 

chromium-63.0.3289.84-nolibc++.patch

@@ -1,15 +0,0 @@
-diff -up chromium-63.0.3239.84/remoting/host/linux/BUILD.gn.nolibc++ chromium-63.0.3239.84/remoting/host/linux/BUILD.gn
---- chromium-63.0.3239.84/remoting/host/linux/BUILD.gn.nolibc++	2017-12-07 11:55:43.173273434 -0500
-+++ chromium-63.0.3239.84/remoting/host/linux/BUILD.gn	2017-12-07 11:55:53.244077772 -0500
-@@ -62,11 +62,9 @@ if (enable_me2me_host) {
-     if (is_component_build) {
-       sources += [
-         "$root_build_dir/libbase.so",
--        "$root_build_dir/libc++.so",
-       ]
-       deps += [
-         "//base:base",
--        "//buildtools/third_party/libc++:libc++",
-       ]
-     }
-   }

chromium-63.0.3289.84-nullfix.patch

@@ -1,43 +0,0 @@
-diff -up chromium-63.0.3239.84/build/toolchain/linux/BUILD.gn.nullfix chromium-63.0.3239.84/build/toolchain/linux/BUILD.gn
---- chromium-63.0.3239.84/build/toolchain/linux/BUILD.gn.nullfix	2017-12-06 15:05:21.000000000 -0500
-+++ chromium-63.0.3239.84/build/toolchain/linux/BUILD.gn	2017-12-07 10:44:34.507207080 -0500
-@@ -31,6 +31,7 @@ gcc_toolchain("arm64") {
-   ld = cxx
-   readelf = "${toolprefix}readelf"
-   nm = "${toolprefix}nm"
-+  extra_cppflags = "-fno-delete-null-pointer-checks"
- 
-   toolchain_args = {
-     current_cpu = "arm64"
-@@ -49,6 +50,7 @@ gcc_toolchain("arm") {
-   ld = cxx
-   readelf = "${toolprefix}readelf"
-   nm = "${toolprefix}nm"
-+  extra_cppflags = "-fno-delete-null-pointer-checks"
- 
-   toolchain_args = {
-     current_cpu = "arm"
-@@ -99,6 +101,7 @@ gcc_toolchain("x86") {
-   nm = "nm"
-   ar = "ar"
-   ld = cxx
-+  extra_cppflags = "-fno-delete-null-pointer-checks"
- 
-   # Output linker map files for binary size analysis.
-   enable_linker_map = true
-@@ -152,6 +155,7 @@ gcc_toolchain("x64") {
-   nm = "nm"
-   ar = "ar"
-   ld = cxx
-+  extra_cppflags = "-fno-delete-null-pointer-checks"
- 
-   # Output linker map files for binary size analysis.
-   enable_linker_map = true
-@@ -186,6 +190,7 @@ gcc_toolchain("mipsel") {
-   ld = cxx
-   readelf = "${toolprefix}readelf"
-   nm = "${toolprefix}nm"
-+  extra_cppflags = "-fno-delete-null-pointer-checks"
- 
-   toolchain_args = {
-     cc_wrapper = ""

chromium-63.0.3289.84-setopaque.patch

@@ -1,12 +0,0 @@
-diff -up chromium-63.0.3239.84/cc/blink/web_layer_impl.h.setopaque chromium-63.0.3239.84/cc/blink/web_layer_impl.h
---- chromium-63.0.3239.84/cc/blink/web_layer_impl.h.setopaque	2017-12-07 10:47:48.262446682 -0500
-+++ chromium-63.0.3239.84/cc/blink/web_layer_impl.h	2017-12-07 10:48:47.437298948 -0500
-@@ -67,7 +67,7 @@ class CC_BLINK_EXPORT WebLayerImpl : pub
-   void SetIsRootForIsolatedGroup(bool root) override;
-   bool IsRootForIsolatedGroup() override;
-   void SetHitTestableWithoutDrawsContent(bool should_hit_test) override;
--  void SetOpaque(bool opaque) override;
-+  CC_BLINK_EXPORT void SetOpaque(bool opaque) override;
-   bool Opaque() const override;
-   void SetPosition(const blink::WebFloatPoint& position) override;
-   blink::WebFloatPoint GetPosition() const override;

chromium-64.0.3282.119-enable-mp3.patch

@@ -1,54 +0,0 @@
-diff -up chromium-64.0.3282.119/media/base/mime_util_internal.cc.mp3 chromium-64.0.3282.119/media/base/mime_util_internal.cc
---- chromium-64.0.3282.119/media/base/mime_util_internal.cc.mp3	2018-01-24 15:05:48.000000000 -0500
-+++ chromium-64.0.3282.119/media/base/mime_util_internal.cc	2018-01-25 11:18:12.354147726 -0500
-@@ -279,15 +279,19 @@ void MimeUtil::AddSupportedMediaFormats(
-   CodecSet webm_codecs(webm_audio_codecs);
-   webm_codecs.insert(webm_video_codecs.begin(), webm_video_codecs.end());
- 
--#if BUILDFLAG(USE_PROPRIETARY_CODECS)
-   const CodecSet mp3_codecs{MP3};
-+#if BUILDFLAG(USE_PROPRIETARY_CODECS)
-   const CodecSet aac{MPEG2_AAC, MPEG4_AAC};
-+#else
-+  const CodecSet aac{};
-+#endif
-+  CodecSet mp4_audio_codecs(aac);
-+  mp4_audio_codecs.emplace(MP3);
- 
-+#if BUILDFLAG(USE_PROPRIETARY_CODECS)
-   CodecSet avc_and_aac(aac);
-   avc_and_aac.emplace(H264);
- 
--  CodecSet mp4_audio_codecs(aac);
--  mp4_audio_codecs.emplace(MP3);
-   mp4_audio_codecs.emplace(FLAC);
- #if BUILDFLAG(ENABLE_AC3_EAC3_AUDIO_DEMUXING)
-   mp4_audio_codecs.emplace(AC3);
-@@ -329,10 +333,10 @@ void MimeUtil::AddSupportedMediaFormats(
-   AddContainerWithCodecs("application/ogg", ogg_codecs, false);
-   AddContainerWithCodecs("audio/flac", implicit_codec, false);
- 
--#if BUILDFLAG(USE_PROPRIETARY_CODECS)
-   AddContainerWithCodecs("audio/mpeg", mp3_codecs, true);  // Allow "mp3".
-   AddContainerWithCodecs("audio/mp3", implicit_codec, true);
-   AddContainerWithCodecs("audio/x-mp3", implicit_codec, true);
-+#if BUILDFLAG(USE_PROPRIETARY_CODECS)
-   AddContainerWithCodecs("audio/aac", implicit_codec, true);  // AAC / ADTS.
-   AddContainerWithCodecs("audio/mp4", mp4_audio_codecs, true);
-   DCHECK(!mp4_video_codecs.empty());
-@@ -970,7 +974,6 @@ bool MimeUtil::IsCodecProprietary(Codec
-     case INVALID_CODEC:
-     case AC3:
-     case EAC3:
--    case MP3:
-     case MPEG2_AAC:
-     case MPEG4_AAC:
-     case H264:
-@@ -978,6 +981,7 @@ bool MimeUtil::IsCodecProprietary(Codec
-     case DOLBY_VISION:
-       return true;
- 
-+    case MP3:
-     case PCM:
-     case VORBIS:
-     case OPUS:

chromium-64.0.3282.119-ffmpeg-stdatomic.patch

@@ -1,17 +0,0 @@
-diff -up chromium-64.0.3282.119/third_party/ffmpeg/libavutil/cpu.c.ffmpeg-stdatomic chromium-64.0.3282.119/third_party/ffmpeg/libavutil/cpu.c
---- chromium-64.0.3282.119/third_party/ffmpeg/libavutil/cpu.c.ffmpeg-stdatomic	2018-01-25 11:55:57.880936815 -0500
-+++ chromium-64.0.3282.119/third_party/ffmpeg/libavutil/cpu.c	2018-01-25 11:57:18.456787888 -0500
-@@ -18,7 +18,13 @@
- 
- #include <stddef.h>
- #include <stdint.h>
-+// GCC 4.8 didn't have stdatomic, but was advertising it.
-+// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58016
-+#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ == 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ == 8)))
-+#include <compat/atomics/gcc/stdatomic.h>
-+#else
- #include <stdatomic.h>
-+#endif
- 
- #include "attributes.h"
- #include "cpu.h"

chromium-64.0.3282.119-gcc-constexpr-fix.patch

@@ -1,70 +0,0 @@
-diff -up chromium-64.0.3282.119/third_party/angle/src/compiler/translator/StaticType.h.gcc-constexpr chromium-64.0.3282.119/third_party/angle/src/compiler/translator/StaticType.h
---- chromium-64.0.3282.119/third_party/angle/src/compiler/translator/StaticType.h.gcc-constexpr	2018-01-25 15:50:16.971171007 -0500
-+++ chromium-64.0.3282.119/third_party/angle/src/compiler/translator/StaticType.h	2018-01-25 15:51:14.158053914 -0500
-@@ -160,7 +160,7 @@ template <TBasicType basicType,
-           TPrecision precision,
-           TQualifier qualifier,
-           unsigned char secondarySize>
--const TType *GetForVecMatHelper(unsigned char primarySize)
-+constexpr const TType *GetForVecMatHelper(unsigned char primarySize)
- {
-     static_assert(basicType == EbtFloat || basicType == EbtInt || basicType == EbtUInt ||
-                       basicType == EbtBool,
-@@ -186,7 +186,7 @@ const TType *GetForVecMatHelper(unsigned
- template <TBasicType basicType,
-           TPrecision precision = EbpUndefined,
-           TQualifier qualifier = EvqGlobal>
--const TType *GetForVecMat(unsigned char primarySize, unsigned char secondarySize = 1)
-+constexpr const TType *GetForVecMat(unsigned char primarySize, unsigned char secondarySize = 1)
- {
-     static_assert(basicType == EbtFloat || basicType == EbtInt || basicType == EbtUInt ||
-                       basicType == EbtBool,
-@@ -208,7 +208,7 @@ const TType *GetForVecMat(unsigned char
- }
- 
- template <TBasicType basicType, TPrecision precision = EbpUndefined>
--const TType *GetForVec(TQualifier qualifier, unsigned char size)
-+constexpr const TType *GetForVec(TQualifier qualifier, unsigned char size)
- {
-     switch (qualifier)
-     {
-diff -up chromium-64.0.3282.119/third_party/angle/src/compiler/translator/SymbolTable.cpp.gcc-constexpr chromium-64.0.3282.119/third_party/angle/src/compiler/translator/SymbolTable.cpp
---- chromium-64.0.3282.119/third_party/angle/src/compiler/translator/SymbolTable.cpp.gcc-constexpr	2018-01-25 15:51:27.670790008 -0500
-+++ chromium-64.0.3282.119/third_party/angle/src/compiler/translator/SymbolTable.cpp	2018-01-25 15:52:04.117077652 -0500
-@@ -189,7 +189,7 @@ TSymbolTable::~TSymbolTable()
-         pop();
- }
- 
--bool IsGenType(const TType *type)
-+constexpr bool IsGenType(const TType *type)
- {
-     if (type)
-     {
-@@ -201,7 +201,7 @@ bool IsGenType(const TType *type)
-     return false;
- }
- 
--bool IsVecType(const TType *type)
-+constexpr bool IsVecType(const TType *type)
- {
-     if (type)
-     {
-diff -up chromium-64.0.3282.119/third_party/angle/src/compiler/translator/Types.h.gcc-constexpr chromium-64.0.3282.119/third_party/angle/src/compiler/translator/Types.h
---- chromium-64.0.3282.119/third_party/angle/src/compiler/translator/Types.h.gcc-constexpr	2018-01-25 15:52:15.042864767 -0500
-+++ chromium-64.0.3282.119/third_party/angle/src/compiler/translator/Types.h	2018-01-25 15:52:56.763049389 -0500
-@@ -236,13 +236,13 @@ class TType
-     {
-     }
- 
--    TBasicType getBasicType() const { return type; }
-+    constexpr TBasicType getBasicType() const { return type; }
-     void setBasicType(TBasicType t);
- 
-     TPrecision getPrecision() const { return precision; }
-     void setPrecision(TPrecision p) { precision = p; }
- 
--    TQualifier getQualifier() const { return qualifier; }
-+    constexpr TQualifier getQualifier() const { return qualifier; }
-     void setQualifier(TQualifier q) { qualifier = q; }
- 
-     bool isInvariant() const { return invariant; }

chromium-64.0.3282.119-gcc-round-fix.patch

@@ -1,12 +0,0 @@
-diff -up chromium-64.0.3282.119/third_party/webrtc/p2p/base/port.cc.gcc-round-fix chromium-64.0.3282.119/third_party/webrtc/p2p/base/port.cc
---- chromium-64.0.3282.119/third_party/webrtc/p2p/base/port.cc.gcc-round-fix	2018-01-25 12:03:14.696443814 -0500
-+++ chromium-64.0.3282.119/third_party/webrtc/p2p/base/port.cc	2018-01-25 12:20:26.446448618 -0500
-@@ -10,7 +10,7 @@
- 
- #include "p2p/base/port.h"
- 
--#include <math.h>
-+#include <cmath>
- 
- #include <algorithm>
- #include <vector>

chromium-64.0.3282.119-gcc5-r3.patch

@@ -1,75 +0,0 @@
-diff -up chromium-64.0.3282.119/gpu/ipc/common/mailbox_struct_traits.h.gcc5-r3 chromium-64.0.3282.119/gpu/ipc/common/mailbox_struct_traits.h
---- chromium-64.0.3282.119/gpu/ipc/common/mailbox_struct_traits.h.gcc5-r3	2018-01-24 15:05:47.000000000 -0500
-+++ chromium-64.0.3282.119/gpu/ipc/common/mailbox_struct_traits.h	2018-01-25 11:58:48.251623423 -0500
-@@ -15,7 +15,7 @@ namespace mojo {
- template <>
- struct StructTraits<gpu::mojom::MailboxDataView, gpu::Mailbox> {
-   static base::span<const int8_t> name(const gpu::Mailbox& mailbox) {
--    return mailbox.name;
-+    return base::make_span(mailbox.name);
-   }
-   static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out);
- };
-diff -up chromium-64.0.3282.119/services/viz/public/cpp/compositing/filter_operation_struct_traits.h.gcc5-r3 chromium-64.0.3282.119/services/viz/public/cpp/compositing/filter_operation_struct_traits.h
---- chromium-64.0.3282.119/services/viz/public/cpp/compositing/filter_operation_struct_traits.h.gcc5-r3	2018-01-24 15:05:51.000000000 -0500
-+++ chromium-64.0.3282.119/services/viz/public/cpp/compositing/filter_operation_struct_traits.h	2018-01-25 11:58:48.252623400 -0500
-@@ -137,7 +137,7 @@ struct StructTraits<viz::mojom::FilterOp
-   static base::span<const float> matrix(const cc::FilterOperation& operation) {
-     if (operation.type() != cc::FilterOperation::COLOR_MATRIX)
-       return base::span<const float>();
--    return operation.matrix();
-+    return base::make_span(operation.matrix());
-   }
- 
-   static base::span<const gfx::Rect> shape(
-diff -up chromium-64.0.3282.119/services/viz/public/cpp/compositing/quads_struct_traits.h.gcc5-r3 chromium-64.0.3282.119/services/viz/public/cpp/compositing/quads_struct_traits.h
---- chromium-64.0.3282.119/services/viz/public/cpp/compositing/quads_struct_traits.h.gcc5-r3	2018-01-24 15:05:51.000000000 -0500
-+++ chromium-64.0.3282.119/services/viz/public/cpp/compositing/quads_struct_traits.h	2018-01-25 11:58:48.252623400 -0500
-@@ -308,7 +308,7 @@ struct StructTraits<viz::mojom::TextureQ
-   static base::span<const float> vertex_opacity(const viz::DrawQuad& input) {
-     const viz::TextureDrawQuad* quad =
-         viz::TextureDrawQuad::MaterialCast(&input);
--    return quad->vertex_opacity;
-+    return base::make_span(quad->vertex_opacity);
-   }
- 
-   static bool y_flipped(const viz::DrawQuad& input) {
-diff -up chromium-64.0.3282.119/third_party/WebKit/Source/platform/exported/WebCORS.cpp.gcc5-r3 chromium-64.0.3282.119/third_party/WebKit/Source/platform/exported/WebCORS.cpp
-diff -up chromium-64.0.3282.119/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h.gcc5-r3 chromium-64.0.3282.119/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
---- chromium-64.0.3282.119/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h.gcc5-r3	2018-01-24 15:06:11.000000000 -0500
-+++ chromium-64.0.3282.119/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h	2018-01-25 11:58:48.253623376 -0500
-@@ -62,7 +62,7 @@ class WTF_EXPORT ArrayBufferContents {
-           allocation_length_(0),
-           data_(data),
-           data_length_(0),
--          kind_(AllocationKind::kNormal),
-+          kind_(WTF::ArrayBufferContents::AllocationKind::kNormal),
-           deleter_(deleter) {}
-     DataHandle(void* allocation_base,
-                size_t allocation_length,
-@@ -93,11 +93,11 @@ class WTF_EXPORT ArrayBufferContents {
-              reinterpret_cast<uintptr_t>(allocation_base_) +
-                  allocation_length_);
-       switch (kind_) {
--        case AllocationKind::kNormal:
-+        case WTF::ArrayBufferContents::AllocationKind::kNormal:
-           DCHECK(deleter_);
-           deleter_(data_);
-           return;
--        case AllocationKind::kReservation:
-+        case WTF::ArrayBufferContents::AllocationKind::kReservation:
-           ReleaseReservedMemory(allocation_base_, allocation_length_);
-           return;
-       }
-diff -up chromium-64.0.3282.119/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5-r3 chromium-64.0.3282.119/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc
---- chromium-64.0.3282.119/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5-r3	2018-01-25 11:58:48.253623376 -0500
-+++ chromium-64.0.3282.119/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc	2018-01-25 12:01:28.769900550 -0500
-@@ -10,7 +10,7 @@
- 
- #include "modules/audio_processing/aec3/aec_state.h"
- 
--#include <math.h>
-+#include <cmath>
- 
- #include <numeric>
- #include <vector>

chromium-64.0.3282.119-gcc5.patch

@@ -1,57 +0,0 @@
-diff -up chromium-64.0.3282.119/third_party/webgl/src/specs/latest/2.0/webgl2.idl.gcc5 chromium-64.0.3282.119/third_party/webgl/src/specs/latest/2.0/webgl2.idl
---- chromium-64.0.3282.119/third_party/webgl/src/specs/latest/2.0/webgl2.idl.gcc5	2018-01-25 11:07:27.179175007 -0500
-+++ chromium-64.0.3282.119/third_party/webgl/src/specs/latest/2.0/webgl2.idl	2018-01-25 11:07:38.037925336 -0500
-@@ -263,7 +263,7 @@ interface WebGL2RenderingContextBase
-   const GLenum UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES          = 0x8A43;
-   const GLenum UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER     = 0x8A44;
-   const GLenum UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER   = 0x8A46;
--  const GLenum INVALID_INDEX                                 = 0xFFFFFFFF;
-+  const GLenum INVALID_INDEX                                 = 256;
-   const GLenum MAX_VERTEX_OUTPUT_COMPONENTS                  = 0x9122;
-   const GLenum MAX_FRAGMENT_INPUT_COMPONENTS                 = 0x9125;
-   const GLenum MAX_SERVER_WAIT_TIMEOUT                       = 0x9111;
-diff -up chromium-64.0.3282.119/third_party/WebKit/Source/core/dom/NodeFilter.h.gcc5 chromium-64.0.3282.119/third_party/WebKit/Source/core/dom/NodeFilter.h
---- chromium-64.0.3282.119/third_party/WebKit/Source/core/dom/NodeFilter.h.gcc5	2018-01-25 11:11:08.581962228 -0500
-+++ chromium-64.0.3282.119/third_party/WebKit/Source/core/dom/NodeFilter.h	2018-01-25 11:11:24.062593478 -0500
-@@ -49,7 +49,7 @@ class NodeFilter final {
-      * to the value of NodeType for the equivalent node type.
-      */
-   enum {
--    kShowAll = 0xFFFFFFFF,
-+    kShowAll = 256 /* 0xFFFFFFFF */,
-     kShowElement = 0x00000001,
-     kShowAttribute = 0x00000002,
-     kShowText = 0x00000004,
-diff -up chromium-64.0.3282.119/third_party/WebKit/Source/core/dom/NodeFilter.idl.gcc5 chromium-64.0.3282.119/third_party/WebKit/Source/core/dom/NodeFilter.idl
---- chromium-64.0.3282.119/third_party/WebKit/Source/core/dom/NodeFilter.idl.gcc5	2018-01-25 11:11:34.816335412 -0500
-+++ chromium-64.0.3282.119/third_party/WebKit/Source/core/dom/NodeFilter.idl	2018-01-25 11:12:23.380171262 -0500
-@@ -27,7 +27,7 @@ callback interface NodeFilter {
-     const unsigned short FILTER_SKIP = 3;
- 
-     // Constants for whatToShow
--    const unsigned long SHOW_ALL = 0xFFFFFFFF;
-+    const unsigned long SHOW_ALL = 256; // 0xFFFFFFFF
-     const unsigned long SHOW_ELEMENT = 0x1;
-     const unsigned long SHOW_ATTRIBUTE = 0x2; // historical
-     const unsigned long SHOW_TEXT = 0x4;
-diff -up chromium-64.0.3282.119/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl.gcc5 chromium-64.0.3282.119/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl
---- chromium-64.0.3282.119/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl.gcc5	2018-01-25 11:12:57.367363214 -0500
-+++ chromium-64.0.3282.119/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl	2018-01-25 11:13:29.883590960 -0500
-@@ -241,7 +241,7 @@ typedef unsigned long long GLuint64;
-     const GLenum UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES          = 0x8A43;
-     const GLenum UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER     = 0x8A44;
-     const GLenum UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER   = 0x8A46;
--    const GLenum INVALID_INDEX                                 = 0xFFFFFFFF;
-+    const GLenum INVALID_INDEX                                 = 256;
-     const GLenum MAX_VERTEX_OUTPUT_COMPONENTS                  = 0x9122;
-     const GLenum MAX_FRAGMENT_INPUT_COMPONENTS                 = 0x9125;
-     const GLenum MAX_SERVER_WAIT_TIMEOUT                       = 0x9111;
-@@ -271,7 +271,7 @@ typedef unsigned long long GLuint64;
-     const GLenum TEXTURE_IMMUTABLE_FORMAT                      = 0x912F;
-     const GLenum MAX_ELEMENT_INDEX                             = 0x8D6B;
-     const GLenum TEXTURE_IMMUTABLE_LEVELS                      = 0x82DF;
--    const GLint TIMEOUT_IGNORED                                = -1;
-+    const GLint TIMEOUT_IGNORED                                = 256;
- 
-     /* WebGL-specific enums */
-     const GLenum MAX_CLIENT_WAIT_TIMEOUT_WEBGL                 = 0x9247;

chromium-64.0.3282.119-gcc7.patch

@@ -1,11 +0,0 @@
-diff -up chromium-64.0.3282.119/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.gcc7 chromium-64.0.3282.119/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h
---- chromium-64.0.3282.119/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.gcc7	2018-01-25 11:15:00.291466617 -0500
-+++ chromium-64.0.3282.119/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h	2018-01-25 11:16:36.159320291 -0500
-@@ -10,6 +10,7 @@
- #include "platform/wtf/Functional.h"
- #include "platform/wtf/ThreadSpecific.h"
- 
-+#include <functional>
- #include <memory>
- 
- namespace blink {

chromium-64.0.3282.119-memcpy-fix.patch

@@ -1,11 +0,0 @@
-diff -up chromium-64.0.3282.119/cc/paint/raw_memory_transfer_cache_entry.cc.memcpyfix chromium-64.0.3282.119/cc/paint/raw_memory_transfer_cache_entry.cc
---- chromium-64.0.3282.119/cc/paint/raw_memory_transfer_cache_entry.cc.memcpyfix	2018-01-26 15:04:44.708100850 -0500
-+++ chromium-64.0.3282.119/cc/paint/raw_memory_transfer_cache_entry.cc	2018-01-26 15:04:54.234915081 -0500
-@@ -3,6 +3,7 @@
- // found in the LICENSE file.
- 
- #include "cc/paint/raw_memory_transfer_cache_entry.h"
-+#include <memory.h>
- 
- namespace cc {
- 

chromium-64.0.3282.167-gcc8-fabi11.patch

@@ -1,15 +0,0 @@
-diff -up chromium-64.0.3282.167/tools/gn/bootstrap/bootstrap.py.fabi11 chromium-64.0.3282.167/tools/gn/bootstrap/bootstrap.py
---- chromium-64.0.3282.167/tools/gn/bootstrap/bootstrap.py.fabi11	2018-02-19 11:39:15.807713662 -0500
-+++ chromium-64.0.3282.167/tools/gn/bootstrap/bootstrap.py	2018-02-19 11:39:47.038070341 -0500
-@@ -336,6 +336,11 @@ def write_gn_ninja(path, root_gen_dir, o
-   cflags = os.environ.get('CFLAGS', '').split()
-   cflags_cc = os.environ.get('CXXFLAGS', '').split()
-   ldflags = os.environ.get('LDFLAGS', '').split()
-+
-+  # Work around GCC8 bug gcc#84286
-+  cflags.extend(['-fabi-version=11'])
-+  cflags_cc.extend(['-fabi-version=11'])
-+
-   include_dirs = [root_gen_dir, SRC_ROOT]
-   libs = []
- 

chromium-65.0.3325.146-Fix-non-copyable-class-s-optional-move.patch

@@ -1,41 +0,0 @@
-diff -up chromium-65.0.3325.146/base/optional.h.noncopyable chromium-65.0.3325.146/base/optional.h
---- chromium-65.0.3325.146/base/optional.h.noncopyable	2018-03-13 16:52:15.953729689 -0400
-+++ chromium-65.0.3325.146/base/optional.h	2018-03-13 16:53:55.365792522 -0400
-@@ -45,6 +45,15 @@ struct OptionalStorageBase {
- 
-   // When T is not trivially destructible we must call its
-   // destructor before deallocating its memory.
-+  // Note that this hides the (implicitly declared) move constructor, which
-+  // would be used for constexpr move constructor in OptionalStorage<T>.
-+  // It is needed iff T is trivially move constructible. However, the current
-+  // is_trivially_{copy,move}_constructible implementation requires
-+  // is_trivially_destructible (which looks a bug, cf:
-+  // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=51452 and
-+  // http://cplusplus.github.io/LWG/lwg-active.html#2116), so it is not
-+  // necessary for this case at the moment. Please see also the destructor
-+  // comment in "is_trivially_destructible = true" specialization below.
-   ~OptionalStorageBase() {
-     if (!is_null_)
-       value_.~T();
-@@ -78,9 +87,18 @@ struct OptionalStorageBase<T, true /* tr
-       : is_null_(false), value_(std::forward<Args>(args)...) {}
- 
-   // When T is trivially destructible (i.e. its destructor does nothing) there
--  // is no need to call it. Explicitly defaulting the destructor means it's not
--  // user-provided. Those two together make this destructor trivial.
--  ~OptionalStorageBase() = default;
-+  // is no need to call it. Implicitly defined destructor is trivial, because
-+  // both members (bool and union containing only variants which are trivially
-+  // destructible) are trivially destructible.
-+  // Explicitly-defaulted destructor is also trivial, but do not use it here,
-+  // because it hides the implicit move constructor. It is needed to implement
-+  // constexpr move constructor in OptionalStorage iff T is trivially move
-+  // constructible. Note that, if T is trivially move constructible, the move
-+  // constructor of OptionalStorageBase<T> is also implicitly defined and it is
-+  // trivially move constructor. If T is not trivially move constructible,
-+  // "not declaring move constructor without destructor declaration" here means
-+  // "delete move constructor", which works because any move constructor of
-+  // OptionalStorage will not refer to it in that case.
- 
-   template <class... Args>
-   void Init(Args&&... args) {

chromium-65.0.3325.146-GCC-IDB-methods-String-renamed-to-GetString.patch

@@ -1,108 +0,0 @@
-diff -up chromium-65.0.3325.146/third_party/WebKit/Source/bindings/modules/v8/V8BindingForModules.cpp.GetString chromium-65.0.3325.146/third_party/WebKit/Source/bindings/modules/v8/V8BindingForModules.cpp
---- chromium-65.0.3325.146/third_party/WebKit/Source/bindings/modules/v8/V8BindingForModules.cpp.GetString	2018-03-13 22:54:27.262671113 -0400
-+++ chromium-65.0.3325.146/third_party/WebKit/Source/bindings/modules/v8/V8BindingForModules.cpp	2018-03-13 22:55:47.722113713 -0400
-@@ -68,7 +68,7 @@ v8::Local<v8::Value> ToV8(const IDBKeyPa
-     case IDBKeyPath::kNullType:
-       return v8::Null(isolate);
-     case IDBKeyPath::kStringType:
--      return V8String(isolate, value.String());
-+      return V8String(isolate, value.GetString());
-     case IDBKeyPath::kArrayType:
-       return ToV8(value.Array(), creation_context, isolate);
-   }
-@@ -97,7 +97,7 @@ v8::Local<v8::Value> ToV8(const IDBKey*
-     case IDBKey::kNumberType:
-       return v8::Number::New(isolate, key->Number());
-     case IDBKey::kStringType:
--      return V8String(isolate, key->String());
-+      return V8String(isolate, key->GetString());
-     case IDBKey::kBinaryType:
-       // https://w3c.github.io/IndexedDB/#convert-a-value-to-a-key
-       return ToV8(DOMArrayBuffer::Create(key->Binary()), creation_context,
-@@ -379,7 +379,7 @@ static std::unique_ptr<IDBKey> CreateIDB
-   }
- 
-   DCHECK_EQ(key_path.GetType(), IDBKeyPath::kStringType);
--  return CreateIDBKeyFromValueAndKeyPath(isolate, value, key_path.String(),
-+  return CreateIDBKeyFromValueAndKeyPath(isolate, value, key_path.GetString(),
-                                          exception_state);
- }
- 
-@@ -483,7 +483,7 @@ bool InjectV8KeyIntoV8Value(v8::Isolate*
-   DCHECK(isolate->InContext());
- 
-   DCHECK_EQ(key_path.GetType(), IDBKeyPath::kStringType);
--  Vector<String> key_path_elements = ParseKeyPath(key_path.String());
-+  Vector<String> key_path_elements = ParseKeyPath(key_path.GetString());
- 
-   // The conbination of a key generator and an empty key path is forbidden by
-   // spec.
-@@ -569,7 +569,7 @@ bool CanInjectIDBKeyIntoScriptValue(v8::
-                                     const IDBKeyPath& key_path) {
-   IDB_TRACE("canInjectIDBKeyIntoScriptValue");
-   DCHECK_EQ(key_path.GetType(), IDBKeyPath::kStringType);
--  Vector<String> key_path_elements = ParseKeyPath(key_path.String());
-+  Vector<String> key_path_elements = ParseKeyPath(key_path.GetString());
- 
-   if (!key_path_elements.size())
-     return false;
-diff -up chromium-65.0.3325.146/third_party/WebKit/Source/modules/exported/WebIDBKey.cpp.GetString chromium-65.0.3325.146/third_party/WebKit/Source/modules/exported/WebIDBKey.cpp
---- chromium-65.0.3325.146/third_party/WebKit/Source/modules/exported/WebIDBKey.cpp.GetString	2018-03-13 22:56:04.041798217 -0400
-+++ chromium-65.0.3325.146/third_party/WebKit/Source/modules/exported/WebIDBKey.cpp	2018-03-13 22:56:22.481440993 -0400
-@@ -56,7 +56,7 @@ WebData WebIDBKeyView::Binary() const {
- }
- 
- WebString WebIDBKeyView::String() const {
--  return private_->String();
-+  return private_->GetString();
- }
- 
- double WebIDBKeyView::Date() const {
-diff -up chromium-65.0.3325.146/third_party/WebKit/Source/modules/indexeddb/IDBDatabase.cpp.GetString chromium-65.0.3325.146/third_party/WebKit/Source/modules/indexeddb/IDBDatabase.cpp
---- chromium-65.0.3325.146/third_party/WebKit/Source/modules/indexeddb/IDBDatabase.cpp.GetString	2018-03-13 22:56:36.028178758 -0400
-+++ chromium-65.0.3325.146/third_party/WebKit/Source/modules/indexeddb/IDBDatabase.cpp	2018-03-13 22:56:58.846736831 -0400
-@@ -297,7 +297,7 @@ IDBObjectStore* IDBDatabase::createObjec
-   }
- 
-   if (auto_increment && ((key_path.GetType() == IDBKeyPath::kStringType &&
--                          key_path.String().IsEmpty()) ||
-+                          key_path.GetString().IsEmpty()) ||
-                          key_path.GetType() == IDBKeyPath::kArrayType)) {
-     exception_state.ThrowDOMException(
-         kInvalidAccessError,
-diff -up chromium-65.0.3325.146/third_party/WebKit/Source/modules/indexeddb/IDBKey.h.GetString chromium-65.0.3325.146/third_party/WebKit/Source/modules/indexeddb/IDBKey.h
---- chromium-65.0.3325.146/third_party/WebKit/Source/modules/indexeddb/IDBKey.h.GetString	2018-03-13 22:57:13.229458842 -0400
-+++ chromium-65.0.3325.146/third_party/WebKit/Source/modules/indexeddb/IDBKey.h	2018-03-13 22:57:38.633966776 -0400
-@@ -106,7 +106,7 @@ class MODULES_EXPORT IDBKey {
-     return binary_;
-   }
- 
--  const String& String() const {
-+  const String& GetString() const {
-     DCHECK_EQ(type_, kStringType);
-     return string_;
-   }
-diff -up chromium-65.0.3325.146/third_party/WebKit/Source/modules/indexeddb/IDBKeyPath.h.GetString chromium-65.0.3325.146/third_party/WebKit/Source/modules/indexeddb/IDBKeyPath.h
---- chromium-65.0.3325.146/third_party/WebKit/Source/modules/indexeddb/IDBKeyPath.h.GetString	2018-03-13 22:57:51.104725428 -0400
-+++ chromium-65.0.3325.146/third_party/WebKit/Source/modules/indexeddb/IDBKeyPath.h	2018-03-13 22:58:09.459369906 -0400
-@@ -65,7 +65,7 @@ class MODULES_EXPORT IDBKeyPath {
-     return array_;
-   }
- 
--  const String& String() const {
-+  const String& GetString() const {
-     DCHECK_EQ(type_, kStringType);
-     return string_;
-   }
-diff -up chromium-65.0.3325.146/third_party/WebKit/Source/modules/indexeddb/InspectorIndexedDBAgent.cpp.GetString chromium-65.0.3325.146/third_party/WebKit/Source/modules/indexeddb/InspectorIndexedDBAgent.cpp
---- chromium-65.0.3325.146/third_party/WebKit/Source/modules/indexeddb/InspectorIndexedDBAgent.cpp.GetString	2018-03-13 22:58:28.778995834 -0400
-+++ chromium-65.0.3325.146/third_party/WebKit/Source/modules/indexeddb/InspectorIndexedDBAgent.cpp	2018-03-13 22:58:45.044681364 -0400
-@@ -399,7 +399,7 @@ static std::unique_ptr<KeyPath> KeyPathF
-     case IDBKeyPath::kStringType:
-       key_path = KeyPath::create()
-                      .setType(KeyPath::TypeEnum::String)
--                     .setString(idb_key_path.String())
-+                     .setString(idb_key_path.GetString())
-                      .build();
-       break;
-     case IDBKeyPath::kArrayType: {

chromium-65.0.3325.146-GCC-PlaybackImageProvider-Settings-do-not-provide-co.patch

@@ -1,22 +0,0 @@
-diff -up chromium-65.0.3325.146/cc/raster/playback_image_provider.cc.pipcc chromium-65.0.3325.146/cc/raster/playback_image_provider.cc
---- chromium-65.0.3325.146/cc/raster/playback_image_provider.cc.pipcc	2018-03-13 22:47:00.271322726 -0400
-+++ chromium-65.0.3325.146/cc/raster/playback_image_provider.cc	2018-03-13 22:47:53.127300060 -0400
-@@ -92,7 +92,6 @@ PlaybackImageProvider::GetDecodedDrawIma
- }
- 
- PlaybackImageProvider::Settings::Settings() = default;
--PlaybackImageProvider::Settings::Settings(const Settings& other) = default;
- PlaybackImageProvider::Settings::~Settings() = default;
- 
- }  // namespace cc
-diff -up chromium-65.0.3325.146/cc/raster/playback_image_provider.h.pipcc chromium-65.0.3325.146/cc/raster/playback_image_provider.h
---- chromium-65.0.3325.146/cc/raster/playback_image_provider.h.pipcc	2018-03-13 22:48:00.673153629 -0400
-+++ chromium-65.0.3325.146/cc/raster/playback_image_provider.h	2018-03-13 22:48:12.726920597 -0400
-@@ -20,7 +20,6 @@ class CC_EXPORT PlaybackImageProvider :
-  public:
-   struct CC_EXPORT Settings {
-     Settings();
--    Settings(const Settings& other);
-     ~Settings();
- 
-     // The set of image ids to skip during raster.

chromium-65.0.3325.146-GCC-build-fix-base-Optional-T-requires-the-full-decl.patch

@@ -1,33 +0,0 @@
-diff -up chromium-65.0.3325.146/services/preferences/tracked/pref_hash_filter.h.fulldecl chromium-65.0.3325.146/services/preferences/tracked/pref_hash_filter.h
---- chromium-65.0.3325.146/services/preferences/tracked/pref_hash_filter.h.fulldecl	2018-03-13 16:38:38.870652491 -0400
-+++ chromium-65.0.3325.146/services/preferences/tracked/pref_hash_filter.h	2018-03-13 16:39:02.691186647 -0400
-@@ -21,9 +21,9 @@
- #include "services/preferences/public/interfaces/preferences.mojom.h"
- #include "services/preferences/tracked/hash_store_contents.h"
- #include "services/preferences/tracked/interceptable_pref_filter.h"
-+#include "services/preferences/tracked/pref_hash_store.h"
- #include "services/preferences/tracked/tracked_preference.h"
- 
--class PrefHashStore;
- class PrefService;
- 
- namespace base {
-diff -up chromium-65.0.3325.146/third_party/WebKit/Source/modules/webdatabase/SQLTransactionBackend.h.fulldecl chromium-65.0.3325.146/third_party/WebKit/Source/modules/webdatabase/SQLTransactionBackend.h
---- chromium-65.0.3325.146/third_party/WebKit/Source/modules/webdatabase/SQLTransactionBackend.h.fulldecl	2018-03-13 16:39:13.787970233 -0400
-+++ chromium-65.0.3325.146/third_party/WebKit/Source/modules/webdatabase/SQLTransactionBackend.h	2018-03-13 16:39:42.614407235 -0400
-@@ -30,6 +30,7 @@
- 
- #include <memory>
- #include "modules/webdatabase/DatabaseBasicTypes.h"
-+#include "modules/webdatabase/SQLError.h"
- #include "modules/webdatabase/SQLStatement.h"
- #include "modules/webdatabase/SQLStatementBackend.h"
- #include "modules/webdatabase/SQLTransactionStateMachine.h"
-@@ -41,7 +42,6 @@
- namespace blink {
- 
- class Database;
--class SQLErrorData;
- class SQLiteTransaction;
- class SQLTransaction;
- class SQLTransactionBackend;

chromium-65.0.3325.146-GCC-explicitely-std-move-to-base-Optional-instead-of.patch

@@ -1,24 +0,0 @@
-diff -up chromium-65.0.3325.146/content/browser/appcache/appcache_request_handler.cc.explicit-std-move chromium-65.0.3325.146/content/browser/appcache/appcache_request_handler.cc
---- chromium-65.0.3325.146/content/browser/appcache/appcache_request_handler.cc.explicit-std-move	2018-03-13 22:50:41.346043716 -0400
-+++ chromium-65.0.3325.146/content/browser/appcache/appcache_request_handler.cc	2018-03-13 22:51:21.428267583 -0400
-@@ -639,7 +639,7 @@ AppCacheRequestHandler::MaybeCreateSubre
- 
-   SubresourceLoaderParams params;
-   params.loader_factory_info = factory_ptr.PassInterface();
--  return params;
-+  return base::Optional<SubresourceLoaderParams>(std::move(params));
- }
- 
- void AppCacheRequestHandler::MaybeCreateSubresourceLoader(
-diff -up chromium-65.0.3325.146/content/browser/service_worker/service_worker_controllee_request_handler.cc.explicit-std-move chromium-65.0.3325.146/content/browser/service_worker/service_worker_controllee_request_handler.cc
---- chromium-65.0.3325.146/content/browser/service_worker/service_worker_controllee_request_handler.cc.explicit-std-move	2018-03-13 22:51:38.133943776 -0400
-+++ chromium-65.0.3325.146/content/browser/service_worker/service_worker_controllee_request_handler.cc	2018-03-13 22:51:57.658566347 -0400
-@@ -271,7 +271,7 @@ ServiceWorkerControlleeRequestHandler::M
-   controller_info->object_info = provider_host_->GetOrCreateServiceWorkerHandle(
-       provider_host_->controller());
-   params.controller_service_worker_info = std::move(controller_info);
--  return params;
-+  return base::Optional<SubresourceLoaderParams>(std::move(params));
- }
- 
- void ServiceWorkerControlleeRequestHandler::PrepareForMainResource(