Title: [226108] releases/WebKitGTK/webkit-2.18/Source/WebKit
- Revision
- 226108
- Author
- [email protected]
- Date
- 2017-12-19 00:03:07 -0800 (Tue, 19 Dec 2017)
Log Message
Merge r225267 - REGRESSION(r218064): [GTK] Broke entering fullscreen mode in debug builds
https://bugs.webkit.org/show_bug.cgi?id=180120
Reviewed by Carlos Garcia Campos.
These assertions need to be swapped. Fixes /webkit2/WebKitWebView/fullscreen in debug mode.
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseEnterFullScreen):
(webkitWebViewBaseExitFullScreen):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog (226107 => 226108)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog 2017-12-19 07:59:16 UTC (rev 226107)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog 2017-12-19 08:03:07 UTC (rev 226108)
@@ -1,3 +1,16 @@
+2017-11-29 Michael Catanzaro <[email protected]>
+
+ REGRESSION(r218064): [GTK] Broke entering fullscreen mode in debug builds
+ https://bugs.webkit.org/show_bug.cgi?id=180120
+
+ Reviewed by Carlos Garcia Campos.
+
+ These assertions need to be swapped. Fixes /webkit2/WebKitWebView/fullscreen in debug mode.
+
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseEnterFullScreen):
+ (webkitWebViewBaseExitFullScreen):
+
2017-12-02 Carlos Garcia Campos <[email protected]>
WebDriver: handle user prompts shown while executing scripts
Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp (226107 => 226108)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp 2017-12-19 07:59:16 UTC (rev 226107)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp 2017-12-19 08:03:07 UTC (rev 226108)
@@ -1306,7 +1306,7 @@
{
#if ENABLE(FULLSCREEN_API)
WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
- ASSERT(priv->fullScreenModeActive);
+ ASSERT(!priv->fullScreenModeActive);
WebFullScreenManagerProxy* fullScreenManagerProxy = priv->pageProxy->fullScreenManager();
fullScreenManagerProxy->willEnterFullScreen();
@@ -1324,7 +1324,7 @@
{
#if ENABLE(FULLSCREEN_API)
WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
- ASSERT(!priv->fullScreenModeActive);
+ ASSERT(priv->fullScreenModeActive);
WebFullScreenManagerProxy* fullScreenManagerProxy = priv->pageProxy->fullScreenManager();
fullScreenManagerProxy->willExitFullScreen();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
