Title: [113630] tags/Safari-536.6.1/Source/WebKit2
Diff
Modified: tags/Safari-536.6.1/Source/WebKit2/ChangeLog (113629 => 113630)
--- tags/Safari-536.6.1/Source/WebKit2/ChangeLog 2012-04-09 22:00:47 UTC (rev 113629)
+++ tags/Safari-536.6.1/Source/WebKit2/ChangeLog 2012-04-09 22:05:25 UTC (rev 113630)
@@ -1,5 +1,27 @@
2011-04-09 Lucas Forschler <[email protected]>
+ Merge 113501
+
+ 2012-04-06 Jer Noble <[email protected]>
+
+ WebFullScreenManagerProxy::isFullScreen() will create an empty full screen window; steal focus.
+ https://bugs.webkit.org/show_bug.cgi?id=83388
+
+ Reviewed by Geoffrey Garen.
+
+ Calling WebFullScreenManagerProxy::isFullScreen() will create a WKFullScreenWindowController if
+ one does not already exist, since the -[WKView fullScreenWindowController] method will create-on-access.
+ Add a new call, -[WKView hasFullScreenWindowController], which does not auto-create the controller
+ and add that check to WebFullScreenManagerProxy::isFullScreen().
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView hasFullScreenWindowController]):
+ * UIProcess/API/mac/WKViewInternal.h:
+ * UIProcess/mac/WebFullScreenManagerProxyMac.mm:
+ (WebKit::WebFullScreenManagerProxy::isFullScreen):
+
+2011-04-09 Lucas Forschler <[email protected]>
+
Merge 113523
2012-04-06 Hironori Bono <[email protected]>
Modified: tags/Safari-536.6.1/Source/WebKit2/UIProcess/API/mac/WKView.mm (113629 => 113630)
--- tags/Safari-536.6.1/Source/WebKit2/UIProcess/API/mac/WKView.mm 2012-04-09 22:00:47 UTC (rev 113629)
+++ tags/Safari-536.6.1/Source/WebKit2/UIProcess/API/mac/WKView.mm 2012-04-09 22:05:25 UTC (rev 113630)
@@ -2800,6 +2800,11 @@
}
#if ENABLE(FULLSCREEN_API)
+- (BOOL)hasFullScreenWindowController
+{
+ return (bool)_data->_fullScreenWindowController;
+}
+
- (WKFullScreenWindowController*)fullScreenWindowController
{
if (!_data->_fullScreenWindowController) {
Modified: tags/Safari-536.6.1/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h (113629 => 113630)
--- tags/Safari-536.6.1/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2012-04-09 22:00:47 UTC (rev 113629)
+++ tags/Safari-536.6.1/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2012-04-09 22:05:25 UTC (rev 113630)
@@ -88,6 +88,7 @@
- (void)_didChangeScrollbarsForMainFrame;
#if ENABLE(FULLSCREEN_API)
+- (BOOL)hasFullScreenWindowController;
- (WKFullScreenWindowController*)fullScreenWindowController;
- (void)closeFullScreenWindowController;
#endif
Modified: tags/Safari-536.6.1/Source/WebKit2/UIProcess/mac/WebFullScreenManagerProxyMac.mm (113629 => 113630)
--- tags/Safari-536.6.1/Source/WebKit2/UIProcess/mac/WebFullScreenManagerProxyMac.mm 2012-04-09 22:00:47 UTC (rev 113629)
+++ tags/Safari-536.6.1/Source/WebKit2/UIProcess/mac/WebFullScreenManagerProxyMac.mm 2012-04-09 22:05:25 UTC (rev 113630)
@@ -57,6 +57,9 @@
{
if (!m_webView)
return false;
+ if (![m_webView hasFullScreenWindowController])
+ return false;
+
return [[m_webView fullScreenWindowController] isFullScreen];
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
