26 lines
1.1 KiB
Diff
26 lines
1.1 KiB
Diff
|
--- a/src/3rdparty/chromium/media/base/cdm_promise_adapter.cc
|
||
|
|
+++ b/src/3rdparty/chromium/media/base/cdm_promise_adapter.cc
|
||
|
|
@@ -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");
|
||
|
|
--- a/src/3rdparty/chromium/content/browser/service_worker/service_worker_context_wrapper.cc
|
||
|
|
+++ b/src/3rdparty/chromium/content/browser/service_worker/service_worker_context_wrapper.cc
|
||
|
|
@@ -1409,7 +1409,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",
|