summaryrefslogtreecommitdiff
path: root/Source/WebKit2/UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-05-07 11:21:11 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-05-07 11:21:11 +0200
commit2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (patch)
tree988e8c5b116dd0466244ae2fe5af8ee9be926d76 /Source/WebKit2/UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp
parentdd91e772430dc294e3bf478c119ef8d43c0a3358 (diff)
downloadqtwebkit-2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47.tar.gz
Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)
Diffstat (limited to 'Source/WebKit2/UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp')
-rw-r--r--Source/WebKit2/UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp23
1 files changed, 20 insertions, 3 deletions
diff --git a/Source/WebKit2/UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp b/Source/WebKit2/UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp
index a136008cd..16147dccf 100644
--- a/Source/WebKit2/UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp
+++ b/Source/WebKit2/UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp
@@ -25,8 +25,8 @@
#include "WebContext.h"
#include "WebFullScreenManagerMessages.h"
#include "WebFullScreenManagerProxyMessages.h"
+#include "WebKitWebViewBasePrivate.h"
#include "WebProcess.h"
-
#include <WebCore/NotImplemented.h>
using namespace WebCore;
@@ -38,14 +38,31 @@ void WebFullScreenManagerProxy::invalidate()
m_webView = 0;
}
-void WebFullScreenManagerProxy::enterFullScreen()
+void WebFullScreenManagerProxy::close()
{
notImplemented();
}
-void WebFullScreenManagerProxy::exitFullScreen()
+bool WebFullScreenManagerProxy::isFullScreen()
{
notImplemented();
+ return false;
+}
+
+void WebFullScreenManagerProxy::enterFullScreen()
+{
+ if (!m_webView)
+ return;
+
+ webkitWebViewBaseEnterFullScreen(m_webView);
+}
+
+void WebFullScreenManagerProxy::exitFullScreen()
+{
+ if (!m_webView)
+ return;
+
+ webkitWebViewBaseExitFullScreen(m_webView);
}
void WebFullScreenManagerProxy::beganEnterFullScreen(const IntRect& initialFrame, const IntRect& finalFrame)