Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions meta-chromium/recipes-browser/chromium/chromium-gn.inc
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ SRC_URI += "\
file://fix-SYS_SECCOMP-redefinition.patch \
file://use-adler2.patch \
file://chromium-145-zip_ffi_glue-use-edition2024.patch \
file://chromium146_backport-Remove-now-obsolete-invalid-patch-on-bytemuck-v1.patch \
"

# ARM/AArch64-specific patches.
Expand Down
195 changes: 186 additions & 9 deletions meta-chromium/recipes-browser/chromium/chromium.inc

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -109,3 +109,16 @@ index 59942a3..cf5e62e 100644
if (use_clang_modules) {
cflags += [
# This removes absolute paths from .pcm files.
@@ -1849,12 +1804,6 @@
"-fsanitize=array-bounds",
"-fsanitize-trap=array-bounds",

- # Some code users feature detection to determine if UBSAN (or any
- # sanitizer) is enabled, they then do expensive debug like operations. We
- # want to suppress this behaviour since we want to keep performance costs
- # as low as possible while having these checks.
- "-fsanitize-ignore-for-ubsan-feature=array-bounds",
-
# Because we've enabled array-bounds sanitizing we also want to suppress
# the related warning about "unsafe-buffer-usage-in-static-sized-array",
# since we know that the array bounds sanitizing will catch any out-of-
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ diff --git a/build/config/rust.gni b/build/config/rust.gni
index bd18d13..e260576 100644
--- a/build/config/rust.gni
+++ b/build/config/rust.gni
@@ -102,6 +102,11 @@
# * Fixing pre-existing violations of `clippy` lints (crbug.com/472355480)
# * Deciding on a policy (e.g. which trybots can/should cover `clippy`)
enable_rust_clippy = false
@@ -121,6 +121,11 @@
# `fail_hard=False` when invoking `build_crubit.py` from
# `tools/rust/build_rust.py`).
enable_cpp_api_from_rust = false
+
+ # Override the vendor part of the Rust target triple (with a leading dash)
+ # used for building target code (not host code). Leave empty to use the
Expand All @@ -42,7 +42,7 @@ index bd18d13..e260576 100644
}

declare_args() {
@@ -193,12 +198,19 @@
@@ -212,12 +217,19 @@
# other toolchains.
rust_abi_target = ""
if (is_linux || is_chromeos) {
Expand All @@ -65,7 +65,7 @@ index bd18d13..e260576 100644
} else if (current_cpu == "arm") {
if (arm_float_abi == "hard") {
float_suffix = "hf"
@@ -206,31 +218,21 @@
@@ -225,31 +237,21 @@
float_suffix = ""
}
if (arm_arch == "armv7-a" || arm_arch == "armv7") {
Expand Down Expand Up @@ -124,7 +124,7 @@ diff --git a/build/rust/gni_impl/rustc_wrapper.py b/build/rust/gni_impl/rustc_wr
index 8f2096d..de43d44 100755
--- a/build/rust/gni_impl/rustc_wrapper.py
+++ b/build/rust/gni_impl/rustc_wrapper.py
@@ -250,6 +250,7 @@ def main():
@@ -288,6 +288,7 @@ def main():
rustc_args = remaining_args[:ldflags_separator]
ldflags = remaining_args[ldflags_separator + 1:rustenv_separator]
rustenv = remaining_args[rustenv_separator + 1:sources_separator]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ diff --git a/chrome/browser/ui/views/frame/layout/browser_view_layout.h b/chrome
index 493d444..99621d9 100644
--- a/chrome/browser/ui/views/frame/layout/browser_view_layout.h
+++ b/chrome/browser/ui/views/frame/layout/browser_view_layout.h
@@ -93,7 +93,7 @@
@@ -95,7 +95,7 @@
// very small window, even on large monitors (which is why a minimum height is
// not specified). This value is used for the main browser window only, not
// for popups.
- static constexpr int kMainBrowserContentsMinimumWidth = 500;
+ static constexpr int kMainBrowserContentsMinimumWidth = 480;

BrowserViewLayout(const BrowserViewLayout&) = delete;
BrowserViewLayout& operator=(const BrowserViewLayout&) = delete;
// The minimum width of the contents area itself. Applies even when side
// panels are open and prevents zero or negative contents sizes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
Taken from http://www.slackware.com/~alien/slackbuilds/chromium/build/patches/chromium146_backport-Remove-now-obsolete-invalid-patch-on-bytemuck-v1.patch

Upstream-Status: Inappropriate [rust version specific]

diff --git a/third_party/rust/chromium_crates_io/patches/bytemuck-v1/0101-Ad-hoc-bytemuck-fix-for-https-crbug.com-480176523.patch b/third_party/rust/chromium_crates_io/patches/bytemuck-v1/0101-Ad-hoc-bytemuck-fix-for-https-crbug.com-480176523.patch
deleted file mode 100644
index d5df20dd..0000000
--- a/third_party/rust/chromium_crates_io/patches/bytemuck-v1/0101-Ad-hoc-bytemuck-fix-for-https-crbug.com-480176523.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 98355e3039f4677b19d1358a207f5ae646b935bb Mon Sep 17 00:00:00 2001
-From: Lukasz Anforowicz <lukasza@chromium.org>
-Date: Fri, 30 Jan 2026 23:30:50 +0000
-Subject: [PATCH] Ad-hoc `bytemuck` fix for https://crbug.com/480176523.
-
-TODO: Remove this patch from `chromium_crates_io/patches` after
-rolling `bytemuck` past the actual fix from
-https://github.com/Lokathor/bytemuck/pull/344
----
- .../rust/chromium_crates_io/vendor/bytemuck-v1/src/pod.rs | 1 -
- .../rust/chromium_crates_io/vendor/bytemuck-v1/src/zeroable.rs | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/pod.rs b/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/pod.rs
-index 846f281d975c7..3aaee72a26e85 100644
---- a/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/pod.rs
-+++ b/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/pod.rs
-@@ -151,7 +151,6 @@ impl_unsafe_marker_for_simd!(
- unsafe impl<T, const N: usize> Pod for core::simd::Simd<T, N>
- where
- T: core::simd::SimdElement + Pod,
-- core::simd::LaneCount<N>: core::simd::SupportedLaneCount,
- {
- }
-
-diff --git a/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/zeroable.rs b/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/zeroable.rs
-index d88ba0f6636d0..b0f3b8aca0b08 100644
---- a/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/zeroable.rs
-+++ b/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/zeroable.rs
-@@ -230,7 +230,6 @@ impl_unsafe_marker_for_simd!(
- unsafe impl<T, const N: usize> Zeroable for core::simd::Simd<T, N>
- where
- T: core::simd::SimdElement + Zeroable,
-- core::simd::LaneCount<N>: core::simd::SupportedLaneCount,
- {
- }
-
---
-2.53.0.rc1.225.gd81095ad13-goog
-
diff --git a/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/pod.rs b/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/pod.rs
index b039792..330f722 100644
--- a/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/pod.rs
+++ b/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/pod.rs
@@ -152,6 +152,7 @@
unsafe impl<T, const N: usize> Pod for core::simd::Simd<T, N>
where
T: core::simd::SimdElement + Pod,
+ core::simd::LaneCount<N>: core::simd::SupportedLaneCount,
{
}

diff --git a/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/zeroable.rs b/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/zeroable.rs
index 397ddde..186c567 100644
--- a/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/zeroable.rs
+++ b/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/zeroable.rs
@@ -231,6 +231,7 @@
unsafe impl<T, const N: usize> Zeroable for core::simd::Simd<T, N>
where
T: core::simd::SimdElement + Zeroable,
+ core::simd::LaneCount<N>: core::simd::SupportedLaneCount,
{
}

1 change: 0 additions & 1 deletion meta-chromium/recipes-browser/chromium/gn_git.bbappend

This file was deleted.