Upstream version 11.39.250.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / ui / accessibility_focus_ring_controller.cc

diff --git a/src/chrome/browser/chromeos/ui/accessibility_focus_ring_controller.cc b/src/chrome/browser/chromeos/ui/accessibility_focus_ring_controller.cc
index b2c93a8..8aa57a5 100644 (file)
--- a/src/chrome/browser/chromeos/ui/accessibility_focus_ring_controller.cc
+++ b/src/chrome/browser/chromeos/ui/accessibility_focus_ring_controller.cc
@@ -297,6 +297,12 @@ void AccessibilityFocusRingController::OnAnimationStep(
   CHECK(!layers_.empty());
   CHECK(layers_[0]);
 
+  // It's quite possible for the first 1 or 2 animation frames to be
+  // for a timestamp that's earlier than the time we received the
+  // focus change, so we just treat those as a delta of zero.
+  if (timestamp < focus_change_time_)
+    timestamp = focus_change_time_;
+
   base::TimeDelta delta = timestamp - focus_change_time_;
   base::TimeDelta transition_time =
       base::TimeDelta::FromMilliseconds(kTransitionTimeMilliseconds);