[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-142-g786665c

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 2a8ce55775d6d54a91b1e789600787fec4b63ab6
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 21 07:50:15 2010 +0000

    2010-12-20  Mahesh Kulkarni  <mahesh.kulkarni at nokia.com>
    
            Reviewed by Andreas Kling.
    
            Qt port of geolocation, geoposition objects timestamp was in seconds
            instead of miliseconds as per HTML5 Geolocation standards.
            Ref: http://dev.w3.org/geo/api/spec-source.html#position_interface
            http://www.w3.org/TR/DOM-Level-3-Core/core.html#Core-DOMTimeStamp
    
            Implemented by Asheesh Srivastava.
    
            [QT] QtWebkit geolocation's position.timestamp is not in miliseconds
            https://bugs.webkit.org/show_bug.cgi?id=51100
    
            Porting code not covered in layout testing. No new tests added.
    
            * platform/qt/GeolocationServiceQt.cpp:
            (WebCore::GeolocationServiceQt::positionUpdated):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74404 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e10d60a..4727a6b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-12-20  Mahesh Kulkarni  <mahesh.kulkarni at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        Qt port of geolocation, geoposition objects timestamp was in seconds
+        instead of miliseconds as per HTML5 Geolocation standards.
+        Ref: http://dev.w3.org/geo/api/spec-source.html#position_interface 
+        http://www.w3.org/TR/DOM-Level-3-Core/core.html#Core-DOMTimeStamp 
+
+        Implemented by Asheesh Srivastava.
+
+        [QT] QtWebkit geolocation's position.timestamp is not in miliseconds
+        https://bugs.webkit.org/show_bug.cgi?id=51100
+
+        Porting code not covered in layout testing. No new tests added.
+
+        * platform/qt/GeolocationServiceQt.cpp:
+        (WebCore::GeolocationServiceQt::positionUpdated):
+
 2010-12-20  Yuzo Fujishima  <yuzo at google.com>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/platform/qt/GeolocationServiceQt.cpp b/WebCore/platform/qt/GeolocationServiceQt.cpp
index 3562eb9..f4379b2 100644
--- a/WebCore/platform/qt/GeolocationServiceQt.cpp
+++ b/WebCore/platform/qt/GeolocationServiceQt.cpp
@@ -83,7 +83,13 @@ void GeolocationServiceQt::positionUpdated(const QGeoPositionInfo &geoPosition)
     RefPtr<Coordinates> coordinates = Coordinates::create(latitude, longitude, providesAltitude, altitude,
                                                           accuracy, providesAltitudeAccuracy, altitudeAccuracy,
                                                           providesHeading, heading, providesSpeed, speed);
-    m_lastPosition = Geoposition::create(coordinates.release(), geoPosition.timestamp().toTime_t());
+
+#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
+    m_lastPosition = Geoposition::create(coordinates.release(), geoPosition.timestamp().toMSecsSinceEpoch());
+#else
+    QDateTime timestamp = geoPosition.timestamp();
+    m_lastPosition = Geoposition::create(coordinates.release(), (timestamp.toTime_t() * 1000.00) + timestamp.time().msec());
+#endif
     positionChanged();
 }
 

-- 
WebKit Debian packaging