Title: [143981] trunk/Source/WebKit2
- Revision
- 143981
- Author
- jer.no...@apple.com
- Date
- 2013-02-25 15:39:02 -0800 (Mon, 25 Feb 2013)
Log Message
Safari shows empty window and paints webpage in full-screen background
https://bugs.webkit.org/show_bug.cgi?id=103712
Reviewed by Darin Adler.
When canceling full screen mode due to a provisional load, exit normally instead of closing the
full screen window controller. Additionally, to ensure full screen is cancelled when the enclosing
frame around a full screen iframe is navigated, check to see if the navigating document contains
a full screen element, rather than checking whether the document itself is full screen.
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::dispatchDidStartProvisionalLoad):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (143980 => 143981)
--- trunk/Source/WebKit2/ChangeLog 2013-02-25 23:36:52 UTC (rev 143980)
+++ trunk/Source/WebKit2/ChangeLog 2013-02-25 23:39:02 UTC (rev 143981)
@@ -1,3 +1,18 @@
+2013-02-25 Jer Noble <jer.no...@apple.com>
+
+ Safari shows empty window and paints webpage in full-screen background
+ https://bugs.webkit.org/show_bug.cgi?id=103712
+
+ Reviewed by Darin Adler.
+
+ When canceling full screen mode due to a provisional load, exit normally instead of closing the
+ full screen window controller. Additionally, to ensure full screen is cancelled when the enclosing
+ frame around a full screen iframe is navigated, check to see if the navigating document contains
+ a full screen element, rather than checking whether the document itself is full screen.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::dispatchDidStartProvisionalLoad):
+
2013-02-25 Anders Carlsson <ander...@apple.com>
Fix build.
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (143980 => 143981)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2013-02-25 23:36:52 UTC (rev 143980)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2013-02-25 23:39:02 UTC (rev 143981)
@@ -383,8 +383,8 @@
return;
#if ENABLE(FULLSCREEN_API)
- if (m_frame->coreFrame()->document()->webkitIsFullScreen())
- webPage->fullScreenManager()->close();
+ if (m_frame->coreFrame()->document()->documentElement()->containsFullScreenElement())
+ webPage->fullScreenManager()->exitFullScreenForElement(webPage->fullScreenManager()->element());
#endif
webPage->findController().hideFindUI();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
