Changeset 86107 in webkit

Timestamp:

May 9, 2011 4:50:28 PM (13 years ago)

Author:

jer.noble@apple.com

Message:

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

Reviewed by Darin Adler.

Command-~/Exposé to another window while <video> is in full screen, breaks Safari, eventually leading to crash
​https://bugs.webkit.org/show_bug.cgi?id=60496

When animating into and out of full screen, order out and back in the original webView window,
disabling animations when necessary. The exitFullscreen method was targeting the wrong window,
as the webView is hosted in the full screen window when we ask for it's parent window.

• WebView/WebFullScreenController.mm: (-[WebFullScreenController windowDidEnterFullscreen:]): (-[WebFullScreenController exitFullscreen]):

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

Reviewed by Darin Adler.

Command-~/Exposé to another window while <video> is in full screen, breaks Safari, eventually leading to crash
​https://bugs.webkit.org/show_bug.cgi?id=60496

When animating into and out of full screen, order out and back in the original webView window,
disabling animations when necessary. The beganExitFullScreenAnimation method was targeting the wrong window,
as the webView is hosted in the full screen window when we ask for it's parent window.

• UIProcess/mac/WKFullScreenWindowController.mm: (-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]): (-[WKFullScreenWindowController beganExitFullScreenAnimation]):

Location:

trunk/Source

Files:

• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebFullScreenController.mm (modified) (4 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/mac/WKFullScreenWindowController.mm (modified) (2 diffs)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2011-05-09  Jeremy Noble  <jer.noble@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Command-~/Exposé to another window while <video> is in full screen, breaks Safari, eventually leading to crash
+        https://bugs.webkit.org/show_bug.cgi?id=60496
+
+        When animating into and out of full screen, order out and back in the original webView window,
+        disabling animations when necessary.  The exitFullscreen method was targeting the wrong window,
+        as the webView is hosted in the full screen window when we ask for it's parent window.
+
+        * WebView/WebFullScreenController.mm:
+        (-[WebFullScreenController windowDidEnterFullscreen:]):
+        (-[WebFullScreenController exitFullscreen]):
+
 2011-05-04  Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebKit/mac/WebView/WebFullScreenController.mm

@@ -272 +272 @@
             _placeholderView = [[NSView alloc] init];
 
+        WebView *webView = [self webView];
+        NSWindow *webWindow = [webView window];
+
         // Do not swap the placeholder into place if already is in a window,
         // assuming the placeholder's window will always be the webView's 
         // original window.
         if (![_placeholderView window]) {
-            WebView* webView = [self webView];
             [_placeholderView setFrame:[webView frame]];        
             [_placeholderView setAutoresizingMask:[webView autoresizingMask]];
@@ -286 +288 @@
             [webView setFrame:[(NSView *)[[self window] contentView] bounds]];
         }
+
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+        // In Lion, NSWindow will animate into and out of orderOut operations. Suppress that
+        // behavior here, making sure to reset the animation behavior afterward.
+        NSWindowAnimationBehavior animationBehavior = [webWindow animationBehavior];
+        [webWindow setAnimationBehavior:NSWindowAnimationBehaviorNone];
+#endif
+        [webWindow orderOut:self];
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+        [webWindow setAnimationBehavior:animationBehavior];
+#endif
         
         WebFullscreenWindow* window = [self _fullscreenWindow];
@@ -503 +516 @@
     NSDisableScreenUpdates();
     
-    // The user may have moved the fullscreen window in Spaces, so temporarily change 
-    // the collectionBehavior of the webView's window:
-    NSWindow* webWindow = [[self webView] window];
-    NSWindowCollectionBehavior behavior = [webWindow collectionBehavior];
-    [webWindow setCollectionBehavior:NSWindowCollectionBehaviorCanJoinAllSpaces];
-    [webWindow orderWindow:NSWindowBelow relativeTo:[[self window] windowNumber]];
-    [webWindow setCollectionBehavior:behavior];
     
     // The fullscreen animation may have been cancelled before the 
@@ -523 +529 @@
         [[_placeholderView superview] replaceSubview:_placeholderView with:webView];
         
+        NSWindow *webWindow = [[self webView] window];
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+        // In Lion, NSWindow will animate into and out of orderOut operations. Suppress that
+        // behavior here, making sure to reset the animation behavior afterward.
+        NSWindowAnimationBehavior animationBehavior = [webWindow animationBehavior];
+        [webWindow setAnimationBehavior:NSWindowAnimationBehaviorNone];
+#endif
+        // The user may have moved the fullscreen window in Spaces, so temporarily change 
+        // the collectionBehavior of the fullscreen window:
+        NSWindowCollectionBehavior behavior = [webWindow collectionBehavior];
+        [webWindow setCollectionBehavior:NSWindowCollectionBehaviorCanJoinAllSpaces];
+        [webWindow orderWindow:NSWindowBelow relativeTo:[[self window] windowNumber]];
+        [webWindow setCollectionBehavior:behavior];
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+        [webWindow setAnimationBehavior:animationBehavior];
+#endif
+
         // Because the animation view is layer-hosted, make sure to 
         // disable animations when changing the layer's opacity. Other-

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-09  Jeremy Noble  <jer.noble@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Command-~/Exposé to another window while <video> is in full screen, breaks Safari, eventually leading to crash
+        https://bugs.webkit.org/show_bug.cgi?id=60496
+
+        When animating into and out of full screen, order out and back in the original webView window,
+        disabling animations when necessary. The beganExitFullScreenAnimation method was targeting the wrong window,
+        as the webView is hosted in the full screen window when we ask for it's parent window.
+
+        * UIProcess/mac/WKFullScreenWindowController.mm:
+        (-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):
+        (-[WKFullScreenWindowController beganExitFullScreenAnimation]):
+
 2011-05-09  Dan Bernstein  <mitz@apple.com>
 

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

@@ -252 +252 @@
         [CATransaction commit];
         
-        // FIXME: In Barolo, orderIn will animate, which is not what we want.  Find a way
-        // to work around this behavior.
-        //[[_webViewPlaceholder.get() window] orderOut:self];
+        NSWindow *webWindow = [_webViewPlaceholder.get() window];
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+        // In Lion, NSWindow will animate into and out of orderOut operations. Suppress that
+        // behavior here, making sure to reset the animation behavior afterward.
+        NSWindowAnimationBehavior animationBehavior = [webWindow animationBehavior];
+        [webWindow setAnimationBehavior:NSWindowAnimationBehaviorNone];
+#endif
+        [webWindow orderOut:self];
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+        [webWindow setAnimationBehavior:animationBehavior];
+#endif
         [[self window] makeKeyAndOrderFront:self];
     }
