From 8d473cf9743f1d30a16a27114e93bd5af5648d23 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Fri, 18 May 2012 14:03:11 +0200
Subject: Imported WebKit commit 1350e72f7345ced9da2bd9980deeeb5a8d62fab4
 (http://svn.webkit.org/repository/webkit/trunk@117578)

Weekly snapshot
---
 Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp')

diff --git a/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp b/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp
index 8ba03f04a..950068d2f 100644
--- a/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp
+++ b/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp
@@ -340,11 +340,10 @@ void WebMediaPlayerClientImpl::pause()
 }
 
 #if USE(NATIVE_FULLSCREEN_VIDEO)
-bool WebMediaPlayerClientImpl::enterFullscreen() const
+void WebMediaPlayerClientImpl::enterFullscreen()
 {
     if (m_webMediaPlayer)
-        return m_webMediaPlayer->enterFullscreen();
-    return false;
+        m_webMediaPlayer->enterFullscreen();
 }
 
 void WebMediaPlayerClientImpl::exitFullscreen()
@@ -352,6 +351,11 @@ void WebMediaPlayerClientImpl::exitFullscreen()
     if (m_webMediaPlayer)
         m_webMediaPlayer->exitFullscreen();
 }
+
+bool WebMediaPlayerClientImpl::canEnterFullscreen() const
+{
+    return m_webMediaPlayer && m_webMediaPlayer->canEnterFullscreen();
+}
 #endif
 
 #if ENABLE(MEDIA_SOURCE)
-- 
cgit v1.2.1