chore: bump chromium to 120.0.6099.56 (28-x-y) (#40653)

* chore: bump chromium in DEPS to 120.0.6099.56

* chore: update patches

* 5041802: Reland "Incorporate policy override for OOPPD feature" | https://chromium-review.googlesource.com/c/chromium/src/+/5041802

(cherry picked from commit 771174eb8c537e86dcdb1499a156998562947223)

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <[email protected]>
Co-authored-by: Keeley Hammond <[email protected]>

DEPS

@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '120.0.6099.35',
+    '120.0.6099.56',
   'node_version':
     'v18.18.2',
   'nan_version':

chromium_src/BUILD.gn

@@ -256,6 +256,8 @@ static_library("chrome") {
     sources += [
       "//chrome/browser/bad_message.cc",
       "//chrome/browser/bad_message.h",
+      "//chrome/browser/printing/prefs_util.cc",
+      "//chrome/browser/printing/prefs_util.h",
       "//chrome/browser/printing/print_job.cc",
       "//chrome/browser/printing/print_job.h",
       "//chrome/browser/printing/print_job_manager.cc",

patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch

@@ -46,10 +46,10 @@ index 44d3b5e543101ce7ff5fed778fc430532e7ae9fb..48799f517e4b83f157c86e9b579cd980
        sources += [ "certificate_viewer_stub.cc" ]
      }
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 25097de65708792948dc0d392e3fd4a1f71fc921..de359d448a4f3db65e12e6fcea06d952543515ff 100644
+index d1fc184a7d8cffec6b247cab7933d54d38ac59dc..577ea662b5ca476f55d8468957d5cc043a0b6475 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -7034,7 +7034,6 @@ test("unit_tests") {
+@@ -7035,7 +7035,6 @@ test("unit_tests") {
  
      deps += [
        "//chrome:other_version",
@@ -57,7 +57,7 @@ index 25097de65708792948dc0d392e3fd4a1f71fc921..de359d448a4f3db65e12e6fcea06d952
        "//chrome//services/util_win:unit_tests",
        "//chrome/app:chrome_dll_resources",
        "//chrome/app:win_unit_tests",
-@@ -7055,6 +7054,10 @@ test("unit_tests") {
+@@ -7056,6 +7055,10 @@ test("unit_tests") {
        "//ui/resources",
      ]
  
@@ -68,7 +68,7 @@ index 25097de65708792948dc0d392e3fd4a1f71fc921..de359d448a4f3db65e12e6fcea06d952
      ldflags = [
        "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
        "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
-@@ -8048,7 +8051,6 @@ test("unit_tests") {
+@@ -8049,7 +8052,6 @@ test("unit_tests") {
      }
  
      deps += [
@@ -76,7 +76,7 @@ index 25097de65708792948dc0d392e3fd4a1f71fc921..de359d448a4f3db65e12e6fcea06d952
        "//chrome/browser/apps:icon_standardizer",
        "//chrome/browser/apps/app_service",
        "//chrome/browser/apps/app_service:app_registry_cache_waiter",
-@@ -8138,6 +8140,10 @@ test("unit_tests") {
+@@ -8139,6 +8141,10 @@ test("unit_tests") {
        "//ui/webui/resources/js/browser_command:mojo_bindings",
      ]
  

patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch

@@ -112,10 +112,10 @@ index a58666f95cf6c0974e25b0c2805f944b290358ae..fa77efab0cbe5a702796a0e374f847c1
    string mime_type;
  
 diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
-index 23bb7603d93dcbe2291f6217001306557882ce6b..5579aaf6a5b04eb3926fb6dd47b6b363c79dd9bf 100644
+index 273e6e6f9dc0034c1ad942f77adc09a82bf00b6d..dd5bcfc92d8ffa85d9c70ece32b82c8458633e5b 100644
 --- a/services/network/url_loader.cc
 +++ b/services/network/url_loader.cc
-@@ -624,6 +624,7 @@ URLLoader::URLLoader(
+@@ -625,6 +625,7 @@ URLLoader::URLLoader(
      has_user_activation_ = request.trusted_params->has_user_activation;
      allow_cookies_from_browser_ =
          request.trusted_params->allow_cookies_from_browser;
@@ -123,7 +123,7 @@ index 23bb7603d93dcbe2291f6217001306557882ce6b..5579aaf6a5b04eb3926fb6dd47b6b363
    }
  
    // Store any cookies passed from the browser process to later attach them to
-@@ -662,7 +663,7 @@ URLLoader::URLLoader(
+@@ -663,7 +664,7 @@ URLLoader::URLLoader(
          &URLLoader::IsSharedDictionaryReadAllowed, base::Unretained(this)));
    }
  
@@ -132,7 +132,7 @@ index 23bb7603d93dcbe2291f6217001306557882ce6b..5579aaf6a5b04eb3926fb6dd47b6b363
      url_request_->SetResponseHeadersCallback(base::BindRepeating(
          &URLLoader::SetRawResponseHeaders, base::Unretained(this)));
    }
-@@ -1597,6 +1598,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
+@@ -1601,6 +1602,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
    }
  
    response_ = BuildResponseHead();

patches/chromium/fix_properly_honor_printing_page_ranges.patch

@@ -10,7 +10,7 @@ them should they exist.
 This will be upstreamed.
 
 diff --git a/printing/printing_context_mac.h b/printing/printing_context_mac.h
-index c9a13aee1e64f359cd1d5c2e440b4df204420997..7790c311400fc84bfda6c99e1ebd8da728031a77 100644
+index 0b21e7034392efa28d69c0d092086ae9bd1c43c4..c5824bdbdfbfab1c221f6bca3517d5404e0286d5 100644
 --- a/printing/printing_context_mac.h
 +++ b/printing/printing_context_mac.h
 @@ -84,6 +84,10 @@ class COMPONENT_EXPORT(PRINTING) PrintingContextMac : public PrintingContext {
@@ -25,7 +25,7 @@ index c9a13aee1e64f359cd1d5c2e440b4df204420997..7790c311400fc84bfda6c99e1ebd8da7
    // Returns true if duplex mode is set.
    bool SetDuplexModeInPrintSettings(mojom::DuplexMode mode);
 diff --git a/printing/printing_context_mac.mm b/printing/printing_context_mac.mm
-index fab1e04e754cb63ab7335a45dce25c130c638a04..612a74964adaf7c2d82ca0bb846cb33a6449db98 100644
+index b051381ebf164fe5b88db6c39152b65c98a625ed..d02db9e0b8295be6f397215fc447acd96baf6e0c 100644
 --- a/printing/printing_context_mac.mm
 +++ b/printing/printing_context_mac.mm
 @@ -486,7 +486,8 @@ void ApplySystemPrintDialogData(
@@ -62,10 +62,10 @@ index fab1e04e754cb63ab7335a45dce25c130c638a04..612a74964adaf7c2d82ca0bb846cb33a
    PMPrintSettings print_settings =
        static_cast<PMPrintSettings>([print_info_ PMPrintSettings]);
 diff --git a/printing/printing_context_system_dialog_win.cc b/printing/printing_context_system_dialog_win.cc
-index 8a7d9c115cf5cca8d203cc71c5c83f06df2c6bee..d808b78d57ea2f29e0ed2248304fa720e3deede2 100644
+index 391397cc4fb5748caa174fb061c7c128d079200d..3179af2283390849b5d6ff945f9f658e4e9bdb54 100644
 --- a/printing/printing_context_system_dialog_win.cc
 +++ b/printing/printing_context_system_dialog_win.cc
-@@ -75,14 +75,28 @@ void PrintingContextSystemDialogWin::AskUserForSettings(
+@@ -72,14 +72,28 @@ void PrintingContextSystemDialogWin::AskUserForSettings(
    PRINTPAGERANGE ranges[32];
    dialog_options.nStartPage = START_PAGE_GENERAL;
    if (max_pages) {
@@ -100,7 +100,7 @@ index 8a7d9c115cf5cca8d203cc71c5c83f06df2c6bee..d808b78d57ea2f29e0ed2248304fa720
    } else {
      // No need to bother, we don't know how many pages are available.
 diff --git a/ui/gtk/printing/print_dialog_gtk.cc b/ui/gtk/printing/print_dialog_gtk.cc
-index 525df2cef7d1740ec488c88fd4f6c06314b45fbb..01b2e50d4537ed27916f978a9110b49a49bdcb32 100644
+index 9d9147427a99804c4ba071b27948c06caac4c477..e047f4a88612172d58802b3529f04061bf90a939 100644
 --- a/ui/gtk/printing/print_dialog_gtk.cc
 +++ b/ui/gtk/printing/print_dialog_gtk.cc
 @@ -241,6 +241,24 @@ void PrintDialogGtk::UpdateSettings(

patches/chromium/printing.patch

@@ -91,7 +91,7 @@ index 57c9c4408946066cd89304d50798a3719c8012d5..1c44d16c792a497623333ee4cb89005e
                 : PdfRenderSettings::Mode::POSTSCRIPT_LEVEL3;
    }
 diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
-index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c399d88dbce 100644
+index 1bd9f4781076322af1b06e6a4998cc363e016173..4b9c787e0d8be0fe62444e52aec5aababf54d6d1 100644
 --- a/chrome/browser/printing/print_view_manager_base.cc
 +++ b/chrome/browser/printing/print_view_manager_base.cc
 @@ -22,7 +22,9 @@
@@ -104,7 +104,7 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
  #include "chrome/browser/printing/print_job.h"
  #include "chrome/browser/printing/print_job_manager.h"
  #include "chrome/browser/printing/print_view_manager_common.h"
-@@ -79,6 +81,20 @@ namespace printing {
+@@ -80,6 +82,20 @@ namespace printing {
  
  namespace {
  
@@ -125,7 +125,7 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
  void OnDidGetDefaultPrintSettings(
      scoped_refptr<PrintQueriesQueue> queue,
      bool want_pdf_settings,
-@@ -87,9 +103,11 @@ void OnDidGetDefaultPrintSettings(
+@@ -88,9 +104,11 @@ void OnDidGetDefaultPrintSettings(
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
  
    if (printer_query->last_status() != mojom::ResultCode::kSuccess) {
@@ -137,7 +137,7 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
      std::move(callback).Run(nullptr);
      return;
    }
-@@ -99,9 +117,11 @@ void OnDidGetDefaultPrintSettings(
+@@ -100,9 +118,11 @@ void OnDidGetDefaultPrintSettings(
    params->document_cookie = printer_query->cookie();
  
    if (!PrintMsgPrintParamsIsValid(*params)) {
@@ -149,7 +149,7 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
      std::move(callback).Run(nullptr);
      return;
    }
-@@ -118,7 +138,8 @@ void OnDidScriptedPrint(
+@@ -119,7 +139,8 @@ void OnDidScriptedPrint(
  
    if (printer_query->last_status() != mojom::ResultCode::kSuccess ||
        !printer_query->settings().dpi()) {
@@ -159,7 +159,7 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
      return;
    }
  
-@@ -128,12 +149,12 @@ void OnDidScriptedPrint(
+@@ -129,12 +150,12 @@ void OnDidScriptedPrint(
                                  params->params.get());
    params->params->document_cookie = printer_query->cookie();
    if (!PrintMsgPrintParamsIsValid(*params->params)) {
@@ -174,7 +174,7 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
    queue->QueuePrinterQuery(std::move(printer_query));
  }
  
-@@ -185,9 +206,11 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
+@@ -186,9 +207,11 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
      : PrintManager(web_contents),
        queue_(g_browser_process->print_job_manager()->queue()) {
    DCHECK(queue_);
@@ -187,7 +187,7 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
  }
  
  PrintViewManagerBase::~PrintViewManagerBase() {
-@@ -210,12 +233,20 @@ void PrintViewManagerBase::DisableThirdPartyBlocking() {
+@@ -211,12 +234,20 @@ void PrintViewManagerBase::DisableThirdPartyBlocking() {
  }
  #endif  // BUILDFLAG(IS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
  
@@ -209,7 +209,7 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
    return true;
  }
  
-@@ -338,12 +369,13 @@ void PrintViewManagerBase::OnDidUpdatePrintableArea(
+@@ -339,12 +370,13 @@ void PrintViewManagerBase::OnDidUpdatePrintableArea(
    }
    PRINTER_LOG(EVENT) << "Paper printable area updated for vendor id "
                       << print_settings->requested_media().vendor_id;
@@ -224,7 +224,7 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
      base::Value::Dict job_settings,
      std::unique_ptr<PrintSettings> print_settings,
      UpdatePrintSettingsCallback callback) {
-@@ -351,7 +383,8 @@ void PrintViewManagerBase::CompleteUpdatePrintSettings(
+@@ -352,7 +384,8 @@ void PrintViewManagerBase::CompleteUpdatePrintSettings(
    settings->pages = GetPageRangesFromJobSettings(job_settings);
    settings->params = mojom::PrintParams::New();
    RenderParamsFromPrintSettings(*print_settings, settings->params.get());
@@ -234,7 +234,7 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
    if (!PrintMsgPrintParamsIsValid(*settings->params)) {
      mojom::PrinterType printer_type = static_cast<mojom::PrinterType>(
          *job_settings.FindInt(kSettingPrinterType));
-@@ -363,6 +396,10 @@ void PrintViewManagerBase::CompleteUpdatePrintSettings(
+@@ -364,6 +397,10 @@ void PrintViewManagerBase::CompleteUpdatePrintSettings(
      return;
    }
  
@@ -245,7 +245,7 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
    set_cookie(settings->params->document_cookie);
    std::move(callback).Run(std::move(settings));
  }
-@@ -501,7 +538,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
+@@ -502,7 +539,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
  void PrintViewManagerBase::ScriptedPrintReply(
      ScriptedPrintCallback callback,
      int process_id,
@@ -255,7 +255,7 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
  
  #if BUILDFLAG(ENABLE_OOP_PRINTING)
-@@ -516,12 +554,15 @@ void PrintViewManagerBase::ScriptedPrintReply(
+@@ -517,12 +555,15 @@ void PrintViewManagerBase::ScriptedPrintReply(
      return;
    }
  
@@ -273,7 +273,7 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
    }
  }
  
-@@ -649,10 +690,12 @@ void PrintViewManagerBase::DidPrintDocument(
+@@ -650,10 +691,12 @@ void PrintViewManagerBase::DidPrintDocument(
  void PrintViewManagerBase::GetDefaultPrintSettings(
      GetDefaultPrintSettingsCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -284,9 +284,9 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
    }
 +#endif
  #if BUILDFLAG(ENABLE_OOP_PRINTING)
-   if (features::ShouldPrintJobOop() &&
+   if (ShouldPrintJobOop() &&
  #if BUILDFLAG(ENABLE_PRINT_CONTENT_ANALYSIS)
-@@ -704,10 +747,12 @@ void PrintViewManagerBase::UpdatePrintSettings(
+@@ -705,10 +748,12 @@ void PrintViewManagerBase::UpdatePrintSettings(
      base::Value::Dict job_settings,
      UpdatePrintSettingsCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -299,7 +299,7 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
  
    absl::optional<int> printer_type_value =
        job_settings.FindInt(kSettingPrinterType);
-@@ -718,6 +763,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
+@@ -719,6 +764,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
  
    mojom::PrinterType printer_type =
        static_cast<mojom::PrinterType>(*printer_type_value);
@@ -307,7 +307,7 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
    if (printer_type != mojom::PrinterType::kExtension &&
        printer_type != mojom::PrinterType::kPdf &&
        printer_type != mojom::PrinterType::kLocal) {
-@@ -737,6 +783,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
+@@ -738,6 +784,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
      if (value > 0)
        job_settings.Set(kSettingRasterizePdfDpi, value);
    }
@@ -315,7 +315,7 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
  
    std::unique_ptr<PrintSettings> print_settings =
        PrintSettingsFromJobSettings(job_settings);
-@@ -756,7 +803,21 @@ void PrintViewManagerBase::UpdatePrintSettings(
+@@ -757,7 +804,21 @@ void PrintViewManagerBase::UpdatePrintSettings(
      }
    }
  
@@ -338,7 +338,7 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
    // TODO(crbug.com/1424368):  Remove this if the printable areas can be made
    // fully available from `PrintBackend::GetPrinterSemanticCapsAndDefaults()`
    // for in-browser queries.
-@@ -778,8 +839,6 @@ void PrintViewManagerBase::UpdatePrintSettings(
+@@ -779,8 +840,6 @@ void PrintViewManagerBase::UpdatePrintSettings(
    }
  #endif
  
@@ -347,7 +347,7 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
  }
  
  void PrintViewManagerBase::SetAccessibilityTree(
-@@ -795,7 +854,7 @@ void PrintViewManagerBase::SetAccessibilityTree(
+@@ -796,7 +855,7 @@ void PrintViewManagerBase::SetAccessibilityTree(
  void PrintViewManagerBase::IsPrintingEnabled(
      IsPrintingEnabledCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -356,7 +356,7 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
  }
  
  void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
-@@ -811,13 +870,13 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
+@@ -812,13 +871,13 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
      // didn't happen for some reason.
      bad_message::ReceivedBadMessage(
          render_process_host, bad_message::PVMB_SCRIPTED_PRINT_FENCED_FRAME);
@@ -365,14 +365,14 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
      return;
    }
  #if BUILDFLAG(ENABLE_OOP_PRINTING)
-   if (features::ShouldPrintJobOop() && !query_with_ui_client_id_.has_value()) {
+   if (ShouldPrintJobOop() && !query_with_ui_client_id_.has_value()) {
      // Renderer process has requested settings outside of the expected setup.
 -    std::move(callback).Run(nullptr);
 +    std::move(callback).Run(nullptr, false);
      return;
    }
  #endif
-@@ -859,6 +918,7 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
+@@ -860,6 +919,7 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
  
    PrintManager::PrintingFailed(cookie, reason);
  
@@ -380,7 +380,7 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
    // `PrintingFailed()` can occur because asynchronous compositing results
    // don't complete until after a print job has already failed and been
    // destroyed.  In such cases the error notification to the user will
-@@ -868,7 +928,7 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
+@@ -869,7 +929,7 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
        print_job_->document()->cookie() == cookie) {
      ShowPrintErrorDialogForGenericError();
    }
@@ -389,7 +389,7 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
    ReleasePrinterQuery();
  }
  
-@@ -880,15 +940,24 @@ void PrintViewManagerBase::RemoveTestObserver(TestObserver& observer) {
+@@ -881,15 +941,24 @@ void PrintViewManagerBase::RemoveTestObserver(TestObserver& observer) {
    test_observers_.RemoveObserver(&observer);
  }
  
@@ -414,7 +414,7 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
  }
  
  void PrintViewManagerBase::RenderFrameDeleted(
-@@ -940,7 +1009,12 @@ void PrintViewManagerBase::OnJobDone() {
+@@ -941,7 +1010,12 @@ void PrintViewManagerBase::OnJobDone() {
    // Printing is done, we don't need it anymore.
    // print_job_->is_job_pending() may still be true, depending on the order
    // of object registration.
@@ -428,7 +428,7 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
    ReleasePrintJob();
  }
  
-@@ -949,9 +1023,10 @@ void PrintViewManagerBase::OnCanceling() {
+@@ -950,9 +1024,10 @@ void PrintViewManagerBase::OnCanceling() {
  }
  
  void PrintViewManagerBase::OnFailed() {
@@ -440,7 +440,7 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
    TerminatePrintJob(true);
  }
  
-@@ -961,7 +1036,7 @@ bool PrintViewManagerBase::RenderAllMissingPagesNow() {
+@@ -962,7 +1037,7 @@ bool PrintViewManagerBase::RenderAllMissingPagesNow() {
  
    // Is the document already complete?
    if (print_job_->document() && print_job_->document()->IsComplete()) {
@@ -449,7 +449,7 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
      return true;
    }
  
-@@ -1014,7 +1089,10 @@ bool PrintViewManagerBase::SetupNewPrintJob(
+@@ -1015,7 +1090,10 @@ bool PrintViewManagerBase::SetupNewPrintJob(
  
    // Disconnect the current `print_job_`.
    auto weak_this = weak_ptr_factory_.GetWeakPtr();
@@ -461,7 +461,7 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
    if (!weak_this)
      return false;
  
-@@ -1034,7 +1112,7 @@ bool PrintViewManagerBase::SetupNewPrintJob(
+@@ -1035,7 +1113,7 @@ bool PrintViewManagerBase::SetupNewPrintJob(
  #endif
    print_job_->AddObserver(*this);
  
@@ -470,7 +470,7 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
    return true;
  }
  
-@@ -1102,6 +1180,11 @@ void PrintViewManagerBase::ReleasePrintJob() {
+@@ -1103,6 +1181,11 @@ void PrintViewManagerBase::ReleasePrintJob() {
    }
  #endif
  
@@ -482,7 +482,7 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
    if (!print_job_)
      return;
  
-@@ -1109,7 +1192,7 @@ void PrintViewManagerBase::ReleasePrintJob() {
+@@ -1110,7 +1193,7 @@ void PrintViewManagerBase::ReleasePrintJob() {
      // printing_rfh_ should only ever point to a RenderFrameHost with a live
      // RenderFrame.
      DCHECK(rfh->IsRenderFrameLive());
@@ -491,7 +491,7 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
    }
  
    print_job_->RemoveObserver(*this);
-@@ -1151,7 +1234,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
+@@ -1152,7 +1235,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
  }
  
  bool PrintViewManagerBase::OpportunisticallyCreatePrintJob(int cookie) {
@@ -500,7 +500,7 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
      return true;
  
    if (!cookie) {
-@@ -1297,7 +1380,7 @@ void PrintViewManagerBase::ReleasePrinterQuery() {
+@@ -1298,7 +1381,7 @@ void PrintViewManagerBase::ReleasePrinterQuery() {
  }
  
  void PrintViewManagerBase::CompletePrintNow(content::RenderFrameHost* rfh) {
@@ -509,7 +509,7 @@ index 6449b27ccbf58c26635830e8822c6ccbcf5a902d..f2f5c1f26335debc638184246be80c39
  
    for (auto& observer : GetTestObservers()) {
      observer.OnPrintNow(rfh);
-@@ -1347,7 +1430,7 @@ void PrintViewManagerBase::CompleteScriptedPrintAfterContentAnalysis(
+@@ -1348,7 +1431,7 @@ void PrintViewManagerBase::CompleteScriptedPrintAfterContentAnalysis(
    set_analyzing_content(/*analyzing=*/false);
    if (!allowed || !printing_rfh_ || IsCrashed() ||
        !printing_rfh_->IsRenderFrameLive()) {
@@ -601,10 +601,10 @@ index ae2339d1ab82bd7cfa971ed03a188cfc26d6e1c0..186414ee72c6b431b87b02623abd4d19
    // Indication that the job is getting canceled.
    bool canceling_job_ = false;
 diff --git a/chrome/browser/printing/printer_query.cc b/chrome/browser/printing/printer_query.cc
-index 9fefdc150acf87774ca2a20301349f83de575944..13d6af57890b99192f4d3751ac47f2680cbe6266 100644
+index 57de2cf6fe6a6ff52b823ddd0079a9587e002416..52eec5ce4ad743543ae3b12b3cfe04e180f1292b 100644
 --- a/chrome/browser/printing/printer_query.cc
 +++ b/chrome/browser/printing/printer_query.cc
-@@ -354,17 +354,19 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Dict new_settings,
+@@ -355,17 +355,19 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Dict new_settings,
  #endif  // BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_CUPS)
    }
  
@@ -920,10 +920,10 @@ index 4c66836806fcda70c76aa026549cdc9aa4cb675f..74fb7ae02010812e9d2796ef4eba3585
      if (is_chromeos) {
        sources += [
 diff --git a/printing/printing_context.cc b/printing/printing_context.cc
-index 6aae8700c36346edfb44db0cec569efb3702cafe..75a5c89b8e0c916239b5f4fc1f062df4cd22733b 100644
+index 94f51e9f280a4282a3e9676c2895703e1bf55422..94555c2577d821ce2cbb521eee269138bbbf1a2b 100644
 --- a/printing/printing_context.cc
 +++ b/printing/printing_context.cc
-@@ -143,7 +143,6 @@ void PrintingContext::UsePdfSettings() {
+@@ -145,7 +145,6 @@ void PrintingContext::UsePdfSettings() {
  
  mojom::ResultCode PrintingContext::UpdatePrintSettings(
      base::Value::Dict job_settings) {
@@ -932,10 +932,10 @@ index 6aae8700c36346edfb44db0cec569efb3702cafe..75a5c89b8e0c916239b5f4fc1f062df4
      std::unique_ptr<PrintSettings> settings =
          PrintSettingsFromJobSettings(job_settings);
 diff --git a/printing/printing_context.h b/printing/printing_context.h
-index c753f04d8b73a51cb7e05dcdb86afc0e981e7a71..7ec1729e08bf42a51f80885b3838eee95c8bc953 100644
+index 6db58a9992642e557bac669b10f109bf6fd0f6ad..e1a5fcdca50d612dcb56faaf846752a44a697b84 100644
 --- a/printing/printing_context.h
 +++ b/printing/printing_context.h
-@@ -174,6 +174,9 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
+@@ -202,6 +202,9 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
  
    bool PrintingAborted() const { return abort_printing_; }
  
@@ -945,16 +945,16 @@ index c753f04d8b73a51cb7e05dcdb86afc0e981e7a71..7ec1729e08bf42a51f80885b3838eee9
    int job_id() const { return job_id_; }
  
   protected:
-@@ -184,9 +187,6 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
-   static std::unique_ptr<PrintingContext> CreateImpl(Delegate* delegate,
-                                                      bool skip_system_calls);
+@@ -213,9 +216,6 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
+       Delegate* delegate,
+       ProcessBehavior process_behavior);
  
 -  // Reinitializes the settings for object reuse.
 -  void ResetSettings();
 -
-   // Determine if system calls should be skipped by this instance.
-   bool skip_system_calls() const {
- #if BUILDFLAG(ENABLE_OOP_PRINTING)
+   // Does bookkeeping when an error occurs.
+   virtual mojom::ResultCode OnError();
+ 
 diff --git a/sandbox/policy/mac/sandbox_mac.mm b/sandbox/policy/mac/sandbox_mac.mm
 index 2dd2b99216e6ebc1e326b9ff61ea2254ea7df4e9..3cc24bed974ba52a12272bc856d085cc890859c0 100644
 --- a/sandbox/policy/mac/sandbox_mac.mm

patches/chromium/revert_same_party_cookie_attribute_removal.patch

@@ -4163,7 +4163,7 @@ index acd9a595a6c83bf58153354da91cb1d23e0f7235..9668aed7e3dde807e040ab71b442d81c
    CookieSettingOverrides cookie_setting_overrides_;
  
 diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
-index fee80f24bbd37de2b55dca08e4dc2ea8e5bf113b..56477b2b5d3d6f41a0ef596c865f9e3454ac9e9f 100644
+index fcb821c562aa1ff431565705b22791076fd9429b..624e78829ca0af70bba8681c18e032e0c08ed691 100644
 --- a/net/url_request/url_request_http_job.cc
 +++ b/net/url_request/url_request_http_job.cc
 @@ -63,7 +63,7 @@
@@ -4281,7 +4281,7 @@ index fee80f24bbd37de2b55dca08e4dc2ea8e5bf113b..56477b2b5d3d6f41a0ef596c865f9e34
  
    cookie_store->GetCookieListWithOptionsAsync(
        request_->url(), options,
-@@ -975,7 +1010,11 @@ void URLRequestHttpJob::SaveCookiesAndNotifyHeadersComplete(int result) {
+@@ -938,7 +973,11 @@ void URLRequestHttpJob::SaveCookiesAndNotifyHeadersComplete(int result) {
            request_->initiator(), is_main_frame_navigation,
            force_ignore_site_for_cookies);
  
@@ -5112,7 +5112,7 @@ index 60b726cce8f05a8d0a89a310d00b467be519badc..407ea92cb29712fd89f7c40c6bb21090
 +  array<SchemefulSite>? party_context;
  };
 diff --git a/services/network/restricted_cookie_manager.cc b/services/network/restricted_cookie_manager.cc
-index e6711498c9422babeb95f5c5c0831b65d47c3af8..939a1a4313c3b65b094e94f70211910cf0d6a952 100644
+index e12ebed92ffb4018f5ea3bb0a2da6e32aeb5ce5c..0f1816c1a7912829433fa6063fb3b69bd81aeda0 100644
 --- a/services/network/restricted_cookie_manager.cc
 +++ b/services/network/restricted_cookie_manager.cc
 @@ -38,7 +38,6 @@
@@ -5120,10 +5120,10 @@ index e6711498c9422babeb95f5c5c0831b65d47c3af8..939a1a4313c3b65b094e94f70211910c
  #include "net/cookies/site_for_cookies.h"
  #include "net/first_party_sets/first_party_set_metadata.h"
 -#include "net/first_party_sets/first_party_sets_cache_filter.h"
+ #include "services/network/ad_heuristic_cookie_overrides.h"
  #include "services/network/cookie_settings.h"
  #include "services/network/public/cpp/features.h"
- #include "services/network/public/mojom/cookie_manager.mojom.h"
-@@ -105,11 +104,20 @@ constexpr base::TimeDelta kCookiesAccessedTimeout = base::Milliseconds(100);
+@@ -106,11 +105,20 @@ constexpr base::TimeDelta kCookiesAccessedTimeout = base::Milliseconds(100);
  constexpr size_t kMaxCookieCacheCount = 32u;
  constexpr size_t kIncreasedMaxCookieCacheCount = 100u;
  
@@ -5145,7 +5145,7 @@ index e6711498c9422babeb95f5c5c0831b65d47c3af8..939a1a4313c3b65b094e94f70211910c
    net::CookieOptions options;
    bool force_ignore_site_for_cookies =
        cookie_settings.ShouldIgnoreSameSiteRestrictions(url, site_for_cookies);
-@@ -125,6 +133,14 @@ net::CookieOptions MakeOptionsForSet(
+@@ -126,6 +134,14 @@ net::CookieOptions MakeOptionsForSet(
          net::cookie_util::ComputeSameSiteContextForSubresource(
              url, site_for_cookies, force_ignore_site_for_cookies));
    }
@@ -5160,7 +5160,7 @@ index e6711498c9422babeb95f5c5c0831b65d47c3af8..939a1a4313c3b65b094e94f70211910c
  
    return options;
  }
-@@ -133,7 +149,9 @@ net::CookieOptions MakeOptionsForGet(
+@@ -134,7 +150,9 @@ net::CookieOptions MakeOptionsForGet(
      mojom::RestrictedCookieManagerRole role,
      const GURL& url,
      const net::SiteForCookies& site_for_cookies,
@@ -5171,7 +5171,7 @@ index e6711498c9422babeb95f5c5c0831b65d47c3af8..939a1a4313c3b65b094e94f70211910c
    // TODO(https://crbug.com/925311): Wire initiator here.
    net::CookieOptions options;
    bool force_ignore_site_for_cookies =
-@@ -151,6 +169,14 @@ net::CookieOptions MakeOptionsForGet(
+@@ -152,6 +170,14 @@ net::CookieOptions MakeOptionsForGet(
          net::cookie_util::ComputeSameSiteContextForSubresource(
              url, site_for_cookies, force_ignore_site_for_cookies));
    }
@@ -5186,7 +5186,7 @@ index e6711498c9422babeb95f5c5c0831b65d47c3af8..939a1a4313c3b65b094e94f70211910c
  
    return options;
  }
-@@ -169,21 +195,13 @@ void RestrictedCookieManager::ComputeFirstPartySetMetadata(
+@@ -170,21 +196,13 @@ void RestrictedCookieManager::ComputeFirstPartySetMetadata(
    std::pair<base::OnceCallback<void(net::FirstPartySetMetadata)>,
              base::OnceCallback<void(net::FirstPartySetMetadata)>>
        callbacks = base::SplitOnceCallback(std::move(callback));
@@ -5215,7 +5215,7 @@ index e6711498c9422babeb95f5c5c0831b65d47c3af8..939a1a4313c3b65b094e94f70211910c
  }
  
  bool CookieWithAccessResultComparer::operator()(
-@@ -315,7 +333,8 @@ class RestrictedCookieManager::Listener : public base::LinkNode<Listener> {
+@@ -316,7 +334,8 @@ class RestrictedCookieManager::Listener : public base::LinkNode<Listener> {
             bool has_storage_access,
             const absl::optional<net::CookiePartitionKey>& cookie_partition_key,
             net::CookieOptions options,
@@ -5225,7 +5225,7 @@ index e6711498c9422babeb95f5c5c0831b65d47c3af8..939a1a4313c3b65b094e94f70211910c
        : cookie_store_(cookie_store),
          restricted_cookie_manager_(restricted_cookie_manager),
          url_(url),
-@@ -323,7 +342,8 @@ class RestrictedCookieManager::Listener : public base::LinkNode<Listener> {
+@@ -324,7 +343,8 @@ class RestrictedCookieManager::Listener : public base::LinkNode<Listener> {
          top_frame_origin_(top_frame_origin),
          has_storage_access_(has_storage_access),
          options_(options),
@@ -5235,7 +5235,7 @@ index e6711498c9422babeb95f5c5c0831b65d47c3af8..939a1a4313c3b65b094e94f70211910c
      // TODO(pwnall): add a constructor w/options to net::CookieChangeDispatcher.
      cookie_store_subscription_ =
          cookie_store->GetChangeDispatcher().AddCallbackForUrl(
-@@ -359,11 +379,16 @@ class RestrictedCookieManager::Listener : public base::LinkNode<Listener> {
+@@ -360,11 +380,16 @@ class RestrictedCookieManager::Listener : public base::LinkNode<Listener> {
  
      // CookieChangeDispatcher doesn't check for inclusion against `options_`, so
      // we need to double-check that.
@@ -5253,7 +5253,7 @@ index e6711498c9422babeb95f5c5c0831b65d47c3af8..939a1a4313c3b65b094e94f70211910c
               .status.IsInclude()) {
        return;
      }
-@@ -414,6 +439,8 @@ class RestrictedCookieManager::Listener : public base::LinkNode<Listener> {
+@@ -415,6 +440,8 @@ class RestrictedCookieManager::Listener : public base::LinkNode<Listener> {
  
    mojo::Remote<mojom::CookieChangeListener> mojo_listener_;
  
@@ -5262,7 +5262,7 @@ index e6711498c9422babeb95f5c5c0831b65d47c3af8..939a1a4313c3b65b094e94f70211910c
    SEQUENCE_CHECKER(sequence_checker_);
  };
  
-@@ -440,6 +467,8 @@ RestrictedCookieManager::RestrictedCookieManager(
+@@ -441,6 +468,8 @@ RestrictedCookieManager::RestrictedCookieManager(
        cookie_partition_key_collection_(
            net::CookiePartitionKeyCollection::FromOptional(
                cookie_partition_key_)),
@@ -5271,7 +5271,7 @@ index e6711498c9422babeb95f5c5c0831b65d47c3af8..939a1a4313c3b65b094e94f70211910c
        receiver_(this),
        metrics_updater_(metrics_updater),
        max_cookie_cache_count_(
-@@ -566,7 +595,8 @@ void RestrictedCookieManager::GetAllForUrl(
+@@ -567,7 +596,8 @@ void RestrictedCookieManager::GetAllForUrl(
    // TODO(morlovich): Try to validate site_for_cookies as well.
  
    net::CookieOptions net_options =
@@ -5281,7 +5281,7 @@ index e6711498c9422babeb95f5c5c0831b65d47c3af8..939a1a4313c3b65b094e94f70211910c
    // TODO(https://crbug.com/977040): remove set_return_excluded_cookies() once
    // removing deprecation warnings.
    net_options.set_return_excluded_cookies();
-@@ -836,7 +866,8 @@ void RestrictedCookieManager::SetCanonicalCookie(
+@@ -839,7 +869,8 @@ void RestrictedCookieManager::SetCanonicalCookie(
  
    net::CanonicalCookie cookie_copy = *sanitized_cookie;
    net::CookieOptions options =
@@ -5291,7 +5291,7 @@ index e6711498c9422babeb95f5c5c0831b65d47c3af8..939a1a4313c3b65b094e94f70211910c
  
    net::CookieAccessResult cookie_access_result(status);
    cookie_store_->SetCanonicalCookieAsync(
-@@ -894,11 +925,12 @@ void RestrictedCookieManager::AddChangeListener(
+@@ -897,11 +928,12 @@ void RestrictedCookieManager::AddChangeListener(
    }
  
    net::CookieOptions net_options =
@@ -5307,10 +5307,10 @@ index e6711498c9422babeb95f5c5c0831b65d47c3af8..939a1a4313c3b65b094e94f70211910c
    listener->mojo_listener().set_disconnect_handler(
        base::BindOnce(&RestrictedCookieManager::RemoveChangeListener,
 diff --git a/services/network/restricted_cookie_manager.h b/services/network/restricted_cookie_manager.h
-index b53b63829ab1e873dbfa4478d6b36ef184baecd9..bc59d8162a40a12d2acfb40af9d840c17c63925e 100644
+index 6e32b7e8c32e03fc5de0c6ddba9e8e65ccc790f9..b0e3bdd3246e2ee64781f44679c98e9989a88df4 100644
 --- a/services/network/restricted_cookie_manager.h
 +++ b/services/network/restricted_cookie_manager.h
-@@ -336,6 +336,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) RestrictedCookieManager
+@@ -337,6 +337,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) RestrictedCookieManager
    // update filtering.
    CookieAccessesByURLAndSite recent_cookie_accesses_;
  
@@ -5320,10 +5320,10 @@ index b53b63829ab1e873dbfa4478d6b36ef184baecd9..bc59d8162a40a12d2acfb40af9d840c1
    // done with this variable.
    mojo::Receiver<mojom::RestrictedCookieManager> receiver_;
 diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
-index 5579aaf6a5b04eb3926fb6dd47b6b363c79dd9bf..4072478d969f754f7ee32676cefc326516dbd1bb 100644
+index dd5bcfc92d8ffa85d9c70ece32b82c8458633e5b..d21cb3348878e4b60fd03deb01066e51e92111be 100644
 --- a/services/network/url_loader.cc
 +++ b/services/network/url_loader.cc
-@@ -286,7 +286,7 @@ bool ShouldNotifyAboutCookie(net::CookieInclusionStatus status) {
+@@ -287,7 +287,7 @@ bool ShouldNotifyAboutCookie(net::CookieInclusionStatus status) {
           status.HasExclusionReason(
               net::CookieInclusionStatus::EXCLUDE_USER_PREFERENCES) ||
           status.HasExclusionReason(
@@ -5332,7 +5332,7 @@ index 5579aaf6a5b04eb3926fb6dd47b6b363c79dd9bf..4072478d969f754f7ee32676cefc3265
           status.HasExclusionReason(
               net::CookieInclusionStatus::EXCLUDE_DOMAIN_NON_ASCII);
  }
-@@ -587,6 +587,9 @@ URLLoader::URLLoader(
+@@ -588,6 +588,9 @@ URLLoader::URLLoader(
      DCHECK(!url_request_->isolation_info().IsEmpty());
    }
  
@@ -5342,7 +5342,7 @@ index 5579aaf6a5b04eb3926fb6dd47b6b363c79dd9bf..4072478d969f754f7ee32676cefc3265
    // When a service worker forwards a navigation request it uses the
    // service worker's IsolationInfo.  This causes the cookie code to fail
    // to send SameSite=Lax cookies for main-frame navigations passed through
-@@ -2698,6 +2701,36 @@ bool URLLoader::ShouldForceIgnoreSiteForCookies(
+@@ -2702,6 +2705,36 @@ bool URLLoader::ShouldForceIgnoreSiteForCookies(
    return false;
  }
  

patches/config.json

@@ -21,7 +21,5 @@
 
   "src/electron/patches/ReactiveObjC": "src/third_party/squirrel.mac/vendor/ReactiveObjC",
 
-  "src/electron/patches/skia": "src/third_party/skia",
-
   "src/electron/patches/webrtc": "src/third_party/webrtc"
 }

patches/skia/.patches

@@ -1 +0,0 @@
-avoid_combining_extremely_large_meshes.patch

patches/skia/avoid_combining_extremely_large_meshes.patch

@@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: John Stiles <[email protected]>
-Date: Fri, 24 Nov 2023 09:40:11 -0500
-Subject: Avoid combining extremely large meshes.
-
-Bug: chromium:1505053
-Change-Id: I42f2ff872bbf054686ec7af0cc85ff63055fcfbf
-Reviewed-on: https://skia-review.googlesource.com/c/skia/+/782936
-Commit-Queue: Michael Ludwig <[email protected]>
-Reviewed-by: Michael Ludwig <[email protected]>
-Auto-Submit: John Stiles <[email protected]>
-
-diff --git a/src/gpu/ganesh/ops/DrawMeshOp.cpp b/src/gpu/ganesh/ops/DrawMeshOp.cpp
-index 5ea123d5fbcd9e9da4925049094f49158e3a5cca..002618a118f4fee469bbd7f2b81264b4cd426341 100644
---- a/src/gpu/ganesh/ops/DrawMeshOp.cpp
-+++ b/src/gpu/ganesh/ops/DrawMeshOp.cpp
-@@ -1176,10 +1176,13 @@ GrOp::CombineResult MeshOp::onCombineIfPossible(GrOp* t, SkArenaAlloc*, const Gr
-         return CombineResult::kCannotCombine;
-     }
- 
-+    if (fVertexCount > INT32_MAX - that->fVertexCount) {
-+        return CombineResult::kCannotCombine;
-+    }
-     if (SkToBool(fIndexCount) != SkToBool(that->fIndexCount)) {
-         return CombineResult::kCannotCombine;
-     }
--    if (SkToBool(fIndexCount) && fVertexCount + that->fVertexCount > SkToInt(UINT16_MAX)) {
-+    if (SkToBool(fIndexCount) && fVertexCount > UINT16_MAX - that->fVertexCount) {
-         return CombineResult::kCannotCombine;
-     }
-