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

Unified Diff: Source/core/html/shadow/MediaControls.h

Issue 130693008: DO NOT LAND MediaControls trybot run (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/html/HTMLMediaElement.cpp ('k') | Source/core/html/shadow/MediaControls.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/shadow/MediaControls.h
diff --git a/Source/core/html/shadow/MediaControls.h b/Source/core/html/shadow/MediaControls.h
index fb3a6d940943d32bff101becc2d36cdd610a0ff5..53324a8dbc11611b649660b382f3f7fbb986d843 100644
--- a/Source/core/html/shadow/MediaControls.h
+++ b/Source/core/html/shadow/MediaControls.h
@@ -41,60 +41,66 @@ class MediaPlayer;
class RenderBox;
class RenderMedia;
-// An abstract class with the media control elements that all ports support.
class MediaControls : public HTMLDivElement {
- public:
+public:
virtual ~MediaControls() {}
- // This function is to be implemented in your port-specific media
- // controls implementation since it will return a child instance.
static PassRefPtr<MediaControls> create(Document&);
virtual void setMediaController(MediaControllerInterface*);
- virtual void reset();
+ void reset();
- virtual void show();
- virtual void hide();
- virtual void makeOpaque();
- virtual void makeTransparent();
- virtual bool shouldHideControls();
+ void show();
+ void hide();
- virtual void bufferingProgressed();
+ void bufferingProgressed();
virtual void playbackStarted();
- virtual void playbackProgressed();
+ void playbackProgressed();
virtual void playbackStopped();
- virtual void updateStatusDisplay() { };
- virtual void updateCurrentTimeDisplay() = 0;
- virtual void showVolumeSlider();
-
- virtual void changedMute();
- virtual void changedVolume();
-
- virtual void changedClosedCaptionsVisibility();
- virtual void refreshClosedCaptionsButtonVisibility();
- virtual void closedCaptionTracksChanged();
+ void updateCurrentTimeDisplay();
+ void showVolumeSlider();
- virtual void enteredFullscreen();
- virtual void exitedFullscreen();
+ void changedMute();
+ void changedVolume();
- virtual bool willRespondToMouseMoveEvents() OVERRIDE { return true; }
+ void changedClosedCaptionsVisibility();
+ void refreshClosedCaptionsButtonVisibility();
+ void closedCaptionTracksChanged();
- virtual void hideFullscreenControlsTimerFired(Timer<MediaControls>*);
- virtual void startHideFullscreenControlsTimer();
- virtual void stopHideFullscreenControlsTimer();
+ void enteredFullscreen();
+ void exitedFullscreen();
- virtual void createTextTrackDisplay();
- virtual void showTextTrackDisplay();
- virtual void hideTextTrackDisplay();
- virtual void updateTextTrackDisplay();
+ void updateTextTrackDisplay();
protected:
explicit MediaControls(Document&);
- virtual void defaultEventHandler(Event*) OVERRIDE;
+ bool initializeControls(Document&);
+
+ virtual bool shouldHideControls();
+
+ virtual void insertTextTrackContainer(PassRefPtr<MediaControlTextTrackContainerElement>);
+
+private:
+ void makeOpaque();
+ void makeTransparent();
+
+ void hideFullscreenControlsTimerFired(Timer<MediaControls>*);
+ void startHideFullscreenControlsTimer();
+ void stopHideFullscreenControlsTimer();
+
+ void createTextTrackDisplay();
+ void showTextTrackDisplay();
+ void hideTextTrackDisplay();
+ virtual bool isMediaControls() const OVERRIDE FINAL { return true; }
+
+ virtual const AtomicString& shadowPseudoId() const OVERRIDE;
+
+ virtual bool willRespondToMouseMoveEvents() OVERRIDE { return true; }
+ virtual void defaultEventHandler(Event*) OVERRIDE;
bool containsRelatedTarget(Event*);
MediaControllerInterface* m_mediaController;
@@ -113,15 +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;
};
DEFINE_NODE_TYPE_CASTS(MediaControls, isMediaControls());
« no previous file with comments | « Source/core/html/HTMLMediaElement.cpp ('k') | Source/core/html/shadow/MediaControls.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698