[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
simonjam at chromium.org
simonjam at chromium.org
Sun Feb 20 22:49:42 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 4648b7c32477c589918d36e5ad18509053c3b284
Author: simonjam at chromium.org <simonjam at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 11 23:19:29 2011 +0000
2011-01-11 James Simonsen <simonjam at chromium.org>
Reviewed by Eric Seidel.
[Web Timing] Rename sslHandshakeStart to secureConnectionStart
https://bugs.webkit.org/show_bug.cgi?id=52239
* fast/dom/Window/window-properties-performance-expected.txt:
* fast/dom/script-tests/webtiming.js:
(checkTimingBeforeLoad):
(checkTimingWhileDeferred):
(checkWebTimingOnDOMContentLoaded):
(checkWebTimingWhileAsync):
(checkWebTimingOnLoad):
(checkWebTimingAfterLoad):
* fast/dom/webtiming-document-open-expected.txt:
* fast/dom/webtiming-expected.txt:
* fast/dom/webtiming-navigate-within-document-expected.txt:
* http/tests/misc/resources/webtiming-cross-origin-and-back2.html:
* http/tests/misc/resources/webtiming-cross-origin-redirect.html:
* http/tests/misc/resources/webtiming-no-origin.html:
* http/tests/misc/resources/webtiming-ssl.html:
* http/tests/misc/webtiming-origins-expected.txt:
* http/tests/misc/webtiming-ssl-expected.txt:
2011-01-11 James Simonsen <simonjam at chromium.org>
Reviewed by Eric Seidel.
[Web Timing] Rename sslHandshakeStart to secureConnectionStart
https://bugs.webkit.org/show_bug.cgi?id=52239
* page/PerformanceTiming.cpp:
(WebCore::PerformanceTiming::secureConnectionStart):
* page/PerformanceTiming.h:
* page/PerformanceTiming.idl:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75560 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 27de42e..dd1663f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,28 @@
+2011-01-11 James Simonsen <simonjam at chromium.org>
+
+ Reviewed by Eric Seidel.
+
+ [Web Timing] Rename sslHandshakeStart to secureConnectionStart
+ https://bugs.webkit.org/show_bug.cgi?id=52239
+
+ * fast/dom/Window/window-properties-performance-expected.txt:
+ * fast/dom/script-tests/webtiming.js:
+ (checkTimingBeforeLoad):
+ (checkTimingWhileDeferred):
+ (checkWebTimingOnDOMContentLoaded):
+ (checkWebTimingWhileAsync):
+ (checkWebTimingOnLoad):
+ (checkWebTimingAfterLoad):
+ * fast/dom/webtiming-document-open-expected.txt:
+ * fast/dom/webtiming-expected.txt:
+ * fast/dom/webtiming-navigate-within-document-expected.txt:
+ * http/tests/misc/resources/webtiming-cross-origin-and-back2.html:
+ * http/tests/misc/resources/webtiming-cross-origin-redirect.html:
+ * http/tests/misc/resources/webtiming-no-origin.html:
+ * http/tests/misc/resources/webtiming-ssl.html:
+ * http/tests/misc/webtiming-origins-expected.txt:
+ * http/tests/misc/webtiming-ssl-expected.txt:
+
2011-01-11 Mihai Parparita <mihaip at chromium.org>
Reviewed by Darin Fisher.
diff --git a/LayoutTests/fast/dom/Window/window-properties-performance-expected.txt b/LayoutTests/fast/dom/Window/window-properties-performance-expected.txt
index 4276728..516ec21 100644
--- a/LayoutTests/fast/dom/Window/window-properties-performance-expected.txt
+++ b/LayoutTests/fast/dom/Window/window-properties-performance-expected.txt
@@ -30,7 +30,7 @@ window.performance.timing.redirectStart [number]
window.performance.timing.requestStart [number]
window.performance.timing.responseEnd [number]
window.performance.timing.responseStart [number]
-window.performance.timing.sslHandshakeStart [number]
+window.performance.timing.secureConnectionStart [number]
window.performance.timing.unloadEventEnd [number]
window.performance.timing.unloadEventStart [number]
window.performance.timing [printed above as window.performance.timing]
diff --git a/LayoutTests/fast/dom/script-tests/webtiming.js b/LayoutTests/fast/dom/script-tests/webtiming.js
index 9621f8b..bc1ec29 100644
--- a/LayoutTests/fast/dom/script-tests/webtiming.js
+++ b/LayoutTests/fast/dom/script-tests/webtiming.js
@@ -31,7 +31,7 @@ function checkTimingBeforeLoad()
shouldBeGreaterThanOrEqual("timing.connectStart", "timing.domainLookupEnd");
shouldBeGreaterThanOrEqual("timing.connectEnd", "timing.connectStart");
- shouldBe("timing.sslHandshakeStart", "0");
+ shouldBe("timing.secureConnectionStart", "0");
shouldBeGreaterThanOrEqual("timing.requestStart", "timing.connectEnd");
@@ -63,7 +63,7 @@ function checkTimingWhileDeferred()
shouldBeGreaterThanOrEqual("timing.connectStart", "timing.domainLookupEnd");
shouldBeGreaterThanOrEqual("timing.connectEnd", "timing.connectStart");
- shouldBe("timing.sslHandshakeStart", "0");
+ shouldBe("timing.secureConnectionStart", "0");
shouldBeGreaterThanOrEqual("timing.requestStart", "timing.connectEnd");
@@ -96,7 +96,7 @@ function checkWebTimingOnDOMContentLoaded() {
shouldBeGreaterThanOrEqual("timing.connectStart", "timing.domainLookupEnd");
shouldBeGreaterThanOrEqual("timing.connectEnd", "timing.connectStart");
- shouldBe("timing.sslHandshakeStart", "0");
+ shouldBe("timing.secureConnectionStart", "0");
shouldBeGreaterThanOrEqual("timing.requestStart", "timing.connectEnd");
@@ -135,7 +135,7 @@ function checkWebTimingWhileAsync()
shouldBeGreaterThanOrEqual("timing.connectStart", "timing.domainLookupEnd");
shouldBeGreaterThanOrEqual("timing.connectEnd", "timing.connectStart");
- shouldBe("timing.sslHandshakeStart", "0");
+ shouldBe("timing.secureConnectionStart", "0");
shouldBeGreaterThanOrEqual("timing.requestStart", "timing.connectEnd");
@@ -169,7 +169,7 @@ function checkWebTimingOnLoad()
shouldBeGreaterThanOrEqual("timing.connectStart", "timing.domainLookupEnd");
shouldBeGreaterThanOrEqual("timing.connectEnd", "timing.connectStart");
- shouldBe("timing.sslHandshakeStart", "0");
+ shouldBe("timing.secureConnectionStart", "0");
shouldBeGreaterThanOrEqual("timing.requestStart", "timing.connectEnd");
@@ -204,7 +204,7 @@ function checkWebTimingAfterLoad()
shouldBeGreaterThanOrEqual("timing.connectStart", "timing.domainLookupEnd");
shouldBeGreaterThanOrEqual("timing.connectEnd", "timing.connectStart");
- shouldBe("timing.sslHandshakeStart", "0");
+ shouldBe("timing.secureConnectionStart", "0");
shouldBeGreaterThanOrEqual("timing.requestStart", "timing.connectEnd");
diff --git a/LayoutTests/fast/dom/webtiming-document-open-expected.txt b/LayoutTests/fast/dom/webtiming-document-open-expected.txt
index 2a6e46e..7ab2646 100644
--- a/LayoutTests/fast/dom/webtiming-document-open-expected.txt
+++ b/LayoutTests/fast/dom/webtiming-document-open-expected.txt
@@ -21,7 +21,7 @@ PASS timing.redirectStart is originalTiming.redirectStart
PASS timing.requestStart is originalTiming.requestStart
PASS timing.responseEnd is originalTiming.responseEnd
PASS timing.responseStart is originalTiming.responseStart
-PASS timing.sslHandshakeStart is originalTiming.sslHandshakeStart
+PASS timing.secureConnectionStart is originalTiming.secureConnectionStart
PASS timing.unloadEventEnd is originalTiming.unloadEventEnd
PASS timing.unloadEventStart is originalTiming.unloadEventStart
PASS successfullyParsed is true
diff --git a/LayoutTests/fast/dom/webtiming-expected.txt b/LayoutTests/fast/dom/webtiming-expected.txt
index 333e9f7..9c71157 100644
--- a/LayoutTests/fast/dom/webtiming-expected.txt
+++ b/LayoutTests/fast/dom/webtiming-expected.txt
@@ -12,7 +12,7 @@ PASS timing.domainLookupStart is >= timing.fetchStart
PASS timing.domainLookupEnd is >= timing.domainLookupStart
PASS timing.connectStart is >= timing.domainLookupEnd
PASS timing.connectEnd is >= timing.connectStart
-PASS timing.sslHandshakeStart is 0
+PASS timing.secureConnectionStart is 0
PASS timing.requestStart is >= timing.connectEnd
PASS timing.responseStart is >= timing.requestStart
PASS timing.domLoading is >= timing.fetchStart
@@ -31,7 +31,7 @@ PASS timing.domainLookupStart is >= timing.fetchStart
PASS timing.domainLookupEnd is >= timing.domainLookupStart
PASS timing.connectStart is >= timing.domainLookupEnd
PASS timing.connectEnd is >= timing.connectStart
-PASS timing.sslHandshakeStart is 0
+PASS timing.secureConnectionStart is 0
PASS timing.requestStart is >= timing.connectEnd
PASS timing.responseStart is >= timing.requestStart
PASS timing.domLoading is >= timing.fetchStart
@@ -50,7 +50,7 @@ PASS timing.domainLookupStart is >= timing.fetchStart
PASS timing.domainLookupEnd is >= timing.domainLookupStart
PASS timing.connectStart is >= timing.domainLookupEnd
PASS timing.connectEnd is >= timing.connectStart
-PASS timing.sslHandshakeStart is 0
+PASS timing.secureConnectionStart is 0
PASS timing.requestStart is >= timing.connectEnd
PASS timing.responseStart is >= timing.requestStart
PASS timing.domLoading is >= timing.fetchStart
@@ -69,7 +69,7 @@ PASS timing.domainLookupStart is >= timing.fetchStart
PASS timing.domainLookupEnd is >= timing.domainLookupStart
PASS timing.connectStart is >= timing.domainLookupEnd
PASS timing.connectEnd is >= timing.connectStart
-PASS timing.sslHandshakeStart is 0
+PASS timing.secureConnectionStart is 0
PASS timing.requestStart is >= timing.connectEnd
PASS timing.responseStart is >= timing.requestStart
PASS timing.domLoading is >= timing.fetchStart
@@ -88,7 +88,7 @@ PASS timing.domainLookupStart is >= timing.fetchStart
PASS timing.domainLookupEnd is >= timing.domainLookupStart
PASS timing.connectStart is >= timing.domainLookupEnd
PASS timing.connectEnd is >= timing.connectStart
-PASS timing.sslHandshakeStart is 0
+PASS timing.secureConnectionStart is 0
PASS timing.requestStart is >= timing.connectEnd
PASS timing.responseStart is >= timing.requestStart
PASS timing.responseEnd is >= timing.responseStart
@@ -108,7 +108,7 @@ PASS timing.domainLookupStart is >= timing.fetchStart
PASS timing.domainLookupEnd is >= timing.domainLookupStart
PASS timing.connectStart is >= timing.domainLookupEnd
PASS timing.connectEnd is >= timing.connectStart
-PASS timing.sslHandshakeStart is 0
+PASS timing.secureConnectionStart is 0
PASS timing.requestStart is >= timing.connectEnd
PASS timing.responseStart is >= timing.requestStart
PASS timing.responseEnd is >= timing.responseStart
diff --git a/LayoutTests/fast/dom/webtiming-navigate-within-document-expected.txt b/LayoutTests/fast/dom/webtiming-navigate-within-document-expected.txt
index 9e69fd3..eb2550f 100644
--- a/LayoutTests/fast/dom/webtiming-navigate-within-document-expected.txt
+++ b/LayoutTests/fast/dom/webtiming-navigate-within-document-expected.txt
@@ -21,7 +21,7 @@ PASS redirectStart is unchanged.
PASS requestStart is unchanged.
PASS responseEnd is unchanged.
PASS responseStart is unchanged.
-PASS sslHandshakeStart is unchanged.
+PASS secureConnectionStart is unchanged.
PASS unloadEventEnd is unchanged.
PASS unloadEventStart is unchanged.
PASS successfullyParsed is true
diff --git a/LayoutTests/http/tests/misc/resources/webtiming-cross-origin-and-back2.html b/LayoutTests/http/tests/misc/resources/webtiming-cross-origin-and-back2.html
index fccf25c..4b49d2b 100644
--- a/LayoutTests/http/tests/misc/resources/webtiming-cross-origin-and-back2.html
+++ b/LayoutTests/http/tests/misc/resources/webtiming-cross-origin-and-back2.html
@@ -16,7 +16,7 @@ var timing = performance.timing || {};
function performTest() {
// FIXME: Need a way to synchronize the test so that loadEventEnd is non-zero.
- var shouldBeZeroList = ["loadEventEnd", "redirectStart", "redirectEnd", "sslHandshakeStart"];
+ var shouldBeZeroList = ["loadEventEnd", "redirectStart", "redirectEnd", "secureConnectionStart"];
var timingProperties = new Array;
for (var property in timing) {
diff --git a/LayoutTests/http/tests/misc/resources/webtiming-cross-origin-redirect.html b/LayoutTests/http/tests/misc/resources/webtiming-cross-origin-redirect.html
index 5cf1d25..921e32a 100644
--- a/LayoutTests/http/tests/misc/resources/webtiming-cross-origin-redirect.html
+++ b/LayoutTests/http/tests/misc/resources/webtiming-cross-origin-redirect.html
@@ -16,7 +16,7 @@ var timing = performance.timing || {};
function performTest() {
// FIXME: Need a way to synchronize the test so that loadEventEnd is non-zero.
- var shouldBeZeroList = ["loadEventEnd", "redirectStart", "redirectEnd", "sslHandshakeStart", "unloadEventStart", "unloadEventEnd"];
+ var shouldBeZeroList = ["loadEventEnd", "redirectStart", "redirectEnd", "secureConnectionStart", "unloadEventStart", "unloadEventEnd"];
var timingProperties = new Array;
for (var property in timing) {
diff --git a/LayoutTests/http/tests/misc/resources/webtiming-no-origin.html b/LayoutTests/http/tests/misc/resources/webtiming-no-origin.html
index ba5a513..d99a6d2 100644
--- a/LayoutTests/http/tests/misc/resources/webtiming-no-origin.html
+++ b/LayoutTests/http/tests/misc/resources/webtiming-no-origin.html
@@ -16,7 +16,7 @@ var timing = performance.timing || {};
function performTest() {
// FIXME: Need a way to synchronize the test so that loadEventEnd is non-zero.
- var shouldBeZeroList = ["loadEventEnd", "redirectStart", "redirectEnd", "sslHandshakeStart", "unloadEventStart", "unloadEventEnd"];
+ var shouldBeZeroList = ["loadEventEnd", "redirectStart", "redirectEnd", "secureConnectionStart", "unloadEventStart", "unloadEventEnd"];
var timingProperties = new Array;
for (var property in timing) {
diff --git a/LayoutTests/http/tests/misc/resources/webtiming-ssl.html b/LayoutTests/http/tests/misc/resources/webtiming-ssl.html
index c085000..b791ac0 100644
--- a/LayoutTests/http/tests/misc/resources/webtiming-ssl.html
+++ b/LayoutTests/http/tests/misc/resources/webtiming-ssl.html
@@ -10,15 +10,15 @@
<p id="description"></p>
<div id="console"></div>
<script>
-description("This test checks that Web Timing reports sslHandshakeStart correctly and has reasonable values for connectStart and connectEnd. Note that DumpRenderTree doesn't set sslHandshakeStart.");
+description("This test checks that Web Timing reports secureConnectionStart correctly and has reasonable values for connectStart and connectEnd. Note that DumpRenderTree doesn't set secureConnectionStart.");
var performance = window.performance || {};
var navigation = performance.navigation || {};
var timing = performance.timing || {};
shouldBeGreaterThanOrEqual("timing.connectStart", "timing.navigationStart");
-shouldBeGreaterThanOrEqual("timing.sslHandshakeStart", "timing.connectStart");
-shouldBeGreaterThanOrEqual("timing.connectEnd", "timing.sslHandshakeStart");
+shouldBeGreaterThanOrEqual("timing.secureConnectionStart", "timing.connectStart");
+shouldBeGreaterThanOrEqual("timing.connectEnd", "timing.secureConnectionStart");
var successfullyParsed = true;
</script>
diff --git a/LayoutTests/http/tests/misc/webtiming-origins-expected.txt b/LayoutTests/http/tests/misc/webtiming-origins-expected.txt
index d2db777..0433119 100644
--- a/LayoutTests/http/tests/misc/webtiming-origins-expected.txt
+++ b/LayoutTests/http/tests/misc/webtiming-origins-expected.txt
@@ -26,7 +26,7 @@ PASS timing.redirectStart is 0
PASS timing.requestStart is non-zero.
PASS timing.responseEnd is non-zero.
PASS timing.responseStart is non-zero.
-PASS timing.sslHandshakeStart is 0
+PASS timing.secureConnectionStart is 0
PASS timing.unloadEventEnd is 0
PASS timing.unloadEventStart is 0
PASS navigation.redirectCount is 0
@@ -61,7 +61,7 @@ PASS timing.redirectStart is 0
PASS timing.requestStart is non-zero.
PASS timing.responseEnd is non-zero.
PASS timing.responseStart is non-zero.
-PASS timing.sslHandshakeStart is 0
+PASS timing.secureConnectionStart is 0
PASS timing.unloadEventEnd is 0
PASS timing.unloadEventStart is 0
PASS navigation.redirectCount is 0
@@ -96,7 +96,7 @@ PASS timing.redirectStart is 0
PASS timing.requestStart is non-zero.
PASS timing.responseEnd is non-zero.
PASS timing.responseStart is non-zero.
-PASS timing.sslHandshakeStart is 0
+PASS timing.secureConnectionStart is 0
PASS timing.unloadEventEnd is non-zero.
PASS timing.unloadEventStart is non-zero.
PASS navigation.redirectCount is 0
diff --git a/LayoutTests/http/tests/misc/webtiming-ssl-expected.txt b/LayoutTests/http/tests/misc/webtiming-ssl-expected.txt
index 24177c5..4dc4c2e 100644
--- a/LayoutTests/http/tests/misc/webtiming-ssl-expected.txt
+++ b/LayoutTests/http/tests/misc/webtiming-ssl-expected.txt
@@ -1,11 +1,11 @@
-This test checks that Web Timing reports sslHandshakeStart correctly and has reasonable values for connectStart and connectEnd. Note that DumpRenderTree doesn't set sslHandshakeStart.
+This test checks that Web Timing reports secureConnectionStart correctly and has reasonable values for connectStart and connectEnd. Note that DumpRenderTree doesn't set secureConnectionStart.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
PASS timing.connectStart is >= timing.navigationStart
-FAIL timing.sslHandshakeStart should be >= timing.connectStart. Was 0 (of type number).
-PASS timing.connectEnd is >= timing.sslHandshakeStart
+FAIL timing.secureConnectionStart should be >= timing.connectStart. Was 0 (of type number).
+PASS timing.connectEnd is >= timing.secureConnectionStart
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index e1cd3d1..803e5f1 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-11 James Simonsen <simonjam at chromium.org>
+
+ Reviewed by Eric Seidel.
+
+ [Web Timing] Rename sslHandshakeStart to secureConnectionStart
+ https://bugs.webkit.org/show_bug.cgi?id=52239
+
+ * page/PerformanceTiming.cpp:
+ (WebCore::PerformanceTiming::secureConnectionStart):
+ * page/PerformanceTiming.h:
+ * page/PerformanceTiming.idl:
+
2011-01-11 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
diff --git a/Source/WebCore/page/PerformanceTiming.cpp b/Source/WebCore/page/PerformanceTiming.cpp
index fb8bfb7..76b410a 100644
--- a/Source/WebCore/page/PerformanceTiming.cpp
+++ b/Source/WebCore/page/PerformanceTiming.cpp
@@ -227,7 +227,7 @@ unsigned long long PerformanceTiming::connectEnd() const
return resourceLoadTimeRelativeToAbsolute(connectEnd);
}
-unsigned long long PerformanceTiming::sslHandshakeStart() const
+unsigned long long PerformanceTiming::secureConnectionStart() const
{
DocumentLoader* loader = documentLoader();
if (!loader)
diff --git a/Source/WebCore/page/PerformanceTiming.h b/Source/WebCore/page/PerformanceTiming.h
index 9c35672..0c37383 100644
--- a/Source/WebCore/page/PerformanceTiming.h
+++ b/Source/WebCore/page/PerformanceTiming.h
@@ -61,7 +61,7 @@ public:
unsigned long long domainLookupEnd() const;
unsigned long long connectStart() const;
unsigned long long connectEnd() const;
- unsigned long long sslHandshakeStart() const;
+ unsigned long long secureConnectionStart() const;
unsigned long long requestStart() const;
unsigned long long responseStart() const;
unsigned long long responseEnd() const;
diff --git a/Source/WebCore/page/PerformanceTiming.idl b/Source/WebCore/page/PerformanceTiming.idl
index a0f08e2..dacf93b 100644
--- a/Source/WebCore/page/PerformanceTiming.idl
+++ b/Source/WebCore/page/PerformanceTiming.idl
@@ -42,7 +42,7 @@ module window {
readonly attribute unsigned long long domainLookupEnd;
readonly attribute unsigned long long connectStart;
readonly attribute unsigned long long connectEnd;
- readonly attribute unsigned long long sslHandshakeStart;
+ readonly attribute unsigned long long secureConnectionStart;
readonly attribute unsigned long long requestStart;
readonly attribute unsigned long long responseStart;
readonly attribute unsigned long long responseEnd;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list