| Index: third_party/WebKit/Source/devtools/front_end/network/ResourceWebSocketFrameView.js
|
| diff --git a/third_party/WebKit/Source/devtools/front_end/network/ResourceWebSocketFrameView.js b/third_party/WebKit/Source/devtools/front_end/network/ResourceWebSocketFrameView.js
|
| index 8069127f1f4fe5764741ddcd0a42f619276746ea..4d740102abf9e9a6a0803b1929a337e0d261ef0e 100644
|
| --- a/third_party/WebKit/Source/devtools/front_end/network/ResourceWebSocketFrameView.js
|
| +++ b/third_party/WebKit/Source/devtools/front_end/network/ResourceWebSocketFrameView.js
|
| @@ -19,9 +19,9 @@
|
| /**
|
| * @unrestricted
|
| */
|
| -WebInspector.ResourceWebSocketFrameView = class extends WebInspector.VBox {
|
| +Network.ResourceWebSocketFrameView = class extends UI.VBox {
|
| /**
|
| - * @param {!WebInspector.NetworkRequest} request
|
| + * @param {!SDK.NetworkRequest} request
|
| */
|
| constructor(request) {
|
| super();
|
| @@ -29,48 +29,48 @@ WebInspector.ResourceWebSocketFrameView = class extends WebInspector.VBox {
|
| this.element.classList.add('websocket-frame-view');
|
| this._request = request;
|
|
|
| - this._splitWidget = new WebInspector.SplitWidget(false, true, 'resourceWebSocketFrameSplitViewState');
|
| + this._splitWidget = new UI.SplitWidget(false, true, 'resourceWebSocketFrameSplitViewState');
|
| this._splitWidget.show(this.element);
|
|
|
| - var columns = /** @type {!Array<!WebInspector.DataGrid.ColumnDescriptor>} */ ([
|
| - {id: 'data', title: WebInspector.UIString('Data'), sortable: false, weight: 88}, {
|
| + var columns = /** @type {!Array<!UI.DataGrid.ColumnDescriptor>} */ ([
|
| + {id: 'data', title: Common.UIString('Data'), sortable: false, weight: 88}, {
|
| id: 'length',
|
| - title: WebInspector.UIString('Length'),
|
| + title: Common.UIString('Length'),
|
| sortable: false,
|
| - align: WebInspector.DataGrid.Align.Right,
|
| + align: UI.DataGrid.Align.Right,
|
| weight: 5
|
| },
|
| - {id: 'time', title: WebInspector.UIString('Time'), sortable: true, weight: 7}
|
| + {id: 'time', title: Common.UIString('Time'), sortable: true, weight: 7}
|
| ]);
|
|
|
| - this._dataGrid = new WebInspector.SortableDataGrid(columns);
|
| + this._dataGrid = new UI.SortableDataGrid(columns);
|
| this._dataGrid.setRowContextMenuCallback(onRowContextMenu);
|
| this._dataGrid.setStickToBottom(true);
|
| this._dataGrid.setCellClass('websocket-frame-view-td');
|
| - this._timeComparator = /** @type {!WebInspector.SortableDataGrid.NodeComparator} */ (
|
| - WebInspector.ResourceWebSocketFrameNodeTimeComparator);
|
| + this._timeComparator = /** @type {!UI.SortableDataGrid.NodeComparator} */ (
|
| + Network.ResourceWebSocketFrameNodeTimeComparator);
|
| this._dataGrid.sortNodes(this._timeComparator, false);
|
| - this._dataGrid.markColumnAsSortedBy('time', WebInspector.DataGrid.Order.Ascending);
|
| - this._dataGrid.addEventListener(WebInspector.DataGrid.Events.SortingChanged, this._sortItems, this);
|
| + this._dataGrid.markColumnAsSortedBy('time', UI.DataGrid.Order.Ascending);
|
| + this._dataGrid.addEventListener(UI.DataGrid.Events.SortingChanged, this._sortItems, this);
|
|
|
| this._dataGrid.setName('ResourceWebSocketFrameView');
|
| - this._dataGrid.addEventListener(WebInspector.DataGrid.Events.SelectedNode, this._onFrameSelected, this);
|
| - this._dataGrid.addEventListener(WebInspector.DataGrid.Events.DeselectedNode, this._onFrameDeselected, this);
|
| + this._dataGrid.addEventListener(UI.DataGrid.Events.SelectedNode, this._onFrameSelected, this);
|
| + this._dataGrid.addEventListener(UI.DataGrid.Events.DeselectedNode, this._onFrameDeselected, this);
|
| this._splitWidget.setMainWidget(this._dataGrid.asWidget());
|
|
|
| - var view = new WebInspector.EmptyWidget('Select frame to browse its content.');
|
| + var view = new UI.EmptyWidget('Select frame to browse its content.');
|
| this._splitWidget.setSidebarWidget(view);
|
|
|
| - /** @type {?WebInspector.ResourceWebSocketFrameNode} */
|
| + /** @type {?Network.ResourceWebSocketFrameNode} */
|
| this._selectedNode = null;
|
|
|
| /**
|
| - * @param {!WebInspector.ContextMenu} contextMenu
|
| - * @param {!WebInspector.DataGridNode} node
|
| + * @param {!UI.ContextMenu} contextMenu
|
| + * @param {!UI.DataGridNode} node
|
| */
|
| function onRowContextMenu(contextMenu, node) {
|
| contextMenu.appendItem(
|
| - WebInspector.UIString.capitalize('Copy ^message'),
|
| + Common.UIString.capitalize('Copy ^message'),
|
| InspectorFrontendHost.copyText.bind(InspectorFrontendHost, node.data.data));
|
| }
|
| }
|
| @@ -81,9 +81,9 @@ WebInspector.ResourceWebSocketFrameView = class extends WebInspector.VBox {
|
| * @return {string}
|
| */
|
| static opCodeDescription(opCode, mask) {
|
| - var rawDescription = WebInspector.ResourceWebSocketFrameView.opCodeDescriptions[opCode] || '';
|
| - var localizedDescription = WebInspector.UIString(rawDescription);
|
| - return WebInspector.UIString('%s (Opcode %d%s)', localizedDescription, opCode, (mask ? ', mask' : ''));
|
| + var rawDescription = Network.ResourceWebSocketFrameView.opCodeDescriptions[opCode] || '';
|
| + var localizedDescription = Common.UIString(rawDescription);
|
| + return Common.UIString('%s (Opcode %d%s)', localizedDescription, opCode, (mask ? ', mask' : ''));
|
| }
|
|
|
| /**
|
| @@ -91,59 +91,59 @@ WebInspector.ResourceWebSocketFrameView = class extends WebInspector.VBox {
|
| */
|
| wasShown() {
|
| this.refresh();
|
| - this._request.addEventListener(WebInspector.NetworkRequest.Events.WebsocketFrameAdded, this._frameAdded, this);
|
| + this._request.addEventListener(SDK.NetworkRequest.Events.WebsocketFrameAdded, this._frameAdded, this);
|
| }
|
|
|
| /**
|
| * @override
|
| */
|
| willHide() {
|
| - this._request.removeEventListener(WebInspector.NetworkRequest.Events.WebsocketFrameAdded, this._frameAdded, this);
|
| + this._request.removeEventListener(SDK.NetworkRequest.Events.WebsocketFrameAdded, this._frameAdded, this);
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.Event} event
|
| + * @param {!Common.Event} event
|
| */
|
| _frameAdded(event) {
|
| - var frame = /** @type {!WebInspector.NetworkRequest.WebSocketFrame} */ (event.data);
|
| - this._dataGrid.insertChild(new WebInspector.ResourceWebSocketFrameNode(this._request.url, frame));
|
| + var frame = /** @type {!SDK.NetworkRequest.WebSocketFrame} */ (event.data);
|
| + this._dataGrid.insertChild(new Network.ResourceWebSocketFrameNode(this._request.url, frame));
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.Event} event
|
| + * @param {!Common.Event} event
|
| */
|
| _onFrameSelected(event) {
|
| - var selectedNode = /** @type {!WebInspector.ResourceWebSocketFrameNode} */ (event.target.selectedNode);
|
| + var selectedNode = /** @type {!Network.ResourceWebSocketFrameNode} */ (event.target.selectedNode);
|
| this._currentSelectedNode = selectedNode;
|
| var contentProvider = selectedNode.contentProvider();
|
| contentProvider.requestContent().then(contentHandler.bind(this));
|
|
|
| /**
|
| * @param {(string|null)} content
|
| - * @this {WebInspector.ResourceWebSocketFrameView}
|
| + * @this {Network.ResourceWebSocketFrameView}
|
| */
|
| function contentHandler(content) {
|
| if (this._currentSelectedNode !== selectedNode)
|
| return;
|
| - WebInspector.JSONView.parseJSON(content).then(handleJSONData.bind(this));
|
| + Network.JSONView.parseJSON(content).then(handleJSONData.bind(this));
|
| }
|
|
|
| /**
|
| - * @param {?WebInspector.ParsedJSON} parsedJSON
|
| - * @this {WebInspector.ResourceWebSocketFrameView}
|
| + * @param {?Network.ParsedJSON} parsedJSON
|
| + * @this {Network.ResourceWebSocketFrameView}
|
| */
|
| function handleJSONData(parsedJSON) {
|
| if (this._currentSelectedNode !== selectedNode)
|
| return;
|
| if (parsedJSON)
|
| - this._splitWidget.setSidebarWidget(WebInspector.JSONView.createSearchableView(parsedJSON));
|
| + this._splitWidget.setSidebarWidget(Network.JSONView.createSearchableView(parsedJSON));
|
| else
|
| - this._splitWidget.setSidebarWidget(new WebInspector.ResourceSourceFrame(contentProvider));
|
| + this._splitWidget.setSidebarWidget(new SourceFrame.ResourceSourceFrame(contentProvider));
|
| }
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.Event} event
|
| + * @param {!Common.Event} event
|
| */
|
| _onFrameDeselected(event) {
|
| this._currentSelectedNode = null;
|
| @@ -153,7 +153,7 @@ WebInspector.ResourceWebSocketFrameView = class extends WebInspector.VBox {
|
| this._dataGrid.rootNode().removeChildren();
|
| var frames = this._request.frames();
|
| for (var i = 0; i < frames.length; ++i)
|
| - this._dataGrid.insertChild(new WebInspector.ResourceWebSocketFrameNode(this._request.url, frames[i]));
|
| + this._dataGrid.insertChild(new Network.ResourceWebSocketFrameNode(this._request.url, frames[i]));
|
| }
|
|
|
| _sortItems() {
|
| @@ -162,7 +162,7 @@ WebInspector.ResourceWebSocketFrameView = class extends WebInspector.VBox {
|
| };
|
|
|
| /** @enum {number} */
|
| -WebInspector.ResourceWebSocketFrameView.OpCodes = {
|
| +Network.ResourceWebSocketFrameView.OpCodes = {
|
| ContinuationFrame: 0,
|
| TextFrame: 1,
|
| BinaryFrame: 2,
|
| @@ -172,8 +172,8 @@ WebInspector.ResourceWebSocketFrameView.OpCodes = {
|
| };
|
|
|
| /** @type {!Array.<string> } */
|
| -WebInspector.ResourceWebSocketFrameView.opCodeDescriptions = (function() {
|
| - var opCodes = WebInspector.ResourceWebSocketFrameView.OpCodes;
|
| +Network.ResourceWebSocketFrameView.opCodeDescriptions = (function() {
|
| + var opCodes = Network.ResourceWebSocketFrameView.OpCodes;
|
| var map = [];
|
| map[opCodes.ContinuationFrame] = 'Continuation Frame';
|
| map[opCodes.TextFrame] = 'Text Frame';
|
| @@ -188,10 +188,10 @@ WebInspector.ResourceWebSocketFrameView.opCodeDescriptions = (function() {
|
| /**
|
| * @unrestricted
|
| */
|
| -WebInspector.ResourceWebSocketFrameNode = class extends WebInspector.SortableDataGridNode {
|
| +Network.ResourceWebSocketFrameNode = class extends UI.SortableDataGridNode {
|
| /**
|
| * @param {string} url
|
| - * @param {!WebInspector.NetworkRequest.WebSocketFrame} frame
|
| + * @param {!SDK.NetworkRequest.WebSocketFrame} frame
|
| */
|
| constructor(url, frame) {
|
| var dataText = frame.text;
|
| @@ -203,9 +203,9 @@ WebInspector.ResourceWebSocketFrameNode = class extends WebInspector.SortableDat
|
| timeNode.createTextChild(timeText);
|
| timeNode.title = time.toLocaleString();
|
|
|
| - var isTextFrame = frame.opCode === WebInspector.ResourceWebSocketFrameView.OpCodes.TextFrame;
|
| + var isTextFrame = frame.opCode === Network.ResourceWebSocketFrameView.OpCodes.TextFrame;
|
| if (!isTextFrame)
|
| - dataText = WebInspector.ResourceWebSocketFrameView.opCodeDescription(frame.opCode, frame.mask);
|
| + dataText = Network.ResourceWebSocketFrameView.opCodeDescription(frame.opCode, frame.mask);
|
|
|
| super({data: dataText, length: length, time: timeNode});
|
|
|
| @@ -221,9 +221,9 @@ WebInspector.ResourceWebSocketFrameNode = class extends WebInspector.SortableDat
|
| createCells() {
|
| var element = this._element;
|
| element.classList.toggle(
|
| - 'websocket-frame-view-row-error', this._frame.type === WebInspector.NetworkRequest.WebSocketFrameType.Error);
|
| + 'websocket-frame-view-row-error', this._frame.type === SDK.NetworkRequest.WebSocketFrameType.Error);
|
| element.classList.toggle(
|
| - 'websocket-frame-view-row-outcoming', this._frame.type === WebInspector.NetworkRequest.WebSocketFrameType.Send);
|
| + 'websocket-frame-view-row-outcoming', this._frame.type === SDK.NetworkRequest.WebSocketFrameType.Send);
|
| element.classList.toggle('websocket-frame-view-row-opcode', !this._isTextFrame);
|
| super.createCells();
|
| }
|
| @@ -237,19 +237,19 @@ WebInspector.ResourceWebSocketFrameNode = class extends WebInspector.SortableDat
|
| }
|
|
|
| /**
|
| - * @return {!WebInspector.ContentProvider}
|
| + * @return {!Common.ContentProvider}
|
| */
|
| contentProvider() {
|
| - return WebInspector.StaticContentProvider.fromString(
|
| - this._url, WebInspector.resourceTypes.WebSocket, this._dataText);
|
| + return Common.StaticContentProvider.fromString(
|
| + this._url, Common.resourceTypes.WebSocket, this._dataText);
|
| }
|
| };
|
|
|
| /**
|
| - * @param {!WebInspector.ResourceWebSocketFrameNode} a
|
| - * @param {!WebInspector.ResourceWebSocketFrameNode} b
|
| + * @param {!Network.ResourceWebSocketFrameNode} a
|
| + * @param {!Network.ResourceWebSocketFrameNode} b
|
| * @return {number}
|
| */
|
| -WebInspector.ResourceWebSocketFrameNodeTimeComparator = function(a, b) {
|
| +Network.ResourceWebSocketFrameNodeTimeComparator = function(a, b) {
|
| return a._frame.time - b._frame.time;
|
| };
|
|
|