Changeset 38017 in webkit

Timestamp:

Oct 30, 2008 6:54:49 PM (15 years ago)

Author:

ddkilzer@apple.com

Message:

2008-10-30 Greg Bolsinga <​bolsinga@apple.com>

Reviewed by Sam Weinig

​https://bugs.webkit.org/show_bug.cgi?id=21966

The Geolocation spec was updated on 10/27/2008. This brings WebCore up to date.
​http://dev.w3.org/geo/api/spec-source.html

• page/Geolocation.cpp: (WebCore::Geolocation::GeoNotifier::GeoNotifier): PositionOptions' timeout now unsigned
• page/Geoposition.cpp: velocity is now called speed (WebCore::Geoposition::toString):
• page/Geoposition.h: velocity is now called speed (WebCore::Geoposition::create): (WebCore::Geoposition::speed): (WebCore::Geoposition::Geoposition):
• page/Geoposition.idl: velocity is now called speed
• page/PositionOptions.h: timeout is now unsigned (WebCore::PositionOptions::create): (WebCore::PositionOptions::timeout): (WebCore::PositionOptions::setTimeout): (WebCore::PositionOptions::PositionOptions):
• page/PositionOptions.idl: timeout is now unsigned long

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/Geolocation.cpp (modified) (1 diff)
• page/Geoposition.cpp (modified) (1 diff)
• page/Geoposition.h (modified) (5 diffs)
• page/Geoposition.idl (modified) (1 diff)
• page/PositionOptions.h (modified) (2 diffs)
• page/PositionOptions.idl (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-10-30  Greg Bolsinga  <bolsinga@apple.com>
+
+        Reviewed by Sam Weinig
+
+        https://bugs.webkit.org/show_bug.cgi?id=21966
+        
+        The Geolocation spec was updated on 10/27/2008. This brings WebCore up to date.
+        http://dev.w3.org/geo/api/spec-source.html
+
+        * page/Geolocation.cpp:
+        (WebCore::Geolocation::GeoNotifier::GeoNotifier): PositionOptions' timeout now unsigned
+        * page/Geoposition.cpp: velocity is now called speed
+        (WebCore::Geoposition::toString):
+        * page/Geoposition.h: velocity is now called speed
+        (WebCore::Geoposition::create):
+        (WebCore::Geoposition::speed):
+        (WebCore::Geoposition::Geoposition):
+        * page/Geoposition.idl: velocity is now called speed
+        * page/PositionOptions.h: timeout is now unsigned
+        (WebCore::PositionOptions::create):
+        (WebCore::PositionOptions::timeout):
+        (WebCore::PositionOptions::setTimeout):
+        (WebCore::PositionOptions::PositionOptions):
+        * page/PositionOptions.idl: timeout is now unsigned long
+
 2008-10-30  Justin Garcia  <justin.garcia@apple.com>
 

trunk/WebCore/page/Geolocation.cpp

@@ -38 +38 @@
     , m_timer(this, &Geolocation::GeoNotifier::timerFired)
 {
-    if (m_errorCallback && options && options->timeout() != -1)
+    if (m_errorCallback && options)
         m_timer.startOneShot(options->timeout() / 1000.0);
 }

trunk/WebCore/page/Geoposition.cpp

@@ -33 +33 @@
     return String::format("position(%.6lg, %.6lg, %.6lg, %.6lg, %.6lg, %.6lg, %.6lg, %.lld)",
                           m_latitude, m_longitude, m_altitude, m_accuracy, 
-                          m_altitudeAccuracy, m_heading, m_velocity, m_timestamp);
+                          m_altitudeAccuracy, m_heading, m_speed, m_timestamp);
 }
 

trunk/WebCore/page/Geoposition.h

@@ -37 +37 @@
 class Geoposition : public RefCounted<Geoposition> {
 public:
-    static PassRefPtr<Geoposition> create(double latitude, double longitude, double altitude, double accuracy, double altitudeAccuracy, double heading, double velocity, DOMTimeStamp timestamp) { return adoptRef(new Geoposition(latitude, longitude, altitude, accuracy, altitudeAccuracy, heading, velocity, timestamp)); }
+    static PassRefPtr<Geoposition> create(double latitude, double longitude, double altitude, double accuracy, double altitudeAccuracy, double heading, double speed, DOMTimeStamp timestamp) { return adoptRef(new Geoposition(latitude, longitude, altitude, accuracy, altitudeAccuracy, heading, speed, timestamp)); }
     
     double latitude() const { return m_latitude; }
@@ -45 +45 @@
     double altitudeAccuracy() const { return m_altitudeAccuracy; }
     double heading() const { return m_heading; }
-    double velocity() const { return m_velocity; }
+    double speed() const { return m_speed; }
     DOMTimeStamp timestamp() const { return m_timestamp; }
 
@@ -51 +51 @@
 
 private:
-    Geoposition(double latitude, double longitude, double altitude, double accuracy, double altitudeAccuracy, double heading, double velocity, DOMTimeStamp timestamp)
+    Geoposition(double latitude, double longitude, double altitude, double accuracy, double altitudeAccuracy, double heading, double speed, DOMTimeStamp timestamp)
         : m_latitude(latitude)
         , m_longitude(longitude)
@@ -58 +58 @@
         , m_altitudeAccuracy(altitudeAccuracy)
         , m_heading(heading)
-        , m_velocity(velocity)
+        , m_speed(speed)
         , m_timestamp(timestamp)
     {
@@ -69 +69 @@
     double m_altitudeAccuracy;
     double m_heading;
-    double m_velocity;
+    double m_speed;
     DOMTimeStamp m_timestamp;
 };

trunk/WebCore/page/Geoposition.idl

@@ -33 +33 @@
         readonly attribute double altitudeAccuracy;
         readonly attribute double heading;
-        readonly attribute double velocity;
+        readonly attribute double speed;
         readonly attribute DOMTimeStamp timestamp;
 

trunk/WebCore/page/PositionOptions.h

@@ -34 +34 @@
 class PositionOptions : public RefCounted<PositionOptions> {
 public:
-    static PassRefPtr<PositionOptions> create(bool highAccuracy, int timeout) { return adoptRef(new PositionOptions(highAccuracy, timeout)); }
+    static PassRefPtr<PositionOptions> create(bool highAccuracy, unsigned timeout) { return adoptRef(new PositionOptions(highAccuracy, timeout)); }
 
     bool enableHighAccuracy() const { return m_highAccuracy; }
     void setEnableHighAccuracy(bool enable) { m_highAccuracy = enable; }
-    int timeout() const { return m_timeout; }
-    void setTimeout(int t) { m_timeout = t; }
+    unsigned timeout() const { return m_timeout; }
+    void setTimeout(unsigned t) { m_timeout = t; }
     
 private:
-    PositionOptions(bool highAccuracy, int timeout)
+    PositionOptions(bool highAccuracy, unsigned timeout)
         : m_highAccuracy(highAccuracy)
         , m_timeout(timeout)
@@ -49 +49 @@
     
     bool m_highAccuracy;
-    int m_timeout;
+    unsigned m_timeout;
 };
     

trunk/WebCore/page/PositionOptions.idl

@@ -30 +30 @@
     ] PositionOptions {
         attribute boolean enableHighAccuracy;
-        attribute long timeout;
+        attribute unsigned long timeout;
     };