Title: [164703] releases/WebKitGTK/webkit-2.4/Source/WebKit2
Revision
164703
Author
carlo...@webkit.org
Date
2014-02-25 23:53:56 -0800 (Tue, 25 Feb 2014)

Log Message

Merge r164578 - [GTK] Remove unneeded method webkitWebViewBaseRequestExitFullScreen
https://bugs.webkit.org/show_bug.cgi?id=129245

Reviewed by Sergio Villar Senin.

* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseKeyPressEvent): Call FullscreenManager::requestExitFullScreen() directly.
* UIProcess/API/gtk/WebKitWebViewBasePrivate.h:

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog (164702 => 164703)


--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog	2014-02-26 07:43:31 UTC (rev 164702)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog	2014-02-26 07:53:56 UTC (rev 164703)
@@ -1,3 +1,14 @@
+2014-02-24  Carlos Garcia Campos  <cgar...@igalia.com>
+
+        [GTK] Remove unneeded method webkitWebViewBaseRequestExitFullScreen
+        https://bugs.webkit.org/show_bug.cgi?id=129245
+
+        Reviewed by Sergio Villar Senin.
+
+        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+        (webkitWebViewBaseKeyPressEvent): Call FullscreenManager::requestExitFullScreen() directly.
+        * UIProcess/API/gtk/WebKitWebViewBasePrivate.h:
+
 2014-02-17  Carlos Garcia Campos  <cgar...@igalia.com>
 
         Unreviewed. Fix make distcheck.

Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (164702 => 164703)


--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp	2014-02-26 07:43:31 UTC (rev 164702)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp	2014-02-26 07:53:56 UTC (rev 164703)
@@ -619,7 +619,7 @@
         case GDK_KEY_Escape:
         case GDK_KEY_f:
         case GDK_KEY_F:
-            webkitWebViewBaseRequestExitFullScreen(webViewBase);
+            priv->pageProxy->fullScreenManager()->requestExitFullScreen();
             return TRUE;
         default:
             break;
@@ -1082,13 +1082,6 @@
 #endif
 }
 
-void webkitWebViewBaseRequestExitFullScreen(WebKitWebViewBase* webkitWebViewBase)
-{
-#if ENABLE(FULLSCREEN_API)
-    webkitWebViewBase->priv->pageProxy->fullScreenManager()->requestExitFullScreen();
-#endif
-}
-
 void webkitWebViewBaseInitializeFullScreenClient(WebKitWebViewBase* webkitWebViewBase, const WKFullScreenClientGtkBase* wkClient)
 {
     webkitWebViewBase->priv->fullScreenClient.initialize(wkClient);

Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h (164702 => 164703)


--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h	2014-02-26 07:43:31 UTC (rev 164702)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h	2014-02-26 07:53:56 UTC (rev 164703)
@@ -45,7 +45,6 @@
 void webkitWebViewBaseChildMoveResize(WebKitWebViewBase*, GtkWidget*, const WebCore::IntRect&);
 void webkitWebViewBaseEnterFullScreen(WebKitWebViewBase*);
 void webkitWebViewBaseExitFullScreen(WebKitWebViewBase*);
-void webkitWebViewBaseRequestExitFullScreen(WebKitWebViewBase*);
 void webkitWebViewBaseInitializeFullScreenClient(WebKitWebViewBase*, const WKFullScreenClientGtkBase*);
 void webkitWebViewBaseSetInspectorViewSize(WebKitWebViewBase*, unsigned size);
 void webkitWebViewBaseSetActiveContextMenuProxy(WebKitWebViewBase*, WebKit::WebContextMenuProxyGtk*);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to