<!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>[213875] 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/213875">213875</a></dd>
<dt>Author</dt> <dd>nvasilyev@apple.com</dd>
<dt>Date</dt> <dd>2017-03-13 15:35:29 -0700 (Mon, 13 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: WebSockets: color of outgoing message icon should match text color
https://bugs.webkit.org/show_bug.cgi?id=169512
<rdar://problem/30994284>
Reviewed by Devin Rousso.
Include SVG icon as an inline SVG element to make currentColor work.
* Localizations/en.lproj/localizedStrings.js:
* UserInterface/Main.html:
* UserInterface/Views/WebSocketContentView.css:
(.web-socket.content-view .outgoing .icon): Deleted.
* UserInterface/Views/WebSocketContentView.js:
(WebInspector.WebSocketContentView):
(WebInspector.WebSocketContentView.prototype.addFrame):
(WebInspector.WebSocketContentView.prototype._addRow):
(WebInspector.WebSocketContentView.prototype._timeStringFromTimestamp): Deleted.
* UserInterface/Views/WebSocketDataGridNode.js: Added.
(WebInspector.WebSocketDataGridNode.prototype.createCellContent):
(WebInspector.WebSocketDataGridNode.prototype._timeStringFromTimestamp):
(WebInspector.WebSocketDataGridNode):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceMainhtml">trunk/Source/WebInspectorUI/UserInterface/Main.html</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsWebSocketContentViewcss">trunk/Source/WebInspectorUI/UserInterface/Views/WebSocketContentView.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsWebSocketContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/WebSocketContentView.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsWebSocketDataGridNodejs">trunk/Source/WebInspectorUI/UserInterface/Views/WebSocketDataGridNode.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (213874 => 213875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2017-03-13 22:29:47 UTC (rev 213874)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-03-13 22:35:29 UTC (rev 213875)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2017-03-13 Nikita Vasilyev <nvasilyev@apple.com>
+
+ Web Inspector: WebSockets: color of outgoing message icon should match text color
+ https://bugs.webkit.org/show_bug.cgi?id=169512
+ <rdar://problem/30994284>
+
+ Reviewed by Devin Rousso.
+
+ Include SVG icon as an inline SVG element to make currentColor work.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ * UserInterface/Main.html:
+ * UserInterface/Views/WebSocketContentView.css:
+ (.web-socket.content-view .outgoing .icon): Deleted.
+ * UserInterface/Views/WebSocketContentView.js:
+ (WebInspector.WebSocketContentView):
+ (WebInspector.WebSocketContentView.prototype.addFrame):
+ (WebInspector.WebSocketContentView.prototype._addRow):
+ (WebInspector.WebSocketContentView.prototype._timeStringFromTimestamp): Deleted.
+ * UserInterface/Views/WebSocketDataGridNode.js: Added.
+ (WebInspector.WebSocketDataGridNode.prototype.createCellContent):
+ (WebInspector.WebSocketDataGridNode.prototype._timeStringFromTimestamp):
+ (WebInspector.WebSocketDataGridNode):
+
</ins><span class="cx"> 2017-03-13 Devin Rousso <webkit@devinrousso.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Event Listeners detail section is unhelpful, default should show listeners by element rather than by event
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (213874 => 213875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2017-03-13 22:29:47 UTC (rev 213874)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2017-03-13 22:35:29 UTC (rev 213875)
</span><span class="lines">@@ -582,6 +582,7 @@
</span><span class="cx"> localizedStrings["Originally %s"] = "Originally %s";
</span><span class="cx"> localizedStrings["Other"] = "Other";
</span><span class="cx"> localizedStrings["Other Issue"] = "Other Issue";
</span><ins>+localizedStrings["Outgoing message"] = "Outgoing message";
</ins><span class="cx"> localizedStrings["Outline"] = "Outline";
</span><span class="cx"> localizedStrings["Output: "] = "Output: ";
</span><span class="cx"> localizedStrings["Outset"] = "Outset";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceMainhtml"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Main.html (213874 => 213875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Main.html 2017-03-13 22:29:47 UTC (rev 213874)
+++ trunk/Source/WebInspectorUI/UserInterface/Main.html 2017-03-13 22:35:29 UTC (rev 213875)
</span><span class="lines">@@ -682,6 +682,7 @@
</span><span class="cx"> <script src="Views/TypeTreeElement.js"></script>
</span><span class="cx"> <script src="Views/TypeTreeView.js"></script>
</span><span class="cx"> <script src="Views/WebSocketContentView.js"></script>
</span><ins>+ <script src="Views/WebSocketDataGridNode.js"></script>
</ins><span class="cx"> <script src="Views/WorkerTreeElement.js"></script>
</span><span class="cx"> <script src="Views/XHRBreakpointTreeElement.js"></script>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsWebSocketContentViewcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/WebSocketContentView.css (213874 => 213875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/WebSocketContentView.css 2017-03-13 22:29:47 UTC (rev 213874)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/WebSocketContentView.css 2017-03-13 22:35:29 UTC (rev 213875)
</span><span class="lines">@@ -61,10 +61,6 @@
</span><span class="cx"> margin-left: 2px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.web-socket.content-view .outgoing .icon {
- background-image: url("../Images/ArrowUp.svg");
-}
-
</del><span class="cx"> .web-socket.content-view .data-grid.variable-height-rows table.data tr:nth-child(odd) {
</span><span class="cx"> background-color: unset;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsWebSocketContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/WebSocketContentView.js (213874 => 213875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/WebSocketContentView.js 2017-03-13 22:29:47 UTC (rev 213874)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/WebSocketContentView.js 2017-03-13 22:35:29 UTC (rev 213875)
</span><span class="lines">@@ -42,7 +42,6 @@
</span><span class="cx"> let columns = {data: {}};
</span><span class="cx"> columns.data.title = WebInspector.UIString("Data");
</span><span class="cx"> columns.data.sortable = false;
</span><del>- columns.data.icon = true;
</del><span class="cx"> columns.data.width = "85%";
</span><span class="cx">
</span><span class="cx"> if (this._showTimeColumn)
</span><span class="lines">@@ -103,7 +102,7 @@
</span><span class="cx"> opcode === WebInspector.WebSocketResource.OpCodes.TextFrame ? "text-frame" : "non-text-frame"
</span><span class="cx"> ];
</span><span class="cx">
</span><del>- this._addRow(nodeText, time, classNames);
</del><ins>+ this._addRow(nodeText, time, classNames, isOutgoing);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Private
</span><span class="lines">@@ -119,21 +118,16 @@
</span><span class="cx"> this._framesRendered = framesLength;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _addRow(data, time, classNames)
</del><ins>+ _addRow(data, time, classNames, isOutgoing)
</ins><span class="cx"> {
</span><span class="cx"> let node;
</span><span class="cx"> if (this._showTimeColumn)
</span><del>- node = new WebInspector.DataGridNode({data, time: this._timeStringFromTimestamp(time)});
</del><ins>+ node = new WebInspector.WebSocketDataGridNode({data, time, isOutgoing});
</ins><span class="cx"> else
</span><del>- node = new WebInspector.DataGridNode({data});
</del><ins>+ node = new WebInspector.WebSocketDataGridNode({data, isOutgoing});
</ins><span class="cx">
</span><span class="cx"> this._dataGrid.appendChild(node);
</span><span class="cx">
</span><span class="cx"> node.element.classList.add(...classNames);
</span><span class="cx"> }
</span><del>-
- _timeStringFromTimestamp(timestamp)
- {
- return new Date(timestamp * 1000).toLocaleTimeString();
- }
</del><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsWebSocketDataGridNodejs"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/UserInterface/Views/WebSocketDataGridNode.js (0 => 213875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/WebSocketDataGridNode.js (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/WebSocketDataGridNode.js 2017-03-13 22:35:29 UTC (rev 213875)
</span><span class="lines">@@ -0,0 +1,54 @@
</span><ins>+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+WebInspector.WebSocketDataGridNode = class WebSocketDataGridNode extends WebInspector.DataGridNode
+{
+ // Public
+
+ createCellContent(columnIdentifier)
+ {
+ if (columnIdentifier === "data") {
+ let fragment = document.createDocumentFragment();
+ if (this._data.isOutgoing) {
+ let iconElement = useSVGSymbol("Images/ArrowUp.svg", "icon", WebInspector.UIString("Outgoing message"));
+ fragment.appendChild(iconElement);
+ }
+ fragment.appendChild(document.createTextNode(this._data.data));
+ return fragment;
+ }
+
+ if (columnIdentifier === "time")
+ return this._timeStringFromTimestamp(this._data.time);
+
+ return super.createCellContent(columnIdentifier);
+ }
+
+ // Private
+
+ _timeStringFromTimestamp(timestamp)
+ {
+ return new Date(timestamp * 1000).toLocaleTimeString();
+ }
+};
</ins></span></pre>
</div>
</div>
</body>
</html>