diff options
Diffstat (limited to 'WebCore/page/Coordinates.h')
| -rw-r--r-- | WebCore/page/Coordinates.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/WebCore/page/Coordinates.h b/WebCore/page/Coordinates.h index 43870a1..bd29d42 100644 --- a/WebCore/page/Coordinates.h +++ b/WebCore/page/Coordinates.h @@ -50,7 +50,11 @@ public: bool canProvideAltitudeAccuracy() const { return m_canProvideAltitudeAccuracy; } bool canProvideHeading() const { return m_canProvideHeading; } bool canProvideSpeed() const { return m_canProvideSpeed; } +<<<<<<< HEAD:WebCore/page/Coordinates.h +======= + +>>>>>>> webkit.org at 49305:WebCore/page/Coordinates.h private: Coordinates(double latitude, double longitude, bool providesAltitude, double altitude, double accuracy, bool providesAltitudeAccuracy, double altitudeAccuracy, bool providesHeading, double heading, bool providesSpeed, double speed) : m_latitude(latitude) |