Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(815)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/devtools/front_end/sdk/HAREntry.js

Issue 2466123002: DevTools: reformat front-end code to match chromium style. (Closed)
Patch Set: all done Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/devtools/front_end/sdk/DebuggerModel.js ('k') | third_party/WebKit/Source/devtools/front_end/sdk/HeapProfilerModel.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/devtools/front_end/sdk/HAREntry.js
diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/HAREntry.js b/third_party/WebKit/Source/devtools/front_end/sdk/HAREntry.js
index 56552e04d42328c9bdf599f58a8dcf7b8337351f..579aa246e606ac2fcb9589b73b2c419276e2d13e 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/HAREntry.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/HAREntry.js
@@ -27,7 +27,6 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
// See http://www.softwareishard.com/blog/har-12-spec/
// for HAR specification.
@@ -35,345 +34,322 @@
// See https://bugs.webkit.org/show_bug.cgi?id=58127 for details.
/**
- * @constructor
- * @param {!WebInspector.NetworkRequest} request
+ * @unrestricted
*/
-WebInspector.HAREntry = function(request)
-{
+WebInspector.HAREntry = class {
+ /**
+ * @param {!WebInspector.NetworkRequest} request
+ */
+ constructor(request) {
this._request = request;
-};
+ }
-WebInspector.HAREntry.prototype = {
- /**
- * @return {!Object}
- */
- build: function()
- {
- var ipAddress = this._request.remoteAddress();
- var portPositionInString = ipAddress.lastIndexOf(":");
- if (portPositionInString !== -1)
- ipAddress = ipAddress.substr(0, portPositionInString);
-
- var entry = {
- startedDateTime: WebInspector.HARLog.pseudoWallTime(this._request, this._request.startTime),
- time: this._request.timing ? WebInspector.HAREntry._toMilliseconds(this._request.duration) : 0,
- request: this._buildRequest(),
- response: this._buildResponse(),
- cache: { }, // Not supported yet.
- timings: this._buildTimings(),
- serverIPAddress: ipAddress
- };
-
- if (this._request.connectionId !== "0")
- entry.connection = this._request.connectionId;
- var page = this._request.networkLog().pageLoadForRequest(this._request);
- if (page)
- entry.pageref = "page_" + page.id;
- return entry;
- },
-
- /**
- * @return {!Object}
- */
- _buildRequest: function()
- {
- var headersText = this._request.requestHeadersText();
- var res = {
- method: this._request.requestMethod,
- url: this._buildRequestURL(this._request.url),
- httpVersion: this._request.requestHttpVersion(),
- headers: this._request.requestHeaders(),
- queryString: this._buildParameters(this._request.queryParameters || []),
- cookies: this._buildCookies(this._request.requestCookies || []),
- headersSize: headersText ? headersText.length : -1,
- bodySize: this.requestBodySize
- };
- if (this._request.requestFormData)
- res.postData = this._buildPostData();
-
- return res;
- },
-
- /**
- * @return {!Object}
- */
- _buildResponse: function()
- {
- var headersText = this._request.responseHeadersText;
- return {
- status: this._request.statusCode,
- statusText: this._request.statusText,
- httpVersion: this._request.responseHttpVersion(),
- headers: this._request.responseHeaders,
- cookies: this._buildCookies(this._request.responseCookies || []),
- content: this._buildContent(),
- redirectURL: this._request.responseHeaderValue("Location") || "",
- headersSize: headersText ? headersText.length : -1,
- bodySize: this.responseBodySize,
- _transferSize: this._request.transferSize,
- _error: this._request.localizedFailDescription
- };
- },
-
- /**
- * @return {!Object}
- */
- _buildContent: function()
- {
- var content = {
- size: this._request.resourceSize,
- mimeType: this._request.mimeType || "x-unknown",
- // text: this._request.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;
- },
-
- /**
- * @return {!Object}
- */
- _buildTimings: function()
- {
- // Order of events: request_start = 0, [proxy], [dns], [connect [ssl]], [send], receive_headers_end
- // HAR 'blocked' time is time before first network activity.
-
- var timing = this._request.timing;
- if (!timing)
- return {blocked: -1, dns: -1, connect: -1, send: 0, wait: 0, receive: 0, ssl: -1};
-
- function firstNonNegative(values)
- {
- for (var i = 0; i < values.length; ++i) {
- if (values[i] >= 0)
- return values[i];
- }
- console.assert(false, "Incomplete request timing information.");
- }
-
- var blocked = firstNonNegative([timing.dnsStart, timing.connectStart, timing.sendStart]);
-
- var dns = -1;
- if (timing.dnsStart >= 0)
- dns = firstNonNegative([timing.connectStart, timing.sendStart]) - timing.dnsStart;
-
- var connect = -1;
- if (timing.connectStart >= 0)
- connect = timing.sendStart - timing.connectStart;
-
- var send = timing.sendEnd - timing.sendStart;
- var wait = timing.receiveHeadersEnd - timing.sendEnd;
- var receive = WebInspector.HAREntry._toMilliseconds(this._request.duration) - timing.receiveHeadersEnd;
-
- var ssl = -1;
- if (timing.sslStart >= 0 && timing.sslEnd >= 0)
- ssl = timing.sslEnd - timing.sslStart;
-
- return {blocked: blocked, dns: dns, connect: connect, send: send, wait: wait, receive: receive, ssl: ssl};
- },
-
- /**
- * @return {!Object}
- */
- _buildPostData: function()
- {
- var res = {
- mimeType: this._request.requestContentType(),
- text: this._request.requestFormData
- };
- if (this._request.formParameters)
- res.params = this._buildParameters(this._request.formParameters);
- return res;
- },
-
- /**
- * @param {!Array.<!Object>} parameters
- * @return {!Array.<!Object>}
- */
- _buildParameters: function(parameters)
- {
- return parameters.slice();
- },
-
- /**
- * @param {string} url
- * @return {string}
- */
- _buildRequestURL: function(url)
- {
- return url.split("#", 2)[0];
- },
-
- /**
- * @param {!Array.<!WebInspector.Cookie>} cookies
- * @return {!Array.<!Object>}
- */
- _buildCookies: function(cookies)
- {
- return cookies.map(this._buildCookie.bind(this));
- },
-
- /**
- * @param {!WebInspector.Cookie} cookie
- * @return {!Object}
- */
- _buildCookie: function(cookie)
- {
- var c = {
- name: cookie.name(),
- value: cookie.value(),
- path: cookie.path(),
- domain: cookie.domain(),
- expires: cookie.expiresDate(WebInspector.HARLog.pseudoWallTime(this._request, this._request.startTime)),
- httpOnly: cookie.httpOnly(),
- secure: cookie.secure()
- };
- if (cookie.sameSite())
- c.sameSite = cookie.sameSite();
- return c;
- },
-
- /**
- * @return {number}
- */
- get requestBodySize()
- {
- return !this._request.requestFormData ? 0 : this._request.requestFormData.length;
- },
-
- /**
- * @return {number}
- */
- get responseBodySize()
- {
- if (this._request.cached() || this._request.statusCode === 304)
- return 0;
- if (!this._request.responseHeadersText)
- return -1;
- return this._request.transferSize - this._request.responseHeadersText.length;
- },
-
- /**
- * @return {number|undefined}
- */
- get responseCompression()
- {
- if (this._request.cached() || this._request.statusCode === 304 || this._request.statusCode === 206)
- return;
- if (!this._request.responseHeadersText)
- return;
- return this._request.resourceSize - this.responseBodySize;
+ /**
+ * @param {number} time
+ * @return {number}
+ */
+ static _toMilliseconds(time) {
+ return time === -1 ? -1 : time * 1000;
+ }
+
+ /**
+ * @return {!Object}
+ */
+ build() {
+ var ipAddress = this._request.remoteAddress();
+ var portPositionInString = ipAddress.lastIndexOf(':');
+ if (portPositionInString !== -1)
+ ipAddress = ipAddress.substr(0, portPositionInString);
+
+ var entry = {
+ startedDateTime: WebInspector.HARLog.pseudoWallTime(this._request, this._request.startTime),
+ time: this._request.timing ? WebInspector.HAREntry._toMilliseconds(this._request.duration) : 0,
+ request: this._buildRequest(),
+ response: this._buildResponse(),
+ cache: {}, // Not supported yet.
+ timings: this._buildTimings(),
+ serverIPAddress: ipAddress
+ };
+
+ if (this._request.connectionId !== '0')
+ entry.connection = this._request.connectionId;
+ var page = this._request.networkLog().pageLoadForRequest(this._request);
+ if (page)
+ entry.pageref = 'page_' + page.id;
+ return entry;
+ }
+
+ /**
+ * @return {!Object}
+ */
+ _buildRequest() {
+ var headersText = this._request.requestHeadersText();
+ var res = {
+ method: this._request.requestMethod,
+ url: this._buildRequestURL(this._request.url),
+ httpVersion: this._request.requestHttpVersion(),
+ headers: this._request.requestHeaders(),
+ queryString: this._buildParameters(this._request.queryParameters || []),
+ cookies: this._buildCookies(this._request.requestCookies || []),
+ headersSize: headersText ? headersText.length : -1,
+ bodySize: this.requestBodySize
+ };
+ if (this._request.requestFormData)
+ res.postData = this._buildPostData();
+
+ return res;
+ }
+
+ /**
+ * @return {!Object}
+ */
+ _buildResponse() {
+ var headersText = this._request.responseHeadersText;
+ return {
+ status: this._request.statusCode,
+ statusText: this._request.statusText,
+ httpVersion: this._request.responseHttpVersion(),
+ headers: this._request.responseHeaders,
+ cookies: this._buildCookies(this._request.responseCookies || []),
+ content: this._buildContent(),
+ redirectURL: this._request.responseHeaderValue('Location') || '',
+ headersSize: headersText ? headersText.length : -1,
+ bodySize: this.responseBodySize,
+ _transferSize: this._request.transferSize,
+ _error: this._request.localizedFailDescription
+ };
+ }
+
+ /**
+ * @return {!Object}
+ */
+ _buildContent() {
+ var content = {
+ size: this._request.resourceSize,
+ mimeType: this._request.mimeType || 'x-unknown',
+ // text: this._request.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;
+ }
+
+ /**
+ * @return {!Object}
+ */
+ _buildTimings() {
+ // Order of events: request_start = 0, [proxy], [dns], [connect [ssl]], [send], receive_headers_end
+ // HAR 'blocked' time is time before first network activity.
+
+ var timing = this._request.timing;
+ if (!timing)
+ return {blocked: -1, dns: -1, connect: -1, send: 0, wait: 0, receive: 0, ssl: -1};
+
+ function firstNonNegative(values) {
+ for (var i = 0; i < values.length; ++i) {
+ if (values[i] >= 0)
+ return values[i];
+ }
+ console.assert(false, 'Incomplete request timing information.');
}
-};
-/**
- * @param {number} time
- * @return {number}
- */
-WebInspector.HAREntry._toMilliseconds = function(time)
-{
- return time === -1 ? -1 : time * 1000;
+ var blocked = firstNonNegative([timing.dnsStart, timing.connectStart, timing.sendStart]);
+
+ var dns = -1;
+ if (timing.dnsStart >= 0)
+ dns = firstNonNegative([timing.connectStart, timing.sendStart]) - timing.dnsStart;
+
+ var connect = -1;
+ if (timing.connectStart >= 0)
+ connect = timing.sendStart - timing.connectStart;
+
+ var send = timing.sendEnd - timing.sendStart;
+ var wait = timing.receiveHeadersEnd - timing.sendEnd;
+ var receive = WebInspector.HAREntry._toMilliseconds(this._request.duration) - timing.receiveHeadersEnd;
+
+ var ssl = -1;
+ if (timing.sslStart >= 0 && timing.sslEnd >= 0)
+ ssl = timing.sslEnd - timing.sslStart;
+
+ return {blocked: blocked, dns: dns, connect: connect, send: send, wait: wait, receive: receive, ssl: ssl};
+ }
+
+ /**
+ * @return {!Object}
+ */
+ _buildPostData() {
+ var res = {mimeType: this._request.requestContentType(), text: this._request.requestFormData};
+ if (this._request.formParameters)
+ res.params = this._buildParameters(this._request.formParameters);
+ return res;
+ }
+
+ /**
+ * @param {!Array.<!Object>} parameters
+ * @return {!Array.<!Object>}
+ */
+ _buildParameters(parameters) {
+ return parameters.slice();
+ }
+
+ /**
+ * @param {string} url
+ * @return {string}
+ */
+ _buildRequestURL(url) {
+ return url.split('#', 2)[0];
+ }
+
+ /**
+ * @param {!Array.<!WebInspector.Cookie>} cookies
+ * @return {!Array.<!Object>}
+ */
+ _buildCookies(cookies) {
+ return cookies.map(this._buildCookie.bind(this));
+ }
+
+ /**
+ * @param {!WebInspector.Cookie} cookie
+ * @return {!Object}
+ */
+ _buildCookie(cookie) {
+ var c = {
+ name: cookie.name(),
+ value: cookie.value(),
+ path: cookie.path(),
+ domain: cookie.domain(),
+ expires: cookie.expiresDate(WebInspector.HARLog.pseudoWallTime(this._request, this._request.startTime)),
+ httpOnly: cookie.httpOnly(),
+ secure: cookie.secure()
+ };
+ if (cookie.sameSite())
+ c.sameSite = cookie.sameSite();
+ return c;
+ }
+
+ /**
+ * @return {number}
+ */
+ get requestBodySize() {
+ return !this._request.requestFormData ? 0 : this._request.requestFormData.length;
+ }
+
+ /**
+ * @return {number}
+ */
+ get responseBodySize() {
+ if (this._request.cached() || this._request.statusCode === 304)
+ return 0;
+ if (!this._request.responseHeadersText)
+ return -1;
+ return this._request.transferSize - this._request.responseHeadersText.length;
+ }
+
+ /**
+ * @return {number|undefined}
+ */
+ get responseCompression() {
+ if (this._request.cached() || this._request.statusCode === 304 || this._request.statusCode === 206)
+ return;
+ if (!this._request.responseHeadersText)
+ return;
+ return this._request.resourceSize - this.responseBodySize;
+ }
};
-/**
- * @constructor
- * @param {!Array.<!WebInspector.NetworkRequest>} requests
- */
-WebInspector.HARLog = function(requests)
-{
- this._requests = requests;
-};
/**
- * @param {!WebInspector.NetworkRequest} request
- * @param {number} monotonicTime
- * @return {!Date}
+ * @unrestricted
*/
-WebInspector.HARLog.pseudoWallTime = function(request, monotonicTime)
-{
+WebInspector.HARLog = class {
+ /**
+ * @param {!Array.<!WebInspector.NetworkRequest>} requests
+ */
+ constructor(requests) {
+ this._requests = requests;
+ }
+
+ /**
+ * @param {!WebInspector.NetworkRequest} request
+ * @param {number} monotonicTime
+ * @return {!Date}
+ */
+ static pseudoWallTime(request, monotonicTime) {
return new Date(request.pseudoWallTime(monotonicTime) * 1000);
-};
-
-WebInspector.HARLog.prototype = {
- /**
- * @return {!Object}
- */
- build: function()
- {
- return {
- version: "1.2",
- creator: this._creator(),
- pages: this._buildPages(),
- entries: this._requests.map(this._convertResource.bind(this))
- };
- },
-
- _creator: function()
- {
- var webKitVersion = /AppleWebKit\/([^ ]+)/.exec(window.navigator.userAgent);
-
- return {
- name: "WebInspector",
- version: webKitVersion ? webKitVersion[1] : "n/a"
- };
- },
-
- /**
- * @return {!Array.<!Object>}
- */
- _buildPages: function()
- {
- var seenIdentifiers = {};
- var pages = [];
- for (var i = 0; i < this._requests.length; ++i) {
- var request = this._requests[i];
- var page = request.networkLog().pageLoadForRequest(request);
- if (!page || seenIdentifiers[page.id])
- continue;
- seenIdentifiers[page.id] = true;
- pages.push(this._convertPage(page, request));
- }
- return pages;
- },
-
- /**
- * @param {!WebInspector.PageLoad} page
- * @param {!WebInspector.NetworkRequest} request
- * @return {!Object}
- */
- _convertPage: function(page, request)
- {
- return {
- startedDateTime: WebInspector.HARLog.pseudoWallTime(request, page.startTime),
- id: "page_" + page.id,
- title: page.url, // We don't have actual page title here. URL is probably better than nothing.
- pageTimings: {
- onContentLoad: this._pageEventTime(page, page.contentLoadTime),
- onLoad: this._pageEventTime(page, page.loadTime)
- }
- };
- },
-
- /**
- * @param {!WebInspector.NetworkRequest} request
- * @return {!Object}
- */
- _convertResource: function(request)
- {
- return (new WebInspector.HAREntry(request)).build();
- },
-
- /**
- * @param {!WebInspector.PageLoad} page
- * @param {number} time
- * @return {number}
- */
- _pageEventTime: function(page, time)
- {
- var startTime = page.startTime;
- if (time === -1 || startTime === -1)
- return -1;
- return WebInspector.HAREntry._toMilliseconds(time - startTime);
+ }
+
+ /**
+ * @return {!Object}
+ */
+ build() {
+ return {
+ version: '1.2',
+ creator: this._creator(),
+ pages: this._buildPages(),
+ entries: this._requests.map(this._convertResource.bind(this))
+ };
+ }
+
+ _creator() {
+ var webKitVersion = /AppleWebKit\/([^ ]+)/.exec(window.navigator.userAgent);
+
+ return {name: 'WebInspector', version: webKitVersion ? webKitVersion[1] : 'n/a'};
+ }
+
+ /**
+ * @return {!Array.<!Object>}
+ */
+ _buildPages() {
+ var seenIdentifiers = {};
+ var pages = [];
+ for (var i = 0; i < this._requests.length; ++i) {
+ var request = this._requests[i];
+ var page = request.networkLog().pageLoadForRequest(request);
+ if (!page || seenIdentifiers[page.id])
+ continue;
+ seenIdentifiers[page.id] = true;
+ pages.push(this._convertPage(page, request));
}
+ return pages;
+ }
+
+ /**
+ * @param {!WebInspector.PageLoad} page
+ * @param {!WebInspector.NetworkRequest} request
+ * @return {!Object}
+ */
+ _convertPage(page, request) {
+ return {
+ startedDateTime: WebInspector.HARLog.pseudoWallTime(request, page.startTime),
+ id: 'page_' + page.id,
+ title: page.url, // We don't have actual page title here. URL is probably better than nothing.
+ pageTimings: {
+ onContentLoad: this._pageEventTime(page, page.contentLoadTime),
+ onLoad: this._pageEventTime(page, page.loadTime)
+ }
+ };
+ }
+
+ /**
+ * @param {!WebInspector.NetworkRequest} request
+ * @return {!Object}
+ */
+ _convertResource(request) {
+ return (new WebInspector.HAREntry(request)).build();
+ }
+
+ /**
+ * @param {!WebInspector.PageLoad} page
+ * @param {number} time
+ * @return {number}
+ */
+ _pageEventTime(page, time) {
+ var startTime = page.startTime;
+ if (time === -1 || startTime === -1)
+ return -1;
+ return WebInspector.HAREntry._toMilliseconds(time - startTime);
+ }
};
+
+
« no previous file with comments | « third_party/WebKit/Source/devtools/front_end/sdk/DebuggerModel.js ('k') | third_party/WebKit/Source/devtools/front_end/sdk/HeapProfilerModel.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698