recipes-wam/cef/files/chromium/0015-meta-browser-Avoid-capturing-structured-bindings.patch

   1 From a1c05a94dc5b999bf22f1beedf3e3a9468775775 Mon Sep 17 00:00:00 2001
   2 From: Max Ihlenfeldt <max@igalia.com>
   3 Date: Tue, 13 Jun 2023 15:48:12 +0000
   4 Subject: [PATCH 15/33] [meta-browser] Avoid capturing structured bindings
   5
   6 Similar to https://crrev.com/c/4526976, this patch removes some uses of
   7 structured bindings that lead to compile errors when using older
   8 versions of clang (observed with clang 15).
   9
  10 Upstream-Status: Inappropriate [specific to older versions of clang]
  11 Signed-off-by: Max Ihlenfeldt <max@igalia.com>
  12 ---
  13  .../service_worker/service_worker_context_wrapper.cc      | 3 ++-
  14  media/base/cdm_promise_adapter.cc                         | 8 ++++----
  15  2 files changed, 6 insertions(+), 5 deletions(-)
  16
  17 diff --git a/content/browser/service_worker/service_worker_context_wrapper.cc b/content/browser/service_worker/service_worker_context_wrapper.cc
  18 index 3267cdb340819..de88ef7e565cb 100644
  19 --- a/content/browser/service_worker/service_worker_context_wrapper.cc
  20 +++ b/content/browser/service_worker/service_worker_context_wrapper.cc
  21 @@ -1412,9 +1412,10 @@ void ServiceWorkerContextWrapper::MaybeProcessPendingWarmUpRequest() {
  22    auto [document_url, key, callback] = std::move(*request);
  23
  24    DCHECK(document_url.is_valid());
  25 +  auto document_url_spec = document_url.spec();
  26    TRACE_EVENT1("ServiceWorker",
  27                 "ServiceWorkerContextWrapper::MaybeProcessPendingWarmUpRequest",
  28 -               "document_url", document_url.spec());
  29 +               "document_url", document_url_spec);
  30
  31    context_core_->registry()->FindRegistrationForClientUrl(
  32        ServiceWorkerRegistry::Purpose::kNotForNavigation,
  33 diff --git a/media/base/cdm_promise_adapter.cc b/media/base/cdm_promise_adapter.cc
  34 index f013809a62e25..144809b9696c3 100644
  35 --- a/media/base/cdm_promise_adapter.cc
  36 +++ b/media/base/cdm_promise_adapter.cc
  37 @@ -94,12 +94,12 @@ void CdmPromiseAdapter::RejectPromise(uint32_t promise_id,
  38  void CdmPromiseAdapter::Clear(ClearReason reason) {
  39    // Reject all outstanding promises.
  40    DCHECK(thread_checker_.CalledOnValidThread());
  41 -  for (auto& [promise_id, promise] : promises_) {
  42 +  for (auto& promise : promises_) {
  43      TRACE_EVENT_NESTABLE_ASYNC_END1(
  44 -        "media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise_id),
  45 +        "media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise.first),
  46          "status", "cleared");
  47 -    promise->reject(CdmPromise::Exception::INVALID_STATE_ERROR,
  48 -                    ToSystemCode(reason), "Operation aborted.");
  49 +    promise.second->reject(CdmPromise::Exception::INVALID_STATE_ERROR,
  50 +                           ToSystemCode(reason), "Operation aborted.");
  51    }
  52    promises_.clear();
  53  }
  54 --
  55 2.42.1
  56