Skip to content

Commit

Permalink
Merge pull request #26254 from brave/ie_geobackport
Browse files Browse the repository at this point in the history
Backport an upstream fix for geolocation crash. (1.72.x)
  • Loading branch information
LaurenWags authored Oct 29, 2024
2 parents 5f14a22 + 5232a68 commit 5e774aa
Showing 1 changed file with 21 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
diff --git a/third_party/blink/renderer/modules/geolocation/geolocation.cc b/third_party/blink/renderer/modules/geolocation/geolocation.cc
index 223049e27395830a64f80ac67ccf435793e3f1e3..c7d247a700167f8215648bcb4fd43836f8507b40 100644
--- a/third_party/blink/renderer/modules/geolocation/geolocation.cc
+++ b/third_party/blink/renderer/modules/geolocation/geolocation.cc
@@ -90,10 +90,12 @@ GeolocationPositionError* CreatePositionError(
error_code = GeolocationPositionError::kPositionUnavailable;
break;
default:
- // On Blink side, it should only handles W3C defined error codes.
- // If it reaches here that means an unexpected error type being propagated
- // to Blink. This should never happen.
- NOTREACHED_NORETURN();
+ // On the Blink side, it should only handle W3C-defined error codes. If it
+ // reaches here, that means a platform-specific error type is being
+ // propagated to Blink. We will now just use kPositionUnavailable until
+ // more explicit error codes are defined in the W3C spec.
+ error_code = GeolocationPositionError::kPositionUnavailable;
+ break;
}
return MakeGarbageCollected<GeolocationPositionError>(error_code,
error.error_message);

0 comments on commit 5e774aa

Please sign in to comment.