Changeset 167130 in webkit


Ignore:
Timestamp:
Apr 11, 2014 9:51:48 AM (10 years ago)
Author:
Brent Fulgham
Message:

[Mac] Prevent crash when exiting fullscreen mode
https://bugs.webkit.org/show_bug.cgi?id=131528

Reviewed by Jer Noble.

  • UIProcess/mac/WKFullScreenWindowController.mm:

(-[WKFullScreenWindowController finishedExitFullScreenAnimation:]):
Clean up the _scaleAnimation controller, not just the _fadeAnimation controller.
(-[WKFullScreenWindowController close]): If we are doing an immediate
close of the view, we need to stop animations so we avoid any
final timer events from interacting with invalid window handles.

Location:
trunk/Source/WebKit2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r167128 r167130  
     12014-04-11  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [Mac] Prevent crash when exiting fullscreen mode
     4        https://bugs.webkit.org/show_bug.cgi?id=131528
     5
     6        Reviewed by Jer Noble.
     7
     8        * UIProcess/mac/WKFullScreenWindowController.mm:
     9        (-[WKFullScreenWindowController finishedExitFullScreenAnimation:]):
     10        Clean up the _scaleAnimation controller, not just the _fadeAnimation controller.
     11        (-[WKFullScreenWindowController close]): If we are doing an immediate
     12        close of the view, we need to stop animations so we avoid any
     13        final timer events from interacting with invalid window handles.
     14
    1152014-04-11  Carlos Garcia Campos  <cgarcia@igalia.com>
    216
  • trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm

    r165218 r167130  
    390390    [[self window] setFrame:NSZeroRect display:YES];
    391391
     392    [_scaleAnimation stopAnimation];
     393    [_scaleAnimation setWindow:nil];
     394    _scaleAnimation = nullptr;
     395
    392396    [_fadeAnimation stopAnimation];
    393397    [_fadeAnimation setWindow:nil];
     
    442446    if (_fullScreenState == ExitingFullScreen)
    443447        [self finishedExitFullScreenAnimation:YES];
     448
     449    [_scaleAnimation stopAnimation];
     450    [_scaleAnimation setWindow:nil];
     451    [_fadeAnimation stopAnimation];
     452    [_fadeAnimation setWindow:nil];
    444453
    445454    _webView = nil;
Note: See TracChangeset for help on using the changeset viewer.