| 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 834 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 845 } | 845 } |
| 846 | 846 |
| 847 void MediaControls::onPlay() { | 847 void MediaControls::onPlay() { |
| 848 updatePlayState(); | 848 updatePlayState(); |
| 849 m_timeline->setPosition(mediaElement().currentTime()); | 849 m_timeline->setPosition(mediaElement().currentTime()); |
| 850 updateCurrentTimeDisplay(); | 850 updateCurrentTimeDisplay(); |
| 851 | 851 |
| 852 startHideMediaControlsTimer(); | 852 startHideMediaControlsTimer(); |
| 853 } | 853 } |
| 854 | 854 |
| 855 void MediaControls::onPlaying() { |
| 856 m_timeline->onPlaying(); |
| 857 } |
| 858 |
| 855 void MediaControls::onPause() { | 859 void MediaControls::onPause() { |
| 856 updatePlayState(); | 860 updatePlayState(); |
| 857 m_timeline->setPosition(mediaElement().currentTime()); | 861 m_timeline->setPosition(mediaElement().currentTime()); |
| 858 updateCurrentTimeDisplay(); | 862 updateCurrentTimeDisplay(); |
| 859 makeOpaque(); | 863 makeOpaque(); |
| 860 | 864 |
| 861 stopHideMediaControlsTimer(); | 865 stopHideMediaControlsTimer(); |
| 862 } | 866 } |
| 863 | 867 |
| 864 void MediaControls::onTextTracksAddedOrRemoved() { | 868 void MediaControls::onTextTracksAddedOrRemoved() { |
| (...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1100 visitor->trace(m_overflowList); | 1104 visitor->trace(m_overflowList); |
| 1101 visitor->trace(m_castButton); | 1105 visitor->trace(m_castButton); |
| 1102 visitor->trace(m_overlayCastButton); | 1106 visitor->trace(m_overlayCastButton); |
| 1103 visitor->trace(m_mediaEventListener); | 1107 visitor->trace(m_mediaEventListener); |
| 1104 visitor->trace(m_windowEventListener); | 1108 visitor->trace(m_windowEventListener); |
| 1105 visitor->trace(m_orientationLockDelegate); | 1109 visitor->trace(m_orientationLockDelegate); |
| 1106 HTMLDivElement::trace(visitor); | 1110 HTMLDivElement::trace(visitor); |
| 1107 } | 1111 } |
| 1108 | 1112 |
| 1109 } // namespace blink | 1113 } // namespace blink |
| OLD | NEW |