| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011, 2012 Apple Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 3 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 852 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 863 if (key == "Enter" || ToKeyboardEvent(event)->keyCode() == ' ') { | 863 if (key == "Enter" || ToKeyboardEvent(event)->keyCode() == ' ') { |
| 864 play_button_->OnMediaKeyboardEvent(event); | 864 play_button_->OnMediaKeyboardEvent(event); |
| 865 return; | 865 return; |
| 866 } | 866 } |
| 867 if (key == "ArrowLeft" || key == "ArrowRight" || key == "Home" || | 867 if (key == "ArrowLeft" || key == "ArrowRight" || key == "Home" || |
| 868 key == "End") { | 868 key == "End") { |
| 869 timeline_->OnMediaKeyboardEvent(event); | 869 timeline_->OnMediaKeyboardEvent(event); |
| 870 return; | 870 return; |
| 871 } | 871 } |
| 872 if (key == "ArrowDown" || key == "ArrowUp") { | 872 if (key == "ArrowDown" || key == "ArrowUp") { |
| 873 volume_slider_->OnMediaKeyboardEvent(event); | 873 for (int i = 0; i < 5; i++) |
| 874 volume_slider_->OnMediaKeyboardEvent(event); |
| 874 return; | 875 return; |
| 875 } | 876 } |
| 876 } | 877 } |
| 877 } | 878 } |
| 878 | 879 |
| 879 void MediaControlsImpl::HideMediaControlsTimerFired(TimerBase*) { | 880 void MediaControlsImpl::HideMediaControlsTimerFired(TimerBase*) { |
| 880 unsigned behavior_flags = | 881 unsigned behavior_flags = |
| 881 hide_timer_behavior_flags_ | kIgnoreFocus | kIgnoreVideoHover; | 882 hide_timer_behavior_flags_ | kIgnoreFocus | kIgnoreVideoHover; |
| 882 hide_timer_behavior_flags_ = kIgnoreNone; | 883 hide_timer_behavior_flags_ = kIgnoreNone; |
| 883 keep_showing_until_timer_fires_ = false; | 884 keep_showing_until_timer_fires_ = false; |
| (...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1252 visitor->Trace(overlay_cast_button_); | 1253 visitor->Trace(overlay_cast_button_); |
| 1253 visitor->Trace(media_event_listener_); | 1254 visitor->Trace(media_event_listener_); |
| 1254 visitor->Trace(window_event_listener_); | 1255 visitor->Trace(window_event_listener_); |
| 1255 visitor->Trace(orientation_lock_delegate_); | 1256 visitor->Trace(orientation_lock_delegate_); |
| 1256 visitor->Trace(rotate_to_fullscreen_delegate_); | 1257 visitor->Trace(rotate_to_fullscreen_delegate_); |
| 1257 MediaControls::Trace(visitor); | 1258 MediaControls::Trace(visitor); |
| 1258 HTMLDivElement::Trace(visitor); | 1259 HTMLDivElement::Trace(visitor); |
| 1259 } | 1260 } |
| 1260 | 1261 |
| 1261 } // namespace blink | 1262 } // namespace blink |
| OLD | NEW |