Changeset 87005 in webkit

Timestamp:

May 20, 2011 5:48:10 PM (13 years ago)

Author:

jer.noble@apple.com

Message:

2011-05-20 Jeremy Noble <​jer.noble@apple.com>

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]):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/mac/WKFullScreenWindowController.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-20  Jeremy Noble  <jer.noble@apple.com>
+
+        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  <aestes@apple.com>
 

trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm

@@ -429 +429 @@
     // 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];
 }