52 lines
3.0 KiB
Diff
52 lines
3.0 KiB
Diff
diff -up chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc.workaround_clang_bug-structured_binding chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc
|
|
--- chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc.workaround_clang_bug-structured_binding 2023-06-07 21:48:37.000000000 +0200
|
|
+++ chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc 2023-06-17 16:53:20.216628557 +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");
|
|
diff -up chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc.me chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc
|
|
--- chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc.me 2023-06-19 08:04:02.287072722 +0200
|
|
+++ chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc 2023-06-19 08:18:24.576814950 +0200
|
|
@@ -1393,7 +1393,8 @@ void ServiceWorkerContextWrapper::MaybeP
|
|
return;
|
|
}
|
|
|
|
- auto [document_url, key, callback] = std::move(*request);
|
|
+ auto [d_u, key, callback] = std::move(*request);
|
|
+ auto document_url = d_u;
|
|
|
|
DCHECK(document_url.is_valid());
|
|
TRACE_EVENT1("ServiceWorker",
|
|
diff -up chromium-120.0.6099.56/third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc.me chromium-120.0.6099.56/third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc
|
|
--- chromium-120.0.6099.56/third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc.me 2023-12-03 22:17:50.922083200 +0100
|
|
+++ chromium-120.0.6099.56/third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc 2023-12-03 22:22:55.437484343 +0100
|
|
@@ -3447,7 +3447,8 @@ void GridLayoutAlgorithm::PlaceGridItems
|
|
DCHECK(out_row_break_between);
|
|
|
|
const auto& container_space = ConstraintSpace();
|
|
- const auto& [grid_items, layout_data, tree_size] = sizing_tree.TreeRootData();
|
|
+ const auto& [grid_items, l_d, tree_size] = sizing_tree.TreeRootData();
|
|
+ const auto& layout_data = l_d;
|
|
|
|
const auto* cached_layout_subtree = container_space.GetGridLayoutSubtree();
|
|
const auto container_writing_direction =
|
|
@@ -3611,7 +3612,9 @@ void GridLayoutAlgorithm::PlaceGridItems
|
|
|
|
// TODO(ikilpatrick): Update |SetHasSeenAllChildren| and early exit if true.
|
|
const auto& constraint_space = ConstraintSpace();
|
|
- const auto& [grid_items, layout_data, tree_size] = sizing_tree.TreeRootData();
|
|
+ const auto& [g_i, l_d, tree_size] = sizing_tree.TreeRootData();
|
|
+ const auto& grid_items = g_i;
|
|
+ const auto& layout_data = l_d;
|
|
|
|
const auto* cached_layout_subtree = constraint_space.GetGridLayoutSubtree();
|
|
const auto container_writing_direction =
|