Revert of Geolocation: rename Geoposition to Position to follow Spec

third_party/WebKit/Source/modules/geolocation/Geolocation.h

 /*
  * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All Rights Reserved.
  * Copyright 2010, The Android Open Source Project
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 16 matching lines @@
 #ifndef Geolocation_h
 #define Geolocation_h
 
 #include "bindings/core/v8/ScriptWrappable.h"
 #include "core/dom/ContextLifecycleObserver.h"
 #include "core/page/PageVisibilityObserver.h"
 #include "device/geolocation/public/interfaces/geolocation.mojom-blink.h"
 #include "modules/ModulesExport.h"
 #include "modules/geolocation/GeoNotifier.h"
 #include "modules/geolocation/GeolocationWatchers.h"
-#include "modules/geolocation/Position.h"
+#include "modules/geolocation/Geoposition.h"
 #include "modules/geolocation/PositionCallback.h"
 #include "modules/geolocation/PositionError.h"
 #include "modules/geolocation/PositionErrorCallback.h"
 #include "modules/geolocation/PositionOptions.h"
 #include "platform/Timer.h"
 #include "platform/heap/Handle.h"
 
 #include "third_party/WebKit/public/platform/modules/permissions/permission.mojom-blink.h"
 #include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom-blink.h"
 
@@ skipping 65 matching lines @@
   explicit Geolocation(ExecutionContext*);
 
   typedef HeapVector<Member<GeoNotifier>> GeoNotifierVector;
   typedef HeapHashSet<Member<GeoNotifier>> GeoNotifierSet;
 
   bool HasListeners() const {
     return !one_shots_.IsEmpty() || !watchers_.IsEmpty();
   }
 
   void SendError(GeoNotifierVector&, PositionError*);
-  void SendPosition(GeoNotifierVector&, Position*);
+  void SendPosition(GeoNotifierVector&, Geoposition*);
 
   // Removes notifiers that use a cached position from |notifiers| and
   // if |cached| is not null they are added to it.
   static void ExtractNotifiersWithCachedPosition(GeoNotifierVector& notifiers,
                                                  GeoNotifierVector* cached);
 
   // Copies notifiers from |src| vector to |dest| set.
   static void CopyToSet(const GeoNotifierVector& src, GeoNotifierSet& dest);
 
   static void StopTimer(GeoNotifierVector&);
@@ skipping 46 matching lines @@
   // granted then the notifier's timers are started. Otherwise, a fatal error
   // is set on them.
   void OnGeolocationPermissionUpdated(mojom::blink::PermissionStatus);
 
   void OnGeolocationConnectionError();
   void OnPermissionConnectionError();
 
   GeoNotifierSet one_shots_;
   GeolocationWatchers watchers_;
   GeoNotifierSet pending_for_permission_notifiers_;
-  Member<Position> last_position_;
+  Member<Geoposition> last_position_;
 
   // States of Geolocation permission as granted by the embedder. Unknown
   // means that the embedder still has to be asked for the current permission
   // level; Requested means that the user has yet to make a decision.
   enum Permission {
     kPermissionUnknown,
     kPermissionRequested,
     kPermissionAllowed,
     kPermissionDenied
   };
 
   Permission geolocation_permission_;
   device::mojom::blink::GeolocationServicePtr geolocation_service_;
   bool enable_high_accuracy_ = false;
   mojom::blink::PermissionServicePtr permission_service_;
 
   // Whether a GeoNotifier is waiting for a position update.
   bool updating_ = false;
 
   // Set to true when m_geolocationService is disconnected. This is used to
   // detect when m_geolocationService is disconnected and reconnected while
   // running callbacks in response to a call to onPositionUpdated().
   bool disconnected_geolocation_service_ = false;
 };
 
 }  // namespace blink
 
 #endif  // Geolocation_h