зеркало из https://github.com/electron/electron.git
chore: update patches
This commit is contained in:
Keeley Hammond
Родитель
19a69aed2a
Коммит
b85e623b90
|
|
@ -1,7 +1,7 @@
|
|||
From 56be91796b858a088f67add4e074b9b016f25757 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Kent Tamura <tkent@chromium.org>
|
||||
Date: Thu, 19 Sep 2024 03:15:18 +0000
|
||||
Subject: [PATCH] RubyLB: Fix a crash with a parent with a non-default text-align
|
||||
Subject: RubyLB: Fix a crash with a parent with a non-default text-align
|
||||
|
||||
Update the LineInfo::GetTextAlign() logic so that it align with
|
||||
ApplyRubyAlign() behavior.
|
||||
|
|
@ -15,13 +15,12 @@ Commit-Queue: Koji Ishii <kojii@chromium.org>
|
|||
Reviewed-by: Koji Ishii <kojii@chromium.org>
|
||||
Auto-Submit: Kent Tamura <tkent@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/main@{#1357460}
|
||||
---
|
||||
|
||||
diff --git a/third_party/blink/renderer/core/layout/inline/line_info.cc b/third_party/blink/renderer/core/layout/inline/line_info.cc
|
||||
index 402e48a..ec44514 100644
|
||||
index fc28f58c4d8c8e510e7ed13f978694a16f6dd1f8..b5e11b9d269d8942f1e4478251d67f5a9919ebce 100644
|
||||
--- a/third_party/blink/renderer/core/layout/inline/line_info.cc
|
||||
+++ b/third_party/blink/renderer/core/layout/inline/line_info.cc
|
||||
@@ -114,14 +114,25 @@
|
||||
@@ -88,14 +88,25 @@ void LineInfo::SetLineStyle(const InlineNode& node,
|
||||
}
|
||||
|
||||
ETextAlign LineInfo::GetTextAlign(bool is_last_line) const {
|
||||
|
|
@ -54,7 +53,7 @@ index 402e48a..ec44514 100644
|
|||
}
|
||||
diff --git a/third_party/blink/web_tests/fast/ruby/ruby-align-in-text-align-crash.html b/third_party/blink/web_tests/fast/ruby/ruby-align-in-text-align-crash.html
|
||||
new file mode 100644
|
||||
index 0000000..b456709
|
||||
index 0000000000000000000000000000000000000000..b4567097d39ede1f66bb84f0b00519896fd03a18
|
||||
--- /dev/null
|
||||
+++ b/third_party/blink/web_tests/fast/ruby/ruby-align-in-text-align-crash.html
|
||||
@@ -0,0 +1,18 @@
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From c333ed99544992f66e6e03621fa938d75ad01f70 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Ken Rockot <rockot@google.com>
|
||||
Date: Mon, 23 Sep 2024 19:26:24 +0000
|
||||
Subject: [PATCH] ipcz: Validate link state fragment before adoption
|
||||
Subject: ipcz: Validate link state fragment before adoption
|
||||
|
||||
Fixed: 368208152
|
||||
Change-Id: I0e2ece4b0857b225d229134b2e55abc3e08348ee
|
||||
|
|
@ -9,13 +9,12 @@ Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5876623
|
|||
Commit-Queue: Ken Rockot <rockot@google.com>
|
||||
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/main@{#1358968}
|
||||
---
|
||||
|
||||
diff --git a/third_party/ipcz/src/ipcz/node_link.cc b/third_party/ipcz/src/ipcz/node_link.cc
|
||||
index e862cf40..dde90c9 100644
|
||||
index 8c378b1ad4d6b06b4d4e80fc99483edea043dde9..ed8d13fe801baed07d50e7458f55e5c0c2e18ccb 100644
|
||||
--- a/third_party/ipcz/src/ipcz/node_link.cc
|
||||
+++ b/third_party/ipcz/src/ipcz/node_link.cc
|
||||
@@ -36,21 +36,6 @@
|
||||
@@ -37,21 +37,6 @@
|
||||
|
||||
namespace ipcz {
|
||||
|
||||
|
|
@ -37,33 +36,33 @@ index e862cf40..dde90c9 100644
|
|||
// static
|
||||
Ref<NodeLink> NodeLink::CreateActive(Ref<Node> node,
|
||||
LinkSide link_side,
|
||||
@@ -714,8 +699,8 @@
|
||||
@@ -703,8 +688,8 @@ bool NodeLink::OnAcceptBypassLink(msg::AcceptBypassLink& accept) {
|
||||
return true;
|
||||
}
|
||||
|
||||
- auto link_state = MaybeAdoptFragmentRef<RouterLinkState>(
|
||||
- memory(), accept.v0()->new_link_state_fragment);
|
||||
- memory(), accept.params().new_link_state_fragment);
|
||||
+ auto link_state = memory().AdoptFragmentRefIfValid<RouterLinkState>(
|
||||
+ accept.v0()->new_link_state_fragment);
|
||||
+ accept.params().new_link_state_fragment);
|
||||
if (link_state.is_null()) {
|
||||
// Bypass links must always come with a valid fragment for their
|
||||
// RouterLinkState. If one has not been provided, that's a validation
|
||||
@@ -753,8 +738,8 @@
|
||||
@@ -746,8 +731,8 @@ bool NodeLink::OnBypassPeerWithLink(msg::BypassPeerWithLink& bypass) {
|
||||
return true;
|
||||
}
|
||||
|
||||
- auto link_state = MaybeAdoptFragmentRef<RouterLinkState>(
|
||||
- memory(), bypass.v0()->new_link_state_fragment);
|
||||
- memory(), bypass.params().new_link_state_fragment);
|
||||
+ auto link_state = memory().AdoptFragmentRefIfValid<RouterLinkState>(
|
||||
+ bypass.v0()->new_link_state_fragment);
|
||||
+ bypass.params().new_link_state_fragment);
|
||||
if (link_state.is_null()) {
|
||||
return false;
|
||||
}
|
||||
diff --git a/third_party/ipcz/src/ipcz/node_link_memory.h b/third_party/ipcz/src/ipcz/node_link_memory.h
|
||||
index c5e3d64..f457757 100644
|
||||
index df8010b595fdecea8959d2277da22ec734728e43..ba04a7c03da0d7f0bb5424b858a1bea7801ab9b4 100644
|
||||
--- a/third_party/ipcz/src/ipcz/node_link_memory.h
|
||||
+++ b/third_party/ipcz/src/ipcz/node_link_memory.h
|
||||
@@ -98,14 +98,29 @@
|
||||
@@ -86,14 +86,29 @@ class NodeLinkMemory : public RefCounted<NodeLinkMemory> {
|
||||
// with the same BufferId and dimensions as `descriptor`.
|
||||
Fragment GetFragment(const FragmentDescriptor& descriptor);
|
||||
|
||||
|
|
@ -96,10 +95,10 @@ index c5e3d64..f457757 100644
|
|||
// allocation capacity for blocks of size `block_size`. Note that the
|
||||
// contents of the mapped region must already be initialized as a
|
||||
diff --git a/third_party/ipcz/src/ipcz/node_link_memory_test.cc b/third_party/ipcz/src/ipcz/node_link_memory_test.cc
|
||||
index bcdd45e..fd51b78 100644
|
||||
index 8a515c1fa5bf2b49067f8538a3e7d08a0d859a4b..2f8cdd38d4f9a3cfbcb9570104748e9887647463 100644
|
||||
--- a/third_party/ipcz/src/ipcz/node_link_memory_test.cc
|
||||
+++ b/third_party/ipcz/src/ipcz/node_link_memory_test.cc
|
||||
@@ -306,5 +306,54 @@
|
||||
@@ -303,5 +303,54 @@ TEST_F(NodeLinkMemoryTest, ParcelDataAllocation) {
|
||||
node_c->Close();
|
||||
}
|
||||
|
||||
|
|
@ -155,10 +154,10 @@ index bcdd45e..fd51b78 100644
|
|||
} // namespace
|
||||
} // namespace ipcz
|
||||
diff --git a/third_party/ipcz/src/ipcz/router.cc b/third_party/ipcz/src/ipcz/router.cc
|
||||
index 820fafe..a2c65331 100644
|
||||
index 79c443d942c6613ea8a52990b93c1811e2d3d166..b1dc593427ecae67b6758edd82257f88daefcde1 100644
|
||||
--- a/third_party/ipcz/src/ipcz/router.cc
|
||||
+++ b/third_party/ipcz/src/ipcz/router.cc
|
||||
@@ -745,12 +745,16 @@
|
||||
@@ -765,12 +765,16 @@ Ref<Router> Router::Deserialize(const RouterDescriptor& descriptor,
|
||||
? descriptor.decaying_incoming_sequence_length
|
||||
: descriptor.next_incoming_sequence_number);
|
||||
|
||||
|
|
@ -170,12 +169,12 @@ index 820fafe..a2c65331 100644
|
|||
+ return nullptr;
|
||||
+ }
|
||||
new_outward_link = from_node_link.AddRemoteRouterLink(
|
||||
- descriptor.new_sublink,
|
||||
- context, descriptor.new_sublink,
|
||||
- from_node_link.memory().AdoptFragmentRef<RouterLinkState>(
|
||||
- from_node_link.memory().GetFragment(
|
||||
- descriptor.new_link_state_fragment)),
|
||||
- LinkType::kCentral, LinkSide::kB, router);
|
||||
+ descriptor.new_sublink, std::move(link_state), LinkType::kCentral,
|
||||
+ context, descriptor.new_sublink, std::move(link_state), LinkType::kCentral,
|
||||
+ LinkSide::kB, router);
|
||||
if (!new_outward_link) {
|
||||
return nullptr;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,10 @@
|
|||
From a7766feb0a9062a4bb75431fa4dcff4062af1442 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Igor Sheludko <ishell@chromium.org>
|
||||
Date: Tue, 24 Sep 2024 18:20:18 +0000
|
||||
Subject: [PATCH] Revert "[maps] Re-enable side-step transitions"
|
||||
Subject: Revert "[maps] Re-enable side-step transitions"
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This reverts commit 62605e134c758be5148d8d7b2541122835006155.
|
||||
|
||||
|
|
@ -27,18 +30,19 @@ Commit-Queue: Clemens Backes <clemensb@chromium.org>
|
|||
Reviewed-by: Clemens Backes <clemensb@chromium.org>
|
||||
Commit-Queue: Igor Sheludko <ishell@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/main@{#96265}
|
||||
---
|
||||
|
||||
diff --git a/src/flags/flag-definitions.h b/src/flags/flag-definitions.h
|
||||
index 25c8d41..dfdf5ed 100644
|
||||
index 470c596abed95bc3e391c890d2caedd2b1d33036..2e6af9dda620542e369aa89f91b48dbc7af4a986 100644
|
||||
--- a/src/flags/flag-definitions.h
|
||||
+++ b/src/flags/flag-definitions.h
|
||||
@@ -2514,7 +2514,7 @@
|
||||
@@ -2285,6 +2285,10 @@ DEFINE_BOOL_READONLY(fast_map_update, false,
|
||||
"enable fast map update by caching the migration target")
|
||||
DEFINE_INT(max_valid_polymorphic_map_count, 4,
|
||||
"maximum number of valid maps to track in POLYMORPHIC state")
|
||||
DEFINE_BOOL(
|
||||
- clone_object_sidestep_transitions, true,
|
||||
+DEFINE_BOOL(
|
||||
+ clone_object_sidestep_transitions, false,
|
||||
"support sidestep transitions for dependency tracking object clone maps")
|
||||
DEFINE_WEAK_IMPLICATION(future, clone_object_sidestep_transitions)
|
||||
+ "support sidestep transitions for dependency tracking object clone maps")
|
||||
+DEFINE_WEAK_IMPLICATION(future, clone_object_sidestep_transitions)
|
||||
|
||||
// map-inl.h
|
||||
DEFINE_INT(fast_properties_soft_limit, 12,
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче