Title: [87216] branches/safari-534-branch/Source/WebKit2
Diff
Modified: branches/safari-534-branch/Source/WebKit2/ChangeLog (87215 => 87216)
--- branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-05-24 22:12:24 UTC (rev 87215)
+++ branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-05-24 22:17:07 UTC (rev 87216)
@@ -1,3 +1,20 @@
+2011-05-24 Lucas Forschler <[email protected]>
+
+ Merged r87005.
+
+ 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-24 Steve Falkenburg <[email protected]>
Reviewed by Adam Roben.
Modified: branches/safari-534-branch/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm (87215 => 87216)
--- branches/safari-534-branch/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm 2011-05-24 22:12:24 UTC (rev 87215)
+++ branches/safari-534-branch/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm 2011-05-24 22:17:07 UTC (rev 87216)
@@ -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
