diff options
| author | Steve Block <steveblock@google.com> | 2010-02-05 14:27:46 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-15 10:49:50 +0000 |
| commit | 5e2bc6953fe6923165b8a5d7679939693a1d58d6 (patch) | |
| tree | 6ccb8c24bc2bf5e8f413e6cfae250b729b426631 /WebCore/html/HTMLMediaElement.h | |
| parent | 4a00f4fccc3cb7e9996749a05631f5d7b9de756e (diff) | |
| download | external_webkit-5e2bc6953fe6923165b8a5d7679939693a1d58d6.zip external_webkit-5e2bc6953fe6923165b8a5d7679939693a1d58d6.tar.gz external_webkit-5e2bc6953fe6923165b8a5d7679939693a1d58d6.tar.bz2 | |
Merge webkit.org at r54340 : Initial merge by git
Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
Diffstat (limited to 'WebCore/html/HTMLMediaElement.h')
| -rw-r--r-- | WebCore/html/HTMLMediaElement.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/WebCore/html/HTMLMediaElement.h b/WebCore/html/HTMLMediaElement.h index 9ee2c25..45a41c6 100644 --- a/WebCore/html/HTMLMediaElement.h +++ b/WebCore/html/HTMLMediaElement.h @@ -102,7 +102,7 @@ public: void setAutobuffer(bool); PassRefPtr<TimeRanges> buffered() const; - void load(ExceptionCode&); + void load(bool isUserGesture, ExceptionCode&); String canPlayType(const String& mimeType) const; // ready state @@ -129,14 +129,8 @@ public: void setAutoplay(bool b); bool loop() const; void setLoop(bool b); - void play(); - void pause(); - -// fullscreen - void webkitEnterFullScreen(ExceptionCode&); - void webkitExitFullScreen(); - bool webkitSupportsFullscreen(); - bool webkitDisplayingFullscreen(); + void play(bool isUserGesture); + void pause(bool isUserGesture); // captions bool webkitHasClosedCaptions() const; @@ -177,6 +171,8 @@ public: bool closedCaptionsVisible() const; void setClosedCaptionsVisible(bool); + bool processingUserGesture() const; + protected: float getTimeOffsetAttribute(const QualifiedName&, float valueOnError) const; void setTimeOffsetAttribute(const QualifiedName&, float value); @@ -196,6 +192,7 @@ private: // MediaPlayerClient virtual void mediaPlayerReadyStateChanged(MediaPlayer*); virtual void mediaPlayerTimeChanged(MediaPlayer*); virtual void mediaPlayerVolumeChanged(MediaPlayer*); + virtual void mediaPlayerMuteChanged(MediaPlayer*); virtual void mediaPlayerDurationChanged(MediaPlayer*); virtual void mediaPlayerRateChanged(MediaPlayer*); virtual void mediaPlayerSawUnsupportedTracks(MediaPlayer*); @@ -246,7 +243,6 @@ private: void prepareForLoad(); - bool processingUserGesture() const; bool processingMediaPlayerCallback() const { return m_processingMediaPlayerCallback > 0; } void beginProcessingMediaPlayerCallback() { ++m_processingMediaPlayerCallback; } void endProcessingMediaPlayerCallback() { ASSERT(m_processingMediaPlayerCallback); --m_processingMediaPlayerCallback; } |