7e7010dacf* chore: bump chromium in DEPS to 133.0.6847.0 * chore: bump chromium in DEPS to 133.0.6848.0 * chore: update patches * implement extensions::GlobalShortcutListener::ExecuteCommand stub https://chromium-review.googlesource.com/c/chromium/src/+/5871484 * fix: ismediakey patch, oops * fix: another missing bracket * chore: bump chromium in DEPS to 133.0.6850.0 * chore: update patches * SharedStorageOperationPtr -> SharedStorageModifierMethodPtr https://chromium-review.googlesource.com/c/chromium/src/+/5990970 * build GlobalShortcutListenerLinux https://chromium-review.googlesource.com/c/chromium/src/+/5871484 * chore: bump chromium in DEPS to 133.0.6851.0 * fix: include full type for network::mojom::SharedStorageModifierMethod * chore: update patches * chore: bump chromium in DEPS to 133.0.6852.0 * chore: update patches * build: remove duplicated icudtl.dat and snapshot_blob.bin https://chromium-review.googlesource.com/c/chromium/src/+/5999387 * fix: include static methods in node tests involving call stacks https://chromium-review.googlesource.com/c/v8/v8/+/5907815 * revert: moved code in picture-in-picture.patch --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Samuel Maddock <smaddock@slack-corp.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 a0b2b43187e02321632a36fe9b388d903789603f..22962fe80da0550b2458289df3ad3eedb28e5709 100644
|
|
--- a/content/browser/renderer_host/navigator.cc
|
|
+++ b/content/browser/renderer_host/navigator.cc
|
|
@@ -1433,6 +1433,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 &&
|
|
@@ -1482,6 +1483,7 @@ void Navigator::RecordNavigationMetrics(
|
|
first_before_unload_start_time)
|
|
.InMilliseconds());
|
|
}
|
|
+#endif
|
|
|
|
builder.Record(ukm::UkmRecorder::Get());
|
|
metrics_data_.reset();
|