Changeset 112867 in webkit

Timestamp:

Apr 2, 2012 6:06:37 AM (12 years ago)

Author:

Philippe Normand

Message:

[GTK][WK2] Initial FullScreen support
​https://bugs.webkit.org/show_bug.cgi?id=75553

Reviewed by Martin Robinson.

Full screen display support in WebKitWebViewBase. Two functions
have been added to handle this. They're called by the
WebFullScreenManagerProxy when full screen display needs to be
managed for an HTML element.

• UIProcess/API/gtk/WebKitWebViewBase.cpp:

(_WebKitWebViewBasePrivate):
(webkitWebViewBaseCreateWebPage):
(onFullscreenGtkKeyPressEvent):
(webkitWebViewBaseEnterFullScreen):
(webkitWebViewBaseExitFullScreen):

• UIProcess/API/gtk/WebKitWebViewBasePrivate.h:
• UIProcess/WebFullScreenManagerProxy.h:

(WebKit):

• UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp:

(WebKit::WebFullScreenManagerProxy::enterFullScreen):
(WebKit::WebFullScreenManagerProxy::exitFullScreen):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/WebKitWebViewBase.cpp (modified) (5 diffs)
• UIProcess/API/gtk/WebKitWebViewBasePrivate.h (modified) (1 diff)
• UIProcess/WebFullScreenManagerProxy.h (modified) (2 diffs)
• UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-03-16  Philippe Normand  <pnormand@igalia.com>
+
+        [GTK][WK2] Initial FullScreen support
+        https://bugs.webkit.org/show_bug.cgi?id=75553
+
+        Reviewed by Martin Robinson.
+
+        Full screen display support in WebKitWebViewBase. Two functions
+        have been added to handle this. They're called by the
+        WebFullScreenManagerProxy when full screen display needs to be
+        managed for an HTML element.
+
+        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+        (_WebKitWebViewBasePrivate):
+        (webkitWebViewBaseCreateWebPage):
+        (onFullscreenGtkKeyPressEvent):
+        (webkitWebViewBaseEnterFullScreen):
+        (webkitWebViewBaseExitFullScreen):
+        * UIProcess/API/gtk/WebKitWebViewBasePrivate.h:
+        * UIProcess/WebFullScreenManagerProxy.h:
+        (WebKit):
+        * UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp:
+        (WebKit::WebFullScreenManagerProxy::enterFullScreen):
+        (WebKit::WebFullScreenManagerProxy::exitFullScreen):
+
 2012-04-02  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp

@@ -53 +53 @@
 #include <WebCore/RefPtrCairo.h>
 #include <WebCore/Region.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkkeysyms.h>
 #include <wtf/gobject/GOwnPtr.h>
 #include <wtf/gobject/GRefPtr.h>
 #include <wtf/text/CString.h>
+
+#if ENABLE(FULLSCREEN_API)
+#include "WebFullScreenManagerProxy.h"
+#endif
 
 using namespace WebKit;
@@ -73 +79 @@
     GRefPtr<AtkObject> accessible;
     bool needsResizeOnMap;
+#if ENABLE(FULLSCREEN_API)
+    bool fullScreenModeActive;
+#endif
 };
 
@@ -277 +286 @@
     WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(widget);
     WebKitWebViewBasePrivate* priv = webViewBase->priv;
+
+#if ENABLE(FULLSCREEN_API)
+    if (priv->fullScreenModeActive) {
+        switch (event->keyval) {
+        case GDK_KEY_Escape:
+        case GDK_KEY_f:
+        case GDK_KEY_F:
+            webkitWebViewBaseExitFullScreen(webViewBase);
+            break;
+        default:
+            break;
+        }
+
+        return TRUE;
+    }
+#endif
 
     // Since WebProcess key event handling is not synchronous, handle the event in two passes.
