Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(46)

Side by Side Diff: third_party/WebKit/Source/modules/media_controls/MediaControlsImpl.cpp

Issue 2938913002: Updates volume to change by .05 increments. (Closed)
Patch Set: Addresses comment 22. Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/media/controls/controls-video-keynav.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
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
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/media/controls/controls-video-keynav.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698