OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All Rights Reserved. | 2 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All Rights Reserved. |
3 * Copyright (C) 2009 Torch Mobile, Inc. | 3 * Copyright (C) 2009 Torch Mobile, Inc. |
4 * Copyright 2010, The Android Open Source Project | 4 * Copyright 2010, The Android Open Source Project |
5 * | 5 * |
6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
8 * are met: | 8 * are met: |
9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
(...skipping 17 matching lines...) Expand all Loading... | |
28 #include "modules/geolocation/Geolocation.h" | 28 #include "modules/geolocation/Geolocation.h" |
29 | 29 |
30 #include "core/dom/Document.h" | 30 #include "core/dom/Document.h" |
31 #include "core/frame/Deprecation.h" | 31 #include "core/frame/Deprecation.h" |
32 #include "core/frame/HostsUsingFeatures.h" | 32 #include "core/frame/HostsUsingFeatures.h" |
33 #include "core/frame/Settings.h" | 33 #include "core/frame/Settings.h" |
34 #include "modules/geolocation/Coordinates.h" | 34 #include "modules/geolocation/Coordinates.h" |
35 #include "modules/geolocation/GeolocationError.h" | 35 #include "modules/geolocation/GeolocationError.h" |
36 #include "platform/UserGestureIndicator.h" | 36 #include "platform/UserGestureIndicator.h" |
37 #include "platform/mojo/MojoHelper.h" | 37 #include "platform/mojo/MojoHelper.h" |
38 #include "public/platform/Platform.h" | |
38 #include "public/platform/ServiceRegistry.h" | 39 #include "public/platform/ServiceRegistry.h" |
39 #include "wtf/Assertions.h" | 40 #include "wtf/Assertions.h" |
40 #include "wtf/CurrentTime.h" | 41 #include "wtf/CurrentTime.h" |
41 | 42 |
42 namespace blink { | 43 namespace blink { |
43 namespace { | 44 namespace { |
44 | 45 |
45 static const char permissionDeniedErrorMessage[] = "User denied Geolocation"; | 46 static const char permissionDeniedErrorMessage[] = "User denied Geolocation"; |
46 static const char failedToStartServiceErrorMessage[] = "Failed to start Geolocat ion service"; | 47 static const char failedToStartServiceErrorMessage[] = "Failed to start Geolocat ion service"; |
47 static const char framelessDocumentErrorMessage[] = "Geolocation cannot be used in frameless documents"; | 48 static const char framelessDocumentErrorMessage[] = "Geolocation cannot be used in frameless documents"; |
(...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
519 queryNextPosition(); | 520 queryNextPosition(); |
520 } | 521 } |
521 | 522 |
522 void Geolocation::pageVisibilityChanged() | 523 void Geolocation::pageVisibilityChanged() |
523 { | 524 { |
524 updateGeolocationServiceConnection(); | 525 updateGeolocationServiceConnection(); |
525 } | 526 } |
526 | 527 |
527 void Geolocation::onGeolocationConnectionError() | 528 void Geolocation::onGeolocationConnectionError() |
528 { | 529 { |
530 // If a request is outstanding at process shutdown, this error handler will | |
531 // be called. In that case, |this| is not really in a good state so do | |
532 // nothing. | |
533 if (!Platform::current()) | |
haraken
2016/07/20 07:15:01
It looks nasty to have this kind of check in Blink
Michael van Ouwerkerk
2016/07/20 09:40:50
This does seem a little out of place. It seems tha
| |
534 return; | |
535 | |
529 PositionError* error = PositionError::create(PositionError::POSITION_UNAVAIL ABLE, failedToStartServiceErrorMessage); | 536 PositionError* error = PositionError::create(PositionError::POSITION_UNAVAIL ABLE, failedToStartServiceErrorMessage); |
530 error->setIsFatal(true); | 537 error->setIsFatal(true); |
531 handleError(error); | 538 handleError(error); |
532 } | 539 } |
533 | 540 |
534 void Geolocation::onPermissionConnectionError() | 541 void Geolocation::onPermissionConnectionError() |
535 { | 542 { |
543 // If a request is outstanding at process shutdown, this error handler will | |
544 // be called. In that case, |this| is not really in a good state so do | |
545 // nothing. | |
546 if (!Platform::current()) | |
547 return; | |
548 | |
536 onGeolocationPermissionUpdated(mojom::blink::PermissionStatus::DENIED); | 549 onGeolocationPermissionUpdated(mojom::blink::PermissionStatus::DENIED); |
537 } | 550 } |
538 | 551 |
539 } // namespace blink | 552 } // namespace blink |
OLD | NEW |