<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[214587] trunk/Source/WebInspectorUI</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/214587">214587</a></dd>
<dt>Author</dt> <dd>nvasilyev@apple.com</dd>
<dt>Date</dt> <dd>2017-03-29 18:06:31 -0700 (Wed, 29 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: WebSockets: Messages log should remain being scrolled to the bottom when a new message is added
https://bugs.webkit.org/show_bug.cgi?id=170090
Reviewed by Matt Baker.
Adding many Web Socket messages quickly can create a performance bottleneck. Batch addition of DataGrid nodes
using requestAnimationFrame, and scroll to the bottom of the DataGrid at most once per a batch update.
* UserInterface/Views/WebSocketContentView.js:
(WebInspector.WebSocketContentView):
(WebInspector.WebSocketContentView.prototype.shown):
(WebInspector.WebSocketContentView.prototype.hidden):
(WebInspector.WebSocketContentView.prototype._updateFramesSoon):
Batch WebSocketContentView DOM modifications using requestAnimationFrame.
(WebInspector.WebSocketContentView.prototype._updateFrames):
(WebInspector.WebSocketContentView.prototype._addFrame):
(WebInspector.WebSocketContentView.prototype.addFrame): Deleted.
Make addFrame method private since it isn't used anywhere outside of this class.
(WebInspector.WebSocketContentView.prototype._updateState): Deleted.
Make _updateState a part of _updateFramesSoon.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsWebSocketContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/WebSocketContentView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (214586 => 214587)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2017-03-30 01:05:58 UTC (rev 214586)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-03-30 01:06:31 UTC (rev 214587)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2017-03-29 Nikita Vasilyev <nvasilyev@apple.com>
+
+ Web Inspector: WebSockets: Messages log should remain being scrolled to the bottom when a new message is added
+ https://bugs.webkit.org/show_bug.cgi?id=170090
+
+ Reviewed by Matt Baker.
+
+ Adding many Web Socket messages quickly can create a performance bottleneck. Batch addition of DataGrid nodes
+ using requestAnimationFrame, and scroll to the bottom of the DataGrid at most once per a batch update.
+
+ * UserInterface/Views/WebSocketContentView.js:
+ (WebInspector.WebSocketContentView):
+ (WebInspector.WebSocketContentView.prototype.shown):
+ (WebInspector.WebSocketContentView.prototype.hidden):
+ (WebInspector.WebSocketContentView.prototype._updateFramesSoon):
+ Batch WebSocketContentView DOM modifications using requestAnimationFrame.
+
+ (WebInspector.WebSocketContentView.prototype._updateFrames):
+ (WebInspector.WebSocketContentView.prototype._addFrame):
+ (WebInspector.WebSocketContentView.prototype.addFrame): Deleted.
+ Make addFrame method private since it isn't used anywhere outside of this class.
+
+ (WebInspector.WebSocketContentView.prototype._updateState): Deleted.
+ Make _updateState a part of _updateFramesSoon.
+
</ins><span class="cx"> 2017-03-29 Sam Brodkin <isam@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Network tab content view is blank after reload
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsWebSocketContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/WebSocketContentView.js (214586 => 214587)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/WebSocketContentView.js 2017-03-30 01:05:58 UTC (rev 214586)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/WebSocketContentView.js 2017-03-30 01:06:31 UTC (rev 214587)
</span><span class="lines">@@ -82,56 +82,57 @@
</span><span class="cx"> shown()
</span><span class="cx"> {
</span><span class="cx"> this._updateFrames();
</span><del>- this._updateState();
-
- this._resource.addEventListener(WebInspector.WebSocketResource.Event.FrameAdded, this._updateFrames, this);
- this._resource.addEventListener(WebInspector.WebSocketResource.Event.ReadyStateChanged, this._updateState, this);
</del><ins>+ this._resource.addEventListener(WebInspector.WebSocketResource.Event.FrameAdded, this._updateFramesSoon, this);
+ this._resource.addEventListener(WebInspector.WebSocketResource.Event.ReadyStateChanged, this._updateFramesSoon, this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> hidden()
</span><span class="cx"> {
</span><del>- this._resource.removeEventListener(WebInspector.WebSocketResource.Event.FrameAdded, this._updateFrames, this);
- this._resource.removeEventListener(WebInspector.WebSocketResource.Event.ReadyStateChanged, this._updateState, this);
</del><ins>+ this._resource.removeEventListener(WebInspector.WebSocketResource.Event.FrameAdded, this._updateFramesSoon, this);
+ this._resource.removeEventListener(WebInspector.WebSocketResource.Event.ReadyStateChanged, this._updateFramesSoon, this);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- addFrame(data, isOutgoing, opcode, time)
</del><ins>+ // Private
+
+ _updateFramesSoon()
</ins><span class="cx"> {
</span><del>- let nodeText;
- if (opcode === WebInspector.WebSocketResource.OpCodes.TextFrame)
- nodeText = data;
- else
- nodeText = WebInspector.WebSocketContentView.textForOpcode(opcode);
-
- let attributes = {
- isOutgoing,
- isText: opcode === WebInspector.WebSocketResource.OpCodes.TextFrame,
- };
-
- this._addRow(nodeText, time, attributes);
</del><ins>+ this.onNextFrame._updateFrames();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- // Private
-
</del><span class="cx"> _updateFrames()
</span><span class="cx"> {
</span><ins>+ let shouldScrollToBottom = this._dataGrid.isScrolledToLastRow();
+
</ins><span class="cx"> let framesLength = this._resource.frames.length;
</span><span class="cx"> for (let index = this._framesRendered; index < framesLength; index++) {
</span><span class="cx"> let frame = this._resource.frames[index];
</span><span class="cx"> let {data, isOutgoing, opcode, walltime} = frame;
</span><del>- this.addFrame(data, isOutgoing, opcode, walltime);
</del><ins>+ this._addFrame(data, isOutgoing, opcode, walltime);
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> this._framesRendered = framesLength;
</span><ins>+
+ if (this._lastRenderedReadyState !== this._resource.readyState) {
+ if (this._resource.readyState === WebInspector.WebSocketResource.ReadyState.Closed)
+ this._dataGrid.appendChild(new WebInspector.SpanningDataGridNode(WebInspector.UIString("Connection Closed")));
+
+ this._lastRenderedReadyState = this._resource.readyState;
+ }
+
+ if (shouldScrollToBottom)
+ this._dataGrid.onNextFrame.scrollToLastRow();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- _updateState(event)
</del><ins>+ _addFrame(data, isOutgoing, opcode, time)
</ins><span class="cx"> {
</span><del>- if (this._lastRenderedReadyState === this._resource.readyState)
- return;
</del><ins>+ let nodeText;
+ let isText = opcode === WebInspector.WebSocketResource.OpCodes.TextFrame;
+ if (isText)
+ nodeText = data;
+ else
+ nodeText = WebInspector.WebSocketContentView.textForOpcode(opcode);
</ins><span class="cx">
</span><del>- if (this._resource.readyState === WebInspector.WebSocketResource.ReadyState.Closed)
- this._dataGrid.appendChild(new WebInspector.SpanningDataGridNode(WebInspector.UIString("Connection Closed")));
-
- this._lastRenderedReadyState = this._resource.readyState;
</del><ins>+ this._addRow(nodeText, time, {isOutgoing, isText});
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _addRow(data, time, attributes = {})
</span></span></pre>
</div>
</div>
</body>
</html>