blob: 1c501f0b192d462b30cab16f430bb56eaa76c79d (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
--- third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.orig 2023-10-13 13:20:35 UTC
+++ third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
@@ -3452,7 +3452,13 @@ void NGGridLayoutAlgorithm::PlaceGridItems(
DCHECK(out_row_break_between);
const auto& container_space = ConstraintSpace();
+#if defined(__clang__) && (__clang_major__ >= 16)
const auto& [grid_items, layout_data, tree_size] = sizing_tree.TreeRootData();
+#else
+ const auto& [g_i, l_d, t_s] = sizing_tree.TreeRootData();
+ const auto& grid_items = g_i;
+ const auto& layout_data = l_d;
+#endif
const auto* cached_layout_subtree = container_space.GridLayoutSubtree();
const auto container_writing_direction =
@@ -3616,7 +3622,13 @@ void NGGridLayoutAlgorithm::PlaceGridItemsForFragmenta
// TODO(ikilpatrick): Update |SetHasSeenAllChildren| and early exit if true.
const auto& constraint_space = ConstraintSpace();
+#if defined(__clang__) && (__clang_major__ >= 16)
const auto& [grid_items, layout_data, tree_size] = sizing_tree.TreeRootData();
+#else
+ const auto& [g_i, l_d, t_s] = sizing_tree.TreeRootData();
+ const auto& grid_items = g_i;
+ const auto& layout_data = l_d;
+#endif
const auto* cached_layout_subtree = constraint_space.GridLayoutSubtree();
const auto container_writing_direction =
|
