Changeset 196714 in webkit

Timestamp:

Feb 17, 2016 12:40:28 PM (8 years ago)

Author:

ddkilzer@apple.com

Message:

[iOS WK1] NSTimer in WebGeolocationProviderIOS.mm fires on the main thread without the WebThreadLock
<​http://webkit.org/b/154347>
<rdar://problem/19360382>

Reviewed by Andy Estes.

This isn't testable because the GeolocationClientMock in WebCore
bypasses this code in WebKit1.

• Misc/WebGeolocationProviderIOS.mm:

(-[WebGeolocationProviderIOS _handlePendingInitialPosition:]):
Assert that this is always called on the WebThread.
(-[WebGeolocationProviderIOS registerWebView:]): Register the
NSTimer on the WebThread NSRunLoop.

Location:

trunk/Source/WebKit/ios

Files:

• ChangeLog (modified) (1 diff)
• Misc/WebGeolocationProviderIOS.mm (modified) (2 diffs)

trunk/Source/WebKit/ios/ChangeLog

@@ +1 @@
+2016-02-17  David Kilzer  <ddkilzer@apple.com>
+
+        [iOS WK1] NSTimer in WebGeolocationProviderIOS.mm fires on the main thread without the WebThreadLock
+        <http://webkit.org/b/154347>
+        <rdar://problem/19360382>
+
+        Reviewed by Andy Estes.
+
+        This isn't testable because the GeolocationClientMock in WebCore
+        bypasses this code in WebKit1.
+
+        * Misc/WebGeolocationProviderIOS.mm:
+        (-[WebGeolocationProviderIOS _handlePendingInitialPosition:]):
+        Assert that this is always called on the WebThread.
+        (-[WebGeolocationProviderIOS registerWebView:]): Register the
+        NSTimer on the WebThread NSRunLoop.
+
 2016-01-16  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebKit/ios/Misc/WebGeolocationProviderIOS.mm

@@ -158 +158 @@
 {
     ASSERT_UNUSED(timer, timer == _sendLastPositionAsynchronouslyTimer);
+    ASSERT(WebThreadIsCurrent());
 
     if (_lastPosition) {
@@ -197 +198 @@
     // On WebKit2, we could skip that and send the position directly from the UIProcess.
     _pendingInitialPositionWebView.add(webView);
-    if (!_sendLastPositionAsynchronouslyTimer)
-        _sendLastPositionAsynchronouslyTimer = [NSTimer scheduledTimerWithTimeInterval:0
-                                                                                target:self
-                                                                              selector:@selector(_handlePendingInitialPosition:)
-                                                                              userInfo:nil
-                                                                               repeats:NO];
+    if (!_sendLastPositionAsynchronouslyTimer) {
+        _sendLastPositionAsynchronouslyTimer = [NSTimer timerWithTimeInterval:0 target:self selector:@selector(_handlePendingInitialPosition:) userInfo:nil repeats:NO];
+        [WebThreadNSRunLoop() addTimer:_sendLastPositionAsynchronouslyTimer.get() forMode:NSDefaultRunLoopMode];
+    }
 }