Changeset 160303 in webkit

Timestamp:

Dec 9, 2013 1:54:09 AM (10 years ago)

Author:

zandobersek@gmail.com

Message:

[GTK][WK2] Move WebFullScreenManagerProxyGtk logic to PageClientImpl
​https://bugs.webkit.org/show_bug.cgi?id=125440

Reviewed by Martin Robinson.

Make PageClientImpl a WebFullScreenManagerProxyClient. This brings the GTK port in line
with changes in r160296 and fixes the WK2 build for that port.

• GNUmakefile.list.am:
• UIProcess/API/gtk/PageClientImpl.cpp:

(WebKit::PageClientImpl::fullScreenManagerProxyClient):
(WebKit::PageClientImpl::closeFullScreenManager):
(WebKit::PageClientImpl::isFullScreen):
(WebKit::PageClientImpl::enterFullScreen):
(WebKit::PageClientImpl::exitFullScreen):
(WebKit::PageClientImpl::beganEnterFullScreen):
(WebKit::PageClientImpl::beganExitFullScreen):

• UIProcess/API/gtk/PageClientImpl.h:
• UIProcess/API/gtk/WebKitWebViewBase.cpp:

(webkitWebViewBaseCreateWebPage):

• UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.list.am (modified) (1 diff)
• UIProcess/API/gtk/PageClientImpl.cpp (modified) (1 diff)
• UIProcess/API/gtk/PageClientImpl.h (modified) (4 diffs)
• UIProcess/API/gtk/WebKitWebViewBase.cpp (modified) (1 diff)
• UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp (deleted)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-09  Zan Dobersek  <zdobersek@igalia.com>
+
+        [GTK][WK2] Move WebFullScreenManagerProxyGtk logic to PageClientImpl
+        https://bugs.webkit.org/show_bug.cgi?id=125440
+
+        Reviewed by Martin Robinson.
+
+        Make PageClientImpl a WebFullScreenManagerProxyClient. This brings the GTK port in line
+        with changes in r160296 and fixes the WK2 build for that port.
+
+        * GNUmakefile.list.am:
+        * UIProcess/API/gtk/PageClientImpl.cpp:
+        (WebKit::PageClientImpl::fullScreenManagerProxyClient):
+        (WebKit::PageClientImpl::closeFullScreenManager):
+        (WebKit::PageClientImpl::isFullScreen):
+        (WebKit::PageClientImpl::enterFullScreen):
+        (WebKit::PageClientImpl::exitFullScreen):
+        (WebKit::PageClientImpl::beganEnterFullScreen):
+        (WebKit::PageClientImpl::beganExitFullScreen):
+        * UIProcess/API/gtk/PageClientImpl.h:
+        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+        (webkitWebViewBaseCreateWebPage):
+        * UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp:
+
 2013-12-09  Brian Holt  <brian.holt@samsung.com>
 

trunk/Source/WebKit2/GNUmakefile.list.am

@@ -895 +895 @@
         Source/WebKit2/UIProcess/gtk/WebFullScreenClientGtk.cpp \
         Source/WebKit2/UIProcess/gtk/WebFullScreenClientGtk.h \
-        Source/WebKit2/UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp \
         Source/WebKit2/UIProcess/gtk/WebInspectorClientGtk.cpp \
         Source/WebKit2/UIProcess/gtk/WebInspectorClientGtk.h \

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

@@ -290 +290 @@
 }
 
+#if ENABLE(FULLSCREEN_API)
+WebFullScreenManagerProxyClient& PageClientImpl::fullScreenManagerProxyClient()
+{
+    return *this;
+}
+
+void PageClientImpl::closeFullScreenManager()
+{
+    notImplemented();
+}
+
+bool PageClientImpl::isFullScreen()
+{
+    notImplemented();
+    return false;
+}
+
+void PageClientImpl::enterFullScreen()
+{
+    if (!m_viewWidget)
+        return;
+
+    webkitWebViewBaseEnterFullScreen(WEBKIT_WEB_VIEW_BASE(m_viewWidget));
+}
+
+void PageClientImpl::exitFullScreen()
+{
+    if (!m_viewWidget)
+        return;
+
+    webkitWebViewBaseExitFullScreen(WEBKIT_WEB_VIEW_BASE(m_viewWidget));
+}
+
+void PageClientImpl::beganEnterFullScreen(const IntRect& initialFrame, const IntRect& finalFrame)
+{
+    notImplemented();
+}
+
+void PageClientImpl::beganExitFullScreen(const IntRect& initialFrame, const IntRect& finalFrame)
+{
+    notImplemented();
+}
+
+#endif // ENABLE(FULLSCREEN_API)
+
 } // namespace WebKit

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

@@ -32 +32 @@
 #include "KeyBindingTranslator.h"
 #include "PageClient.h"
+#include "WebFullScreenManagerProxy.h"
 #include "WebPageProxy.h"
 #include "WindowsKeyboardCodes.h"
@@ -42 +43 @@
 class WebPageNamespace;
 
-class PageClientImpl : public PageClient {
+class PageClientImpl : public PageClient
+#if ENABLE(FULLSCREEN_API)
+    , public WebFullScreenManagerProxyClient
+#endif
+{
 public:
     ~PageClientImpl();
@@ -55 +60 @@
     explicit PageClientImpl(GtkWidget*);
 
+    // PageClient
     virtual std::unique_ptr<DrawingAreaProxy> createDrawingAreaProxy() OVERRIDE;
     virtual void setViewNeedsDisplay(const WebCore::IntRect&) OVERRIDE;
@@ -102 +108 @@
     virtual void didCommitLoadForMainFrame() OVERRIDE;
 
+    // Auxiliary Client Creation
+#if ENABLE(FULLSCREEN_API)
+    virtual WebFullScreenManagerProxyClient& fullScreenManagerProxyClient() FINAL;
+#endif
+
+#if ENABLE(FULLSCREEN_API)
+    // WebFullScreenManagerProxyClient
+    virtual void closeFullScreenManager() OVERRIDE;
+    virtual bool isFullScreen() OVERRIDE;
+    virtual void enterFullScreen() OVERRIDE;
+    virtual void exitFullScreen() OVERRIDE;
+    virtual void beganEnterFullScreen(const WebCore::IntRect& initialFrame, const WebCore::IntRect& finalFrame) OVERRIDE;
+    virtual void beganExitFullScreen(const WebCore::IntRect& initialFrame, const WebCore::IntRect& finalFrame) OVERRIDE;
+#endif
+
     // Members of PageClientImpl class
     GtkWidget* m_viewWidget;

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

@@ -935 +935 @@
     priv->pageProxy->initializeWebPage();
 
-#if ENABLE(FULLSCREEN_API)
-    priv->pageProxy->fullScreenManager()->setWebView(webkitWebViewBase);
-#endif
-
 #if USE(TEXTURE_MAPPER_GL)
     if (priv->redirectedWindow)