Skip to content

Commit 5fb9fb7

Browse files
licy183licy183
authored
chromium-beta-host-tools: bump to 143.0.7499.4 (#2021)
1 parent 4f5e323 commit 5fb9fb7

18 files changed

+1105
-759
lines changed

‎tur/chromium-beta-host-tools/build.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.chromium.org/Home
22
TERMUX_PKG_DESCRIPTION="Chromium web browser (Host tools)"
33
TERMUX_PKG_LICENSE="BSD 3-Clause"
44
TERMUX_PKG_MAINTAINER="@licy183"
5-
TERMUX_PKG_VERSION=142.0.7444.52
5+
TERMUX_PKG_VERSION=143.0.7499.4
66
TERMUX_PKG_SRCURL=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$TERMUX_PKG_VERSION.tar.xz
7-
TERMUX_PKG_SHA256=053c12ba6d0899d91ddb498268449f9f858e3b19a884f82396ab4fd9c0df24cc
7+
TERMUX_PKG_SHA256=7be0c051bbd1f9b9a965bf617dbf2d65414a62c681dad5d248e69495d136325e
88
TERMUX_PKG_DEPENDS="atk, cups, dbus, fontconfig, gtk3, krb5, libc++, libevdev, libxkbcommon, libminizip, libnss, libx11, mesa, openssl, pango, pulseaudio, zlib"
99
TERMUX_PKG_BUILD_DEPENDS="libffi-static"
1010
# TODO: Split chromium-common and chromium-headless

‎tur/chromium-beta-host-tools/cr-patches/2021-libsync-android.patch‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- a/third_party/libsync/src/include/ndk/sync.h
2+
+++ b/third_party/libsync/src/include/ndk/sync.h
3+
@@ -32,7 +32,7 @@
4+
5+
__BEGIN_DECLS
6+
7+
-#if __ANDROID_API__ >= __ANDROID_API_O__
8+
+#if __ANDROID_API__ >= __ANDROID_API_O__ || defined(__TERMUX__)
9+
10+
/* Fences indicate the status of an asynchronous task. They are initially
11+
* in unsignaled state (0), and make a one-time transition to either signaled

‎tur/chromium-beta-host-tools/cr-patches/6001-bugfix-net_cookies_cookie_util.cc.patch‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
--- a/net/cookies/cookie_util.cc
2+
+++ b/net/cookies/cookie_util.cc
3+
@@ -841,7 +841,7 @@
4+
5+
void ParseRequestCookieLine(std::string_view header_value,
6+
ParsedRequestCookies* parsed_cookies) {
7+
- std::string::const_iterator i = header_value.begin();
8+
+ std::string_view::const_iterator i = header_value.begin();
9+
while (i != header_value.end()) {
10+
// Here we are at the beginning of a cookie.
11+
12+
@@ -850,7 +850,7 @@
13+
if (i == header_value.end()) return;
14+
15+
// Find cookie name.
16+
- std::string::const_iterator cookie_name_beginning = i;
17+
+ std::string_view::const_iterator cookie_name_beginning = i;
18+
while (i != header_value.end() && *i != '=') ++i;
19+
auto cookie_name = std::string_view(cookie_name_beginning, i);
20+
21+
@@ -859,7 +859,7 @@
22+
// Cookies may have no value, in this case '=' may or may not be there.
23+
if (i != header_value.end() && i + 1 != header_value.end()) {
24+
++i; // Skip '='.
25+
- std::string::const_iterator cookie_value_beginning = i;
26+
+ std::string_view::const_iterator cookie_value_beginning = i;
27+
if (*i == '"') {
28+
++i; // Skip '"'.
29+
while (i != header_value.end() && *i != '"') ++i;

‎tur/chromium-beta-host-tools/cr-patches/7002-polyfill-atomic_ref.patch‎

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
- //services/device/public/cpp/generic_sensor/sensor_reading_shared_buffer_reader.cc
1010
- //services/device/generic_sensor/platform_sensor.cc
1111
- //v8/src/utils/memcopy.h
12+
- //v8/src/base/atomicops.h
1213

1314
--- a/third_party/termux-polyfill/__termux_header_only_atomic_ref_polyfill.h
1415
+++ b/third_party/termux-polyfill/__termux_header_only_atomic_ref_polyfill.h
@@ -980,3 +981,128 @@ index 6f39e15f88..6cb29b4f02 100644
980981
}
981982
}
982983

984+
--- a/v8/src/base/atomicops.h
985+
+++ b/v8/src/base/atomicops.h
986+
@@ -12,6 +12,15 @@
987+
#include "src/base/base-export.h"
988+
#include "src/base/macros.h"
989+
990+
+#ifdef __TERMUX__
991+
+#include "third_party/termux-polyfill/__termux_header_only_atomic_ref_polyfill.h"
992+
+template <typename T>
993+
+using __my_atomic_ref = Foo::atomic_ref<T>;
994+
+#else
995+
+template <typename T>
996+
+using __my_atomic_ref = std::atomic_ref<T>;
997+
+#endif
998+
+
999+
#if defined(V8_OS_STARBOARD)
1000+
#include "starboard/atomic.h"
1001+
#endif // V8_OS_STARBOARD
1002+
@@ -78,7 +87,7 @@
1003+
inline std::type_identity_t<T> Relaxed_CompareAndSwap(
1004+
T* ptr, std::type_identity_t<T> old_value,
1005+
std::type_identity_t<T> new_value) {
1006+
- std::atomic_ref<T>(*ptr).compare_exchange_strong(old_value, new_value,
1007+
+ __my_atomic_ref<T>(*ptr).compare_exchange_strong(old_value, new_value,
1008+
std::memory_order_relaxed);
1009+
return old_value;
1010+
}
1011+
@@ -87,7 +96,7 @@
1012+
inline std::type_identity_t<T> AcquireRelease_CompareAndSwap(
1013+
T* ptr, std::type_identity_t<T> old_value,
1014+
std::type_identity_t<T> new_value) {
1015+
- std::atomic_ref<T>(*ptr).compare_exchange_strong(old_value, new_value,
1016+
+ __my_atomic_ref<T>(*ptr).compare_exchange_strong(old_value, new_value,
1017+
std::memory_order_acq_rel,
1018+
std::memory_order_acquire);
1019+
return old_value;
1020+
@@ -97,7 +106,7 @@
1021+
inline std::type_identity_t<T> Release_CompareAndSwap(
1022+
T* ptr, std::type_identity_t<T> old_value,
1023+
std::type_identity_t<T> new_value) {
1024+
- std::atomic_ref<T>(*ptr).compare_exchange_strong(old_value, new_value,
1025+
+ __my_atomic_ref<T>(*ptr).compare_exchange_strong(old_value, new_value,
1026+
std::memory_order_release,
1027+
std::memory_order_relaxed);
1028+
return old_value;
1029+
@@ -107,7 +116,7 @@
1030+
inline std::type_identity_t<T> SeqCst_CompareAndSwap(
1031+
T* ptr, std::type_identity_t<T> old_value,
1032+
std::type_identity_t<T> new_value) {
1033+
- std::atomic_ref<T>(*ptr).compare_exchange_strong(old_value, new_value,
1034+
+ __my_atomic_ref<T>(*ptr).compare_exchange_strong(old_value, new_value,
1035+
std::memory_order_seq_cst,
1036+
std::memory_order_seq_cst);
1037+
return old_value;
1038+
@@ -116,60 +125,60 @@
1039+
template <AtomicTypeForTrivialOperations T>
1040+
inline std::type_identity_t<T> Relaxed_AtomicExchange(
1041+
T* ptr, std::type_identity_t<T> new_value) {
1042+
- return std::atomic_ref<T>(*ptr).exchange(new_value,
1043+
+ return __my_atomic_ref<T>(*ptr).exchange(new_value,
1044+
std::memory_order_relaxed);
1045+
}
1046+
1047+
template <AtomicTypeForTrivialOperations T>
1048+
inline std::type_identity_t<T> SeqCst_AtomicExchange(
1049+
T* ptr, std::type_identity_t<T> new_value) {
1050+
- return std::atomic_ref<T>(*ptr).exchange(new_value,
1051+
+ return __my_atomic_ref<T>(*ptr).exchange(new_value,
1052+
std::memory_order_seq_cst);
1053+
}
1054+
1055+
template <AtomicTypeForTrivialOperations T>
1056+
inline std::type_identity_t<T> Relaxed_FetchOr(T* ptr,
1057+
std::type_identity_t<T> bits) {
1058+
- return std::atomic_ref<T>(*ptr).fetch_or(bits, std::memory_order_relaxed);
1059+
+ return __my_atomic_ref<T>(*ptr).fetch_or(bits, std::memory_order_relaxed);
1060+
}
1061+
1062+
template <AtomicTypeForTrivialOperations T>
1063+
inline std::type_identity_t<T> Relaxed_AtomicIncrement(
1064+
T* ptr, std::type_identity_t<T> increment) {
1065+
- return increment + std::atomic_ref<T>(*ptr).fetch_add(
1066+
+ return increment + __my_atomic_ref<T>(*ptr).fetch_add(
1067+
increment, std::memory_order_relaxed);
1068+
}
1069+
1070+
template <AtomicTypeForTrivialOperations T>
1071+
inline void Relaxed_Store(T* ptr, std::type_identity_t<T> value) {
1072+
- std::atomic_ref<T>(*ptr).store(value, std::memory_order_relaxed);
1073+
+ __my_atomic_ref<T>(*ptr).store(value, std::memory_order_relaxed);
1074+
}
1075+
1076+
template <AtomicTypeForTrivialOperations T>
1077+
inline void Release_Store(T* ptr, std::type_identity_t<T> value) {
1078+
- std::atomic_ref<T>(*ptr).store(value, std::memory_order_release);
1079+
+ __my_atomic_ref<T>(*ptr).store(value, std::memory_order_release);
1080+
}
1081+
1082+
template <AtomicTypeForTrivialOperations T>
1083+
inline void SeqCst_Store(T* ptr, std::type_identity_t<T> value) {
1084+
- std::atomic_ref<T>(*ptr).store(value, std::memory_order_seq_cst);
1085+
+ __my_atomic_ref<T>(*ptr).store(value, std::memory_order_seq_cst);
1086+
}
1087+
1088+
template <AtomicTypeForTrivialOperations T>
1089+
inline T Relaxed_Load(const T* ptr) {
1090+
- return std::atomic_ref<T>(*const_cast<T*>(ptr))
1091+
+ return __my_atomic_ref<T>(*const_cast<T*>(ptr))
1092+
.load(std::memory_order_relaxed);
1093+
}
1094+
1095+
template <AtomicTypeForTrivialOperations T>
1096+
inline T Acquire_Load(const T* ptr) {
1097+
- return std::atomic_ref<T>(*const_cast<T*>(ptr))
1098+
+ return __my_atomic_ref<T>(*const_cast<T*>(ptr))
1099+
.load(std::memory_order_acquire);
1100+
}
1101+
1102+
template <AtomicTypeForTrivialOperations T>
1103+
inline T SeqCst_Load(const T* ptr) {
1104+
- return std::atomic_ref<T>(*const_cast<T*>(ptr))
1105+
+ return __my_atomic_ref<T>(*const_cast<T*>(ptr))
1106+
.load(std::memory_order_seq_cst);
1107+
}
1108+

‎tur/chromium-beta-host-tools/jumbo-patches/0101-group-base.patch‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,3 +404,26 @@ index 9f18a00af5..870c7dbae4 100644
404404

405405
defines = [ "VIZ_SERVICE_IMPLEMENTATION" ]
406406

407+
diff --git a/cc/metrics/scroll_jank_v4_histogram_emitter.cc b/cc/metrics/scroll_jank_v4_histogram_emitter.cc
408+
index cbb688f8a2..64b5aedb8d 100644
409+
--- a/cc/metrics/scroll_jank_v4_histogram_emitter.cc
410+
+++ b/cc/metrics/scroll_jank_v4_histogram_emitter.cc
411+
@@ -17,6 +17,10 @@
412+
#include "cc/metrics/event_metrics.h"
413+
#include "cc/metrics/scroll_jank_dropped_frame_tracker.h"
414+
415+
+#define kVsyncCountsMin kVsyncCountsMin_ScrollJankV4HistogramEmitter
416+
+#define kVsyncCountsMax kVsyncCountsMax_ScrollJankV4HistogramEmitter
417+
+#define kVsyncCountsBuckets kVsyncCountsBuckets_ScrollJankV4HistogramEmitter
418+
+
419+
namespace cc {
420+
421+
namespace {
422+
@@ -167,3 +171,7 @@ void ScrollJankV4HistogramEmitter::EmitPerScrollHistogramsAndResetCounters() {
423+
}
424+
425+
} // namespace cc
426+
+
427+
+#undef kVsyncCountsMin
428+
+#undef kVsyncCountsMax
429+
+#undef kVsyncCountsBuckets

‎tur/chromium-beta-host-tools/jumbo-patches/0102-group-crypto.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,15 +160,15 @@ diff --git a/google_apis/BUILD.gn b/google_apis/BUILD.gn
160160
index 6ae1463..603f821 100644
161161
--- a/google_apis/BUILD.gn
162162
+++ b/google_apis/BUILD.gn
163-
@@ -5,6 +5,7 @@
163+
@@ -4,6 +4,7 @@
164+
164165
import("//build/buildflag_header.gni")
165166
import("//build/config/chrome_build.gni")
166-
import("//build/config/features.gni")
167167
+import("//build/config/jumbo.gni")
168168
import("//extensions/buildflags/buildflags.gni")
169169
import("//google_apis/config.gni")
170170
import("//testing/test.gni")
171-
@@ -94,7 +95,7 @@ config("key_defines") {
171+
@@ -93,7 +94,7 @@
172172
}
173173
}
174174

‎tur/chromium-beta-host-tools/jumbo-patches/0103-net.patch‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -831,3 +831,22 @@ index 270cbfcf40..19f5805390 100644
831831
} // namespace net
832832
+
833833
+#undef TaskRunner
834+
diff --git a/net/disk_cache/sql/sql_backend_impl.cc b/net/disk_cache/sql/sql_backend_impl.cc
835+
index 73ab379a2b..a8f23eece0 100644
836+
--- a/net/disk_cache/sql/sql_backend_impl.cc
837+
+++ b/net/disk_cache/sql/sql_backend_impl.cc
838+
@@ -33,6 +33,8 @@
839+
#include "net/disk_cache/sql/sql_persistent_store.h"
840+
#include "sql_backend_constants.h"
841+
842+
+#define IsBrowserIdle IsBrowserIdle_SqlBackendImpl
843+
+
844+
namespace disk_cache {
845+
namespace {
846+
847+
@@ -1417,3 +1419,5 @@ SqlBackendImpl::InFlightEntryModification::InFlightEntryModification(
848+
InFlightEntryModification&&) = default;
849+
850+
} // namespace disk_cache
851+
+
852+
+#undef IsBrowserIdle

‎tur/chromium-beta-host-tools/jumbo-patches/0104-v8.patch‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -978,3 +978,29 @@ index ddf3b81c7a..f6548579c7 100644
978978
+#undef TRACE
979979
+
980980
} // namespace v8::internal::maglev
981+
diff --git a/v8/BUILD.gn b/v8/BUILD.gn
982+
index d91aea71f1..fe232e23b4 100644
983+
--- a/v8/BUILD.gn
984+
+++ b/v8/BUILD.gn
985+
@@ -5344,6 +5344,10 @@ if (!v8_enable_maglev) {
986+
"src/maglev/maglev-phi-representation-selector.cc",
987+
"src/maglev/maglev-truncation.cc",
988+
]
989+
+ v8_compiler_sources_jumbo_excluded += [
990+
+ # call to 'DestructivelyIntersect' is ambiguous
991+
+ "src/maglev/maglev-known-node-aspects.cc",
992+
+ ]
993+
}
994+
995+
if (v8_current_cpu == "x86") {
996+
@@ -6112,6 +6116,10 @@ v8_source_set("v8_base_without_compiler") {
997+
"src/maglev/maglev-truncation.cc",
998+
"src/maglev/maglev.cc",
999+
]
1000+
+ jumbo_excluded_sources += [
1001+
+ # call to 'DestructivelyIntersect' is ambiguous
1002+
+ "src/maglev/maglev-known-node-aspects.cc",
1003+
+ ]
1004+
if (v8_current_cpu == "arm") {
1005+
sources += [
1006+
"src/maglev/arm/maglev-assembler-arm.cc",

‎tur/chromium-beta-host-tools/jumbo-patches/0106-blink-and-mojo.patch‎

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,9 +316,9 @@ index 87b3bbe9ae..d3d7f411fa 100644
316316
# found in the LICENSE file.
317317

318318
+import("//build/config/jumbo.gni")
319+
import("//mojo/public/tools/bindings/mojom_rust.gni")
319320
import("//third_party/closure_compiler/closure_args.gni")
320321
import("//third_party/closure_compiler/compile_js.gni")
321-
import("//third_party/protobuf/proto_library.gni")
322322
@@ -1029,7 +1030,7 @@ template("mojom") {
323323
}
324324

@@ -3664,10 +3664,10 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/re
36643664
index 589dd18b99..d65ab808e7 100644
36653665
--- a/third_party/blink/renderer/platform/BUILD.gn
36663666
+++ b/third_party/blink/renderer/platform/BUILD.gn
3667-
@@ -7,6 +7,7 @@ import("//build/buildflag_header.gni")
3667+
@@ -6,6 +6,7 @@
3668+
import("//build/buildflag_header.gni")
36683669
import("//build/compiled_action.gni")
36693670
import("//build/config/compiler/compiler.gni")
3670-
import("//build/config/features.gni")
36713671
+import("//build/config/jumbo.gni")
36723672
import("//build/config/ui.gni")
36733673
import("//build/nocompile.gni")
@@ -4767,3 +4767,33 @@ index d7ec050e88..609a531b26 100644
47674767
+#endif
47684768
+
47694769
#endif // THIRD_PARTY_BLINK_RENDERER_PLATFORM_WTF_VECTOR_H_
4770+
diff --git a/third_party/blink/renderer/platform/wtf/text/atomic_string.h b/third_party/blink/renderer/platform/wtf/text/atomic_string.h
4771+
index 0d4bfa601d..f3c82b3d8e 100644
4772+
--- a/third_party/blink/renderer/platform/wtf/text/atomic_string.h
4773+
+++ b/third_party/blink/renderer/platform/wtf/text/atomic_string.h
4774+
@@ -326,3 +326,6 @@ WTF_ALLOW_MOVE_INIT_AND_COMPARE_WITH_MEM_FUNCTIONS(blink::AtomicString)
4775+
4776+
#include "third_party/blink/renderer/platform/wtf/text/string_operators_atomic.h"
4777+
#endif // THIRD_PARTY_BLINK_RENDERER_PLATFORM_WTF_TEXT_ATOMIC_STRING_H_
4778+
+
4779+
+// FIXME: Where exactly did Google forget to include this file?
4780+
+#include "third_party/blink/renderer/platform/wtf/text/atomic_string_hash.h"
4781+
diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_transport/rtc_transport.cc b/third_party/blink/renderer/modules/peerconnection/rtc_transport/rtc_transport.cc
4782+
index 3ebe4bb745..fba0084cb1 100644
4783+
--- a/third_party/blink/renderer/modules/peerconnection/rtc_transport/rtc_transport.cc
4784+
+++ b/third_party/blink/renderer/modules/peerconnection/rtc_transport/rtc_transport.cc
4785+
@@ -37,6 +37,8 @@
4786+
#include "third_party/webrtc/pc/ice_server_parsing.h"
4787+
#include "third_party/webrtc/rtc_base/rtc_certificate_generator.h"
4788+
4789+
+#define kMaxDigestSize kMaxDigestSize_RtcTransport
4790+
+
4791+
namespace blink {
4792+
namespace {
4793+
// Maximum known size (SHA-512). See
4794+
@@ -548,3 +550,5 @@ void RtcTransport::Dispose() {
4795+
}
4796+
4797+
} // namespace blink
4798+
+
4799+
+#undef kMaxDigestSize

0 commit comments

Comments
 (0)