[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[tonyg at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 23949ab987f9da1eb811e217de4f9610f32069ad
Author: tonyg at chromium.org <tonyg at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 12 04:55:31 2010 +0000

    2010-11-11  Tony Gentilcore  <tonyg at chromium.org>
    
            Reviewed by Nate Chapin.
    
            [chromium] Convert WebPerformance doubles to seconds
            https://bugs.webkit.org/show_bug.cgi?id=49232
    
            This makes them suitable for passing to Time::FromDoubleT().
    
            * src/WebPerformance.cpp:
            (WebKit::millisecondsToSeconds):
            (WebKit::WebPerformance::navigationStart):
            (WebKit::WebPerformance::unloadEventEnd):
            (WebKit::WebPerformance::redirectStart):
            (WebKit::WebPerformance::redirectEnd):
            (WebKit::WebPerformance::fetchStart):
            (WebKit::WebPerformance::domainLookupStart):
            (WebKit::WebPerformance::domainLookupEnd):
            (WebKit::WebPerformance::connectStart):
            (WebKit::WebPerformance::connectEnd):
            (WebKit::WebPerformance::requestStart):
            (WebKit::WebPerformance::requestEnd):
            (WebKit::WebPerformance::responseStart):
            (WebKit::WebPerformance::responseEnd):
            (WebKit::WebPerformance::loadEventStart):
            (WebKit::WebPerformance::loadEventEnd):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71883 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 6310746..ad8d79a 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,30 @@
+2010-11-11  Tony Gentilcore  <tonyg at chromium.org>
+
+        Reviewed by Nate Chapin.
+
+        [chromium] Convert WebPerformance doubles to seconds
+        https://bugs.webkit.org/show_bug.cgi?id=49232
+
+        This makes them suitable for passing to Time::FromDoubleT().
+
+        * src/WebPerformance.cpp:
+        (WebKit::millisecondsToSeconds):
+        (WebKit::WebPerformance::navigationStart):
+        (WebKit::WebPerformance::unloadEventEnd):
+        (WebKit::WebPerformance::redirectStart):
+        (WebKit::WebPerformance::redirectEnd):
+        (WebKit::WebPerformance::fetchStart):
+        (WebKit::WebPerformance::domainLookupStart):
+        (WebKit::WebPerformance::domainLookupEnd):
+        (WebKit::WebPerformance::connectStart):
+        (WebKit::WebPerformance::connectEnd):
+        (WebKit::WebPerformance::requestStart):
+        (WebKit::WebPerformance::requestEnd):
+        (WebKit::WebPerformance::responseStart):
+        (WebKit::WebPerformance::responseEnd):
+        (WebKit::WebPerformance::loadEventStart):
+        (WebKit::WebPerformance::loadEventEnd):
+
 2010-11-11  Hans Wennborg  <hans at chromium.org>
 
         Reviewed by Jeremy Orlow.
diff --git a/WebKit/chromium/src/WebPerformance.cpp b/WebKit/chromium/src/WebPerformance.cpp
index 898a761..e894895 100644
--- a/WebKit/chromium/src/WebPerformance.cpp
+++ b/WebKit/chromium/src/WebPerformance.cpp
@@ -37,6 +37,11 @@ using namespace WebCore;
 
 namespace WebKit {
 
+static double millisecondsToSeconds(unsigned long long milliseconds)
+{
+    return static_cast<double>(milliseconds / 1000.0);
+}
+
 void WebPerformance::reset()
 {
     m_private.reset();
@@ -63,22 +68,22 @@ WebNavigationType WebPerformance::navigationType() const
 
 double WebPerformance::navigationStart() const
 {
-    return static_cast<double>(m_private->timing()->navigationStart());
+    return millisecondsToSeconds(m_private->timing()->navigationStart());
 }
 
 double WebPerformance::unloadEventEnd() const
 {
-    return static_cast<double>(m_private->timing()->unloadEventEnd());
+    return millisecondsToSeconds(m_private->timing()->unloadEventEnd());
 }
 
 double WebPerformance::redirectStart() const
 {
-    return static_cast<double>(m_private->timing()->redirectStart());
+    return millisecondsToSeconds(m_private->timing()->redirectStart());
 }
 
 double WebPerformance::redirectEnd() const
 {
-    return static_cast<double>(m_private->timing()->redirectEnd());
+    return millisecondsToSeconds(m_private->timing()->redirectEnd());
 }
 
 unsigned short WebPerformance::redirectCount() const
@@ -88,52 +93,52 @@ unsigned short WebPerformance::redirectCount() const
 
 double WebPerformance::fetchStart() const
 {
-    return static_cast<double>(m_private->timing()->fetchStart());
+    return millisecondsToSeconds(m_private->timing()->fetchStart());
 }
 
 double WebPerformance::domainLookupStart() const
 {
-    return static_cast<double>(m_private->timing()->domainLookupStart());
+    return millisecondsToSeconds(m_private->timing()->domainLookupStart());
 }
 
 double WebPerformance::domainLookupEnd() const
 {
-    return static_cast<double>(m_private->timing()->domainLookupEnd());
+    return millisecondsToSeconds(m_private->timing()->domainLookupEnd());
 }
 
 double WebPerformance::connectStart() const
 {
-    return static_cast<double>(m_private->timing()->connectStart());
+    return millisecondsToSeconds(m_private->timing()->connectStart());
 }
 
 double WebPerformance::connectEnd() const
 {
-    return static_cast<double>(m_private->timing()->connectEnd());
+    return millisecondsToSeconds(m_private->timing()->connectEnd());
 }
 
 double WebPerformance::requestStart() const
 {
-    return static_cast<double>(m_private->timing()->requestStart());
+    return millisecondsToSeconds(m_private->timing()->requestStart());
 }
 
 double WebPerformance::responseStart() const
 {
-    return static_cast<double>(m_private->timing()->responseStart());
+    return millisecondsToSeconds(m_private->timing()->responseStart());
 }
 
 double WebPerformance::responseEnd() const
 {
-    return static_cast<double>(m_private->timing()->responseEnd());
+    return millisecondsToSeconds(m_private->timing()->responseEnd());
 }
 
 double WebPerformance::loadEventStart() const
 {
-    return static_cast<double>(m_private->timing()->loadEventStart());
+    return millisecondsToSeconds(m_private->timing()->loadEventStart());
 }
 
 double WebPerformance::loadEventEnd() const
 {
-    return static_cast<double>(m_private->timing()->loadEventEnd());
+    return millisecondsToSeconds(m_private->timing()->loadEventEnd());
 }
 
 WebPerformance::WebPerformance(const PassRefPtr<Performance>& performance)

-- 
WebKit Debian packaging