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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 0cd0b10f622df90877dba87f3ea44b27e4a34e26
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 30 21:55:37 2010 +0000

    2010-09-30  James Simonsen  <simonjam at chromium.org>
    
            Reviewed by Adam Barth.
    
            [Web Timing] Make requestEnd equal to start of response
            https://bugs.webkit.org/show_bug.cgi?id=46302
    
            * fast/dom/script-tests/webtiming.js:
            (checkTimingBeforeLoad):
            (checkWebTimingOnLoad):
            (checkWebTimingAfterLoad):
            * fast/dom/webtiming-expected.txt:
    2010-09-30  James Simonsen  <simonjam at chromium.org>
    
            Reviewed by Adam Barth.
    
            [Web Timing] Make requestEnd equal to start of response
            https://bugs.webkit.org/show_bug.cgi?id=46302
    
            * page/Timing.cpp:
            (WebCore::Timing::requestEnd):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68835 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 25e4ec2..4d3ddba 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-30  James Simonsen  <simonjam at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        [Web Timing] Make requestEnd equal to start of response
+        https://bugs.webkit.org/show_bug.cgi?id=46302
+
+        * fast/dom/script-tests/webtiming.js:
+        (checkTimingBeforeLoad):
+        (checkWebTimingOnLoad):
+        (checkWebTimingAfterLoad):
+        * fast/dom/webtiming-expected.txt:
+
 2010-09-30  Xiaomei Ji  <xji at chromium.org>
 
         Unreviewed, updated test_expectations.txt
diff --git a/LayoutTests/fast/dom/script-tests/webtiming.js b/LayoutTests/fast/dom/script-tests/webtiming.js
index b393351..bae2134 100644
--- a/LayoutTests/fast/dom/script-tests/webtiming.js
+++ b/LayoutTests/fast/dom/script-tests/webtiming.js
@@ -36,7 +36,7 @@ function checkTimingBeforeLoad()
     shouldBeGreaterThanOrEqual("timing.requestStart", "timing.connectEnd");
     shouldBeGreaterThanOrEqual("timing.requestEnd", "timing.requestStart");
 
-    shouldBeGreaterThanOrEqual("timing.responseStart", "timing.requestEnd");
+    shouldBe("timing.responseStart", "timing.requestEnd");
 
     shouldBe("timing.loadEventStart", "0");
     shouldBe("timing.loadEventEnd", "0");
@@ -65,7 +65,7 @@ function checkWebTimingOnLoad()
     shouldBeGreaterThanOrEqual("timing.requestStart", "timing.connectEnd");
     shouldBeGreaterThanOrEqual("timing.requestEnd", "timing.requestStart");
 
-    shouldBeGreaterThanOrEqual("timing.responseStart", "timing.requestEnd");
+    shouldBe("timing.responseStart", "timing.requestEnd");
     shouldBeGreaterThanOrEqual("timing.responseEnd", "timing.responseStart");
 
     shouldBeGreaterThanOrEqual("timing.loadEventStart", "timing.responseEnd");
@@ -95,7 +95,7 @@ function checkWebTimingAfterLoad()
     shouldBeGreaterThanOrEqual("timing.requestStart", "timing.connectEnd");
     shouldBeGreaterThanOrEqual("timing.requestEnd", "timing.requestStart");
 
-    shouldBeGreaterThanOrEqual("timing.responseStart", "timing.requestEnd");
+    shouldBe("timing.responseStart", "timing.requestEnd");
     shouldBeGreaterThanOrEqual("timing.responseEnd", "timing.responseStart");
 
     shouldBeGreaterThanOrEqual("timing.loadEventStart", "timing.responseEnd");
diff --git a/LayoutTests/fast/dom/webtiming-expected.txt b/LayoutTests/fast/dom/webtiming-expected.txt
index 1e8951c..4e169f8 100644
--- a/LayoutTests/fast/dom/webtiming-expected.txt
+++ b/LayoutTests/fast/dom/webtiming-expected.txt
@@ -15,7 +15,7 @@ PASS timing.connectStart is >= timing.domainLookupEnd
 PASS timing.connectEnd is >= timing.connectStart
 PASS timing.requestStart is >= timing.connectEnd
 PASS timing.requestEnd is >= timing.requestStart
-PASS timing.responseStart is >= timing.requestEnd
+PASS timing.responseStart is timing.requestEnd
 PASS timing.loadEventStart is 0
 PASS timing.loadEventEnd is 0
 PASS timing.navigationStart is >= oneHourAgoUTC
@@ -30,7 +30,7 @@ PASS timing.connectStart is >= timing.domainLookupEnd
 PASS timing.connectEnd is >= timing.connectStart
 PASS timing.requestStart is >= timing.connectEnd
 PASS timing.requestEnd is >= timing.requestStart
-PASS timing.responseStart is >= timing.requestEnd
+PASS timing.responseStart is timing.requestEnd
 PASS timing.responseEnd is >= timing.responseStart
 PASS timing.loadEventStart is >= timing.responseEnd
 PASS timing.loadEventEnd is 0
@@ -46,7 +46,7 @@ PASS timing.connectStart is >= timing.domainLookupEnd
 PASS timing.connectEnd is >= timing.connectStart
 PASS timing.requestStart is >= timing.connectEnd
 PASS timing.requestEnd is >= timing.requestStart
-PASS timing.responseStart is >= timing.requestEnd
+PASS timing.responseStart is timing.requestEnd
 PASS timing.responseEnd is >= timing.responseStart
 PASS timing.loadEventStart is >= timing.responseEnd
 PASS timing.loadEventEnd is >= timing.loadEventStart + 50
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 61fec49..4ae9dcb 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-30  James Simonsen  <simonjam at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        [Web Timing] Make requestEnd equal to start of response
+        https://bugs.webkit.org/show_bug.cgi?id=46302
+
+        * page/Timing.cpp:
+        (WebCore::Timing::requestEnd):
+
 2010-09-30  Zhenyao Mo  <zmo at google.com>
 
         Reviewed by Kenneth Russell.
diff --git a/WebCore/page/Timing.cpp b/WebCore/page/Timing.cpp
index f65322b..8a0de2a 100644
--- a/WebCore/page/Timing.cpp
+++ b/WebCore/page/Timing.cpp
@@ -100,7 +100,7 @@ unsigned long long Timing::unloadEventEnd() const
 
     return toIntegerMilliseconds(timing->unloadEventEnd);
 }
-    
+
 unsigned long long Timing::redirectStart() const
 {
     DocumentLoadTiming* timing = documentLoadTiming();
@@ -109,7 +109,7 @@ unsigned long long Timing::redirectStart() const
 
     return toIntegerMilliseconds(timing->redirectStart);
 }
-    
+
 unsigned long long Timing::redirectEnd() const
 {
     DocumentLoadTiming* timing = documentLoadTiming();
@@ -218,12 +218,7 @@ unsigned long long Timing::requestStart() const
 
 unsigned long long Timing::requestEnd() const
 {
-    ResourceLoadTiming* timing = resourceLoadTiming();
-    if (!timing)
-        return 0;
-
-    ASSERT(timing->sendEnd >= 0);
-    return resourceLoadTimeRelativeToAbsolute(timing->sendEnd);
+    return responseStart();
 }
 
 unsigned long long Timing::responseStart() const

-- 
WebKit Debian packaging