Neva main rolling 7680 adaptation#31
Merged
Vanya-PIP merged 3 commits intoneva-main-rolling-7680from Feb 27, 2026
Merged
Conversation
…to 146.0.7680.0~1
Conflicts:
cc/trees/layer_tree_host_impl.cc
components/BUILD.gn
components/history_clusters/core/history_clusters_debug_jsons.cc
ui/ozone/public/ozone_platform.cc
//cc/trees/layer_tree_host_impl.cc
Trivial conflict after the upstream CL https://crrev.com/c/7544038 where
fixed some unsafe code and added "}" bracket at the end of "if" section.
//components/BUILD.gn
Trivial conflict after the upstream CL https://crrev.com/c/7551252 where
excluded enterprise connectors from Fuchsia builds.
//components/history_clusters/core/history_clusters_debug_jsons.cc
Trivial conflict after the upstream CL https://crrev.com/c/7546329 where
was cleaned up unused function. Neva GCC workaround removed as no more
needed.
//ui/ozone/public/ozone_platform.cc
Trivial conflict after the upstream CL https://crrev.com/c/7546965 where
introduced a static function to determine if ozone is wayland in test.
Issue: NEVA-11057
In the upstream CL https://crrev.com/c/7546757 added basic tests for MessagePipeWatcher. Neva doesn't support Rust, therefore, Mojo Rust tests is disabled to avoid configuration error: ERROR at //build/rust/gni_impl/rust_target.gni:43:3: Assertion failed. assert(enable_rust) ^----- See //build/rust/rust_static_library.gni:221:3: whence it was called. rust_target(_target_name) { ^-------------------------- See //mojo/public/rust/sequences/BUILD.gn:7:1: whence it was called. rust_static_library("sequences") { ^--------------------------------- See //mojo/public/rust/BUILD.gn:14:5: which caused the file to be included. "sequences" Issues: NEVA-11057
…nfigurable" The Neva patch "Make v8 heap constraints configurable" applies successfully but due to the new upstream v8 CL https://chromium-review.googlesource.com/c/v8/v8/+/7546727, which is rolled into Chromium in https://crrev.com/c/7558095 there are the errors: ../../v8/src/heap/heap-controller.cc:343:21: error: too few arguments to function call, expected 2, have 1 342 | MemoryController<V8HeapTrait>::MinimumAllocationLimitGrowingStep( | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 343 | mode)); So the patch is updated to use the MinimumAllocationLimitGrowingStep() in heap-controller.cc correctly with the updated v8 version. Issues: NEVA-11057
d7fe24b to
92b4686
Compare
Vanya-PIP
approved these changes
Feb 25, 2026
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.