| 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 private: | 69 private: |
| 70 explicit MediaControls(HTMLMediaElement&); | 70 explicit MediaControls(HTMLMediaElement&); |
| 71 | 71 |
| 72 bool initializeControls(); | 72 bool initializeControls(); |
| 73 | 73 |
| 74 void makeOpaque(); | 74 void makeOpaque(); |
| 75 void makeTransparent(); | 75 void makeTransparent(); |
| 76 | 76 |
| 77 void updatePlayState(); | 77 void updatePlayState(); |
| 78 | 78 |
| 79 bool shouldHideFullscreenControls(); | 79 bool shouldHideMediaControls(); |
| 80 void hideFullscreenControlsTimerFired(Timer<MediaControls>*); | 80 void hideMediaControlsTimerFired(Timer<MediaControls>*); |
| 81 void startHideFullscreenControlsTimer(); | 81 void startHideMediaControlsTimer(); |
| 82 void stopHideFullscreenControlsTimer(); | 82 void stopHideMediaControlsTimer(); |
| 83 | 83 |
| 84 void createTextTrackDisplay(); | 84 void createTextTrackDisplay(); |
| 85 void showTextTrackDisplay(); | 85 void showTextTrackDisplay(); |
| 86 void hideTextTrackDisplay(); | 86 void hideTextTrackDisplay(); |
| 87 | 87 |
| 88 // Node | 88 // Node |
| 89 virtual bool isMediaControls() const OVERRIDE { return true; } | 89 virtual bool isMediaControls() const OVERRIDE { return true; } |
| 90 virtual bool willRespondToMouseMoveEvents() OVERRIDE { return true; } | 90 virtual bool willRespondToMouseMoveEvents() OVERRIDE { return true; } |
| 91 virtual void defaultEventHandler(Event*) OVERRIDE; | 91 virtual void defaultEventHandler(Event*) OVERRIDE; |
| 92 bool containsRelatedTarget(Event*); | 92 bool containsRelatedTarget(Event*); |
| (...skipping 15 matching lines...) Expand all Loading... |
| 108 MediaControlPlayButtonElement* m_playButton; | 108 MediaControlPlayButtonElement* m_playButton; |
| 109 MediaControlCurrentTimeDisplayElement* m_currentTimeDisplay; | 109 MediaControlCurrentTimeDisplayElement* m_currentTimeDisplay; |
| 110 MediaControlTimelineElement* m_timeline; | 110 MediaControlTimelineElement* m_timeline; |
| 111 MediaControlMuteButtonElement* m_muteButton; | 111 MediaControlMuteButtonElement* m_muteButton; |
| 112 MediaControlVolumeSliderElement* m_volumeSlider; | 112 MediaControlVolumeSliderElement* m_volumeSlider; |
| 113 MediaControlToggleClosedCaptionsButtonElement* m_toggleClosedCaptionsButton; | 113 MediaControlToggleClosedCaptionsButtonElement* m_toggleClosedCaptionsButton; |
| 114 MediaControlFullscreenButtonElement* m_fullScreenButton; | 114 MediaControlFullscreenButtonElement* m_fullScreenButton; |
| 115 MediaControlTimeRemainingDisplayElement* m_durationDisplay; | 115 MediaControlTimeRemainingDisplayElement* m_durationDisplay; |
| 116 MediaControlPanelEnclosureElement* m_enclosure; | 116 MediaControlPanelEnclosureElement* m_enclosure; |
| 117 | 117 |
| 118 Timer<MediaControls> m_hideFullscreenControlsTimer; | 118 Timer<MediaControls> m_hideMediaControlsTimer; |
| 119 bool m_isFullscreen : 1; | |
| 120 bool m_isMouseOverControls : 1; | 119 bool m_isMouseOverControls : 1; |
| 121 bool m_isPausedForScrubbing : 1; | 120 bool m_isPausedForScrubbing : 1; |
| 122 }; | 121 }; |
| 123 | 122 |
| 124 DEFINE_ELEMENT_TYPE_CASTS(MediaControls, isMediaControls()); | 123 DEFINE_ELEMENT_TYPE_CASTS(MediaControls, isMediaControls()); |
| 125 | 124 |
| 126 } | 125 } |
| 127 | 126 |
| 128 #endif | 127 #endif |
| OLD | NEW |