From 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Thu, 2 Jun 2011 12:07:03 +0100
Subject: Merge WebKit at r84325: Initial merge by git.

Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
---
 Source/WebCore/html/HTMLVideoElement.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'Source/WebCore/html/HTMLVideoElement.cpp')

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();
-- 
cgit v1.1