Index: Source/core/html/shadow/MediaControls.h |
diff --git a/Source/core/html/shadow/MediaControls.h b/Source/core/html/shadow/MediaControls.h |
index 41e4e4335d506356452165f2d453e3f052fb7165..53324a8dbc11611b649660b382f3f7fbb986d843 100644 |
--- a/Source/core/html/shadow/MediaControls.h |
+++ b/Source/core/html/shadow/MediaControls.h |
@@ -53,9 +53,6 @@ public: |
void show(); |
void hide(); |
- void makeOpaque(); |
- void makeTransparent(); |
- virtual bool shouldHideControls(); |
void bufferingProgressed(); |
virtual void playbackStarted(); |
@@ -75,7 +72,20 @@ public: |
void enteredFullscreen(); |
void exitedFullscreen(); |
- virtual bool willRespondToMouseMoveEvents() OVERRIDE { return true; } |
+ void updateTextTrackDisplay(); |
+ |
+protected: |
+ explicit MediaControls(Document&); |
+ |
+ bool initializeControls(Document&); |
+ |
+ virtual bool shouldHideControls(); |
+ |
+ virtual void insertTextTrackContainer(PassRefPtr<MediaControlTextTrackContainerElement>); |
+ |
+private: |
+ void makeOpaque(); |
+ void makeTransparent(); |
void hideFullscreenControlsTimerFired(Timer<MediaControls>*); |
void startHideFullscreenControlsTimer(); |
@@ -84,16 +94,13 @@ public: |
void createTextTrackDisplay(); |
void showTextTrackDisplay(); |
void hideTextTrackDisplay(); |
- void updateTextTrackDisplay(); |
- virtual void insertTextTrackContainer(PassRefPtr<MediaControlTextTrackContainerElement>); |
-protected: |
- explicit MediaControls(Document&); |
+ virtual bool isMediaControls() const OVERRIDE FINAL { return true; } |
- bool initializeControls(Document&); |
+ virtual const AtomicString& shadowPseudoId() const OVERRIDE; |
+ virtual bool willRespondToMouseMoveEvents() OVERRIDE { return true; } |
acolwell GONE FROM CHROMIUM
2014/02/07 22:08:40
nit: Please add a comment indicating that these ar
philipj_slow
2014/02/08 04:00:24
Done.
|
virtual void defaultEventHandler(Event*) OVERRIDE; |
- |
bool containsRelatedTarget(Event*); |
MediaControllerInterface* m_mediaController; |
@@ -112,18 +119,12 @@ protected: |
MediaControlPanelVolumeSliderElement* m_volumeSlider; |
MediaControlToggleClosedCaptionsButtonElement* m_toggleClosedCaptionsButton; |
MediaControlFullscreenButtonElement* m_fullScreenButton; |
+ MediaControlTimeRemainingDisplayElement* m_durationDisplay; |
+ MediaControlPanelEnclosureElement* m_enclosure; |
Timer<MediaControls> m_hideFullscreenControlsTimer; |
bool m_isFullscreen; |
bool m_isMouseOverControls; |
- |
-private: |
- virtual bool isMediaControls() const OVERRIDE FINAL { return true; } |
- |
- virtual const AtomicString& shadowPseudoId() const OVERRIDE; |
- |
- MediaControlTimeRemainingDisplayElement* m_durationDisplay; |
- MediaControlPanelEnclosureElement* m_enclosure; |
}; |
DEFINE_NODE_TYPE_CASTS(MediaControls, isMediaControls()); |