diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-12-07 17:22:45 -0800 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2010-12-22 14:15:40 -0800 |
| commit | 4576aa36e9a9671459299c7963ac95aa94beaea9 (patch) | |
| tree | 3863574e050f168c0126ecb47c83319fab0972d8 /WebCore/inspector/front-end/HAREntry.js | |
| parent | 55323ac613cc31553107b68603cb627264d22bb0 (diff) | |
| download | external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.zip external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.gz external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.bz2 | |
Merge WebKit at r73109: Initial merge by git.
Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
Diffstat (limited to 'WebCore/inspector/front-end/HAREntry.js')
| -rw-r--r-- | WebCore/inspector/front-end/HAREntry.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/WebCore/inspector/front-end/HAREntry.js b/WebCore/inspector/front-end/HAREntry.js index f3bfb06..6dfbd1b 100644 --- a/WebCore/inspector/front-end/HAREntry.js +++ b/WebCore/inspector/front-end/HAREntry.js @@ -189,6 +189,7 @@ WebInspector.HAREntry._toMilliseconds = function(time) WebInspector.HARLog = function() { + this.includeResourceIds = false; } WebInspector.HARLog.prototype = { @@ -203,7 +204,7 @@ WebInspector.HARLog.prototype = { version: webKitVersion ? webKitVersion[1] : "n/a" }, pages: this._buildPages(), - entries: Object.keys(WebInspector.networkResources).map(this._convertResource) + entries: Object.keys(WebInspector.networkResources).map(this._convertResource.bind(this)) } }, @@ -229,7 +230,10 @@ WebInspector.HARLog.prototype = { _convertResource: function(id) { - return (new WebInspector.HAREntry(WebInspector.networkResources[id])).build(); + var entry = (new WebInspector.HAREntry(WebInspector.networkResources[id])).build(); + if (this.includeResourceIds) + entry._resourceId = id; + return entry; }, _pageEventTime: function(time) |