Skip to content

Commit d5ed574

Browse files
committed
chromium-stable: bump to 138.0.7204.157
1 parent 0c5a44f commit d5ed574

11 files changed

+143
-84
lines changed

tur-chromium/chromium-stable/0001-compiler-use-android-target.patch

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,24 @@
11
--- a/build/config/compiler/BUILD.gn
22
+++ b/build/config/compiler/BUILD.gn
3-
@@ -1242,8 +1242,8 @@
3+
@@ -1233,7 +1233,7 @@
4+
# simplicity we always explicitly set the architecture.
5+
if (current_cpu == "x64") {
6+
if (is_clang && !is_android && !is_nacl && !is_fuchsia &&
7+
- !is_chromeos_device) {
8+
+ !is_chromeos_device && false) {
9+
cflags += [ "--target=x86_64-unknown-linux-gnu" ]
10+
ldflags += [ "--target=x86_64-unknown-linux-gnu" ]
11+
} else {
12+
@@ -1242,7 +1242,7 @@
13+
}
14+
cflags += [ "-msse3" ]
15+
} else if (current_cpu == "x86") {
16+
- if (is_clang && !is_android && !is_nacl && !is_chromeos_device) {
17+
+ if (is_clang && !is_android && !is_nacl && !is_chromeos_device && false) {
18+
cflags += [ "--target=i386-unknown-linux-gnu" ]
19+
ldflags += [ "--target=i386-unknown-linux-gnu" ]
20+
} else {
21+
@@ -1257,8 +1257,8 @@
422
}
523
} else if (current_cpu == "arm") {
624
if (is_clang && !is_android && !is_nacl && !is_chromeos_device) {
@@ -11,7 +29,7 @@
1129
}
1230
if (!is_nacl) {
1331
cflags += [
14-
@@ -1257,8 +1257,8 @@
32+
@@ -1272,8 +1272,8 @@
1533
} else if (current_cpu == "arm64") {
1634
if (is_clang && !is_android && !is_nacl && !is_fuchsia &&
1735
!is_chromeos_device) {

tur-chromium/chromium-stable/0005-compiler-custom-rust-abi-target-triple.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,25 @@
99
if (is_android) {
1010
import("//build/config/android/config.gni")
1111
}
12-
@@ -98,6 +100,8 @@
12+
@@ -95,6 +97,8 @@
1313
# a platform. Mostly applicable to Windows, where new versions can handle ANSI
1414
# escape sequences but it's not reliable in general.
1515
force_rustc_color_output = false
1616
+
1717
+ custom_target_rust_abi_target = ""
1818
}
1919

20-
# Use a separate declare_args so these variables' defaults can depend on the
21-
@@ -165,7 +169,7 @@
22-
# TODO(crbug.com/1278030): To build unit tests for Android we need to build
20+
declare_args() {
21+
@@ -155,7 +159,7 @@
22+
# TODO(crbug.com/40809974): To build unit tests for Android we need to build
2323
# them as a dylib and put them into an APK. We should reuse all the same logic
2424
# for gtests from the `//testing/test:test` template.
2525
-can_build_rust_unit_tests = toolchain_has_rust && !is_android
2626
+can_build_rust_unit_tests = toolchain_has_rust && !is_android && false
2727

2828
# We want to store rust_sysroot as a source-relative variable for ninja
2929
# portability. In practice if an external toolchain was specified, it might
30-
@@ -280,6 +284,12 @@
30+
@@ -373,6 +377,12 @@
3131
}
3232
}
3333

@@ -37,6 +37,6 @@
3737
+ }
3838
+}
3939
+
40-
assert(!toolchain_has_rust || rust_abi_target != "")
40+
if (toolchain_has_rust) {
41+
assert(rust_abi_target != "")
4142

42-
# This variable is passed to the Rust libstd build.

tur-chromium/chromium-stable/0006-iwyu-opener_heuristic_utils.patch

Lines changed: 0 additions & 14 deletions
This file was deleted.

tur-chromium/chromium-stable/0007-iwyu-disruptive_notification_permissions_manager.patch

Lines changed: 0 additions & 12 deletions
This file was deleted.

tur-chromium/chromium-stable/1001-chromium-disable-sandbox.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
// web security by setting the kWebKitWebSecurityEnabled pref directly.
7373
--- a/content/shell/browser/shell_content_browser_client.cc
7474
+++ b/content/shell/browser/shell_content_browser_client.cc
75-
@@ -140,6 +140,10 @@
75+
@@ -141,6 +141,10 @@
7676
#include "media/mojo/services/media_foundation_preferences.h"
7777
#endif // BUILDFLAG(IS_WIN)
7878

@@ -83,13 +83,13 @@
8383
namespace content {
8484

8585
namespace {
86-
@@ -448,6 +452,9 @@
87-
// to shell_main.cc that it's a browser test.
88-
switches::kBrowserTest,
86+
@@ -451,6 +455,9 @@
87+
// to shell_main.cc that it's a browser test.
88+
switches::kBrowserTest,
8989
#endif
9090
+#ifdef __TERMUX__
91-
+ sandbox::policy::switches::kNoSandbox
91+
+ sandbox::policy::switches::kNoSandbox
9292
+#endif
93-
switches::kCrashDumpsDir,
94-
switches::kEnableCrashReporter,
95-
switches::kExposeInternalsForTesting,
93+
switches::kCrashDumpsDir,
94+
switches::kEnableCrashReporter,
95+
switches::kExposeInternalsForTesting,
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
--- a/chrome/browser/ui/startup/infobar_utils.cc
22
+++ b/chrome/browser/ui/startup/infobar_utils.cc
3-
@@ -154,7 +154,11 @@
4-
infobars::ContentInfoBarManager* infobar_manager =
5-
infobars::ContentInfoBarManager::FromWebContents(web_contents);
3+
@@ -171,7 +171,11 @@
4+
infobars::ContentInfoBarManager* infobar_manager =
5+
infobars::ContentInfoBarManager::FromWebContents(web_contents);
66

77
+#ifdef __TERMUX__
88
+ if (0) {
99
+#else
10-
if (!google_apis::HasAPIKeyConfigured()) {
10+
if (!google_apis::HasAPIKeyConfigured()) {
1111
+#endif
12-
GoogleApiKeysInfoBarDelegate::Create(infobar_manager);
13-
}
12+
GoogleApiKeysInfoBarDelegate::Create(infobar_manager);
13+
}
1414

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
--- a/ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc
2-
+++ b/ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc
3-
@@ -22,6 +22,11 @@
4-
#include "ui/ozone/platform/wayland/host/wayland_seat.h"
5-
#include "ui/ozone/platform/wayland/host/wayland_window.h"
1+
--- a/components/exo/wayland/zwp_text_input_manager.cc
2+
+++ b/components/exo/wayland/zwp_text_input_manager.cc
3+
@@ -33,6 +33,11 @@
4+
#include "ui/events/keycodes/dom/keycode_converter.h"
5+
#include "ui/events/ozone/layout/xkb/xkb_modifier_converter.h"
66

7-
+#if defined __ANDROID__ && __ANDROID_API__ < 30
7+
+#if defined(__ANDROID__) && __ANDROID_API__ < 30
88
+#include <sys/syscall.h>
99
+#define memfd_create(name,flags) syscall(SYS_memfd_create,name,flags)
1010
+#endif
1111
+
12-
namespace ui {
13-
namespace {
12+
namespace exo {
13+
namespace wayland {
1414

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
https://github.com/chromium/chromium/commit/574a7eb053a0ca3ae94872a0cac72e0ba76ecd6d
2+
3+
--- a/third_party/blink/renderer/core/html/forms/select_mutation_observer.h
4+
+++ b/third_party/blink/renderer/core/html/forms/select_mutation_observer.h
5+
@@ -2,6 +2,9 @@
6+
// Use of this source code is governed by a BSD-style license that can be
7+
// found in the LICENSE file.
8+
9+
+#ifndef THIRD_PARTY_BLINK_RENDERER_CORE_HTML_FORMS_SELECT_MUTATION_OBSERVER_H_
10+
+#define THIRD_PARTY_BLINK_RENDERER_CORE_HTML_FORMS_SELECT_MUTATION_OBSERVER_H_
11+
+
12+
#include "third_party/blink/renderer/core/dom/mutation_observer.h"
13+
#include "third_party/blink/renderer/core/html/forms/html_select_element.h"
14+
#include "third_party/blink/renderer/core/inspector/inspector_audits_issue.h"
15+
@@ -56,3 +59,5 @@ class SelectMutationObserver : public MutationObserver::Delegate {
16+
};
17+
18+
} // namespace blink
19+
+
20+
+#endif // THIRD_PARTY_BLINK_RENDERER_CORE_HTML_FORMS_SELECT_MUTATION_OBSERVER_H_

tur-chromium/chromium-stable/7005-polyfill-atomic_ref.patch

Lines changed: 52 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -702,33 +702,60 @@
702702
#if SIMDUTF_FEATURE_BASE64
703703
// We include base64_tables once.
704704
/* begin file src/tables/base64_tables.h */
705-
@@ -18410,7 +18421,7 @@
706-
#if SIMDUTF_ATOMIC_REF
707-
size_t atomic_binary_to_base64(const char *input, size_t length, char *output,
708-
base64_options options) noexcept {
709-
- static_assert(std::atomic_ref<char>::required_alignment == 1);
710-
+ static_assert(__my_atomic_ref<char>::required_alignment == 1);
711-
size_t retval = 0;
712-
// Arbitrary block sizes: 3KB for input, 4KB for output. Total is 7KB.
713-
constexpr size_t input_block_size = 1024 * 3;
714-
@@ -18430,7 +18441,7 @@
715-
// Under x64, we could use 16-byte aligned loads.
716-
// Note that we warn users that the performance might be poor.
717-
for (size_t j = 0; j < current_block_size; ++j) {
718-
- inbuf[j] = std::atomic_ref<char>(mutable_input[i + j])
719-
+ inbuf[j] = __my_atomic_ref<char>(mutable_input[i + j])
720-
.load(std::memory_order_relaxed);
705+
@@ -16160,7 +16171,7 @@
706+
// This function is a memcpy that uses atomic operations to read from the
707+
// source.
708+
inline void memcpy_atomic_read(char *dst, const char *src, size_t len) {
709+
- static_assert(std::atomic_ref<char>::required_alignment == sizeof(char),
710+
+ static_assert(__my_atomic_ref<char>::required_alignment == sizeof(char),
711+
"std::atomic_ref requires the same alignment as char_type");
712+
// We expect all 64-bit systems to be able to read 64-bit words from an
713+
// aligned memory region atomically. You might be able to do better on
714+
@@ -16173,7 +16184,7 @@
715+
char *mutable_src = const_cast<char *>(bytesrc);
716+
for (size_t j = 0; j < bytelen; ++j) {
717+
bytedst[j] =
718+
- std::atomic_ref<char>(mutable_src[j]).load(std::memory_order_relaxed);
719+
+ __my_atomic_ref<char>(mutable_src[j]).load(std::memory_order_relaxed);
721720
}
722-
const size_t written = binary_to_base64(inbuf.data(), current_block_size,
723-
@@ -18438,7 +18449,7 @@
724-
// This copy is inefficient.
725-
// Under x64, we could use 16-byte aligned stores.
726-
for (size_t j = 0; j < written; ++j) {
727-
- std::atomic_ref<char>(output[retval + j])
728-
+ __my_atomic_ref<char>(output[retval + j])
729-
.store(outbuf[j], std::memory_order_relaxed);
721+
};
722+
723+
@@ -16191,7 +16202,7 @@
724+
while (len >= alignment) {
725+
auto *src_aligned = reinterpret_cast<uint64_t *>(const_cast<char *>(src));
726+
const auto dst_value =
727+
- std::atomic_ref<uint64_t>(*src_aligned).load(std::memory_order_relaxed);
728+
+ __my_atomic_ref<uint64_t>(*src_aligned).load(std::memory_order_relaxed);
729+
std::memcpy(dst, &dst_value, sizeof(uint64_t));
730+
src += alignment;
731+
dst += alignment;
732+
@@ -16207,7 +16218,7 @@
733+
// This function is a memcpy that uses atomic operations to write to the
734+
// destination.
735+
inline void memcpy_atomic_write(char *dst, const char *src, size_t len) {
736+
- static_assert(std::atomic_ref<char>::required_alignment == sizeof(char),
737+
+ static_assert(__my_atomic_ref<char>::required_alignment == sizeof(char),
738+
"std::atomic_ref requires the same alignment as char");
739+
// We expect all 64-bit systems to be able to write 64-bit words to an aligned
740+
// memory region atomically.
741+
@@ -16219,7 +16230,7 @@
742+
auto bbb_memcpy_atomic_write = [](char *bytedst, const char *bytesrc,
743+
size_t bytelen) noexcept {
744+
for (size_t j = 0; j < bytelen; ++j) {
745+
- std::atomic_ref<char>(bytedst[j])
746+
+ __my_atomic_ref<char>(bytedst[j])
747+
.store(bytesrc[j], std::memory_order_relaxed);
730748
}
731-
retval += written;
749+
};
750+
@@ -16239,7 +16250,7 @@
751+
auto *dst_aligned = reinterpret_cast<uint64_t *>(dst);
752+
uint64_t src_val;
753+
std::memcpy(&src_val, src, sizeof(uint64_t)); // Non-atomic read from src
754+
- std::atomic_ref<uint64_t>(*dst_aligned)
755+
+ __my_atomic_ref<uint64_t>(*dst_aligned)
756+
.store(src_val, std::memory_order_relaxed);
757+
dst += alignment;
758+
src += alignment;
732759
--- a/v8/src/objects/simd.cc
733760
+++ b/v8/src/objects/simd.cc
734761
@@ -32,6 +32,15 @@
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
--- a/third_party/pdfium/core/fxcrt/span.h
2+
+++ b/third_party/pdfium/core/fxcrt/span.h
3+
@@ -791,7 +791,7 @@
4+
template <typename OtherElementType,
5+
size_t OtherExtent,
6+
typename OtherInternalPtrType>
7+
- requires((OtherExtent == dynamic_extent || extent == OtherExtent) &&
8+
+ requires((OtherExtent == dynamic_extent || Extent == OtherExtent) &&
9+
std::equality_comparable_with<const element_type,
10+
const OtherElementType>)
11+
friend constexpr bool operator==(
12+
@@ -826,7 +826,7 @@
13+
template <typename OtherElementType,
14+
size_t OtherExtent,
15+
typename OtherInternalPtrType>
16+
- requires((OtherExtent == dynamic_extent || extent == OtherExtent) &&
17+
+ requires((OtherExtent == dynamic_extent || Extent == OtherExtent) &&
18+
std::three_way_comparable_with<const element_type,
19+
const OtherElementType>)
20+
friend constexpr auto operator<=>(

0 commit comments

Comments
 (0)