@@ -530 +555 @@
     priv->pageProxy = toImpl(context)->createWebPage(priv->pageClient.get(), toImpl(pageGroup));
     priv->pageProxy->initializeWebPage();
+
+#if ENABLE(FULLSCREEN_API)
+    priv->pageProxy->fullScreenManager()->setWebView(webkitWebViewBase);
+#endif
 }
 
@@ -577 +606 @@
     webkitWebViewBase->priv->shouldForwardNextKeyEvent = TRUE;
 }
+
+void webkitWebViewBaseEnterFullScreen(WebKitWebViewBase* webkitWebViewBase)
+{
+#if ENABLE(FULLSCREEN_API)
+    WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
+    if (priv->fullScreenModeActive)
+        return;
+
+    WebFullScreenManagerProxy* fullScreenManagerProxy = priv->pageProxy->fullScreenManager();
+
+    fullScreenManagerProxy->willEnterFullScreen();
+
+    GtkWidget* topLevelWindow = gtk_widget_get_toplevel(GTK_WIDGET(webkitWebViewBase));
+    if (gtk_widget_is_toplevel(topLevelWindow))
+        gtk_window_fullscreen(GTK_WINDOW(topLevelWindow));
+    fullScreenManagerProxy->didEnterFullScreen();
+    priv->fullScreenModeActive = true;
+#endif
+}
+
+void webkitWebViewBaseExitFullScreen(WebKitWebViewBase* webkitWebViewBase)
+{
+#if ENABLE(FULLSCREEN_API)
+    WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
+    if (!priv->fullScreenModeActive)
+        return;
+
+    WebFullScreenManagerProxy* fullScreenManagerProxy = priv->pageProxy->fullScreenManager();
+    fullScreenManagerProxy->willExitFullScreen();
+
+    GtkWidget* topLevelWindow = gtk_widget_get_toplevel(GTK_WIDGET(webkitWebViewBase));
+    if (gtk_widget_is_toplevel(topLevelWindow))
+        gtk_window_unfullscreen(GTK_WINDOW(topLevelWindow));
+    fullScreenManagerProxy->didExitFullScreen();
+    priv->fullScreenModeActive = false;
+#endif
+}

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h

@@ -51 +51 @@
 void webkitWebViewBaseStartDrag(WebKitWebViewBase*, const WebCore::DragData&, PassRefPtr<ShareableBitmap> dragImage);
 
+void webkitWebViewBaseEnterFullScreen(WebKitWebViewBase*);
+void webkitWebViewBaseExitFullScreen(WebKitWebViewBase*);
+
 G_END_DECLS
 

trunk/Source/WebKit2/UIProcess/WebFullScreenManagerProxy.h

@@ -45 +45 @@
 #if PLATFORM(MAC)
 OBJC_CLASS WKView;
+#elif PLATFORM(GTK)
+typedef struct _WebKitWebViewBase WebKitWebViewBase;
 #endif
 
@@ -58 +60 @@
 typedef QObject PlatformWebView;
 #elif PLATFORM(GTK)
-class WebView;
-typedef WebView PlatformWebView;
+typedef WebKitWebViewBase PlatformWebView;
 #endif
 

trunk/Source/WebKit2/UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp

@@ -26 +26 @@
 #include "WebFullScreenManagerMessages.h"
 #include "WebFullScreenManagerProxyMessages.h"
+#include "WebKitWebViewBasePrivate.h"
 #include "WebProcess.h"
-
 #include <WebCore/NotImplemented.h>
 
@@ -41 +41 @@
 void WebFullScreenManagerProxy::enterFullScreen()
 {
-    notImplemented();
+    if (!m_webView)
+        return;
+
+    webkitWebViewBaseEnterFullScreen(m_webView);
 }
 
 void WebFullScreenManagerProxy::exitFullScreen()
 {
-    notImplemented();
+    if (!m_webView)
+        return;
+
+    webkitWebViewBaseExitFullScreen(m_webView);
 }