diff --git a/index.html b/index.html index b9dd211..aea0366 100644 --- a/index.html +++ b/index.html @@ -44,7 +44,7 @@ }; -
+This specification defines an API that provides scripted access to @@ -309,36 +309,8 @@
- User agents MUST NOT send location information to Web sites without - the express permission of the user. User agents MUST acquire - permission through a user interface, unless they have prearranged - trust relationships with users, as described below. The user - interface MUST include the {{URL/host}} component of the document's - URL. Those permissions that are acquired through the user interface - and that are preserved beyond the current browsing session (i.e. - beyond the time when the browsing context is navigated to - another URL) MUST be revocable and user agents MUST respect revoked - permissions. -
-- Some user agents will have prearranged trust relationships that do - not require such user interfaces. For example, while a Web browser - will present a user interface when a Web site performs a geolocation - request, a VOIP telephone MAY NOT present any user interface when - using location information to perform an E911 function. -
-- The getCurrentPosition() method takes one, two or three - arguments. When called, it MUST immediately return and then - asynchronously attempt to obtain the current location of the - device. If the attempt is successful, the - |successCallback:PositionCallback| MUST be invoked with a new - {{GeolocationPosition}} object, reflecting the current location of - the device. If the attempt fails, the - |errorCallback:PositionErrorCallback| MUST be invoked with a new - {{GeolocationPositionError}} object, reflecting the reason for the - failure. + When {{Geolocation/getCurrentPosition()}} is invoked, the user + agent MUST:
-- The implementation of the {{Geolocation/getCurrentPosition()}} - method MUST execute the following set of steps: -
-- The watchPosition() method takes one, two or three - arguments. When called, immediately return a long value that - uniquely identifies a watch process and continue - asynchronously. + When watchPosition() is invoked, the user agent MUST:
-@@ -561,14 +521,13 @@
- For both {{Geolocation/getCurrentPosition()}} and - {{Geolocation/watchPosition()}}, the implementation MUST never - invoke the |successCallback| without having first obtained - permission from the user to share location. Furthermore, the - implementation SHOULD always obtain the user's permission to share - location before executing any of the - {{Geolocation/getCurrentPosition()}} or - {{Geolocation/watchPosition()}} steps described above. If the user - grants permission, the appropriate callback MUST be invoked as - described above. If the user denies permission, the |errorCallback| - (if present) MUST be invoked with {{GeolocationPositionError/code}} - set to {{GeolocationPositionError.PERMISSION_DENIED}}, irrespective - of any other errors encountered in the above steps. The time that - is spent obtaining the user permission MUST NOT be included in the - period covered by the {{PositionOptions/timeout}} attribute of the - {{PositionOptions}} parameter. The {{PositionOptions/timeout}} - attribute MUST only apply to the location acquisition operation. +
+ The time that is spent obtaining the user permission MUST NOT be + included in the period covered by the {{PositionOptions/timeout}} + attribute of the {{PositionOptions}} parameter. The + {{PositionOptions/timeout}} attribute MUST only apply to the + location acquisition operation.
+ When instructed to call back with error, given an + {{PositionErrorCallback}}? |callback:PositionErrorCallback?| and + {{unsigned short}} |code:unsigned short|: +
+