Clamp focus ring opacity to avoid debug-mode failures

chrome/browser/chromeos/ui/accessibility_focus_ring_controller.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 419 matching lines @@
   base::TimeDelta fade_out_time = animation_info->fade_out_time;
 
   if (change_delta > fade_in_time + fade_out_time) {
     animation_info->opacity = 0.0;
     return;
   }
 
   float opacity;
   if (start_delta < fade_in_time) {
     opacity = start_delta.InSecondsF() / fade_in_time.InSecondsF();
-    if (opacity > 1.0)
-      opacity = 1.0;
   } else {
     opacity = 1.0 - (change_delta.InSecondsF() /
                      (fade_in_time + fade_out_time).InSecondsF());
-    if (opacity < 0.0)
-      opacity = 0.0;
   }
 
+  // Layer::SetOpacity will throw an error if we're not within 0...1.
+  opacity = std::min(std::max(opacity, 0.0f), 1.0f);
+
   animation_info->opacity = opacity;
 }
 
 void AccessibilityFocusRingController::AnimateCursorRing(
     base::TimeTicks timestamp) {
   CHECK(cursor_layer_);
 
   ComputeOpacity(&cursor_animation_info_, timestamp);
   if (cursor_animation_info_.opacity == 0.0) {
     cursor_layer_.reset();
     return;
   }
   cursor_layer_->SetOpacity(cursor_animation_info_.opacity);
 }
 
 void AccessibilityFocusRingController::AnimateCaretRing(
     base::TimeTicks timestamp) {
   CHECK(caret_layer_);
 
   ComputeOpacity(&caret_animation_info_, timestamp);
   if (caret_animation_info_.opacity == 0.0) {
     caret_layer_.reset();
     return;
   }
   caret_layer_->SetOpacity(caret_animation_info_.opacity);
 }
 
 }  // namespace chromeos