diff options
| author | Steve Block <steveblock@google.com> | 2009-12-17 09:55:06 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-17 09:55:06 -0800 |
| commit | b880d713c04257ca40abfef97c300afdead423b8 (patch) | |
| tree | 6982576c228bcd1a7efe98afed544d840751094c /WebCore/html/HTMLVideoElement.cpp | |
| parent | e2e7a5c57b53f01e63a0245b4420d54b454cb373 (diff) | |
| parent | 643ca7872b450ea4efacab6188849e5aac2ba161 (diff) | |
| download | external_webkit-b880d713c04257ca40abfef97c300afdead423b8.zip external_webkit-b880d713c04257ca40abfef97c300afdead423b8.tar.gz external_webkit-b880d713c04257ca40abfef97c300afdead423b8.tar.bz2 | |
am 643ca787: Merge webkit.org at r51976 : Initial merge by git.
Merge commit '643ca7872b450ea4efacab6188849e5aac2ba161' into eclair-mr2-plus-aosp
* commit '643ca7872b450ea4efacab6188849e5aac2ba161':
Merge webkit.org at r51976 : Initial merge by git.
Diffstat (limited to 'WebCore/html/HTMLVideoElement.cpp')
| -rw-r--r-- | WebCore/html/HTMLVideoElement.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/WebCore/html/HTMLVideoElement.cpp b/WebCore/html/HTMLVideoElement.cpp index 5bbc167..d0b1042 100644 --- a/WebCore/html/HTMLVideoElement.cpp +++ b/WebCore/html/HTMLVideoElement.cpp @@ -35,6 +35,7 @@ #include "HTMLImageLoader.h" #include "HTMLNames.h" #include "MappedAttribute.h" +#include "Page.h" #include "RenderImage.h" #include "RenderVideo.h" @@ -119,9 +120,10 @@ bool HTMLVideoElement::supportsFullscreen() const if (!page) return false; - if (!m_player || !m_player->supportsFullscreen()) + if (!m_player || !m_player->supportsFullscreen() || !m_player->hasVideo()) return false; - + + // Check with the platform client. return page->chrome()->client()->supportsFullscreenForNode(this); } |