Changeset 218064 in webkit
- Timestamp:
- Jun 10, 2017 11:30:12 PM (7 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 6 deleted
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r218063 r218064 1 2017-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 1 34 2017-06-10 Carlos Garcia Campos <cgarcia@igalia.com> 2 35 -
trunk/Source/WebKit2/PlatformGTK.cmake
r217960 r218064 110 110 UIProcess/API/C/cairo/WKIconDatabaseCairo.cpp 111 111 112 UIProcess/API/C/gtk/WKFullScreenClientGtk.cpp113 112 UIProcess/API/C/gtk/WKInspectorClientGtk.cpp 114 113 UIProcess/API/C/gtk/WKTextCheckerGtk.cpp … … 177 176 UIProcess/API/gtk/WebKitFormSubmissionRequestPrivate.h 178 177 UIProcess/API/gtk/WebKitForwardDeclarations.h 179 UIProcess/API/gtk/WebKitFullscreenClient.cpp180 UIProcess/API/gtk/WebKitFullscreenClient.h181 178 UIProcess/API/gtk/WebKitGeolocationPermissionRequest.cpp 182 179 UIProcess/API/gtk/WebKitGeolocationPermissionRequest.h … … 340 337 UIProcess/gtk/WebColorPickerGtk.cpp 341 338 UIProcess/gtk/WebContextMenuProxyGtk.cpp 342 UIProcess/gtk/WebFullScreenClientGtk.cpp343 339 UIProcess/gtk/WebInspectorClientGtk.cpp 344 340 UIProcess/gtk/WebInspectorProxyGtk.cpp -
trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp
r218063 r218064 295 295 bool PageClientImpl::isFullScreen() 296 296 { 297 notImplemented(); 298 return false; 297 return webkitWebViewBaseIsFullScreen(WEBKIT_WEB_VIEW_BASE(m_viewWidget)); 299 298 } 300 299 … … 304 303 return; 305 304 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)); 307 312 } 308 313 … … 312 317 return; 313 318 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)); 315 326 } 316 327 -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h
r208959 r218064 31 31 #include <WebKit/WKDownload.h> 32 32 #include <WebKit/WKFindOptions.h> 33 #include <WebKit/WKFullScreenClientGtk.h>34 33 #include <WebKit/WKGeolocationManager.h> 35 34 #include <WebKit/WKGeolocationPermissionRequest.h> -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
r218063 r218064 41 41 #include "WebKitFaviconDatabasePrivate.h" 42 42 #include "WebKitFormClient.h" 43 #include "WebKitFullscreenClient.h"44 43 #include "WebKitHitTestResultPrivate.h" 45 44 #include "WebKitInstallMissingMediaPluginsPermissionRequestPrivate.h" … … 693 692 attachUIClientToView(webView); 694 693 attachPolicyClientToView(webView); 695 attachFullScreenClientToView(webView);696 694 attachContextMenuClientToView(webView); 697 695 attachFormClientToView(webView); … … 2080 2078 } 2081 2079 2082 bool webkitWebViewEnterFullScreen(WebKitWebView* webView) 2083 { 2080 void webkitWebViewEnterFullScreen(WebKitWebView* webView) 2081 { 2082 #if ENABLE(FULLSCREEN_API) 2084 2083 gboolean returnValue; 2085 2084 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 2090 void webkitWebViewExitFullScreen(WebKitWebView* webView) 2091 { 2092 #if ENABLE(FULLSCREEN_API) 2091 2093 gboolean returnValue; 2092 2094 g_signal_emit(webView, signals[LEAVE_FULLSCREEN], 0, &returnValue); 2093 return !returnValue; 2095 if (!returnValue) 2096 webkitWebViewBaseExitFullScreen(WEBKIT_WEB_VIEW_BASE(webView)); 2097 #endif 2094 2098 } 2095 2099 -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp
r218063 r218064 41 41 #include "PageClientImpl.h" 42 42 #include "WebEventFactory.h" 43 #include "WebFullScreenClientGtk.h"44 43 #include "WebInspectorProxy.h" 45 44 #include "WebKit2Initialize.h" … … 192 191 #if ENABLE(FULLSCREEN_API) 193 192 bool fullScreenModeActive { false }; 194 WebFullScreenClientGtk fullScreenClient;195 193 GRefPtr<GDBusProxy> screenSaverProxy; 196 194 GRefPtr<GCancellable> screenSaverInhibitCancellable; … … 1323 1321 #if ENABLE(FULLSCREEN_API) 1324 1322 WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv; 1325 if (priv->fullScreenModeActive) 1326 return; 1327 1328 if (!priv->fullScreenClient.willEnterFullScreen()) 1329 return; 1323 ASSERT(priv->fullScreenModeActive); 1330 1324 1331 1325 WebFullScreenManagerProxy* fullScreenManagerProxy = priv->pageProxy->fullScreenManager(); … … 1345 1339 #if ENABLE(FULLSCREEN_API) 1346 1340 WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv; 1347 if (!priv->fullScreenModeActive) 1348 return; 1349 1350 if (!priv->fullScreenClient.willExitFullScreen()) 1351 return; 1341 ASSERT(!priv->fullScreenModeActive); 1352 1342 1353 1343 WebFullScreenManagerProxy* fullScreenManagerProxy = priv->pageProxy->fullScreenManager(); … … 1363 1353 } 1364 1354 1365 void webkitWebViewBaseInitializeFullScreenClient(WebKitWebViewBase* webkitWebViewBase, const WKFullScreenClientGtkBase* wkClient) 1366 { 1367 webkitWebViewBase->priv->fullScreenClient.initialize(wkClient); 1355 bool webkitWebViewBaseIsFullScreen(WebKitWebViewBase* webkitWebViewBase) 1356 { 1357 #if ENABLE(FULLSCREEN_API) 1358 return webkitWebViewBase->priv->fullScreenModeActive; 1359 #else 1360 return false; 1361 #endif 1368 1362 } 1369 1363 -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h
r218063 r218064 49 49 void webkitWebViewBaseEnterFullScreen(WebKitWebViewBase*); 50 50 void webkitWebViewBaseExitFullScreen(WebKitWebViewBase*); 51 void webkitWebViewBaseInitializeFullScreenClient(WebKitWebViewBase*, const WKFullScreenClientGtkBase*);51 bool webkitWebViewBaseIsFullScreen(WebKitWebViewBase*); 52 52 void webkitWebViewBaseSetInspectorViewSize(WebKitWebViewBase*, unsigned size); 53 53 void webkitWebViewBaseSetActiveContextMenuProxy(WebKitWebViewBase*, WebKit::WebContextMenuProxyGtk*); -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewPrivate.h
r218063 r218064 56 56 void webKitWebViewDidReceiveSnapshot(WebKitWebView*, uint64_t callbackID, WebKit::WebImage*); 57 57 void webkitWebViewRemoveLoadingWebResource(WebKitWebView*, uint64_t resourceIdentifier); 58 boolwebkitWebViewEnterFullScreen(WebKitWebView*);59 bool webkitWebViewLeaveFullScreen(WebKitWebView*);58 void webkitWebViewEnterFullScreen(WebKitWebView*); 59 void webkitWebViewExitFullScreen(WebKitWebView*); 60 60 void webkitWebViewPopulateContextMenu(WebKitWebView*, const Vector<WebKit::WebContextMenuItemData>& proposedMenu, const WebKit::WebHitTestResultData&, GVariant*); 61 61 void webkitWebViewSubmitFormRequest(WebKitWebView*, WebKitFormSubmissionRequest*);
Note: See TracChangeset
for help on using the changeset viewer.