[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
caseq at chromium.org
caseq at chromium.org
Wed Dec 22 13:24:35 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 97ea918a8fde3d31f49b0e37540d2da29e580944
Author: caseq at chromium.org <caseq at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 14 16:30:45 2010 +0000
2010-09-14 Andrey Kosyakov <caseq at chromium.org>
Reviewed by Yury Semikhatsky.
Web Inspector: [Resources panel] [HAR] Need a way to save timing data.
Added support for resource timings to HAREntry.
https://bugs.webkit.org/show_bug.cgi?id=45663
* inspector/front-end/HAREntry.js:
(WebInspector.HAREntry.prototype._buildTimings):
(WebInspector.HAREntry.prototype._toMilliseconds):
(WebInspector.HAREntry.prototype._interval):
2010-09-14 Andrey Kosyakov <caseq at chromium.org>
Reviewed by Yury Semikhatsky.
Web Inspector: [Resources panel] [HAR] Need a way to save timing data.
https://bugs.webkit.org/show_bug.cgi?id=45663
* http/tests/inspector/resource-har-conversion-expected.txt:
* http/tests/inspector/resource-parameters-expected.txt:
* http/tests/inspector/resource-test2.js: Added entire timings object to list of non-deterministic fields.
* http/tests/inspector/resource-tests.js: Ditto.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67474 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4f055fd..55301da 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-14 Andrey Kosyakov <caseq at chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
+ Web Inspector: [Resources panel] [HAR] Need a way to save timing data.
+ https://bugs.webkit.org/show_bug.cgi?id=45663
+
+ * http/tests/inspector/resource-har-conversion-expected.txt:
+ * http/tests/inspector/resource-parameters-expected.txt:
+ * http/tests/inspector/resource-test2.js: Added entire timings object to list of non-deterministic fields.
+ * http/tests/inspector/resource-tests.js: Ditto.
+
2010-09-14 Hans Wennborg <hans at chromium.org>
Reviewed by Jeremy Orlow.
diff --git a/LayoutTests/http/tests/inspector/resource-har-conversion-expected.txt b/LayoutTests/http/tests/inspector/resource-har-conversion-expected.txt
index 2994943..93daf90 100644
--- a/LayoutTests/http/tests/inspector/resource-har-conversion-expected.txt
+++ b/LayoutTests/http/tests/inspector/resource-har-conversion-expected.txt
@@ -25,15 +25,7 @@ Page reloaded.
headersSize : -1
bodySize : <number>
}
- timings : {
- blocked : -1
- dns : -1
- connect : -1
- send : -1
- wait : <number>
- receive : <number>
- ssl : -1
- }
+ timings : <object>
}
1 : {
pageref : "http://127.0.0.1:8000/inspector/resource-har-conversion.html"
@@ -58,15 +50,7 @@ Page reloaded.
headersSize : -1
bodySize : <number>
}
- timings : {
- blocked : -1
- dns : -1
- connect : -1
- send : -1
- wait : <number>
- receive : <number>
- ssl : -1
- }
+ timings : <object>
}
2 : {
pageref : "http://127.0.0.1:8000/inspector/resource-har-conversion.html"
@@ -91,15 +75,7 @@ Page reloaded.
headersSize : -1
bodySize : <number>
}
- timings : {
- blocked : -1
- dns : -1
- connect : -1
- send : -1
- wait : <number>
- receive : <number>
- ssl : -1
- }
+ timings : <object>
}
3 : {
pageref : "http://127.0.0.1:8000/inspector/resource-har-conversion.html"
@@ -128,15 +104,7 @@ Page reloaded.
headersSize : -1
bodySize : <number>
}
- timings : {
- blocked : -1
- dns : -1
- connect : -1
- send : -1
- wait : <number>
- receive : <number>
- ssl : -1
- }
+ timings : <object>
}
}
diff --git a/LayoutTests/http/tests/inspector/resource-parameters-expected.txt b/LayoutTests/http/tests/inspector/resource-parameters-expected.txt
index 73ab085..c37334f 100644
--- a/LayoutTests/http/tests/inspector/resource-parameters-expected.txt
+++ b/LayoutTests/http/tests/inspector/resource-parameters-expected.txt
@@ -49,14 +49,6 @@ Tests that resources panel shows form data parameters.
headersSize : -1
bodySize : 14
}
- timings : {
- blocked : -1
- dns : -1
- connect : -1
- send : -1
- wait : <number>
- receive : <number>
- ssl : -1
- }
+ timings : <object>
}
diff --git a/LayoutTests/http/tests/inspector/resource-test2.js b/LayoutTests/http/tests/inspector/resource-test2.js
index fd878a3..e06ccf7 100755
--- a/LayoutTests/http/tests/inspector/resource-test2.js
+++ b/LayoutTests/http/tests/inspector/resource-test2.js
@@ -6,6 +6,7 @@ InspectorTest.HARNondeterministicProperties = {
wait: 1,
receive: 1,
headers: 1,
+ timings: 1,
};
// addObject checks own properties only, so make a deep copy rather than use prototype.
diff --git a/LayoutTests/http/tests/inspector/resource-tests.js b/LayoutTests/http/tests/inspector/resource-tests.js
index 8fa6e0a..58d9536 100644
--- a/LayoutTests/http/tests/inspector/resource-tests.js
+++ b/LayoutTests/http/tests/inspector/resource-tests.js
@@ -4,6 +4,7 @@ var HARNondeterministicProperties = {
wait: 1,
receive: 1,
headers: 1,
+ timings: 1,
};
function resourceURLComparer(r1, r2)
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e92629b..839f124 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-14 Andrey Kosyakov <caseq at chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
+ Web Inspector: [Resources panel] [HAR] Need a way to save timing data.
+ Added support for resource timings to HAREntry.
+ https://bugs.webkit.org/show_bug.cgi?id=45663
+
+ * inspector/front-end/HAREntry.js:
+ (WebInspector.HAREntry.prototype._buildTimings):
+ (WebInspector.HAREntry.prototype._toMilliseconds):
+ (WebInspector.HAREntry.prototype._interval):
+
2010-09-14 Kwang Yul Seo <skyul at company100.net>
Reviewed by Kent Tamura.
diff --git a/WebCore/inspector/front-end/HAREntry.js b/WebCore/inspector/front-end/HAREntry.js
index 9f188ed..f7a5f58 100644
--- a/WebCore/inspector/front-end/HAREntry.js
+++ b/WebCore/inspector/front-end/HAREntry.js
@@ -95,14 +95,34 @@ WebInspector.HAREntry.prototype = {
_buildTimings: function()
{
+ var waitForConnection = this._interval("connectStart", "connectEnd");
+ var blocked;
+ var connect;
+ var dns = this._interval("dnsStart", "dnsEnd");
+ var send = this._interval("sendStart", "sendEnd");
+ var ssl = this._interval("sslStart", "sslEnd");
+
+ if (ssl !== -1 && send !== -1)
+ send -= ssl;
+
+ if (this._resource.connectionReused) {
+ connect = -1;
+ blocked = waitForConnection;
+ } else {
+ blocked = 0;
+ connect = waitForConnection;
+ if (dns !== -1)
+ connect -= dns;
+ }
+
return {
- blocked: -1, // Not available.
- dns: -1, // Not available.
- connect: -1, // Not available.
- send: -1, // Not available.
- wait: this._toMilliseconds(this._resource.latency),
+ blocked: blocked,
+ dns: dns,
+ connect: connect,
+ send: send,
+ wait: this._interval("sendEnd", "receiveHeadersEnd"),
receive: this._toMilliseconds(this._resource.receiveDuration),
- ssl: -1 // Not available.
+ ssl: ssl
};
},
@@ -133,5 +153,14 @@ WebInspector.HAREntry.prototype = {
_toMilliseconds: function(time)
{
return time === -1 ? -1 : Math.round(time * 1000);
+ },
+
+ _interval: function(start, end)
+ {
+ var timing = this._resource.timing;
+ if (!timing)
+ return -1;
+ var startTime = timing[start];
+ return typeof startTime !== "number" || startTime === -1 ? -1 : Math.round(timing[end] - startTime);
}
};
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list