@@ -1,4 +1,65 @@

 -------------------------------------------------------------------

+Sat Oct  9 05:32:48 UTC 2021 - Carsten Ziepke <kieltux@gmail.com>

+

+- Removed patches:

+  * chromium-94-ffmpeg-roll.patch

+

+-------------------------------------------------------------------

+Fri Oct  8 19:46:13 UTC 2021 - Carsten Ziepke <kieltux@gmail.com>

+

+- Chromium 94.0.4606.81 (boo#1191463):

+  * CVE-2021-37977: Use after free in Garbage Collection

+  * CVE-2021-37978: Heap buffer overflow in Blink

+  * CVE-2021-37979: Heap buffer overflow in WebRTC

+  * CVE-2021-37980: Inappropriate implementation in Sandbox

+- Re-add after accidental deletion:

+  * chromium-93-InkDropHost-crash.patch

+- Chromium 94.0.4606.54 (boo#1190765):

+  * CVE-2021-37956: Use after free in Offline use

+  * CVE-2021-37957: Use after free in WebGPU

+  * CVE-2021-37958: Inappropriate implementation in Navigation

+  * CVE-2021-37959: Use after free in Task Manager

+  * CVE-2021-37960: Inappropriate implementation in Blink graphics

+  * CVE-2021-37961: Use after free in Tab Strip

+  * CVE-2021-37962: Use after free in Performance Manager

+  * CVE-2021-37963: Side-channel information leakage in DevTools

+  * CVE-2021-37964: Inappropriate implementation in ChromeOS Networking

+  * CVE-2021-37965: Inappropriate implementation in Background Fetch API

+  * CVE-2021-37966: Inappropriate implementation in Compositing

+  * CVE-2021-37967: Inappropriate implementation in Background Fetch API

+  * CVE-2021-37968: Inappropriate implementation in Background Fetch API

+  * CVE-2021-37969: Inappropriate implementation in Google Updater

+  * CVE-2021-37970: Use after free in File System API

+  * CVE-2021-37971: Incorrect security UI in Web Browser UI

+  * CVE-2021-37972: Out of bounds read in libjpeg-turbo

+- Chromium 94.0.4606.61 (boo#1191166):

+  * CVE-2021-37973: Use after free in Portals

+- Chromium 94.0.4606.71 (boo#1191204):

+  * CVE-2021-37974 : Use after free in Safe Browsing

+  * CVE-2021-37975 : Use after free in V8

+  * CVE-2021-37976 : Information leak in core

+- Added patches:

+  * chromium-94-CustomSpaces-include.patch

+  * chromium-94-sql-no-assert.patch

+  * chromium-older-harfbuzz.patch

+  * chromium-94-ffmpeg-roll.patch

+  * chromium-94-compiler.patch

+- Removed patches:

+  * chromium-freetype-2.11.patch

+  * chromium-93-ContextSet-permissive.patch

+  * chromium-93-ClassProperty-include.patch

+  * chromium-93-BluetoothLowEnergyScanFilter-include.patch

+  * chromium-93-HashPasswordManager-include.patch

+  * chromium-93-pdfium-include.patch

+  * chromium-93-DevToolsEmbedderMessageDispatcher-include.patch

+  * chromium-93-FormForest-constexpr.patch

+  * chromium-93-ScopedTestDialogAutoConfirm-include.patch

+  * chromium-93-InkDropHost-crash.patch

+  * chromium-91-compiler.patch

+  * chromium-glibc-2.33.patch

+  * chromium-shim_headers.patch

+  

+-------------------------------------------------------------------

 Sun Sep 19 19:41:03 UTC 2021 - Carsten Ziepke <kieltux@gmail.com>

 - Update to 93.0.4577.82

​

@@ -41,7 +41,7 @@

 %bcond_with lto

 %bcond_without clang

 Name:           chromium-ffmpeg-extra

-Version:        93.0.4577.82

+Version:        94.0.4606.81

 Release:        0

 Summary:        Extra ffmpeg codecs for browsers based on Chromium

 License:        BSD-3-Clause AND LGPL-2.1-or-later

@@ -75,34 +75,27 @@

 # gentoo/fedora/arch patchset

 Patch12:        chromium-78-protobuf-RepeatedPtrField-export.patch

 Patch13:        chromium-80-QuicStreamSendBuffer-deleted-move-constructor.patch

-Patch15:        chromium-91-compiler.patch

+Patch15:        chromium-94-compiler.patch

 Patch17:        chromium-86-ImageMemoryBarrierData-init.patch

 Patch18:        chromium-86-nearby-explicit.patch

 Patch19:        chromium-86-nearby-include.patch

 Patch20:        chromium-86-f_seal.patch

 Patch21:        chromium-gcc11.patch

-Patch23:        chromium-glibc-2.33.patch

 Patch25:        chromium-90-fseal.patch

 Patch29:        chromium-93-EnumTable-crash.patch

-Patch30:        chromium-shim_headers.patch

 Patch31:        chromium-89-missing-cstring-header.patch

 Patch36:        chromium-90-ruy-include.patch

 Patch40:        chromium-91-java-only-allowed-in-android-builds.patch

 Patch44:        chromium-91-libyuv-aarch64.patch

 Patch46:        chromium-91-sql-standard-layout-type.patch

-Patch49:        chromium-freetype-2.11.patch

 Patch50:        chromium-clang-nomerge.patch

 Patch51:        chromium-glibc-2.34.patch

-Patch53:        chromium-93-ContextSet-permissive.patch

-Patch54:        chromium-93-ClassProperty-include.patch

-Patch55:        chromium-93-BluetoothLowEnergyScanFilter-include.patch

-Patch56:        chromium-93-HashPasswordManager-include.patch

-Patch57:        chromium-93-pdfium-include.patch

-Patch58:        chromium-93-DevToolsEmbedderMessageDispatcher-include.patch

-Patch59:        chromium-93-FormForest-constexpr.patch

-Patch60:        chromium-93-ScopedTestDialogAutoConfirm-include.patch

-Patch61:        chromium-93-InkDropHost-crash.patch

 Patch62:        chromium-93-ffmpeg-4.4.patch

+Patch63:        chromium-ffmpeg-lp152.patch

+Patch64:        chromium-94-CustomSpaces-include.patch

+Patch65:        chromium-94-sql-no-assert.patch

+Patch67:        chromium-older-harfbuzz.patch

+Patch69:        chromium-93-InkDropHost-crash.patch

 # Google seem not too keen on merging this but GPU accel is quite important

 #  https://chromium-review.googlesource.com/c/chromium/src/+/532294

 #  https://github.com/saiarcot895/chromium-ubuntu-build/tree/master/debian/patches

@@ -348,6 +341,8 @@

     third_party/cros_system_api

     third_party/dav1d

     third_party/dawn

+    third_party/dawn/third_party

+    third_party/dawn/third_party/tint/src/ast

     third_party/depot_tools

     third_party/depot_tools/third_party/six

     third_party/devscripts

@@ -366,6 +361,7 @@

     third_party/devtools-frontend/src/front_end/third_party/puppeteer

     third_party/devtools-frontend/src/front_end/third_party/wasmparser

     third_party/devtools-frontend/src/third_party

+    third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n

     third_party/dom_distiller_js

     third_party/eigen3

     third_party/emoji-segmenter

@@ -665,7 +661,7 @@

 myconf_gn+=" use_allocator=\"partition\""

 myconf_gn+=" use_allocator_shim=true"

 myconf_gn+=" use_partition_alloc=true"

-myconf_gn+=" fieldtrial_testing_like_official_build=true"

+myconf_gn+=" disable_fieldtrial_testing_config=true"

 myconf_gn+=" use_gnome_keyring=false"

 myconf_gn+=" use_unofficial_version_number=false"

 myconf_gn+=" use_vaapi=true"

​

@@ -1,165 +0,0 @@

-From f4d0b0eb899005b4b8b6388e1d8bb82cc0018fc8 Mon Sep 17 00:00:00 2001

-From: Mike Gilbert <floppym@gentoo.org>

-Date: Wed, 7 Apr 2021 08:50:04 +0000

-Subject: [PATCH] Disable various compiler configs

-

----

- build/config/compiler/BUILD.gn | 59 ++++++++++------------------------

- 1 file changed, 17 insertions(+), 42 deletions(-)

-

-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn

-index 72ea590..539672d 100644

---- a/build/config/compiler/BUILD.gn

-+++ b/build/config/compiler/BUILD.gn

-@@ -273,8 +273,6 @@ config("compiler") {

- 

-   configs += [

-     # See the definitions below.

--    ":clang_revision",

--    ":compiler_cpu_abi",

-     ":compiler_codegen",

-     ":compiler_deterministic",

-   ]

-@@ -518,24 +516,6 @@ config("compiler") {

-     ldflags += [ "-Wl,-z,keep-text-section-prefix" ]

-   }

- 

--  if (is_clang && !is_nacl && !use_xcode_clang) {

--    cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]

--

--    # TODO(hans): Remove this once Clang generates better optimized debug info

--    # by default. https://crbug.com/765793

--    cflags += [

--      "-mllvm",

--      "-instcombine-lower-dbg-declare=0",

--    ]

--    if (!is_debug && use_thin_lto && is_a_target_toolchain) {

--      if (is_win) {

--        ldflags += [ "-mllvm:-instcombine-lower-dbg-declare=0" ]

--      } else {

--        ldflags += [ "-Wl,-mllvm,-instcombine-lower-dbg-declare=0" ]

--      }

--    }

--  }

--

-   # C11/C++11 compiler flags setup.

-   # ---------------------------

-   if (is_linux || is_chromeos || is_android || (is_nacl && is_clang) ||

-@@ -1643,7 +1623,7 @@ config("chromium_code") {

-       defines = [ "_HAS_NODISCARD" ]

-     }

-   } else {

--    cflags = [ "-Wall" ]

-+    cflags = []

-     if (treat_warnings_as_errors) {

-       cflags += [ "-Werror" ]

- 

-@@ -1652,10 +1632,6 @@ config("chromium_code") {

-       # well.

-       ldflags = [ "-Werror" ]

-     }

--    if (is_clang) {

--      # Enable extra warnings for chromium_code when we control the compiler.

--      cflags += [ "-Wextra" ]

--    }

- 

-     # In Chromium code, we define __STDC_foo_MACROS in order to get the

-     # C99 macros on Mac and Linux.

-@@ -1664,15 +1640,6 @@ config("chromium_code") {

-       "__STDC_FORMAT_MACROS",

-     ]

- 

--    if (!is_debug && !using_sanitizer && current_cpu != "s390x" &&

--        current_cpu != "s390" && current_cpu != "ppc64" &&

--        current_cpu != "mips" && current_cpu != "mips64") {

--      # Non-chromium code is not guaranteed to compile cleanly with

--      # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are

--      # disabled, so only do that for Release build.

--      defines += [ "_FORTIFY_SOURCE=2" ]

--    }

--

-     if (is_mac) {

-       cflags_objc = [ "-Wobjc-missing-property-synthesis" ]

-       cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]

-@@ -2068,7 +2035,8 @@ config("default_stack_frames") {

- }

- 

- # Default "optimization on" config.

--config("optimize") {

-+config("optimize") { }

-+config("xoptimize") {

-   if (is_win) {

-     if (chrome_pgo_phase != 2) {

-       # Favor size over speed, /O1 must be before the common flags.

-@@ -2103,7 +2071,8 @@ config("optimize") {

- }

- 

- # Turn off optimizations.

--config("no_optimize") {

-+config("no_optimize") { }

-+config("xno_optimize") {

-   if (is_win) {

-     cflags = [

-       "/Od",  # Disable optimization.

-@@ -2143,7 +2112,8 @@ config("no_optimize") {

- # Turns up the optimization level. On Windows, this implies whole program

- # optimization and link-time code generation which is very expensive and should

- # be used sparingly.

--config("optimize_max") {

-+config("optimize_max") { }

-+config("xoptimize_max") {

-   if (is_nacl && is_nacl_irt) {

-     # The NaCl IRT is a special case and always wants its own config.

-     # Various components do:

-@@ -2175,7 +2145,8 @@ config("optimize_max") {

- #

- # TODO(crbug.com/621335) - rework how all of these configs are related

- # so that we don't need this disclaimer.

--config("optimize_speed") {

-+config("optimize_speed") { }

-+config("xoptimize_speed") {

-   if (is_nacl && is_nacl_irt) {

-     # The NaCl IRT is a special case and always wants its own config.

-     # Various components do:

-@@ -2200,7 +2171,8 @@ config("optimize_speed") {

-   }

- }

- 

--config("optimize_fuzzing") {

-+config("optimize_fuzzing") { }

-+config("xoptimize_fuzzing") {

-   cflags = [ "-O1" ] + common_optimize_on_cflags

-   ldflags = common_optimize_on_ldflags

-   visibility = [ ":default_optimization" ]

-@@ -2319,7 +2291,8 @@ config("win_pdbaltpath") {

- }

- 

- # Full symbols.

--config("symbols") {

-+config("symbols") { }

-+config("xsymbols") {

-   if (is_win) {

-     if (is_clang) {

-       cflags = [ "/Z7" ]  # Debug information in the .obj files.

-@@ -2422,7 +2395,8 @@ config("symbols") {

- # Minimal symbols.

- # This config guarantees to hold symbol for stack trace which are shown to user

- # when crash happens in unittests running on buildbot.

--config("minimal_symbols") {

-+config("minimal_symbols") { }

-+config("xminimal_symbols") {

-   if (is_win) {

-     # Functions, files, and line tables only.

-     cflags = []

-@@ -2481,7 +2455,8 @@ config("minimal_symbols") {

- # This configuration contains function names only. That is, the compiler is

- # told to not generate debug information and the linker then just puts function

- # names in the final debug information.

--config("no_symbols") {

-+config("no_symbols") { }

-+config("xno_symbols") {

-   if (is_win) {

-     ldflags = [ "/DEBUG" ]

- 

--- 

-2.26.3

​

@@ -217,7 +217,7 @@

 +#include <array>

  #include <cstdint>

  #include <memory>

- 

+ #include <ostream>

 @@ -70,7 +71,7 @@ class DatabasePageReader {

      DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);

      DCHECK_NE(page_id_, kInvalidPageId)

​

@@ -1,30 +0,0 @@

-From 2f5514051210388bfcff605570d33f08cfa7bcaa Mon Sep 17 00:00:00 2001

-From: Jose Dapena Paz <jdapena@igalia.com>

-Date: Wed, 21 Jul 2021 08:34:58 +0000

-Subject: [PATCH] IWYU: usage of unique_ptr requires including <memory> in bluetooth low energy scan filter.

-

-Fix build because of missing include:

-../../device/bluetooth/bluetooth_low_energy_scan_filter.h:57:15: error: ‘unique_ptr’ in namespace ‘std’ does not name a template type

-   57 |   static std::unique_ptr<BluetoothLowEnergyScanFilter> Create(

-      |               ^~~~~~~~~~

-

-Bug: 819294

-Change-Id: I347953a083f1bcdf744fd86e1a73954c6f86b32e

-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3041155

-Reviewed-by: Reilly Grant <reillyg@chromium.org>

-Commit-Queue: José Dapena Paz <jdapena@igalia.com>

-Cr-Commit-Position: refs/heads/master@{#903819}

----

-

-diff --git a/device/bluetooth/bluetooth_low_energy_scan_filter.h b/device/bluetooth/bluetooth_low_energy_scan_filter.h

-index a0436c1..7ae606c 100644

---- a/device/bluetooth/bluetooth_low_energy_scan_filter.h

-+++ b/device/bluetooth/bluetooth_low_energy_scan_filter.h

-@@ -7,6 +7,7 @@

- 

- #include <stddef.h>

- #include <stdint.h>

-+#include <memory>

- #include <vector>

- 

- #include "base/time/time.h"

​

@@ -1,30 +0,0 @@

-From 8ae99ee447cf5f0160ea4ae978cdf37f5dcecd1e Mon Sep 17 00:00:00 2001

-From: Jose Dapena Paz <jdapena@igalia.com>

-Date: Wed, 21 Jul 2021 08:36:20 +0000

-Subject: [PATCH] IWYU: missing memory include for unique_ptr usage in class_property.h

-

-Fix GCC build breakage because of missing inclide:

-./../ui/base/class_property.h:120:58: error: ‘std::unique_ptr’ has not been declared

-  120 |   T* SetProperty(const ClassProperty<T*>* property, std::unique_ptr<T> value);

-      |                                                          ^~~~~~~~~~

-

-Bug: 819294

-Change-Id: I46b921876702b8d44674689bbb5acdc107db21e5

-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3041030

-Reviewed-by: Peter Boström <pbos@chromium.org>

-Commit-Queue: José Dapena Paz <jdapena@igalia.com>

-Cr-Commit-Position: refs/heads/master@{#903820}

----

-

-diff --git a/ui/base/class_property.h b/ui/base/class_property.h

-index f7b2f55..88b4938 100644

---- a/ui/base/class_property.h

-+++ b/ui/base/class_property.h

-@@ -8,6 +8,7 @@

- #include <stdint.h>

- 

- #include <map>

-+#include <memory>

- #include <set>

- #include <type_traits>

- 

​

@@ -1,47 +0,0 @@

-From 7108f83c8ad1bad4072e4f32da3db6d59cf51400 Mon Sep 17 00:00:00 2001

-From: Ivan Murashov <ivan.murashov@lge.com>

-Date: Tue, 20 Jul 2021 13:16:44 +0300

-Subject: [PATCH] GCC: Remove double declaration of ContextSet

-

-After the CL

-https://chromium-review.googlesource.com/c/angle/angle/+/2965780

-the build with GCC failed with error:

-/third_party/angle/src/libANGLE/Display.h:325:37: error: declaration of

-'typedef class std::__1::set<gl::Context*> egl::Display::ContextSet'

-changes meaning of 'ContextSet' [-fpermissive]

-/third_party/angle/src/libANGLE/Display.h:75:7: note: 'ContextSet'

-declared here as 'using ContextSet = class std::__1::set<gl::Context*>'

-

-To fix the error the double declaration of ContextSet is removed.

-

-Bug: angleproject:5878, chromium:819294

-Change-Id: Id9e52061af53ea18dd5d13b960daaa67a14f61ca

-Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3038804

-Reviewed-by: Jamie Madill <jmadill@chromium.org>

-Commit-Queue: Jamie Madill <jmadill@chromium.org>

----

-

-diff --git a/third_party/angle/CONTRIBUTORS b/third_party/angle/CONTRIBUTORS

-index 887ddc2..94b1b4d 100644

---- a/third_party/angle/CONTRIBUTORS

-+++ b/third_party/angle/CONTRIBUTORS

-@@ -154,6 +154,7 @@

- 

- LG Electronics, Inc.

-  Jani Hautakangas

-+ Ivan Murashov

- 

- IBM Inc.

-  Junliang Yan

-diff --git a/third_party/angle/src/libANGLE/Display.h b/third_party/angle/src/libANGLE/Display.h

-index f33123b..f0c0910 100644

---- a/third_party/angle/src/libANGLE/Display.h

-+++ b/third_party/angle/src/libANGLE/Display.h

-@@ -322,7 +322,6 @@

- 

-     ConfigSet mConfigSet;

- 

--    typedef std::set<gl::Context *> ContextSet;

-     ContextSet mContextSet;

- 

-     typedef std::set<Image *> ImageSet;

​

@@ -1,24 +0,0 @@

-From 409859ad9ba763a4267fb3457df7cd8eb0b7387b Mon Sep 17 00:00:00 2001

-From: Stephan Hartmann <stha09@googlemail.com>

-Date: Sun, 25 Jul 2021 19:43:45 +0000

-Subject: [PATCH] IWYU: add vector for std::vector

-

----

- chrome/browser/devtools/devtools_embedder_message_dispatcher.h | 1 +

- 1 file changed, 1 insertion(+)

-

-diff --git a/chrome/browser/devtools/devtools_embedder_message_dispatcher.h b/chrome/browser/devtools/devtools_embedder_message_dispatcher.h

-index 12f8500..4007112 100644

---- a/chrome/browser/devtools/devtools_embedder_message_dispatcher.h

-+++ b/chrome/browser/devtools/devtools_embedder_message_dispatcher.h

-@@ -8,6 +8,7 @@

- #include <map>

- #include <memory>

- #include <string>

-+#include <vector>

- 

- #include "base/callback.h"

- #include "ui/gfx/geometry/insets.h"

--- 

-2.31.1

-

​

@@ -1,49 +0,0 @@

-From 802150d7be94e5317b257df545d55ce5b007ae65 Mon Sep 17 00:00:00 2001

-From: Jose Dapena Paz <jdapena@igalia.com>

-Date: Tue, 20 Jul 2021 18:50:11 +0000

-Subject: [PATCH] libstdc++: do not use unique_ptr bool() operator in a constexpr in form_forest.h

-

-Fix build breakage in GCC, because of calling non constexpr functions from a

-constexpr function. In this case, libstdc++ unique_ptr bool() operator is not

-constexpr, so it cannot be used inside CompareByFrameToken.

-

-An example of build breakage caused by this:

-    ../../components/autofill/content/browser/form_forest.h:157:21: error: call to non-‘constexpr’ function ‘std::unique_ptr<_Tp, _Dp>::operator bool() const [with _Tp = autofill::internal::FormForest::FrameData; _Dp = std::default_delete<autofill::internal::FormForest::FrameData>]’

-      157 |         return f && g ? f->frame_token < g->frame_token : f.get() < g.get();

-          |                     ^

-

-Bug: 957519

-Change-Id: I3c49559084fe58886a03520729873b7c4ac89bbf

-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3041050

-Commit-Queue: Dominic Battré <battre@chromium.org>

-Reviewed-by: Dominic Battré <battre@chromium.org>

-Cr-Commit-Position: refs/heads/master@{#903595}

----

-

-diff --git a/components/autofill/content/browser/form_forest.h b/components/autofill/content/browser/form_forest.h

-index c89a8eb..f414ab8 100644

---- a/components/autofill/content/browser/form_forest.h

-+++ b/components/autofill/content/browser/form_forest.h

-@@ -152,16 +152,16 @@

-     // used by FrameData sets.

-     struct CompareByFrameToken {

-       using is_transparent = void;

--      constexpr bool operator()(const std::unique_ptr<FrameData>& f,

--                                const std::unique_ptr<FrameData>& g) const {

-+      bool operator()(const std::unique_ptr<FrameData>& f,

-+                      const std::unique_ptr<FrameData>& g) const {

-         return f && g ? f->frame_token < g->frame_token : f.get() < g.get();

-       }

--      constexpr bool operator()(const std::unique_ptr<FrameData>& f,

--                                const LocalFrameToken& g) const {

-+      bool operator()(const std::unique_ptr<FrameData>& f,

-+                      const LocalFrameToken& g) const {

-         return f ? f->frame_token < g : true;

-       }

--      constexpr bool operator()(const LocalFrameToken& f,

--                                const std::unique_ptr<FrameData>& g) const {

-+      bool operator()(const LocalFrameToken& f,

-+                      const std::unique_ptr<FrameData>& g) const {

-         return g ? f < g->frame_token : false;

-       }

-     };

​

@@ -1,30 +0,0 @@

-From 17d0e3dfcd0690df0e7b212fedcb95402f16935d Mon Sep 17 00:00:00 2001

-From: Jose Dapena Paz <jdapena@igalia.com>

-Date: Fri, 23 Jul 2021 10:17:49 +0000

-Subject: [PATCH] IWYU: missing include for using std::vector in hash password manager.

-

-Fix build breakage:

-../../components/password_manager/core/browser/hash_password_manager.h:44:8: error: ‘vector’ in namespace ‘std’ does not name a template type

-   44 |   std::vector<PasswordHashData> RetrieveAllPasswordHashes();

-      |        ^~~~~~

-

-Bug: 819294

-Change-Id: I8c8a4ec3972eedb87a312c5ec56adf4a21b1b2a2

-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3041046

-Commit-Queue: Vasilii Sukhanov <vasilii@chromium.org>

-Reviewed-by: Vasilii Sukhanov <vasilii@chromium.org>

-Cr-Commit-Position: refs/heads/master@{#904696}

----

-

-diff --git a/components/password_manager/core/browser/hash_password_manager.h b/components/password_manager/core/browser/hash_password_manager.h

-index c762c5a..85e656ed 100644

---- a/components/password_manager/core/browser/hash_password_manager.h

-+++ b/components/password_manager/core/browser/hash_password_manager.h

-@@ -6,6 +6,7 @@

- #define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_HASH_PASSWORD_MANAGER_H_

- 

- #include <string>

-+#include <vector>

- 

- #include "base/callback.h"

- #include "base/callback_list.h"

​

@@ -1,8 +1,7 @@

-diff --git a/ui/views/animation/ink_drop_host_view.h b/ui/views/animation/ink_drop_host_view.h

-index bd0975b..e5df288 100644

---- a/ui/views/animation/ink_drop_host_view.h

-+++ b/ui/views/animation/ink_drop_host_view.h

-@@ -238,6 +238,11 @@ class VIEWS_EXPORT InkDropHost {

+diff -up chromium-94.0.4606.71/ui/views/animation/ink_drop_host_view.h.InkDropHost-crash chromium-94.0.4606.71/ui/views/animation/ink_drop_host_view.h

+--- chromium-94.0.4606.71/ui/views/animation/ink_drop_host_view.h.InkDropHost-crash    2021-10-05 16:04:46.313586509 -0400

++++ chromium-94.0.4606.71/ui/views/animation/ink_drop_host_view.h  2021-10-05 16:05:12.213732558 -0400

+@@ -228,6 +228,11 @@ class VIEWS_EXPORT InkDropHost {

    // Used to observe View and inform the InkDrop of host-transform changes.

    ViewLayerTransformObserver host_view_transform_observer_;

@@ -14,7 +13,7 @@

    // Should not be accessed directly. Use GetInkDrop() instead.

    std::unique_ptr<InkDrop> ink_drop_;

-@@ -261,8 +266,6 @@ class VIEWS_EXPORT InkDropHost {

+@@ -249,8 +254,6 @@ class VIEWS_EXPORT InkDropHost {

    int ink_drop_small_corner_radius_ = 2;

    int ink_drop_large_corner_radius_ = 4;

​

@@ -1,24 +0,0 @@

-From 92fc089d50fc81b9903cd0573c95749e41081474 Mon Sep 17 00:00:00 2001

-From: Stephan Hartmann <stha09@googlemail.com>

-Date: Sun, 25 Jul 2021 21:38:26 +0000

-Subject: [PATCH] IWYU: add cstring for std::strcpy

-

----

- extensions/browser/extension_dialog_auto_confirm.cc | 1 +

- 1 file changed, 1 insertion(+)

-

-diff --git a/extensions/browser/extension_dialog_auto_confirm.cc b/extensions/browser/extension_dialog_auto_confirm.cc

-index adb4ac3..be8b161 100644

---- a/extensions/browser/extension_dialog_auto_confirm.cc

-+++ b/extensions/browser/extension_dialog_auto_confirm.cc

-@@ -4,6 +4,7 @@

- 

- #include "extensions/browser/extension_dialog_auto_confirm.h"

- 

-+#include <cstring>

- #include <utility>

- 

- #include "base/check.h"

--- 

-2.31.1

-

​

@@ -1,117 +0,0 @@

-From 7a6289c5ace52cf88f0e19caa5f78b7c15d0e7a6 Mon Sep 17 00:00:00 2001

-From: Miklos Vajna <vmiklos@collabora.co.uk>

-Date: Wed, 21 Jul 2021 17:42:30 +0000

-Subject: [PATCH] fxcodec, fxge: fix missing includes with libstdc++

-

-These missing includes break the build with gcc/libstdc++, they were not

-a problem in practice with clang/libc++.

-

-Change-Id: I40013f97ba7ab06f32aa59f87b04aec06a19478c

-Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/83210

-Commit-Queue: Lei Zhang <thestig@chromium.org>

-Reviewed-by: Lei Zhang <thestig@chromium.org>

----

-

-diff --git a/third_party/pdfium/core/fxcodec/jpeg/jpegmodule.cpp b/third_party/pdfium/core/fxcodec/jpeg/jpegmodule.cpp

-index cea0679..036f250 100644

---- a/third_party/pdfium/core/fxcodec/jpeg/jpegmodule.cpp

-+++ b/third_party/pdfium/core/fxcodec/jpeg/jpegmodule.cpp

-@@ -7,6 +7,7 @@

- #include "core/fxcodec/jpeg/jpegmodule.h"

- 

- #include <setjmp.h>

-+#include <string.h>

- 

- #include <memory>

- #include <utility>

-diff --git a/third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.cpp b/third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.cpp

-index c66985a..9c1122b 100644

---- a/third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.cpp

-+++ b/third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.cpp

-@@ -6,6 +6,8 @@

- 

- #include "core/fxcodec/jpx/cjpx_decoder.h"

- 

-+#include <string.h>

-+

- #include <algorithm>

- #include <limits>

- #include <utility>

-diff --git a/third_party/pdfium/core/fxge/cfx_cliprgn.cpp b/third_party/pdfium/core/fxge/cfx_cliprgn.cpp

-index 5369d52..d198852 100644

---- a/third_party/pdfium/core/fxge/cfx_cliprgn.cpp

-+++ b/third_party/pdfium/core/fxge/cfx_cliprgn.cpp

-@@ -6,6 +6,8 @@

- 

- #include "core/fxge/cfx_cliprgn.h"

- 

-+#include <string.h>

-+

- #include <utility>

- 

- #include "core/fxge/dib/cfx_dibitmap.h"

-diff --git a/third_party/pdfium/core/fxge/dib/cfx_bitmapcomposer.cpp b/third_party/pdfium/core/fxge/dib/cfx_bitmapcomposer.cpp

-index 6f9b420..0f1ffae 100644

---- a/third_party/pdfium/core/fxge/dib/cfx_bitmapcomposer.cpp

-+++ b/third_party/pdfium/core/fxge/dib/cfx_bitmapcomposer.cpp

-@@ -6,6 +6,8 @@

- 

- #include "core/fxge/dib/cfx_bitmapcomposer.h"

- 

-+#include <string.h>

-+

- #include "core/fxge/cfx_cliprgn.h"

- #include "core/fxge/dib/cfx_dibitmap.h"

- 

-diff --git a/third_party/pdfium/core/fxge/dib/cfx_bitmapstorer.cpp b/third_party/pdfium/core/fxge/dib/cfx_bitmapstorer.cpp

-index f57c00e..45a0a18 100644

---- a/third_party/pdfium/core/fxge/dib/cfx_bitmapstorer.cpp

-+++ b/third_party/pdfium/core/fxge/dib/cfx_bitmapstorer.cpp

-@@ -6,6 +6,8 @@

- 

- #include "core/fxge/dib/cfx_bitmapstorer.h"

- 

-+#include <string.h>

-+

- #include <utility>

- 

- #include "core/fxge/dib/cfx_dibitmap.h"

-diff --git a/third_party/pdfium/core/fxge/dib/cfx_dibbase.cpp b/third_party/pdfium/core/fxge/dib/cfx_dibbase.cpp

-index 4ec0ddb..a1de2fb 100644

---- a/third_party/pdfium/core/fxge/dib/cfx_dibbase.cpp

-+++ b/third_party/pdfium/core/fxge/dib/cfx_dibbase.cpp

-@@ -6,6 +6,8 @@

- 

- #include "core/fxge/dib/cfx_dibbase.h"

- 

-+#include <string.h>

-+

- #include <algorithm>

- #include <memory>

- #include <utility>

-diff --git a/third_party/pdfium/core/fxge/dib/cfx_dibitmap.cpp b/third_party/pdfium/core/fxge/dib/cfx_dibitmap.cpp

-index d7ccf6c..94e8acc 100644

---- a/third_party/pdfium/core/fxge/dib/cfx_dibitmap.cpp

-+++ b/third_party/pdfium/core/fxge/dib/cfx_dibitmap.cpp

-@@ -6,6 +6,8 @@

- 

- #include "core/fxge/dib/cfx_dibitmap.h"

- 

-+#include <string.h>

-+

- #include <limits>

- #include <memory>

- #include <utility>

-diff --git a/third_party/pdfium/core/fxge/dib/cfx_scanlinecompositor.cpp b/third_party/pdfium/core/fxge/dib/cfx_scanlinecompositor.cpp

-index e8362d7..c04c6dc 100644

---- a/third_party/pdfium/core/fxge/dib/cfx_scanlinecompositor.cpp

-+++ b/third_party/pdfium/core/fxge/dib/cfx_scanlinecompositor.cpp

-@@ -6,6 +6,8 @@

- 

- #include "core/fxge/dib/cfx_scanlinecompositor.h"

- 

-+#include <string.h>

-+

- #include <algorithm>

- 

- #include "core/fxge/dib/fx_dib.h"

​

@@ -0,0 +1,24 @@

+From 4eeacdaa57b29a079fe09315eb22557c06aa522e Mon Sep 17 00:00:00 2001

+From: Stephan Hartmann <stha09@googlemail.com>

+Date: Fri, 13 Aug 2021 12:57:42 +0000

+Subject: [PATCH] IWYU: add memory for std::unique_ptr in blink::CustomSpaces

+

+---

+ .../blink/renderer/platform/heap/v8_wrapper/custom_spaces.h      | 1 +

+ 1 file changed, 1 insertion(+)

+

+diff --git a/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h b/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h

+index df0465a..640cb33 100644

+--- a/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h

++++ b/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h

+@@ -5,6 +5,7 @@

+ #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_V8_WRAPPER_CUSTOM_SPACES_H_

+ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_V8_WRAPPER_CUSTOM_SPACES_H_

+ 

++#include <memory>

+ #include <vector>

+ 

+ #include "third_party/blink/renderer/platform/platform_export.h"

+-- 

+2.31.1

+

​

@@ -0,0 +1,218 @@

+From f4d0b0eb899005b4b8b6388e1d8bb82cc0018fc8 Mon Sep 17 00:00:00 2001

+From: Mike Gilbert <floppym@gentoo.org>

+Date: Sun, 8 Aug 2021 08:50:00 +0000

+Subject: [PATCH] Disable various compiler configs

+

+---

+ build/config/compiler/BUILD.gn | 105 ++++++---------------------------

+ 1 file changed, 17 insertions(+), 88 deletions(-)

+

+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn

+index 0bb155a..e95c023 100644

+--- a/build/config/compiler/BUILD.gn

++++ b/build/config/compiler/BUILD.gn

+@@ -291,8 +291,6 @@ config("compiler") {

+ 

+   configs += [

+     # See the definitions below.

+-    ":clang_revision",

+-    ":compiler_cpu_abi",

+     ":compiler_codegen",

+     ":compiler_deterministic",

+   ]

+@@ -530,31 +528,6 @@ config("compiler") {

+     ldflags += [ "-Wl,-z,keep-text-section-prefix" ]

+   }

+ 

+-  if (is_clang && !is_nacl && !use_xcode_clang) {

+-    cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]

+-

+-    # TODO(hans): Remove this once Clang generates better optimized debug info

+-    # by default. https://crbug.com/765793

+-    cflags += [

+-      "-mllvm",

+-      "-instcombine-lower-dbg-declare=0",

+-    ]

+-    if (!is_debug && use_thin_lto && is_a_target_toolchain) {

+-      if (is_win) {

+-        ldflags += [ "-mllvm:-instcombine-lower-dbg-declare=0" ]

+-      } else {

+-        ldflags += [ "-Wl,-mllvm,-instcombine-lower-dbg-declare=0" ]

+-      }

+-    }

+-

+-    # TODO(crbug.com/1235145): Investigate why/if this should be needed.

+-    if (is_win) {

+-      cflags += [ "/clang:-ffp-contract=off" ]

+-    } else {

+-      cflags += [ "-ffp-contract=off" ]

+-    }

+-  }

+-

+   # C11/C++11 compiler flags setup.

+   # ---------------------------

+   if (is_linux || is_chromeos || is_android || (is_nacl && is_clang) ||

+@@ -1216,45 +1189,6 @@ config("compiler_deterministic") {

+     }

+   }

+ 

+-  # Makes builds independent of absolute file path.

+-  if (is_clang && strip_absolute_paths_from_debug_symbols) {

+-    # If debug option is given, clang includes $cwd in debug info by default.

+-    # For such build, this flag generates reproducible obj files even we use

+-    # different build directory like "out/feature_a" and "out/feature_b" if

+-    # we build same files with same compile flag.

+-    # Other paths are already given in relative, no need to normalize them.

+-    if (is_nacl) {

+-      # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.

+-      cflags += [

+-        "-Xclang",

+-        "-fdebug-compilation-dir",

+-        "-Xclang",

+-        ".",

+-      ]

+-    } else {

+-      # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=

+-      # and -fcoverage-compilation-dir=.

+-      cflags += [ "-ffile-compilation-dir=." ]

+-    }

+-    if (!is_win) {

+-      # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)

+-      asmflags = [ "-Wa,-fdebug-compilation-dir,." ]

+-    }

+-

+-    if (is_win && use_lld) {

+-      if (symbol_level == 2 || (is_clang && using_sanitizer)) {

+-        # Absolutize source file paths for PDB. Pass the real build directory

+-        # if the pdb contains source-level debug information and if linker

+-        # reproducibility is not critical.

+-        ldflags += [ "/PDBSourcePath:" + rebase_path(root_build_dir) ]

+-      } else {

+-        # Use a fake fixed base directory for paths in the pdb to make the pdb

+-        # output fully deterministic and independent of the build directory.

+-        ldflags += [ "/PDBSourcePath:o:\fake\prefix" ]

+-      }

+-    }

+-  }

+-

+   # Tells the compiler not to use absolute paths when passing the default

+   # paths to the tools it invokes. We don't want this because we don't

+   # really need it and it can mess up the goma cache entries.

+@@ -1658,7 +1592,7 @@ config("chromium_code") {

+       defines = [ "_HAS_NODISCARD" ]

+     }

+   } else {

+-    cflags = [ "-Wall" ]

++    cflags = []

+     if (treat_warnings_as_errors) {

+       cflags += [ "-Werror" ]

+ 

+@@ -1667,10 +1601,6 @@ config("chromium_code") {

+       # well.

+       ldflags = [ "-Werror" ]

+     }

+-    if (is_clang) {

+-      # Enable extra warnings for chromium_code when we control the compiler.

+-      cflags += [ "-Wextra" ]

+-    }

+ 

+     # In Chromium code, we define __STDC_foo_MACROS in order to get the

+     # C99 macros on Mac and Linux.

+@@ -1679,15 +1609,6 @@ config("chromium_code") {

+       "__STDC_FORMAT_MACROS",

+     ]

+ 

+-    if (!is_debug && !using_sanitizer && current_cpu != "s390x" &&

+-        current_cpu != "s390" && current_cpu != "ppc64" &&

+-        current_cpu != "mips" && current_cpu != "mips64") {

+-      # Non-chromium code is not guaranteed to compile cleanly with

+-      # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are

+-      # disabled, so only do that for Release build.

+-      defines += [ "_FORTIFY_SOURCE=2" ]

+-    }

+-

+     if (is_mac) {

+       cflags_objc = [ "-Wobjc-missing-property-synthesis" ]

+       cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]

+@@ -2077,7 +1998,8 @@ config("default_stack_frames") {

+ }

+ 

+ # Default "optimization on" config.

+-config("optimize") {

++config("optimize") { }

++config("xoptimize") {

+   if (is_win) {

+     if (chrome_pgo_phase != 2) {

+       # Favor size over speed, /O1 must be before the common flags.

+@@ -2112,7 +2034,8 @@ config("optimize") {

+ }

+ 

+ # Turn off optimizations.

+-config("no_optimize") {

++config("no_optimize") { }

++config("xno_optimize") {

+   if (is_win) {

+     cflags = [

+       "/Od",  # Disable optimization.

+@@ -2152,7 +2075,8 @@ config("no_optimize") {

+ # Turns up the optimization level. On Windows, this implies whole program

+ # optimization and link-time code generation which is very expensive and should

+ # be used sparingly.

+-config("optimize_max") {

++config("optimize_max") { }

++config("xoptimize_max") {

+   if (is_nacl && is_nacl_irt) {

+     # The NaCl IRT is a special case and always wants its own config.

+     # Various components do:

+@@ -2184,7 +2108,8 @@ config("optimize_max") {

+ #

+ # TODO(crbug.com/621335) - rework how all of these configs are related

+ # so that we don't need this disclaimer.

+-config("optimize_speed") {

++config("optimize_speed") { }

++config("xoptimize_speed") {

+   if (is_nacl && is_nacl_irt) {

+     # The NaCl IRT is a special case and always wants its own config.

+     # Various components do:

+@@ -2209,7 +2134,8 @@ config("optimize_speed") {

+   }

+ }

+ 

+-config("optimize_fuzzing") {

++config("optimize_fuzzing") { }

++config("xoptimize_fuzzing") {

+   cflags = [ "-O1" ] + common_optimize_on_cflags

+   ldflags = common_optimize_on_ldflags

+   visibility = [ ":default_optimization" ]

+@@ -2328,7 +2254,8 @@ config("win_pdbaltpath") {

+ }

+ 

+ # Full symbols.

+-config("symbols") {

++config("symbols") { }

++config("xsymbols") {

+   if (is_win) {

+     if (is_clang) {

+       cflags = [ "/Z7" ]  # Debug information in the .obj files.

+@@ -2431,7 +2358,8 @@ config("symbols") {

+ # Minimal symbols.

+ # This config guarantees to hold symbol for stack trace which are shown to user

​

@@ -0,0 +1,15 @@

+--- a/sql/recover_module/cursor.h

++++ b/sql/recover_module/cursor.h

+@@ -62,10 +62,12 @@

+   // |sqlite_cursor| must have been returned by VirtualTable::SqliteCursor().

+   static inline VirtualCursor* FromSqliteCursor(

+       sqlite3_vtab_cursor* sqlite_cursor) {

++#ifndef NDEBUG

+     static_assert(std::is_standard_layout<VirtualCursor>::value,

+                   "needed for the reinterpret_cast below");

+     static_assert(offsetof(VirtualCursor, sqlite_cursor_) == 0,

+                   "sqlite_cursor_ must be the first member of the class");

++#endif

+     VirtualCursor* result = reinterpret_cast<VirtualCursor*>(sqlite_cursor);

+     DCHECK_EQ(sqlite_cursor, &result->sqlite_cursor_);

+     return result;

​

@@ -1,52 +0,0 @@

-diff -up chromium-93.0.4577.63/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp.freetype-2.11 chromium-93.0.4577.63/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp

---- chromium-93.0.4577.63/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp.freetype-2.11  2021-09-02 08:49:18.996863417 -0400

-+++ chromium-93.0.4577.63/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp    2021-09-02 08:56:07.716626801 -0400

-@@ -712,7 +712,11 @@ void colrv1_draw_paint(SkCanvas* canvas,

-             canvas->drawPaint(colrPaint);

-             break;

-         }

-+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11

-         case FT_COLR_PAINTFORMAT_TRANSFORM:

-+#else

-+        case FT_COLR_PAINTFORMAT_TRANSFORMED:

-+#endif

-         case FT_COLR_PAINTFORMAT_TRANSLATE:

-         case FT_COLR_PAINTFORMAT_SCALE:

-         case FT_COLR_PAINTFORMAT_ROTATE:

-@@ -760,10 +764,17 @@ void colrv1_transform(SkCanvas* canvas,

-     SkMatrix transform;

- 

-     switch (colrv1_paint.format) {

-+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11

-         case FT_COLR_PAINTFORMAT_TRANSFORM: {

-             transform = ToSkMatrix(colrv1_paint.u.transform.affine);

-             break;

-         }

-+#else

-+        case FT_COLR_PAINTFORMAT_TRANSFORMED: {

-+            transform = ToSkMatrix(colrv1_paint.u.transformed.affine);

-+            break;

-+        }

-+#endif

-         case FT_COLR_PAINTFORMAT_TRANSLATE: {

-             transform = SkMatrix::Translate(

-                 SkFixedToScalar(colrv1_paint.u.translate.dx),

-@@ -889,11 +900,18 @@ bool colrv1_traverse_paint(SkCanvas* can

-             traverse_result = colrv1_start_glyph(canvas, palette, face, paint.u.colr_glyph.glyphID,

-                                                  FT_COLOR_NO_ROOT_TRANSFORM);

-             break;

-+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11

-         case FT_COLR_PAINTFORMAT_TRANSFORM:

-             colrv1_transform(canvas, face, paint);

-             traverse_result = colrv1_traverse_paint(canvas, palette, face,

-                                                     paint.u.transform.paint, visited_set);

-             break;

-+#else

-+        case FT_COLR_PAINTFORMAT_TRANSFORMED:

-+            colrv1_transform(canvas, face, paint);

-+            traverse_result = colrv1_traverse_paint(canvas, palette, face,

-+                                                    paint.u.transformed.paint, visited_set);

-+#endif

-         case FT_COLR_PAINTFORMAT_TRANSLATE:

-             colrv1_transform(canvas, face, paint);

-             traverse_result = colrv1_traverse_paint(canvas, palette, face,

​

@@ -1,149 +0,0 @@

-# Patch made by Kevin Kofler <Kevin@tigcc.ticalc.org>

-# https://bugzilla.redhat.com/show_bug.cgi?id=1904652

-

-Index: chromium-90.0.4430.72/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc

-===================================================================

---- chromium-90.0.4430.72.orig/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc

-+++ chromium-90.0.4430.72/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc

-@@ -269,6 +269,18 @@ ResultExpr EvaluateSyscallImpl(int fs_de

-     return Allow();

-   }

- 

-+#if defined(__NR_newfstatat)

-+  if (sysno == __NR_newfstatat) {

-+    return RewriteFstatatSIGSYS();

-+  }

-+#endif

-+

-+#if defined(__NR_fstatat64)

-+  if (sysno == __NR_fstatat64) {

-+    return RewriteFstatatSIGSYS();

-+  }

-+#endif

-+

-   if (SyscallSets::IsFileSystem(sysno) ||

-       SyscallSets::IsCurrentDirectory(sysno)) {

-     return Error(fs_denied_errno);

-Index: chromium-90.0.4430.72/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc

-===================================================================

---- chromium-90.0.4430.72.orig/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc

-+++ chromium-90.0.4430.72/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc

-@@ -6,6 +6,8 @@

- 

- #include "sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h"

- 

-+#include <errno.h>

-+#include <fcntl.h>

- #include <stddef.h>

- #include <stdint.h>

- #include <string.h>

-@@ -355,6 +357,35 @@ intptr_t SIGSYSSchedHandler(const struct

-   return -ENOSYS;

- }

- 

-+intptr_t SIGSYSFstatatHandler(const struct arch_seccomp_data& args,

-+                              void* aux) {

-+  switch (args.nr) {

-+#if defined(__NR_newfstatat)

-+    case __NR_newfstatat:

-+#endif

-+#if defined(__NR_fstatat64)

-+    case __NR_fstatat64:

-+#endif

-+#if defined(__NR_newfstatat) || defined(__NR_fstatat64)

-+      if (*reinterpret_cast<const char *>(args.args[1]) == '\0'

-+          && args.args[3] == static_cast<uint64_t>(AT_EMPTY_PATH)) {

-+        return sandbox::sys_fstat64(static_cast<int>(args.args[0]),

-+                                    reinterpret_cast<struct stat64 *>(args.args[2]));

-+      } else {

-+        errno = EACCES;

-+        return -1;

-+      }

-+      break;

-+#endif

-+  }

-+

-+  CrashSIGSYS_Handler(args, aux);

-+

-+  // Should never be reached.

-+  RAW_CHECK(false);

-+  return -ENOSYS;

-+}

-+

- bpf_dsl::ResultExpr CrashSIGSYS() {

-   return bpf_dsl::Trap(CrashSIGSYS_Handler, NULL);

- }

-@@ -387,6 +418,10 @@ bpf_dsl::ResultExpr RewriteSchedSIGSYS()

-   return bpf_dsl::Trap(SIGSYSSchedHandler, NULL);

- }

- 

-+bpf_dsl::ResultExpr RewriteFstatatSIGSYS() {

-+  return bpf_dsl::Trap(SIGSYSFstatatHandler, NULL);

-+}

-+

- void AllocateCrashKeys() {

- #if !defined(OS_NACL_NONSFI)

-   if (seccomp_crash_key)

-Index: chromium-90.0.4430.72/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h

-===================================================================

---- chromium-90.0.4430.72.orig/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h

-+++ chromium-90.0.4430.72/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h

-@@ -62,6 +62,10 @@ SANDBOX_EXPORT intptr_t SIGSYSPtraceFail

- // sched_setparam(), sched_setscheduler()

- SANDBOX_EXPORT intptr_t SIGSYSSchedHandler(const arch_seccomp_data& args,

-                                            void* aux);

-+// If the fstatat syscall is actually a disguised fstat, calls the regular fstat

-+// syscall, otherwise, crashes in the same way as CrashSIGSYS_Handler.

-+SANDBOX_EXPORT intptr_t SIGSYSFstatatHandler(const struct arch_seccomp_data& args, 

-+                                             void* aux);

- 

- // Variants of the above functions for use with bpf_dsl.

- SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYS();

-@@ -72,6 +76,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Crash

- SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYSFutex();

- SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYSPtrace();

- SANDBOX_EXPORT bpf_dsl::ResultExpr RewriteSchedSIGSYS();

-+SANDBOX_EXPORT bpf_dsl::ResultExpr RewriteFstatatSIGSYS();

- 

- // Allocates a crash key so that Seccomp information can be recorded.

- void AllocateCrashKeys();

-Index: chromium-90.0.4430.72/sandbox/linux/services/syscall_wrappers.cc

-===================================================================

---- chromium-90.0.4430.72.orig/sandbox/linux/services/syscall_wrappers.cc

-+++ chromium-90.0.4430.72/sandbox/linux/services/syscall_wrappers.cc

-@@ -261,4 +261,13 @@ int sys_sigaction(int signum,

- 

- #endif  // defined(MEMORY_SANITIZER)

- 

-+SANDBOX_EXPORT int sys_fstat64(int fd, struct stat64 *buf)

-+{

-+#if defined(__NR_fstat64)

-+    return syscall(__NR_fstat64, fd, buf);

-+#else

-+    return syscall(__NR_fstat, fd, buf);

-+#endif

-+}

-+

- }  // namespace sandbox

-Index: chromium-90.0.4430.72/sandbox/linux/services/syscall_wrappers.h

-===================================================================

---- chromium-90.0.4430.72.orig/sandbox/linux/services/syscall_wrappers.h

-+++ chromium-90.0.4430.72/sandbox/linux/services/syscall_wrappers.h

-@@ -17,6 +17,7 @@ struct sock_fprog;

- struct rlimit64;

- struct cap_hdr;

- struct cap_data;

-+struct stat64;

- 

- namespace sandbox {

- 

-@@ -84,6 +85,9 @@ SANDBOX_EXPORT int sys_sigaction(int sig

-                                  const struct sigaction* act,

-                                  struct sigaction* oldact);

- 

-+// Recent glibc rewrites fstat to fstatat.

-+SANDBOX_EXPORT int sys_fstat64(int fd, struct stat64 *buf);

-+

- }  // namespace sandbox

- 

- #endif  // SANDBOX_LINUX_SERVICES_SYSCALL_WRAPPERS_H_

​

@@ -0,0 +1,26 @@

+From: Fabian Vogt <fvogt@suse.com>

+Subject: Fix build with harfbuzz < 2.9.0

+

+Index: qtwebengine-everywhere-src-5.15.6/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc

+===================================================================

+--- a/components/paint_preview/common/subset_font.cc

++++ b/components/paint_preview/common/subset_font.cc

+@@ -71,11 +71,18 @@ sk_sp<SkData> SubsetFont(SkTypeface* typ

+   hb_set_t* glyphs =

+       hb_subset_input_glyph_set(input.get());  // Owned by |input|.

+   usage.ForEach(base::BindRepeating(&AddGlyphs, base::Unretained(glyphs)));

++#if HB_VERSION_ATLEAST(2,9,0)

+   hb_subset_input_set_flags(input.get(), HB_SUBSET_FLAGS_RETAIN_GIDS);

+ 

+   HbScoped<hb_face_t> subset_face(hb_subset_or_fail(face.get(), input.get()));

+   if (!subset_face)

+     return nullptr;

++#else

++  hb_subset_input_set_retain_gids(input.get(), true);

++

++  HbScoped<hb_face_t> subset_face(hb_subset(face.get(), input.get()));

++#endif

++

+   HbScoped<hb_blob_t> subset_blob(hb_face_reference_blob(subset_face.get()));

+   if (!subset_blob)