webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 16 insertions, 24 deletions

diff --git a/Source/WebCore/Modules/geolocation/Coordinates.cpp b/Source/WebCore/Modules/geolocation/Coordinates.cpp
index d7b759d37..8981fb55e 100644
--- a/Source/WebCore/Modules/geolocation/Coordinates.cpp
+++ b/Source/WebCore/Modules/geolocation/Coordinates.cpp
@@ -28,40 +28,32 @@
 
 namespace WebCore {
 
-double Coordinates::altitude(bool& isNull) const
+std::optional<double> Coordinates::altitude() const
 {
-    if (m_canProvideAltitude)
-        return m_altitude;
-
-    isNull = true;
-    return 0;
+    if (!m_canProvideAltitude)
+        return std::nullopt;
+    return m_altitude;
 }
 
-double Coordinates::altitudeAccuracy(bool& isNull) const
+std::optional<double> Coordinates::altitudeAccuracy() const
 {
-    if (m_canProvideAltitudeAccuracy)
-        return m_altitudeAccuracy;
-
-    isNull = true;
-    return 0;
+    if (!m_canProvideAltitudeAccuracy)
+        return std::nullopt;
+    return m_altitudeAccuracy;
 }
 
-double Coordinates::heading(bool& isNull) const
+std::optional<double> Coordinates::heading() const
 {
-    if (m_canProvideHeading)
-        return m_heading;
-
-    isNull = true;
-    return 0;
+    if (!m_canProvideHeading)
+        return std::nullopt;
+    return m_heading;
 }
 
-double Coordinates::speed(bool& isNull) const
+std::optional<double> Coordinates::speed() const
 {
-    if (m_canProvideSpeed)
-        return m_speed;
-
-    isNull = true;
-    return 0;
+    if (!m_canProvideSpeed)
+        return std::nullopt;
+    return m_speed;
 }
     
 } // namespace WebCore