56dfcc5468
* chore: bump chromium in DEPS to 124.0.6315.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: update patches Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * 5279678: Stream AIDA responses https://chromium-review.googlesource.com/c/chromium/src/+/5279678 Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * 5276439: Remove non_network_url_loader_factory_remotes_ https://chromium-review.googlesource.com/c/chromium/src/+/5276439 Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * 5310165: Add DevTools API to show search results https://chromium-review.googlesource.com/c/chromium/src/+/5310165 Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * chore: bump chromium in DEPS to 124.0.6317.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: update patches Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * Remove Setup.Install.CumulativeDiskUsage2 and supporting code https://chromium-review.googlesource.com/c/chromium/src/+/5314269 Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * browser: Make cmd line non-const in process singleton callback https://chromium-review.googlesource.com/c/chromium/src/+/5311256 Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * chore: bump chromium in DEPS to 124.0.6319.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: bump chromium in DEPS to 124.0.6321.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: bump chromium in DEPS to 124.0.6323.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * 5318335: Roll src/third_party/boringssl/src 23824fa0f..4fe29ebc7 https://chromium-review.googlesource.com/c/chromium/src/+/5318335 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 5318051: [CBE Watermarking] Hoist `watermark_view` to a member variable. https://chromium-review.googlesource.com/c/chromium/src/+/5318051 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: fixup patch indices Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 4946553: Delegate HID permission to Chrome App in webview https://chromium-review.googlesource.com/c/chromium/src/+/4946553 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 5310001: DevTools UI binding for reporting client events to AIDA https://chromium-review.googlesource.com/c/chromium/src/+/5310001 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * Refactor the predicate taking variant of `__cxx_atomic_wait` Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: fix browser_view patch harder Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 5293937: Reland "[gUM] Use preferred device if more than one is eligible" https://chromium-review.googlesource.com/c/chromium/src/+/5293937 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * fix: filter {video|audio} devices by eligible device id Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 5267921: enable speak content under the pointer on PWA and WV2 https://chromium-review.googlesource.com/c/chromium/src/+/5267921 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 5310195: heap: Remove Blink's GCTaskRunner https://chromium-review.googlesource.com/c/chromium/src/+/5310195 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: John Kleinschmidt <jkleinsc@electronjs.org> 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 1afb29c1a18e8729cb1fd95f976ee6dae5340035..597d20dd33c6bff54cefc909e3cb20d4e89cb744 100644
|
|
--- a/content/browser/renderer_host/navigator.cc
|
|
+++ b/content/browser/renderer_host/navigator.cc
|
|
@@ -1301,6 +1301,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 &&
|
|
@@ -1350,6 +1351,7 @@ void Navigator::RecordNavigationMetrics(
|
|
first_before_unload_start_time)
|
|
.InMilliseconds());
|
|
}
|
|
+#endif
|
|
|
|
builder.Record(ukm::UkmRecorder::Get());
|
|
metrics_data_.reset();
|