Skip to content

Neva main rolling 7680 adaptation#31

Merged
Vanya-PIP merged 3 commits intoneva-main-rolling-7680from
neva-main-rolling-7680-adaptation
Feb 27, 2026
Merged

Neva main rolling 7680 adaptation#31
Vanya-PIP merged 3 commits intoneva-main-rolling-7680from
neva-main-rolling-7680-adaptation

Conversation

@denisBechin
Copy link

No description provided.

…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
@denisBechin denisBechin force-pushed the neva-main-rolling-7680-adaptation branch from d7fe24b to 92b4686 Compare February 25, 2026 19:04
Copy link

@ygrec ygrec left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Vanya-PIP Vanya-PIP merged commit f410a68 into neva-main-rolling-7680 Feb 27, 2026
4 of 10 checks passed
@Vanya-PIP Vanya-PIP deleted the neva-main-rolling-7680-adaptation branch February 27, 2026 06:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants