5953dca8be
* chore: bump chromium in DEPS to 138.0.7166.1 * chore: bump chromium in DEPS to 138.0.7166.2 * chore: bump chromium in DEPS to 138.0.7168.1 * chore: bump chromium in DEPS to 138.0.7169.2 * chore: bump chromium in DEPS to 138.0.7170.1 * chore: bump chromium in DEPS to 138.0.7172.1 * chore: bump chromium in DEPS to 138.0.7173.0 * chore: bump chromium in DEPS to 138.0.7175.0 * chore: bump chromium in DEPS to 138.0.7177.1 * chore: bump chromium in DEPS to 138.0.7178.2 * chore: bump chromium in DEPS to 138.0.7180.1 * chore: bump chromium in DEPS to 138.0.7181.0 * chore: bump chromium in DEPS to 138.0.7182.2 * chore: bump chromium in DEPS to 138.0.7184.0 * chore: bump chromium in DEPS to 138.0.7186.0 * chore: bump chromium in DEPS to 138.0.7188.0 * chore: bump chromium in DEPS to 138.0.7190.1 * chore: bump chromium in DEPS to 138.0.7192.0 * chore: bump chromium in DEPS to 138.0.7194.1 * chore: bump chromium in DEPS to 138.0.7196.1 * chore: bump chromium in DEPS to 138.0.7198.1 * chore: bump chromium in DEPS to 138.0.7200.0 * chore: bump chromium in DEPS to 138.0.7202.0 * chore: bump chromium in DEPS to 138.0.7204.0 * chore: bump chromium in DEPS to 138.0.7204.5 * chore: bump chromium in DEPS to 138.0.7204.4 * 6543986: Mac: decouple deserializing and applying sandbox policy Refs6543986(cherry picked from commit d386063e9d2414a35c91c4fa017665d950de5882) * 6566111: Change UtilityProcessHost to manage its instance internally Refs6566111(cherry picked from commit 93a0a91d447c118de33efec079365f5d0e8363db) * chore: update patches * 6577970: Remove superfluous includes for base/strings/stringprintf.h in headers Refs6577970(cherry picked from commit 9ba045f3715d85792e4aa12139e7e05e0b772634) * 6568811: Add FunctionCall structured metrics event for DevTools Refs6568811(cherry picked from commit 79ae6f2c8b53568b6277998cfe9a91e3a1ee595b) * [PDF Ink Signatures] Support PdfAnnotationsEnabled policy6558970* Mac: Switch to Xcode 16.3 (16E140) and SDK 15.4 (24E241)6431799* chore: bump chromium in DEPS to 138.0.7204.15 * chore: update patches * fixup Mac: decouple deserializing and applying sandbox policy6543986* chore: update patches --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
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 3c736de224325fec247308ea8adef3c1186029f9..8b5fd128120b2a4db387bf42b632c9e2e94f7cd4 100644
|
|
--- a/content/browser/renderer_host/navigator.cc
|
|
+++ b/content/browser/renderer_host/navigator.cc
|
|
@@ -1478,6 +1478,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 &&
|
|
@@ -1527,6 +1528,7 @@ void Navigator::RecordNavigationMetrics(
|
|
first_before_unload_start_time)
|
|
.InMilliseconds());
|
|
}
|
|
+#endif
|
|
|
|
builder.Record(ukm::UkmRecorder::Get());
|
|
metrics_data_.reset();
|