File chromium-114-workaround_clang_bug-structured_binding.patch of Package chromium-ffmpeg-extra (Revision b30401c0254353da4e772a68807e8dc6)

Currently displaying revision b30401c0254353da4e772a68807e8dc6 , Show latest

82
 
1
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
2
--- 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
3
+++ 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
4
@@ -238,7 +238,10 @@ const NGLayoutResult* NGGridLayoutAlgori
5
                               : BuildGridSizingTree(&oof_children);
6
7
   LayoutUnit intrinsic_block_size;
8
-  auto& [grid_items, layout_data, tree_size] = grid_sizing_tree.TreeRootData();
9
+  auto& [g_i, l_d, t_s] = grid_sizing_tree.TreeRootData();
10
+  auto& grid_items = g_i;
11
+  auto& layout_data = l_d;
12
+  auto& tree_size = t_s;
13
14
   if (IsBreakInside(BreakToken())) {
15
     // TODO(layout-dev): When we support variable inline-size fragments we'll
16
@@ -520,8 +523,10 @@ wtf_size_t NGGridLayoutAlgorithm::BuildG
17
                                 row_auto_repetitions);
18
19
   bool has_nested_subgrid = false;
20
-  auto& [grid_items, layout_data, subtree_size] =
21
-      sizing_tree->CreateSizingData(opt_subgrid_data);
22
+  auto& [g_i, l_d, s_s] = sizing_tree->CreateSizingData(opt_subgrid_data);
23
+  auto& grid_items = g_i;
24
+  auto& layout_data = l_d;
25
+  auto& subtree_size = s_s;
26
27
   if (!must_ignore_children) {
28
     // Construct grid items that are not subgridded.
29
@@ -650,8 +655,10 @@ NGGridSizingTree NGGridLayoutAlgorithm::
30
   NGGridSizingTree sizing_tree;
31
32
   if (const auto* layout_subtree = ConstraintSpace().GridLayoutSubtree()) {
33
-    auto& [grid_items, layout_data, subtree_size] =
34
-        sizing_tree.CreateSizingData();
35
+    auto& [g_i, l_d, s_s] = sizing_tree.CreateSizingData();
36
+    auto& grid_items = g_i;
37
+    auto& layout_data = l_d;
38
+    auto& subtree_size = s_s;
39
40
     const auto& node = Node();
41
     grid_items =
42
@@ -1640,8 +1647,10 @@ void NGGridLayoutAlgorithm::InitializeTr
43
     const absl::optional<GridTrackSizingDirection>& opt_track_direction) const {
44
   DCHECK(sizing_subtree);
45
46
-  auto& [grid_items, layout_data, subtree_size] =
47
-      sizing_subtree.SubtreeRootData();
48
+  auto& [g_i, l_d, s_s] = sizing_subtree.SubtreeRootData();
49
+  auto& grid_items = g_i;
50
+  auto& layout_data = l_d;
51
+  auto& subtree_size = s_s;
52
53
   auto InitAndCacheTrackSizes = [&](GridTrackSizingDirection track_direction) {
54
     InitializeTrackCollection(opt_subgrid_data, track_direction, &layout_data);
55
@@ -1825,8 +1834,10 @@ void NGGridLayoutAlgorithm::CompleteTrac
56
     bool* opt_needs_additional_pass) const {
57
   DCHECK(sizing_subtree);
58
59
-  auto& [grid_items, layout_data, subtree_size] =
60
-      sizing_subtree.SubtreeRootData();
61
+  auto& [g_i, l_d, s_s] = sizing_subtree.SubtreeRootData();
62
+  auto& grid_items = g_i;
63
+  auto& layout_data = l_d;
64
+  auto& subtree_size = s_s;
65
66
   const bool is_for_columns = track_direction == kForColumns;
67
   const bool has_non_definite_track =
68
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
69
--- chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc.me 2023-05-14 17:35:00.446844465 +0200
70
+++ chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc    2023-05-14 17:39:22.991733926 +0200
71
@@ -94,7 +94,9 @@ void CdmPromiseAdapter::RejectPromise(ui
72
 void CdmPromiseAdapter::Clear(ClearReason reason) {
73
   // Reject all outstanding promises.
74
   DCHECK(thread_checker_.CalledOnValidThread());
75
-  for (auto& [promise_id, promise] : promises_) {
76
+  for (auto& [p_i, p_e] : promises_) {
77
+    auto& promise_id = p_i;
78
+    auto& promise = p_e;
79
     TRACE_EVENT_NESTABLE_ASYNC_END1(
80
         "media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise_id),
81
         "status", "cleared");
82
​
Locations
Help
Contact