82 lines
3.8 KiB
Diff
82 lines
3.8 KiB
Diff
diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
|
|
--- chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding 2023-05-11 03:36:27.000000000 +0200
|
|
+++ chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc 2023-05-14 11:49:42.558129164 +0200
|
|
@@ -238,7 +238,10 @@ const NGLayoutResult* NGGridLayoutAlgori
|
|
: BuildGridSizingTree(&oof_children);
|
|
|
|
LayoutUnit intrinsic_block_size;
|
|
- auto& [grid_items, layout_data, tree_size] = grid_sizing_tree.TreeRootData();
|
|
+ auto& [g_i, l_d, t_s] = grid_sizing_tree.TreeRootData();
|
|
+ auto& grid_items = g_i;
|
|
+ auto& layout_data = l_d;
|
|
+ auto& tree_size = t_s;
|
|
|
|
if (IsBreakInside(BreakToken())) {
|
|
// TODO(layout-dev): When we support variable inline-size fragments we'll
|
|
@@ -520,8 +523,10 @@ wtf_size_t NGGridLayoutAlgorithm::BuildG
|
|
row_auto_repetitions);
|
|
|
|
bool has_nested_subgrid = false;
|
|
- auto& [grid_items, layout_data, subtree_size] =
|
|
- sizing_tree->CreateSizingData(opt_subgrid_data);
|
|
+ auto& [g_i, l_d, s_s] = sizing_tree->CreateSizingData(opt_subgrid_data);
|
|
+ auto& grid_items = g_i;
|
|
+ auto& layout_data = l_d;
|
|
+ auto& subtree_size = s_s;
|
|
|
|
if (!must_ignore_children) {
|
|
// Construct grid items that are not subgridded.
|
|
@@ -650,8 +655,10 @@ NGGridSizingTree NGGridLayoutAlgorithm::
|
|
NGGridSizingTree sizing_tree;
|
|
|
|
if (const auto* layout_subtree = ConstraintSpace().GridLayoutSubtree()) {
|
|
- auto& [grid_items, layout_data, subtree_size] =
|
|
- sizing_tree.CreateSizingData();
|
|
+ auto& [g_i, l_d, s_s] = sizing_tree.CreateSizingData();
|
|
+ auto& grid_items = g_i;
|
|
+ auto& layout_data = l_d;
|
|
+ auto& subtree_size = s_s;
|
|
|
|
const auto& node = Node();
|
|
grid_items =
|
|
@@ -1640,8 +1647,10 @@ void NGGridLayoutAlgorithm::InitializeTr
|
|
const absl::optional<GridTrackSizingDirection>& opt_track_direction) const {
|
|
DCHECK(sizing_subtree);
|
|
|
|
- auto& [grid_items, layout_data, subtree_size] =
|
|
- sizing_subtree.SubtreeRootData();
|
|
+ auto& [g_i, l_d, s_s] = sizing_subtree.SubtreeRootData();
|
|
+ auto& grid_items = g_i;
|
|
+ auto& layout_data = l_d;
|
|
+ auto& subtree_size = s_s;
|
|
|
|
auto InitAndCacheTrackSizes = [&](GridTrackSizingDirection track_direction) {
|
|
InitializeTrackCollection(opt_subgrid_data, track_direction, &layout_data);
|
|
@@ -1825,8 +1834,10 @@ void NGGridLayoutAlgorithm::CompleteTrac
|
|
bool* opt_needs_additional_pass) const {
|
|
DCHECK(sizing_subtree);
|
|
|
|
- auto& [grid_items, layout_data, subtree_size] =
|
|
- sizing_subtree.SubtreeRootData();
|
|
+ auto& [g_i, l_d, s_s] = sizing_subtree.SubtreeRootData();
|
|
+ auto& grid_items = g_i;
|
|
+ auto& layout_data = l_d;
|
|
+ auto& subtree_size = s_s;
|
|
|
|
const bool is_for_columns = track_direction == kForColumns;
|
|
const bool has_non_definite_track =
|
|
diff -up chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc.me chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc
|
|
--- chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc.me 2023-05-14 17:35:00.446844465 +0200
|
|
+++ chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc 2023-05-14 17:39:22.991733926 +0200
|
|
@@ -94,7 +94,9 @@ void CdmPromiseAdapter::RejectPromise(ui
|
|
void CdmPromiseAdapter::Clear(ClearReason reason) {
|
|
// Reject all outstanding promises.
|
|
DCHECK(thread_checker_.CalledOnValidThread());
|
|
- for (auto& [promise_id, promise] : promises_) {
|
|
+ for (auto& [p_i, p_e] : promises_) {
|
|
+ auto& promise_id = p_i;
|
|
+ auto& promise = p_e;
|
|
TRACE_EVENT_NESTABLE_ASYNC_END1(
|
|
"media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise_id),
|
|
"status", "cleared");
|