<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[160303] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/160303">160303</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2013-12-09 01:54:09 -0800 (Mon, 09 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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 <a href="http://trac.webkit.org/projects/webkit/changeset/160296">r160296</a> 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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2GNUmakefilelistam">trunk/Source/WebKit2/GNUmakefile.list.am</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkPageClientImplcpp">trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkPageClientImplh">trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebFullScreenManagerProxyGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160302 => 160303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-09 09:37:23 UTC (rev 160302)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-09 09:54:09 UTC (rev 160303)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+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:
+
</ins><span class="cx"> 2013-12-09 Brian Holt <brian.holt@samsung.com>
</span><span class="cx">
</span><span class="cx"> [WK2][Gtk] Add support for ENABLE_NETWORK_PROCESS to the build system
</span></span></pre></div>
<a id="trunkSourceWebKit2GNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/GNUmakefile.list.am (160302 => 160303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/GNUmakefile.list.am 2013-12-09 09:37:23 UTC (rev 160302)
+++ trunk/Source/WebKit2/GNUmakefile.list.am 2013-12-09 09:54:09 UTC (rev 160303)
</span><span class="lines">@@ -894,7 +894,6 @@
</span><span class="cx"> Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.h \
</span><span class="cx"> Source/WebKit2/UIProcess/gtk/WebFullScreenClientGtk.cpp \
</span><span class="cx"> Source/WebKit2/UIProcess/gtk/WebFullScreenClientGtk.h \
</span><del>- Source/WebKit2/UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp \
</del><span class="cx"> Source/WebKit2/UIProcess/gtk/WebInspectorClientGtk.cpp \
</span><span class="cx"> Source/WebKit2/UIProcess/gtk/WebInspectorClientGtk.h \
</span><span class="cx"> Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp \
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkPageClientImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp (160302 => 160303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2013-12-09 09:37:23 UTC (rev 160302)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2013-12-09 09:54:09 UTC (rev 160303)
</span><span class="lines">@@ -289,4 +289,49 @@
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#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)
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkPageClientImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h (160302 => 160303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2013-12-09 09:37:23 UTC (rev 160302)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2013-12-09 09:54:09 UTC (rev 160303)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "DefaultUndoController.h"
</span><span class="cx"> #include "KeyBindingTranslator.h"
</span><span class="cx"> #include "PageClient.h"
</span><ins>+#include "WebFullScreenManagerProxy.h"
</ins><span class="cx"> #include "WebPageProxy.h"
</span><span class="cx"> #include "WindowsKeyboardCodes.h"
</span><span class="cx"> #include <WebCore/IntSize.h>
</span><span class="lines">@@ -41,7 +42,11 @@
</span><span class="cx"> class DrawingAreaProxy;
</span><span class="cx"> class WebPageNamespace;
</span><span class="cx">
</span><del>-class PageClientImpl : public PageClient {
</del><ins>+class PageClientImpl : public PageClient
+#if ENABLE(FULLSCREEN_API)
+ , public WebFullScreenManagerProxyClient
+#endif
+{
</ins><span class="cx"> public:
</span><span class="cx"> ~PageClientImpl();
</span><span class="cx"> static PassOwnPtr<PageClientImpl> create(GtkWidget* viewWidget)
</span><span class="lines">@@ -54,6 +59,7 @@
</span><span class="cx"> private:
</span><span class="cx"> explicit PageClientImpl(GtkWidget*);
</span><span class="cx">
</span><ins>+ // PageClient
</ins><span class="cx"> virtual std::unique_ptr<DrawingAreaProxy> createDrawingAreaProxy() OVERRIDE;
</span><span class="cx"> virtual void setViewNeedsDisplay(const WebCore::IntRect&) OVERRIDE;
</span><span class="cx"> virtual void displayView() OVERRIDE;
</span><span class="lines">@@ -101,6 +107,21 @@
</span><span class="cx"> virtual void handleDownloadRequest(DownloadProxy*) OVERRIDE;
</span><span class="cx"> virtual void didCommitLoadForMainFrame() OVERRIDE;
</span><span class="cx">
</span><ins>+ // 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
+
</ins><span class="cx"> // Members of PageClientImpl class
</span><span class="cx"> GtkWidget* m_viewWidget;
</span><span class="cx"> DefaultUndoController m_undoController;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (160302 => 160303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2013-12-09 09:37:23 UTC (rev 160302)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2013-12-09 09:54:09 UTC (rev 160303)
</span><span class="lines">@@ -934,10 +934,6 @@
</span><span class="cx"> priv->pageProxy = context->createWebPage(*priv->pageClient, pageGroup);
</span><span class="cx"> priv->pageProxy->initializeWebPage();
</span><span class="cx">
</span><del>-#if ENABLE(FULLSCREEN_API)
- priv->pageProxy->fullScreenManager()->setWebView(webkitWebViewBase);
-#endif
-
</del><span class="cx"> #if USE(TEXTURE_MAPPER_GL)
</span><span class="cx"> if (priv->redirectedWindow)
</span><span class="cx"> priv->pageProxy->setAcceleratedCompositingWindowId(priv->redirectedWindow->windowId());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebFullScreenManagerProxyGtkcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp (160302 => 160303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp 2013-12-09 09:37:23 UTC (rev 160302)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp 2013-12-09 09:54:09 UTC (rev 160303)
</span><span class="lines">@@ -1,81 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Igalia S.L.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-#include "WebFullScreenManagerProxy.h"
-
-#if ENABLE(FULLSCREEN_API)
-
-#include "WebContext.h"
-#include "WebFullScreenManagerMessages.h"
-#include "WebFullScreenManagerProxyMessages.h"
-#include "WebKitWebViewBasePrivate.h"
-#include "WebProcess.h"
-#include <WebCore/NotImplemented.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-void WebFullScreenManagerProxy::invalidate()
-{
- m_page->process().removeMessageReceiver(Messages::WebFullScreenManagerProxy::messageReceiverName(), m_page->pageID());
- m_webView = 0;
-}
-
-void WebFullScreenManagerProxy::close()
-{
- notImplemented();
-}
-
-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)
-{
- notImplemented();
-}
-
-void WebFullScreenManagerProxy::beganExitFullScreen(const IntRect& initialFrame, const IntRect& finalFrame)
-{
- notImplemented();
-}
-
-} // namespace WebKit
-
-#endif // ENABLE(FULLSCREEN_API)
</del></span></pre>
</div>
</div>
</body>
</html>