<!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>[183671] 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/183671">183671</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-05-01 07:24:17 -0700 (Fri, 01 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Remove FrameContentView.js
https://bugs.webkit.org/show_bug.cgi?id=144415
Reviewed by Joseph Pecoraro.
* UserInterface/Images/DOMTree.svg: Removed.
* UserInterface/Images/SourceCode.svg: Removed.
* UserInterface/Main.html: Removed FrameContentView.js.
* UserInterface/Views/FrameContentView.js: Removed.
* UserInterface/Views/PathComponentIcons.css:
(.source-code-icon .icon): Deleted.
(.dom-tree-icon .icon): Deleted.
* UserInterface/Views/ResourceSidebarPanel.js:
(WebInspector.ResourceSidebarPanel.prototype._mainFrameMainResourceDidChange.delayedWork):
(WebInspector.ResourceSidebarPanel.prototype._mainFrameMainResourceDidChange):
Simplify the code here. We don't need these checks now with tabs and the Storage tab.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceMainhtml">trunk/Source/WebInspectorUI/UserInterface/Main.html</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsPathComponentIconscss">trunk/Source/WebInspectorUI/UserInterface/Views/PathComponentIcons.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsResourceSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceImagesDOMTreesvg">trunk/Source/WebInspectorUI/UserInterface/Images/DOMTree.svg</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceImagesSourceCodesvg">trunk/Source/WebInspectorUI/UserInterface/Images/SourceCode.svg</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceImagesgtkDOMTreesvg">trunk/Source/WebInspectorUI/UserInterface/Images/gtk/DOMTree.svg</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceImagesgtkSourceCodesvg">trunk/Source/WebInspectorUI/UserInterface/Images/gtk/SourceCode.svg</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsFrameContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/FrameContentView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (183670 => 183671)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-05-01 11:40:11 UTC (rev 183670)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-05-01 14:24:17 UTC (rev 183671)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-04-29 Timothy Hatcher <timothy@apple.com>
+
+ Web Inspector: Remove FrameContentView.js
+ https://bugs.webkit.org/show_bug.cgi?id=144415
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Images/DOMTree.svg: Removed.
+ * UserInterface/Images/SourceCode.svg: Removed.
+ * UserInterface/Main.html: Removed FrameContentView.js.
+ * UserInterface/Views/FrameContentView.js: Removed.
+ * UserInterface/Views/PathComponentIcons.css:
+ (.source-code-icon .icon): Deleted.
+ (.dom-tree-icon .icon): Deleted.
+
+ * UserInterface/Views/ResourceSidebarPanel.js:
+ (WebInspector.ResourceSidebarPanel.prototype._mainFrameMainResourceDidChange.delayedWork):
+ (WebInspector.ResourceSidebarPanel.prototype._mainFrameMainResourceDidChange):
+ Simplify the code here. We don't need these checks now with tabs and the Storage tab.
+
</ins><span class="cx"> 2015-04-30 Nikita Vasilyev <nvasilyev@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION: Web Inspector: Console message repeat count overlapped by icon
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceImagesDOMTreesvg"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Images/DOMTree.svg (183670 => 183671)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Images/DOMTree.svg 2015-05-01 11:40:11 UTC (rev 183670)
+++ trunk/Source/WebInspectorUI/UserInterface/Images/DOMTree.svg 2015-05-01 14:24:17 UTC (rev 183671)
</span><span class="lines">@@ -1,8 +0,0 @@
</span><del>-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright © 2013 Apple Inc. All rights reserved. -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
- <path fill="rgb(165, 202, 164)" d="M 13 1 L 3 1 C 1.898438 1 1 1.898438 1 3 L 1 13 C 1 14.101562 1.898438 15 3 15 L 13 15 C 14.101562 15 15 14.101562 15 13 L 15 3 C 15 1.898438 14.101562 1 13 1 Z"/>
- <path fill="rgb(118, 153, 116)" d="M 13 1 L 3 1 C 1.898438 1 1 1.898438 1 3 L 1 13 C 1 14.101562 1.898438 15 3 15 L 13 15 C 14.101562 15 15 14.101562 15 13 L 15 3 C 15 1.898438 14.101562 1 13 1 M 13 2 C 13.550781 2 14 2.449219 14 3 L 14 13 C 14 13.550781 13.550781 14 13 14 L 3 14 C 2.449219 14 2 13.550781 2 13 L 2 3 C 2 2.449219 2.449219 2 3 2 L 13 2"/>
- <path fill="rgb(128, 166, 126)" d="M 9 12 C 8.449219 12 8 11.550781 8 11 L 8 9 C 8 8.449219 8.449219 8 9 8 C 8.25 8 7.75 8 7 8 C 7.550781 8 8 8.449219 8 9 L 8 11 C 8 11.550781 7.550781 12 7 12 L 4 12 C 3.445312 12 3 11.550781 3 11 L 3 9 C 3 8.449219 3.445312 8 4 8 C 3.445312 8 3 7.550781 3 7 L 3 5 C 3 4.449219 3.445312 4 4 4 L 12 4 C 12.554688 4 13 4.449219 13 5 L 13 7 C 13 7.550781 12.554688 8 12 8 C 12.554688 8 13 8.449219 13 9 L 13 11 C 13 11.550781 12.554688 12 12 12 L 9 12"/>
- <path fill="white" d="M 12 9 L 12 11 L 9 11 L 9 9 L 10 9 L 10 7 L 6 7 L 6 9 L 7 9 L 7 11 L 4 11 L 4 9 L 5 9 L 5 7 L 4 7 L 4 5 L 12 5 L 12 7 L 11 7 L 11 9 Z"/>
-</svg>
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceImagesSourceCodesvg"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Images/SourceCode.svg (183670 => 183671)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Images/SourceCode.svg 2015-05-01 11:40:11 UTC (rev 183670)
+++ trunk/Source/WebInspectorUI/UserInterface/Images/SourceCode.svg 2015-05-01 14:24:17 UTC (rev 183671)
</span><span class="lines">@@ -1,9 +0,0 @@
</span><del>-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright © 2013 Apple Inc. All rights reserved. -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
- <path fill="rgb(245, 245, 245)" d="M 13 1 L 3 1 C 1.898438 1 1 1.898438 1 3 L 1 13 C 1 14.101562 1.898438 15 3 15 L 13 15 C 14.101562 15 15 14.101562 15 13 L 15 3 C 15 1.898438 14.101562 1 13 1 Z"/>
- <path fill="rgb(191, 191, 191)" d="M 13 1 L 3 1 C 1.898438 1 1 1.898438 1 3 L 1 13 C 1 14.101562 1.898438 15 3 15 L 13 15 C 14.101562 15 15 14.101562 15 13 L 15 3 C 15 1.898438 14.101562 1 13 1 M 13 2 C 13.550781 2 14 2.449219 14 3 L 14 13 C 14 13.550781 13.550781 14 13 14 L 3 14 C 2.449219 14 2 13.550781 2 13 L 2 3 C 2 2.449219 2.449219 2 3 2 L 13 2"/>
- <path fill="rgb(203, 203, 203)" d="M 4 10 L 12 10 L 12 12 L 4 12 Z"/>
- <path fill="rgb(203, 203, 203)" d="M 4 7 L 12 7 L 12 9 L 4 9 Z"/>
- <path fill="rgb(203, 203, 203)" d="M 4 4 L 12 4 L 12 6 L 4 6 Z"/>
-</svg>
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceImagesgtkDOMTreesvg"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Images/gtk/DOMTree.svg (183670 => 183671)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Images/gtk/DOMTree.svg 2015-05-01 11:40:11 UTC (rev 183670)
+++ trunk/Source/WebInspectorUI/UserInterface/Images/gtk/DOMTree.svg 2015-05-01 14:24:17 UTC (rev 183671)
</span><span class="lines">@@ -1,27 +0,0 @@
</span><del>-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Licensed under the Creative Commons Attribution-Share Alike 3.0 United States License (http://creativecommons.org/licenses/by-sa/3.0/) -->
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 16 16">
- <defs>
- <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="51.5" cx="301" gradientTransform="matrix(.97063 1.9684e-8 0 .28611 -291.16 -14.63)" r="19.5">
- <stop stop-color="#fff" offset="0"/>
- <stop stop-color="#fff" stop-opacity="0" offset="1"/>
- </radialGradient>
- <radialGradient id="a" gradientUnits="userSpaceOnUse" cy="35.878" cx="24.446" gradientTransform="matrix(.85696 3.2529e-7 -1.253e-7 .33010 -12.949 .77181)" r="20.531">
- <stop stop-color="#fff" offset="0"/>
- <stop stop-color="#dcf6c2" offset="1"/>
- </radialGradient>
- <linearGradient id="c" y2="118.5" gradientUnits="userSpaceOnUse" x2="311.65" gradientTransform="matrix(.55569 0 0 .55568 -169.27 -70.906)" y1="145.52" x1="321.57">
- <stop stop-color="#4e9a06" offset="0"/>
- <stop stop-color="#d3f4b2" offset="1"/>
- </linearGradient>
- <linearGradient id="d" y2="732.05" gradientUnits="userSpaceOnUse" x2="491.22" gradientTransform="matrix(.093294 0 0 .093294 -35.871 -43.769)" y1="506.65" x1="491.22">
- <stop stop-color="#4e9a06" offset="0"/>
- <stop stop-color="#8ae234" offset="1"/>
- </linearGradient>
- </defs>
- <rect stroke-linejoin="bevel" height="15.003" stroke="url(#c)" fill="url(#a)" style="enable-background:new" fill-rule="evenodd" rx="1.5143" ry="1.5143" width="15.004" stroke-miterlimit="10" y=".49833" x=".49815"/>
- <rect stroke-linejoin="bevel" style="enable-background:new" rx=".50812" ry=".50810" height="13" width="12.997" stroke="#fff" stroke-miterlimit="10" y="1.5016" x="1.5014" fill="none"/>
- <rect style="enable-background:new" fill-rule="evenodd" rx="1.9062" ry="1.9062" height="14" width="14" y="1.0016" x="1.0017" fill="url(#b)"/>
- <path style="block-progression:tb;text-indent:0;color:#000000;enable-background:new;text-transform:none" d="m6.6521 5.3345a0.25002 0.25002 0 0 0 -0.03125 0.03125 0.25002 0.25002 0 0 0 -0.09375 0.0625 0.25002 0.25002 0 0 0 -0.03125 0.0625 0.25002 0.25002 0 0 0 -0.03125 0.09375v2.375a0.25002 0.25002 0 0 0 0.03125 0.09375 0.25002 0.25002 0 0 0 0.0625 0.09375 0.25002 0.25002 0 0 0 0.0625 0.03125 0.25002 0.25002 0 0 0 0.09375 0.03125h0.6875v0.4375h-1.8438-0.21875a0.25002 0.25002 0 0 0 -0.0625 0 0.25002 0.25002 0 0 0 -0.0625 0.03125 0.25002 0.25002 0 0 0 -0.0625 0.03125 0.25002 0.25002 0 0 0 -0.03125 0.0625 0.25002 0.25002 0 0 0 -0.03125 0.0625 0.25002 0.25002 0 0 0 0 0.0625v0.21875 0.90625h-0.71875a0.25002 0.25002 0 0 0 -0.03125 0 0.25002 0.25002 0 0 0 -0.09375 0.03125 0.25002 0.25002 0 0 0 -0.0625 0.0625 0.25002 0.25002 0 0 0 -0.03125 0.03125 0.25002 0.25002 0 0 0 -0.03125 0.125v2.3438a0.25002 0.25002 0 0 0 0.03125 0.09375 0.25002 0.25002 0 0 0 0.0625 0.09375
0.25002 0.25002 0 0 0 0.0625 0.03125 0.25002 0.25002 0 0 0 0.09375 0.03125h2.3438a0.25002 0.25002 0 0 0 0.0625 0 0.25002 0.25002 0 0 0 0.0625 -0.03125 0.25002 0.25002 0 0 0 0.09375 -0.09375 0.25002 0.25002 0 0 0 0.03125 -0.0625 0.25002 0.25002 0 0 0 0 -0.0625v-2.3438a0.25002 0.25002 0 0 0 0 -0.0625 0.25002 0.25002 0 0 0 -0.03125 -0.0625 0.25002 0.25002 0 0 0 -0.09375 -0.09375 0.25002 0.25002 0 0 0 -0.125 -0.03125h-0.65625v-0.40625h3.7188v0.40625h-0.6875a0.25002 0.25002 0 0 0 -0.0625 0 0.25002 0.25002 0 0 0 -0.0625 0.03125 0.25002 0.25002 0 0 0 -0.09375 0.09375 0.25002 0.25002 0 0 0 -0.03125 0.125v2.3438a0.25002 0.25002 0 0 0 0 0.0625 0.25002 0.25002 0 0 0 0 0.03125 0.25002 0.25002 0 0 0 0.03125 0.0625 0.25002 0.25002 0 0 0 0.0625 0.0625 0.25002 0.25002 0 0 0 0.0625 0.03125 0.25002 0.25002 0 0 0 0.0625 0 0.25002 0.25002 0 0 0 0.03125 0h2.3125a0.25002 0.25002 0 0 0 0.0625 0 0.25002 0.25002 0 0 0 0.0625 -0.03125 0.25002 0.25002 0 0 0 0.0625 -0.03125 0.25002 0.25002 0 0 0 0.0312
5 -0.0625 0.25002 0.25002 0 0 0 0.03125 -0.0625 0.25002 0.25002 0 0 0 0 -0.0625v-2.3438a0.25002 0.25002 0 0 0 0 -0.0625 0.25002 0.25002 0 0 0 -0.03125 -0.0625 0.25002 0.25002 0 0 0 -0.09375 -0.09375 0.25002 0.25002 0 0 0 -0.09375 -0.03125 0.25002 0.25002 0 0 0 -0.03125 0h-0.65625v-0.90625-0.21875a0.25002 0.25002 0 0 0 -0.03125 -0.09375 0.25002 0.25002 0 0 0 -0.0625 -0.09375 0.25002 0.25002 0 0 0 -0.0625 -0.03125 0.25002 0.25002 0 0 0 -0.09375 -0.03125h-0.25-1.8438v-0.4375h0.6875a0.25002 0.25002 0 0 0 0.09375 -0.03125 0.25002 0.25002 0 0 0 0.09375 -0.09375 0.25002 0.25002 0 0 0 0.03125 -0.0625 0.25002 0.25002 0 0 0 0.03125 -0.0625v-2.375a0.25002 0.25002 0 0 0 -0.03125 -0.09375 0.25002 0.25002 0 0 0 -0.09375 -0.09375 0.25002 0.25002 0 0 0 -0.0625 -0.03125 0.25002 0.25002 0 0 0 -0.0625 -0.03125h-2.375a0.25002 0.25002 0 0 0 -0.0625 0z" display="block" fill="#fff"/>
- <path style="block-progression:tb;text-indent:0;color:#000000;enable-background:new;text-transform:none" d="m6.7039 4.3041a0.25002 0.25002 0 0 0 -0.03125 0.03125 0.25002 0.25002 0 0 0 -0.09375 0.0625 0.25002 0.25002 0 0 0 -0.03125 0.0625 0.25002 0.25002 0 0 0 -0.03125 0.09375v2.375a0.25002 0.25002 0 0 0 0.03125 0.09375 0.25002 0.25002 0 0 0 0.0625 0.09375 0.25002 0.25002 0 0 0 0.0625 0.03125 0.25002 0.25002 0 0 0 0.09375 0.03125h0.6875v0.4375h-1.8438-0.21875a0.25002 0.25002 0 0 0 -0.0625 0 0.25002 0.25002 0 0 0 -0.0625 0.03125 0.25002 0.25002 0 0 0 -0.0625 0.03125 0.25002 0.25002 0 0 0 -0.03125 0.0625 0.25002 0.25002 0 0 0 -0.03125 0.0625 0.25002 0.25002 0 0 0 0 0.0625v0.21875 0.90625h-0.71875a0.25002 0.25002 0 0 0 -0.03125 0 0.25002 0.25002 0 0 0 -0.09375 0.03125 0.25002 0.25002 0 0 0 -0.0625 0.0625 0.25002 0.25002 0 0 0 -0.03125 0.03125 0.25002 0.25002 0 0 0 -0.03125 0.125v2.3437a0.25002 0.25002 0 0 0 0.03125 0.09375 0.25002 0.25002 0 0 0 0.0625 0.09375
0.25002 0.25002 0 0 0 0.0625 0.03125 0.25002 0.25002 0 0 0 0.09375 0.03125h2.3438a0.25002 0.25002 0 0 0 0.0625 0 0.25002 0.25002 0 0 0 0.0625 -0.03125 0.25002 0.25002 0 0 0 0.09375 -0.09375 0.25002 0.25002 0 0 0 0.03125 -0.0625 0.25002 0.25002 0 0 0 0 -0.0625v-2.3437a0.25002 0.25002 0 0 0 0 -0.0625 0.25002 0.25002 0 0 0 -0.03125 -0.0625 0.25002 0.25002 0 0 0 -0.09375 -0.09375 0.25002 0.25002 0 0 0 -0.125 -0.03125h-0.65625v-0.40625h3.7188v0.40625h-0.6875a0.25002 0.25002 0 0 0 -0.0625 0 0.25002 0.25002 0 0 0 -0.0625 0.03125 0.25002 0.25002 0 0 0 -0.09375 0.09375 0.25002 0.25002 0 0 0 -0.03125 0.125v2.3437a0.25002 0.25002 0 0 0 0 0.0625 0.25002 0.25002 0 0 0 0 0.03125 0.25002 0.25002 0 0 0 0.03125 0.0625 0.25002 0.25002 0 0 0 0.0625 0.0625 0.25002 0.25002 0 0 0 0.0625 0.03125 0.25002 0.25002 0 0 0 0.0625 0 0.25002 0.25002 0 0 0 0.03125 0h2.3125a0.25002 0.25002 0 0 0 0.0625 0 0.25002 0.25002 0 0 0 0.0625 -0.03125 0.25002 0.25002 0 0 0 0.0625 -0.03125 0.25002 0.25002 0 0 0 0.0312
5 -0.0625 0.25002 0.25002 0 0 0 0.03125 -0.0625 0.25002 0.25002 0 0 0 0 -0.0625v-2.3437a0.25002 0.25002 0 0 0 0 -0.0625 0.25002 0.25002 0 0 0 -0.03125 -0.0625 0.25002 0.25002 0 0 0 -0.09375 -0.09375 0.25002 0.25002 0 0 0 -0.09375 -0.03125 0.25002 0.25002 0 0 0 -0.03125 0h-0.65625v-0.90625-0.21875a0.25002 0.25002 0 0 0 -0.03125 -0.09375 0.25002 0.25002 0 0 0 -0.0625 -0.09375 0.25002 0.25002 0 0 0 -0.0625 -0.03125 0.25002 0.25002 0 0 0 -0.09375 -0.03125h-0.25-1.8438v-0.4375h0.6875a0.25002 0.25002 0 0 0 0.09375 -0.03125 0.25002 0.25002 0 0 0 0.09375 -0.09375 0.25002 0.25002 0 0 0 0.03125 -0.0625 0.25002 0.25002 0 0 0 0.03125 -0.0625v-2.375a0.25002 0.25002 0 0 0 -0.03125 -0.09375 0.25002 0.25002 0 0 0 -0.09375 -0.09375 0.25002 0.25002 0 0 0 -0.0625 -0.03125 0.25002 0.25002 0 0 0 -0.0625 -0.03125h-2.375a0.25002 0.25002 0 0 0 -0.0625 0z" display="block" fill="url(#d)"/>
-</svg>
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceImagesgtkSourceCodesvg"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Images/gtk/SourceCode.svg (183670 => 183671)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Images/gtk/SourceCode.svg 2015-05-01 11:40:11 UTC (rev 183670)
+++ trunk/Source/WebInspectorUI/UserInterface/Images/gtk/SourceCode.svg 2015-05-01 14:24:17 UTC (rev 183671)
</span><span class="lines">@@ -1,29 +0,0 @@
</span><del>-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Licensed under the Creative Commons Attribution-Share Alike 3.0 United States License (http://creativecommons.org/licenses/by-sa/3.0/) -->
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 16 16">
- <defs>
- <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="51.5" cx="301" gradientTransform="matrix(.97063 1.9684e-8 0 .28611 -291.16 -14.63)" r="19.5">
- <stop stop-color="#fff" offset="0"/>
- <stop stop-color="#fff" stop-opacity="0" offset="1"/>
- </radialGradient>
- <radialGradient id="a" gradientUnits="userSpaceOnUse" cy="35.878" cx="24.446" gradientTransform="matrix(.85696 3.2529e-7 -1.253e-7 .33010 -12.949 .77181)" r="20.531">
- <stop stop-color="#fff" offset="0"/>
- <stop stop-color="#dcdcdc" offset="1"/>
- </radialGradient>
- <linearGradient id="c" y2="118.5" gradientUnits="userSpaceOnUse" x2="311.65" gradientTransform="matrix(.55569 0 0 .55568 -169.27 -70.906)" y1="145.52" x1="321.57">
- <stop stop-color="#9b9b9b" offset="0"/>
- <stop stop-color="#d3d7cf" offset="1"/>
- </linearGradient>
- <linearGradient id="d" y2="732.05" gradientUnits="userSpaceOnUse" x2="491.22" gradientTransform="matrix(.093294 0 0 .093294 -35.871 -43.769)" y1="506.65" x1="491.22">
- <stop stop-color="#888a85" offset="0"/>
- <stop stop-color="#d3d7cf" offset="1"/>
- </linearGradient>
- </defs>
- <g>
- <rect stroke-linejoin="bevel" height="15.003" stroke="url(#c)" fill="url(#a)" style="enable-background:new" fill-rule="evenodd" rx="1.5143" ry="1.5143" width="15.004" stroke-miterlimit="10" y=".49833" x=".49815"/>
- <rect stroke-linejoin="bevel" style="enable-background:new" rx=".50812" ry=".50810" height="13" width="12.997" stroke="#fff" stroke-miterlimit="10" y="1.5016" x="1.5014" fill="none"/>
- <rect style="enable-background:new" fill-rule="evenodd" rx="1.9062" ry="1.9062" height="14" width="14" y="1.0016" x="1.0017" fill="url(#b)"/>
- <path style="color:#000000;enable-background:new" d="m4.8249 5.5063a0.25002 0.25002 0 0 0 -0.0625 0.0625 0.25002 0.25002 0 0 0 -0.03125 0.0625 0.25002 0.25002 0 0 0 -0.03125 0.125v1.3125a0.25002 0.25002 0 0 0 0 0.0625 0.25002 0.25002 0 0 0 0.0625 0.125 0.25002 0.25002 0 0 0 0.03125 0.03125 0.25002 0.25002 0 0 0 0.0625 0.03125 0.25002 0.25002 0 0 0 0.0625 0 0.25002 0.25002 0 0 0 0.03125 0h5.875a0.25002 0.25002 0 0 0 0.09375 -0.03125 0.25002 0.25002 0 0 0 0.0625 -0.03125 0.25002 0.25002 0 0 0 0.03125 -0.03125 0.25002 0.25002 0 0 0 0.03125 -0.03125 0.25002 0.25002 0 0 0 0.03125 -0.09375 0.25002 0.25002 0 0 0 0 -0.03125v-1.3125a0.25002 0.25002 0 0 0 0 -0.0625 0.25002 0.25002 0 0 0 -0.09375 -0.125 0.25002 0.25002 0 0 0 -0.0625 -0.03125 0.25002 0.25002 0 0 0 -0.09375 -0.03125h-5.875a0.25002 0.25002 0 0 0 -0.0625 0 0.25002 0.25002 0 0 0 -0.03125 0 0.25002 0.25002 0 0 0 -0.03125 0zm0 2.6875a0.25002 0.25002 0 0 0 -0.0625 0.0625 0.25002 0.25002 0 0 0 -0.03125 0.062
5 0.25002 0.25002 0 0 0 -0.03125 0.125v1.3125a0.25002 0.25002 0 0 0 0 0.0625 0.25002 0.25002 0 0 0 0.0625 0.125 0.25002 0.25002 0 0 0 0.03125 0.03125 0.25002 0.25002 0 0 0 0.0625 0.03125 0.25002 0.25002 0 0 0 0.0625 0 0.25002 0.25002 0 0 0 0.03125 0h5.875a0.25002 0.25002 0 0 0 0.09375 -0.03125 0.25002 0.25002 0 0 0 0.0625 -0.03125 0.25002 0.25002 0 0 0 0.03125 -0.03125 0.25002 0.25002 0 0 0 0.03125 -0.03125 0.25002 0.25002 0 0 0 0.03125 -0.09375 0.25002 0.25002 0 0 0 0 -0.03125v-1.3125a0.25002 0.25002 0 0 0 0 -0.0625 0.25002 0.25002 0 0 0 -0.09375 -0.125 0.25002 0.25002 0 0 0 -0.0625 -0.03125 0.25002 0.25002 0 0 0 -0.09375 -0.03125h-5.875a0.25002 0.25002 0 0 0 -0.0625 0 0.25002 0.25002 0 0 0 -0.03125 0 0.25002 0.25002 0 0 0 -0.03125 0zm0 2.6875a0.25002 0.25002 0 0 0 -0.0625 0.0625 0.25002 0.25002 0 0 0 -0.03125 0.0625 0.25002 0.25002 0 0 0 -0.03125 0.125v1.3125a0.25002 0.25002 0 0 0 0 0.0625 0.25002 0.25002 0 0 0 0.0625 0.125 0.25002 0.25002 0 0 0 0.03125 0.03125 0.25002 0.2
5002 0 0 0 0.0625 0.03125 0.25002 0.25002 0 0 0 0.0625 0 0.25002 0.25002 0 0 0 0.03125 0h5.875a0.25002 0.25002 0 0 0 0.09375 -0.03125 0.25002 0.25002 0 0 0 0.0625 -0.03125 0.25002 0.25002 0 0 0 0.03125 -0.03125 0.25002 0.25002 0 0 0 0.03125 -0.03125 0.25002 0.25002 0 0 0 0.03125 -0.09375 0.25002 0.25002 0 0 0 0 -0.03125v-1.3125a0.25002 0.25002 0 0 0 0 -0.0625 0.25002 0.25002 0 0 0 -0.09375 -0.125 0.25002 0.25002 0 0 0 -0.0625 -0.03125 0.25002 0.25002 0 0 0 -0.09375 -0.03125h-5.875a0.25002 0.25002 0 0 0 -0.0625 0 0.25002 0.25002 0 0 0 -0.03125 0 0.25002 0.25002 0 0 0 -0.03125 0z" display="block" fill="#fff"/>
- <path style="color:#000000;enable-background:new" d="m4.8767 4.476a0.25002 0.25002 0 0 0 -0.0625 0.0625 0.25002 0.25002 0 0 0 -0.03125 0.0625 0.25002 0.25002 0 0 0 -0.03125 0.125v1.3125a0.25002 0.25002 0 0 0 0 0.0625 0.25002 0.25002 0 0 0 0.0625 0.125 0.25002 0.25002 0 0 0 0.03125 0.03125 0.25002 0.25002 0 0 0 0.0625 0.03125 0.25002 0.25002 0 0 0 0.0625 0 0.25002 0.25002 0 0 0 0.03125 0h5.875a0.25002 0.25002 0 0 0 0.09375 -0.03125 0.25002 0.25002 0 0 0 0.0625 -0.03125 0.25002 0.25002 0 0 0 0.03125 -0.03125 0.25002 0.25002 0 0 0 0.03125 -0.03125 0.25002 0.25002 0 0 0 0.03125 -0.09375 0.25002 0.25002 0 0 0 0 -0.03125v-1.3125a0.25002 0.25002 0 0 0 0 -0.0625 0.25002 0.25002 0 0 0 -0.09375 -0.125 0.25002 0.25002 0 0 0 -0.0625 -0.03125 0.25002 0.25002 0 0 0 -0.09375 -0.03125h-5.875a0.25002 0.25002 0 0 0 -0.0625 0 0.25002 0.25002 0 0 0 -0.03125 0 0.25002 0.25002 0 0 0 -0.03125 0zm0 2.6875a0.25002 0.25002 0 0 0 -0.0625 0.0625 0.25002 0.25002 0 0 0 -0.03125 0.0625
0.25002 0.25002 0 0 0 -0.03125 0.125v1.3125a0.25002 0.25002 0 0 0 0 0.0625 0.25002 0.25002 0 0 0 0.0625 0.125 0.25002 0.25002 0 0 0 0.03125 0.03125 0.25002 0.25002 0 0 0 0.0625 0.03125 0.25002 0.25002 0 0 0 0.0625 0 0.25002 0.25002 0 0 0 0.03125 0h5.875a0.25002 0.25002 0 0 0 0.09375 -0.03125 0.25002 0.25002 0 0 0 0.0625 -0.03125 0.25002 0.25002 0 0 0 0.03125 -0.03125 0.25002 0.25002 0 0 0 0.03125 -0.03125 0.25002 0.25002 0 0 0 0.03125 -0.09375 0.25002 0.25002 0 0 0 0 -0.03125v-1.3125a0.25002 0.25002 0 0 0 0 -0.0625 0.25002 0.25002 0 0 0 -0.09375 -0.125 0.25002 0.25002 0 0 0 -0.0625 -0.03125 0.25002 0.25002 0 0 0 -0.09375 -0.03125h-5.875a0.25002 0.25002 0 0 0 -0.0625 0 0.25002 0.25002 0 0 0 -0.03125 0 0.25002 0.25002 0 0 0 -0.03125 0zm0 2.6875a0.25002 0.25002 0 0 0 -0.0625 0.0625 0.25002 0.25002 0 0 0 -0.03125 0.0625 0.25002 0.25002 0 0 0 -0.03125 0.125v1.3125a0.25002 0.25002 0 0 0 0 0.0625 0.25002 0.25002 0 0 0 0.0625 0.125 0.25002 0.25002 0 0 0 0.03125 0.03125 0.25002 0.25
002 0 0 0 0.0625 0.03125 0.25002 0.25002 0 0 0 0.0625 0 0.25002 0.25002 0 0 0 0.03125 0h5.875a0.25002 0.25002 0 0 0 0.09375 -0.03125 0.25002 0.25002 0 0 0 0.0625 -0.03125 0.25002 0.25002 0 0 0 0.03125 -0.03125 0.25002 0.25002 0 0 0 0.03125 -0.03125 0.25002 0.25002 0 0 0 0.03125 -0.09375 0.25002 0.25002 0 0 0 0 -0.03125v-1.3125a0.25002 0.25002 0 0 0 0 -0.0625 0.25002 0.25002 0 0 0 -0.09375 -0.125 0.25002 0.25002 0 0 0 -0.0625 -0.03125 0.25002 0.25002 0 0 0 -0.09375 -0.03125h-5.875a0.25002 0.25002 0 0 0 -0.0625 0 0.25002 0.25002 0 0 0 -0.03125 0 0.25002 0.25002 0 0 0 -0.03125 0z" display="block" fill="url(#d)"/>
- </g>
-</svg>
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceMainhtml"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Main.html (183670 => 183671)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Main.html 2015-05-01 11:40:11 UTC (rev 183670)
+++ trunk/Source/WebInspectorUI/UserInterface/Main.html 2015-05-01 14:24:17 UTC (rev 183671)
</span><span class="lines">@@ -426,7 +426,6 @@
</span><span class="cx"> <script src="Views/FlexibleSpaceNavigationItem.js"></script>
</span><span class="cx"> <script src="Views/FontResourceContentView.js"></script>
</span><span class="cx"> <script src="Views/FormattedValue.js"></script>
</span><del>- <script src="Views/FrameContentView.js"></script>
</del><span class="cx"> <script src="Views/FrameDOMTreeContentView.js"></script>
</span><span class="cx"> <script src="Views/FrameTreeElement.js"></script>
</span><span class="cx"> <script src="Views/GeneralTreeElementPathComponent.js"></script>
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsFrameContentViewjs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Views/FrameContentView.js (183670 => 183671)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/FrameContentView.js 2015-05-01 11:40:11 UTC (rev 183670)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/FrameContentView.js 2015-05-01 14:24:17 UTC (rev 183671)
</span><span class="lines">@@ -1,195 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 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.FrameContentView = function(frame)
-{
- WebInspector.ClusterContentView.call(this, frame);
-
- this._frame = frame;
-
- function createPathComponent(displayName, className, identifier)
- {
- var pathComponent = new WebInspector.HierarchicalPathComponent(displayName, className, identifier, false, true);
- pathComponent.addEventListener(WebInspector.HierarchicalPathComponent.Event.SiblingWasSelected, this._pathComponentSelected, this);
- return pathComponent;
- }
-
- this._sourceCodePathComponent = createPathComponent.call(this, WebInspector.UIString("Source Code"), WebInspector.FrameContentView.SourceCodeIconStyleClassName, WebInspector.FrameContentView.SourceCodeIdentifier);
- this._domTreePathComponent = createPathComponent.call(this, WebInspector.UIString("DOM Tree"), WebInspector.FrameContentView.DOMTreeIconStyleClassName, WebInspector.FrameContentView.DOMTreeIdentifier);
-
- this._sourceCodePathComponent.nextSibling = this._domTreePathComponent;
- this._domTreePathComponent.previousSibling = this._sourceCodePathComponent;
-
- this.element.classList.add(WebInspector.FrameContentView.StyleClassName);
-
- this._currentContentViewSetting = new WebInspector.Setting("frame-current-view-" + this._frame.url.hash, WebInspector.FrameContentView.DOMTreeIdentifier);
-};
-
-WebInspector.FrameContentView.StyleClassName = "frame";
-WebInspector.FrameContentView.SourceCodeIconStyleClassName = "source-code-icon";
-WebInspector.FrameContentView.SourceCodeIdentifier = "source-code";
-WebInspector.FrameContentView.DOMTreeIconStyleClassName = "dom-tree-icon";
-WebInspector.FrameContentView.DOMTreeIdentifier = "dom-tree";
-
-WebInspector.FrameContentView.prototype = {
- constructor: WebInspector.FrameContentView,
-
- // Public
-
- get frame()
- {
- return this._frame;
- },
-
- get selectionPathComponents()
- {
- if (!this._contentViewContainer.currentContentView)
- return [];
-
- // Append the current view's path components to the path component representing the current view.
- var components = [this._pathComponentForContentView(this._contentViewContainer.currentContentView)];
- return components.concat(this._contentViewContainer.currentContentView.selectionPathComponents);
- },
-
- shown: function()
- {
- WebInspector.ClusterContentView.prototype.shown.call(this);
-
- if (this._shownInitialContent)
- return;
-
- this._showContentViewForIdentifier(this._currentContentViewSetting.value);
- },
-
- closed: function()
- {
- WebInspector.ClusterContentView.prototype.closed.call(this);
-
- this._shownInitialContent = false;
- },
-
- saveToCookie: function(cookie)
- {
- cookie.type = WebInspector.ContentViewCookieType.Resource;
- cookie.subview = this._currentContentViewSetting.value;
- if (!this.representedObject.isMainFrame())
- cookie.url = this.representedObject.url;
- },
-
- restoreFromCookie: function(cookie)
- {
- var shownView = this._showContentViewForIdentifier(cookie.subview);
- if ("lineNumber" in cookie && "columnNumber" in cookie)
- this.showSourceCode(new WebInspector.SourceCodePosition(cookie.lineNumber, cookie.columnNumber));
- },
-
- showResource: function()
- {
- this._shownInitialContent = true;
-
- return this._showContentViewForIdentifier(WebInspector.FrameContentView.SourceCodeIdentifier);
- },
-
- showSourceCode: function(positionToReveal, textRangeToSelect, forceUnformatted)
- {
- var resourceContentView = this.showResource();
- console.assert(resourceContentView instanceof WebInspector.ResourceClusterContentView);
- if (!resourceContentView)
- return null;
-
- return resourceContentView.showResponse(positionToReveal, textRangeToSelect, forceUnformatted);
- },
-
- showDOMTree: function(domNodeToSelect, preventFocusChange)
- {
- this._shownInitialContent = true;
-
- var domTreeContentView = this._showContentViewForIdentifier(WebInspector.FrameContentView.DOMTreeIdentifier);
- console.assert(domTreeContentView);
- if (!domTreeContentView || !domNodeToSelect)
- return null;
-
- domTreeContentView.selectAndRevealDOMNode(domNodeToSelect, preventFocusChange);
-
- return domTreeContentView;
- },
-
- // Private
-
- _pathComponentForContentView: function(contentView)
- {
- console.assert(contentView);
- if (!contentView)
- return null;
- if (contentView.representedObject instanceof WebInspector.Resource)
- return this._sourceCodePathComponent;
- if (contentView.representedObject instanceof WebInspector.DOMTree)
- return this._domTreePathComponent;
- console.error("Unknown contentView.");
- return null;
- },
-
- _identifierForContentView: function(contentView)
- {
- console.assert(contentView);
- if (!contentView)
- return null;
- if (contentView.representedObject instanceof WebInspector.Resource)
- return WebInspector.FrameContentView.SourceCodeIdentifier;
- if (contentView.representedObject instanceof WebInspector.DOMTree)
- return WebInspector.FrameContentView.DOMTreeIdentifier;
- console.error("Unknown contentView.");
- return null;
- },
-
- _showContentViewForIdentifier: function(identifier)
- {
- var representedObjectToShow = null;
-
- switch (identifier) {
- case WebInspector.FrameContentView.SourceCodeIdentifier:
- representedObjectToShow = this._frame.mainResource;
- break;
- case WebInspector.FrameContentView.DOMTreeIdentifier:
- representedObjectToShow = this._frame.domTree;
- break;
- }
-
- console.assert(representedObjectToShow);
- if (!representedObjectToShow)
- return null;
-
- this._currentContentViewSetting.value = identifier;
-
- return this.contentViewContainer.showContentViewForRepresentedObject(representedObjectToShow);
- },
-
- _pathComponentSelected: function(event)
- {
- this._showContentViewForIdentifier(event.data.pathComponent.representedObject);
- }
-};
-
-WebInspector.FrameContentView.prototype.__proto__ = WebInspector.ClusterContentView.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsPathComponentIconscss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/PathComponentIcons.css (183670 => 183671)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/PathComponentIcons.css 2015-05-01 11:40:11 UTC (rev 183670)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/PathComponentIcons.css 2015-05-01 14:24:17 UTC (rev 183671)
</span><span class="lines">@@ -23,14 +23,6 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-.source-code-icon .icon {
- content: url(../Images/SourceCode.svg);
-}
-
-.dom-tree-icon .icon {
- content: url(../Images/DOMTree.svg);
-}
-
</del><span class="cx"> .request-icon .icon {
</span><span class="cx"> content: url(../Images/Request.svg);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsResourceSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js (183670 => 183671)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js 2015-05-01 11:40:11 UTC (rev 183670)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js 2015-05-01 14:24:17 UTC (rev 183671)
</span><span class="lines">@@ -179,20 +179,13 @@
</span><span class="cx">
</span><span class="cx"> _mainFrameMainResourceDidChange(event)
</span><span class="cx"> {
</span><del>- var wasShowingResourceSidebar = this.selected;
- var currentContentView = this.contentBrowser.currentContentView;
- var wasShowingResourceContentView = currentContentView instanceof WebInspector.ResourceContentView
- || currentContentView instanceof WebInspector.ResourceClusterContentView
- || currentContentView instanceof WebInspector.FrameContentView
- || currentContentView instanceof WebInspector.ScriptContentView;
-
</del><span class="cx"> this.contentBrowser.contentViewContainer.closeAllContentViews();
</span><span class="cx">
</span><span class="cx"> function delayedWork()
</span><span class="cx"> {
</span><del>- // Show the main frame since there is no content view showing or we were showing a resource before.
</del><ins>+ // Show the main frame since there is no content view showing.
</ins><span class="cx"> // Cookie restoration will attempt to re-select the resource we were showing.
</span><del>- if (!this.contentBrowser.currentContentView || wasShowingResourceContentView) {
</del><ins>+ if (!this.contentBrowser.currentContentView) {
</ins><span class="cx"> // NOTE: This selection, during provisional loading, won't be saved, so it is
</span><span class="cx"> // safe to do and not-clobber cookie restoration.
</span><span class="cx"> this.showDefaultContentViewForTreeElement(this._mainFrameTreeElement);
</span></span></pre>
</div>
</div>
</body>
</html>