chromium: Chromium 103.0.5060.134 -> 104.0.5112.79

6 files changed, 147 insertions, 123 deletions

diff --git a/chromium/chromium/chromium-ffmpeg-clean.sh b/chromium/chromium/chromium-ffmpeg-clean.sh
index 5d517c3..28f4c67 100755
--- a/chromium/chromium/chromium-ffmpeg-clean.sh
+++ b/chromium/chromium/chromium-ffmpeg-clean.sh
@@ -81,6 +81,7 @@ header_files="	libavcodec/x86/inline_asm.h \
 		libavcodec/aac_ac3_parser.h \
 		libavcodec/aac_defines.h \
 		libavcodec/ac3.h \
+		libavcodec/ac3defs.h \
 		libavcodec/ac3tab.h \
 		libavcodec/adts_header.h \
 		libavcodec/avcodec.h \
diff --git a/chromium/chromium/chromium-gcc-12-r1003039.patch b/chromium/chromium/chromium-gcc-12-r1003039.patch
deleted file mode 100644
index 5915e56..0000000
--- a/chromium/chromium/chromium-gcc-12-r1003039.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 0b2cb61de75f65e8d1a1925a4bd7509541b989ba Mon Sep 17 00:00:00 2001
-From: "Steinar H. Gunderson" <sesse@chromium.org>
-Date: Fri, 13 May 2022 09:31:23 +0000
-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
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3645110
-Reviewed-by: danakj <danakj@chromium.org>
-Commit-Queue: Steinar H Gunderson <sesse@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1003039}
----
- .../substring_set_matcher/substring_set_matcher.cc |  7 ++++++-
- base/substring_set_matcher/substring_set_matcher.h | 14 ++++++++++++--
- 2 files changed, 18 insertions(+), 3 deletions(-)
-
-diff --git a/base/substring_set_matcher/substring_set_matcher.cc b/base/substring_set_matcher/substring_set_matcher.cc
-index e1100479c250b..d2c66ead0c9c6 100644
---- a/base/substring_set_matcher/substring_set_matcher.cc
-+++ b/base/substring_set_matcher/substring_set_matcher.cc
-@@ -424,7 +424,12 @@ void SubstringSetMatcher::AhoCorasickNode::SetEdge(uint32_t label,
-     edges_.inline_edges[num_edges()] = AhoCorasickEdge{label, node};
-     if (label == kFailureNodeLabel) {
-       // Make sure that kFailureNodeLabel is first.
--      std::swap(edges_.inline_edges[0], edges_.inline_edges[num_edges()]);
-+      // NOTE: We don't use std::swap here, because the compiler doesn't
-+      // understand that inline_edges[] is 4-aligned and can give
-+      // a warning or error.
-+      AhoCorasickEdge temp = edges_.inline_edges[0];
-+      edges_.inline_edges[0] = edges_.inline_edges[num_edges()];
-+      edges_.inline_edges[num_edges()] = temp;
-     }
-     --num_free_edges_;
-     return;
-diff --git a/base/substring_set_matcher/substring_set_matcher.h b/base/substring_set_matcher/substring_set_matcher.h
-index 13b01971f6e78..47f913f2c09d9 100644
---- a/base/substring_set_matcher/substring_set_matcher.h
-+++ b/base/substring_set_matcher/substring_set_matcher.h
-@@ -154,8 +154,9 @@ class BASE_EXPORT SubstringSetMatcher {
-   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 @@ class BASE_EXPORT SubstringSetMatcher {
-     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 @@ class BASE_EXPORT SubstringSetMatcher {
-     // 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.
--- 
-2.35.3
-
diff --git a/chromium/chromium/chromium-gcc-12-r1004139.patch b/chromium/chromium/chromium-gcc-12-r1004139.patch
deleted file mode 100644
index 065e6d7..0000000
--- a/chromium/chromium/chromium-gcc-12-r1004139.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 018f2969b72158534972befe1a0378a9cd5c2bc4 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Tue, 17 May 2022 07:51:50 +0000
-Subject: [PATCH] GCC: fix ambiguous references in blink::FrameLoadRequest
-
-Add namespace to avoid confusion.
-
-Bug: 819294
-Change-Id: Ia60b4cf7a6d17ba5cd386d3fc57cc59222fcef71
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3650536
-Reviewed-by: Mike West <mkwst@chromium.org>
-Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
-Cr-Commit-Position: refs/heads/main@{#1004139}
----
- third_party/blink/renderer/core/loader/frame_load_request.h | 4 +++-
- 1 file changed, 3 insertions(+), 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 444b25c831245..32e3480fd395b 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,9 @@ 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.3
-
diff --git a/chromium/chromium/chromium-gcc-12-r1016345.patch b/chromium/chromium/chromium-gcc-12-r1016345.patch
new file mode 100644
index 0000000..267358d
--- /dev/null
+++ b/chromium/chromium/chromium-gcc-12-r1016345.patch
@@ -0,0 +1,62 @@
+From de893f1b7bc9c2f221b102145e1a15f4b2521954 Mon Sep 17 00:00:00 2001
+From: Ivan Murashov <ivan.murashov@lge.com>
+Date: Tue, 21 Jun 2022 19:29:30 +0000
+Subject: [PATCH] [Cast Streaming] libstdc++: Fix incomplete type of
+ cast_streaming::ResourceProvider
+
+Destructor of std::unique_ptr in libstdc++ uses sizeof() which requires
+full definition of cast_streaming::ResourceProvider for return type of
+ContentRendererClient::CreateCastStreamingResourceProvider().
+Added required include and deps to fix the issue.
+
+Bug: b/228081914, 957519
+Change-Id: I1f12d104a090460f5d2ffbb78c72f59279a63b33
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3672799
+Commit-Queue: Ivan Murashov <ivan.murashov@lge.com>
+Reviewed-by: Jordan Bayles <jophba@chromium.org>
+Reviewed-by: Fabrice de Gans <fdegans@chromium.org>
+Reviewed-by: Alex Moshchuk <alexmos@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#1016345}
+---
+ content/public/renderer/BUILD.gn                   | 1 +
+ content/public/renderer/DEPS                       | 1 +
+ content/public/renderer/content_renderer_client.cc | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/content/public/renderer/BUILD.gn b/content/public/renderer/BUILD.gn
+index 1eab7f35738a7..fecca01152929 100644
+--- a/content/public/renderer/BUILD.gn
++++ b/content/public/renderer/BUILD.gn
+@@ -58,6 +58,7 @@ target(link_target_type, "renderer_sources") {
+   ]
+ 
+   deps = [
++    "//components/cast_streaming/renderer:resource_provider",
+     "//content/public/child:child_sources",
+     "//content/public/common:common_sources",
+     "//content/renderer",
+diff --git a/content/public/renderer/DEPS b/content/public/renderer/DEPS
+index 12f044c8b6dbf..9e762d37425d9 100644
+--- a/content/public/renderer/DEPS
++++ b/content/public/renderer/DEPS
+@@ -1,4 +1,5 @@
+ include_rules = [
++  "+components/cast_streaming/renderer/public",
+   "+content/common/media",
+   "+content/public/child",
+   "+gin",
+diff --git a/content/public/renderer/content_renderer_client.cc b/content/public/renderer/content_renderer_client.cc
+index de7f7113f06c9..8eeeee0178f52 100644
+--- a/content/public/renderer/content_renderer_client.cc
++++ b/content/public/renderer/content_renderer_client.cc
+@@ -6,6 +6,7 @@
+ 
+ #include "base/command_line.h"
+ #include "build/build_config.h"
++#include "components/cast_streaming/renderer/public/resource_provider.h"
+ #include "content/public/common/content_switches.h"
+ #include "media/base/demuxer.h"
+ #include "media/base/renderer_factory.h"
+-- 
+2.37.1
+
diff --git a/chromium/chromium/chromium-tflite-minizip.patch b/chromium/chromium/chromium-tflite-minizip.patch
new file mode 100644
index 0000000..91ef572
--- /dev/null
+++ b/chromium/chromium/chromium-tflite-minizip.patch
@@ -0,0 +1,70 @@
+--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc
++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc
+@@ -21,8 +21,8 @@ limitations under the License.
+ #include "absl/status/status.h"        // from @com_google_absl
+ #include "absl/strings/str_format.h"   // from @com_google_absl
+ #include "absl/strings/string_view.h"  // from @com_google_absl
+-#include "contrib/minizip/ioapi.h"
+-#include "contrib/minizip/unzip.h"
++#include "third_party/zlib/contrib/minizip/ioapi.h"
++#include "third_party/zlib/contrib/minizip/unzip.h"
+ #include "flatbuffers/flatbuffers.h"  // from @flatbuffers
+ #include "tensorflow/lite/schema/schema_generated.h"
+ #include "tensorflow_lite_support/cc/common.h"
+--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc
++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc
+@@ -19,8 +19,8 @@ limitations under the License.
+ #include <cstring>
+ #include <functional>
+ 
+-#include "contrib/minizip/ioapi.h"
+-#include "contrib/minizip/zip.h"
++#include "third_party/zlib/contrib/minizip/ioapi.h"
++#include "third_party/zlib/contrib/minizip/zip.h"
+ #include "flatbuffers/flatbuffers.h"  // from @flatbuffers
+ #include "tensorflow/lite/schema/schema_generated.h"
+ #include "tensorflow_lite_support/cc/common.h"
+--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc
++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc
+@@ -19,7 +19,7 @@ limitations under the License.
+ #include <cstdio>
+ 
+ #include "absl/strings/string_view.h"  // from @com_google_absl
+-#include "contrib/minizip/ioapi.h"
++#include "third_party/zlib/contrib/minizip/ioapi.h"
+ 
+ namespace tflite {
+ namespace metadata {
+--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h
++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h
+@@ -19,7 +19,7 @@ limitations under the License.
+ #include <cstdlib>
+ 
+ #include "absl/strings/string_view.h"  // from @com_google_absl
+-#include "contrib/minizip/ioapi.h"
++#include "third_party/zlib/contrib/minizip/ioapi.h"
+ 
+ namespace tflite {
+ namespace metadata {
+--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc
++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc
+@@ -19,7 +19,7 @@ limitations under the License.
+ #include <cstdio>
+ 
+ #include "absl/strings/string_view.h"  // from @com_google_absl
+-#include "contrib/minizip/ioapi.h"
++#include "third_party/zlib/contrib/minizip/ioapi.h"
+ 
+ namespace tflite {
+ namespace metadata {
+--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h
++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h
+@@ -19,7 +19,7 @@ limitations under the License.
+ #include <cstdlib>
+ 
+ #include "absl/strings/string_view.h"  // from @com_google_absl
+-#include "contrib/minizip/ioapi.h"
++#include "third_party/zlib/contrib/minizip/ioapi.h"
+ 
+ namespace tflite {
+ namespace metadata {
diff --git a/chromium/chromium/chromium.spec b/chromium/chromium/chromium.spec
index c2e1364..9cf41f3 100644
--- a/chromium/chromium/chromium.spec
+++ b/chromium/chromium/chromium.spec
@@ -56,7 +56,7 @@
 %bcond_with fedora_compilation_flags
 
 Name:       chromium
-Version:    103.0.5060.134
+Version:    104.0.5112.79
 Release:    100%{?dist}
 Summary:    A WebKit (Blink) powered web browser
 
@@ -96,19 +96,22 @@ Source12:   chromium-browser.xml
 Patch0:     chromium-stub-unrar-wrapper.patch
 
 # Don't require static libstdc++
-Patch2:     chromium-gn-no-static-libstdc++.patch
-
-# Fix missing opus dependency for media/mojo/services/gpu_mojo_media_client.cc
-Patch3:     chromium-media-mojo-services-opus.patch
+Patch1:     chromium-gn-no-static-libstdc++.patch
 
 # Don't use unversioned python commands. This patch is based on
 # https://src.fedoraproject.org/rpms/chromium/c/7048e95ab61cd143
 # https://src.fedoraproject.org/rpms/chromium/c/cb0be2c990fc724e
-Patch10:    chromium-python3.patch
+Patch2:     chromium-python3.patch
+
+# Fix missing opus dependency for media/mojo/services/gpu_mojo_media_client.cc
+Patch3:     chromium-media-mojo-services-opus.patch
+
+# Pull patches from Gentoo
+# https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc8b4484b9a3461e
+Patch10:    chromium-tflite-minizip.patch
 
 # Pull upstream patches
-Patch40:    chromium-gcc-12-r1003039.patch
-Patch41:    chromium-gcc-12-r1004139.patch
+Patch20:    chromium-gcc-12-r1016345.patch
 
 # I don't have time to test whether it work on other architectures
 ExclusiveArch: x86_64
@@ -727,6 +730,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Thu Aug 04 2022 - Ting-Wei Lan <lantw44@gmail.com> - 104.0.5112.79-100
+- Update to 104.0.5112.79
+
 * Thu Jul 21 2022 - Ting-Wei Lan <lantw44@gmail.com> - 103.0.5060.134-100
 - Update to 103.0.5060.134