Merge branch 'master' into f25

fix merge
Fix the policy templates handling
2017-11-08 13:00:08 -05:00 · 2017-10-29 10:39:41 -04:00 · 2017-10-25 10:35:45 +02:00 · 2017-10-24 17:02:42 -04:00 · 2017-10-19 14:15:50 +02:00 · 2017-10-18 13:31:03 +02:00
155 changed files with 8735 additions and 7344 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,33 +1,35 @@
 /chromium-52.0.2743.75-clean.tar.xz
 /depot_tools.git-master.tar.gz
 /policy_templates.zip
-/chromium-*.tar.xz
-/gelasio.zip
-/MuktiNarrow-0.94.tar.bz2
-/NotoSansCJKjp-hinted.zip
-/lohit-gurmukhi-ttf-2.91.2.tar.gz
-/Arimo-BoldItalic.ttf
-/Arimo-Bold.ttf
-/Arimo-Italic.ttf
-/Arimo-Regular.ttf
-/Cousine-BoldItalic.ttf
-/Cousine-Bold.ttf
-/Cousine-Italic.ttf
-/Cousine-Regular.ttf
-/Tinos-BoldItalic.ttf
-/Tinos-Bold.ttf
-/Tinos-Italic.ttf
-/Tinos-Regular.ttf
-/Ahem.ttf
-/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
+/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
--- a/README.fedora
+++ b/README.fedora
@ -1,9 +0,0 @@
- 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.
--- a/chromium-101.0.4951.41-fedora-user-agent.patch
+++ b/chromium-101.0.4951.41-fedora-user-agent.patch
@ -1,12 +0,0 @@
-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)
--- a/chromium-103.0.5060.53-update-rjsmin-to-1.2.0.patch
+++ b/chromium-103.0.5060.53-update-rjsmin-to-1.2.0.patch
--- a/chromium-105.0.5195.52-python-six-1.16.0.patch
+++ b/chromium-105.0.5195.52-python-six-1.16.0.patch
@ -1,134 +0,0 @@
-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
- 
- 
--- a/chromium-107-ffmpeg-duration.patch
+++ b/chromium-107-ffmpeg-duration.patch
@ -1,16 +0,0 @@
-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_));
- 
--- a/chromium-107-proprietary-codecs.patch
+++ b/chromium-107-proprietary-codecs.patch
@ -1,16 +0,0 @@
-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.
--- a/chromium-107.0.5304.110-gn-system.patch
+++ b/chromium-107.0.5304.110-gn-system.patch
@ -1,39 +0,0 @@
-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',
--- a/chromium-108-el7-include-fcntl-memfd.patch
+++ b/chromium-108-el7-include-fcntl-memfd.patch
@ -1,36 +0,0 @@
-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>
--- a/chromium-108-el7-wayland-strndup-error.patch
+++ b/chromium-108-el7-wayland-strndup-error.patch
@ -1,11 +0,0 @@
-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>
--- a/chromium-108-ffmpeg-revert-new-channel-layout-api.patch
+++ b/chromium-108-ffmpeg-revert-new-channel-layout-api.patch
@ -1,294 +0,0 @@
-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.";
--- a/chromium-108-system-brotli.patch
+++ b/chromium-108-system-brotli.patch
@ -1,36 +0,0 @@
-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"
--- a/chromium-108-system-opus.patch
+++ b/chromium-108-system-opus.patch
@ -1,12 +0,0 @@
-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 {
- 
--- a/chromium-108-widevine-other-locations.patch
+++ b/chromium-108-widevine-other-locations.patch
@ -1,32 +0,0 @@
-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",
-   ]
--- a/chromium-109-system-minizip-header-fix.patch
+++ b/chromium-109-system-minizip-header-fix.patch
@ -1,64 +0,0 @@
-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 {
--- a/chromium-110-epel7-old-headers-workarounds.patch
+++ b/chromium-110-epel7-old-headers-workarounds.patch
@ -1,141 +0,0 @@
-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 {
--- a/chromium-110-limits.patch
+++ b/chromium-110-limits.patch
@ -1,11 +0,0 @@
-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>
- 
--- a/chromium-112-ffmpeg-first_dts.patch
+++ b/chromium-112-ffmpeg-first_dts.patch
@ -1,120 +0,0 @@
-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
-
--- a/chromium-113-disable-GlobalMediaControlsCastStartStop.patch
+++ b/chromium-113-disable-GlobalMediaControlsCastStartStop.patch
@ -1,12 +0,0 @@
-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)
- 
--- a/chromium-113-rhel8-force-disable-use_gnome_keyring.patch
+++ b/chromium-113-rhel8-force-disable-use_gnome_keyring.patch
@ -1,12 +0,0 @@
-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.
--- a/chromium-114-add_qt6_linuxui_backend.patch
+++ b/chromium-114-add_qt6_linuxui_backend.patch
@ -1,545 +0,0 @@
-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");
--- a/chromium-114-buildflag-el7.patch
+++ b/chromium-114-buildflag-el7.patch
@ -1,21 +0,0 @@
-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,
--- a/chromium-114-constexpr-el7.patch
+++ b/chromium-114-constexpr-el7.patch
@ -1,62 +0,0 @@
-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 "
--- a/chromium-114-gcc13.patch
+++ b/chromium-114-gcc13.patch
@ -1,389 +0,0 @@
-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"
--- a/chromium-114-norar.patch
+++ b/chromium-114-norar.patch
@ -1,105 +0,0 @@
-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_;
--- a/chromium-114-qt-fix_font_double_scaling.patch
+++ b/chromium-114-qt-fix_font_double_scaling.patch
@ -1,21 +0,0 @@
-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);
--- a/chromium-114-qt-handle_scale_factor_changes.patch
+++ b/chromium-114-qt-handle_scale_factor_changes.patch
@ -1,574 +0,0 @@
-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.
--- a/chromium-114-qt_deps.patch
+++ b/chromium-114-qt_deps.patch
@ -1,46 +0,0 @@
-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",
--- a/chromium-114-qt_enable_AllowQt_feature_flag.patch
+++ b/chromium-114-qt_enable_AllowQt_feature_flag.patch
@ -1,12 +0,0 @@
-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();
--- a/chromium-114-qt_logical_scale_factor.patch
+++ b/chromium-114-qt_logical_scale_factor.patch
@ -1,59 +0,0 @@
-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 {
--- a/chromium-114-revert-av1enc-el9.patch
+++ b/chromium-114-revert-av1enc-el9.patch
@ -1,87 +0,0 @@
-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",
--- a/chromium-114-typename.patch
+++ b/chromium-114-typename.patch
@ -1,62 +0,0 @@
-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.
--- a/chromium-114-wireless-el7.patch
+++ b/chromium-114-wireless-el7.patch
@ -1,22 +0,0 @@
-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 {
--- a/chromium-114-workaround_clang_bug-structured_binding.patch
+++ b/chromium-114-workaround_clang_bug-structured_binding.patch
@ -1,81 +0,0 @@
-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");
--- a/chromium-45.0.2454.101-linux-path-max.patch
+++ b/chromium-45.0.2454.101-linux-path-max.patch
@ -0,0 +1,44 @@
+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__)
--- a/chromium-46.0.2490.71-gcc5.patch
+++ b/chromium-46.0.2490.71-gcc5.patch
@ -0,0 +1,354 @@
+diff -up chromium-46.0.2490.71/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc.gcc5 chromium-46.0.2490.71/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc
+--- chromium-46.0.2490.71/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc.gcc5	2015-10-06 22:42:52.000000000 -0400
+++ chromium-46.0.2490.71/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc	2015-10-15 23:42:00.645518701 -0400
+@@ -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-46.0.2490.71/third_party/webgl/src/specs/latest/2.0/webgl2.idl.gcc5 chromium-46.0.2490.71/third_party/webgl/src/specs/latest/2.0/webgl2.idl
+--- chromium-46.0.2490.71/third_party/webgl/src/specs/latest/2.0/webgl2.idl.gcc5	2015-10-13 15:04:44.000000000 -0400
+++ chromium-46.0.2490.71/third_party/webgl/src/specs/latest/2.0/webgl2.idl	2015-10-16 00:54:16.603896492 -0400
+@@ -261,7 +261,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-46.0.2490.71/third_party/WebKit/Source/core/dom/NodeFilter.h.gcc5 chromium-46.0.2490.71/third_party/WebKit/Source/core/dom/NodeFilter.h
+--- chromium-46.0.2490.71/third_party/WebKit/Source/core/dom/NodeFilter.h.gcc5	2015-10-06 22:42:25.000000000 -0400
+++ chromium-46.0.2490.71/third_party/WebKit/Source/core/dom/NodeFilter.h	2015-10-15 23:42:00.651518569 -0400
+@@ -52,7 +52,7 @@ public:
+      * to the value of NodeType for the equivalent node type.
+      */
+     enum {
+-        SHOW_ALL                       = 0xFFFFFFFF,
+        SHOW_ALL                       = 256 /* 0xFFFFFFFF */,
+         SHOW_ELEMENT                   = 0x00000001,
+         SHOW_ATTRIBUTE                 = 0x00000002,
+         SHOW_TEXT                      = 0x00000004,
+diff -up chromium-46.0.2490.71/third_party/WebKit/Source/core/dom/NodeFilter.idl.gcc5 chromium-46.0.2490.71/third_party/WebKit/Source/core/dom/NodeFilter.idl
+--- chromium-46.0.2490.71/third_party/WebKit/Source/core/dom/NodeFilter.idl.gcc5	2015-10-06 22:42:25.000000000 -0400
+++ chromium-46.0.2490.71/third_party/WebKit/Source/core/dom/NodeFilter.idl	2015-10-15 23:42:00.653518525 -0400
+@@ -31,7 +31,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-46.0.2490.71/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl.gcc5 chromium-46.0.2490.71/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl
+--- chromium-46.0.2490.71/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl.gcc5	2015-10-13 15:04:34.000000000 -0400
+++ chromium-46.0.2490.71/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl	2015-10-16 00:54:52.061105191 -0400
+@@ -254,7 +254,7 @@ typedef long long      GLint64;
+     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;
+@@ -297,7 +297,7 @@ typedef long long      GLint64;
+     const GLenum MAX_ELEMENT_INDEX                             = 0x8D6B;
+     const GLenum NUM_SAMPLE_COUNTS                             = 0x9380;
+     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;
--- a/chromium-46.0.2490.71-notest.patch
+++ b/chromium-46.0.2490.71-notest.patch
@ -0,0 +1,11 @@
+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>
--- a/chromium-46.0.2490.86-use_system_opus.patch
+++ b/chromium-46.0.2490.86-use_system_opus.patch
@ -0,0 +1,12 @@
+diff -up chromium-46.0.2490.86/media/cast/receiver/audio_decoder_unittest.cc.use_system_opus chromium-46.0.2490.86/media/cast/receiver/audio_decoder_unittest.cc
+--- chromium-46.0.2490.86/media/cast/receiver/audio_decoder_unittest.cc.use_system_opus	2015-10-07 04:42:12.000000000 +0200
+++ chromium-46.0.2490.86/media/cast/receiver/audio_decoder_unittest.cc	2015-11-11 16:11:13.535250609 +0100
+@@ -13,7 +13,7 @@
+ #include "media/cast/test/utility/audio_utility.h"
+ #include "media/cast/test/utility/standalone_cast_environment.h"
+ #include "testing/gtest/include/gtest/gtest.h"
+-#include "third_party/opus/src/include/opus.h"
+#include <opus/opus.h>
+ 
+ namespace media {
+ namespace cast {
--- a/chromium-47.0.2526.80-nacl-ignore-broken-fd-counter.patch
+++ b/chromium-47.0.2526.80-nacl-ignore-broken-fd-counter.patch
@ -0,0 +1,27 @@
+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) {
--- a/chromium-47.0.2526.80-pnacl-fgnu-inline-asm.patch
+++ b/chromium-47.0.2526.80-pnacl-fgnu-inline-asm.patch
@ -0,0 +1,11 @@
+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.
--- a/chromium-48.0.2564.103-gcc6.patch
+++ b/chromium-48.0.2564.103-gcc6.patch
@ -0,0 +1,204 @@
+diff -up chromium-48.0.2564.103/third_party/skia/src/opts/SkXfermode_opts.h.gcc6 chromium-48.0.2564.103/third_party/skia/src/opts/SkXfermode_opts.h
+--- chromium-48.0.2564.103/third_party/skia/src/opts/SkXfermode_opts.h.gcc6	2016-02-16 15:01:13.200131996 -0500
+++ chromium-48.0.2564.103/third_party/skia/src/opts/SkXfermode_opts.h	2016-02-17 13:31:50.216198258 -0500
+@@ -109,76 +109,71 @@ XFERMODE(Lighten) {
+ }
+ #undef XFERMODE
+ 
+-// Some xfermodes use math like divide or sqrt that's best done in floats.
+-// We write it generically, then call it 1 or 2 pixels at a time (T == Sk4f or Sk8f).
+-#define XFERMODE(Name) struct Name { template <typename T> T operator()(const T&, const T&); }; \
+-    template <typename T> T Name::operator()(const T& d, const T& s)
+// Some xfermodes use math like divide or sqrt that's best done in floats 1 pixel at a time.
+#define XFERMODE(Name) static Sk4f SK_VECTORCALL Name(Sk4f d, Sk4f s)
+ 
+-static_assert(SK_A32_SHIFT == 24, "");
+ static inline Sk4f a_rgb(const Sk4f& a, const Sk4f& rgb) {
+    static_assert(SK_A32_SHIFT == 24, "");
+     return a * Sk4f(0,0,0,1) + rgb * Sk4f(1,1,1,0);
+ }
+-static inline Sk8f a_rgb(const Sk8f& a, const Sk8f& rgb) {
+-    // TODO: SkNx_blend<0,0,0,1,0,0,0,1>(a, rgb) to let us use _mm256_blend_ps?
+-    return a * Sk8f(0,0,0,1,0,0,0,1) + rgb * Sk8f(1,1,1,0,1,1,1,0);
+static inline Sk4f alphas(const Sk4f& f) {
+    return SkNx_dup<SK_A32_SHIFT/8>(f);
+ }
+-static inline Sk4f alphas(const Sk4f& f) { return SkNx_shuffle<3,3,3,3>        (f); }
+-static inline Sk8f alphas(const Sk8f& f) { return SkNx_shuffle<3,3,3,3,7,7,7,7>(f); }
+ 
+ XFERMODE(ColorDodge) {
+     auto sa = alphas(s),
+          da = alphas(d),
+-         isa = T(1)-sa,
+-         ida = T(1)-da;
+         isa = Sk4f(1)-sa,
+         ida = Sk4f(1)-da;
+ 
+     auto srcover = s + d*isa,
+          dstover = d + s*ida,
+-         otherwise = sa * T::Min(da, (d*sa)*(sa-s).approxInvert()) + s*ida + d*isa;
+         otherwise = sa * Sk4f::Min(da, (d*sa)*(sa-s).approxInvert()) + s*ida + d*isa;
+ 
+     // Order matters here, preferring d==0 over s==sa.
+-    auto colors = (d ==  0).thenElse(dstover,
+-                  (s == sa).thenElse(srcover,
+-                                     otherwise));
+    auto colors = (d == Sk4f(0)).thenElse(dstover,
+                  (s ==      sa).thenElse(srcover,
+                                          otherwise));
+     return a_rgb(srcover, colors);
+ }
+ XFERMODE(ColorBurn) {
+     auto sa = alphas(s),
+          da = alphas(d),
+-         isa = T(1)-sa,
+-         ida = T(1)-da;
+         isa = Sk4f(1)-sa,
+         ida = Sk4f(1)-da;
+ 
+     auto srcover = s + d*isa,
+          dstover = d + s*ida,
+-         otherwise = sa*(da-T::Min(da, (da-d)*sa*s.approxInvert())) + s*ida + d*isa;
+         otherwise = sa*(da-Sk4f::Min(da, (da-d)*sa*s.approxInvert())) + s*ida + d*isa;
+ 
+     // Order matters here, preferring d==da over s==0.
+-    auto colors = (d == da).thenElse(dstover,
+-                  (s ==  0).thenElse(srcover,
+-                                     otherwise));
+    auto colors = (d ==      da).thenElse(dstover,
+                  (s == Sk4f(0)).thenElse(srcover,
+                                          otherwise));
+     return a_rgb(srcover, colors);
+ }
+ XFERMODE(SoftLight) {
+     auto sa = alphas(s),
+          da = alphas(d),
+-         isa = T(1)-sa,
+-         ida = T(1)-da;
+         isa = Sk4f(1)-sa,
+         ida = Sk4f(1)-da;
+ 
+     // Some common terms.
+-    auto m  = (da > 0).thenElse(d / da, 0),
+-         s2 = s*2,
+-         m4 = m*4;
+    auto m  = (da > Sk4f(0)).thenElse(d / da, Sk4f(0)),
+         s2 = Sk4f(2)*s,
+         m4 = Sk4f(4)*m;
+ 
+     // The logic forks three ways:
+     //    1. dark src?
+     //    2. light src, dark dst?
+     //    3. light src, light dst?
+-    auto darkSrc = d*(sa + (s2 - sa)*(T(1) - m)),  // Used in case 1.
+-         darkDst = (m4*m4 + m4)*(m - 1) + m*7,     // Used in case 2.
+-         liteDst = m.sqrt() - m,                   // Used in case 3.
+-         liteSrc = d*sa + da*(s2-sa)*(d*4 <= da).thenElse(darkDst, liteDst); // Case 2 or 3?
+    auto darkSrc = d*(sa + (s2 - sa)*(Sk4f(1) - m)),        // Used in case 1.
+         darkDst = (m4*m4 + m4)*(m - Sk4f(1)) + Sk4f(7)*m,  // Used in case 2.
+         liteDst = m.sqrt() - m,                            // Used in case 3.
+         liteSrc = d*sa + da*(s2-sa)*(Sk4f(4)*d <= da).thenElse(darkDst, liteDst); // Case 2 or 3?
+ 
+     auto alpha  = s + d*isa;
+-    auto colors = s*ida + d*isa + (s2 <= sa).thenElse(darkSrc, liteSrc);     // Case 1 or 2/3?
+    auto colors = s*ida + d*isa + (s2 <= sa).thenElse(darkSrc, liteSrc);           // Case 1 or 2/3?
+ 
+     return a_rgb(alpha, colors);
+ }
+@@ -245,52 +240,53 @@ private:
+     typedef SkProcCoeffXfermode INHERITED;
+ };
+ 
+-template <typename BlendFn>
+-class FloatXfermode : public SkProcCoeffXfermode {
+class Sk4fXfermode : public SkProcCoeffXfermode {
+ public:
+-    FloatXfermode(const ProcCoeff& rec, SkXfermode::Mode mode)
+-        : INHERITED(rec, mode) {}
+    typedef Sk4f (SK_VECTORCALL *ProcF)(Sk4f, Sk4f);
+    Sk4fXfermode(const ProcCoeff& rec, SkXfermode::Mode mode, ProcF procf)
+        : INHERITED(rec, mode)
+        , fProcF(procf) {}
+ 
+     void xfer32(SkPMColor dst[], const SkPMColor src[], int n, const SkAlpha aa[]) const override {
+-        BlendFn blend;
+-        while (n >= 2) {
+-            auto d = Sk8f::FromBytes((const uint8_t*)dst) * (1.0f/255),
+-                 s = Sk8f::FromBytes((const uint8_t*)src) * (1.0f/255),
+-                 b = blend(d, s);
+-            if (aa) {
+-                auto a255 = Sk8f(aa[0],aa[0],aa[0],aa[0], aa[1],aa[1],aa[1],aa[1]);
+-                (b*a255 + d*(Sk8f(255)-a255) + 0.5).toBytes((uint8_t*)dst);
+-                aa += 2;
+-            } else {
+-                (b * 255 + 0.5).toBytes((uint8_t*)dst);
+-            }
+-            dst += 2;
+-            src += 2;
+-            n   -= 2;
+-        }
+-        if (n) {
+-            auto d = Sk4f::FromBytes((const uint8_t*)dst) * (1.0f/255),
+-                 s = Sk4f::FromBytes((const uint8_t*)src) * (1.0f/255),
+-                 b = blend(d, s);
+-            if (aa) {
+-                auto a255 = Sk4f(aa[0],aa[0],aa[0],aa[0]);
+-                (b*a255 + d*(Sk4f(255)-a255) + 0.5).toBytes((uint8_t*)dst);
+-                aa++;
+-            } else {
+-                (b * 255 + 0.5).toBytes((uint8_t*)dst);
+-            }
+        for (int i = 0; i < n; i++) {
+            dst[i] = aa ? this->xfer32(dst[i], src[i], aa[i])
+                        : this->xfer32(dst[i], src[i]);
+         }
+     }
+ 
+     void xfer16(uint16_t dst[], const SkPMColor src[], int n, const SkAlpha aa[]) const override {
+         for (int i = 0; i < n; i++) {
+-            SkPMColor dst32 = SkPixel16ToPixel32(dst[i]);           // Convert dst up to 8888.
+-            this->xfer32(&dst32, src+i, 1, aa ? aa+i : nullptr);    // Blend 1 pixel.
+-            dst[i] = SkPixel32ToPixel16(dst32);                     // Repack dst to 565 and store.
+            SkPMColor dst32 = SkPixel16ToPixel32(dst[i]);
+            dst32 = aa ? this->xfer32(dst32, src[i], aa[i])
+                       : this->xfer32(dst32, src[i]);
+            dst[i] = SkPixel32ToPixel16(dst32);
+         }
+     }
+ 
+ private:
+    static Sk4f Load(SkPMColor c) {
+        return Sk4f::FromBytes((uint8_t*)&c) * Sk4f(1.0f/255);
+    }
+    static SkPMColor Round(const Sk4f& f) {
+        SkPMColor c;
+        (f * Sk4f(255) + Sk4f(0.5f)).toBytes((uint8_t*)&c);
+        return c;
+    }
+    inline SkPMColor xfer32(SkPMColor dst, SkPMColor src) const {
+        return Round(fProcF(Load(dst), Load(src)));
+    }
+
+    inline SkPMColor xfer32(SkPMColor dst, SkPMColor src, SkAlpha aa) const {
+        Sk4f s(Load(src)),
+             d(Load(dst)),
+             b(fProcF(d,s));
+        // We do aa in full float precision before going back down to bytes, because we can!
+        Sk4f a = Sk4f(aa) * Sk4f(1.0f/255);
+        b = b*a + d*(Sk4f(1)-a);
+        return Round(b);
+    }
+
+    ProcF fProcF;
+     typedef SkProcCoeffXfermode INHERITED;
+ };
+ 
+@@ -327,7 +323,7 @@ static SkXfermode* create_xfermode(const
+     #undef CASE
+ 
+ #define CASE(Mode) \
+-    case SkXfermode::k##Mode##_Mode: return new FloatXfermode<Mode>(rec, mode)
+    case SkXfermode::k##Mode##_Mode: return new Sk4fXfermode(rec, mode, &Mode)
+         CASE(ColorDodge);
+         CASE(ColorBurn);
+         CASE(SoftLight);
--- a/chromium-48.0.2564.116-libusb_interrupt_event_handler.patch
+++ b/chromium-48.0.2564.116-libusb_interrupt_event_handler.patch
@ -0,0 +1,15 @@
+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) {
--- a/chromium-50.0.2661.86-addrfix.patch
+++ b/chromium-50.0.2661.86-addrfix.patch
@ -0,0 +1,11 @@
+diff -up chromium-50.0.2661.86/third_party/boringssl/boringssl.gyp.addrfix chromium-50.0.2661.86/third_party/boringssl/boringssl.gyp
+--- chromium-50.0.2661.86/third_party/boringssl/boringssl.gyp.addrfix	2016-04-27 13:26:38.483282586 -0400
+++ chromium-50.0.2661.86/third_party/boringssl/boringssl.gyp	2016-04-27 13:28:19.843065230 -0400
+@@ -18,6 +18,7 @@
+         'BORINGSSL_IMPLEMENTATION',
+         'BORINGSSL_NO_STATIC_INITIALIZER',
+         'OPENSSL_SMALL',
+	'_POSIX_C_SOURCE=200112L',
+       ],
+       'dependencies': [ 'boringssl_asm' ],
+       # TODO(davidben): Fix size_t truncations in BoringSSL.
--- a/chromium-50.0.2661.94-unbundle-re2-fix.patch
+++ b/chromium-50.0.2661.94-unbundle-re2-fix.patch
@ -0,0 +1,12 @@
+diff -up chromium-50.0.2661.94/build/linux/unbundle/re2.gyp.unbundle-fix chromium-50.0.2661.94/build/linux/unbundle/re2.gyp
+--- chromium-50.0.2661.94/build/linux/unbundle/re2.gyp.unbundle-fix	2016-03-25 09:04:44.000000000 -0400
+++ chromium-50.0.2661.94/build/linux/unbundle/re2.gyp	2016-05-03 12:24:38.850296350 -0400
+@@ -8,7 +8,7 @@
+       'target_name': 're2',
+       'type': 'none',
+       'variables': {
+-        'headers_root_path': '.',
+        'headers_root_path': 'src/',
+         'header_filenames': [
+           're2/filtered_re2.h',
+           're2/re2.h',
--- a/chromium-52.0.2723.2-PNGImageDecoder-fix-cast.patch
+++ b/chromium-52.0.2723.2-PNGImageDecoder-fix-cast.patch
@ -0,0 +1,12 @@
+diff -up chromium-52.0.2723.2/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp.fixcast chromium-52.0.2723.2/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp
+--- chromium-52.0.2723.2/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp.fixcast	2016-05-10 09:43:31.637003844 -0400
+++ chromium-52.0.2723.2/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp	2016-05-10 09:43:43.523741296 -0400
+@@ -234,7 +234,7 @@ void PNGImageDecoder::headerAvailable()
+ #endif
+             png_uint_32 profileLength = 0;
+             if (png_get_iCCP(png, info, &profileName, &compressionType, &profile, &profileLength)) {
+-                setColorProfileAndTransform(profile, profileLength, imageHasAlpha, false /* useSRGB */);
+                setColorProfileAndTransform((const char*)profile, profileLength, imageHasAlpha, false /* useSRGB */);
+             }
+         }
+ #endif // PNG_iCCP_SUPPORTED
--- a/chromium-52.0.2723.2-sync_link_zlib.patch
+++ b/chromium-52.0.2723.2-sync_link_zlib.patch
@ -0,0 +1,11 @@
+diff -up chromium-52.0.2723.2/sync/sync_tests.gypi.sync_link_zlib chromium-52.0.2723.2/sync/sync_tests.gypi
+--- chromium-52.0.2723.2/sync/sync_tests.gypi.sync_link_zlib	2016-05-09 14:22:30.884719562 -0400
+++ chromium-52.0.2723.2/sync/sync_tests.gypi	2016-05-09 14:24:06.337517725 -0400
+@@ -264,6 +264,7 @@
+         '../testing/gtest.gyp:gtest',
+         '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
+         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
+        '../third_party/zlib/zlib.gyp:zlib',
+         'sync',
+         'test_support_sync_api',
+         'test_support_sync_core',
--- a/chromium-52.0.2723.2-system-icu-54-does-not-have-detectHostTimeZone.patch
+++ b/chromium-52.0.2723.2-system-icu-54-does-not-have-detectHostTimeZone.patch
@ -0,0 +1,12 @@
+diff -up chromium-52.0.2723.2/content/browser/time_zone_monitor.cc.system-icu chromium-52.0.2723.2/content/browser/time_zone_monitor.cc
+--- chromium-52.0.2723.2/content/browser/time_zone_monitor.cc.system-icu	2016-05-09 14:01:42.751588803 -0400
+++ chromium-52.0.2723.2/content/browser/time_zone_monitor.cc	2016-05-09 14:09:22.663951240 -0400
+@@ -23,7 +23,7 @@ TimeZoneMonitor::~TimeZoneMonitor() {
+ 
+ void TimeZoneMonitor::NotifyRenderers() {
+   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) || U_ICU_VERSION_MAJOR_NUM < 55
+   // On CrOS, ICU's default tz is already set to a new zone. No
+   // need to redetect it with detectHostTimeZone().
+   std::unique_ptr<icu::TimeZone> new_zone(icu::TimeZone::createDefault());
--- a/chromium-52.0.2723.2-use_system_harfbuzz.patch
+++ b/chromium-52.0.2723.2-use_system_harfbuzz.patch
@ -0,0 +1,12 @@
+diff -up chromium-52.0.2723.2/ui/gfx/render_text_harfbuzz.h.use_system_harfbuzz chromium-52.0.2723.2/ui/gfx/render_text_harfbuzz.h
+--- chromium-52.0.2723.2/ui/gfx/render_text_harfbuzz.h.use_system_harfbuzz	2016-05-09 14:17:34.867555791 -0400
+++ chromium-52.0.2723.2/ui/gfx/render_text_harfbuzz.h	2016-05-09 14:18:56.131677853 -0400
+@@ -13,7 +13,7 @@
+ #include "base/gtest_prod_util.h"
+ #include "base/macros.h"
+ #include "base/memory/scoped_vector.h"
+-#include "third_party/harfbuzz-ng/src/hb.h"
+#include <harfbuzz/hb.h>
+ #include "third_party/icu/source/common/unicode/ubidi.h"
+ #include "third_party/icu/source/common/unicode/uscript.h"
+ #include "ui/gfx/render_text.h"
--- a/chromium-52.0.2743.116-unset-madv_free.patch
+++ b/chromium-52.0.2743.116-unset-madv_free.patch
@ -0,0 +1,15 @@
+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
--- a/chromium-52.0.2743.82-arm-icu-fix.patch
+++ b/chromium-52.0.2743.82-arm-icu-fix.patch
@ -0,0 +1,12 @@
+diff -up chromium-52.0.2743.82/third_party/icu/icu.gyp.armfix chromium-52.0.2743.82/third_party/icu/icu.gyp
+--- chromium-52.0.2743.82/third_party/icu/icu.gyp.armfix	2016-08-03 09:39:02.159874067 +0200
+++ chromium-52.0.2743.82/third_party/icu/icu.gyp	2016-08-03 09:39:17.953765034 +0200
+@@ -44,7 +44,7 @@
+       }],
+       ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
+          or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \
+-        (target_arch=="arm" or target_arch=="ia32" or \
+        (target_arch=="ia32" or \
+          target_arch=="mipsel")', {
+         'target_conditions': [
+           ['_toolset=="host"', {
--- a/chromium-52.0.2743.82-arm-webrtc.patch
+++ b/chromium-52.0.2743.82-arm-webrtc.patch
@ -0,0 +1,51 @@
+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;
--- a/chromium-52.0.2743.82-cups22.patch
+++ b/chromium-52.0.2743.82-cups22.patch
@ -0,0 +1,47 @@
+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.
+         ]
+diff -up chromium-52.0.2743.82/printing/printing.gyp.cups22 chromium-52.0.2743.82/printing/printing.gyp
+--- chromium-52.0.2743.82/printing/printing.gyp.cups22	2016-07-21 11:26:26.622746918 -0400
+++ chromium-52.0.2743.82/printing/printing.gyp	2016-07-21 14:36:07.390373060 -0400
+@@ -142,12 +142,13 @@
+             'cups_version': '<!(python cups_config_helper.py --api-version <(sysroot))',
+           },
+           'conditions': [
+-            ['cups_version in ["1.6", "1.7"]', {
+            ['cups_version in ["1.6", "1.7", "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.
+               ],
--- a/chromium-52.0.2743.82-master-prefs-path.patch
+++ b/chromium-52.0.2743.82-master-prefs-path.patch
@ -0,0 +1,15 @@
+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);
+ }
+ 
--- a/chromium-52.0.2743.82-more-codec-aliases.patch
+++ b/chromium-52.0.2743.82-more-codec-aliases.patch
@ -0,0 +1,15 @@
+diff -up chromium-52.0.2743.82/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp.morealiases chromium-52.0.2743.82/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp
+--- chromium-52.0.2743.82/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp.morealiases	2016-08-03 08:55:48.293159940 +0200
+++ chromium-52.0.2743.82/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp	2016-08-03 08:57:05.192505191 +0200
+@@ -208,7 +208,11 @@ void TextCodecICU::registerEncodingNames
+     registrar("iso_8859-6", "ISO-8859-6");
+     registrar("iso_8859-7", "ISO-8859-7");
+     registrar("iso_8859-8", "ISO-8859-8");
+    registrar("ISO_8859-8-I", "ISO-8859-8-I");
+     registrar("iso_8859-9", "windows-1254");
+    registrar("ISO_8859-10", "ISO-8859-10");
+    registrar("ISO_8859-13", "ISO-8859-13");
+    registrar("ISO_8859-14", "ISO-8859-14");
+     registrar("iso_8859-15", "ISO-8859-15");
+     registrar("koi8_r", "KOI8-R");
+     registrar("x-cp1253", "windows-1253");
--- a/chromium-52.0.2743.82-sandbox-pie.patch
+++ b/chromium-52.0.2743.82-sandbox-pie.patch
@ -0,0 +1,15 @@
+diff -up chromium-52.0.2743.82/sandbox/linux/sandbox_linux.gypi.pie chromium-52.0.2743.82/sandbox/linux/sandbox_linux.gypi
+--- chromium-52.0.2743.82/sandbox/linux/sandbox_linux.gypi.pie	2016-08-03 09:06:41.617923620 +0200
+++ chromium-52.0.2743.82/sandbox/linux/sandbox_linux.gypi	2016-08-03 09:11:49.747463317 +0200
+@@ -205,7 +205,10 @@
+       ],
+       'cflags': [
+         # For ULLONG_MAX
+-        '-std=gnu99',
+        '-std=gnu99 -fPIE',
+      ],
+      'ldflags': [
+        '-pie',
+       ],
+       'include_dirs': [
+         '../..',
--- a/chromium-53.0.2785.101-crrev-415028.patch
+++ b/chromium-53.0.2785.101-crrev-415028.patch
@ -0,0 +1,142 @@
+diff -up chromium-53.0.2785.101/sandbox/linux/BUILD.gn.415208 chromium-53.0.2785.101/sandbox/linux/BUILD.gn
+--- chromium-53.0.2785.101/sandbox/linux/BUILD.gn.415208	2016-09-08 10:22:07.702555383 -0400
+++ chromium-53.0.2785.101/sandbox/linux/BUILD.gn	2016-09-08 10:23:26.190044992 -0400
+@@ -41,10 +41,7 @@ group("sandbox") {
+     public_deps += [ ":suid_sandbox_client" ]
+   }
+   if (use_seccomp_bpf || is_nacl_nonsfi) {
+-    public_deps += [
+-      ":seccomp_bpf",
+-      ":seccomp_bpf_helpers",
+-    ]
+    public_deps += [ ":seccomp_bpf" ]
+   }
+ }
+ 
+@@ -221,6 +218,14 @@ component("seccomp_bpf") {
+     "bpf_dsl/syscall_set.cc",
+     "bpf_dsl/syscall_set.h",
+     "bpf_dsl/trap_registry.h",
+    "seccomp-bpf-helpers/baseline_policy.cc",
+    "seccomp-bpf-helpers/baseline_policy.h",
+    "seccomp-bpf-helpers/sigsys_handlers.cc",
+    "seccomp-bpf-helpers/sigsys_handlers.h",
+    "seccomp-bpf-helpers/syscall_parameters_restrictions.cc",
+    "seccomp-bpf-helpers/syscall_parameters_restrictions.h",
+    "seccomp-bpf-helpers/syscall_sets.cc",
+    "seccomp-bpf-helpers/syscall_sets.h",
+     "seccomp-bpf/die.cc",
+     "seccomp-bpf/die.h",
+     "seccomp-bpf/sandbox_bpf.cc",
+@@ -250,31 +255,6 @@ component("seccomp_bpf") {
+       "bpf_dsl/linux_syscall_ranges.h",
+       "bpf_dsl/seccomp_macros.h",
+       "bpf_dsl/trap_registry.h",
+-    ]
+-  }
+-}
+-
+-component("seccomp_bpf_helpers") {
+-  sources = [
+-    "seccomp-bpf-helpers/baseline_policy.cc",
+-    "seccomp-bpf-helpers/baseline_policy.h",
+-    "seccomp-bpf-helpers/sigsys_handlers.cc",
+-    "seccomp-bpf-helpers/sigsys_handlers.h",
+-    "seccomp-bpf-helpers/syscall_parameters_restrictions.cc",
+-    "seccomp-bpf-helpers/syscall_parameters_restrictions.h",
+-    "seccomp-bpf-helpers/syscall_sets.cc",
+-    "seccomp-bpf-helpers/syscall_sets.h",
+-  ]
+-  defines = [ "SANDBOX_IMPLEMENTATION" ]
+-
+-  deps = [
+-    ":sandbox_services",
+-    ":seccomp_bpf",
+-    "//base",
+-  ]
+-
+-  if (is_nacl_nonsfi) {
+-    sources -= [
+       "seccomp-bpf-helpers/baseline_policy.cc",
+       "seccomp-bpf-helpers/baseline_policy.h",
+       "seccomp-bpf-helpers/syscall_sets.cc",
+diff -up chromium-53.0.2785.101/sandbox/linux/sandbox_linux.gypi.415208 chromium-53.0.2785.101/sandbox/linux/sandbox_linux.gypi
+--- chromium-53.0.2785.101/sandbox/linux/sandbox_linux.gypi.415208	2016-09-08 10:20:50.263045995 -0400
+++ chromium-53.0.2785.101/sandbox/linux/sandbox_linux.gypi	2016-09-08 10:21:51.341870321 -0400
+@@ -54,7 +54,6 @@
+         [ 'use_seccomp_bpf==1', {
+           'dependencies': [
+             'seccomp_bpf',
+-            'seccomp_bpf_helpers',
+           ],
+         }],
+       ],
+@@ -141,6 +140,14 @@
+         'bpf_dsl/syscall_set.cc',
+         'bpf_dsl/syscall_set.h',
+         'bpf_dsl/trap_registry.h',
+        'seccomp-bpf-helpers/baseline_policy.cc',
+        'seccomp-bpf-helpers/baseline_policy.h',
+        'seccomp-bpf-helpers/sigsys_handlers.cc',
+        'seccomp-bpf-helpers/sigsys_handlers.h',
+        'seccomp-bpf-helpers/syscall_parameters_restrictions.cc',
+        'seccomp-bpf-helpers/syscall_parameters_restrictions.h',
+        'seccomp-bpf-helpers/syscall_sets.cc',
+        'seccomp-bpf-helpers/syscall_sets.h',
+         'seccomp-bpf/die.cc',
+         'seccomp-bpf/die.h',
+         'seccomp-bpf/sandbox_bpf.cc',
+@@ -165,31 +172,6 @@
+       ],
+       'include_dirs': [
+         '../..',
+-      ],
+-    },
+-    {
+-      'target_name': 'seccomp_bpf_helpers',
+-      'type': '<(component)',
+-      'sources': [
+-        'seccomp-bpf-helpers/baseline_policy.cc',
+-        'seccomp-bpf-helpers/baseline_policy.h',
+-        'seccomp-bpf-helpers/sigsys_handlers.cc',
+-        'seccomp-bpf-helpers/sigsys_handlers.h',
+-        'seccomp-bpf-helpers/syscall_parameters_restrictions.cc',
+-        'seccomp-bpf-helpers/syscall_parameters_restrictions.h',
+-        'seccomp-bpf-helpers/syscall_sets.cc',
+-        'seccomp-bpf-helpers/syscall_sets.h',
+-      ],
+-      'dependencies': [
+-        '../base/base.gyp:base',
+-        'sandbox_services',
+-        'seccomp_bpf',
+-      ],
+-      'defines': [
+-        'SANDBOX_IMPLEMENTATION',
+-      ],
+-      'include_dirs': [
+-        '../..',
+       ],
+     },
+     {
+diff -up chromium-53.0.2785.101/services/shell/runner/host/BUILD.gn.415208 chromium-53.0.2785.101/services/shell/runner/host/BUILD.gn
+--- chromium-53.0.2785.101/services/shell/runner/host/BUILD.gn.415208	2016-09-08 10:20:17.591674773 -0400
+++ chromium-53.0.2785.101/services/shell/runner/host/BUILD.gn	2016-09-08 10:20:27.742478927 -0400
+@@ -61,7 +61,6 @@ source_set("child_process_base") {
+       "//sandbox/linux:sandbox",
+       "//sandbox/linux:sandbox_services",
+       "//sandbox/linux:seccomp_bpf",
+-      "//sandbox/linux:seccomp_bpf_helpers",
+     ]
+   }
+ 
+diff -up chromium-53.0.2785.101/services/shell/shell.gyp.415208 chromium-53.0.2785.101/services/shell/shell.gyp
+--- chromium-53.0.2785.101/services/shell/shell.gyp.415208	2016-09-08 10:19:52.543156283 -0400
+++ chromium-53.0.2785.101/services/shell/shell.gyp	2016-09-08 10:20:03.894938333 -0400
+@@ -145,7 +145,6 @@
+           '<(DEPTH)/sandbox/sandbox.gyp:sandbox',
+           '<(DEPTH)/sandbox/sandbox.gyp:sandbox_services',
+           '<(DEPTH)/sandbox/sandbox.gyp:seccomp_bpf',
+-          '<(DEPTH)/sandbox/sandbox.gyp:seccomp_bpf_helpers',
+         ],
+       }],
+       ['OS=="mac"', {
--- a/chromium-53.0.2785.92-boringssl-time-fix.patch
+++ b/chromium-53.0.2785.92-boringssl-time-fix.patch
@ -0,0 +1,11 @@
+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>
+ 
--- a/chromium-53.0.2785.92-gn-system.patch
+++ b/chromium-53.0.2785.92-gn-system.patch
@ -0,0 +1,252 @@
+diff -up chromium-53.0.2785.92/build/linux/unbundle/libjpeg.gn.gnsystem chromium-53.0.2785.92/build/linux/unbundle/libjpeg.gn
+--- chromium-53.0.2785.92/build/linux/unbundle/libjpeg.gn.gnsystem	2016-09-06 13:27:56.018365168 -0400
+++ chromium-53.0.2785.92/build/linux/unbundle/libjpeg.gn	2016-09-06 13:27:56.018365168 -0400
+@@ -0,0 +1,9 @@
+# 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.
+
+source_set("libjpeg") {
+  libs = [
+    "jpeg",
+  ]
+}
+diff -up chromium-53.0.2785.92/build/linux/unbundle/libpng.gn.gnsystem chromium-53.0.2785.92/build/linux/unbundle/libpng.gn
+--- chromium-53.0.2785.92/build/linux/unbundle/libpng.gn.gnsystem	2016-09-06 13:27:56.018365168 -0400
+++ chromium-53.0.2785.92/build/linux/unbundle/libpng.gn	2016-09-06 13:27:56.018365168 -0400
+@@ -0,0 +1,25 @@
+# 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_libpng") {
+  packages = [ "libpng" ]
+}
+
+shim_headers("libpng_shim") {
+  root_path = "include"
+  headers = [
+    "png.h",
+    "pngconf.h",
+  ]
+}
+
+source_set("libpng") {
+  deps = [
+    ":libpng_shim",
+  ]
+  public_configs = [ ":system_libpng" ]
+}
+diff -up chromium-53.0.2785.92/build/linux/unbundle/libusb.gn.gnsystem chromium-53.0.2785.92/build/linux/unbundle/libusb.gn
+--- chromium-53.0.2785.92/build/linux/unbundle/libusb.gn.gnsystem	2016-09-06 13:27:56.019365149 -0400
+++ chromium-53.0.2785.92/build/linux/unbundle/libusb.gn	2016-09-06 13:27:56.018365168 -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-53.0.2785.92/build/linux/unbundle/opus.gn.gnsystem chromium-53.0.2785.92/build/linux/unbundle/opus.gn
+--- chromium-53.0.2785.92/build/linux/unbundle/opus.gn.gnsystem	2016-09-06 13:27:56.019365149 -0400
+++ chromium-53.0.2785.92/build/linux/unbundle/opus.gn	2016-09-06 13:31:11.546589545 -0400
+@@ -0,0 +1,161 @@
+# 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",
+  ]
+}
+
+diff -up chromium-53.0.2785.92/build/linux/unbundle/replace_gn_files.py.gnsystem chromium-53.0.2785.92/build/linux/unbundle/replace_gn_files.py
+--- chromium-53.0.2785.92/build/linux/unbundle/replace_gn_files.py.gnsystem	2016-09-02 15:02:02.000000000 -0400
+++ chromium-53.0.2785.92/build/linux/unbundle/replace_gn_files.py	2016-09-06 13:27:56.020365130 -0400
+@@ -21,9 +21,13 @@ REPLACEMENTS = {
+   'flac': 'third_party/flac/BUILD.gn',
+   'harfbuzz-ng': 'third_party/harfbuzz-ng/BUILD.gn',
+   'libevent': 'base/third_party/libevent/BUILD.gn',
+  'libjpeg': 'third_party/libjpeg/BUILD.gn',
+  'libpng': 'third_party/libpng/BUILD.gn',
+  'libusb': 'third_party/libusb/BUILD.gn',
+   'libwebp': 'third_party/libwebp/BUILD.gn',
+   'libxml': 'third_party/libxml/BUILD.gn',
+   'libxslt': 'third_party/libxslt/BUILD.gn',
+  'opus': 'third_party/opus/BUILD.gn',
+   'snappy': 'third_party/snappy/BUILD.gn',
+   'yasm': 'third_party/yasm/yasm_assemble.gni',
+   'zlib': 'third_party/zlib/BUILD.gn',
--- a/chromium-53.0.2785.92-last-commit-position.patch
+++ b/chromium-53.0.2785.92-last-commit-position.patch
@ -0,0 +1,28 @@
+diff -up chromium-53.0.2785.92/tools/gn/BUILD.gn.lastcommitfix chromium-53.0.2785.92/tools/gn/BUILD.gn
+--- chromium-53.0.2785.92/tools/gn/BUILD.gn.lastcommitfix	2016-09-06 13:50:17.540459136 -0400
+++ chromium-53.0.2785.92/tools/gn/BUILD.gn	2016-09-06 13:50:27.380269110 -0400
+@@ -259,7 +259,6 @@ executable("gn") {
+ 
+   deps = [
+     ":gn_lib",
+-    ":last_commit_position",
+     "//base",
+     "//build/config/sanitizers:deps",
+     "//build/win:default_exe_manifest",
+diff -up chromium-53.0.2785.92/tools/gn/gn_main.cc.lastcommitfix chromium-53.0.2785.92/tools/gn/gn_main.cc
+--- chromium-53.0.2785.92/tools/gn/gn_main.cc.lastcommitfix	2016-09-06 13:49:34.620288177 -0400
+++ chromium-53.0.2785.92/tools/gn/gn_main.cc	2016-09-06 13:49:47.316042652 -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 {
+ 
--- a/chromium-54.0.2840.59-arm-icu-fix.patch
+++ b/chromium-54.0.2840.59-arm-icu-fix.patch
@ -0,0 +1,12 @@
+diff -up chromium-54.0.2840.59/third_party/icu/icu.gyp.armfix chromium-54.0.2840.59/third_party/icu/icu.gyp
+--- chromium-54.0.2840.59/third_party/icu/icu.gyp.armfix	2016-10-13 14:57:47.148707100 -0400
+++ chromium-54.0.2840.59/third_party/icu/icu.gyp	2016-10-13 14:59:24.294837176 -0400
+@@ -44,7 +44,7 @@
+       }],
+       ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
+          or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \
+-        (target_arch=="arm" or target_arch=="ia32" or \
+        (target_arch=="ia32" or \
+          target_arch=="mipsel" or target_arch=="mips")', {
+         'target_conditions': [
+           ['_toolset=="host"', {
--- a/chromium-54.0.2840.59-gcc5.patch
+++ b/chromium-54.0.2840.59-gcc5.patch
@ -0,0 +1,354 @@
+diff -up chromium-54.0.2840.59/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc.gcc5 chromium-54.0.2840.59/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc
+--- chromium-54.0.2840.59/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc.gcc5	2016-10-12 15:05:10.000000000 -0400
+++ chromium-54.0.2840.59/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc	2016-10-13 14:45:19.769110162 -0400
+@@ -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-54.0.2840.59/third_party/webgl/src/specs/latest/2.0/webgl2.idl.gcc5 chromium-54.0.2840.59/third_party/webgl/src/specs/latest/2.0/webgl2.idl
+--- chromium-54.0.2840.59/third_party/webgl/src/specs/latest/2.0/webgl2.idl.gcc5	2016-10-12 15:05:45.000000000 -0400
+++ chromium-54.0.2840.59/third_party/webgl/src/specs/latest/2.0/webgl2.idl	2016-10-13 14:45:19.770110142 -0400
+@@ -264,7 +264,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-54.0.2840.59/third_party/WebKit/Source/core/dom/NodeFilter.h.gcc5 chromium-54.0.2840.59/third_party/WebKit/Source/core/dom/NodeFilter.h
+--- chromium-54.0.2840.59/third_party/WebKit/Source/core/dom/NodeFilter.h.gcc5	2016-10-13 14:45:19.771110122 -0400
+++ chromium-54.0.2840.59/third_party/WebKit/Source/core/dom/NodeFilter.h	2016-10-13 14:54:50.328113956 -0400
+@@ -51,7 +51,7 @@ public:
+      * 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-54.0.2840.59/third_party/WebKit/Source/core/dom/NodeFilter.idl.gcc5 chromium-54.0.2840.59/third_party/WebKit/Source/core/dom/NodeFilter.idl
+--- chromium-54.0.2840.59/third_party/WebKit/Source/core/dom/NodeFilter.idl.gcc5	2016-10-12 15:03:13.000000000 -0400
+++ chromium-54.0.2840.59/third_party/WebKit/Source/core/dom/NodeFilter.idl	2016-10-13 14:45:19.771110122 -0400
+@@ -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-54.0.2840.59/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl.gcc5 chromium-54.0.2840.59/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl
+--- chromium-54.0.2840.59/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl.gcc5	2016-10-12 15:03:13.000000000 -0400
+++ chromium-54.0.2840.59/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl	2016-10-13 14:45:19.772110102 -0400
+@@ -239,7 +239,7 @@ typedef long long      GLint64;
+     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;
+@@ -282,7 +282,7 @@ typedef long long      GLint64;
+     const GLenum MAX_ELEMENT_INDEX                             = 0x8D6B;
+     const GLenum NUM_SAMPLE_COUNTS                             = 0x9380;
+     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;
--- a/chromium-54.0.2840.59-gn-system.patch
+++ b/chromium-54.0.2840.59-gn-system.patch
@ -0,0 +1,223 @@
+diff -up chromium-54.0.2840.59/build/linux/unbundle/libjpeg.gn.gnsystem chromium-54.0.2840.59/build/linux/unbundle/libjpeg.gn
+--- chromium-54.0.2840.59/build/linux/unbundle/libjpeg.gn.gnsystem	2016-10-13 16:06:00.464796742 -0400
+++ chromium-54.0.2840.59/build/linux/unbundle/libjpeg.gn	2016-10-13 16:06:08.976631824 -0400
+@@ -16,6 +16,10 @@ source_set("libjpeg") {
+   libs = [ "jpeg" ]
+ }
+ 
+config("system_libjpeg") {
+  defines = [ "USE_SYSTEM_LIBJPEG=1" ]
+}
+
+ source_set("simd") {
+ }
+ 
+diff -up chromium-54.0.2840.59/build/linux/unbundle/libusb.gn.gnsystem chromium-54.0.2840.59/build/linux/unbundle/libusb.gn
+--- chromium-54.0.2840.59/build/linux/unbundle/libusb.gn.gnsystem	2016-10-13 15:47:48.147891525 -0400
+++ chromium-54.0.2840.59/build/linux/unbundle/libusb.gn	2016-10-13 15:47:48.147891525 -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-54.0.2840.59/build/linux/unbundle/opus.gn.gnsystem chromium-54.0.2840.59/build/linux/unbundle/opus.gn
+--- chromium-54.0.2840.59/build/linux/unbundle/opus.gn.gnsystem	2016-10-13 15:47:48.147891525 -0400
+++ chromium-54.0.2840.59/build/linux/unbundle/opus.gn	2016-10-13 15:47:48.147891525 -0400
+@@ -0,0 +1,161 @@
+# 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",
+  ]
+}
+
+diff -up chromium-54.0.2840.59/build/linux/unbundle/replace_gn_files.py.gnsystem chromium-54.0.2840.59/build/linux/unbundle/replace_gn_files.py
+--- chromium-54.0.2840.59/build/linux/unbundle/replace_gn_files.py.gnsystem	2016-10-12 15:02:53.000000000 -0400
+++ chromium-54.0.2840.59/build/linux/unbundle/replace_gn_files.py	2016-10-13 15:47:48.147891525 -0400
+@@ -23,10 +23,12 @@ 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',
+   'libxslt': 'third_party/libxslt/BUILD.gn',
+  'opus': 'third_party/opus/BUILD.gn',
+   're2': 'third_party/re2/BUILD.gn',
+   'snappy': 'third_party/snappy/BUILD.gn',
+   'yasm': 'third_party/yasm/yasm_assemble.gni',
--- a/chromium-54.0.2840.59-i686-ld-memory-tricks.patch
+++ b/chromium-54.0.2840.59-i686-ld-memory-tricks.patch
@ -0,0 +1,12 @@
+diff -up chromium-54.0.2840.59/build/toolchain/linux/BUILD.gn.ldmemory chromium-54.0.2840.59/build/toolchain/linux/BUILD.gn
+--- chromium-54.0.2840.59/build/toolchain/linux/BUILD.gn.ldmemory	2016-10-19 15:56:20.253096784 -0400
+++ chromium-54.0.2840.59/build/toolchain/linux/BUILD.gn	2016-10-19 15:58:17.940833948 -0400
+@@ -71,7 +71,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"
+ 
+   toolchain_args = {
+     current_cpu = "x86"
--- a/chromium-54.0.2840.59-jpeg-include-dir.patch
+++ b/chromium-54.0.2840.59-jpeg-include-dir.patch
@ -0,0 +1,11 @@
+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") {
--- a/chromium-54.0.2840.59-nullfix.patch
+++ b/chromium-54.0.2840.59-nullfix.patch
@ -0,0 +1,35 @@
+diff -up chromium-54.0.2840.59/build/toolchain/linux/BUILD.gn.nullfix chromium-54.0.2840.59/build/toolchain/linux/BUILD.gn
+--- chromium-54.0.2840.59/build/toolchain/linux/BUILD.gn.nullfix	2016-10-13 16:49:26.844221023 -0400
+++ chromium-54.0.2840.59/build/toolchain/linux/BUILD.gn	2016-10-13 16:50:49.882605484 -0400
+@@ -31,6 +31,7 @@ gcc_toolchain("arm") {
+   ld = cxx
+   readelf = "${toolprefix}readelf"
+   nm = "${toolprefix}nm"
+  extra_cppflags = "-fno-delete-null-pointer-checks"
+ 
+   toolchain_args = {
+     current_cpu = "arm"
+@@ -70,6 +71,7 @@ gcc_toolchain("x86") {
+   nm = "nm"
+   ar = "ar"
+   ld = cxx
+  extra_cppflags = "-fno-delete-null-pointer-checks"
+ 
+   toolchain_args = {
+     current_cpu = "x86"
+@@ -109,6 +111,7 @@ gcc_toolchain("x64") {
+   nm = "nm"
+   ar = "ar"
+   ld = cxx
+  extra_cppflags = "-fno-delete-null-pointer-checks"
+ 
+   toolchain_args = {
+     current_cpu = "x64"
+@@ -131,6 +134,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 = ""
--- a/chromium-54.0.2840.90-aura-browser-link-to-snapshot.patch
+++ b/chromium-54.0.2840.90-aura-browser-link-to-snapshot.patch
@ -0,0 +1,11 @@
+diff -up chromium-54.0.2840.90/chrome/browser/BUILD.gn.fixme chromium-54.0.2840.90/chrome/browser/BUILD.gn
+--- chromium-54.0.2840.90/chrome/browser/BUILD.gn.fixme	2016-11-04 09:52:43.712072361 -0400
+++ chromium-54.0.2840.90/chrome/browser/BUILD.gn	2016-11-04 09:53:21.495864624 -0400
+@@ -605,6 +605,7 @@ split_static_library("browser") {
+       "//services/ui/public/cpp/input_devices",
+       "//ui/aura",
+       "//ui/compositor",
+      "//ui/snapshot",
+       "//ui/views/mus",
+     ]
+   }
--- a/chromium-54.0.2840.90-setopaque.patch
+++ b/chromium-54.0.2840.90-setopaque.patch
@ -0,0 +1,13 @@
+diff -up chromium-54.0.2840.90/cc/blink/web_layer_impl.h.setopaque chromium-54.0.2840.90/cc/blink/web_layer_impl.h
+--- chromium-54.0.2840.90/cc/blink/web_layer_impl.h.setopaque	2016-11-03 09:07:03.422497483 -0400
+++ chromium-54.0.2840.90/cc/blink/web_layer_impl.h	2016-11-03 09:07:13.302307531 -0400
+@@ -80,7 +80,7 @@ class WebLayerImpl : public blink::WebLa
+   blink::WebBlendMode blendMode() const override;
+   void setIsRootForIsolatedGroup(bool root) override;
+   bool isRootForIsolatedGroup() 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 position() const override;
+diff -up chromium-54.0.2840.90/content/renderer/child_frame_compositing_helper.cc.setopaque chromium-54.0.2840.90/content/renderer/child_frame_compositing_helper.cc
--- a/chromium-55.0.2883.75-addrfix.patch
+++ b/chromium-55.0.2883.75-addrfix.patch
@ -0,0 +1,11 @@
+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.
--- a/chromium-55.0.2883.75-cups22.patch
+++ b/chromium-55.0.2883.75-cups22.patch
@ -0,0 +1,29 @@
+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.
+         ]
--- a/chromium-55.0.2883.75-gcc5.patch
+++ b/chromium-55.0.2883.75-gcc5.patch
@ -0,0 +1,354 @@
+diff -up chromium-55.0.2883.75/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc.gcc5 chromium-55.0.2883.75/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc
+--- chromium-55.0.2883.75/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc.gcc5	2016-12-01 18:03:09.000000000 -0500
+++ chromium-55.0.2883.75/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc	2016-12-12 15:24:01.171747843 -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-55.0.2883.75/third_party/webgl/src/specs/latest/2.0/webgl2.idl.gcc5 chromium-55.0.2883.75/third_party/webgl/src/specs/latest/2.0/webgl2.idl
+--- chromium-55.0.2883.75/third_party/webgl/src/specs/latest/2.0/webgl2.idl.gcc5	2016-12-01 18:03:16.000000000 -0500
+++ chromium-55.0.2883.75/third_party/webgl/src/specs/latest/2.0/webgl2.idl	2016-12-12 15:24:01.209747655 -0500
+@@ -264,7 +264,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-55.0.2883.75/third_party/WebKit/Source/core/dom/NodeFilter.h.gcc5 chromium-55.0.2883.75/third_party/WebKit/Source/core/dom/NodeFilter.h
+--- chromium-55.0.2883.75/third_party/WebKit/Source/core/dom/NodeFilter.h.gcc5	2016-12-12 15:24:01.210747650 -0500
+++ chromium-55.0.2883.75/third_party/WebKit/Source/core/dom/NodeFilter.h	2016-12-12 15:26:23.176045106 -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-55.0.2883.75/third_party/WebKit/Source/core/dom/NodeFilter.idl.gcc5 chromium-55.0.2883.75/third_party/WebKit/Source/core/dom/NodeFilter.idl
+--- chromium-55.0.2883.75/third_party/WebKit/Source/core/dom/NodeFilter.idl.gcc5	2016-12-01 18:02:30.000000000 -0500
+++ chromium-55.0.2883.75/third_party/WebKit/Source/core/dom/NodeFilter.idl	2016-12-12 15:24:01.211747645 -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-55.0.2883.75/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl.gcc5 chromium-55.0.2883.75/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl
+--- chromium-55.0.2883.75/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl.gcc5	2016-12-01 18:02:32.000000000 -0500
+++ chromium-55.0.2883.75/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl	2016-12-12 15:24:01.214747631 -0500
+@@ -239,7 +239,7 @@ typedef long long      GLint64;
+     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;
+@@ -282,7 +282,7 @@ typedef long long      GLint64;
+     const GLenum MAX_ELEMENT_INDEX                             = 0x8D6B;
+     const GLenum NUM_SAMPLE_COUNTS                             = 0x9380;
+     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;
--- a/chromium-55.0.2883.75-more-codec-aliases.patch
+++ b/chromium-55.0.2883.75-more-codec-aliases.patch
@ -0,0 +1,15 @@
+diff -up chromium-55.0.2883.75/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp.morealiases chromium-55.0.2883.75/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp
+--- chromium-55.0.2883.75/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp.morealiases	2016-12-12 15:53:06.545149310 -0500
+++ chromium-55.0.2883.75/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp	2016-12-12 15:55:25.808468122 -0500
+@@ -213,7 +213,11 @@ void TextCodecICU::registerEncodingNames
+   registrar("iso_8859-6", "ISO-8859-6");
+   registrar("iso_8859-7", "ISO-8859-7");
+   registrar("iso_8859-8", "ISO-8859-8");
+  registrar("iso_8859-8-I", "ISO-8859-8-I");
+   registrar("iso_8859-9", "windows-1254");
+  registrar("iso_8859-10", "ISO-8859-10");
+  registrar("iso_8859-13", "ISO-8859-13");
+  registrar("iso_8859-14", "ISO-8859-14");
+   registrar("iso_8859-15", "ISO-8859-15");
+   registrar("koi8_r", "KOI8-R");
+   registrar("x-cp1253", "windows-1253");
--- a/chromium-55.0.2883.75-sandbox-pie.patch
+++ b/chromium-55.0.2883.75-sandbox-pie.patch
@ -0,0 +1,30 @@
+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" ]
+       }
+     }
+ 
--- a/chromium-55.0.2883.75-use_system_harfbuzz.patch
+++ b/chromium-55.0.2883.75-use_system_harfbuzz.patch
@ -0,0 +1,12 @@
+diff -up chromium-55.0.2883.75/ui/gfx/render_text_harfbuzz.h.use_system_harfbuzz chromium-55.0.2883.75/ui/gfx/render_text_harfbuzz.h
+--- chromium-55.0.2883.75/ui/gfx/render_text_harfbuzz.h.use_system_harfbuzz	2016-12-12 16:09:03.873466669 -0500
+++ chromium-55.0.2883.75/ui/gfx/render_text_harfbuzz.h	2016-12-12 16:09:57.507204326 -0500
+@@ -12,7 +12,7 @@
+ 
+ #include "base/macros.h"
+ #include "base/memory/scoped_vector.h"
+-#include "third_party/harfbuzz-ng/src/hb.h"
+#include <harfbuzz/hb.h>
+ #include "third_party/icu/source/common/unicode/ubidi.h"
+ #include "third_party/icu/source/common/unicode/uscript.h"
+ #include "ui/gfx/render_text.h"
--- a/chromium-55.0.2883.87-rvalue-fix.patch
+++ b/chromium-55.0.2883.87-rvalue-fix.patch
@ -0,0 +1,17 @@
+diff -up chromium-55.0.2883.87/buildtools/third_party/libc++/trunk/test/std/input.output/iostream.format/input.streams/istream.rvalue chromium-55.0.2883.87/buildtools/third_party/libc++/trunk/test/std/input.output/iostream.format/input.streams/istream
+Only in chromium-55.0.2883.87/buildtools/third_party/libc++/trunk/test/std/input.output/iostream.format/input.streams/istream: istream.assign
+Only in chromium-55.0.2883.87/buildtools/third_party/libc++/trunk/test/std/input.output/iostream.format/input.streams/istream: istream.cons
+Only in chromium-55.0.2883.87/buildtools/third_party/libc++/trunk/test/std/input.output/iostream.format/input.streams/istream: istream_sentry
+diff -up chromium-55.0.2883.87/buildtools/third_party/libc++/trunk/test/std/input.output/iostream.format/output.streams/ostream.rvalue chromium-55.0.2883.87/buildtools/third_party/libc++/trunk/test/std/input.output/iostream.format/output.streams/ostream
+diff -up chromium-55.0.2883.87/remoting/host/fake_desktop_environment.cc.rvalue chromium-55.0.2883.87/remoting/host/fake_desktop_environment.cc
+--- chromium-55.0.2883.87/remoting/host/fake_desktop_environment.cc.rvalue	2016-12-14 11:19:16.150103994 -0500
+++ chromium-55.0.2883.87/remoting/host/fake_desktop_environment.cc	2016-12-14 11:19:44.003563271 -0500
+@@ -84,7 +84,7 @@ FakeDesktopEnvironment::CreateVideoCaptu
+   std::unique_ptr<DesktopCapturerProxy> result(
+       new DesktopCapturerProxy(capture_thread_));
+   result->set_capturer(std::move(fake_capturer));
+-  return result;
+  return std::move(result);
+ }
+ 
+ std::unique_ptr<webrtc::MouseCursorMonitor>
--- a/chromium-56.0.2924.87-fpermissive.patch
+++ b/chromium-56.0.2924.87-fpermissive.patch
@ -0,0 +1,13 @@
+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'.
--- a/chromium-56.0.2924.87-gcc5.patch
+++ b/chromium-56.0.2924.87-gcc5.patch
@ -0,0 +1,354 @@
+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;
--- a/chromium-56.0.2924.87-gcc7.patch
+++ b/chromium-56.0.2924.87-gcc7.patch
@ -0,0 +1,82 @@
+diff -up chromium-56.0.2924.87/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.gcc7 chromium-56.0.2924.87/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h
+--- chromium-56.0.2924.87/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.gcc7	2017-03-01 11:29:32.681142930 -0500
+++ chromium-56.0.2924.87/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h	2017-03-01 11:30:19.396536499 -0500
+@@ -5,6 +5,7 @@
+ #include "platform/PlatformExport.h"
+ #include "wtf/ThreadSpecific.h"
+ 
+#include <functional>
+ #include <memory>
+ 
+ namespace gpu {
+diff -up chromium-56.0.2924.87/v8/src/objects-body-descriptors.h.gcc7 chromium-56.0.2924.87/v8/src/objects-body-descriptors.h
+--- chromium-56.0.2924.87/v8/src/objects-body-descriptors.h.gcc7	2017-02-28 16:00:27.313172210 -0500
+++ chromium-56.0.2924.87/v8/src/objects-body-descriptors.h	2017-02-28 16:00:46.016804708 -0500
+@@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public
+ 
+   template <typename StaticVisitor>
+   static inline void IterateBody(HeapObject* obj, int object_size) {
+-    IterateBody(obj);
+    IterateBody<StaticVisitor>(obj);
+   }
+ };
+ 
+diff -up chromium-56.0.2924.87/v8/src/objects.h.gcc7 chromium-56.0.2924.87/v8/src/objects.h
+--- chromium-56.0.2924.87/v8/src/objects.h.gcc7	2017-02-28 15:58:27.368527968 -0500
+++ chromium-56.0.2924.87/v8/src/objects.h	2017-02-28 15:59:25.868379455 -0500
+@@ -3531,22 +3531,10 @@ class HashTable : public HashTableBase {
+  public:
+   typedef Shape ShapeT;
+ 
+-  // Wrapper methods
+-  inline uint32_t Hash(Key key) {
+-    if (Shape::UsesSeed) {
+-      return Shape::SeededHash(key, GetHeap()->HashSeed());
+-    } else {
+-      return Shape::Hash(key);
+-    }
+-  }
+-
+-  inline uint32_t HashForObject(Key key, Object* object) {
+-    if (Shape::UsesSeed) {
+-      return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object);
+-    } else {
+-      return Shape::HashForObject(key, object);
+-    }
+-  }
+  // Wrapper methods.  Defined in src/objects-inl.h
+  // to break a cycle with src/heap/heap.h.
+  inline uint32_t Hash(Key key);
+  inline uint32_t HashForObject(Key key, Object* object);
+ 
+   // Returns a new HashTable object.
+   MUST_USE_RESULT static Handle<Derived> New(
+diff -up chromium-56.0.2924.87/v8/src/objects-inl.h.gcc7 chromium-56.0.2924.87/v8/src/objects-inl.h
+--- chromium-56.0.2924.87/v8/src/objects-inl.h.gcc7	2017-02-28 15:59:44.293016928 -0500
+++ chromium-56.0.2924.87/v8/src/objects-inl.h	2017-02-28 16:00:18.187351116 -0500
+@@ -39,6 +39,25 @@
+ namespace v8 {
+ namespace internal {
+ 
+template <typename Derived, typename Shape, typename Key>
+uint32_t HashTable<Derived, Shape, Key>::Hash(Key key) {
+  if (Shape::UsesSeed) {
+    return Shape::SeededHash(key, GetHeap()->HashSeed());
+  } else {
+    return Shape::Hash(key);
+  }
+}
+
+template <typename Derived, typename Shape, typename Key>
+uint32_t HashTable<Derived, Shape, Key>::HashForObject(Key key,
+                                                       Object* object) {
+  if (Shape::UsesSeed) {
+    return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object);
+  } else {
+    return Shape::HashForObject(key, object);
+  }
+}
+
+ PropertyDetails::PropertyDetails(Smi* smi) {
+   value_ = smi->value();
+ }
--- a/chromium-58.0.3029.81-enable-mp3.patch
+++ b/chromium-58.0.3029.81-enable-mp3.patch
@ -0,0 +1,144 @@
+diff -up chromium-58.0.3029.81/media/base/mime_util_internal.cc.mp3 chromium-58.0.3029.81/media/base/mime_util_internal.cc
+--- chromium-58.0.3029.81/media/base/mime_util_internal.cc.mp3	2017-04-21 14:46:15.817743487 -0400
+++ chromium-58.0.3029.81/media/base/mime_util_internal.cc	2017-04-21 14:52:58.544150880 -0400
+@@ -244,10 +244,10 @@ 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)
+   CodecSet mp3_codecs;
+   mp3_codecs.insert(MP3);
+ 
+#if BUILDFLAG(USE_PROPRIETARY_CODECS)
+   CodecSet aac;
+   aac.insert(MPEG2_AAC);
+   aac.insert(MPEG4_AAC);
+@@ -291,10 +291,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());
+@@ -715,7 +715,6 @@ bool MimeUtil::IsCodecProprietary(Codec
+     case INVALID_CODEC:
+     case AC3:
+     case EAC3:
+-    case MP3:
+     case MPEG2_AAC:
+     case MPEG4_AAC:
+     case H264:
+@@ -723,6 +722,7 @@ bool MimeUtil::IsCodecProprietary(Codec
+     case DOLBY_VISION:
+       return true;
+ 
+    case MP3:
+     case PCM:
+     case VORBIS:
+     case OPUS:
+diff -up chromium-58.0.3029.81/third_party/ffmpeg/ffmpeg_generated.gni.mp3 chromium-58.0.3029.81/third_party/ffmpeg/ffmpeg_generated.gni
+--- chromium-58.0.3029.81/third_party/ffmpeg/ffmpeg_generated.gni.mp3	2017-04-21 11:49:42.000000000 -0400
+++ chromium-58.0.3029.81/third_party/ffmpeg/ffmpeg_generated.gni	2017-04-21 14:46:15.816743506 -0400
+@@ -176,19 +176,12 @@ if ((is_linux && current_cpu == "arm" &&
+   ]
+ }
+ 
+-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_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) {
+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_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm") || (is_linux && current_cpu == "arm64") || (is_linux && current_cpu == "mipsel") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_win))
+{
+   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/ac3tab.c",
+     "libavcodec/cbrt_data.c",
+     "libavcodec/dct.c",
+     "libavcodec/dct32_fixed.c",
+@@ -204,7 +197,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",
+@@ -213,6 +205,21 @@ 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_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) 
+{
+  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_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_mac) || (is_win)) {
+   ffmpeg_c_sources += [
+     "libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c",
+@@ -312,21 +319,31 @@ if ((is_linux && current_cpu == "x64") |
+ if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) {
+   ffmpeg_c_sources += [
+     "libavcodec/x86/aacpsdsp_init.c",
+   ]
+}
+
+if ((current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "x64") || (is_linux && 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_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) {
+if ((current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_win)) {
+   ffmpeg_yasm_sources += [
+-    "libavcodec/x86/aacpsdsp.asm",
+     "libavcodec/x86/dct32.asm",
+     "libavcodec/x86/imdct36.asm",
+     "libavcodec/x86/sbrdsp.asm",
+   ]
+ }
+ 
+if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) {
+  ffmpeg_yasm_sources += [
+    "libavcodec/x86/aacpsdsp.asm",
+  ]
+}
+
+ if ((is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm")) {
+   ffmpeg_c_sources += [
+     "libavcodec/arm/h264pred_init_arm.c",
+diff -up chromium-58.0.3029.81/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 chromium-58.0.3029.81/third_party/ffmpeg/libavcodec/sbrdsp.c
+--- chromium-58.0.3029.81/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3	2017-04-21 11:49:43.000000000 -0400
+++ chromium-58.0.3029.81/third_party/ffmpeg/libavcodec/sbrdsp.c	2017-04-21 14:46:15.817743487 -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"
--- a/chromium-58.0.3029.81-ffmpeg-stdatomic.patch
+++ b/chromium-58.0.3029.81-ffmpeg-stdatomic.patch
@ -0,0 +1,14 @@
+diff -up chromium-57.0.2987.21/third_party/ffmpeg/libavutil/cpu.c.ffmpeg_stdatomic chromium-57.0.2987.21/third_party/ffmpeg/libavutil/cpu.c
+--- chromium-57.0.2987.21/third_party/ffmpeg/libavutil/cpu.c.ffmpeg_stdatomic	2017-02-03 07:07:36.000000000 +0100
+++ chromium-57.0.2987.21/third_party/ffmpeg/libavutil/cpu.c	2017-02-09 11:54:34.083000442 +0100
+@@ -20,6 +20,10 @@
+ // Chromium: Windows doesn't provide stdatomic.h, so use the compat version.
+ #if defined(_MSC_VER)
+ #include <compat/atomics/win32/stdatomic.h>
+// GCC 4.8 didn't have stdatomic, but was advertising it.
+// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58016
+#elif !defined(__clang__) && defined(__GNUC__) && (__GNUC__ == 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ == 8)))
+#include <compat/atomics/gcc/stdatomic.h>
+ #else
+ #include <stdatomic.h>
+ #endif
--- a/chromium-58.0.3029.81-fix-gn.patch
+++ b/chromium-58.0.3029.81-fix-gn.patch
@ -0,0 +1,11 @@
+diff -up chromium-58.0.3029.81/tools/gn/bootstrap/bootstrap.py.fixgn chromium-58.0.3029.81/tools/gn/bootstrap/bootstrap.py
+--- chromium-58.0.3029.81/tools/gn/bootstrap/bootstrap.py.fixgn	2017-04-21 15:39:59.704874747 -0400
+++ chromium-58.0.3029.81/tools/gn/bootstrap/bootstrap.py	2017-04-21 15:43:06.778809475 -0400
+@@ -384,6 +384,7 @@ def write_gn_ninja(path, root_gen_dir, o
+       'base/base_paths.cc',
+       'base/base_switches.cc',
+       'base/build_time.cc',
+      'base/callback_helpers.cc',
+       'base/callback_internal.cc',
+       'base/command_line.cc',
+       'base/debug/activity_tracker.cc',
--- a/chromium-58.0.3029.81-use_system_harfbuzz.patch
+++ b/chromium-58.0.3029.81-use_system_harfbuzz.patch
@ -0,0 +1,12 @@
+diff -up chromium-58.0.3029.81/ui/gfx/render_text_harfbuzz.h.use_system_harfbuzz chromium-58.0.3029.81/ui/gfx/render_text_harfbuzz.h
+--- chromium-58.0.3029.81/ui/gfx/render_text_harfbuzz.h.use_system_harfbuzz	2017-04-21 14:58:23.182030756 -0400
+++ chromium-58.0.3029.81/ui/gfx/render_text_harfbuzz.h	2017-04-21 15:06:22.681991351 -0400
+@@ -12,7 +12,7 @@
+ #include <vector>
+ 
+ #include "base/macros.h"
+-#include "third_party/harfbuzz-ng/src/hb.h"
+#include <harfbuzz/hb.h>
+ #include "third_party/icu/source/common/unicode/ubidi.h"
+ #include "third_party/icu/source/common/unicode/uscript.h"
+ #include "ui/gfx/render_text.h"
--- a/chromium-58.0.3029.96-revert-b794998819088f76b4cf44c8db6940240c563cf4.patch
+++ b/chromium-58.0.3029.96-revert-b794998819088f76b4cf44c8db6940240c563cf4.patch
@ -0,0 +1,19 @@
+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;
--- a/chromium-59.0.3071.115-ucontext-fix.patch
+++ b/chromium-59.0.3071.115-ucontext-fix.patch
@ -0,0 +1,214 @@
+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
--- a/chromium-59.0.3071.86-dma-buf-header-hack.patch
+++ b/chromium-59.0.3071.86-dma-buf-header-hack.patch
@ -0,0 +1,13 @@
+diff -up chromium-59.0.3071.86/ui/gfx/linux/client_native_pixmap_dmabuf.cc.headerhack chromium-59.0.3071.86/ui/gfx/linux/client_native_pixmap_dmabuf.cc
+--- chromium-59.0.3071.86/ui/gfx/linux/client_native_pixmap_dmabuf.cc.headerhack	2017-06-09 15:12:49.684832489 -0400
+++ chromium-59.0.3071.86/ui/gfx/linux/client_native_pixmap_dmabuf.cc	2017-06-09 15:13:13.907342001 -0400
+@@ -17,7 +17,8 @@
+ #include "base/strings/stringprintf.h"
+ #include "base/trace_event/trace_event.h"
+ 
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
+//#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
+#if 1
+ #include <linux/types.h>
+ 
+ struct local_dma_buf_sync {
--- a/chromium-59.0.3071.86-enable-mp3.patch
+++ b/chromium-59.0.3071.86-enable-mp3.patch
@ -0,0 +1,477 @@
+diff -up chromium-59.0.3071.86/components/neterror/resources/sounds/button-press.mp3 chromium-59.0.3071.86/components/neterror/resources/sounds/button-press
+diff -up chromium-59.0.3071.86/components/neterror/resources/sounds/hit.mp3 chromium-59.0.3071.86/components/neterror/resources/sounds/hit
+diff -up chromium-59.0.3071.86/components/neterror/resources/sounds/score-reached.mp3 chromium-59.0.3071.86/components/neterror/resources/sounds/score-reached
+diff -up chromium-59.0.3071.86/media/base/mime_util_internal.cc.mp3 chromium-59.0.3071.86/media/base/mime_util_internal.cc
+--- chromium-59.0.3071.86/media/base/mime_util_internal.cc.mp3	2017-06-05 15:03:08.000000000 -0400
+++ chromium-59.0.3071.86/media/base/mime_util_internal.cc	2017-06-15 12:37:05.162650032 -0400
+@@ -286,10 +286,10 @@ 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)
+   CodecSet mp3_codecs;
+   mp3_codecs.insert(MP3);
+ 
+#if BUILDFLAG(USE_PROPRIETARY_CODECS)
+   CodecSet aac;
+   aac.insert(MPEG2_AAC);
+   aac.insert(MPEG4_AAC);
+@@ -333,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());
+@@ -789,7 +789,6 @@ bool MimeUtil::IsCodecProprietary(Codec
+     case INVALID_CODEC:
+     case AC3:
+     case EAC3:
+-    case MP3:
+     case MPEG2_AAC:
+     case MPEG4_AAC:
+     case H264:
+@@ -797,6 +796,7 @@ bool MimeUtil::IsCodecProprietary(Codec
+     case DOLBY_VISION:
+       return true;
+ 
+    case MP3:
+     case PCM:
+     case VORBIS:
+     case OPUS:
+diff -up chromium-59.0.3071.86/media/BUILD.gn.mp3 chromium-59.0.3071.86/media/BUILD.gn
+--- chromium-59.0.3071.86/media/BUILD.gn.mp3	2017-06-15 12:48:07.277772389 -0400
+++ chromium-59.0.3071.86/media/BUILD.gn	2017-06-15 12:50:34.342911710 -0400
+@@ -229,6 +229,14 @@ component("media") {
+     "formats/webm/webm_video_client.h",
+     "formats/webm/webm_webvtt_parser.cc",
+     "formats/webm/webm_webvtt_parser.h",
+    "formats/mpeg/adts_constants.cc",
+    "formats/mpeg/adts_constants.h",
+    "formats/mpeg/adts_stream_parser.cc",
+    "formats/mpeg/adts_stream_parser.h",
+    "formats/mpeg/mpeg1_audio_stream_parser.cc",
+    "formats/mpeg/mpeg1_audio_stream_parser.h",
+    "formats/mpeg/mpeg_audio_stream_parser_base.cc",
+    "formats/mpeg/mpeg_audio_stream_parser_base.h",
+     "muxers/webm_muxer.cc",
+     "muxers/webm_muxer.h",
+     "renderers/audio_renderer_impl.cc",
+@@ -442,14 +450,6 @@ component("media") {
+       "formats/mp4/sample_to_group_iterator.h",
+       "formats/mp4/track_run_iterator.cc",
+       "formats/mp4/track_run_iterator.h",
+-      "formats/mpeg/adts_constants.cc",
+-      "formats/mpeg/adts_constants.h",
+-      "formats/mpeg/adts_stream_parser.cc",
+-      "formats/mpeg/adts_stream_parser.h",
+-      "formats/mpeg/mpeg1_audio_stream_parser.cc",
+-      "formats/mpeg/mpeg1_audio_stream_parser.h",
+-      "formats/mpeg/mpeg_audio_stream_parser_base.cc",
+-      "formats/mpeg/mpeg_audio_stream_parser_base.h",
+     ]
+     if (enable_mse_mpeg2ts_stream_parser) {
+       sources += [
+diff -up chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h.mp3 chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h
+--- chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h.mp3	2017-06-16 14:34:19.233333696 -0400
+++ chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h	2017-06-16 14:35:36.235836034 -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/usr/local/google/home/tguilbert/Code/chromium/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/usr/local/google/home/tguilbert/Code/chromium/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"
+@@ -550,7 +550,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
+@@ -617,8 +617,8 @@
+ #define CONFIG_LZF 0
+ #define CONFIG_ME_CMP 0
+ #define CONFIG_MPEG_ER 0
+-#define CONFIG_MPEGAUDIO 0
+-#define CONFIG_MPEGAUDIODSP 0
+#define CONFIG_MPEGAUDIO 1
+#define CONFIG_MPEGAUDIODSP 1
+ #define CONFIG_MPEGVIDEO 0
+ #define CONFIG_MPEGVIDEOENC 0
+ #define CONFIG_MSS34DSP 0
+@@ -957,7 +957,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
+@@ -1263,7 +1263,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
+@@ -2196,7 +2196,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-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h.mp3 chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h
+--- chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h.mp3	2017-06-16 14:33:03.565804834 -0400
+++ chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h	2017-06-16 14:34:00.538697021 -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/tguilbert/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/tguilbert/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"
+@@ -550,7 +550,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
+@@ -617,8 +617,8 @@
+ #define CONFIG_LZF 0
+ #define CONFIG_ME_CMP 0
+ #define CONFIG_MPEG_ER 0
+-#define CONFIG_MPEGAUDIO 0
+-#define CONFIG_MPEGAUDIODSP 0
+#define CONFIG_MPEGAUDIO 1
+#define CONFIG_MPEGAUDIODSP 1
+ #define CONFIG_MPEGVIDEO 0
+ #define CONFIG_MPEGVIDEOENC 0
+ #define CONFIG_MSS34DSP 0
+@@ -957,7 +957,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
+@@ -1263,7 +1263,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
+@@ -2196,7 +2196,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-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h.mp3 chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h
+--- chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h.mp3	2017-06-16 14:35:50.558558013 -0400
+++ chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h	2017-06-16 14:36:34.140710462 -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/tguilbert/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/tguilbert/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"
+@@ -550,7 +550,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
+@@ -617,8 +617,8 @@
+ #define CONFIG_LZF 0
+ #define CONFIG_ME_CMP 0
+ #define CONFIG_MPEG_ER 0
+-#define CONFIG_MPEGAUDIO 0
+-#define CONFIG_MPEGAUDIODSP 0
+#define CONFIG_MPEGAUDIO 1
+#define CONFIG_MPEGAUDIODSP 1
+ #define CONFIG_MPEGVIDEO 0
+ #define CONFIG_MPEGVIDEOENC 0
+ #define CONFIG_MSS34DSP 0
+@@ -957,7 +957,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
+@@ -1263,7 +1263,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
+@@ -2196,7 +2196,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-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.mp3 chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h
+--- chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.mp3	2017-06-16 14:31:10.694999531 -0400
+++ chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h	2017-06-16 14:32:48.921089988 -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/usr/local/google/home/tguilbert/Code/chromium/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/usr/local/google/home/tguilbert/Code/chromium/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"
+@@ -550,7 +550,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
+@@ -617,8 +617,8 @@
+ #define CONFIG_LZF 0
+ #define CONFIG_ME_CMP 0
+ #define CONFIG_MPEG_ER 0
+-#define CONFIG_MPEGAUDIO 0
+-#define CONFIG_MPEGAUDIODSP 0
+#define CONFIG_MPEGAUDIO 1
+#define CONFIG_MPEGAUDIODSP 1
+ #define CONFIG_MPEGVIDEO 0
+ #define CONFIG_MPEGVIDEOENC 0
+ #define CONFIG_MSS34DSP 0
+@@ -957,7 +957,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
+@@ -1263,7 +1263,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
+@@ -2196,7 +2196,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-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h.mp3 chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h
+--- chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h.mp3	2017-06-16 14:27:17.782528334 -0400
+++ chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h	2017-06-16 14:29:24.962054946 -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/usr/local/google/home/tguilbert/Code/chromium/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-pic --enable-lto"
+#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/usr/local/google/home/tguilbert/Code/chromium/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-pic --enable-lto --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"
+@@ -550,7 +550,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
+@@ -617,8 +617,8 @@
+ #define CONFIG_LZF 0
+ #define CONFIG_ME_CMP 0
+ #define CONFIG_MPEG_ER 0
+-#define CONFIG_MPEGAUDIO 0
+-#define CONFIG_MPEGAUDIODSP 0
+#define CONFIG_MPEGAUDIO 1
+#define CONFIG_MPEGAUDIODSP 1
+ #define CONFIG_MPEGVIDEO 0
+ #define CONFIG_MPEGVIDEOENC 0
+ #define CONFIG_MSS34DSP 0
+@@ -957,7 +957,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
+@@ -1263,7 +1263,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
+@@ -2196,7 +2196,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-59.0.3071.86/third_party/ffmpeg/ffmpeg_generated.gni.mp3 chromium-59.0.3071.86/third_party/ffmpeg/ffmpeg_generated.gni
+--- chromium-59.0.3071.86/third_party/ffmpeg/ffmpeg_generated.gni.mp3	2017-06-08 11:40:39.000000000 -0400
+++ chromium-59.0.3071.86/third_party/ffmpeg/ffmpeg_generated.gni	2017-06-15 12:37:05.163650012 -0400
+@@ -177,19 +177,12 @@ if ((is_linux && current_cpu == "arm" &&
+   ]
+ }
+ 
+-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_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) {
+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_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm") || (is_linux && current_cpu == "arm64") || (is_linux && current_cpu == "mipsel") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_win))
+{
+   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/ac3tab.c",
+     "libavcodec/cbrt_data.c",
+     "libavcodec/dct.c",
+     "libavcodec/dct32_fixed.c",
+@@ -205,7 +198,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",
+@@ -214,6 +206,21 @@ 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_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) 
+{
+  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_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_mac) || (is_win)) {
+   ffmpeg_c_sources += [
+     "libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c",
+@@ -315,21 +322,31 @@ if ((is_linux && current_cpu == "x64") |
+ if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) {
+   ffmpeg_c_sources += [
+     "libavcodec/x86/aacpsdsp_init.c",
+   ]
+}
+
+if ((current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "x64") || (is_linux && 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_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) {
+if ((current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_win)) {
+   ffmpeg_yasm_sources += [
+-    "libavcodec/x86/aacpsdsp.asm",
+     "libavcodec/x86/dct32.asm",
+     "libavcodec/x86/imdct36.asm",
+     "libavcodec/x86/sbrdsp.asm",
+   ]
+ }
+ 
+if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) {
+  ffmpeg_yasm_sources += [
+    "libavcodec/x86/aacpsdsp.asm",
+  ]
+}
+
+ if ((is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm")) {
+   ffmpeg_c_sources += [
+     "libavcodec/arm/h264pred_init_arm.c",
+diff -up chromium-59.0.3071.86/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 chromium-59.0.3071.86/third_party/ffmpeg/libavcodec/sbrdsp.c
+--- chromium-59.0.3071.86/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3	2017-06-08 11:40:41.000000000 -0400
+++ chromium-59.0.3071.86/third_party/ffmpeg/libavcodec/sbrdsp.c	2017-06-15 12:37:05.163650012 -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-59.0.3071.86/third_party/webrtc/examples/objc/AppRTCMobile/ios/resources/mozart.mp3 chromium-59.0.3071.86/third_party/webrtc/examples/objc/AppRTCMobile/ios/resources/mozart
+diff -up chromium-59.0.3071.86/tools/android/audio_focus_grabber/java/res/raw/ping.mp3 chromium-59.0.3071.86/tools/android/audio_focus_grabber/java/res/raw/ping
--- a/chromium-59.0.3071.86-ffmpeg-stdatomic.patch
+++ b/chromium-59.0.3071.86-ffmpeg-stdatomic.patch
@ -0,0 +1,17 @@
+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"
--- a/chromium-59.0.3071.86-gcc7.patch
+++ b/chromium-59.0.3071.86-gcc7.patch
@ -0,0 +1,81 @@
+diff -up chromium-59.0.3071.86/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.gcc7 chromium-59.0.3071.86/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h
+--- chromium-59.0.3071.86/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.gcc7	2017-06-07 16:30:12.351173420 -0400
+++ chromium-59.0.3071.86/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h	2017-06-07 16:32:43.005163948 -0400
+@@ -5,6 +5,7 @@
+ #include "platform/PlatformExport.h"
+ #include "platform/wtf/ThreadSpecific.h"
+ 
+#include <functional>
+ #include <memory>
+ 
+ namespace gpu {
+diff -up chromium-59.0.3071.86/v8/src/objects-body-descriptors.h.gcc7 chromium-59.0.3071.86/v8/src/objects-body-descriptors.h
+--- chromium-59.0.3071.86/v8/src/objects-body-descriptors.h.gcc7	2017-06-05 15:04:29.000000000 -0400
+++ chromium-59.0.3071.86/v8/src/objects-body-descriptors.h	2017-06-07 16:30:12.352173401 -0400
+@@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public
+ 
+   template <typename StaticVisitor>
+   static inline void IterateBody(HeapObject* obj, int object_size) {
+-    IterateBody(obj);
+    IterateBody<StaticVisitor>(obj);
+   }
+ };
+ 
+diff -up chromium-59.0.3071.86/v8/src/objects/hash-table.h.gcc7 chromium-59.0.3071.86/v8/src/objects/hash-table.h
+--- chromium-59.0.3071.86/v8/src/objects/hash-table.h.gcc7	2017-06-07 16:35:26.052900374 -0400
+++ chromium-59.0.3071.86/v8/src/objects/hash-table.h	2017-06-07 16:35:53.982340480 -0400
+@@ -135,22 +135,8 @@ class HashTable : public HashTableBase {
+  public:
+   typedef Shape ShapeT;
+ 
+-  // Wrapper methods
+-  inline uint32_t Hash(Key key) {
+-    if (Shape::UsesSeed) {
+-      return Shape::SeededHash(key, GetHeap()->HashSeed());
+-    } else {
+-      return Shape::Hash(key);
+-    }
+-  }
+-
+-  inline uint32_t HashForObject(Key key, Object* object) {
+-    if (Shape::UsesSeed) {
+-      return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object);
+-    } else {
+-      return Shape::HashForObject(key, object);
+-    }
+-  }
+  inline uint32_t Hash(Key key);
+  inline uint32_t HashForObject(Key key, Object* object);
+ 
+   // Returns a new HashTable object.
+   MUST_USE_RESULT static Handle<Derived> New(
+diff -up chromium-59.0.3071.86/v8/src/objects.h.gcc7 chromium-59.0.3071.86/v8/src/objects.h
+diff -up chromium-59.0.3071.86/v8/src/objects-inl.h.gcc7 chromium-59.0.3071.86/v8/src/objects-inl.h
+--- chromium-59.0.3071.86/v8/src/objects-inl.h.gcc7	2017-06-05 15:04:29.000000000 -0400
+++ chromium-59.0.3071.86/v8/src/objects-inl.h	2017-06-07 16:30:12.477171021 -0400
+@@ -46,6 +46,25 @@
+ namespace v8 {
+ namespace internal {
+ 
+template <typename Derived, typename Shape, typename Key>
+uint32_t HashTable<Derived, Shape, Key>::Hash(Key key) {
+  if (Shape::UsesSeed) {
+    return Shape::SeededHash(key, GetHeap()->HashSeed());
+  } else {
+    return Shape::Hash(key);
+  }
+}
+
+template <typename Derived, typename Shape, typename Key>
+uint32_t HashTable<Derived, Shape, Key>::HashForObject(Key key,
+                                                       Object* object) {
+  if (Shape::UsesSeed) {
+    return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object);
+  } else {
+    return Shape::HashForObject(key, object);
+  }
+}
+
+ PropertyDetails::PropertyDetails(Smi* smi) {
+   value_ = smi->value();
+ }
--- a/chromium-59.0.3071.86-i686-ld-memory-tricks.patch
+++ b/chromium-59.0.3071.86-i686-ld-memory-tricks.patch
@ -0,0 +1,12 @@
+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
--- a/chromium-59.0.3071.86-nullfix.patch
+++ b/chromium-59.0.3071.86-nullfix.patch
@ -0,0 +1,43 @@
+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 = ""
--- a/chromium-59.0.3071.86-setopaque.patch
+++ b/chromium-59.0.3071.86-setopaque.patch
@ -0,0 +1,12 @@
+diff -up chromium-59.0.3071.86/cc/blink/web_layer_impl.h.setopaque chromium-59.0.3071.86/cc/blink/web_layer_impl.h
+--- chromium-59.0.3071.86/cc/blink/web_layer_impl.h.setopaque	2017-06-07 15:48:52.240620197 -0400
+++ chromium-59.0.3071.86/cc/blink/web_layer_impl.h	2017-06-07 16:25:48.311448200 -0400
+@@ -69,7 +69,7 @@ class CC_BLINK_EXPORT WebLayerImpl : pub
+   blink::WebBlendMode BlendMode() const override;
+   void SetIsRootForIsolatedGroup(bool root) override;
+   bool IsRootForIsolatedGroup() 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;
--- a/chromium-59.0.3071.86-system-clang.patch
+++ b/chromium-59.0.3071.86-system-clang.patch
@ -0,0 +1,10 @@
+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"
+ }
--- a/chromium-60.0.3112.101-camfix.patch
+++ b/chromium-60.0.3112.101-camfix.patch
@ -0,0 +1,25 @@
+diff -up chromium-60.0.3112.101/content/browser/renderer_host/media/media_devices_dispatcher_host.cc.camfix chromium-60.0.3112.101/content/browser/renderer_host/media/media_devices_dispatcher_host.cc
+--- chromium-60.0.3112.101/content/browser/renderer_host/media/media_devices_dispatcher_host.cc.camfix	2017-08-16 17:02:07.177832503 -0400
+++ chromium-60.0.3112.101/content/browser/renderer_host/media/media_devices_dispatcher_host.cc	2017-08-16 17:02:56.378883520 -0400
+@@ -6,6 +6,7 @@
+ 
+ #include <stddef.h>
+ 
+#include <algorithm>
+ #include <utility>
+ #include <vector>
+ 
+@@ -454,6 +455,13 @@ media::VideoCaptureFormats MediaDevicesD
+ 
+   media_stream_manager_->video_capture_manager()->GetDeviceSupportedFormats(
+       device_id, &formats);
+  // Remove formats that have zero resolution.
+  formats.erase(std::remove_if(formats.begin(), formats.end(),
+                               [](const media::VideoCaptureFormat& format) {
+                                 return format.frame_size.GetArea() <= 0;
+                               }),
+                formats.end());
+
+   return formats;
+ }
+ 
--- a/chromium-60.0.3112.101-fix-ffmpeg-aarch64.patch
+++ b/chromium-60.0.3112.101-fix-ffmpeg-aarch64.patch
@ -0,0 +1,12 @@
+diff -up chromium-60.0.3112.101/third_party/ffmpeg/ffmpeg_generated.gni.aarch64 chromium-60.0.3112.101/third_party/ffmpeg/ffmpeg_generated.gni
+--- chromium-60.0.3112.101/third_party/ffmpeg/ffmpeg_generated.gni.aarch64	2017-08-23 14:46:37.305832399 -0400
+++ chromium-60.0.3112.101/third_party/ffmpeg/ffmpeg_generated.gni	2017-08-23 14:47:06.217148864 -0400
+@@ -539,7 +539,7 @@ if (is_linux && current_cpu == "arm64")
+   ]
+ }
+ 
+-if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) {
+if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chromium")) {
+   ffmpeg_c_sources += [
+     "libavcodec/aarch64/mpegaudiodsp_init.c",
+   ]
--- a/chromium-60.0.3112.113-libavutil-timer-include-path-fix.patch
+++ b/chromium-60.0.3112.113-libavutil-timer-include-path-fix.patch
@ -0,0 +1,21 @@
+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)
--- a/chromium-60.0.3112.78-enable-mp3.patch
+++ b/chromium-60.0.3112.78-enable-mp3.patch
@ -0,0 +1,479 @@
+diff -up chromium-60.0.3112.78/components/neterror/resources/sounds/button-press.mp3 chromium-60.0.3112.78/components/neterror/resources/sounds/button-press
+diff -up chromium-60.0.3112.78/components/neterror/resources/sounds/hit.mp3 chromium-60.0.3112.78/components/neterror/resources/sounds/hit
+diff -up chromium-60.0.3112.78/components/neterror/resources/sounds/score-reached.mp3 chromium-60.0.3112.78/components/neterror/resources/sounds/score-reached
+diff -up chromium-60.0.3112.78/media/base/mime_util_internal.cc.mp3 chromium-60.0.3112.78/media/base/mime_util_internal.cc
+--- chromium-60.0.3112.78/media/base/mime_util_internal.cc.mp3	2017-07-25 15:04:57.000000000 -0400
+++ chromium-60.0.3112.78/media/base/mime_util_internal.cc	2017-07-31 10:57:55.054231795 -0400
+@@ -278,10 +278,10 @@ 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)
+   CodecSet mp3_codecs;
+   mp3_codecs.insert(MP3);
+ 
+#if BUILDFLAG(USE_PROPRIETARY_CODECS)
+   CodecSet aac;
+   aac.insert(MPEG2_AAC);
+   aac.insert(MPEG4_AAC);
+@@ -325,10 +325,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());
+@@ -928,7 +928,6 @@ bool MimeUtil::IsCodecProprietary(Codec
+     case INVALID_CODEC:
+     case AC3:
+     case EAC3:
+-    case MP3:
+     case MPEG2_AAC:
+     case MPEG4_AAC:
+     case H264:
+@@ -936,6 +935,7 @@ bool MimeUtil::IsCodecProprietary(Codec
+     case DOLBY_VISION:
+       return true;
+ 
+    case MP3:
+     case PCM:
+     case VORBIS:
+     case OPUS:
+diff -up chromium-60.0.3112.78/media/BUILD.gn.mp3 chromium-60.0.3112.78/media/BUILD.gn
+diff -up chromium-60.0.3112.78/media/formats/BUILD.gn.mp3 chromium-60.0.3112.78/media/formats/BUILD.gn
+--- chromium-60.0.3112.78/media/formats/BUILD.gn.mp3	2017-07-31 11:00:08.486638957 -0400
+++ chromium-60.0.3112.78/media/formats/BUILD.gn	2017-07-31 11:01:17.867290730 -0400
+@@ -12,6 +12,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",
+@@ -76,14 +84,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-60.0.3112.78/third_party/catapult/third_party/gsutil/gslib/tests/test_data/test.mp3 chromium-60.0.3112.78/third_party/catapult/third_party/gsutil/gslib/tests/test_data/test
+diff -up chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h.mp3 chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h
+--- chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h.mp3	2017-07-31 10:18:49.000000000 -0400
+++ chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h	2017-07-31 10:57:55.056231757 -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/usr/local/google/home/tguilbert/Code/chromium/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/usr/local/google/home/tguilbert/Code/chromium/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"
+@@ -550,7 +550,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
+@@ -617,8 +617,8 @@
+ #define CONFIG_LZF 0
+ #define CONFIG_ME_CMP 0
+ #define CONFIG_MPEG_ER 0
+-#define CONFIG_MPEGAUDIO 0
+-#define CONFIG_MPEGAUDIODSP 0
+#define CONFIG_MPEGAUDIO 1
+#define CONFIG_MPEGAUDIODSP 1
+ #define CONFIG_MPEGVIDEO 0
+ #define CONFIG_MPEGVIDEOENC 0
+ #define CONFIG_MSS34DSP 0
+@@ -957,7 +957,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
+@@ -1263,7 +1263,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
+@@ -2196,7 +2196,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-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h.mp3 chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h
+--- chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h.mp3	2017-07-31 10:18:49.000000000 -0400
+++ chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h	2017-07-31 10:57:55.057231738 -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/tguilbert/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/tguilbert/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"
+@@ -550,7 +550,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
+@@ -617,8 +617,8 @@
+ #define CONFIG_LZF 0
+ #define CONFIG_ME_CMP 0
+ #define CONFIG_MPEG_ER 0
+-#define CONFIG_MPEGAUDIO 0
+-#define CONFIG_MPEGAUDIODSP 0
+#define CONFIG_MPEGAUDIO 1
+#define CONFIG_MPEGAUDIODSP 1
+ #define CONFIG_MPEGVIDEO 0
+ #define CONFIG_MPEGVIDEOENC 0
+ #define CONFIG_MSS34DSP 0
+@@ -957,7 +957,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
+@@ -1263,7 +1263,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
+@@ -2196,7 +2196,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-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h.mp3 chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h
+--- chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h.mp3	2017-07-31 10:18:49.000000000 -0400
+++ chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h	2017-07-31 10:57:55.106230806 -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/tguilbert/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/tguilbert/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"
+@@ -550,7 +550,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
+@@ -617,8 +617,8 @@
+ #define CONFIG_LZF 0
+ #define CONFIG_ME_CMP 0
+ #define CONFIG_MPEG_ER 0
+-#define CONFIG_MPEGAUDIO 0
+-#define CONFIG_MPEGAUDIODSP 0
+#define CONFIG_MPEGAUDIO 1
+#define CONFIG_MPEGAUDIODSP 1
+ #define CONFIG_MPEGVIDEO 0
+ #define CONFIG_MPEGVIDEOENC 0
+ #define CONFIG_MSS34DSP 0
+@@ -957,7 +957,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
+@@ -1263,7 +1263,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
+@@ -2196,7 +2196,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-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.mp3 chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h
+--- chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.mp3	2017-07-31 10:18:49.000000000 -0400
+++ chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h	2017-07-31 10:57:55.107230787 -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/usr/local/google/home/tguilbert/Code/chromium/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/usr/local/google/home/tguilbert/Code/chromium/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"
+@@ -550,7 +550,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
+@@ -617,8 +617,8 @@
+ #define CONFIG_LZF 0
+ #define CONFIG_ME_CMP 0
+ #define CONFIG_MPEG_ER 0
+-#define CONFIG_MPEGAUDIO 0
+-#define CONFIG_MPEGAUDIODSP 0
+#define CONFIG_MPEGAUDIO 1
+#define CONFIG_MPEGAUDIODSP 1
+ #define CONFIG_MPEGVIDEO 0
+ #define CONFIG_MPEGVIDEOENC 0
+ #define CONFIG_MSS34DSP 0
+@@ -957,7 +957,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
+@@ -1263,7 +1263,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
+@@ -2196,7 +2196,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-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h.mp3 chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h
+--- chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h.mp3	2017-07-31 10:18:49.000000000 -0400
+++ chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h	2017-07-31 10:57:55.108230768 -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/usr/local/google/home/tguilbert/Code/chromium/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-pic --enable-lto"
+#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/usr/local/google/home/tguilbert/Code/chromium/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-pic --enable-lto --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"
+@@ -550,7 +550,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
+@@ -617,8 +617,8 @@
+ #define CONFIG_LZF 0
+ #define CONFIG_ME_CMP 0
+ #define CONFIG_MPEG_ER 0
+-#define CONFIG_MPEGAUDIO 0
+-#define CONFIG_MPEGAUDIODSP 0
+#define CONFIG_MPEGAUDIO 1
+#define CONFIG_MPEGAUDIODSP 1
+ #define CONFIG_MPEGVIDEO 0
+ #define CONFIG_MPEGVIDEOENC 0
+ #define CONFIG_MSS34DSP 0
+@@ -957,7 +957,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
+@@ -1263,7 +1263,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
+@@ -2196,7 +2196,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-60.0.3112.78/third_party/ffmpeg/ffmpeg_generated.gni.mp3 chromium-60.0.3112.78/third_party/ffmpeg/ffmpeg_generated.gni
+--- chromium-60.0.3112.78/third_party/ffmpeg/ffmpeg_generated.gni.mp3	2017-07-31 10:18:46.000000000 -0400
+++ chromium-60.0.3112.78/third_party/ffmpeg/ffmpeg_generated.gni	2017-07-31 10:57:55.109230749 -0400
+@@ -177,19 +177,12 @@ if ((is_linux && current_cpu == "arm" &&
+   ]
+ }
+ 
+-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_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) {
+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_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm") || (is_linux && current_cpu == "arm64") || (is_linux && current_cpu == "mipsel") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_win))
+{
+   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/ac3tab.c",
+     "libavcodec/cbrt_data.c",
+     "libavcodec/dct.c",
+     "libavcodec/dct32_fixed.c",
+@@ -205,7 +198,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",
+@@ -214,6 +206,21 @@ 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_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) 
+{
+  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_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_mac) || (is_win)) {
+   ffmpeg_c_sources += [
+     "libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c",
+@@ -315,21 +322,31 @@ if ((is_linux && current_cpu == "x64") |
+ if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) {
+   ffmpeg_c_sources += [
+     "libavcodec/x86/aacpsdsp_init.c",
+   ]
+}
+
+if ((current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "x64") || (is_linux && 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_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) {
+if ((current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_win)) {
+   ffmpeg_yasm_sources += [
+-    "libavcodec/x86/aacpsdsp.asm",
+     "libavcodec/x86/dct32.asm",
+     "libavcodec/x86/imdct36.asm",
+     "libavcodec/x86/sbrdsp.asm",
+   ]
+ }
+ 
+if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) {
+  ffmpeg_yasm_sources += [
+    "libavcodec/x86/aacpsdsp.asm",
+  ]
+}
+
+ if ((is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm")) {
+   ffmpeg_c_sources += [
+     "libavcodec/arm/h264pred_init_arm.c",
+diff -up chromium-60.0.3112.78/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 chromium-60.0.3112.78/third_party/ffmpeg/libavcodec/sbrdsp.c
+--- chromium-60.0.3112.78/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3	2017-07-31 10:18:48.000000000 -0400
+++ chromium-60.0.3112.78/third_party/ffmpeg/libavcodec/sbrdsp.c	2017-07-31 10:57:55.110230730 -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-60.0.3112.78/third_party/webrtc/examples/objc/AppRTCMobile/ios/resources/mozart.mp3 chromium-60.0.3112.78/third_party/webrtc/examples/objc/AppRTCMobile/ios/resources/mozart
+diff -up chromium-60.0.3112.78/tools/android/audio_focus_grabber/java/res/raw/ping.mp3 chromium-60.0.3112.78/tools/android/audio_focus_grabber/java/res/raw/ping
--- a/chromium-60.0.3112.78-fix-gn-bootstrap.patch
+++ b/chromium-60.0.3112.78-fix-gn-bootstrap.patch
@ -0,0 +1,11 @@
+diff -up chromium-60.0.3112.78/tools/gn/bootstrap/bootstrap.py.fixme chromium-60.0.3112.78/tools/gn/bootstrap/bootstrap.py
+--- chromium-60.0.3112.78/tools/gn/bootstrap/bootstrap.py.fixme	2017-07-31 11:47:11.660774702 -0400
+++ chromium-60.0.3112.78/tools/gn/bootstrap/bootstrap.py	2017-07-31 11:47:32.859362600 -0400
+@@ -487,6 +487,7 @@ def write_gn_ninja(path, root_gen_dir, o
+       'base/sys_info.cc',
+       'base/task_runner.cc',
+       'base/task_scheduler/delayed_task_manager.cc',
+      'base/task_scheduler/environment_config.cc',
+       'base/task_scheduler/post_task.cc',
+       'base/task_scheduler/priority_queue.cc',
+       'base/task_scheduler/scheduler_lock_impl.cc',
--- a/chromium-60.0.3112.78-gcc7.patch
+++ b/chromium-60.0.3112.78-gcc7.patch
@ -0,0 +1,80 @@
+diff -up chromium-60.0.3112.78/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.gcc7 chromium-60.0.3112.78/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h
+--- chromium-60.0.3112.78/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.gcc7	2017-07-25 15:05:15.000000000 -0400
+++ chromium-60.0.3112.78/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h	2017-07-31 10:51:08.530131802 -0400
+@@ -8,6 +8,7 @@
+ #include "platform/PlatformExport.h"
+ #include "platform/wtf/ThreadSpecific.h"
+ 
+#include <functional>
+ #include <memory>
+ 
+ namespace gpu {
+diff -up chromium-60.0.3112.78/v8/src/objects-body-descriptors.h.gcc7 chromium-60.0.3112.78/v8/src/objects-body-descriptors.h
+--- chromium-60.0.3112.78/v8/src/objects-body-descriptors.h.gcc7	2017-07-31 10:51:08.531131782 -0400
+++ chromium-60.0.3112.78/v8/src/objects-body-descriptors.h	2017-07-31 10:55:08.989458924 -0400
+@@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public
+ 
+   template <typename StaticVisitor>
+   static inline void IterateBody(HeapObject* obj, int object_size) {
+-    IterateBody(obj);
+    IterateBody<StaticVisitor>(obj);
+   }
+ 
+   static inline int SizeOf(Map* map, HeapObject* object) { return kSize; }
+diff -up chromium-60.0.3112.78/v8/src/objects/hash-table.h.gcc7 chromium-60.0.3112.78/v8/src/objects/hash-table.h
+--- chromium-60.0.3112.78/v8/src/objects/hash-table.h.gcc7	2017-07-25 15:06:36.000000000 -0400
+++ chromium-60.0.3112.78/v8/src/objects/hash-table.h	2017-07-31 10:51:08.531131782 -0400
+@@ -138,22 +138,8 @@ class HashTable : public HashTableBase {
+  public:
+   typedef Shape ShapeT;
+ 
+-  // Wrapper methods
+-  inline uint32_t Hash(Key key) {
+-    if (Shape::UsesSeed) {
+-      return Shape::SeededHash(key, GetHeap()->HashSeed());
+-    } else {
+-      return Shape::Hash(key);
+-    }
+-  }
+-
+-  inline uint32_t HashForObject(Key key, Object* object) {
+-    if (Shape::UsesSeed) {
+-      return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object);
+-    } else {
+-      return Shape::HashForObject(key, object);
+-    }
+-  }
+  inline uint32_t Hash(Key key);
+  inline uint32_t HashForObject(Key key, Object* object);
+ 
+   // Returns a new HashTable object.
+   MUST_USE_RESULT static Handle<Derived> New(
+diff -up chromium-60.0.3112.78/v8/src/objects-inl.h.gcc7 chromium-60.0.3112.78/v8/src/objects-inl.h
+--- chromium-60.0.3112.78/v8/src/objects-inl.h.gcc7	2017-07-25 15:06:36.000000000 -0400
+++ chromium-60.0.3112.78/v8/src/objects-inl.h	2017-07-31 10:51:08.533131742 -0400
+@@ -47,6 +47,25 @@
+ namespace v8 {
+ namespace internal {
+ 
+template <typename Derived, typename Shape, typename Key>
+uint32_t HashTable<Derived, Shape, Key>::Hash(Key key) {
+  if (Shape::UsesSeed) {
+    return Shape::SeededHash(key, GetHeap()->HashSeed());
+  } else {
+    return Shape::Hash(key);
+  }
+}
+
+template <typename Derived, typename Shape, typename Key>
+uint32_t HashTable<Derived, Shape, Key>::HashForObject(Key key,
+                                                       Object* object) {
+  if (Shape::UsesSeed) {
+    return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object);
+  } else {
+    return Shape::HashForObject(key, object);
+  }
+}
+
+ PropertyDetails::PropertyDetails(Smi* smi) {
+   value_ = smi->value();
+ }
--- a/chromium-60.0.3112.78-gn-system.patch
+++ b/chromium-60.0.3112.78-gn-system.patch
@ -0,0 +1,221 @@
+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',
--- a/chromium-60.0.3112.78-gtk2fix.patch
+++ b/chromium-60.0.3112.78-gtk2fix.patch
@ -0,0 +1,612 @@
+diff -up chromium-60.0.3112.78/chrome/browser/ui/libgtkui/gtk_ui.cc.gtk2fix chromium-60.0.3112.78/chrome/browser/ui/libgtkui/gtk_ui.cc
+--- chromium-60.0.3112.78/chrome/browser/ui/libgtkui/gtk_ui.cc.gtk2fix	2017-08-03 10:26:36.816787227 -0400
+++ chromium-60.0.3112.78/chrome/browser/ui/libgtkui/gtk_ui.cc	2017-08-03 10:56:53.345661368 -0400
+@@ -60,6 +60,7 @@
+ #include "ui/views/controls/button/blue_button.h"
+ #include "ui/views/controls/button/label_button.h"
+ #include "ui/views/controls/button/label_button_border.h"
+#include "ui/views/linux_ui/device_scale_factor_observer.h"
+ #include "ui/views/linux_ui/window_button_order_observer.h"
+ #include "ui/views/resources/grit/views_resources.h"
+ 
+@@ -315,17 +316,6 @@ gfx::FontRenderParams GetGtkFontRenderPa
+   return params;
+ }
+ 
+-float GetRawDeviceScaleFactor() {
+-  if (display::Display::HasForceDeviceScaleFactor())
+-    return display::Display::GetForcedDeviceScaleFactor();
+-
+-  GdkScreen* screen = gdk_screen_get_default();
+-  gint scale = gdk_screen_get_monitor_scale_factor(
+-      screen, gdk_screen_get_primary_monitor(screen));
+-  gdouble resolution = gdk_screen_get_resolution(screen);
+-  return resolution <= 0 ? scale : resolution * scale / kDefaultDPI;
+-}
+-
+ views::LinuxUI::NonClientMiddleClickAction GetDefaultMiddleClickAction() {
+   std::unique_ptr<base::Environment> env(base::Environment::Create());
+   switch (base::nix::GetDesktopEnvironment(env.get())) {
+@@ -414,19 +404,17 @@ GtkUi::GtkUi() : middle_click_action_(Ge
+ #if GTK_MAJOR_VERSION == 2
+   native_theme_ = NativeThemeGtk2::instance();
+   fake_window_ = chrome_gtk_frame_new();
+-  gtk_widget_realize(fake_window_);  // Is this necessary?
+ #elif GTK_MAJOR_VERSION == 3
+   native_theme_ = NativeThemeGtk3::instance();
+-  (void)fake_window_;  // Silence the unused warning.
+  fake_window_ = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ #else
+ #error "Unsupported GTK version"
+ #endif
+  gtk_widget_realize(fake_window_);
+ }
+ 
+ GtkUi::~GtkUi() {
+-#if GTK_MAJOR_VERSION == 2
+   gtk_widget_destroy(fake_window_);
+-#endif
+ }
+ 
+ void OnThemeChanged(GObject* obj, GParamSpec* param, GtkUi* gtkui) {
+@@ -440,6 +428,17 @@ void GtkUi::Initialize() {
+   g_signal_connect_after(settings, "notify::gtk-icon-theme-name",
+                          G_CALLBACK(OnThemeChanged), this);
+ 
+  GdkScreen* screen = gdk_screen_get_default();
+  // Listen for DPI changes.
+  g_signal_connect_after(screen, "notify::resolution",
+                         G_CALLBACK(OnDeviceScaleFactorMaybeChangedThunk),
+                         this);
+  // Listen for scale factor changes.  We would prefer to listen on
+  // |screen|, but there is no scale-factor property, so use an
+  // unmapped window instead.
+  g_signal_connect(fake_window_, "notify::scale-factor",
+                   G_CALLBACK(OnDeviceScaleFactorMaybeChangedThunk), this);
+
+   LoadGtkValues();
+ 
+ #if BUILDFLAG(ENABLE_BASIC_PRINTING)
+@@ -701,12 +700,12 @@ void GtkUi::AddWindowButtonOrderObserver
+     observer->OnWindowButtonOrderingChange(leading_buttons_, trailing_buttons_);
+   }
+ 
+-  observer_list_.AddObserver(observer);
+  window_button_order_observer_list_.AddObserver(observer);
+ }
+ 
+ void GtkUi::RemoveWindowButtonOrderObserver(
+     views::WindowButtonOrderObserver* observer) {
+-  observer_list_.RemoveObserver(observer);
+  window_button_order_observer_list_.RemoveObserver(observer);
+ }
+ 
+ void GtkUi::SetWindowButtonOrdering(
+@@ -715,8 +714,10 @@ void GtkUi::SetWindowButtonOrdering(
+   leading_buttons_ = leading_buttons;
+   trailing_buttons_ = trailing_buttons;
+ 
+-  for (views::WindowButtonOrderObserver& observer : observer_list_)
+  for (views::WindowButtonOrderObserver& observer :
+       window_button_order_observer_list_) {
+     observer.OnWindowButtonOrderingChange(leading_buttons_, trailing_buttons_);
+  }
+ }
+ 
+ void GtkUi::SetNonClientMiddleClickAction(NonClientMiddleClickAction action) {
+@@ -768,6 +769,16 @@ void GtkUi::NotifyWindowManagerStartupCo
+   gdk_notify_startup_complete();
+ }
+ 
+void GtkUi::AddDeviceScaleFactorObserver(
+    views::DeviceScaleFactorObserver* observer) {
+  device_scale_factor_observer_list_.AddObserver(observer);
+}
+
+void GtkUi::RemoveDeviceScaleFactorObserver(
+    views::DeviceScaleFactorObserver* observer) {
+  device_scale_factor_observer_list_.RemoveObserver(observer);
+}
+
+ bool GtkUi::MatchEvent(const ui::Event& event,
+                        std::vector<ui::TextEditCommandAuraLinux>* commands) {
+   // Ensure that we have a keyboard handler.
+@@ -777,6 +788,10 @@ bool GtkUi::MatchEvent(const ui::Event&
+   return key_bindings_handler_->MatchEvent(event, commands);
+ }
+ 
+void GtkUi::OnDeviceScaleFactorMaybeChanged(void*, GParamSpec*) {
+  UpdateDeviceScaleFactor();
+}
+
+ void GtkUi::SetScrollbarColors() {
+   thumb_active_color_ = SkColorSetRGB(244, 244, 244);
+   thumb_inactive_color_ = SkColorSetRGB(234, 234, 234);
+@@ -1037,14 +1052,38 @@ void GtkUi::ResetStyle() {
+   native_theme_->NotifyObservers();
+ }
+ 
+-void GtkUi::UpdateDeviceScaleFactor() {
+-  // Note: Linux chrome currently does not support dynamic DPI
+-  // changes.  This is to allow flags to override the DPI settings
+-  // during startup.
+-  float scale = GetRawDeviceScaleFactor();
+float GtkUi::GetRawDeviceScaleFactor() {
+  if (display::Display::HasForceDeviceScaleFactor())
+    return display::Display::GetForcedDeviceScaleFactor();
+
+#if GTK_MAJOR_VERSION == 2
+  GtkSettings* gtk_settings = gtk_settings_get_default();
+  gint gtk_dpi = -1;
+  g_object_get(gtk_settings, "gtk-xft-dpi", &gtk_dpi, nullptr);
+  const float scale_factor = gtk_dpi / (1024 * kDefaultDPI);
+#else
+  GdkScreen* screen = gdk_screen_get_default();
+  gint scale = gtk_widget_get_scale_factor(fake_window_);
+  DCHECK_GT(scale, 0);
+  gdouble resolution = gdk_screen_get_resolution(screen);
+  const float scale_factor =
+      resolution <= 0 ? scale : resolution * scale / kDefaultDPI;
+#endif
+
+   // Blacklist scaling factors <120% (crbug.com/484400) and round
+   // to 1 decimal to prevent rendering problems (crbug.com/485183).
+-  device_scale_factor_ = scale < 1.2f ? 1.0f : roundf(scale * 10) / 10;
+  return scale_factor < 1.2f ? 1.0f : roundf(scale_factor * 10) / 10;
+}
+
+void GtkUi::UpdateDeviceScaleFactor() {
+  float old_device_scale_factor = device_scale_factor_;
+  device_scale_factor_ = GetRawDeviceScaleFactor();
+  if (device_scale_factor_ != old_device_scale_factor) {
+    for (views::DeviceScaleFactorObserver& observer :
+         device_scale_factor_observer_list_) {
+      observer.OnDeviceScaleFactorChanged();
+    }
+  }
+   UpdateDefaultFont();
+ }
+ 
+diff -up chromium-60.0.3112.78/chrome/browser/ui/libgtkui/gtk_ui.h.gtk2fix chromium-60.0.3112.78/chrome/browser/ui/libgtkui/gtk_ui.h
+--- chromium-60.0.3112.78/chrome/browser/ui/libgtkui/gtk_ui.h.gtk2fix	2017-08-03 10:35:28.031517634 -0400
+++ chromium-60.0.3112.78/chrome/browser/ui/libgtkui/gtk_ui.h	2017-08-03 10:37:29.300173415 -0400
+@@ -18,12 +18,14 @@
+ #include "ui/views/linux_ui/linux_ui.h"
+ #include "ui/views/window/frame_buttons.h"
+ 
+typedef struct _GParamSpec GParamSpec;
+ typedef struct _GtkStyle GtkStyle;
+ typedef struct _GtkWidget GtkWidget;
+ 
+ namespace libgtkui {
+ class Gtk2KeyBindingsHandler;
+ class GConfListener;
+class DeviceScaleFactorObserver;
+ 
+ // Interface to GTK2 desktop features.
+ //
+@@ -97,6 +99,10 @@ class GtkUi : public views::LinuxUI {
+   bool UnityIsRunning() override;
+   NonClientMiddleClickAction GetNonClientMiddleClickAction() override;
+   void NotifyWindowManagerStartupComplete() override;
+  void AddDeviceScaleFactorObserver(
+      views::DeviceScaleFactorObserver* observer) override;
+  void RemoveDeviceScaleFactorObserver(
+      views::DeviceScaleFactorObserver* observer) override;
+ 
+   // ui::TextEditKeybindingDelegate:
+   bool MatchEvent(const ui::Event& event,
+@@ -110,6 +116,12 @@ class GtkUi : public views::LinuxUI {
+   typedef std::map<int, SkColor> ColorMap;
+   typedef std::map<int, color_utils::HSL> TintMap;
+ 
+  CHROMEG_CALLBACK_1(GtkUi,
+                     void,
+                     OnDeviceScaleFactorMaybeChanged,
+                     void*,
+                     GParamSpec*);
+
+   // This method returns the colors webkit will use for the scrollbars. When no
+   // colors are specified by the GTK+ theme, this function averages of the
+   // thumb part and of the track colors.
+@@ -129,9 +141,12 @@ class GtkUi : public views::LinuxUI {
+   bool GetChromeStyleColor(const char* sytle_property,
+                            SkColor* ret_color) const;
+ 
+  float GetRawDeviceScaleFactor();
+
+   ui::NativeTheme* native_theme_;
+ 
+-  // A GtkWindow object with the class "ChromeGtkFrame".
+  // On Gtk2, A GtkWindow object with the class "ChromeGtkFrame".  On
+  // Gtk3, a regular GtkWindow.
+   GtkWidget* fake_window_;
+ 
+   // Colors calculated by LoadGtkValues() that are given to the
+@@ -171,7 +186,12 @@ class GtkUi : public views::LinuxUI {
+   std::unique_ptr<Gtk2KeyBindingsHandler> key_bindings_handler_;
+ 
+   // Objects to notify when the window frame button order changes.
+-  base::ObserverList<views::WindowButtonOrderObserver> observer_list_;
+  base::ObserverList<views::WindowButtonOrderObserver>
+      window_button_order_observer_list_;
+
+  // Objects to notify when the device scale factor changes.
+  base::ObserverList<views::DeviceScaleFactorObserver>
+      device_scale_factor_observer_list_;
+ 
+   // Whether we should lower the window on a middle click to the non client
+   // area.
+diff -up chromium-60.0.3112.78/ui/views/linux_ui/device_scale_factor_observer.h.gtk2fix chromium-60.0.3112.78/ui/views/linux_ui/device_scale_factor_observer.h
+--- chromium-60.0.3112.78/ui/views/linux_ui/device_scale_factor_observer.h.gtk2fix	2017-08-03 10:39:23.600963296 -0400
+++ chromium-60.0.3112.78/ui/views/linux_ui/device_scale_factor_observer.h	2017-08-03 10:39:39.024664885 -0400
+@@ -0,0 +1,19 @@
+// 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.
+
+#ifndef UI_VIEWS_LINUX_UI_DEVICE_SCALE_FACTOR_OBSERVER_H_
+#define UI_VIEWS_LINUX_UI_DEVICE_SCALE_FACTOR_OBSERVER_H_
+
+namespace views {
+
+class DeviceScaleFactorObserver {
+ public:
+  virtual ~DeviceScaleFactorObserver() {}
+
+  virtual void OnDeviceScaleFactorChanged() = 0;
+};
+
+}  // namespace views
+
+#endif  // UI_VIEWS_LINUX_UI_DEVICE_SCALE_FACTOR_OBSERVER_H_
+diff -up chromium-60.0.3112.78/ui/views/linux_ui/linux_ui.h.gtk2fix chromium-60.0.3112.78/ui/views/linux_ui/linux_ui.h
+--- chromium-60.0.3112.78/ui/views/linux_ui/linux_ui.h.gtk2fix	2017-08-03 10:39:48.866474799 -0400
+++ chromium-60.0.3112.78/ui/views/linux_ui/linux_ui.h	2017-08-03 10:41:05.598991893 -0400
+@@ -38,6 +38,7 @@ class NativeTheme;
+ 
+ namespace views {
+ class Border;
+class DeviceScaleFactorObserver;
+ class LabelButton;
+ class LabelButtonBorder;
+ class WindowButtonOrderObserver;
+@@ -157,6 +158,16 @@ class VIEWS_EXPORT LinuxUI : public ui::
+ 
+   // Determines the device scale factor of the primary screen.
+   virtual float GetDeviceScaleFactor() const = 0;
+
+  // Registers |observer| to be notified about changes to the device
+  // scale factor.
+  virtual void AddDeviceScaleFactorObserver(
+      DeviceScaleFactorObserver* observer) = 0;
+
+  // Unregisters |observer| from receiving changes to the device scale
+  // factor.
+  virtual void RemoveDeviceScaleFactorObserver(
+      DeviceScaleFactorObserver* observer) = 0;
+ };
+ 
+ }  // namespace views
+diff -up chromium-60.0.3112.78/ui/views/test/desktop_screen_x11_test_api.cc.gtk2fix chromium-60.0.3112.78/ui/views/test/desktop_screen_x11_test_api.cc
+--- chromium-60.0.3112.78/ui/views/test/desktop_screen_x11_test_api.cc.gtk2fix	2017-08-03 10:41:28.014558483 -0400
+++ chromium-60.0.3112.78/ui/views/test/desktop_screen_x11_test_api.cc	2017-08-03 10:41:49.326146074 -0400
+@@ -13,7 +13,7 @@ namespace test {
+ void DesktopScreenX11TestApi::UpdateDisplays() {
+   DesktopScreenX11* screen =
+       static_cast<DesktopScreenX11*>(display::Screen::GetScreen());
+-  screen->ConfigureTimerFired();
+  screen->UpdateDisplays();
+ }
+ 
+ }  // namespace test
+diff -up chromium-60.0.3112.78/ui/views/widget/desktop_aura/desktop_screen_x11.cc.gtk2fix chromium-60.0.3112.78/ui/views/widget/desktop_aura/desktop_screen_x11.cc
+--- chromium-60.0.3112.78/ui/views/widget/desktop_aura/desktop_screen_x11.cc.gtk2fix	2017-08-03 10:41:59.219954866 -0400
+++ chromium-60.0.3112.78/ui/views/widget/desktop_aura/desktop_screen_x11.cc	2017-08-03 10:47:16.589818323 -0400
+@@ -11,6 +11,7 @@
+ #undef RootWindow
+ 
+ #include "base/logging.h"
+#include "base/threading/thread_task_runner_handle.h"
+ #include "base/trace_event/trace_event.h"
+ #include "ui/aura/window.h"
+ #include "ui/aura/window_event_dispatcher.h"
+@@ -40,10 +41,6 @@ const char* const kAtomsToCache[] = {
+   nullptr
+ };
+ 
+-// The delay to perform configuration after RRNotify.  See the comment
+-// in |Dispatch()|.
+-const int64_t kConfigureDelayMs = 500;
+-
+ double GetDeviceScaleFactor() {
+   float device_scale_factor = 1.0f;
+   if (views::LinuxUI::instance()) {
+@@ -95,7 +92,10 @@ DesktopScreenX11::DesktopScreenX11()
+       has_xrandr_(false),
+       xrandr_event_base_(0),
+       primary_display_index_(0),
+      weak_factory_(this),
+       atom_cache_(xdisplay_, kAtomsToCache) {
+  if (views::LinuxUI::instance())
+    views::LinuxUI::instance()->AddDeviceScaleFactorObserver(this);
+   // We only support 1.3+. There were library changes before this and we should
+   // use the new interface instead of the 1.2 one.
+   int randr_version_major = 0;
+@@ -124,6 +124,8 @@ DesktopScreenX11::DesktopScreenX11()
+ }
+ 
+ DesktopScreenX11::~DesktopScreenX11() {
+  if (views::LinuxUI::instance())
+    views::LinuxUI::instance()->AddDeviceScaleFactorObserver(this);
+   if (has_xrandr_ && ui::PlatformEventSource::GetInstance())
+     ui::PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this);
+ }
+@@ -251,18 +253,7 @@ uint32_t DesktopScreenX11::DispatchEvent
+   } else if (event->type - xrandr_event_base_ == RRNotify ||
+              (event->type == PropertyNotify &&
+               event->xproperty.atom == atom_cache_.GetAtom("_NET_WORKAREA"))) {
+-    // There's some sort of observer dispatch going on here, but I don't think
+-    // it's the screen's?
+-    if (configure_timer_.get() && configure_timer_->IsRunning()) {
+-      configure_timer_->Reset();
+-    } else {
+-      configure_timer_.reset(new base::OneShotTimer());
+-      configure_timer_->Start(
+-          FROM_HERE,
+-          base::TimeDelta::FromMilliseconds(kConfigureDelayMs),
+-          this,
+-          &DesktopScreenX11::ConfigureTimerFired);
+-    }
+    RestartDelayedConfigurationTask();
+   } else {
+     NOTREACHED();
+   }
+@@ -270,11 +261,15 @@ uint32_t DesktopScreenX11::DispatchEvent
+   return ui::POST_DISPATCH_NONE;
+ }
+ 
+void DesktopScreenX11::OnDeviceScaleFactorChanged() {
+  RestartDelayedConfigurationTask();
+}
+
+ // static
+ void DesktopScreenX11::UpdateDeviceScaleFactorForTest() {
+   DesktopScreenX11* screen =
+       static_cast<DesktopScreenX11*>(display::Screen::GetScreen());
+-  screen->ConfigureTimerFired();
+  screen->UpdateDisplays();
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+@@ -288,7 +283,11 @@ DesktopScreenX11::DesktopScreenX11(
+       xrandr_event_base_(0),
+       displays_(test_displays),
+       primary_display_index_(0),
+-      atom_cache_(xdisplay_, kAtomsToCache) {}
+      weak_factory_(this),
+      atom_cache_(xdisplay_, kAtomsToCache) {
+  if (views::LinuxUI::instance())
+    views::LinuxUI::instance()->AddDeviceScaleFactorObserver(this);
+}
+ 
+ std::vector<display::Display> DesktopScreenX11::BuildDisplaysFromXRandRInfo() {
+   std::vector<display::Display> displays;
+@@ -390,7 +389,14 @@ std::vector<display::Display> DesktopScr
+   return displays;
+ }
+ 
+-void DesktopScreenX11::ConfigureTimerFired() {
+void DesktopScreenX11::RestartDelayedConfigurationTask() {
+  delayed_configuration_task_.Reset(base::Bind(
+      &DesktopScreenX11::UpdateDisplays, weak_factory_.GetWeakPtr()));
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
+      FROM_HERE, delayed_configuration_task_.callback());
+}
+
+void DesktopScreenX11::UpdateDisplays() {
+   std::vector<display::Display> old_displays = displays_;
+   SetDisplaysInternal(BuildDisplaysFromXRandRInfo());
+   change_notifier_.NotifyDisplaysChanged(old_displays, displays_);
+diff -up chromium-60.0.3112.78/ui/views/widget/desktop_aura/desktop_screen_x11.h.gtk2fix chromium-60.0.3112.78/ui/views/widget/desktop_aura/desktop_screen_x11.h
+--- chromium-60.0.3112.78/ui/views/widget/desktop_aura/desktop_screen_x11.h.gtk2fix	2017-08-03 10:47:28.734583288 -0400
+++ chromium-60.0.3112.78/ui/views/widget/desktop_aura/desktop_screen_x11.h	2017-08-03 10:49:54.850756813 -0400
+@@ -9,11 +9,12 @@
+ 
+ #include <memory>
+ 
+#include "base/cancelable_callback.h"
+ #include "base/macros.h"
+-#include "base/timer/timer.h"
+ #include "ui/display/display_change_notifier.h"
+ #include "ui/display/screen.h"
+ #include "ui/events/platform/platform_event_dispatcher.h"
+#include "ui/views/linux_ui/device_scale_factor_observer.h"
+ #include "ui/gfx/x/x11_atom_cache.h"
+ #include "ui/views/views_export.h"
+ 
+@@ -30,7 +31,8 @@ class DesktopScreenX11TestApi;
+ 
+ // Our singleton screen implementation that talks to xrandr.
+ class VIEWS_EXPORT DesktopScreenX11 : public display::Screen,
+-                                      public ui::PlatformEventDispatcher {
+                                      public ui::PlatformEventDispatcher,
+                                      public views::DeviceScaleFactorObserver {
+  public:
+   DesktopScreenX11();
+ 
+@@ -56,6 +58,9 @@ class VIEWS_EXPORT DesktopScreenX11 : pu
+   bool CanDispatchEvent(const ui::PlatformEvent& event) override;
+   uint32_t DispatchEvent(const ui::PlatformEvent& event) override;
+ 
+  // views::DeviceScaleFactorObserver:
+  void OnDeviceScaleFactorChanged() override;
+
+   static void UpdateDeviceScaleFactorForTest();
+ 
+  private:
+@@ -69,10 +74,15 @@ class VIEWS_EXPORT DesktopScreenX11 : pu
+   // the X server.
+   std::vector<display::Display> BuildDisplaysFromXRandRInfo();
+ 
+-  // We delay updating the display so we can coalesce events.
+-  void ConfigureTimerFired();
+  // Removes |delayed_configuration_task_| from the task queue (if
+  // it's in the queue) and adds it back at the end of the queue.
+  void RestartDelayedConfigurationTask();
+
+  // Updates |displays_| with the latest XRandR info.
+  void UpdateDisplays();
+ 
+-  // Updates |displays_| and sets FontRenderParams's scale factor.
+  // Updates |displays_| from |displays| and sets FontRenderParams's scale
+  // factor.
+   void SetDisplaysInternal(const std::vector<display::Display>& displays);
+ 
+   Display* xdisplay_;
+@@ -91,12 +101,14 @@ class VIEWS_EXPORT DesktopScreenX11 : pu
+   // The index into displays_ that represents the primary display.
+   size_t primary_display_index_;
+ 
+-  // The timer to delay configuring outputs. See also the comments in
+-  // Dispatch().
+-  std::unique_ptr<base::OneShotTimer> configure_timer_;
+  // The task to delay configuring outputs.  We delay updating the
+  // display so we can coalesce events.
+  base::CancelableCallback<void()> delayed_configuration_task_;
+ 
+   display::DisplayChangeNotifier change_notifier_;
+ 
+  base::WeakPtrFactory<DesktopScreenX11> weak_factory_;
+
+   ui::X11AtomCache atom_cache_;
+ 
+   DISALLOW_COPY_AND_ASSIGN(DesktopScreenX11);
+diff -up chromium-60.0.3112.78/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc.gtk2fix chromium-60.0.3112.78/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
+--- chromium-60.0.3112.78/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc.gtk2fix	2017-08-03 10:50:14.858370042 -0400
+++ chromium-60.0.3112.78/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc	2017-08-03 10:52:58.367207187 -0400
+@@ -212,13 +212,16 @@ DesktopWindowTreeHostX11::DesktopWindowT
+       has_pointer_focus_(false),
+       modal_dialog_counter_(0),
+       close_widget_factory_(this),
+-      weak_factory_(this) {}
+      weak_factory_(this) {
+  display::Screen::GetScreen()->AddObserver(this);
+}
+ 
+ DesktopWindowTreeHostX11::~DesktopWindowTreeHostX11() {
+   window()->ClearProperty(kHostForRootWindow);
+   aura::client::SetWindowMoveClient(window(), NULL);
+   desktop_native_widget_aura_->OnDesktopWindowTreeHostDestroyed(this);
+   DestroyDispatcher();
+  display::Screen::GetScreen()->RemoveObserver(this);
+ }
+ 
+ // static
+@@ -1360,6 +1363,30 @@ void DesktopWindowTreeHostX11::OnCursorV
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+// DesktopWindowTreeHostX11, display::DisplayObserver implementation:
+
+void DesktopWindowTreeHostX11::OnDisplayAdded(
+    const display::Display& new_display) {}
+
+void DesktopWindowTreeHostX11::OnDisplayRemoved(
+    const display::Display& old_display) {}
+
+void DesktopWindowTreeHostX11::OnDisplayMetricsChanged(
+    const display::Display& display,
+    uint32_t changed_metrics) {
+  if ((changed_metrics & DISPLAY_METRIC_DEVICE_SCALE_FACTOR) &&
+      display::Screen::GetScreen()->GetDisplayNearestWindow(window()).id() ==
+          display.id()) {
+    // When the scale factor changes, also pretend that a resize
+    // occured so that the window layout will be refreshed and a
+    // compositor redraw will be scheduled.  This is weird, but works.
+    // TODO(thomasanderson): Figure out a more direct way of doing
+    // this.
+    RestartDelayedResizeTask();
+  }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+ // DesktopWindowTreeHostX11, private:
+ 
+ void DesktopWindowTreeHostX11::InitX11Window(
+@@ -2079,13 +2106,8 @@ uint32_t DesktopWindowTreeHostX11::Dispa
+       if (origin_changed)
+         OnHostMovedInPixels(bounds_in_pixels_.origin());
+ 
+-      if (size_changed) {
+-        delayed_resize_task_.Reset(base::Bind(
+-            &DesktopWindowTreeHostX11::DelayedResize,
+-            close_widget_factory_.GetWeakPtr(), bounds_in_pixels.size()));
+-        base::ThreadTaskRunnerHandle::Get()->PostTask(
+-            FROM_HERE, delayed_resize_task_.callback());
+-      }
+      if (size_changed)
+        RestartDelayedResizeTask();
+       break;
+     }
+     case GenericEvent: {
+@@ -2358,6 +2380,14 @@ void DesktopWindowTreeHostX11::EnableEve
+     targeter_for_modal_.reset();
+ }
+ 
+void DesktopWindowTreeHostX11::RestartDelayedResizeTask() {
+  delayed_resize_task_.Reset(
+      base::Bind(&DesktopWindowTreeHostX11::DelayedResize,
+                 close_widget_factory_.GetWeakPtr(), bounds_in_pixels_.size()));
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
+      FROM_HERE, delayed_resize_task_.callback());
+}
+
+ ////////////////////////////////////////////////////////////////////////////////
+ // DesktopWindowTreeHost, public:
+ 
+diff -up chromium-60.0.3112.78/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h.gtk2fix chromium-60.0.3112.78/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
+--- chromium-60.0.3112.78/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h.gtk2fix	2017-08-03 10:54:34.484348046 -0400
+++ chromium-60.0.3112.78/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h	2017-08-03 10:54:43.564172318 -0400
+@@ -18,6 +18,7 @@
+ #include "ui/aura/scoped_window_targeter.h"
+ #include "ui/aura/window_tree_host.h"
+ #include "ui/base/cursor/cursor_loader_x11.h"
+#include "ui/display/display_observer.h"
+ #include "ui/events/platform/platform_event_dispatcher.h"
+ #include "ui/gfx/geometry/insets.h"
+ #include "ui/gfx/geometry/rect.h"
+@@ -45,7 +46,8 @@ class X11DesktopWindowMoveClient;
+ class VIEWS_EXPORT DesktopWindowTreeHostX11
+     : public DesktopWindowTreeHost,
+       public aura::WindowTreeHost,
+-      public ui::PlatformEventDispatcher {
+      public ui::PlatformEventDispatcher,
+      public display::DisplayObserver {
+  public:
+   DesktopWindowTreeHostX11(
+       internal::NativeWidgetDelegate* native_widget_delegate,
+@@ -170,6 +172,12 @@ class VIEWS_EXPORT DesktopWindowTreeHost
+       const gfx::Point& location_in_pixels) override;
+   void OnCursorVisibilityChangedNative(bool show) override;
+ 
+  // Overridden from display::DisplayObserver:
+  void OnDisplayAdded(const display::Display& new_display) override;
+  void OnDisplayRemoved(const display::Display& old_display) override;
+  void OnDisplayMetricsChanged(const display::Display& display,
+                               uint32_t changed_metrics) override;
+
+  private:
+   friend class DesktopWindowTreeHostX11HighDPITest;
+   // Initializes our X11 surface to draw on. This method performs all
+@@ -278,6 +286,10 @@ class VIEWS_EXPORT DesktopWindowTreeHost
+   // Enables event listening after closing |dialog|.
+   void EnableEventListening();
+ 
+  // Removes |delayed_resize_task_| from the task queue (if it's in
+  // the queue) and adds it back at the end of the queue.
+  void RestartDelayedResizeTask();
+
+   // X11 things
+   // The display and the native X window hosting the root window.
+   XDisplay* xdisplay_;
--- a/chromium-60.0.3112.78-jpeg-nomangle.patch
+++ b/chromium-60.0.3112.78-jpeg-nomangle.patch
@ -0,0 +1,14 @@
+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
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tom Callaway	054c665009	Merge branch 'master' into f25	2017-11-08 13:00:08 -05:00
Tom Callaway	b3ae569782	fix merge	2017-10-29 10:39:41 -04:00
Tomas Popela	a2ce65ede4	Fix the policy templates handling Basically revert my previous commits as the policy templates are generated during the build. The only thing that we were copying out from the tarballs was the policy templates documentation, but that one is generated as well so use that one and remove the policy_templates zip file from sources	2017-10-25 10:35:45 +02:00
Tom Callaway	65423256c7	Merge branch 'master' into f25	2017-10-24 17:02:42 -04:00
Tomas Popela	a408fa31ca	Improve the chromium-latest.py script - Download the policy templates per release channel - Only run the nacl_versions when not running on python 2.6 as the toolchain_build modules are not python 2.6 compatible	2017-10-19 14:15:50 +02:00
Tomas Popela	a6268f10a7	Update the chromium-lastest.py to always download the policy templates They are changing across the releases - always download the latest one.	2017-10-18 13:31:03 +02:00
Tom Callaway	bde07021e1	Merge branch 'master' into f25	2017-09-22 21:54:12 -04:00
Tom Callaway	ead805e4a5	Merge branch 'master' into f25	2017-09-13 09:30:22 -04:00
Tom Callaway	0d47ab0d0b	Merge branch 'master' into f25	2017-08-28 06:27:21 -04:00
Tom Callaway	00b7151be8	Merge branch 'master' into f25	2017-08-16 17:21:42 -04:00
Tom Callaway	52e2970033	Merge branch 'master' into f25	2017-08-08 13:45:54 -04:00
Tom Callaway	f1fb6e46c3	Merge branch 'master' into f25	2017-07-21 14:49:41 -04:00
Tom Callaway	08ab0f536a	Merge branch 'master' into f25	2017-07-13 14:04:12 -04:00
Tom Callaway	a4acd898df	Merge branch 'master' into f25	2017-07-13 10:54:19 -04:00
Tom Callaway	ceba0404d2	Merge branch 'master' into f25	2017-06-26 12:52:28 -04:00
Tom Callaway	0b28ea473f	Merge branch 'master' into f25	2017-06-16 16:44:20 -04:00
Tom Callaway	54c2aa8f48	Merge branch 'master' into f25	2017-06-13 13:27:24 -04:00
Tom Callaway	fa5ac7a8f5	Merge branch 'master' into f25	2017-06-12 17:22:10 -04:00
Tom Callaway	7f90530e56	Merge branch 'master' into f25	2017-06-12 16:01:22 -04:00
Tom Callaway	9ca4d735ac	Merge branch 'master' into f25	2017-06-12 15:13:51 -04:00
Tom Callaway	1eb003b080	Merge branch 'master' into f25	2017-05-16 10:40:50 -04:00
Tom Callaway	1c1a73dfe4	Merge branch 'master' into f25	2017-05-16 08:43:55 -04:00
Tom Callaway	f3715e384b	Merge branch 'master' into f25	2017-03-30 14:21:43 -04:00
Tom Callaway	84d38d9c65	Merge branch 'master' into f25	2017-03-26 11:17:04 -04:00
Tom Callaway	a7762b31a4	Merge branch 'master' into f25	2017-03-21 20:28:17 -04:00
Tom Callaway	7149b55c1f	Merge branch 'master' into f25	2017-03-21 20:10:31 -04:00
Tom Callaway	73f769d006	Merge branch 'master' into f25	2017-02-23 17:31:56 -05:00
Tom Callaway	0d5141b5af	Merge branch 'master' into f25	2017-02-13 14:46:43 -05:00
Tom Callaway	740c5db5be	Merge branch 'master' into f25	2017-02-10 15:35:41 -05:00
Tom Callaway	dae8e5080e	Merge branch 'master' into f25	2017-02-10 15:30:53 -05:00
Tom Callaway	1234a68db5	Merge branch 'master' into f25	2016-12-13 14:31:11 -05:00
Tom Callaway	c77fc327b9	Merge branch 'master' into f25	2016-12-12 16:42:41 -05:00
Tom Callaway	4fee8c6265	Merge branch 'master' into f25	2016-11-04 13:33:38 -04:00
Tom Callaway	f611c2c3c1	Merge branch 'master' into f25	2016-11-03 13:39:33 -04:00
Tom Callaway	2893cb14bc	Merge branch 'master' into f25	2016-11-02 11:48:12 -04:00
Tom Callaway	654376e00c	Merge branch 'master' into f25	2016-10-27 09:27:57 -04:00
Tom Callaway	b354894644	Merge branch 'master' into f25	2016-09-30 14:04:59 -04:00
Tom Callaway	578062b2bb	Merge branch 'master' into f25	2016-09-20 12:51:05 -04:00
Tom Callaway	0eca3e3d42	Merge branch 'master' into f25	2016-09-14 10:22:08 -04:00
Tom Callaway	4181b6cea5	Merge branch 'master' into f25	2016-09-09 09:09:51 -04:00
Tom Callaway	72ad576531	Merge branch 'master' into f25	2016-09-07 15:28:00 -04:00
Tom Callaway	4f7db46765	Merge branch 'master' into f25	2016-08-18 09:38:05 -04:00
Tom Callaway	aaa85cda51	Merge branch 'master' into f25	2016-08-16 15:31:34 -04:00
Tom Callaway	34ca4a83ad	Merge branch 'master' into f25	2016-08-16 09:19:27 -04:00
Tom Callaway	d885ae2cab	Merge branch 'master' into f25	2016-08-15 16:33:17 -04:00
Tom Callaway	8e523c10d3	Merge branch 'master' into f25	2016-08-15 14:15:46 -04:00
Tom Callaway	6568852684	Merge branch 'master' into f25	2016-08-08 13:38:15 -04:00
Richard Hughes	08b8514222	trivial: Fix up the <translation> tag in the AppData file	2016-08-08 16:53:54 +01:00