Diff
Modified: trunk/LayoutTests/ChangeLog (105281 => 105282)
--- trunk/LayoutTests/ChangeLog 2012-01-18 17:09:01 UTC (rev 105281)
+++ trunk/LayoutTests/ChangeLog 2012-01-18 17:14:12 UTC (rev 105282)
@@ -1,3 +1,15 @@
+2012-01-18 Andrey Kosyakov <ca...@chromium.org>
+
+ Web Inspector: omit compression field in HAR entries for resources coming from cache
+ https://bugs.webkit.org/show_bug.cgi?id=76543
+
+ Reviewed by Yury Semikhatsky.
+
+ * http/tests/inspector/resource-har-conversion-expected.txt:
+ * http/tests/inspector/resource-har-headers-expected.txt:
+ * http/tests/inspector/resource-parameters-expected.txt:
+ * platform/chromium/http/tests/inspector/resource-har-conversion-expected.txt: Removed.
+
2012-01-18 Csaba Osztrogonác <o...@webkit.org>
[Qt] Unreviewed gardening. Skip failing tests, simplify qt-wk2 skipped list.
Modified: trunk/LayoutTests/http/tests/inspector/resource-har-conversion-expected.txt (105281 => 105282)
--- trunk/LayoutTests/http/tests/inspector/resource-har-conversion-expected.txt 2012-01-18 17:09:01 UTC (rev 105281)
+++ trunk/LayoutTests/http/tests/inspector/resource-har-conversion-expected.txt 2012-01-18 17:14:12 UTC (rev 105282)
@@ -98,7 +98,6 @@
]
content : {
size : <number>
- compression : <number>
mimeType : "application/x-_javascript_"
}
redirectURL : ""
@@ -134,8 +133,8 @@
]
content : {
size : <number>
- compression : <number>
mimeType : "text/html"
+ compression : <number>
}
redirectURL : ""
headersSize : <number>
@@ -170,7 +169,6 @@
]
content : {
size : <number>
- compression : <number>
mimeType : "application/x-_javascript_"
}
redirectURL : ""
@@ -210,8 +208,8 @@
]
content : {
size : <number>
- compression : <number>
mimeType : "application/xml"
+ compression : <number>
}
redirectURL : ""
headersSize : <number>
Modified: trunk/LayoutTests/http/tests/inspector/resource-har-headers-expected.txt (105281 => 105282)
--- trunk/LayoutTests/http/tests/inspector/resource-har-headers-expected.txt 2012-01-18 17:09:01 UTC (rev 105281)
+++ trunk/LayoutTests/http/tests/inspector/resource-har-headers-expected.txt 2012-01-18 17:14:12 UTC (rev 105282)
@@ -53,8 +53,8 @@
]
content : {
size : 1000
+ mimeType : "text/html"
compression : 500
- mimeType : "text/html"
}
redirectURL : ""
headersSize : 39
Modified: trunk/LayoutTests/http/tests/inspector/resource-parameters-expected.txt (105281 => 105282)
--- trunk/LayoutTests/http/tests/inspector/resource-parameters-expected.txt 2012-01-18 17:09:01 UTC (rev 105281)
+++ trunk/LayoutTests/http/tests/inspector/resource-parameters-expected.txt 2012-01-18 17:14:12 UTC (rev 105282)
@@ -49,8 +49,8 @@
]
content : {
size : 14
+ mimeType : "application/xml"
compression : <number>
- mimeType : "application/xml"
}
redirectURL : ""
headersSize : <number>
Modified: trunk/LayoutTests/platform/chromium/http/tests/inspector/resource-har-conversion-expected.txt (105281 => 105282)
--- trunk/LayoutTests/platform/chromium/http/tests/inspector/resource-har-conversion-expected.txt 2012-01-18 17:09:01 UTC (rev 105281)
+++ trunk/LayoutTests/platform/chromium/http/tests/inspector/resource-har-conversion-expected.txt 2012-01-18 17:14:12 UTC (rev 105282)
@@ -98,7 +98,6 @@
]
content : {
size : <number>
- compression : <number>
mimeType : "application/x-_javascript_"
}
redirectURL : ""
@@ -134,8 +133,8 @@
]
content : {
size : <number>
- compression : <number>
mimeType : "text/html"
+ compression : <number>
}
redirectURL : ""
headersSize : <number>
@@ -170,7 +169,6 @@
]
content : {
size : <number>
- compression : <number>
mimeType : "application/x-_javascript_"
}
redirectURL : ""
@@ -210,8 +208,8 @@
]
content : {
size : <number>
- compression : <number>
mimeType : "application/xml"
+ compression : <number>
}
redirectURL : ""
headersSize : <number>
Modified: trunk/Source/WebCore/ChangeLog (105281 => 105282)
--- trunk/Source/WebCore/ChangeLog 2012-01-18 17:09:01 UTC (rev 105281)
+++ trunk/Source/WebCore/ChangeLog 2012-01-18 17:14:12 UTC (rev 105282)
@@ -1,3 +1,14 @@
+2012-01-18 Andrey Kosyakov <ca...@chromium.org>
+
+ Web Inspector: omit compression field in HAR entries for resources coming from cache
+ https://bugs.webkit.org/show_bug.cgi?id=76543
+
+ Reviewed by Yury Semikhatsky.
+
+ * inspector/front-end/HAREntry.js:
+ (WebInspector.HAREntry.prototype._buildContent):
+ (WebInspector.HAREntry.prototype.get responseCompression):
+
2012-01-18 Mihnea Ovidenie <mih...@adobe.com>
[CSSRegions]Fix region style code in CSSStyleSelector
Modified: trunk/Source/WebCore/inspector/front-end/HAREntry.js (105281 => 105282)
--- trunk/Source/WebCore/inspector/front-end/HAREntry.js 2012-01-18 17:09:01 UTC (rev 105281)
+++ trunk/Source/WebCore/inspector/front-end/HAREntry.js 2012-01-18 17:14:12 UTC (rev 105282)
@@ -104,12 +104,15 @@
*/
_buildContent: function()
{
- return {
+ var content = {
size: this._resource.resourceSize,
- compression: this.responseCompression,
mimeType: this._resource.mimeType,
// text: this._resource.content // TODO: pull out into a boolean flag, as content can be huge (and needs to be requested with an async call)
};
+ var compression = this.responseCompression;
+ if (typeof compression === "number")
+ content.compression = compression;
+ return content;
},
/**
@@ -252,6 +255,8 @@
*/
get responseCompression()
{
+ if (this._resource.cahced || this._resource.statusCode === 304)
+ return;
return this._resource.resourceSize - (this._resource.transferSize - this._resource.responseHeadersSize);
}
}
