Changeset 181607 in webkit

Timestamp:

Mar 16, 2015, 7:58:07 PM (11 years ago)

Author:

Conrad Shultz

Message:

Don't pass nil as a fireDate for NSTimer
​https://bugs.webkit.org/show_bug.cgi?id=142765

Reviewed by Dan Bernstein.

While we're here, switch to a selector that conforms to documented NSTimer API.

• UIProcess/mac/WKFullScreenWindowController.mm:

(-[WKFullScreenWindowController cancelOperation:]):
Set the timer's fireDate as the future date matching the former interval; update the selector.
(-[WKFullScreenWindowController _watchdogTimerFired:]):
Timer callback; wrap -exitFullScreen.

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-03-16  Conrad Shultz  <conrad_shultz@apple.com>
+
+        Don't pass nil as a fireDate for NSTimer
+        https://bugs.webkit.org/show_bug.cgi?id=142765
+
+        Reviewed by Dan Bernstein.
+
+        While we're here, switch to a selector that conforms to documented NSTimer API.
+
+        * UIProcess/mac/WKFullScreenWindowController.mm:
+        (-[WKFullScreenWindowController cancelOperation:]):
+        Set the timer's fireDate as the future date matching the former interval; update the selector.
+        (-[WKFullScreenWindowController _watchdogTimerFired:]):
+        Timer callback; wrap -exitFullScreen.
+
 2015-03-16  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -155 +155 @@
     if (!_watchdogTimer) {
         [self _manager]->requestExitFullScreen();
-        _watchdogTimer = adoptNS([[NSTimer alloc] initWithFireDate:nil interval:DefaultWatchdogTimerInterval target:self selector:@selector(exitFullScreen) userInfo:nil repeats:NO]);
+        _watchdogTimer = adoptNS([[NSTimer alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:DefaultWatchdogTimerInterval] interval:0 target:self selector:@selector(_watchdogTimerFired:) userInfo:nil repeats:NO]);
         [[NSRunLoop mainRunLoop] addTimer:_watchdogTimer.get() forMode:NSDefaultRunLoopMode];
     }
@@ -672 +672 @@
     NSEnableScreenUpdates();
 }
+
+- (void)_watchdogTimerFired:(NSTimer *)timer
+{
+    [self exitFullScreen];
+}
+
 @end