diff --git a/patches/common/chromium/.patches b/patches/common/chromium/.patches index a191e6431253..f3c0c287cf0f 100644 --- a/patches/common/chromium/.patches +++ b/patches/common/chromium/.patches @@ -60,7 +60,6 @@ verbose_generate_breakpad_symbols.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 autofill_size_calculation.patch revert_build_swiftshader_for_arm32.patch fix_disable_usage_of_abort_report_np_in_mas_builds.patch diff --git a/patches/common/chromium/disable_time_ticks_dcheck.patch b/patches/common/chromium/disable_time_ticks_dcheck.patch deleted file mode 100644 index 51a619e98318..000000000000 --- a/patches/common/chromium/disable_time_ticks_dcheck.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 128abab37eb8a96535ef92ebf11a463e863cc485..4d8e5e9c05b11083a69537d5badc85924b6fbae2 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