Title: [87005] trunk/Source/WebKit2
- Revision
- 87005
- Author
- [email protected]
- Date
- 2011-05-20 17:48:10 -0700 (Fri, 20 May 2011)
Log Message
2011-05-20 Jeremy Noble <[email protected]>
Reviewed by Mark Rowe.
Crash in WebFullScreenManager::didExitFullScreen when closing a window in Safari.
https://bugs.webkit.org/show_bug.cgi?id=61228
Do not attempt to exit full screen if we aren't in full screen to begin with, as the WebProcess
won't be expecting will/didExitFullScreen notifications.
* UIProcess/mac/WKFullScreenWindowController.mm:
(-[WKFullScreenWindowController close]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (87004 => 87005)
--- trunk/Source/WebKit2/ChangeLog 2011-05-21 00:42:25 UTC (rev 87004)
+++ trunk/Source/WebKit2/ChangeLog 2011-05-21 00:48:10 UTC (rev 87005)
@@ -1,3 +1,16 @@
+2011-05-20 Jeremy Noble <[email protected]>
+
+ Reviewed by Mark Rowe.
+
+ Crash in WebFullScreenManager::didExitFullScreen when closing a window in Safari.
+ https://bugs.webkit.org/show_bug.cgi?id=61228
+
+ Do not attempt to exit full screen if we aren't in full screen to begin with, as the WebProcess
+ won't be expecting will/didExitFullScreen notifications.
+
+ * UIProcess/mac/WKFullScreenWindowController.mm:
+ (-[WKFullScreenWindowController close]):
+
2011-05-20 Andy Estes <[email protected]>
Reviewed by Darin Adler.
Modified: trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm (87004 => 87005)
--- trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm 2011-05-21 00:42:25 UTC (rev 87004)
+++ trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm 2011-05-21 00:48:10 UTC (rev 87005)
@@ -428,9 +428,13 @@
// has closed or the web process has crashed. Just walk through our
// normal exit full screen sequence, but don't wait to be called back
// in response.
- [self exitFullScreen];
- [self beganExitFullScreenAnimation];
- [self finishedExitFullScreenAnimation:YES];
+ if (_isFullScreen) {
+ [self exitFullScreen];
+ [self beganExitFullScreenAnimation];
+ }
+
+ if (_isExitingFullScreen)
+ [self finishedExitFullScreenAnimation:YES];
}
#pragma mark -
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
