Index: third_party/WebKit/Source/modules/geolocation/Geolocation.cpp |
diff --git a/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp b/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp |
index 7b14da1bb8fdbe811a7ca521468de0c61d052180..cd8df3c870ffe60090e87a18ad276bf98cb8bf77 100644 |
--- a/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp |
+++ b/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp |
@@ -526,6 +526,13 @@ |
void Geolocation::onGeolocationConnectionError() |
{ |
+ // If a request is outstanding at process shutdown, this error handler will |
+ // be called. In that case, blink has already shut down so do nothing. |
+ // |
+ // TODO(sammc): Remove this once renderer shutdown is no longer graceful. |
+ if (!Platform::current()) |
+ return; |
+ |
PositionError* error = PositionError::create(PositionError::kPositionUnavailable, failedToStartServiceErrorMessage); |
error->setIsFatal(true); |
handleError(error); |
@@ -533,6 +540,13 @@ |
void Geolocation::onPermissionConnectionError() |
{ |
+ // If a request is outstanding at process shutdown, this error handler will |
+ // be called. In that case, blink has already shut down so do nothing. |
+ // |
+ // TODO(sammc): Remove this once renderer shutdown is no longer graceful. |
+ if (!Platform::current()) |
+ return; |
+ |
onGeolocationPermissionUpdated(mojom::blink::PermissionStatus::DENIED); |
} |