diff options
Diffstat (limited to 'chromium/third_party/blink/renderer/modules/geolocation/geolocation.h')
| -rw-r--r-- | chromium/third_party/blink/renderer/modules/geolocation/geolocation.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/chromium/third_party/blink/renderer/modules/geolocation/geolocation.h b/chromium/third_party/blink/renderer/modules/geolocation/geolocation.h index 6ad28ae59bf..65f8b6709ee 100644 --- a/chromium/third_party/blink/renderer/modules/geolocation/geolocation.h +++ b/chromium/third_party/blink/renderer/modules/geolocation/geolocation.h @@ -27,6 +27,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_GEOLOCATION_GEOLOCATION_H_ #define THIRD_PARTY_BLINK_RENDERER_MODULES_GEOLOCATION_GEOLOCATION_H_ +#include "mojo/public/cpp/bindings/remote.h" #include "services/device/public/mojom/geolocation.mojom-blink.h" #include "third_party/blink/public/mojom/geolocation/geolocation_service.mojom-blink.h" #include "third_party/blink/renderer/bindings/core/v8/active_script_wrappable.h" @@ -35,14 +36,13 @@ #include "third_party/blink/renderer/core/execution_context/context_lifecycle_observer.h" #include "third_party/blink/renderer/core/page/page_visibility_observer.h" #include "third_party/blink/renderer/modules/geolocation/geo_notifier.h" +#include "third_party/blink/renderer/modules/geolocation/geolocation_position_error.h" #include "third_party/blink/renderer/modules/geolocation/geolocation_watchers.h" #include "third_party/blink/renderer/modules/geolocation/geoposition.h" -#include "third_party/blink/renderer/modules/geolocation/position_error.h" #include "third_party/blink/renderer/modules/geolocation/position_options.h" #include "third_party/blink/renderer/modules/modules_export.h" #include "third_party/blink/renderer/platform/bindings/script_wrappable.h" #include "third_party/blink/renderer/platform/heap/handle.h" -#include "third_party/blink/renderer/platform/mojo/revocable_interface_ptr.h" #include "third_party/blink/renderer/platform/timer.h" namespace blink { @@ -173,7 +173,7 @@ class MODULES_EXPORT Geolocation final // Sends the given error to all notifiers, unless the error is not fatal and // the notifier is due to receive a cached position. Clears the oneshots, // and also clears the watchers if the error is fatal. - void HandleError(PositionError*); + void HandleError(GeolocationPositionError*); // Connects to the Geolocation mojo service and starts polling for updates. void StartUpdating(GeoNotifier*); @@ -184,15 +184,15 @@ class MODULES_EXPORT Geolocation final void QueryNextPosition(); // Attempts to obtain a position for the given notifier, either by using - // the cached position or by requesting one from the Geolocation. + // the cached position or by requesting one from the Geolocation service. // Sets a fatal error if permission is denied or no position can be // obtained. void StartRequest(GeoNotifier*); bool HaveSuitableCachedPosition(const PositionOptions*); - // Record whether the origin trying to access Geolocation would be allowed - // to access a feature that can only be accessed by secure origins. + // Record whether the origin trying to access Geolocation would be + // allowed to access a feature that can only be accessed by secure origins. // See https://goo.gl/Y0ZkNV void RecordOriginTypeAccess() const; @@ -209,10 +209,10 @@ class MODULES_EXPORT Geolocation final // // |HandleError(error)| and |MakeSuccessCallbacks| need to clear |one_shots_| // (and optionally |watchers_|) before invoking the callbacks, in order to - // avoid clearing notifiers added by calls to Geolocation methods from the - // callbacks. Thus, something else needs to make the notifiers being invoked - // alive with wrapper-tracing because V8 GC may run during the callbacks. - // |one_shots_being_invoked_| and |watchers_being_invoked_| perform + // avoid clearing notifiers added by calls to Geolocation methods + // from the callbacks. Thus, something else needs to make the notifiers being + // invoked alive with wrapper-tracing because V8 GC may run during the + // callbacks. |one_shots_being_invoked_| and |watchers_being_invoked_| perform // wrapper-tracing. // TODO(https://crbug.com/796145): Remove this hack once on-stack objects // get supported by either of wrapper-tracing or unified GC. @@ -220,8 +220,8 @@ class MODULES_EXPORT Geolocation final HeapVector<Member<GeoNotifier>> watchers_being_invoked_; Member<Geoposition> last_position_; - RevocableInterfacePtr<device::mojom::blink::Geolocation> geolocation_; - RevocableInterfacePtr<mojom::blink::GeolocationService> geolocation_service_; + mojo::Remote<device::mojom::blink::Geolocation> geolocation_; + mojo::Remote<mojom::blink::GeolocationService> geolocation_service_; bool enable_high_accuracy_ = false; // Whether a GeoNotifier is waiting for a position update. |