|
|
Created:
6 years, 1 month ago by eustas Modified:
6 years ago CC:
blink-reviews, caseq+blink_chromium.org, loislo+blink_chromium.org, eustas+blink_chromium.org, malch+blink_chromium.org, yurys+blink_chromium.org, lushnikov+blink_chromium.org, vsevik+blink_chromium.org, pfeldman+blink_chromium.org, paulirish+reviews_chromium.org, apavlov+blink_chromium.org, devtools-reviews_chromium.org, sergeyv+blink_chromium.org, aandrey+blink_chromium.org Base URL:
https://chromium.googlesource.com/chromium/blink.git@master Project:
blink Visibility:
Public. |
DescriptionDevTools: Split NetworkPanel.js
BUG=
Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=185306
Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=185384
Patch Set 1 #Patch Set 2 : #Patch Set 3 : rebase #Patch Set 4 : rebase #Patch Set 5 : #Patch Set 6 : #Patch Set 7 : #
Messages
Total messages: 18 (7 generated)
eustas@chromium.org changed reviewers: + apavlov@chromium.org, vsevik@chromium.org
lgtm
The CQ bit was checked by eustas@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/722683003/40001
The CQ bit was unchecked by commit-bot@chromium.org
Failed to apply patch for Source/devtools/front_end/network/NetworkPanel.js: While running patch -p1 --forward --force --no-backup-if-mismatch; patching file Source/devtools/front_end/network/NetworkPanel.js Hunk #2 FAILED at 30. 1 out of 5 hunks FAILED -- saving rejects to file Source/devtools/front_end/network/NetworkPanel.js.rej Patch: Source/devtools/front_end/network/NetworkPanel.js Index: Source/devtools/front_end/network/NetworkPanel.js diff --git a/Source/devtools/front_end/network/NetworkPanel.js b/Source/devtools/front_end/network/NetworkPanel.js index e9e8dcb8f0c5f83334aa2c0512f4f752765baacf..62f46e8b88cab39be978b49e802e05e93368b848 100644 --- a/Source/devtools/front_end/network/NetworkPanel.js +++ b/Source/devtools/front_end/network/NetworkPanel.js @@ -1,7 +1,7 @@ /* * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. * Copyright (C) 2008, 2009 Anthony Ricaud <rik@webkit.org> - * Copyright (C) 2011 Google Inc. All rights reserved. + * Copyright (C) 2010, 2011, 2012, 2013, 2014 Google Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,1875 +30,6 @@ /** * @constructor - * @implements {WebInspector.Searchable} - * @implements {WebInspector.TargetManager.Observer} - * @extends {WebInspector.VBox} - * @param {!WebInspector.FilterBar} filterBar - * @param {!WebInspector.Setting} coulmnsVisibilitySetting - */ -WebInspector.NetworkLogView = function(filterBar, coulmnsVisibilitySetting) -{ - WebInspector.VBox.call(this); - this.registerRequiredCSS("network/networkLogView.css"); - this.registerRequiredCSS("ui/filter.css"); - - this._filterBar = filterBar; - this._coulmnsVisibilitySetting = coulmnsVisibilitySetting; - this._allowRequestSelection = false; - /** @type {!Map.<string, !WebInspector.NetworkDataGridNode>} */ - this._nodesByRequestId = new Map(); - /** @type {!Object.<string, boolean>} */ - this._staleRequestIds = {}; - /** @type {number} */ - this._mainRequestLoadTime = -1; - /** @type {number} */ - this._mainRequestDOMContentLoadedTime = -1; - this._matchedRequestCount = 0; - this._highlightedSubstringChanges = []; - - /** @type {!Array.<!WebInspector.NetworkLogView.Filter>} */ - this._filters = []; - - this._currentMatchedRequestNode = null; - this._currentMatchedRequestIndex = -1; - - this._createStatusbarButtons(); - this._createStatusBarItems(); - this._linkifier = new WebInspector.Linkifier(); - - this._allowPopover = true; - - /** @type {number} */ - this._rowHeight = 0; - - this._addFilters(); - this._resetSuggestionBuilder(); - this._initializeView(); - this._toggleRecordButton(true); - - WebInspector.targetManager.observeTargets(this); - WebInspector.targetManager.addModelListener(WebInspector.NetworkManager, WebInspector.NetworkManager.EventTypes.RequestStarted, this._onRequestStarted, this); - WebInspector.targetManager.addModelListener(WebInspector.NetworkManager, WebInspector.NetworkManager.EventTypes.RequestUpdated, this._onRequestUpdated, this); - WebInspector.targetManager.addModelListener(WebInspector.NetworkManager, WebInspector.NetworkManager.EventTypes.RequestFinished, this._onRequestUpdated, this); - - WebInspector.targetManager.addModelListener(WebInspector.ResourceTreeModel, WebInspector.ResourceTreeModel.EventTypes.WillReloadPage, this._willReloadPage, this); - WebInspector.targetManager.addModelListener(WebInspector.ResourceTreeModel, WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this); - WebInspector.targetManager.addModelListener(WebInspector.ResourceTreeModel, WebInspector.ResourceTreeModel.EventTypes.Load, this._loadEventFired, this); - WebInspector.targetManager.addModelListener(WebInspector.ResourceTreeModel, WebInspector.ResourceTreeModel.EventTypes.DOMContentLoaded, this._domContentLoadedEventFired, this); -} - -WebInspector.NetworkLogView.HTTPSchemas = {"http": true, "https": true, "ws": true, "wss": true}; -WebInspector.NetworkLogView._responseHeaderColumns = ["Cache-Control", "Connection", "Content-Encoding", "Content-Length", "ETag", "Keep-Alive", "Last-Modified", "Server", "Vary"]; -WebInspector.NetworkLogView.defaultColumnsVisibility = { - method: true, status: true, scheme: false, domain: false, remoteAddress: false, type: true, initiator: true, cookies: false, setCookies: false, size: true, time: true, connectionId: false, - "Cache-Control": false, "Connection": false, "Content-Encoding": false, "Content-Length": false, "ETag": false, "Keep-Alive": false, "Last-Modified": false, "Server": false, "Vary": false -}; -WebInspector.NetworkLogView._defaultRefreshDelay = 500; - -/** @enum {string} */ -WebInspector.NetworkLogView.FilterType = { - Domain: "Domain", - HasResponseHeader: "HasResponseHeader", - Is: "Is", - Method: "Method", - MimeType: "MimeType", - Scheme: "Scheme", - SetCookieDomain: "SetCookieDomain", - SetCookieName: "SetCookieName", - SetCookieValue: "SetCookieValue", - StatusCode: "StatusCode" -}; - -/** @enum {string} */ -WebInspector.NetworkLogView.IsFilterType = { - Running: "running" -}; - -/** @type {!Array.<string>} */ -WebInspector.NetworkLogView._searchKeys = Object.values(WebInspector.NetworkLogView.FilterType); - -/** @type {!Object.<string, string>} */ -WebInspector.NetworkLogView._columnTitles = { - "name": WebInspector.UIString("Name"), - "method": WebInspector.UIString("Method"), - "status": WebInspector.UIString("Status"), - "scheme": WebInspector.UIString("Scheme"), - "domain": WebInspector.UIString("Domain"), - "remoteAddress": WebInspector.UIString("Remote Address"), - "type": WebInspector.UIString("Type"), - "initiator": WebInspector.UIString("Initiator"), - "cookies": WebInspector.UIString("Cookies"), - "setCookies": WebInspector.UIString("Set-Cookies"), - "size": WebInspector.UIString("Size"), - "time": WebInspector.UIString("Time"), - "connectionId": WebInspector.UIString("Connection Id"), - "timeline": WebInspector.UIString("Timeline"), - - // Response header columns - "Cache-Control": WebInspector.UIString("Cache-Control"), - "Connection": WebInspector.UIString("Connection"), - "Content-Encoding": WebInspector.UIString("Content-Encoding"), - "Content-Length": WebInspector.UIString("Content-Length"), - "ETag": WebInspector.UIString("ETag"), - "Keep-Alive": WebInspector.UIString("Keep-Alive"), - "Last-Modified": WebInspector.UIString("Last-Modified"), - "Server": WebInspector.UIString("Server"), - "Vary": WebInspector.UIString("Vary") -}; - -WebInspector.NetworkLogView.prototype = { - /** - * @param {!WebInspector.Target} target - */ - targetAdded: function(target) - { - target.networkLog.requests.forEach(this._appendRequest.bind(this)); - }, - - /** - * @param {!WebInspector.Target} target - */ - targetRemoved: function(target) - { - }, - - /** - * @return {boolean} - */ - allowRequestSelection: function() - { - return this._allowRequestSelection; - }, - - _addFilters: function() - { - this._textFilterUI = new WebInspector.TextFilterUI(); - this._textFilterUI.addEventListener(WebInspector.FilterUI.Events.FilterChanged, this._filterChanged, this); - this._filterBar.addFilter(this._textFilterUI); - - var types = []; - for (var typeId in WebInspector.resourceTypes) { - var resourceType = WebInspector.resourceTypes[typeId]; - if (resourceType === WebInspector.resourceTypes.TextTrack) - continue; - types.push({name: resourceType.name(), label: resourceType.categoryTitle()}); - } - this._resourceTypeFilterUI = new WebInspector.NamedBitSetFilterUI(types, WebInspector.settings.networkResourceTypeFilters); - this._resourceTypeFilterUI.addEventListener(WebInspector.FilterUI.Events.FilterChanged, this._filterChanged.bind(this), this); - this._filterBar.addFilter(this._resourceTypeFilterUI); - - var dataURLSetting = WebInspector.settings.networkHideDataURL; - this._dataURLFilterUI = new WebInspector.CheckboxFilterUI("hide-data-url", WebInspector.UIString("Hide data URLs"), true, dataURLSetting); - this._dataURLFilterUI.addEventListener(WebInspector.FilterUI.Events.FilterChanged, this._filterChanged.bind(this), this); - this._filterBar.addFilter(this._dataURLFilterUI); - }, - - _resetSuggestionBuilder: function() - { - this._suggestionBuilder = new WebInspector.FilterSuggestionBuilder(WebInspector.NetworkLogView._searchKeys); - this._suggestionBuilder.addItem(WebInspector.NetworkLogView.FilterType.Is, WebInspector.NetworkLogView.IsFilterType.Running); - this._textFilterUI.setSuggestionBuilder(this._suggestionBuilder); - }, - - /** - * @param {!WebInspector.Event} event - */ - _filterChanged: function(event) - { - this._removeAllNodeHighlights(); - this._parseFilterQuery(this._textFilterUI.value()); - this._filterRequests(); - }, - - _initializeView: function() - { - this.element.id = "network-container"; - - this._createSortingFunctions(); - this._createCalculators(); - this._createTable(); - this._createTimelineGrid(); - this._summaryBarElement = this.element.createChild("div", "network-summary-bar"); - - this._updateRowsSize(); - - this._popoverHelper = new WebInspector.PopoverHelper(this.element, this._getPopoverAnchor.bind(this), this._showPopover.bind(this), this._onHidePopover.bind(this)); - // Enable faster hint. - this._popoverHelper.setTimeout(250, 250); - - this.switchViewMode(true); - }, - - /** - * @retur… (message too large)
The CQ bit was checked by eustas@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/722683003/60001
The CQ bit was unchecked by commit-bot@chromium.org
Try jobs failed on following builders: linux_blink_rel on tryserver.blink (http://build.chromium.org/p/tryserver.blink/builders/linux_blink_rel/builds/3...)
The CQ bit was checked by eustas@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/722683003/80001
Message was sent while issue was closed.
Committed patchset #5 (id:80001) as 185306
Message was sent while issue was closed.
A revert of this CL (patchset #5 id:80001) has been created in https://codereview.chromium.org/730463002/ by pfeldman@chromium.org. The reason for reverting is: Don't overwrite files..
The CQ bit was checked by eustas@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/722683003/100001
Message was sent while issue was closed.
Committed patchset #6 (id:100001) as 185384 |