<!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>[196151] 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/196151">196151</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-04 15:13:46 -0800 (Thu, 04 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: New timeline images for instruments
https://bugs.webkit.org/show_bug.cgi?id=153884
<rdar://problem/24509429>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-02-04
Reviewed by Timothy Hatcher.
* UserInterface/Views/TimelineTabContentView.js:
(WebInspector.TimelineTabContentView.iconClassNameForTimeline):
Better names and give Memory timeline a name for an icon.
* UserInterface/Views/TreeOutline.css:
(.tree-outline.large .item .icon):
Add more padding next to large icons.
* UserInterface/Images/ColorsLarge.png: Removed.
* UserInterface/Images/ColorsLarge@2x.png: Removed.
* UserInterface/Images/Frames.png: Removed.
* UserInterface/Images/Frames@2x.png: Removed.
* UserInterface/Images/LayoutInstrument.svg: Added.
* UserInterface/Images/MemoryInstrument.svg: Added.
* UserInterface/Images/NetworkInstrument.svg: Added.
* UserInterface/Images/NetworkLarge.png: Removed.
* UserInterface/Images/NetworkLarge@2x.png: Removed.
* UserInterface/Images/RenderingFramesInstrument.svg: Added.
* UserInterface/Images/ScriptLarge.png: Removed.
* UserInterface/Images/ScriptLarge@2x.png: Removed.
Remove old timeline pngs.
* UserInterface/Images/ScriptsInstrument.svg: Added.
* UserInterface/Views/TimelineIcons.css:
(.network-icon .icon):
(.script-icon .icon):
(.memory-icon .icon):
(.layout-icon .icon):
(.rendering-frame-icon .icon):
Use the new SVGs.
(body:not(.mac-platform, .windows-platform) .network-icon .icon):
(body:not(.mac-platform, .windows-platform) .network-icon.large .icon):
(body:not(.mac-platform, .windows-platform) .layout-icon .icon):
(body:not(.mac-platform, .windows-platform) .layout-icon.large .icon):
(body:not(.mac-platform, .windows-platform) .script-icon .icon):
(body:not(.mac-platform, .windows-platform) .script-icon.large .icon):
(body:not(.mac-platform, .windows-platform) .rendering-frame-icon .icon):
Fallback to old icons for non-Mac/Windows ports using Images/gtk images.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineIconscss">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineIcons.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineTabContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineTabContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTreeOutlinecss">trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.css</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceImagesLayoutInstrumentsvg">trunk/Source/WebInspectorUI/UserInterface/Images/LayoutInstrument.svg</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceImagesMemoryInstrumentsvg">trunk/Source/WebInspectorUI/UserInterface/Images/MemoryInstrument.svg</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceImagesNetworkInstrumentsvg">trunk/Source/WebInspectorUI/UserInterface/Images/NetworkInstrument.svg</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceImagesRenderingFramesInstrumentsvg">trunk/Source/WebInspectorUI/UserInterface/Images/RenderingFramesInstrument.svg</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceImagesScriptsInstrumentsvg">trunk/Source/WebInspectorUI/UserInterface/Images/ScriptsInstrument.svg</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceImagesColorsLargepng">trunk/Source/WebInspectorUI/UserInterface/Images/ColorsLarge.png</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceImagesColorsLarge2xpng">trunk/Source/WebInspectorUI/UserInterface/Images/ColorsLarge@2x.png</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceImagesFramespng">trunk/Source/WebInspectorUI/UserInterface/Images/Frames.png</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceImagesFrames2xpng">trunk/Source/WebInspectorUI/UserInterface/Images/Frames@2x.png</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceImagesNetworkLargepng">trunk/Source/WebInspectorUI/UserInterface/Images/NetworkLarge.png</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceImagesNetworkLarge2xpng">trunk/Source/WebInspectorUI/UserInterface/Images/NetworkLarge@2x.png</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceImagesScriptLargepng">trunk/Source/WebInspectorUI/UserInterface/Images/ScriptLarge.png</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceImagesScriptLarge2xpng">trunk/Source/WebInspectorUI/UserInterface/Images/ScriptLarge@2x.png</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (196150 => 196151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-02-04 22:54:02 UTC (rev 196150)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-02-04 23:13:46 UTC (rev 196151)
</span><span class="lines">@@ -1,3 +1,51 @@
</span><ins>+2016-02-04 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: New timeline images for instruments
+ https://bugs.webkit.org/show_bug.cgi?id=153884
+ <rdar://problem/24509429>
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/TimelineTabContentView.js:
+ (WebInspector.TimelineTabContentView.iconClassNameForTimeline):
+ Better names and give Memory timeline a name for an icon.
+
+ * UserInterface/Views/TreeOutline.css:
+ (.tree-outline.large .item .icon):
+ Add more padding next to large icons.
+
+ * UserInterface/Images/ColorsLarge.png: Removed.
+ * UserInterface/Images/ColorsLarge@2x.png: Removed.
+ * UserInterface/Images/Frames.png: Removed.
+ * UserInterface/Images/Frames@2x.png: Removed.
+ * UserInterface/Images/LayoutInstrument.svg: Added.
+ * UserInterface/Images/MemoryInstrument.svg: Added.
+ * UserInterface/Images/NetworkInstrument.svg: Added.
+ * UserInterface/Images/NetworkLarge.png: Removed.
+ * UserInterface/Images/NetworkLarge@2x.png: Removed.
+ * UserInterface/Images/RenderingFramesInstrument.svg: Added.
+ * UserInterface/Images/ScriptLarge.png: Removed.
+ * UserInterface/Images/ScriptLarge@2x.png: Removed.
+ Remove old timeline pngs.
+
+ * UserInterface/Images/ScriptsInstrument.svg: Added.
+ * UserInterface/Views/TimelineIcons.css:
+ (.network-icon .icon):
+ (.script-icon .icon):
+ (.memory-icon .icon):
+ (.layout-icon .icon):
+ (.rendering-frame-icon .icon):
+ Use the new SVGs.
+
+ (body:not(.mac-platform, .windows-platform) .network-icon .icon):
+ (body:not(.mac-platform, .windows-platform) .network-icon.large .icon):
+ (body:not(.mac-platform, .windows-platform) .layout-icon .icon):
+ (body:not(.mac-platform, .windows-platform) .layout-icon.large .icon):
+ (body:not(.mac-platform, .windows-platform) .script-icon .icon):
+ (body:not(.mac-platform, .windows-platform) .script-icon.large .icon):
+ (body:not(.mac-platform, .windows-platform) .rendering-frame-icon .icon):
+ Fallback to old icons for non-Mac/Windows ports using Images/gtk images.
+
</ins><span class="cx"> 2016-02-04 Devin Rousso <dcrousso+webkit@gmail.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Show error icons if invalid values already exist for properties in the Visual sidebar
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceImagesColorsLargepng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Images/ColorsLarge.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceImagesColorsLarge2xpng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Images/ColorsLarge@2x.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceImagesFramespng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Images/Frames.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceImagesFrames2xpng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Images/Frames@2x.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceImagesLayoutInstrumentsvg"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/UserInterface/Images/LayoutInstrument.svg (0 => 196151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Images/LayoutInstrument.svg (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Images/LayoutInstrument.svg 2016-02-04 23:13:46 UTC (rev 196151)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright © 2016 Apple Inc. All rights reserved. -->
+<svg xmlns="http://www.w3.org/2000/svg" id="root" version="1.1" viewBox="0 0 16 16">
+ <circle stroke="rgb(141, 174, 69)" fill="rgb(176, 203, 103)" cx="8" cy="8" r="7.5"/>
+ <path d="M 3 10.4935773 C 3 11.6310702 3.94215347 11.9907402 4.93496556 12 C 6.42418369 11.9907402 6.92058973 11.3204375 6.92058973 10.4935773 C 6.92058973 9.66671703 6.24966718 8.99641436 5.42204226 8.99641436 C 4.59441735 8.99641436 3.94215347 9.66671703 3.94215347 10.4935773 C 3.94215347 10.999895 3.31764654 10.7238538 3 10.4935773 Z M 8.99763014 9.08837807 L 11.7565232 5.32059047 C 12.059741 4.94168339 12.0992889 4.42825986 11.8436112 4.17258216 C 11.5879335 3.91690445 11.070247 3.9521894 10.6860812 4.25014853 L 6.88966617 6.98041409 C 6.48986361 7.26273645 5.98436755 8.19410964 6.86513881 9.0748809 C 7.74591007 9.95565216 8.71076191 9.48363474 8.99763014 9.08837807 Z" stroke="rgb(141, 174, 69)" stroke-width="2" stroke-linejoin="round"/>
+ <path d="M 3 10.4935773 C 3 11.6310702 3.94215347 11.9907402 4.93496556 12 C 6.42418369 11.9907402 6.92058973 11.3204375 6.92058973 10.4935773 C 6.92058973 9.66671703 6.24966718 8.99641436 5.42204226 8.99641436 C 4.59441735 8.99641436 3.94215347 9.66671703 3.94215347 10.4935773 C 3.94215347 10.999895 3.31764654 10.7238538 3 10.4935773 Z M 8.99763014 9.08837807 L 11.7565232 5.32059047 C 12.059741 4.94168339 12.0992889 4.42825986 11.8436112 4.17258216 C 11.5879335 3.91690445 11.070247 3.9521894 10.6860812 4.25014853 L 6.88966617 6.98041409 C 6.48986361 7.26273645 5.98436755 8.19410964 6.86513881 9.0748809 C 7.74591007 9.95565216 8.71076191 9.48363474 8.99763014 9.08837807 Z" fill="white"/>
+</svg>
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceImagesMemoryInstrumentsvg"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/UserInterface/Images/MemoryInstrument.svg (0 => 196151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Images/MemoryInstrument.svg (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Images/MemoryInstrument.svg 2016-02-04 23:13:46 UTC (rev 196151)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright © 2016 Apple Inc. All rights reserved. -->
+<svg xmlns="http://www.w3.org/2000/svg" id="root" version="1.1" viewBox="0 0 16 16">
+ <circle stroke="rgb(179, 114, 76)" fill="rgb(224, 166, 133)" cx="8" cy="8" r="7.5"/>
+ <rect stroke="rgb(179, 114, 76)" stroke-width="2" x="4" y="4" width="2" height="8" rx="0.25"/>
+ <rect stroke="rgb(179, 114, 76)" stroke-width="2" x="7" y="4" width="2" height="8" rx="0.25"/>
+ <rect stroke="rgb(179, 114, 76)" stroke-width="2" x="10" y="4" width="2" height="8" rx="0.25"/>
+ <rect fill="white" x="4" y="4" width="2" height="8" rx="0.25"/>
+ <rect fill="white" x="7" y="4" width="2" height="8" rx="0.25"/>
+ <rect fill="white" x="10" y="4" width="2" height="8" rx="0.25"/>
+ <rect stroke="rgb(179, 114, 76)" stroke-width="2" x="3" y="6" width="10" height="4" rx="0.25"/>
+ <rect fill="white" x="3" y="6" width="10" height="4" rx="0.25"/>
+</svg>
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceImagesNetworkInstrumentsvg"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/UserInterface/Images/NetworkInstrument.svg (0 => 196151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Images/NetworkInstrument.svg (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Images/NetworkInstrument.svg 2016-02-04 23:13:46 UTC (rev 196151)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright © 2016 Apple Inc. All rights reserved. -->
+<svg xmlns="http://www.w3.org/2000/svg" id="root" version="1.1" viewBox="0 0 16 16">
+ <circle stroke="rgb(61, 148, 199)" fill="rgb(119, 177, 225)" cx="8" cy="8" r="7.5"/>
+ <path d="M 11 14.3325755 L 10 14.6900635 L 10 4.81711004 L 8.46831066 6.24134473 L 7.75 5.5705206 L 10.5 3.00231934 L 13.25 5.5705206 L 12.5316893 6.24134473 L 11 4.81091327 L 11 14.3325755 Z" stroke="rgb(61, 148, 199)" stroke-linejoin="round" stroke-width="2"/>
+ <path d="M 6 1.32731142 L 5 1.79199219 L 5 10.2777191 L 3.46831066 8.84604471 L 2.75 9.520373 L 5.5 12.1019897 L 8.25 9.520373 L 7.53168934 8.84604471 L 6 10.2839483 L 6 1.32731142 Z" stroke="rgb(61, 148, 199)" stroke-linejoin="round" stroke-width="2"/>
+ <path d="M 11 14.3325755 L 10 14.6900635 L 10 4.81711004 L 8.46831066 6.24134473 L 7.75 5.5705206 L 10.5 3.00231934 L 13.25 5.5705206 L 12.5316893 6.24134473 L 11 4.81091327 L 11 14.3325755 Z" fill="white"/>
+ <path d="M 6 1.32731142 L 5 1.79199219 L 5 10.2777191 L 3.46831066 8.84604471 L 2.75 9.520373 L 5.5 12.1019897 L 8.25 9.520373 L 7.53168934 8.84604471 L 6 10.2839483 L 6 1.32731142 Z" fill="white"/>
+</svg>
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceImagesNetworkLargepng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Images/NetworkLarge.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceImagesNetworkLarge2xpng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Images/NetworkLarge@2x.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceImagesRenderingFramesInstrumentsvg"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/UserInterface/Images/RenderingFramesInstrument.svg (0 => 196151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Images/RenderingFramesInstrument.svg (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Images/RenderingFramesInstrument.svg 2016-02-04 23:13:46 UTC (rev 196151)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright © 2016 Apple Inc. All rights reserved. -->
+<svg xmlns="http://www.w3.org/2000/svg" id="root" version="1.1" viewBox="0 0 16 16">
+ <circle fill="rgb(232, 149, 149)" cx="8" cy="8" r="7.5" stroke="rgb(210, 106, 106)"/>
+ <rect stroke-linejoin="round" fill="white" x="9.5" y="4" width="3" height="8" stroke="rgb(210, 106, 106)"/>
+ <rect stroke-linejoin="round" fill="white" x="3.5" y="9" width="3" height="3" stroke="rgb(210, 106, 106)"/>
+ <rect stroke-linejoin="round" fill="white" x="6.5" y="7" width="3" height="5" stroke="rgb(210, 106, 106)"/>
+</svg>
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceImagesScriptLargepng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Images/ScriptLarge.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceImagesScriptLarge2xpng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Images/ScriptLarge@2x.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceImagesScriptsInstrumentsvg"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/UserInterface/Images/ScriptsInstrument.svg (0 => 196151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Images/ScriptsInstrument.svg (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Images/ScriptsInstrument.svg 2016-02-04 23:13:46 UTC (rev 196151)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright © 2016 Apple Inc. All rights reserved. -->
+<svg xmlns="http://www.w3.org/2000/svg" id="root" version="1.1" viewBox="0 0 16 16">
+ <circle stroke="rgb(151, 113, 183)" fill="rgb(187, 146, 232)" cx="8" cy="8" r="7.5"/>
+ <path d="M 5.22715696 6.125 C 5.91982955 6.125 6.45431395 6.6811371 6.45431395 7.25000001 C 6.45431395 7.25000001 6.93478361 6.81078546 7.17501843 6.59117817 C 7.92513716 5.90546775 9.42537462 4.53404687 9.42537462 4.53404687 C 9.42537462 4.53404687 12.4169327 7.54094502 12.5269833 7.67306518 C 12.6753846 7.85122682 13 8.17674256 13 8.7521515 C 13 9.03857762 12.8713126 9.31763171 12.6565014 9.52590133 C 12.4398269 9.73597737 7.89350922 13.8804761 8.11042201 13.69328 C 8.34989886 13.4865646 8.49957557 13.1940886 8.49957557 12.875 C 8.49957557 12.2636566 8.18050277 11.9713059 8.0225143 11.7980652 C 8.01851356 11.7936782 7.87412439 11.647648 7.6463559 11.4174298 L 6.04526161 12.875 C 6.04526161 13.4963203 6.59467851 14 7.2724186 14 C 7.5964145 14 7.89108408 13.8826115 8.11042201 13.69328 C 8.34996717 13.4864312 8.49957557 13.1940158 8.49957557 12.875 C 8.49957557 12.2636566 8.18050277 11.9713059 8.0225143 11.7980652 C 7.86452582 11.6248245 4.77566147 8.52086639 4.56
48687 8.29740906 C 4.35407594 8.07395173 4 7.82797241 4 7.25000001 C 4 6.9391318 4.15462275 6.63721575 4.40531682 6.42455392 C 4.15462324 6.63721527 8.68638208 2.47343347 8.96623147 2.26163853 C 9.17952159 2.10021679 9.4468593 2 9.72673256 2 C 10.3738162 2 10.9667723 2.55439758 10.9667723 3.125 L 6.45431395 7.25000001 C 6.45431395 6.6811371 5.91982955 6.125 5.22715696 6.125 C 4.90704524 6.125 4.62071828 6.24183056 4.40531685 6.42455387 C 4.62071825 6.24183056 4.90704521 6.125 5.22715696 6.125 Z" stroke="rgb(151, 113, 183)" />
+ <path d="M 5.22715696 6.125 C 5.91982955 6.125 6.45431395 6.6811371 6.45431395 7.25000001 C 6.45431395 7.25000001 6.93478361 6.81078546 7.17501843 6.59117817 C 7.92513716 5.90546775 9.42537462 4.53404687 9.42537462 4.53404687 C 9.42537462 4.53404687 12.4169327 7.54094502 12.5269833 7.67306518 C 12.6753846 7.85122682 13 8.17674256 13 8.7521515 C 13 9.03857762 12.8713126 9.31763171 12.6565014 9.52590133 C 12.4398269 9.73597737 7.89350922 13.8804761 8.11042201 13.69328 C 8.34989886 13.4865646 8.49957557 13.1940886 8.49957557 12.875 C 8.49957557 12.2636566 8.18050277 11.9713059 8.0225143 11.7980652 C 8.01851356 11.7936782 7.87412439 11.647648 7.6463559 11.4174298 L 6.04526161 12.875 C 6.04526161 13.4963203 6.59467851 14 7.2724186 14 C 7.5964145 14 7.89108408 13.8826115 8.11042201 13.69328 C 8.34996717 13.4864312 8.49957557 13.1940158 8.49957557 12.875 C 8.49957557 12.2636566 8.18050277 11.9713059 8.0225143 11.7980652 C 7.86452582 11.6248245 4.77566147 8.52086639 4.56
48687 8.29740906 C 4.35407594 8.07395173 4 7.82797241 4 7.25000001 C 4 6.9391318 4.15462275 6.63721575 4.40531682 6.42455392 C 4.15462324 6.63721527 8.68638208 2.47343347 8.96623147 2.26163853 C 9.17952159 2.10021679 9.4468593 2 9.72673256 2 C 10.3738162 2 10.9667723 2.55439758 10.9667723 3.125 L 6.45431395 7.25000001 C 6.45431395 6.6811371 5.91982955 6.125 5.22715696 6.125 C 4.90704524 6.125 4.62071828 6.24183056 4.40531685 6.42455387 C 4.62071825 6.24183056 4.90704521 6.125 5.22715696 6.125 Z" fill="white" stroke="rgb(151, 113, 183)" stroke-width="0.5"/>
+</svg>
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineIconscss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineIcons.css (196150 => 196151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineIcons.css 2016-02-04 22:54:02 UTC (rev 196150)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineIcons.css 2016-02-04 23:13:46 UTC (rev 196151)
</span><span class="lines">@@ -24,30 +24,51 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> .network-icon .icon {
</span><ins>+ content: url(../Images/NetworkInstrument.svg);
+}
+
+.script-icon .icon {
+ content: url(../Images/ScriptsInstrument.svg);
+}
+
+.memory-icon .icon {
+ content: url(../Images/MemoryInstrument.svg);
+}
+
+.layout-icon .icon {
+ content: url(../Images/LayoutInstrument.svg);
+}
+
+.rendering-frame-icon .icon {
+ content: url(../Images/RenderingFramesInstrument.svg);
+}
+
+/* FIXME: <https://webkit.org/b/153892> [GTK] Web Inspector: Add new GTK+ icons for instrument icons */
+body:not(.mac-platform, .windows-platform) .network-icon .icon {
</ins><span class="cx"> content: -webkit-image-set(url(../Images/Network.png) 1x, url(../Images/Network@2x.png) 2x);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.network-icon.large .icon {
</del><ins>+body:not(.mac-platform, .windows-platform) .network-icon.large .icon {
</ins><span class="cx"> content: -webkit-image-set(url(../Images/NetworkLarge.png) 1x, url(../Images/NetworkLarge@2x.png) 2x);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.colors-icon .icon {
</del><ins>+body:not(.mac-platform, .windows-platform) .layout-icon .icon {
</ins><span class="cx"> content: -webkit-image-set(url(../Images/Colors.png) 1x, url(../Images/Colors@2x.png) 2x);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.colors-icon.large .icon {
</del><ins>+body:not(.mac-platform, .windows-platform) .layout-icon.large .icon {
</ins><span class="cx"> content: -webkit-image-set(url(../Images/ColorsLarge.png) 1x, url(../Images/ColorsLarge@2x.png) 2x);
</span><span class="cx"> }
</span><del>-
-.script-icon .icon {
</del><ins>+
+body:not(.mac-platform, .windows-platform) .script-icon .icon {
</ins><span class="cx"> content: -webkit-image-set(url(../Images/Script.png) 1x, url(../Images/Script@2x.png) 2x);
</span><span class="cx"> }
</span><del>-
-.script-icon.large .icon {
</del><ins>+
+body:not(.mac-platform, .windows-platform) .script-icon.large .icon {
</ins><span class="cx"> content: -webkit-image-set(url(../Images/ScriptLarge.png) 1x, url(../Images/ScriptLarge@2x.png) 2x);
</span><span class="cx"> }
</span><del>-
-.rendering-frame-icon .icon {
</del><ins>+
+body:not(.mac-platform, .windows-platform) .rendering-frame-icon .icon {
</ins><span class="cx"> content: -webkit-image-set(url(../Images/Frames.png) 1x, url(../Images/Frames@2x.png) 2x);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineTabContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineTabContentView.js (196150 => 196151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineTabContentView.js 2016-02-04 22:54:02 UTC (rev 196150)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineTabContentView.js 2016-02-04 23:13:46 UTC (rev 196151)
</span><span class="lines">@@ -75,9 +75,9 @@
</span><span class="cx"> case WebInspector.TimelineRecord.Type.Network:
</span><span class="cx"> return "network-icon";
</span><span class="cx"> case WebInspector.TimelineRecord.Type.Layout:
</span><del>- return "colors-icon";
</del><ins>+ return "layout-icon";
</ins><span class="cx"> case WebInspector.TimelineRecord.Type.Memory:
</span><del>- // FIXME: Need a new icon. For now fall through to the Script icon.
</del><ins>+ return "memory-icon";
</ins><span class="cx"> case WebInspector.TimelineRecord.Type.Script:
</span><span class="cx"> return "script-icon";
</span><span class="cx"> case WebInspector.TimelineRecord.Type.RenderingFrame:
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTreeOutlinecss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.css (196150 => 196151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.css 2016-02-04 22:54:02 UTC (rev 196150)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.css 2016-02-04 23:13:46 UTC (rev 196151)
</span><span class="lines">@@ -128,6 +128,7 @@
</span><span class="cx">
</span><span class="cx"> .tree-outline.large .item .icon {
</span><span class="cx"> width: 32px;
</span><ins>+ margin-right: 6px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .tree-outline .item .status {
</span></span></pre>
</div>
</div>
</body>
</html>