summaryrefslogtreecommitdiffstats
path: root/WebCore/rendering/RenderMedia.h
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2009-12-17 10:00:51 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-17 10:00:51 -0800
commitbc0688665b65cce4fec4a58f289e8fbac55af976 (patch)
tree36882563e661afd21008ad31d761f1e5a170f9eb /WebCore/rendering/RenderMedia.h
parent9443700060dfd3b488a3bdf30cfa547135478a7f (diff)
parentb880d713c04257ca40abfef97c300afdead423b8 (diff)
downloadexternal_webkit-bc0688665b65cce4fec4a58f289e8fbac55af976.zip
external_webkit-bc0688665b65cce4fec4a58f289e8fbac55af976.tar.gz
external_webkit-bc0688665b65cce4fec4a58f289e8fbac55af976.tar.bz2
am b880d713: am 643ca787: Merge webkit.org at r51976 : Initial merge by git.
Merge commit 'b880d713c04257ca40abfef97c300afdead423b8' * commit 'b880d713c04257ca40abfef97c300afdead423b8': Merge webkit.org at r51976 : Initial merge by git.
Diffstat (limited to 'WebCore/rendering/RenderMedia.h')
-rw-r--r--WebCore/rendering/RenderMedia.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/WebCore/rendering/RenderMedia.h b/WebCore/rendering/RenderMedia.h
index 602cd26..066b83d 100644
--- a/WebCore/rendering/RenderMedia.h
+++ b/WebCore/rendering/RenderMedia.h
@@ -40,6 +40,7 @@ class MediaControlPlayButtonElement;
class MediaControlSeekButtonElement;
class MediaControlRewindButtonElement;
class MediaControlReturnToRealtimeButtonElement;
+class MediaControlToggleClosedCaptionsButtonElement;
class MediaControlTimelineElement;
class MediaControlVolumeSliderElement;
class MediaControlFullscreenButtonElement;
@@ -96,6 +97,7 @@ private:
void createSeekForwardButton();
void createRewindButton();
void createReturnToRealtimeButton();
+ void createToggleClosedCaptionsButton();
void createStatusDisplay();
void createTimelineContainer();
void createTimeline();
@@ -123,6 +125,7 @@ private:
RefPtr<MediaControlSeekButtonElement> m_seekForwardButton;
RefPtr<MediaControlRewindButtonElement> m_rewindButton;
RefPtr<MediaControlReturnToRealtimeButtonElement> m_returnToRealtimeButton;
+ RefPtr<MediaControlToggleClosedCaptionsButtonElement> m_toggleClosedCaptionsButton;
RefPtr<MediaControlTimelineElement> m_timeline;
RefPtr<MediaControlVolumeSliderElement> m_volumeSlider;
RefPtr<MediaControlFullscreenButtonElement> m_fullscreenButton;