From 1fe4b3fa284c12aa1a63038f2e77b2c7edb964e8 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Tue, 15 Jan 2019 15:59:53 +0900 Subject: [PATCH] fix: add patch to disable dcheck in inter_process_time_ticks_converter.cc I'm seeing crashes on Windows when runnings tests for serviceWorker, the reason why the dcheck failed is unclear. --- patches/common/chromium/.patches | 1 + .../chromium/disable_time_ticks_dcheck.patch | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 patches/common/chromium/disable_time_ticks_dcheck.patch diff --git a/patches/common/chromium/.patches b/patches/common/chromium/.patches index 639d85559333..714828aa3067 100644 --- a/patches/common/chromium/.patches +++ b/patches/common/chromium/.patches @@ -68,3 +68,4 @@ cross_site_document_resource_handler.patch content_allow_embedder_to_prevent_locking_scheme_registry.patch support_mixed_sandbox_with_zygote.patch disable_color_correct_rendering.patch +disable_time_ticks_dcheck.patch diff --git a/patches/common/chromium/disable_time_ticks_dcheck.patch b/patches/common/chromium/disable_time_ticks_dcheck.patch new file mode 100644 index 000000000000..ca19b46026a3 --- /dev/null +++ b/patches/common/chromium/disable_time_ticks_dcheck.patch @@ -0,0 +1,27 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Cheng Zhao +Date: Tue, 15 Jan 2019 14:57:02 -0700 +Subject: disable_time_ticks_dcheck.patch + +The DCHECK is failing for some reason. + +diff --git a/content/common/inter_process_time_ticks_converter.cc b/content/common/inter_process_time_ticks_converter.cc +index 128abab37eb8..4d8e5e9c05b1 100644 +--- a/content/common/inter_process_time_ticks_converter.cc ++++ b/content/common/inter_process_time_ticks_converter.cc +@@ -55,13 +55,13 @@ LocalTimeTicks InterProcessTimeTicksConverter::ToLocalTimeTicks( + + RemoteTimeDelta remote_delta = remote_time_ticks - remote_lower_bound_; + +- DCHECK_LE(remote_time_ticks, remote_upper_bound_); ++ // DCHECK_LE(remote_time_ticks, remote_upper_bound_); + return local_base_time_ + ToLocalTimeDelta(remote_delta); + } + + LocalTimeDelta InterProcessTimeTicksConverter::ToLocalTimeDelta( + RemoteTimeDelta remote_delta) const { +- DCHECK_LE(remote_lower_bound_ + remote_delta, remote_upper_bound_); ++ // DCHECK_LE(remote_lower_bound_ + remote_delta, remote_upper_bound_); + + // For remote times that come before remote time range, apply just time + // offset and ignore scaling, so as to avoid extrapolation error for values