From c2467847c97406bc1566a6b65ba40b6284b305e9 Mon Sep 17 00:00:00 2001 From: sheckylin Date: Wed, 28 Jan 2015 16:19:03 -0800 Subject: [PATCH] Fix uninitialized timestamps being passed to the gesture lib The CL corrects a bug where clock_gettime was placed in a DCHECK call and thus not executed on release builds. Contributed by sheckylin@chromium.org BUG=chrome-os-partner:35111 TEST=samus ChromeOS build Review URL: https://codereview.chromium.org/884313002 Cr-Commit-Position: refs/heads/master@{#313634} --- .../ozone/evdev/libgestures_glue/gesture_timer_provider.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ui/events/ozone/evdev/libgestures_glue/gesture_timer_provider.cc b/ui/events/ozone/evdev/libgestures_glue/gesture_timer_provider.cc index 795fe2b3d3b9f..2b08b9844192b 100644 --- a/ui/events/ozone/evdev/libgestures_glue/gesture_timer_provider.cc +++ b/ui/events/ozone/evdev/libgestures_glue/gesture_timer_provider.cc @@ -29,7 +29,10 @@ struct GesturesTimer { private: void OnTimerExpired() { struct timespec ts; - DCHECK(!clock_gettime(CLOCK_MONOTONIC, &ts)); + int fail = clock_gettime(CLOCK_MONOTONIC, &ts); + DCHECK(!fail); + + // Run the callback and reschedule the next run if requested. stime_t next_delay = callback_(StimeFromTimespec(&ts), callback_data_); if (next_delay >= 0) { timer_.Start(FROM_HERE,