diff options
author | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-26 07:06:59 (GMT) |
---|---|---|
committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-26 07:06:59 (GMT) |
commit | 9a1ee410d24321e7eedaea6bb4f1b21fcc6fb427 (patch) | |
tree | 37ae0ceb0eb9d4f74683b02bf3187cfd7f694c6c /src/3rdparty/webkit/WebCore/html/HTMLMediaElement.h | |
parent | 2c0921b667ec74df6ad3d749b30bb9b7c5843343 (diff) | |
parent | 35c8033ff51ab6d0567e786b790b8cc49852803b (diff) | |
download | Qt-9a1ee410d24321e7eedaea6bb4f1b21fcc6fb427.zip Qt-9a1ee410d24321e7eedaea6bb4f1b21fcc6fb427.tar.gz Qt-9a1ee410d24321e7eedaea6bb4f1b21fcc6fb427.tar.bz2 |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/3rdparty/webkit/WebCore/html/HTMLMediaElement.h')
-rw-r--r-- | src/3rdparty/webkit/WebCore/html/HTMLMediaElement.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/html/HTMLMediaElement.h b/src/3rdparty/webkit/WebCore/html/HTMLMediaElement.h index aa8d5f7..0005e07 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLMediaElement.h +++ b/src/3rdparty/webkit/WebCore/html/HTMLMediaElement.h @@ -43,7 +43,7 @@ class HTMLSourceElement; class MediaError; class KURL; class TimeRanges; - + class HTMLMediaElement : public HTMLElement, public MediaPlayerClient { public: HTMLMediaElement(const QualifiedName&, Document*); @@ -57,6 +57,7 @@ public: virtual bool rendererIsNeeded(RenderStyle*); virtual RenderObject* createRenderer(RenderArena*, RenderStyle*); virtual void insertedIntoDocument(); + virtual void willRemove(); virtual void removedFromDocument(); virtual void attach(); virtual void recalcStyle(StyleChange); @@ -73,6 +74,8 @@ public: // Eventually overloaded in HTMLVideoElement virtual bool supportsFullscreen() const { return false; }; virtual bool supportsSave() const; + + PlatformMedia platformMedia() const; void scheduleLoad(); @@ -141,6 +144,8 @@ public: void beginScrubbing(); void endScrubbing(); + const IntRect screenRect(); + bool canPlay() const; float percentLoaded() const; @@ -154,6 +159,9 @@ public: #endif bool hasSingleSecurityOrigin() const { return !m_player || m_player->hasSingleSecurityOrigin(); } + + void enterFullscreen(); + void exitFullscreen(); protected: float getTimeOffsetAttribute(const QualifiedName&, float valueOnError) const; @@ -233,6 +241,7 @@ private: bool endedPlayback() const; bool stoppedDueToErrors() const; bool pausedForUserInteraction() const; + bool couldPlayIfEnoughData() const; float minTimeSeekable() const; float maxTimeSeekable() const; @@ -310,6 +319,8 @@ protected: // support progress events so setting m_sendProgressEvents disables them bool m_sendProgressEvents : 1; + bool m_isFullscreen : 1; + #if ENABLE(PLUGIN_PROXY_FOR_VIDEO) bool m_needWidgetUpdate : 1; #endif |