261954137b
* chore: bump chromium in DEPS to 128.0.6571.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * 5636652: [4/n] Introduce RenderInputRouterClient and move InputRouterClient implementation to RenderInputRouter. https://chromium-review.googlesource.com/c/chromium/src/+/5636652 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 5655811: Revert "Reland "Reland "Add toolchains without PartitionAlloc-Everywhere for dump_syms et al""" https://chromium-review.googlesource.com/c/chromium/src/+/5655811 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 5581006: [tracing] Forward startup tracing config as shmem https://chromium-review.googlesource.com/c/chromium/src/+/5581006 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: fixup patch indices Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 5608450: [Views AX] Move Image Auto Captioning strings to ui/ https://chromium-review.googlesource.com/c/chromium/src/+/5608450 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 5648900: [Extensions] Move ExtensionAPIEnabledForServiceWorkerScript() https://chromium-review.googlesource.com/c/chromium/src/+/5648900 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 5651681: Remove Web Speech API profanity masking https://chromium-review.googlesource.com/c/chromium/src/+/5651681 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 5651361: `content::RenderFrame::GetBrowserInterfaceBroker`: return a const-ref. https://chromium-review.googlesource.com/c/chromium/src/+/5651361 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 5604943: Start capture of toolbar after gesture end events are received https://chromium-review.googlesource.com/c/chromium/src/+/5604943 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 5624392: [BRP] Enforce raw_ptr/ref in Renderer code https://chromium-review.googlesource.com/c/chromium/src/+/5624392 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 5659259: Portals: Remove WebContentsView::TransferDragSecurityInfo https://chromium-review.googlesource.com/c/chromium/src/+/5659259 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 5230721: Move ComposeStatus to components/compose https://chromium-review.googlesource.com/c/chromium/src/+/5230721 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 5647894: [api] Cleanup usages of v8::ReturnValue<void>::Set[NonEmpty](..) https://chromium-review.googlesource.com/c/v8/v8/+/5647894 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
45 lines
1.8 KiB
Diff
45 lines
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Cheng Zhao <zcbenz@gmail.com>
|
|
Date: Thu, 20 Sep 2018 17:45:47 -0700
|
|
Subject: fix: disable unload metrics
|
|
|
|
Chromium introduced unload metrics in:
|
|
https://chromium-review.googlesource.com/c/chromium/src/+/2314877
|
|
|
|
Which would cause some DCHECKs to assert in Electron:
|
|
https://github.com/electron/electron/issues/27717
|
|
|
|
And it would then crash and make some tests fail:
|
|
crashReporter module should send minidump when sandboxed renderer crashes api-crash-reporter-spec.ts 643 ms
|
|
Error message:
|
|
ptype: expected 'browser' to equal 'renderer'
|
|
Error stack trace:
|
|
AssertionError: ptype: expected 'browser' to equal 'renderer'
|
|
at checkCrash (electron\spec\api-crash-reporter-spec.ts:39:35)
|
|
at Context.<anonymous> (electron\spec\api-crash-reporter-spec.ts:154:7)
|
|
at runMicrotasks (<anonymous>)
|
|
at processTicksAndRejections (internal/process/task_queues.js:93:5)
|
|
|
|
This patch temporarily disables the metrics so we can have green CI, and we
|
|
should continue seeking for a real fix.
|
|
|
|
diff --git a/content/browser/renderer_host/navigator.cc b/content/browser/renderer_host/navigator.cc
|
|
index 2fce2e901cb9745447c8e55a0d34f742d5bf0d97..0981c31e2e770484b32bbb79f1c6babc0e68d97a 100644
|
|
--- a/content/browser/renderer_host/navigator.cc
|
|
+++ b/content/browser/renderer_host/navigator.cc
|
|
@@ -1329,6 +1329,7 @@ void Navigator::RecordNavigationMetrics(
|
|
.InMilliseconds());
|
|
}
|
|
|
|
+#if 0
|
|
// If this is a same-process navigation and we have timestamps for unload
|
|
// durations, fill those metrics out as well.
|
|
if (params.unload_start && params.unload_end &&
|
|
@@ -1378,6 +1379,7 @@ void Navigator::RecordNavigationMetrics(
|
|
first_before_unload_start_time)
|
|
.InMilliseconds());
|
|
}
|
|
+#endif
|
|
|
|
builder.Record(ukm::UkmRecorder::Get());
|
|
metrics_data_.reset();
|