Title: [174062] trunk/Source/WebKit/ios
- Revision
- 174062
- Author
- [email protected]
- Date
- 2014-09-29 08:37:17 -0700 (Mon, 29 Sep 2014)
Log Message
[iOS] Remove CoreLocation workaround
https://bugs.webkit.org/show_bug.cgi?id=137198
Reviewed by Dan Bernstein.
Following the fix for <rdar://problem/18448331>, we can revert the CoreLocation workaround
committed in <http://trac.webkit.org/changeset/173946> and <http://trac.webkit.org/changeset/173940> (in order).
* Misc/WebGeolocationCoreLocationProvider.mm:
(-[WebGeolocationCoreLocationProvider requestGeolocationAuthorization]):
(-[WebGeolocationCoreLocationProvider locationManager:didChangeAuthorizationStatus:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ios/ChangeLog (174061 => 174062)
--- trunk/Source/WebKit/ios/ChangeLog 2014-09-29 15:30:50 UTC (rev 174061)
+++ trunk/Source/WebKit/ios/ChangeLog 2014-09-29 15:37:17 UTC (rev 174062)
@@ -1,3 +1,17 @@
+2014-09-29 Daniel Bates <[email protected]>
+
+ [iOS] Remove CoreLocation workaround
+ https://bugs.webkit.org/show_bug.cgi?id=137198
+
+ Reviewed by Dan Bernstein.
+
+ Following the fix for <rdar://problem/18448331>, we can revert the CoreLocation workaround
+ committed in <http://trac.webkit.org/changeset/173946> and <http://trac.webkit.org/changeset/173940> (in order).
+
+ * Misc/WebGeolocationCoreLocationProvider.mm:
+ (-[WebGeolocationCoreLocationProvider requestGeolocationAuthorization]):
+ (-[WebGeolocationCoreLocationProvider locationManager:didChangeAuthorizationStatus:]):
+
2014-09-24 Daniel Bates <[email protected]>
[iOS] Another iOS build fix; workaround for CoreLocation
Modified: trunk/Source/WebKit/ios/Misc/WebGeolocationCoreLocationProvider.mm (174061 => 174062)
--- trunk/Source/WebKit/ios/Misc/WebGeolocationCoreLocationProvider.mm 2014-09-29 15:30:50 UTC (rev 174061)
+++ trunk/Source/WebKit/ios/Misc/WebGeolocationCoreLocationProvider.mm 2014-09-29 15:37:17 UTC (rev 174062)
@@ -101,8 +101,7 @@
return;
}
- CLAuthorizationStatus authorizationStatus = [getCLLocationManagerClass() authorizationStatus];
- switch (authorizationStatus) {
+ switch ([getCLLocationManagerClass() authorizationStatus]) {
case kCLAuthorizationStatusNotDetermined: {
if (!_isWaitingForAuthorization) {
_isWaitingForAuthorization = YES;
@@ -119,16 +118,6 @@
case kCLAuthorizationStatusDenied:
[_positionListener geolocationAuthorizationDenied];
break;
- default: // FIXME: Remove this default statement once we have the fix for <rdar://problem/18448331>.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if (authorizationStatus == kCLAuthorizationStatusAuthorized) {
- [_positionListener geolocationAuthorizationGranted];
- break;
- }
- ASSERT_NOT_REACHED();
- break;
-#pragma clang diagnostic pop
}
}
@@ -174,17 +163,6 @@
_isWaitingForAuthorization = NO;
[_positionListener geolocationAuthorizationGranted];
break;
- default: // FIXME: Remove this default statement once we have the fix for <rdar://problem/18448331>.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if (status == kCLAuthorizationStatusAuthorized) {
- _isWaitingForAuthorization = NO;
- [_positionListener geolocationAuthorizationGranted];
- break;
- }
- ASSERT_NOT_REACHED();
- break;
-#pragma clang diagnostic pop
}
} else {
if (!(isAuthorizationGranted(_lastAuthorizationStatus) && isAuthorizationGranted(status))) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
