Diff
Modified: trunk/Source/WebKit2/ChangeLog (218063 => 218064)
--- trunk/Source/WebKit2/ChangeLog 2017-06-11 06:28:02 UTC (rev 218063)
+++ trunk/Source/WebKit2/ChangeLog 2017-06-11 06:30:12 UTC (rev 218064)
@@ -1,5 +1,38 @@
2017-06-10 Carlos Garcia Campos <[email protected]>
+ [GTK] Remove WKFullScreenClientGtk
+ https://bugs.webkit.org/show_bug.cgi?id=173140
+
+ Reviewed by Michael Catanzaro.
+
+ It's only used internally in the GTK+ API. Implementation is a lot simpler without using it, we can simply use
+ either WebKitWebView or WebKitWebViewBase from PageClient directly.
+
+ * PlatformGTK.cmake:
+ * UIProcess/API/C/gtk/WKFullScreenClientGtk.cpp: Removed.
+ * UIProcess/API/C/gtk/WKFullScreenClientGtk.h: Removed.
+ * UIProcess/API/gtk/PageClientImpl.cpp:
+ (WebKit::PageClientImpl::isFullScreen):
+ (WebKit::PageClientImpl::enterFullScreen):
+ (WebKit::PageClientImpl::exitFullScreen):
+ * UIProcess/API/gtk/WebKitFullscreenClient.cpp: Removed.
+ * UIProcess/API/gtk/WebKitFullscreenClient.h: Removed.
+ * UIProcess/API/gtk/WebKitPrivate.h:
+ * UIProcess/API/gtk/WebKitWebView.cpp:
+ (webkitWebViewConstructed):
+ (webkitWebViewEnterFullScreen):
+ (webkitWebViewExitFullScreen):
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseEnterFullScreen):
+ (webkitWebViewBaseExitFullScreen):
+ (webkitWebViewBaseIsFullScreen):
+ * UIProcess/API/gtk/WebKitWebViewBasePrivate.h:
+ * UIProcess/API/gtk/WebKitWebViewPrivate.h:
+ * UIProcess/gtk/WebFullScreenClientGtk.cpp: Removed.
+ * UIProcess/gtk/WebFullScreenClientGtk.h: Removed.
+
+2017-06-10 Carlos Garcia Campos <[email protected]>
+
[GTK] Handle page download request in WebKitWebView directly
https://bugs.webkit.org/show_bug.cgi?id=173137
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (218063 => 218064)
--- trunk/Source/WebKit2/PlatformGTK.cmake 2017-06-11 06:28:02 UTC (rev 218063)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2017-06-11 06:30:12 UTC (rev 218064)
@@ -109,7 +109,6 @@
UIProcess/API/C/cairo/WKIconDatabaseCairo.cpp
- UIProcess/API/C/gtk/WKFullScreenClientGtk.cpp
UIProcess/API/C/gtk/WKInspectorClientGtk.cpp
UIProcess/API/C/gtk/WKTextCheckerGtk.cpp
UIProcess/API/C/gtk/WKView.cpp
@@ -176,8 +175,6 @@
UIProcess/API/gtk/WebKitFormSubmissionRequest.h
UIProcess/API/gtk/WebKitFormSubmissionRequestPrivate.h
UIProcess/API/gtk/WebKitForwardDeclarations.h
- UIProcess/API/gtk/WebKitFullscreenClient.cpp
- UIProcess/API/gtk/WebKitFullscreenClient.h
UIProcess/API/gtk/WebKitGeolocationPermissionRequest.cpp
UIProcess/API/gtk/WebKitGeolocationPermissionRequest.h
UIProcess/API/gtk/WebKitGeolocationPermissionRequestPrivate.h
@@ -339,7 +336,6 @@
UIProcess/gtk/WaylandCompositor.cpp
UIProcess/gtk/WebColorPickerGtk.cpp
UIProcess/gtk/WebContextMenuProxyGtk.cpp
- UIProcess/gtk/WebFullScreenClientGtk.cpp
UIProcess/gtk/WebInspectorClientGtk.cpp
UIProcess/gtk/WebInspectorProxyGtk.cpp
UIProcess/gtk/WebKitInspectorWindow.cpp
Deleted: trunk/Source/WebKit2/UIProcess/API/C/gtk/WKFullScreenClientGtk.cpp (218063 => 218064)
--- trunk/Source/WebKit2/UIProcess/API/C/gtk/WKFullScreenClientGtk.cpp 2017-06-11 06:28:02 UTC (rev 218063)
+++ trunk/Source/WebKit2/UIProcess/API/C/gtk/WKFullScreenClientGtk.cpp 2017-06-11 06:30:12 UTC (rev 218064)
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2012 Igalia S.L.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WKFullScreenClientGtk.h"
-
-#include "WKAPICast.h"
-#include "WebKitWebViewBasePrivate.h"
-
-using namespace WebKit;
-
-void WKViewSetFullScreenClientGtk(WKViewRef viewRef, const WKFullScreenClientGtkBase* wkClient)
-{
- webkitWebViewBaseInitializeFullScreenClient(toImpl(viewRef), wkClient);
-}
Deleted: trunk/Source/WebKit2/UIProcess/API/C/gtk/WKFullScreenClientGtk.h (218063 => 218064)
--- trunk/Source/WebKit2/UIProcess/API/C/gtk/WKFullScreenClientGtk.h 2017-06-11 06:28:02 UTC (rev 218063)
+++ trunk/Source/WebKit2/UIProcess/API/C/gtk/WKFullScreenClientGtk.h 2017-06-11 06:30:12 UTC (rev 218064)
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2012 Igalia S.L.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WKFullScreenClientGtk_h
-#define WKFullScreenClientGtk_h
-
-#include <WebKit/WKBase.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef bool (*WKFullScreenClientGtkWillEnterFullScreenCallback)(const void* clientInfo);
-typedef bool (*WKFullScreenClientGtkWillExitFullScreenCallback)(const void* clientInfo);
-
-typedef struct WKFullScreenClientGtkBase {
- int version;
- const void* clientInfo;
-} WKFullScreenClientGtkBase;
-
-typedef struct WKFullScreenClientGtkV0 {
- WKFullScreenClientGtkBase base;
-
- WKFullScreenClientGtkWillEnterFullScreenCallback willEnterFullScreen;
- WKFullScreenClientGtkWillExitFullScreenCallback willExitFullScreen;
-} WKFullScreenClientGtkV0;
-
-WK_EXPORT void WKViewSetFullScreenClientGtk(WKViewRef viewRef, const WKFullScreenClientGtkBase* client);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* WKFullScreenClientGtk_h */
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp (218063 => 218064)
--- trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2017-06-11 06:28:02 UTC (rev 218063)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2017-06-11 06:30:12 UTC (rev 218064)
@@ -294,8 +294,7 @@
bool PageClientImpl::isFullScreen()
{
- notImplemented();
- return false;
+ return webkitWebViewBaseIsFullScreen(WEBKIT_WEB_VIEW_BASE(m_viewWidget));
}
void PageClientImpl::enterFullScreen()
@@ -303,7 +302,13 @@
if (!m_viewWidget)
return;
- webkitWebViewBaseEnterFullScreen(WEBKIT_WEB_VIEW_BASE(m_viewWidget));
+ if (isFullScreen())
+ return;
+
+ if (WEBKIT_IS_WEB_VIEW(m_viewWidget))
+ webkitWebViewEnterFullScreen(WEBKIT_WEB_VIEW(m_viewWidget));
+ else
+ webkitWebViewBaseEnterFullScreen(WEBKIT_WEB_VIEW_BASE(m_viewWidget));
}
void PageClientImpl::exitFullScreen()
@@ -311,7 +316,13 @@
if (!m_viewWidget)
return;
- webkitWebViewBaseExitFullScreen(WEBKIT_WEB_VIEW_BASE(m_viewWidget));
+ if (!isFullScreen())
+ return;
+
+ if (WEBKIT_IS_WEB_VIEW(m_viewWidget))
+ webkitWebViewExitFullScreen(WEBKIT_WEB_VIEW(m_viewWidget));
+ else
+ webkitWebViewBaseExitFullScreen(WEBKIT_WEB_VIEW_BASE(m_viewWidget));
}
void PageClientImpl::beganEnterFullScreen(const IntRect& /* initialFrame */, const IntRect& /* finalFrame */)
Deleted: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFullscreenClient.cpp (218063 => 218064)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFullscreenClient.cpp 2017-06-11 06:28:02 UTC (rev 218063)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFullscreenClient.cpp 2017-06-11 06:30:12 UTC (rev 218064)
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2012 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 "WebKitFullscreenClient.h"
-
-#include "WebKitPrivate.h"
-#include "WebKitWebViewPrivate.h"
-
-using namespace WebKit;
-
-static bool willEnterFullScreen(const void* clientInfo)
-{
- return webkitWebViewEnterFullScreen(WEBKIT_WEB_VIEW(clientInfo));
-}
-
-static bool willExitFullScreen(const void* clientInfo)
-{
- return webkitWebViewLeaveFullScreen(WEBKIT_WEB_VIEW(clientInfo));
-}
-
-void attachFullScreenClientToView(WebKitWebView* webView)
-{
- WKFullScreenClientGtkV0 wkFullScreenClient = {
- {
- 0, // version
- webView, // clientInfo
- },
- willEnterFullScreen,
- willExitFullScreen
- };
- WKViewSetFullScreenClientGtk(toAPI(WEBKIT_WEB_VIEW_BASE(webView)), &wkFullScreenClient.base);
-}
-
Deleted: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFullscreenClient.h (218063 => 218064)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFullscreenClient.h 2017-06-11 06:28:02 UTC (rev 218063)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFullscreenClient.h 2017-06-11 06:30:12 UTC (rev 218064)
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2012 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.
- */
-
-#ifndef WebKitFullscreenClient_h
-#define WebKitFullscreenClient_h
-
-#include "WebKitWebView.h"
-
-void attachFullScreenClientToView(WebKitWebView*);
-
-#endif
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h (218063 => 218064)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h 2017-06-11 06:28:02 UTC (rev 218063)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h 2017-06-11 06:30:12 UTC (rev 218064)
@@ -30,7 +30,6 @@
#include <WebKit/WKAPICast.h>
#include <WebKit/WKDownload.h>
#include <WebKit/WKFindOptions.h>
-#include <WebKit/WKFullScreenClientGtk.h>
#include <WebKit/WKGeolocationManager.h>
#include <WebKit/WKGeolocationPermissionRequest.h>
#include <WebKit/WKGeolocationPosition.h>
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (218063 => 218064)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2017-06-11 06:28:02 UTC (rev 218063)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2017-06-11 06:30:12 UTC (rev 218064)
@@ -40,7 +40,6 @@
#include "WebKitError.h"
#include "WebKitFaviconDatabasePrivate.h"
#include "WebKitFormClient.h"
-#include "WebKitFullscreenClient.h"
#include "WebKitHitTestResultPrivate.h"
#include "WebKitInstallMissingMediaPluginsPermissionRequestPrivate.h"
#include "WebKitJavascriptResultPrivate.h"
@@ -692,7 +691,6 @@
attachLoaderClientToView(webView);
attachUIClientToView(webView);
attachPolicyClientToView(webView);
- attachFullScreenClientToView(webView);
attachContextMenuClientToView(webView);
attachFormClientToView(webView);
@@ -2079,18 +2077,24 @@
priv->loadingResourcesMap.remove(resourceIdentifier);
}
-bool webkitWebViewEnterFullScreen(WebKitWebView* webView)
+void webkitWebViewEnterFullScreen(WebKitWebView* webView)
{
+#if ENABLE(FULLSCREEN_API)
gboolean returnValue;
g_signal_emit(webView, signals[ENTER_FULLSCREEN], 0, &returnValue);
- return !returnValue;
+ if (!returnValue)
+ webkitWebViewBaseEnterFullScreen(WEBKIT_WEB_VIEW_BASE(webView));
+#endif
}
-bool webkitWebViewLeaveFullScreen(WebKitWebView* webView)
+void webkitWebViewExitFullScreen(WebKitWebView* webView)
{
+#if ENABLE(FULLSCREEN_API)
gboolean returnValue;
g_signal_emit(webView, signals[LEAVE_FULLSCREEN], 0, &returnValue);
- return !returnValue;
+ if (!returnValue)
+ webkitWebViewBaseExitFullScreen(WEBKIT_WEB_VIEW_BASE(webView));
+#endif
}
void webkitWebViewRunFileChooserRequest(WebKitWebView* webView, WebKitFileChooserRequest* request)
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (218063 => 218064)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2017-06-11 06:28:02 UTC (rev 218063)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2017-06-11 06:30:12 UTC (rev 218064)
@@ -40,7 +40,6 @@
#include "NativeWebWheelEvent.h"
#include "PageClientImpl.h"
#include "WebEventFactory.h"
-#include "WebFullScreenClientGtk.h"
#include "WebInspectorProxy.h"
#include "WebKit2Initialize.h"
#include "WebKitAuthenticationDialog.h"
@@ -191,7 +190,6 @@
#if ENABLE(FULLSCREEN_API)
bool fullScreenModeActive { false };
- WebFullScreenClientGtk fullScreenClient;
GRefPtr<GDBusProxy> screenSaverProxy;
GRefPtr<GCancellable> screenSaverInhibitCancellable;
unsigned screenSaverCookie { 0 };
@@ -1322,12 +1320,8 @@
{
#if ENABLE(FULLSCREEN_API)
WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
- if (priv->fullScreenModeActive)
- return;
+ ASSERT(priv->fullScreenModeActive);
- if (!priv->fullScreenClient.willEnterFullScreen())
- return;
-
WebFullScreenManagerProxy* fullScreenManagerProxy = priv->pageProxy->fullScreenManager();
fullScreenManagerProxy->willEnterFullScreen();
@@ -1344,12 +1338,8 @@
{
#if ENABLE(FULLSCREEN_API)
WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
- if (!priv->fullScreenModeActive)
- return;
+ ASSERT(!priv->fullScreenModeActive);
- if (!priv->fullScreenClient.willExitFullScreen())
- return;
-
WebFullScreenManagerProxy* fullScreenManagerProxy = priv->pageProxy->fullScreenManager();
fullScreenManagerProxy->willExitFullScreen();
@@ -1362,9 +1352,13 @@
#endif
}
-void webkitWebViewBaseInitializeFullScreenClient(WebKitWebViewBase* webkitWebViewBase, const WKFullScreenClientGtkBase* wkClient)
+bool webkitWebViewBaseIsFullScreen(WebKitWebViewBase* webkitWebViewBase)
{
- webkitWebViewBase->priv->fullScreenClient.initialize(wkClient);
+#if ENABLE(FULLSCREEN_API)
+ return webkitWebViewBase->priv->fullScreenModeActive;
+#else
+ return false;
+#endif
}
void webkitWebViewBaseSetInspectorViewSize(WebKitWebViewBase* webkitWebViewBase, unsigned size)
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h (218063 => 218064)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h 2017-06-11 06:28:02 UTC (rev 218063)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h 2017-06-11 06:30:12 UTC (rev 218064)
@@ -48,7 +48,7 @@
void webkitWebViewBaseChildMoveResize(WebKitWebViewBase*, GtkWidget*, const WebCore::IntRect&);
void webkitWebViewBaseEnterFullScreen(WebKitWebViewBase*);
void webkitWebViewBaseExitFullScreen(WebKitWebViewBase*);
-void webkitWebViewBaseInitializeFullScreenClient(WebKitWebViewBase*, const WKFullScreenClientGtkBase*);
+bool webkitWebViewBaseIsFullScreen(WebKitWebViewBase*);
void webkitWebViewBaseSetInspectorViewSize(WebKitWebViewBase*, unsigned size);
void webkitWebViewBaseSetActiveContextMenuProxy(WebKitWebViewBase*, WebKit::WebContextMenuProxyGtk*);
WebKit::WebContextMenuProxyGtk* webkitWebViewBaseGetActiveContextMenuProxy(WebKitWebViewBase*);
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewPrivate.h (218063 => 218064)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewPrivate.h 2017-06-11 06:28:02 UTC (rev 218063)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewPrivate.h 2017-06-11 06:30:12 UTC (rev 218064)
@@ -55,8 +55,8 @@
WebKitWebResource* webkitWebViewGetLoadingWebResource(WebKitWebView*, uint64_t resourceIdentifier);
void webKitWebViewDidReceiveSnapshot(WebKitWebView*, uint64_t callbackID, WebKit::WebImage*);
void webkitWebViewRemoveLoadingWebResource(WebKitWebView*, uint64_t resourceIdentifier);
-bool webkitWebViewEnterFullScreen(WebKitWebView*);
-bool webkitWebViewLeaveFullScreen(WebKitWebView*);
+void webkitWebViewEnterFullScreen(WebKitWebView*);
+void webkitWebViewExitFullScreen(WebKitWebView*);
void webkitWebViewPopulateContextMenu(WebKitWebView*, const Vector<WebKit::WebContextMenuItemData>& proposedMenu, const WebKit::WebHitTestResultData&, GVariant*);
void webkitWebViewSubmitFormRequest(WebKitWebView*, WebKitFormSubmissionRequest*);
void webkitWebViewHandleAuthenticationChallenge(WebKitWebView*, WebKit::AuthenticationChallengeProxy*);
Deleted: trunk/Source/WebKit2/UIProcess/gtk/WebFullScreenClientGtk.cpp (218063 => 218064)
--- trunk/Source/WebKit2/UIProcess/gtk/WebFullScreenClientGtk.cpp 2017-06-11 06:28:02 UTC (rev 218063)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebFullScreenClientGtk.cpp 2017-06-11 06:30:12 UTC (rev 218064)
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2012 Igalia S.L.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WebFullScreenClientGtk.h"
-
-#include "WKAPICast.h"
-#include "WKSharedAPICast.h"
-
-namespace WebKit {
-
-bool WebFullScreenClientGtk::willEnterFullScreen()
-{
- if (!m_client.willEnterFullScreen)
- return true;
-
- return m_client.willEnterFullScreen(m_client.base.clientInfo);
-}
-
-bool WebFullScreenClientGtk::willExitFullScreen()
-{
- if (!m_client.willExitFullScreen)
- return true;
-
- return m_client.willExitFullScreen(m_client.base.clientInfo);
-}
-
-} // namespace WebKit
Deleted: trunk/Source/WebKit2/UIProcess/gtk/WebFullScreenClientGtk.h (218063 => 218064)
--- trunk/Source/WebKit2/UIProcess/gtk/WebFullScreenClientGtk.h 2017-06-11 06:28:02 UTC (rev 218063)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebFullScreenClientGtk.h 2017-06-11 06:30:12 UTC (rev 218064)
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2012 Igalia S.L.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebFullScreenClientGtk_h
-#define WebFullScreenClientGtk_h
-
-#include "APIClient.h"
-#include "WKFullScreenClientGtk.h"
-
-namespace API {
-class Object;
-
-template<> struct ClientTraits<WKFullScreenClientGtkBase> {
- typedef std::tuple<WKFullScreenClientGtkV0> Versions;
-};
-}
-
-namespace WebKit {
-
-class WebFullScreenClientGtk : public API::Client<WKFullScreenClientGtkBase> {
-public:
- bool willEnterFullScreen();
- bool willExitFullScreen();
-};
-
-} // namespace WebKit
-
-#endif // WebFullScreenClientGtk_h
