chore: remove disable_unload_metrics.patch (#47059)
This commit is contained in:
parent
e3e647d21e
commit
c218128675
2 changed files with 0 additions and 46 deletions
|
@ -57,7 +57,6 @@ export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
|
||||||
fix_export_zlib_symbols.patch
|
fix_export_zlib_symbols.patch
|
||||||
web_contents.patch
|
web_contents.patch
|
||||||
webview_fullscreen.patch
|
webview_fullscreen.patch
|
||||||
disable_unload_metrics.patch
|
|
||||||
extend_apply_webpreferences.patch
|
extend_apply_webpreferences.patch
|
||||||
build_libc_as_static_library.patch
|
build_libc_as_static_library.patch
|
||||||
build_do_not_depend_on_packed_resource_integrity.patch
|
build_do_not_depend_on_packed_resource_integrity.patch
|
||||||
|
|
|
@ -1,45 +0,0 @@
|
||||||
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 d976c082529a62bcef7352531ced808e5970027e..31e95005359f6e8e4e18ebd75324940f4fdd11eb 100644
|
|
||||||
--- a/content/browser/renderer_host/navigator.cc
|
|
||||||
+++ b/content/browser/renderer_host/navigator.cc
|
|
||||||
@@ -1476,6 +1476,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 &&
|
|
||||||
@@ -1525,6 +1526,7 @@ void Navigator::RecordNavigationMetrics(
|
|
||||||
first_before_unload_start_time)
|
|
||||||
.InMilliseconds());
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
builder.Record(ukm::UkmRecorder::Get());
|
|
||||||
metrics_data_.reset();
|
|
Loading…
Add table
Add a link
Reference in a new issue