diff options
author | Steve Block <steveblock@google.com> | 2009-10-08 17:19:54 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2009-10-20 00:41:58 +0100 |
commit | 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf (patch) | |
tree | a6c7e2d6cd7bfa7011cc39abbb436142d7a4a7c8 /WebCore/rendering/RenderMedia.h | |
parent | e196732677050bd463301566a68a643b6d14b907 (diff) | |
download | external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.zip external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.gz external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.bz2 |
Merge webkit.org at R49305 : Automatic merge by git.
Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
Diffstat (limited to 'WebCore/rendering/RenderMedia.h')
-rw-r--r-- | WebCore/rendering/RenderMedia.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/WebCore/rendering/RenderMedia.h b/WebCore/rendering/RenderMedia.h index 5697bda..602cd26 100644 --- a/WebCore/rendering/RenderMedia.h +++ b/WebCore/rendering/RenderMedia.h @@ -41,10 +41,12 @@ class MediaControlSeekButtonElement; class MediaControlRewindButtonElement; class MediaControlReturnToRealtimeButtonElement; class MediaControlTimelineElement; +class MediaControlVolumeSliderElement; class MediaControlFullscreenButtonElement; class MediaControlTimeDisplayElement; class MediaControlStatusDisplayElement; class MediaControlTimelineContainerElement; +class MediaControlVolumeSliderContainerElement; class MediaControlElement; class MediaPlayer; @@ -60,8 +62,6 @@ public: HTMLMediaElement* mediaElement() const; MediaPlayer* player() const; - static String formatTime(float time); - bool shouldShowTimeDisplayControls() const; void updateFromElement(); @@ -99,6 +99,8 @@ private: void createStatusDisplay(); void createTimelineContainer(); void createTimeline(); + void createVolumeSliderContainer(); + void createVolumeSlider(); void createCurrentTimeDisplay(); void createTimeRemainingDisplay(); void createFullscreenButton(); @@ -109,6 +111,8 @@ private: void changeOpacity(HTMLElement*, float opacity); void opacityAnimationTimerFired(Timer<RenderMedia>*); + void updateVolumeSliderContainer(bool visible); + virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle); RefPtr<HTMLElement> m_controlsShadowRoot; @@ -120,8 +124,10 @@ private: RefPtr<MediaControlRewindButtonElement> m_rewindButton; RefPtr<MediaControlReturnToRealtimeButtonElement> m_returnToRealtimeButton; RefPtr<MediaControlTimelineElement> m_timeline; + RefPtr<MediaControlVolumeSliderElement> m_volumeSlider; RefPtr<MediaControlFullscreenButtonElement> m_fullscreenButton; RefPtr<MediaControlTimelineContainerElement> m_timelineContainer; + RefPtr<MediaControlVolumeSliderContainerElement> m_volumeSliderContainer; RefPtr<MediaControlTimeDisplayElement> m_currentTimeDisplay; RefPtr<MediaControlTimeDisplayElement> m_timeRemainingDisplay; RefPtr<MediaControlStatusDisplayElement> m_statusDisplay; |