2585e6d5fa
* chore: bump chromium in DEPS to 93.0.4562.0 * chore: update patches * [base] Made Value::Take{Dict,List}() rvalue ref-qualified. https://chromium-review.googlesource.com/c/chromium/src/+/2988105 * Revert "Reland "Roll src/buildtools/third_party/libc++/trunk/ 8fa879467..79a2e924d (426 commits)"" https://chromium-review.googlesource.com/c/chromium/src/+/2995482 This reverts commit 9691d6c265f010791c37d374248559969980ec65 and 797723ec838709ddeba0c104e30727ee0b7ac8ca * Pass gfx::Insets to GetHTComponentForFrame https://chromium-review.googlesource.com/c/chromium/src/+/2984243 * chore: bump chromium in DEPS to 93.0.4563.0 * [Clipboard API] Clipboard Custom Formats implementation Part 2. https://chromium-review.googlesource.com/c/chromium/src/+/2967649 * chore: update patches * chore: bump chromium in DEPS to 93.0.4564.0 * chore: bump chromium in DEPS to 93.0.4565.0 * chore: update patches * Prevent use of base::NoDestructor for trivially-destructible types https://chromium-review.googlesource.com/c/chromium/src/+/2998672 * chore: update patches * fixup! [Clipboard API] Clipboard Custom Formats implementation Part 2. * chore: bump chromium in DEPS to 93.0.4566.0 * chore: update patches * chore: add missing header * ci: do not run clipboard tests on WOA Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.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-main\api-crash-reporter-spec.ts:39:35)
|
|
at Context.<anonymous> (electron\spec-main\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 a5cb0c1497531a77881b24fc0fad3a8c9c848f1e..60822a341d99dde6341dbe5d481fa50f618cf0ef 100644
|
|
--- a/content/browser/renderer_host/navigator.cc
|
|
+++ b/content/browser/renderer_host/navigator.cc
|
|
@@ -1074,6 +1074,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 &&
|
|
@@ -1120,6 +1121,7 @@ void Navigator::RecordNavigationMetrics(
|
|
first_before_unload_start_time)
|
|
.InMilliseconds());
|
|
}
|
|
+#endif
|
|
|
|
builder.Record(ukm::UkmRecorder::Get());
|
|
navigation_data_.reset();
|