@@ -1,4 +1,177 @@

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

+Sun Jul 16 07:54:55 UTC 2023 - Carsten Ziepke <kieltux@gmail.com>

+

+- Rebase chromium 114.0.5735.198 for use as chromium-ffmpeg-extra

+

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

+Tue Jun 27 07:39:29 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de>

+

+- Chromium 114.0.5735.198 (boo#1212755):

+  * CVE-2023-3420: Type Confusion in V8

+  * CVE-2023-3421: Use after free in Media

+  * CVE-2023-3422: Use after free in Guest View

+

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

+Sun Jun 25 09:54:37 UTC 2023 - Callum Farmer <gmbr3@opensuse.org>

+

+- Install Qt5 library & prepare for Qt6 in 115

+

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

+Wed Jun 14 05:23:16 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de>

+

+- Chromium 114.0.5735.133 (boo#1212302):

+  * CVE-2023-3214: Use after free in Autofill payments

+  * CVE-2023-3215: Use after free in WebRTC

+  * CVE-2023-3216: Type Confusion in V8

+  * CVE-2023-3217: Use after free in WebXR

+  * Various fixes from internal audits, fuzzing and other initiatives

+

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

+Wed Jun  7 18:13:06 UTC 2023 - Andreas Stieger <Andreas.Stieger@gmx.de>

+

+- Fix Leap 15.4 build - chromium-114-revert-av1enc-lp154.patch

+

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

+Tue Jun  6 05:34:13 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de>

+

+- Chromium 114.0.5735.106 (boo#1212044):

+  * CVE-2023-3079: Type Confusion in V8

+

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

+Sun Jun  4 18:52:01 UTC 2023 - Callum Farmer <gmbr3@opensuse.org>

+

+- Chromium 114.0.5735.90 (boo#1211843):

+  * CSS text-wrap: balance is available

+  * Cookies partitioned by top level site (CHIPS)

+  * New Popover API

+- Security fixes:

+  * CVE-2023-2929: Out of bounds write in Swiftshader

+  * CVE-2023-2930: Use after free in Extensions

+  * CVE-2023-2931: Use after free in PDF

+  * CVE-2023-2932: Use after free in PDF

+  * CVE-2023-2933: Use after free in PDF

+  * CVE-2023-2934: Out of bounds memory access in Mojo

+  * CVE-2023-2935: Type Confusion in V8

+  * CVE-2023-2936: Type Confusion in V8

+  * CVE-2023-2937: Inappropriate implementation in Picture In Picture

+  * CVE-2023-2938: Inappropriate implementation in Picture In Picture

+  * CVE-2023-2939: Insufficient data validation in Installer

+  * CVE-2023-2940: Inappropriate implementation in Downloads

+  * CVE-2023-2941: Inappropriate implementation in Extensions API

+- Drop patches:

+  * chromium-103-VirtualCursor-std-layout.patch

+  * chromium-113-system-zlib.patch

+  * chromium-113-workaround_clang_bug-structured_binding.patch

+- Add patches

+  * chromium-114-workaround_clang_bug-structured_binding.patch

+  * chromium-114-lld-argument.patch

+

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

+Tue May 30 21:53:45 UTC 2023 - Callum Farmer <gmbr3@opensuse.org>

+

+- Un-bundle zlib again

+- Remove un-needed patches:

+  * chromium-112-default-comparison-operators.patch

+  * chromium-109-clang-lp154.patch

+  * chromium-clang-nomerge.patch

+  * chromium-ffmpeg-lp152.patch

+  * chromium-lp151-old-drm.patch

+- Added patches:

+  * chromium-113-system-zlib.patch

+

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

+Sun May 28 21:32:03 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de>

+

+- build with llvm15 on Leap

+

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

+Tue May 16 21:16:23 UTC 2023 - Andreas Stieger <Andreas.Stieger@gmx.de>

+

+- Chromium 113.0.5672.126 (boo#1211442):

+  * CVE-2023-2721: Use after free in Navigation

+  * CVE-2023-2722: Use after free in Autofill UI

+  * CVE-2023-2723: Use after free in DevTools

+  * CVE-2023-2724: Type Confusion in V8

+  * CVE-2023-2725: Use after free in Guest View

+  * CVE-2023-2726: Inappropriate implementation in WebApp Installs

+  * Various fixes from internal audits, fuzzing and other initiatives

+

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

+Tue May  9 19:14:20 UTC 2023 - Andreas Stieger <Andreas.Stieger@gmx.de>

+

+- Chromium 113.0.5672.92 (boo#1211211)

+- Multiple security fixes (boo#1211036):

+  * CVE-2023-2459: Inappropriate implementation in Prompts

+  * CVE-2023-2460: Insufficient validation of untrusted input in Extensions

+  * CVE-2023-2461: Use after free in OS Inputs

+  * CVE-2023-2462: Inappropriate implementation in Prompts

+  * CVE-2023-2463: Inappropriate implementation in Full Screen Mode

+  * CVE-2023-2464: Inappropriate implementation in PictureInPicture

+  * CVE-2023-2465: Inappropriate implementation in CORS

+  * CVE-2023-2466: Inappropriate implementation in Prompts

+  * CVE-2023-2467: Inappropriate implementation in Prompts

+  * CVE-2023-2468: Inappropriate implementation in PictureInPicture

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

+- drop no-location-leap151.patch

+- add chromium-113-webview-namespace.patch

+- add chromium-113-webauth-include-variant.patch

+- add chromium-113-typename.patch

+- add chromium-113-workaround_clang_bug-structured_binding.patch

+

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

+Wed Apr 19 19:55:51 UTC 2023 - Andreas Stieger <Andreas.Stieger@gmx.de>

+

+- Chromium 112.0.5615.165 (boo#1210618):

+  * CVE-2023-2133: Out of bounds memory access in Service Worker API

+  * CVE-2023-2134: Out of bounds memory access in Service Worker API

+  * CVE-2023-2135: Use after free in DevTools

+  * CVE-2023-2136: Integer overflow in Skia

+  * CVE-2023-2137: Heap buffer overflow in sqlite

+- drop chromium-112-feed_protos.patch

+

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

+Sun Apr 16 02:10:30 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de>

+

+- Fix Leap 15.4 build failures from default comparison operators

+  defined outside of the class definition, a C++20 feature

+  adding chromium-112-default-comparison-operators.patch

+

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

+Sat Apr 15 10:49:51 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de>

+

+- Chromium 112.0.5615.121:

+  * CVE-2023-2033: Type Confusion in V8 (boo#1210478)

+

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

+Fri Apr  7 07:57:40 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de>

+

+- Revert a breaking change with chromium-112-feed_protos.patch

+

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

+Tue Apr  4 22:38:23 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de>

+

+- Chromium 112.0.5615.49 

+  * CSS now supports nesting rules.

+  * The algorithm to set the initial focus on <dialog> elements was updated.

+  * No-op fetch() handlers on service workers are skipped from now on to make navigations faster

+  * The setter for document.domain is now deprecated.

+  * The recorder in devtools can now record with pierce selectors.

+  * Security fixes (boo#1210126):

+  * CVE-2023-1810: Heap buffer overflow in Visuals

+  * CVE-2023-1811: Use after free in Frames

+  * CVE-2023-1812: Out of bounds memory access in DOM Bindings

+  * CVE-2023-1813: Inappropriate implementation in Extensions

+  * CVE-2023-1814: Insufficient validation of untrusted input in Safe Browsing

+  * CVE-2023-1815: Use after free in Networking APIs

+  * CVE-2023-1816: Incorrect security UI in Picture In Picture

+  * CVE-2023-1817: Insufficient policy enforcement in Intents

+  * CVE-2023-1818: Use after free in Vulkan

+  * CVE-2023-1819: Out of bounds read in Accessibility

+  * CVE-2023-1820: Heap buffer overflow in Browser History

+  * CVE-2023-1821: Inappropriate implementation in WebShare

+  * CVE-2023-1822: Incorrect security UI in Navigation

+  * CVE-2023-1823: Inappropriate implementation in FedCM

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

 Sun Apr  2 10:10:49 UTC 2023 - Carsten Ziepke <kieltux@gmail.com>

 - Use gcc11/gcc11-c++ for openSUSE Leap, use gcc12/gcc12-c++

​

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

 # spec file for package chromium-ffmpeg-extra

 #

 # Copyright (c) 2023 SUSE LLC

+# Copyright (c) 2023 Callum Farmer <gmbr3@opensuse.org>

+# Copyright (c) 2023 Andreas Stieger <Andreas.Stieger@gmx.de>

 #

 # All modifications and additions to the file contributed by third parties

 # remain the property of their copyright owners, unless otherwise agreed

@@ -18,42 +20,56 @@

 %define rname chromium

 %define outputdir out

+%bcond_with is_beta # CHANNEL SWITCH

 # bsc#1108175

 %define __provides_exclude ^lib.*\\.so.*$

-%if 0%{?suse_version} >= 1550

-%bcond_without system_icu

-%else

-%bcond_with system_icu

-%endif

 %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400

 %bcond_without gtk4

+%bcond_without qt

 %else

 %bcond_with gtk4

+%bcond_with qt

 %endif

-%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200

-%bcond_without pipewire

-%else

-%bcond_with pipewire

-%endif

-%bcond_without system_zlib

-%bcond_with system_vpx

 %ifarch aarch64

 %bcond_with swiftshader

 %else

 %bcond_without swiftshader

 %endif

-%if 0%{?suse_version} >= 1550

+%if 0%{?suse_version} >= 1599

 %bcond_without system_harfbuzz

 %bcond_without system_freetype

+%bcond_without arm_bti

+%bcond_without system_icu

+%bcond_without ffmpeg_51

+%bcond_without qt6

 %else

 %bcond_with system_harfbuzz

 %bcond_with system_freetype

-%endif

-%bcond_with clang

+%bcond_with arm_bti

+%bcond_with system_icu

+%bcond_with ffmpeg_51

+%bcond_with qt6

+%endif

+%bcond_with system_avif

+# LLVM version

+%define llvm_version 15

+# GCC version

+%define gcc_version 12

+# Compiler

+%bcond_without clang

 # Chromium built with GCC 11 and LTO enabled crashes (boo#1194055)

-%bcond_with lto

+%bcond_without lto

+%bcond_without pipewire

+%bcond_without system_zlib

+%bcond_with system_vpx

+# FFmpeg version

+%if %{with ffmpeg_51}

+%define ffmpeg_version 59

+%else

+%define ffmpeg_version 58

+%endif

 Name:           chromium-ffmpeg-extra

-Version:        103.0.5060.114

+Version:        114.0.5735.198

 Release:        0

 Summary:        Google's open source browser project

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

@@ -81,33 +97,32 @@

 Patch6:         gcc-enable-lto.patch

 # Do not use unrar code, it is non-free

 Patch7:         chromium-norar.patch

-# revert location on old GCC on 15.1, 15.2 gets it right tho

-Patch8:         no-location-leap151.patch

 Patch9:         system-libdrm.patch

 Patch10:        chromium-disable-parallel-gold.patch

-Patch11:        chromium-lp151-old-drm.patch

 # gentoo/fedora/arch patchset

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

-Patch15:        chromium-103-compiler.patch

-Patch17:        chromium-86-ImageMemoryBarrierData-init.patch

-Patch21:        chromium-gcc11.patch

+Patch15:        chromium-110-compiler.patch

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

-Patch50:        chromium-clang-nomerge.patch

 Patch62:        chromium-93-ffmpeg-4.4.patch

-Patch63:        chromium-ffmpeg-lp152.patch

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

 Patch68:        chromium-94-ffmpeg-roll.patch

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

-Patch78:        chromium-98-EnumTable-crash.patch

 Patch87:        chromium-98-gtk4-build.patch

 Patch90:        chromium-100-InMilliseconds-constexpr.patch

 Patch98:        chromium-102-regex_pattern-array.patch

-Patch101:       chromium-103-FrameLoadRequest-type.patch

-Patch102:       chromium-103-SubstringSetMatcher-packed.patch

-Patch103:       chromium-103-VirtualCursor-std-layout.patch

 Patch201:       chromium-86-fix-vaapi-on-intel.patch

 # PATCH-FIX-SUSE: allow prop codecs to be set with chromium branding

 Patch202:       chromium-prop-codecs.patch

+Patch203:       chromium-106-ffmpeg-duration.patch

+Patch205:       chromium-disable-GlobalMediaControlsCastStartStop.patch

+Patch208:       chromium-icu72-2.patch

+Patch210:       chromium-110-system-libffi.patch

+Patch211:       gcc13-fix.patch

+Patch214:       chromium-113-webview-namespace.patch

+Patch215:       chromium-113-webauth-include-variant.patch

+Patch216:       chromium-113-typename.patch

+Patch217:       chromium-114-workaround_clang_bug-structured_binding.patch

+Patch218:       chromium-114-lld-argument.patch

+%if 0%{?sle_version} == 150400

+Patch300:       chromium-114-revert-av1enc-lp154.patch

+%endif

 BuildRequires:  SDL-devel

 BuildRequires:  bison

 BuildRequires:  cups-devel

@@ -119,10 +134,11 @@

 BuildRequires:  gn >= 0.1807

 BuildRequires:  gperf

 BuildRequires:  hicolor-icon-theme

+BuildRequires:  (python3 >= 3.7 or python3-dataclasses)

+BuildRequires:  (python3-importlib-metadata if python3-base < 3.8)

 BuildRequires:  golang(API)

 # Java used during build

 BuildRequires:  java-openjdk-headless

-BuildRequires:  libcap-devel

 BuildRequires:  libdc1394

 BuildRequires:  libgcrypt-devel

 BuildRequires:  libgsm-devel

@@ -130,7 +146,6 @@

 BuildRequires:  libpng-devel

 BuildRequires:  memory-constraints

 BuildRequires:  nasm

-BuildRequires:  ncurses-devel

 BuildRequires:  ninja >= 1.7.2

 BuildRequires:  nodejs >= 8.0

 BuildRequires:  pam-devel

@@ -151,6 +166,8 @@

 BuildRequires:  pkgconfig(dri)

 BuildRequires:  pkgconfig(expat)

 BuildRequires:  pkgconfig(flac++)

+BuildRequires:  pkgconfig(form)

+BuildRequires:  pkgconfig(formw)

 BuildRequires:  pkgconfig(gbm)

 BuildRequires:  pkgconfig(glib-2.0)

 BuildRequires:  pkgconfig(hunspell)

@@ -159,15 +176,13 @@

 BuildRequires:  pkgconfig(kadm-client)

 BuildRequires:  pkgconfig(kdb)

 BuildRequires:  pkgconfig(krb5)

-BuildRequires:  pkgconfig(libavcodec)

-BuildRequires:  pkgconfig(libavfilter)

-BuildRequires:  pkgconfig(libavformat) >= 58

-BuildRequires:  pkgconfig(libavutil)

+BuildRequires:  pkgconfig(libcap)

 BuildRequires:  pkgconfig(libcrypto)

 BuildRequires:  pkgconfig(libcurl)

 BuildRequires:  pkgconfig(libdc1394-2)

 BuildRequires:  pkgconfig(libdrm)

 BuildRequires:  pkgconfig(libelf)

+BuildRequires:  pkgconfig(libevdev)

 BuildRequires:  pkgconfig(libevent)

 BuildRequires:  pkgconfig(libexif)

 BuildRequires:  pkgconfig(libffi)

@@ -180,18 +195,28 @@

 BuildRequires:  pkgconfig(libwebp) >= 0.4.0

 BuildRequires:  pkgconfig(libxml-2.0) >= 2.9.5

 BuildRequires:  pkgconfig(libxslt)

+BuildRequires:  pkgconfig(menu)

+BuildRequires:  pkgconfig(menuw)

 BuildRequires:  pkgconfig(minizip)

+BuildRequires:  pkgconfig(ncurses)

+BuildRequires:  pkgconfig(ncurses++)

+BuildRequires:  pkgconfig(ncurses++w)

+BuildRequires:  pkgconfig(ncursesw)

 BuildRequires:  pkgconfig(nspr) >= 4.9.5

 BuildRequires:  pkgconfig(nss) >= 3.26

 BuildRequires:  pkgconfig(ogg)

 BuildRequires:  pkgconfig(openssl)

 BuildRequires:  pkgconfig(opus) >= 1.3.1

+BuildRequires:  pkgconfig(panel)

+BuildRequires:  pkgconfig(panelw)

 BuildRequires:  pkgconfig(python3)

 BuildRequires:  pkgconfig(re2)

 BuildRequires:  pkgconfig(schroedinger-1.0)

​

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

-From 491bf840da4f76fa3591cc0aa2f4c19cdbe57ec4 Mon Sep 17 00:00:00 2001

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

-Date: Thu, 12 May 2022 11:58:29 +0000

-Subject: PATCH GCC: fix ambiguous references in blink::FrameLoadRequest

-

-Add namespace to avoid confusion.

----

- third_party/blink/renderer/core/loader/frame_load_request.h | 2 +-

- 1 file changed, 1 insertion(+), 1 deletion(-)

-

-diff --git a/third_party/blink/renderer/core/loader/frame_load_request.h b/third_party/blink/renderer/core/loader/frame_load_request.h

-index 444b25c..a86814d 100644

---- a/third_party/blink/renderer/core/loader/frame_load_request.h

-+++ b/third_party/blink/renderer/core/loader/frame_load_request.h

-@@ -179,7 +179,7 @@ struct CORE_EXPORT FrameLoadRequest {

-     impression_ = impression;

-   }

- 

--  const absl::optional<Impression>& Impression() const { return impression_; }

-+  const absl::optional<blink::Impression>& Impression() const { return impression_; }

- 

-   bool CanDisplay(const KURL&) const;

- 

--- 

-2.35.1

-

​

@@ -1,70 +0,0 @@

-From 3d274856e792a361336eb4ae1670bc9c1905f0cb Mon Sep 17 00:00:00 2001

-From: Steinar H. Gunderson <sesse@chromium.org>

-Date: Thu, 12 May 2022 16:42:40 +0200

-Subject: PATCH Make AhoCorasickNode 4-aligned.

-

-This should fix an issue where std::vector could allocate unaligned

-memory for AhoCorasickNode, and we'd then return a pointer to

-inline_edges, where a caller would expect the pointer to be aligned

-but it wasn't.

-

-Change-Id: Id9dff044c61f8e46062c63b8480b18ebc68c4862

----

-

-diff --git a/base/substring_set_matcher/substring_set_matcher.cc b/base/substring_set_matcher/substring_set_matcher.cc

-index e110047..ef0b750 100644

---- a/base/substring_set_matcher/substring_set_matcher.cc

-+++ b/base/substring_set_matcher/substring_set_matcher.cc

-@@ -424,7 +424,12 @@

-     edges_.inline_edgesnum_edges() = AhoCorasickEdge{label, node};

-     if (label == kFailureNodeLabel) {

-       // Make sure that kFailureNodeLabel is first.

--      std::swap(edges_.inline_edges0, edges_.inline_edgesnum_edges());

-+      // NOTE: We don't use std::swap here, because GCC

-+      // doesn't understand that inline_edges is 4-aligned

-+      // and gives a warning.

-+      AhoCorasickEdge temp = edges_.inline_edges0;

-+      edges_.inline_edges0 = edges_.inline_edgesnum_edges();

-+      edges_.inline_edgesnum_edges() = temp;

-     }

-     --num_free_edges_;

-     return;

-diff --git a/base/substring_set_matcher/substring_set_matcher.cc b/base/substring_set_matcher/substring_set_matcher.cc

-index e110047..ef0b750 100644

---- a/base/substring_set_matcher/substring_set_matcher.h

-+++ b/base/substring_set_matcher/substring_set_matcher.h

-@@ -154,8 +154,9 @@

-   static constexpr uint32_t kEmptyLabel = 0x103;

- 

-   // A node in the trie, packed tightly together so that it occupies 12 bytes

--  // (both on 32- and 64-bit platforms).

--  class AhoCorasickNode {

-+  // (both on 32- and 64-bit platforms), but aligned to at least 4 (see the

-+  // comment on edges_).

-+  class alignas(AhoCorasickEdge) AhoCorasickNode {

-    public:

-     AhoCorasickNode();

-     ~AhoCorasickNode();

-@@ -178,6 +179,10 @@

-     NodeID GetEdgeNoInline(uint32_t label) const;

-     void SetEdge(uint32_t label, NodeID node);

-     const AhoCorasickEdge* edges() const {

-+      // NOTE: Returning edges_.inline_edges here is fine, because it's

-+      // the first thing in the struct (see the comment on edges_).

-+      DCHECK_EQ(0u, reinterpret_cast<uintptr_t>(edges_.inline_edges) %

-+                        alignof(AhoCorasickEdge));

-       return edges_capacity_ == 0 ? edges_.inline_edges : edges_.edges;

-     }

- 

-@@ -258,6 +263,11 @@

-     // in the first slot if it exists (ie., is not equal to kRootID), since we

-     // need to access that label during every single node we look at during

-     // traversal.

-+    //

-+    // NOTE: Keep this the first member in the struct, so that inline_edges gets

-+    // 4-aligned (since the class is marked as such, despite being packed.

-+    // Otherwise, edges() can return an unaligned pointer marked as aligned

-+    // (the unalignedness gets lost).

-     static constexpr int kNumInlineEdges = 2;

-     union {

-       // Out-of-line edge storage, having room for edges_capacity_ elements.

​

@@ -1,231 +0,0 @@

-From 144479ad7b4287bee4067f95e4218f614798a865 Mon Sep 17 00:00:00 2001

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

-Date: Sun, 16 Jan 2022 19:15:26 +0000

-Subject: PATCH sql: make VirtualCursor standard layout type

-

-sql::recover::VirtualCursor needs to be a standard layout type, but

-has members of type std::unique_ptr. However, std::unique_ptr is not

-guaranteed to be standard layout. Compiling with clang combined with

-gcc-11 libstdc++ fails because of this.

-

-Bug: 1189788

-Change-Id: Ia6dc388cc5ef1c0f2afc75f8ca45b9f12687ca9c

----

-

-diff --git a/sql/recover_module/btree.cc b/sql/recover_module/btree.cc

-index cc9420e5..f12d8fa 100644

---- a/sql/recover_module/btree.cc

-+++ b/sql/recover_module/btree.cc

-@@ -136,16 +136,22 @@

-               "Move the destructor to the .cc file if it's non-trival");

- #endif  // !DCHECK_IS_ON()

- 

--LeafPageDecoder::LeafPageDecoder(DatabasePageReader* db_reader) noexcept

--    : page_id_(db_reader->page_id()),

--      db_reader_(db_reader),

--      cell_count_(ComputeCellCount(db_reader)),

--      next_read_index_(0),

--      last_record_size_(0) {

-+LeafPageDecoder::LeafPageDecoder() noexcept = default;

-+

-+void LeafPageDecoder::Initialize(DatabasePageReader* db_reader) {

-+  page_id_ = db_reader->page_id();

-+  db_reader_ = db_reader;

-+  cell_count_ = ComputeCellCount(db_reader);

-+  next_read_index_ = 0;

-+  last_record_size_ = 0;

-   DCHECK(IsOnValidPage(db_reader));

-   DCHECK(DatabasePageReader::IsValidPageId(page_id_));

- }

- 

-+void LeafPageDecoder::Reset() {

-+  db_reader_ = nullptr;

-+}

-+

- bool LeafPageDecoder::TryAdvance() {

-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);

-   DCHECK(CanAdvance());

-diff --git a/sql/recover_module/btree.h b/sql/recover_module/btree.h

-index eaa087a5..df0e0c9 100644

---- a/sql/recover_module/btree.h

-+++ b/sql/recover_module/btree.h

-@@ -101,9 +101,7 @@

-  public:

-   // Creates a decoder for a DatabasePageReader's last read page.

-   //

--  // |db_reader| must have been used to read an inner page of a table B-tree.

--  // |db_reader| must outlive this instance.

--  explicit LeafPageDecoder(DatabasePageReader* db_reader) noexcept;

-+  LeafPageDecoder() noexcept;

-   ~LeafPageDecoder() noexcept = default;

- 

-   LeafPageDecoder(const LeafPageDecoder&) = delete;

-@@ -151,6 +149,17 @@

-   // read as long as CanAdvance() returns true.

-   bool TryAdvance();

- 

-+  // Initialize with DatabasePageReader

-+  // |db_reader| must have been used to read an inner page of a table B-tree.

-+  // |db_reader| must outlive this instance.

-+  void Initialize(DatabasePageReader* db_reader);

-+

-+  // Reset internal DatabasePageReader

-+  void Reset();

-+

-+  // True if DatabasePageReader is valid

-+  bool IsValid() { return (db_reader_ != nullptr); }

-+

-   // True if the given reader may point to an inner page in a table B-tree.

-   //

-   // The last ReadPage() call on |db_reader| must have succeeded.

-@@ -164,14 +173,14 @@

-   static int ComputeCellCount(DatabasePageReader* db_reader);

- 

-   // The number of the B-tree page this reader is reading.

--  const int64_t page_id_;

-+  int64_t page_id_;

-   // Used to read the tree page.

-   //

-   // Raw pointer usage is acceptable because this instance's owner is expected

-   // to ensure that the DatabasePageReader outlives this.

--  DatabasePageReader* const db_reader_;

-+  DatabasePageReader* db_reader_;

-   // Caches the ComputeCellCount() value for this reader's page.

--  const int cell_count_ = ComputeCellCount(db_reader_);

-+  int cell_count_;

- 

-   // The reader's cursor state.

-   //

-diff --git a/sql/recover_module/cursor.cc b/sql/recover_module/cursor.cc

-index 4f827ed..240de499 100644

---- a/sql/recover_module/cursor.cc

-+++ b/sql/recover_module/cursor.cc

-@@ -28,7 +28,7 @@

- int VirtualCursor::First() {

-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);

-   inner_decoders_.clear();

--  leaf_decoder_ = nullptr;

-+  leaf_decoder_.Reset();

- 

-   AppendPageDecoder(table_->root_page_id());

-   return Next();

-@@ -38,18 +38,18 @@

-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);

-   record_reader_.Reset();

- 

--  while (!inner_decoders_.empty() || leaf_decoder_.get()) {

--    if (leaf_decoder_.get()) {

--      if (!leaf_decoder_->CanAdvance()) {

-+  while (!inner_decoders_.empty() || leaf_decoder_.IsValid()) {

-+    if (leaf_decoder_.IsValid()) {

-+      if (!leaf_decoder_.CanAdvance()) {

-         // The leaf has been exhausted. Remove it from the DFS stack.

--        leaf_decoder_ = nullptr;

-+        leaf_decoder_.Reset();

-         continue;

-       }

--      if (!leaf_decoder_->TryAdvance())

-+      if (!leaf_decoder_.TryAdvance())

-         continue;

- 

--      if (!payload_reader_.Initialize(leaf_decoder_->last_record_size(),

--                                      leaf_decoder_->last_record_offset())) {

-+      if (!payload_reader_.Initialize(leaf_decoder_.last_record_size(),

-+                                      leaf_decoder_.last_record_offset())) {

-         continue;

-       }

-       if (!record_reader_.Initialize())

-@@ -101,13 +101,13 @@

- int64_t VirtualCursor::RowId() {

-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);

-   DCHECK(record_reader_.IsInitialized());

--  DCHECK(leaf_decoder_.get());

--  return leaf_decoder_->last_record_rowid();

-+  DCHECK(leaf_decoder_.IsValid());

-+  return leaf_decoder_.last_record_rowid();

- }

- 

- void VirtualCursor::AppendPageDecoder(int page_id) {

-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);

--  DCHECK(leaf_decoder_.get() == nullptr)

-+  DCHECK(!leaf_decoder_.IsValid())

-       << __func__

-       << " must only be called when the current path has no leaf decoder";

- 

-@@ -115,7 +115,7 @@

-     return;

- 

-   if (LeafPageDecoder::IsOnValidPage(&db_reader_)) {

--    leaf_decoder_ = std::make_unique<LeafPageDecoder>(&db_reader_);

-+    leaf_decoder_.Initialize(&db_reader_);

-     return;

-   }

- 

-diff --git a/sql/recover_module/cursor.h b/sql/recover_module/cursor.h

-index 845b785..cc4e85f8 100644

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

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

-@@ -130,7 +130,7 @@

-   std::vector<std::unique_ptr<InnerPageDecoder>> inner_decoders_;

- 

-   // Decodes the leaf page containing records.

--  std::unique_ptr<LeafPageDecoder> leaf_decoder_;

-+  LeafPageDecoder leaf_decoder_;

- 

-   SEQUENCE_CHECKER(sequence_checker_);

- };

-diff --git a/sql/recover_module/pager.cc b/sql/recover_module/pager.cc

-index 58e75de..69d98cef 100644

---- a/sql/recover_module/pager.cc

-+++ b/sql/recover_module/pager.cc

-@@ -23,8 +23,7 @@

-               "ints are not appropriate for representing page IDs");

- 

- DatabasePageReader::DatabasePageReader(VirtualTable* table)

--    : page_data_(std::make_unique<uint8_t>(table->page_size())),

--      table_(table) {

-+    : page_data_(table->page_size()), table_(table) {

-   DCHECK(table != nullptr);

-   DCHECK(IsValidPageSize(table->page_size()));

- }

-@@ -58,7 +57,7 @@

-                 "The |read_offset| computation above may overflow");

- 

-   int sqlite_status =

--      RawRead(sqlite_file, read_size, read_offset, page_data_.get());

-+      RawRead(sqlite_file, read_size, read_offset, page_data_.data());

- 

-   // |page_id_| needs to be set to kInvalidPageId if the read failed.

-   // Otherwise, future ReadPage() calls with the previous |page_id_| value

​

@@ -1,235 +0,0 @@

-From 307a0f63dd9b118f4b8470ed3d7567e81fdb7a6d Mon Sep 17 00:00:00 2001

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

-Date: Tue, 3 May 2022 10:51:55 +0000

-Subject: PATCH Disable various compiler configs

-

----

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

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

-

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

-index f378b95..cb2aeb3 100644

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

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

-@@ -286,9 +286,7 @@ config("compiler") {

- 

-   configs += 

-     # See the definitions below.

--    ":clang_revision",

-     ":rustc_revision",

--    ":compiler_cpu_abi",

-     ":compiler_codegen",

-     ":compiler_deterministic",

-   

-@@ -522,31 +520,6 @@ config("compiler") {

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

-   }

- 

--  if (is_clang && !is_nacl && current_os != "zos") {

--    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" 

--    }

--  }

--

-   # Rust compiler setup (for either clang or rustc).

-   if (enable_rust) {

-     defines +=  "RUST_ENABLED" 

-@@ -1231,45 +1204,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.

-@@ -1534,15 +1468,6 @@ config("default_warnings") {

-         cflags +=  "-Wno-unqualified-std-cast-call" 

-       }

- 

--      if (!is_nacl && !(is_chromeos ||

--                        default_toolchain == "//build/toolchain/cros:target")) {

--        # TODO(https://crbug.com/1316298): Re-enable once test failure is figured out

--        cflags += 

--          "-Xclang",

--          "-no-opaque-pointers",

--        

--      }

--

-       if (is_fuchsia) {

-         # TODO(https://bugs.chromium.org/p/fuchsia/issues/detail?id=77383)

-         cflags +=  "-Wno-deprecated-copy" 

-@@ -1611,7 +1536,7 @@ config("chromium_code") {

-       defines =  "_HAS_NODISCARD" 

-     }

-   } else {

--    cflags =  "-Wall" 

-+    cflags = 

-     if (treat_warnings_as_errors) {

-       cflags +=  "-Werror" 

- 

-@@ -1620,10 +1545,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.

-@@ -1632,15 +1553,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" 

-@@ -2031,7 +1943,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.

-@@ -2069,7 +1982,8 @@ config("optimize") {

- }

- 

- # Turn off optimizations.

--config("no_optimize") {

-+config("no_optimize") { }

-+config("xno_optimize") {

-   if (is_win) {

-     cflags = 

-       "/Od",  # Disable optimization.

-@@ -2109,7 +2023,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:

-@@ -2142,7 +2057,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:

-@@ -2168,7 +2084,8 @@ config("optimize_speed") {

-   }

- }

- 

--config("optimize_fuzzing") {

-+config("optimize_fuzzing") { }

​

@@ -0,0 +1,17 @@

+Index: chromium-106.0.5249.91/media/filters/audio_file_reader.cc

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

+--- chromium-106.0.5249.91.orig/media/filters/audio_file_reader.cc

++++ chromium-106.0.5249.91/media/filters/audio_file_reader.cc

+@@ -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()->streamsstream_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_));

+ 

​

@@ -0,0 +1,253 @@

+From 307a0f63dd9b118f4b8470ed3d7567e81fdb7a6d Mon Sep 17 00:00:00 2001

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

+Date: Tue, 15 Nov 2022 10:27:58 +0000

+Subject: PATCH Disable various compiler configs

+

+---

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

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

+

+Index: chromium-114.0.5735.90/build/config/compiler/BUILD.gn

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

+--- chromium-114.0.5735.90.orig/build/config/compiler/BUILD.gn

++++ chromium-114.0.5735.90/build/config/compiler/BUILD.gn

+@@ -289,9 +289,7 @@ config("compiler") {

+ 

+   configs += 

+     # See the definitions below.

+-    ":clang_revision",

+     ":rustc_revision",

+-    ":compiler_cpu_abi",

+     ":compiler_codegen",

+     ":compiler_deterministic",

+   

+@@ -540,37 +538,6 @@ config("compiler") {

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

+   }

+ 

+-  if (is_clang && !is_nacl && current_os != "zos") {

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

+-    if (save_reproducers_on_lld_crash && use_lld) {

+-      ldflags += 

+-        "-fcrash-diagnostics=all",

+-        "-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) ||

+@@ -1346,46 +1313,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=." 

+-      swiftflags +=  "-file-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.

+@@ -1404,27 +1331,6 @@ config("compiler_deterministic") {

+   }

+ }

+ 

+-config("clang_revision") {

+-  if (is_clang && clang_base_path == default_clang_base_path) {

+-    update_args = 

+-      "--print-revision",

+-      "--verify-version=$clang_version",

+-    

+-    if (llvm_force_head_revision) {

+-      update_args +=  "--llvm-force-head-revision" 

+-    }

+-    clang_revision = exec_script("//tools/clang/scripts/update.py",

+-                                 update_args,

+-                                 "trim string")

+-

+-    # This is here so that all files get recompiled after a clang roll and

+-    # when turning clang on or off. (defines are passed via the command line,

+-    # and build system rebuild things when their commandline changes). Nothing

+-    # should ever read this define.

+-    defines =  "CR_CLANG_REVISION=\"$clang_revision\"" 

+-  }

+-}

+-

+ config("rustc_revision") {

+   if (rustc_revision != "") {

+     # Similar to the above config, this is here so that all files get recompiled

+@@ -1714,7 +1620,7 @@ config("chromium_code") {

+       defines =  "_HAS_NODISCARD" 

+     }

+   } else {

+-    cflags =  "-Wall" 

++    cflags = 

+     if (treat_warnings_as_errors) {

+       cflags +=  "-Werror" 

+ 

+@@ -1723,10 +1629,6 @@ config("chromium_code") {

+       # well.

+       ldflags =  "-Werror" 

+     }

+-    if (is_clang) {

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

+-      cflags +=  "-Wextra" 

+-    }

+ 

+     if (treat_warnings_as_errors) {

+       # Turn rustc warnings into the "deny" lint level, which produce compiler

+@@ -1744,16 +1646,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" &&

+-        current_cpu != "riscv64" && current_cpu != "loong64") {

+-      # 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_apple) {

+       cflags_objc =  "-Wimplicit-retain-self" 

+       cflags_objcc =  "-Wimplicit-retain-self" 

+@@ -2122,7 +2014,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.

+@@ -2181,7 +2074,8 @@ config("optimize") {

+ }

+ 

+ # Turn off optimizations.

+-config("no_optimize") {

++config("no_optimize") { }

++config("xno_optimize") {

+   if (is_win) {

+     cflags = 

+       "/Od",  # Disable optimization.

+@@ -2221,7 +2115,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") { }

​

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

+Index: chromium-110.0.5481.30/build/config/linux/libffi/BUILD.gn

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

+--- chromium-110.0.5481.30.orig/build/config/linux/libffi/BUILD.gn

++++ chromium-110.0.5481.30/build/config/linux/libffi/BUILD.gn

+@@ -4,21 +4,6 @@

+ 

+ import("//build/config/linux/pkg_config.gni")

+ 

+-declare_args() {

+-  # Controls whether the build should use the version of libffi library shipped

+-  # with the system. By default, we only use the system version on Chrome OS:

+-  # on Linux, libffi must be statically linked to prevent a situation where the

+-  # runtime version of libffi is different from the build-time version from the

+-  # sysroot.

+-  use_system_libffi = default_toolchain == "//build/toolchain/cros:target"

+-}

+-

+-if (use_system_libffi) {

+   pkg_config("libffi") {

+     packages =  "libffi" 

+   }

+-} else {

+-  config("libffi") {

+-    libs =  ":libffi_pic.a" 

+-  }

+-}

​

@@ -0,0 +1,64 @@

+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 --git a/print_backend_service_manager.h b/print_backend_service_manager.h.new

+index d812f3b..3352148 100644

+--- a/chrome/browser/printing/print_backend_service_manager.h

++++ b/chrome/browser/printing/print_backend_service_manager.h

+@@ -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 --git a/print_backend_service_manager.cc b/print_backend_service_manager.cc.new

+index b5a4b52..224369c 100644

+--- a/chrome/browser/printing/print_backend_service_manager.cc

++++ b/chrome/browser/printing/print_backend_service_manager.cc

+@@ -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.

​

@@ -0,0 +1,12 @@

+Index: chromium-114.0.5735.90/chrome/browser/webauthn/authenticator_request_dialog_model.h

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

+--- chromium-114.0.5735.90.orig/chrome/browser/webauthn/authenticator_request_dialog_model.h

++++ chromium-114.0.5735.90/chrome/browser/webauthn/authenticator_request_dialog_model.h

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

+ 

+ #include <memory>

+ #include <string>

++#include <variant>

+ #include <vector>

+ #include <variant>

+ 

​

@@ -0,0 +1,13 @@

+diff --git a/web_view_impl.cc b/web_view_impl.cc.new

+index f726627..c1d4d14 100644

+--- a/chrome/test/chromedriver/chrome/web_view_impl.cc

++++ b/chrome/test/chromedriver/chrome/web_view_impl.cc

+@@ -75,7 +75,7 @@ absl::optional<std::pair<std::string, int>> GetElementId(

+   if (element_id == nullptr) {

+     return absl::nullopt;

+   }

+-  static const size_t separator_length = std::strlen(kElementIdSeparator);

++  static const size_t separator_length = strlen(kElementIdSeparator);

+   const size_t separator_pos = element_id->rfind(

+       kElementIdSeparator, std::string::npos, separator_length);

+   if (separator_pos == std::string::npos) {

​

@@ -0,0 +1,18 @@

+diff --git a/BUILD.gn b/BUILD.gn.new