Changeset 218064 in webkit


Ignore:
Timestamp:
Jun 10, 2017 11:30:12 PM (7 years ago)
Author:
Carlos Garcia Campos
Message:

[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.
Location:
trunk/Source/WebKit2
Files:
6 deleted
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r218063 r218064  
     12017-06-10  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Remove WKFullScreenClientGtk
     4        https://bugs.webkit.org/show_bug.cgi?id=173140
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        It's only used internally in the GTK+ API. Implementation is a lot simpler without using it, we can simply use
     9        either WebKitWebView or WebKitWebViewBase from PageClient directly.
     10
     11        * PlatformGTK.cmake:
     12        * UIProcess/API/C/gtk/WKFullScreenClientGtk.cpp: Removed.
     13        * UIProcess/API/C/gtk/WKFullScreenClientGtk.h: Removed.
     14        * UIProcess/API/gtk/PageClientImpl.cpp:
     15        (WebKit::PageClientImpl::isFullScreen):
     16        (WebKit::PageClientImpl::enterFullScreen):
     17        (WebKit::PageClientImpl::exitFullScreen):
     18        * UIProcess/API/gtk/WebKitFullscreenClient.cpp: Removed.
     19        * UIProcess/API/gtk/WebKitFullscreenClient.h: Removed.
     20        * UIProcess/API/gtk/WebKitPrivate.h:
     21        * UIProcess/API/gtk/WebKitWebView.cpp:
     22        (webkitWebViewConstructed):
     23        (webkitWebViewEnterFullScreen):
     24        (webkitWebViewExitFullScreen):
     25        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
     26        (webkitWebViewBaseEnterFullScreen):
     27        (webkitWebViewBaseExitFullScreen):
     28        (webkitWebViewBaseIsFullScreen):
     29        * UIProcess/API/gtk/WebKitWebViewBasePrivate.h:
     30        * UIProcess/API/gtk/WebKitWebViewPrivate.h:
     31        * UIProcess/gtk/WebFullScreenClientGtk.cpp: Removed.
     32        * UIProcess/gtk/WebFullScreenClientGtk.h: Removed.
     33
    1342017-06-10  Carlos Garcia Campos  <cgarcia@igalia.com>
    235
  • trunk/Source/WebKit2/PlatformGTK.cmake

    r217960 r218064  
    110110    UIProcess/API/C/cairo/WKIconDatabaseCairo.cpp
    111111
    112     UIProcess/API/C/gtk/WKFullScreenClientGtk.cpp
    113112    UIProcess/API/C/gtk/WKInspectorClientGtk.cpp
    114113    UIProcess/API/C/gtk/WKTextCheckerGtk.cpp
     
    177176    UIProcess/API/gtk/WebKitFormSubmissionRequestPrivate.h
    178177    UIProcess/API/gtk/WebKitForwardDeclarations.h
    179     UIProcess/API/gtk/WebKitFullscreenClient.cpp
    180     UIProcess/API/gtk/WebKitFullscreenClient.h
    181178    UIProcess/API/gtk/WebKitGeolocationPermissionRequest.cpp
    182179    UIProcess/API/gtk/WebKitGeolocationPermissionRequest.h
     
    340337    UIProcess/gtk/WebColorPickerGtk.cpp
    341338    UIProcess/gtk/WebContextMenuProxyGtk.cpp
    342     UIProcess/gtk/WebFullScreenClientGtk.cpp
    343339    UIProcess/gtk/WebInspectorClientGtk.cpp
    344340    UIProcess/gtk/WebInspectorProxyGtk.cpp
  • trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp

    r218063 r218064  
    295295bool PageClientImpl::isFullScreen()
    296296{
    297     notImplemented();
    298     return false;
     297    return webkitWebViewBaseIsFullScreen(WEBKIT_WEB_VIEW_BASE(m_viewWidget));
    299298}
    300299
     
    304303        return;
    305304
    306     webkitWebViewBaseEnterFullScreen(WEBKIT_WEB_VIEW_BASE(m_viewWidget));
     305    if (isFullScreen())
     306        return;
     307
     308    if (WEBKIT_IS_WEB_VIEW(m_viewWidget))
     309        webkitWebViewEnterFullScreen(WEBKIT_WEB_VIEW(m_viewWidget));
     310    else
     311        webkitWebViewBaseEnterFullScreen(WEBKIT_WEB_VIEW_BASE(m_viewWidget));
    307312}
    308313
     
    312317        return;
    313318
    314     webkitWebViewBaseExitFullScreen(WEBKIT_WEB_VIEW_BASE(m_viewWidget));
     319    if (!isFullScreen())
     320        return;
     321
     322    if (WEBKIT_IS_WEB_VIEW(m_viewWidget))
     323        webkitWebViewExitFullScreen(WEBKIT_WEB_VIEW(m_viewWidget));
     324    else
     325        webkitWebViewBaseExitFullScreen(WEBKIT_WEB_VIEW_BASE(m_viewWidget));
    315326}
    316327
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h

    r208959 r218064  
    3131#include <WebKit/WKDownload.h>
    3232#include <WebKit/WKFindOptions.h>
    33 #include <WebKit/WKFullScreenClientGtk.h>
    3433#include <WebKit/WKGeolocationManager.h>
    3534#include <WebKit/WKGeolocationPermissionRequest.h>
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp

    r218063 r218064  
    4141#include "WebKitFaviconDatabasePrivate.h"
    4242#include "WebKitFormClient.h"
    43 #include "WebKitFullscreenClient.h"
    4443#include "WebKitHitTestResultPrivate.h"
    4544#include "WebKitInstallMissingMediaPluginsPermissionRequestPrivate.h"
     
    693692    attachUIClientToView(webView);
    694693    attachPolicyClientToView(webView);
    695     attachFullScreenClientToView(webView);
    696694    attachContextMenuClientToView(webView);
    697695    attachFormClientToView(webView);
     
    20802078}
    20812079
    2082 bool webkitWebViewEnterFullScreen(WebKitWebView* webView)
    2083 {
     2080void webkitWebViewEnterFullScreen(WebKitWebView* webView)
     2081{
     2082#if ENABLE(FULLSCREEN_API)
    20842083    gboolean returnValue;
    20852084    g_signal_emit(webView, signals[ENTER_FULLSCREEN], 0, &returnValue);
    2086     return !returnValue;
    2087 }
    2088 
    2089 bool webkitWebViewLeaveFullScreen(WebKitWebView* webView)
    2090 {
     2085    if (!returnValue)
     2086        webkitWebViewBaseEnterFullScreen(WEBKIT_WEB_VIEW_BASE(webView));
     2087#endif
     2088}
     2089
     2090void webkitWebViewExitFullScreen(WebKitWebView* webView)
     2091{
     2092#if ENABLE(FULLSCREEN_API)
    20912093    gboolean returnValue;
    20922094    g_signal_emit(webView, signals[LEAVE_FULLSCREEN], 0, &returnValue);
    2093     return !returnValue;
     2095    if (!returnValue)
     2096        webkitWebViewBaseExitFullScreen(WEBKIT_WEB_VIEW_BASE(webView));
     2097#endif
    20942098}
    20952099
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp

    r218063 r218064  
    4141#include "PageClientImpl.h"
    4242#include "WebEventFactory.h"
    43 #include "WebFullScreenClientGtk.h"
    4443#include "WebInspectorProxy.h"
    4544#include "WebKit2Initialize.h"
     
    192191#if ENABLE(FULLSCREEN_API)
    193192    bool fullScreenModeActive { false };
    194     WebFullScreenClientGtk fullScreenClient;
    195193    GRefPtr<GDBusProxy> screenSaverProxy;
    196194    GRefPtr<GCancellable> screenSaverInhibitCancellable;
     
    13231321#if ENABLE(FULLSCREEN_API)
    13241322    WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
    1325     if (priv->fullScreenModeActive)
    1326         return;
    1327 
    1328     if (!priv->fullScreenClient.willEnterFullScreen())
    1329         return;
     1323    ASSERT(priv->fullScreenModeActive);
    13301324
    13311325    WebFullScreenManagerProxy* fullScreenManagerProxy = priv->pageProxy->fullScreenManager();
     
    13451339#if ENABLE(FULLSCREEN_API)
    13461340    WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
    1347     if (!priv->fullScreenModeActive)
    1348         return;
    1349 
    1350     if (!priv->fullScreenClient.willExitFullScreen())
    1351         return;
     1341    ASSERT(!priv->fullScreenModeActive);
    13521342
    13531343    WebFullScreenManagerProxy* fullScreenManagerProxy = priv->pageProxy->fullScreenManager();
     
    13631353}
    13641354
    1365 void webkitWebViewBaseInitializeFullScreenClient(WebKitWebViewBase* webkitWebViewBase, const WKFullScreenClientGtkBase* wkClient)
    1366 {
    1367     webkitWebViewBase->priv->fullScreenClient.initialize(wkClient);
     1355bool webkitWebViewBaseIsFullScreen(WebKitWebViewBase* webkitWebViewBase)
     1356{
     1357#if ENABLE(FULLSCREEN_API)
     1358    return webkitWebViewBase->priv->fullScreenModeActive;
     1359#else
     1360    return false;
     1361#endif
    13681362}
    13691363
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h

    r218063 r218064  
    4949void webkitWebViewBaseEnterFullScreen(WebKitWebViewBase*);
    5050void webkitWebViewBaseExitFullScreen(WebKitWebViewBase*);
    51 void webkitWebViewBaseInitializeFullScreenClient(WebKitWebViewBase*, const WKFullScreenClientGtkBase*);
     51bool webkitWebViewBaseIsFullScreen(WebKitWebViewBase*);
    5252void webkitWebViewBaseSetInspectorViewSize(WebKitWebViewBase*, unsigned size);
    5353void webkitWebViewBaseSetActiveContextMenuProxy(WebKitWebViewBase*, WebKit::WebContextMenuProxyGtk*);
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewPrivate.h

    r218063 r218064  
    5656void webKitWebViewDidReceiveSnapshot(WebKitWebView*, uint64_t callbackID, WebKit::WebImage*);
    5757void webkitWebViewRemoveLoadingWebResource(WebKitWebView*, uint64_t resourceIdentifier);
    58 bool webkitWebViewEnterFullScreen(WebKitWebView*);
    59 bool webkitWebViewLeaveFullScreen(WebKitWebView*);
     58void webkitWebViewEnterFullScreen(WebKitWebView*);
     59void webkitWebViewExitFullScreen(WebKitWebView*);
    6060void webkitWebViewPopulateContextMenu(WebKitWebView*, const Vector<WebKit::WebContextMenuItemData>& proposedMenu, const WebKit::WebHitTestResultData&, GVariant*);
    6161void webkitWebViewSubmitFormRequest(WebKitWebView*, WebKitFormSubmissionRequest*);
Note: See TracChangeset for help on using the changeset viewer.