@@ -283 +291 @@
     [self _updatePowerAssertions];
     
-    // The user may have moved the fullScreen window in Spaces, so temporarily change 
-    // the collectionBehavior of the webView's window:
-    NSWindow* webWindow = [[self webView] window];
-    NSWindowCollectionBehavior behavior = [webWindow collectionBehavior];
-    [webWindow setCollectionBehavior:NSWindowCollectionBehaviorCanJoinAllSpaces];
-    [webWindow orderWindow:NSWindowBelow relativeTo:[[self window] windowNumber]];
-    [webWindow setCollectionBehavior:behavior];
-    
     // Swap the webView back into its original position:
-    if ([_webView window] == [self window])
+    if ([_webView window] == [self window]) {
         [self _swapView:_webViewPlaceholder.get() with:_webView];
+        NSWindow* webWindow = [_webView window];
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+        // In Lion, NSWindow will animate into and out of orderOut operations. Suppress that
+        // behavior here, making sure to reset the animation behavior afterward.
+        NSWindowAnimationBehavior animationBehavior = [webWindow animationBehavior];
+        [webWindow setAnimationBehavior:NSWindowAnimationBehaviorNone];
+#endif
+        // The user may have moved the fullScreen window in Spaces, so temporarily change 
+        // the collectionBehavior of the webView's window:
+        NSWindowCollectionBehavior behavior = [webWindow collectionBehavior];
+        [webWindow setCollectionBehavior:NSWindowCollectionBehaviorCanJoinAllSpaces];
+        [webWindow orderWindow:NSWindowBelow relativeTo:[[self window] windowNumber]];
+        [webWindow setCollectionBehavior:behavior];
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+        [webWindow setAnimationBehavior:animationBehavior];
+#endif
+    }
     
     [CATransaction begin];