diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
| commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
| tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebCore/html/HTMLVideoElement.cpp | |
| parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
| download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 | |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebCore/html/HTMLVideoElement.cpp')
| -rw-r--r-- | Source/WebCore/html/HTMLVideoElement.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/WebCore/html/HTMLVideoElement.cpp b/Source/WebCore/html/HTMLVideoElement.cpp index 4ddcdfe..5b7f42d 100644 --- a/Source/WebCore/html/HTMLVideoElement.cpp +++ b/Source/WebCore/html/HTMLVideoElement.cpp @@ -129,6 +129,11 @@ bool HTMLVideoElement::supportsFullscreen() const return false; // Check with the platform client. +#if ENABLE(FULLSCREEN_API) + if (page->chrome()->client()->supportsFullScreenForElement(this, false)) + return true; +#endif + return page->chrome()->client()->supportsFullscreenForNode(this); } @@ -183,7 +188,7 @@ void HTMLVideoElement::setDisplayMode(DisplayMode mode) if (oldMode != Video && player()) player()->prepareForRendering(); if (!hasAvailableVideoFrame()) - mode = Poster; + mode = PosterWaitingForVideo; } } else if (oldMode != Video && player()) player()->prepareForRendering(); |