-
Notifications
You must be signed in to change notification settings - Fork 194
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Release notes:
https://chromereleases.googleblog.com/2024/01/stable-channel-update-for-desktop_23.html
https://chromereleases.googleblog.com/2024/01/stable-channel-update-for-desktop_30.html
https://chromereleases.googleblog.com/2024/02/stable-channel-update-for-desktop.html
https://chromereleases.googleblog.com/2024/02/stable-channel-update-for-desktop_13.html
Build and patch changes:
------------------------
Drop five backported patches that are included upstream now, and add one
new backport.
Drop arm/0002-Fix-ARM-build-with-recent-glibc.patch as
https://crrev.com/c/5035139 includes an equivalent patch.
Add 0019-Don-t-require-profiler_builtins.rlib.patch to fix a build error
when using OE master.
Rebase and renumber remaining patches.
License changes:
----------------
Added licenses:
* third_party/lit/LICENSE
- https://chromium-review.googlesource.com/c/chromium/src/+/5046161
Removed licenses:
* base/third_party/xdg_mime/LICENSE
- https://chromium-review.googlesource.com/c/chromium/src/+/4996430
* native_client/LICENSE
- not sure which change caused this, but we don't use NativeClient anyways
Updated licenses:
* third_party/libxml/src/Copyright
- https://chromium-review.googlesource.com/c/chromium/src/+/4985186
Test-built:
-----------
* chromium-ozone-wayland:
- nanbield, clang, MACHINE=qemuarm64
* chromium-x11:
- master, clang, MACHINE=qemuarm
Signed-off-by: Max Ihlenfeldt <[email protected]>- Loading branch information
1 parent
0fcfadc
commit 12df687
Showing
37 changed files
with
346 additions
and
995 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,10 +21,10 @@ Rebased-by: Randy MacLeod <[email protected]> | |
| 1 file changed, 38 deletions(-) | ||
|
|
||
| diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn | ||
| index 80bc79e..beeb116 100644 | ||
| index de1cd6e..38b8167 100644 | ||
| --- a/build/config/compiler/BUILD.gn | ||
| +++ b/build/config/compiler/BUILD.gn | ||
| @@ -1173,11 +1173,6 @@ config("compiler_cpu_abi") { | ||
| @@ -1175,11 +1175,6 @@ config("compiler_cpu_abi") { | ||
| ] | ||
| } | ||
| } else if (current_cpu == "arm") { | ||
|
|
@@ -36,7 +36,7 @@ index 80bc79e..beeb116 100644 | |
| if (!is_nacl) { | ||
| cflags += [ | ||
| "-march=$arm_arch", | ||
| @@ -1187,12 +1182,6 @@ config("compiler_cpu_abi") { | ||
| @@ -1189,12 +1184,6 @@ config("compiler_cpu_abi") { | ||
| if (arm_tune != "") { | ||
| cflags += [ "-mtune=$arm_tune" ] | ||
| } | ||
|
|
@@ -49,7 +49,7 @@ index 80bc79e..beeb116 100644 | |
| } else if (current_cpu == "mipsel" && !is_nacl) { | ||
| ldflags += [ "-Wl,--hash-style=sysv" ] | ||
| if (custom_toolchain == "") { | ||
| @@ -1200,9 +1189,6 @@ config("compiler_cpu_abi") { | ||
| @@ -1202,9 +1191,6 @@ config("compiler_cpu_abi") { | ||
| if (is_android) { | ||
| cflags += [ "--target=mipsel-linux-android" ] | ||
| ldflags += [ "--target=mipsel-linux-android" ] | ||
|
|
@@ -59,7 +59,7 @@ index 80bc79e..beeb116 100644 | |
| } | ||
| } else { | ||
| cflags += [ "-EL" ] | ||
| @@ -1282,8 +1268,6 @@ config("compiler_cpu_abi") { | ||
| @@ -1284,8 +1270,6 @@ config("compiler_cpu_abi") { | ||
| ldflags += [ "-Wl,--hash-style=sysv" ] | ||
| if (custom_toolchain == "") { | ||
| if (is_clang) { | ||
|
|
@@ -68,7 +68,7 @@ index 80bc79e..beeb116 100644 | |
| } else { | ||
| cflags += [ "-EB" ] | ||
| ldflags += [ "-EB" ] | ||
| @@ -1331,9 +1315,6 @@ config("compiler_cpu_abi") { | ||
| @@ -1333,9 +1317,6 @@ config("compiler_cpu_abi") { | ||
| if (is_android) { | ||
| cflags += [ "--target=mips64el-linux-android" ] | ||
| ldflags += [ "--target=mips64el-linux-android" ] | ||
|
|
@@ -78,7 +78,7 @@ index 80bc79e..beeb116 100644 | |
| } | ||
| } else { | ||
| cflags += [ | ||
| @@ -1391,8 +1372,6 @@ config("compiler_cpu_abi") { | ||
| @@ -1393,8 +1374,6 @@ config("compiler_cpu_abi") { | ||
| ldflags += [ "-Wl,--hash-style=sysv" ] | ||
| if (custom_toolchain == "") { | ||
| if (is_clang) { | ||
|
|
@@ -87,7 +87,7 @@ index 80bc79e..beeb116 100644 | |
| } else { | ||
| cflags += [ | ||
| "-EB", | ||
| @@ -1555,23 +1534,6 @@ config("compiler_deterministic") { | ||
| @@ -1557,23 +1536,6 @@ config("compiler_deterministic") { | ||
| } | ||
| } | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,10 +13,10 @@ Signed-off-by: Randy MacLeod <[email protected]> | |
| 1 file changed, 5 insertions(+) | ||
|
|
||
| diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn | ||
| index beeb116..c19ac04 100644 | ||
| index 38b8167..93c9bfc 100644 | ||
| --- a/build/config/compiler/BUILD.gn | ||
| +++ b/build/config/compiler/BUILD.gn | ||
| @@ -1817,6 +1817,11 @@ config("default_warnings") { | ||
| @@ -1819,6 +1819,11 @@ config("default_warnings") { | ||
| cflags += [ | ||
| "-Wenum-compare-conditional", | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,10 +18,10 @@ Signed-off-by: Randy MacLeod <[email protected]> | |
| 2 files changed, 4 insertions(+) | ||
|
|
||
| diff --git a/base/BUILD.gn b/base/BUILD.gn | ||
| index 24f2397..b716e48 100644 | ||
| index 3d538b3..a7f353b 100644 | ||
| --- a/base/BUILD.gn | ||
| +++ b/base/BUILD.gn | ||
| @@ -1105,7 +1105,9 @@ component("base") { | ||
| @@ -1098,7 +1098,9 @@ component("base") { | ||
| # Needed for <atomic> if using newer C++ library than sysroot, except if | ||
| # building inside the cros_sdk environment - use host_toolchain as a | ||
| # more robust check for this. | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,7 +18,7 @@ Signed-off-by: Max Ihlenfeldt <[email protected]> | |
| 1 file changed, 25 deletions(-) | ||
|
|
||
| diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn | ||
| index 80bc79e..715bffc 100644 | ||
| index 93c9bfc..94e40fa 100644 | ||
| --- a/build/config/compiler/BUILD.gn | ||
| +++ b/build/config/compiler/BUILD.gn | ||
| @@ -616,24 +616,6 @@ config("compiler") { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,10 +16,10 @@ Signed-off-by: Max Ihlenfeldt <[email protected]> | |
| 3 files changed, 12 insertions(+), 7 deletions(-) | ||
|
|
||
| diff --git a/content/browser/service_worker/service_worker_context_wrapper.cc b/content/browser/service_worker/service_worker_context_wrapper.cc | ||
| index 36e307e..2bdbb60 100644 | ||
| index 630b04c..8f2b834 100644 | ||
| --- a/content/browser/service_worker/service_worker_context_wrapper.cc | ||
| +++ b/content/browser/service_worker/service_worker_context_wrapper.cc | ||
| @@ -1456,9 +1456,10 @@ void ServiceWorkerContextWrapper::MaybeProcessPendingWarmUpRequest() { | ||
| @@ -1473,9 +1473,10 @@ void ServiceWorkerContextWrapper::MaybeProcessPendingWarmUpRequest() { | ||
| auto [document_url, key, callback] = std::move(*request); | ||
|
|
||
| DCHECK(document_url.is_valid()); | ||
|
|
@@ -32,7 +32,7 @@ index 36e307e..2bdbb60 100644 | |
| context_core_->registry()->FindRegistrationForClientUrl( | ||
| ServiceWorkerRegistry::Purpose::kNotForNavigation, | ||
| diff --git a/media/base/cdm_promise_adapter.cc b/media/base/cdm_promise_adapter.cc | ||
| index f013809a..144809b 100644 | ||
| index f013809..144809b 100644 | ||
| --- a/media/base/cdm_promise_adapter.cc | ||
| +++ b/media/base/cdm_promise_adapter.cc | ||
| @@ -94,12 +94,12 @@ void CdmPromiseAdapter::RejectPromise(uint32_t promise_id, | ||
|
|
@@ -53,24 +53,24 @@ index f013809a..144809b 100644 | |
| promises_.clear(); | ||
| } | ||
| diff --git a/third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc b/third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc | ||
| index 6091eade..95db975 100644 | ||
| index 33deaeb..3b283c6 100644 | ||
| --- a/third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc | ||
| +++ b/third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc | ||
| @@ -3447,7 +3447,9 @@ void GridLayoutAlgorithm::PlaceGridItems( | ||
| @@ -3527,7 +3527,9 @@ void GridLayoutAlgorithm::PlaceGridItems( | ||
| DCHECK(out_row_break_between); | ||
|
|
||
| const auto& container_space = ConstraintSpace(); | ||
| const auto& container_space = GetConstraintSpace(); | ||
| - const auto& [grid_items, layout_data, tree_size] = sizing_tree.TreeRootData(); | ||
| + const auto& grid_items = sizing_tree.TreeRootData().grid_items; | ||
| + const auto& layout_data = sizing_tree.TreeRootData().layout_data; | ||
| + const auto& tree_size = sizing_tree.TreeRootData().subtree_size; | ||
|
|
||
| const auto* cached_layout_subtree = container_space.GetGridLayoutSubtree(); | ||
| const auto container_writing_direction = | ||
| @@ -3611,7 +3613,9 @@ void GridLayoutAlgorithm::PlaceGridItemsForFragmentation( | ||
| @@ -3691,7 +3693,9 @@ void GridLayoutAlgorithm::PlaceGridItemsForFragmentation( | ||
|
|
||
| // TODO(ikilpatrick): Update |SetHasSeenAllChildren| and early exit if true. | ||
| const auto& constraint_space = ConstraintSpace(); | ||
| const auto& constraint_space = GetConstraintSpace(); | ||
| - const auto& [grid_items, layout_data, tree_size] = sizing_tree.TreeRootData(); | ||
| + const auto& grid_items = sizing_tree.TreeRootData().grid_items; | ||
| + const auto& layout_data = sizing_tree.TreeRootData().layout_data; | ||
|
|
||
Oops, something went wrong.