DevTools: WebSocketFrameView - Add frames display control toolbar

third_party/WebKit/Source/devtools/front_end/network/ResourceWebSocketFrameView.js

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 acf15e9b77ae55d1a9aab2e8d607352b07eaefdc..63215d41f3de63b2a9c2b83a51a4990193ce7802 100644
--- a/third_party/WebKit/Source/devtools/front_end/network/ResourceWebSocketFrameView.js
+++ b/third_party/WebKit/Source/devtools/front_end/network/ResourceWebSocketFrameView.js
@@ -44,7 +44,7 @@ Network.ResourceWebSocketFrameView = class extends UI.VBox {
     ]);
 
     this._dataGrid = new DataGrid.SortableDataGrid(columns);
-    this._dataGrid.setRowContextMenuCallback(onRowContextMenu);
+    this._dataGrid.setRowContextMenuCallback(onRowContextMenu.bind(this));
     this._dataGrid.setStickToBottom(true);
     this._dataGrid.setCellClass('websocket-frame-view-td');
     this._timeComparator =
@@ -57,10 +57,34 @@ Network.ResourceWebSocketFrameView = class extends UI.VBox {
     this._dataGrid.setName('ResourceWebSocketFrameView');
     this._dataGrid.addEventListener(DataGrid.DataGrid.Events.SelectedNode, this._onFrameSelected, this);
     this._dataGrid.addEventListener(DataGrid.DataGrid.Events.DeselectedNode, this._onFrameDeselected, this);
-    this._splitWidget.setMainWidget(this._dataGrid.asWidget());
 
-    var view = new UI.EmptyWidget('Select frame to browse its content.');
-    this._splitWidget.setSidebarWidget(view);
+    this._clearAllButton = new UI.ToolbarButton(Common.UIString('Clear All'), 'largeicon-clear');
+    this._clearAllButton.addEventListener(UI.ToolbarButton.Events.Click, this._clearFrames, this);
+    this._clearFrameOffset = 0;
+
+    this._textFilterUI = new UI.TextFilterUI(true);
+    this._textFilterUI.addEventListener(UI.FilterUI.Events.FilterChanged, this.refresh, this);
+
+    var typeFilterSetting = Common.settings.createSetting('resourceWebSocketFrameViewTypeFilters', {});
+    this._typeFilterUI = new UI.NamedBitSetFilterUI(Network.ResourceWebSocketFrameView.filterTypes, typeFilterSetting);

[allada, 2017/04/24 18:28:14]

Also sorry, here after speaking with my TL he said we want to deprecate
UI.NamedBitSetFilterUI, and in this case he wants us to use a select box
(dropdown box) instead.

+    this._typeFilterUI.addEventListener(UI.FilterUI.Events.FilterChanged, this.refresh, this);
+
+    this._filterBar = new UI.FilterBar('websocketFrameView', true);

[allada, 2017/04/24 18:28:14]

Sorry if I switched this on you, but I spoke with one of the members of the team
and we think it'd be best if the toolbar was all on one line similar to how
cookies filter is. (http://imgur.com/a/OBgd8)

see this for refs:
https://cs.chromium.org/chromium/src/third_party/WebKit/Source/devtools/front...

+    this._filterBar.addFilter(this._textFilterUI);
+    this._filterBar.addFilter(this._typeFilterUI);
+
+    this._mainToolbar = new UI.Toolbar('');
+    this._mainToolbar.appendToolbarItem(this._clearAllButton);
+    this._mainToolbar.appendToolbarItem(this._filterBar.filterButton());
+
+    var mainContainer = new UI.VBox();
+    mainContainer.element.appendChild(this._mainToolbar.element);
+    this._filterBar.show(mainContainer.element);
+    this._dataGrid.asWidget().show(mainContainer.element);
+    this._splitWidget.setMainWidget(mainContainer);
+
+    this._frameEmptyWidget = new UI.EmptyWidget(Common.UIString('Select frame to browse its content.'));
+    this._splitWidget.setSidebarWidget(this._frameEmptyWidget);
 
     /** @type {?Network.ResourceWebSocketFrameNode} */
     this._selectedNode = null;
@@ -68,11 +92,14 @@ Network.ResourceWebSocketFrameView = class extends UI.VBox {
     /**
      * @param {!UI.ContextMenu} contextMenu
      * @param {!DataGrid.DataGridNode} node
+     * @this {Network.ResourceWebSocketFrameView}
      */
     function onRowContextMenu(contextMenu, node) {
       contextMenu.appendItem(
           Common.UIString.capitalize('Copy ^message'),
           InspectorFrontendHost.copyText.bind(InspectorFrontendHost, node.data.data));
+      contextMenu.appendSeparator();
+      contextMenu.appendItem(Common.UIString.capitalize('Clear ^all'), this._clearFrames.bind(this));
     }
   }
 
@@ -107,10 +134,25 @@ Network.ResourceWebSocketFrameView = class extends UI.VBox {
    */
   _frameAdded(event) {
     var frame = /** @type {!SDK.NetworkRequest.WebSocketFrame} */ (event.data);
+    if (!this._frameFilter(frame))
+      return;
     this._dataGrid.insertChild(new Network.ResourceWebSocketFrameNode(this._request.url(), frame));
   }
 
   /**
+   * @param {!SDK.NetworkRequest.WebSocketFrame} frame

[allada, 2017/04/24 18:28:14]

nit: While we are here, can you add:

 * @return {boolean}

+   */
+  _frameFilter(frame) {
+    var regex = this._textFilterUI.regex();
+    return (regex ? regex.test(frame.text) : true) && this._typeFilterUI.accept(frame.type);

[allada, 2017/04/24 18:28:14]

is there a reason we cant use this?

return !!regex && regex.test(frame.text) &&
this._typeFilterUI.accept(frame.type);

+  }
+
+  _clearFrames() {
+    this._clearFrameOffset = this._request.frames().length;
+    this.refresh();
+  }
+
+  /**
    * @param {!Common.Event} event
    */
   _onFrameSelected(event) {
@@ -148,13 +190,17 @@ Network.ResourceWebSocketFrameView = class extends UI.VBox {
    */
   _onFrameDeselected(event) {
     this._currentSelectedNode = null;
+    this._splitWidget.setSidebarWidget(this._frameEmptyWidget);
   }
 
   refresh() {
     this._dataGrid.rootNode().removeChildren();
+
+    var url = this._request.url();
     var frames = this._request.frames();
-    for (var i = 0; i < frames.length; ++i)
-      this._dataGrid.insertChild(new Network.ResourceWebSocketFrameNode(this._request.url(), frames[i]));
+    frames = frames.slice(this._clearFrameOffset);
+    frames = frames.filter(this._frameFilter.bind(this));
+    frames.forEach(frame => this._dataGrid.insertChild(new Network.ResourceWebSocketFrameNode(url, frame)));
   }
 
   _sortItems() {
@@ -185,6 +231,10 @@ Network.ResourceWebSocketFrameView.opCodeDescriptions = (function() {
   return map;
 })();
 
+Network.ResourceWebSocketFrameView.filterTypes = [

[allada, 2017/04/24 18:28:14]

nit (doctype and it's private):

/** @type {!Array<!UI.NamedBitSetFilterUI.Item>} */
Network.ResourceWebSocketFrameView._filterTypes

+  {name: 'send', label: Common.UIString('Send')},
+  {name: 'receive', label: Common.UIString('Receive')},
+];
 
 /**
  * @unrestricted