| Index: chrome/browser/chromeos/ui/accessibility_focus_ring_controller.cc
|
| diff --git a/chrome/browser/chromeos/ui/accessibility_focus_ring_controller.cc b/chrome/browser/chromeos/ui/accessibility_focus_ring_controller.cc
|
| index 07cef1b44152e68196f3c458292bacf4a6d911a0..62ac28a0beaadf7d660b3f505000b8aa97d61ec7 100644
|
| --- a/chrome/browser/chromeos/ui/accessibility_focus_ring_controller.cc
|
| +++ b/chrome/browser/chromeos/ui/accessibility_focus_ring_controller.cc
|
| @@ -437,15 +437,14 @@ void AccessibilityFocusRingController::ComputeOpacity(
|
| 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;
|
| }
|
|
|
|
|