<!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>[183328] 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/183328">183328</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-04-25 18:19:08 -0700 (Sat, 25 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Remove time and weight from the dashboard
https://bugs.webkit.org/show_bug.cgi?id=144063
These two items were the odd ones out since they are only available
when recording a timeline. We will need the toolbar space soon, so make
this lets us make the dashboard skinnier.
This also removes the exception catching in DashboardContainerView. It doesn't really
help us and it makes debugging an exception harder.
Reviewed by Joseph Pecoraro.
* UserInterface/Views/DashboardContainerView.css:
(.toolbar .dashboard-container):
* UserInterface/Views/DashboardContainerView.js:
(WebInspector.DashboardContainerView.prototype._dashboardViewForRepresentedObject):
* UserInterface/Views/DefaultDashboardView.css:
(body.web .toolbar.collapsed .dashboard.default > .item.resourcesCount):
(body.javascript .toolbar .dashboard.default > .item.resourcesCount):
* UserInterface/Views/DefaultDashboardView.js:
(WebInspector.DefaultDashboardView):
(WebInspector.DefaultDashboardView.prototype._updateDisplay):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsDefaultDashboardjs">trunk/Source/WebInspectorUI/UserInterface/Models/DefaultDashboard.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDashboardContainerViewcss">trunk/Source/WebInspectorUI/UserInterface/Views/DashboardContainerView.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDashboardContainerViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/DashboardContainerView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDefaultDashboardViewcss">trunk/Source/WebInspectorUI/UserInterface/Views/DefaultDashboardView.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDefaultDashboardViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/DefaultDashboardView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (183327 => 183328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-04-26 01:18:35 UTC (rev 183327)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-04-26 01:19:08 UTC (rev 183328)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2015-04-22 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Remove time and weight from the dashboard
+ https://bugs.webkit.org/show_bug.cgi?id=144063
+
+ These two items were the odd ones out since they are only available
+ when recording a timeline. We will need the toolbar space soon, so make
+ this lets us make the dashboard skinnier.
+
+ This also removes the exception catching in DashboardContainerView. It doesn't really
+ help us and it makes debugging an exception harder.
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Views/DashboardContainerView.css:
+ (.toolbar .dashboard-container):
+ * UserInterface/Views/DashboardContainerView.js:
+ (WebInspector.DashboardContainerView.prototype._dashboardViewForRepresentedObject):
+ * UserInterface/Views/DefaultDashboardView.css:
+ (body.web .toolbar.collapsed .dashboard.default > .item.resourcesCount):
+ (body.javascript .toolbar .dashboard.default > .item.resourcesCount):
+ * UserInterface/Views/DefaultDashboardView.js:
+ (WebInspector.DefaultDashboardView):
+ (WebInspector.DefaultDashboardView.prototype._updateDisplay):
+
+2015-04-22 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Web Inspector: Remove sidebar panel shortcut and image
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=144061
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsDefaultDashboardjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/DefaultDashboard.js (183327 => 183328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/DefaultDashboard.js 2015-04-26 01:18:35 UTC (rev 183327)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/DefaultDashboard.js 2015-04-26 01:19:08 UTC (rev 183328)
</span><span class="lines">@@ -31,10 +31,6 @@
</span><span class="cx">
</span><span class="cx"> this._waitingForFirstMainResourceToStartTrackingSize = true;
</span><span class="cx">
</span><del>- // Necessary event required to track page load time and resource sizes.
- WebInspector.Frame.addEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._mainResourceDidChange, this);
- WebInspector.timelineManager.addEventListener(WebInspector.TimelineManager.Event.CapturingStopped, this._capturingStopped, this);
-
</del><span class="cx"> // Necessary events required to track load of resources.
</span><span class="cx"> WebInspector.Frame.addEventListener(WebInspector.Frame.Event.ResourceWasAdded, this._resourceWasAdded, this);
</span><span class="cx"> WebInspector.frameResourceManager.addEventListener(WebInspector.FrameResourceManager.Event.FrameWasAdded, this._frameWasAdded, this);
</span><span class="lines">@@ -47,8 +43,6 @@
</span><span class="cx"> logManager.addEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, this._consoleMessageWasRepeated, this);
</span><span class="cx">
</span><span class="cx"> this._resourcesCount = 0;
</span><del>- this._resourcesSize = 0;
- this._time = 0;
</del><span class="cx"> this._logs = 0;
</span><span class="cx"> this._errors = 0;
</span><span class="cx"> this._issues = 0;
</span><span class="lines">@@ -67,28 +61,6 @@
</span><span class="cx"> this._dataDidChange();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- get resourcesSize()
- {
- return this._resourcesSize;
- }
-
- set resourcesSize(value)
- {
- this._resourcesSize = value;
- this._dataDidChange();
- }
-
- get time()
- {
- return this._time;
- }
-
- set time(value)
- {
- this._time = value;
- this._dataDidChange();
- }
-
</del><span class="cx"> get logs()
</span><span class="cx"> {
</span><span class="cx"> return this._logs;
</span><span class="lines">@@ -129,38 +101,6 @@
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.DefaultDashboard.Event.DataDidChange);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _mainResourceDidChange(event)
- {
- console.assert(event.target instanceof WebInspector.Frame);
-
- if (!event.target.isMainFrame())
- return;
-
- this._resourcesCount = 1;
- this._resourcesSize = WebInspector.frameResourceManager.mainFrame.mainResource.size || 0;
-
- // Only update the time if we are recording the timeline.
- if (!WebInspector.timelineManager.isCapturing()) {
- this._time = 0;
- return;
- }
-
- // We should only track resource sizes on fresh loads.
- if (this._waitingForFirstMainResourceToStartTrackingSize) {
- delete this._waitingForFirstMainResourceToStartTrackingSize;
- WebInspector.Resource.addEventListener(WebInspector.Resource.Event.SizeDidChange, this._resourceSizeDidChange, this);
- }
-
- this._dataDidChange();
- this._startUpdatingTime();
- }
-
- _capturingStopped(event)
- {
- // If recording stops, we should stop the timer if it hasn't stopped already.
- this._stopUpdatingTime();
- }
-
</del><span class="cx"> _resourceWasAdded(event)
</span><span class="cx"> {
</span><span class="cx"> ++this.resourcesCount;
</span><span class="lines">@@ -176,59 +116,6 @@
</span><span class="cx"> this.resourcesSize += event.target.size - event.data.previousSize;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _startUpdatingTime()
- {
- this._stopUpdatingTime();
-
- this.time = 0;
-
- this._timelineBaseTime = Date.now();
- this._timeIntervalDelay = 50;
- this._timeIntervalIdentifier = setInterval(this._updateTime.bind(this), this._timeIntervalDelay);
- }
-
- _stopUpdatingTime()
- {
- if (!this._timeIntervalIdentifier)
- return;
-
- clearInterval(this._timeIntervalIdentifier);
- delete this._timeIntervalIdentifier;
- }
-
- _updateTime()
- {
- var duration = Date.now() - this._timelineBaseTime;
-
- var timeIntervalDelay = this._timeIntervalDelay;
- if (duration >= 1000) // 1 second
- timeIntervalDelay = 100;
- else if (duration >= 60000) // 60 seconds
- timeIntervalDelay = 1000;
- else if (duration >= 3600000) // 1 minute
- timeIntervalDelay = 10000;
-
- if (timeIntervalDelay !== this._timeIntervalDelay) {
- this._timeIntervalDelay = timeIntervalDelay;
-
- clearInterval(this._timeIntervalIdentifier);
- this._timeIntervalIdentifier = setInterval(this._updateTime.bind(this), this._timeIntervalDelay);
- }
-
- var mainFrame = WebInspector.frameResourceManager.mainFrame;
- var mainFrameStartTime = mainFrame.mainResource.firstTimestamp;
- var mainFrameLoadEventTime = mainFrame.loadEventTimestamp;
-
- if (isNaN(mainFrameStartTime) || isNaN(mainFrameLoadEventTime)) {
- this.time = duration / 1000;
- return;
- }
-
- this.time = mainFrameLoadEventTime - mainFrameStartTime;
-
- this._stopUpdatingTime();
- }
-
</del><span class="cx"> _consoleMessageAdded(event)
</span><span class="cx"> {
</span><span class="cx"> var message = event.data.message;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDashboardContainerViewcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DashboardContainerView.css (183327 => 183328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DashboardContainerView.css 2015-04-26 01:18:35 UTC (rev 183327)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DashboardContainerView.css 2015-04-26 01:19:08 UTC (rev 183328)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> .toolbar .dashboard-container {
</span><span class="cx"> position: relative;
</span><span class="cx">
</span><del>- width: 375px;
</del><ins>+ width: 225px;
</ins><span class="cx">
</span><span class="cx"> border-radius: 4px;
</span><span class="cx"> background-color: rgb(252, 252, 252);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDashboardContainerViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DashboardContainerView.js (183327 => 183328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DashboardContainerView.js 2015-04-26 01:18:35 UTC (rev 183327)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DashboardContainerView.js 2015-04-26 01:19:08 UTC (rev 183328)
</span><span class="lines">@@ -136,13 +136,12 @@
</span><span class="cx"> if (onlyReturnExistingViews)
</span><span class="cx"> return null;
</span><span class="cx">
</span><del>- try {
- // No existing content view found, make a new one.
- dashboardView = WebInspector.DashboardView.create(representedObject);
- } catch (e) {
- console.error(e, e.stack);
</del><ins>+ // No existing content view found, make a new one.
+ dashboardView = WebInspector.DashboardView.create(representedObject);
+
+ console.assert(dashboardView, "Unknown representedObject", representedObject);
+ if (!dashboardView)
</ins><span class="cx"> return null;
</span><del>- }
</del><span class="cx">
</span><span class="cx"> this._dashboardStack.push(dashboardView);
</span><span class="cx"> this._toolbarItem.element.appendChild(dashboardView.element);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDefaultDashboardViewcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DefaultDashboardView.css (183327 => 183328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DefaultDashboardView.css 2015-04-26 01:18:35 UTC (rev 183327)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DefaultDashboardView.css 2015-04-26 01:19:08 UTC (rev 183328)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,11 +23,11 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-body.web .toolbar.collapsed .dashboard.default > :matches(.time, .resourcesSize, .logs) {
</del><ins>+body.web .toolbar.collapsed .dashboard.default > .item.resourcesCount {
</ins><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.javascript .toolbar .dashboard.default > :matches(.time, .resourcesSize, .resourcesCount) {
</del><ins>+body.javascript .toolbar .dashboard.default > .item.resourcesCount {
</ins><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -58,11 +58,6 @@
</span><span class="cx"> font-weight: bold;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.toolbar .dashboard.default > .time,
-.toolbar .dashboard.default > .resourcesSize {
- min-width: 70px;
-}
-
</del><span class="cx"> .toolbar .dashboard.default > .item.enabled:hover {
</span><span class="cx"> border: 1px solid rgba(0, 0, 0, 0.1);
</span><span class="cx"> }
</span><span class="lines">@@ -111,18 +106,10 @@
</span><span class="cx"> content: url(../Images/Resources.svg);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.toolbar .dashboard.default > .time > img {
- content: url(../Images/Time.svg);
-}
-
</del><span class="cx"> .toolbar .dashboard.default > .logs > img {
</span><span class="cx"> content: url(../Images/Logs.svg);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.toolbar .dashboard.default > .resourcesSize > img {
- content: url(../Images/Weight.svg);
-}
-
</del><span class="cx"> .toolbar .dashboard.default > .errors > img {
</span><span class="cx"> content: url(../Images/Errors.svg);
</span><span class="cx"> }
</span><span class="lines">@@ -136,18 +123,10 @@
</span><span class="cx"> content: url(../Images/Legacy/Resources.svg);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.mac-platform.legacy .toolbar .dashboard.default > .time > img {
- content: url(../Images/Legacy/Time.svg);
-}
-
</del><span class="cx"> body.mac-platform.legacy .toolbar .dashboard.default > .logs > img {
</span><span class="cx"> content: url(../Images/Legacy/Logs.svg);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.mac-platform.legacy .toolbar .dashboard.default > .resourcesSize > img {
- content: url(../Images/Legacy/Weight.svg);
-}
-
</del><span class="cx"> body.mac-platform.legacy .toolbar .dashboard.default > .errors > img {
</span><span class="cx"> content: url(../Images/Legacy/Errors.svg);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDefaultDashboardViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DefaultDashboardView.js (183327 => 183328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DefaultDashboardView.js 2015-04-26 01:18:35 UTC (rev 183327)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DefaultDashboardView.js 2015-04-26 01:19:08 UTC (rev 183328)
</span><span class="lines">@@ -36,14 +36,6 @@
</span><span class="cx"> tooltip: WebInspector.UIString("Total number of resources, click to show the Resources navigation sidebar"),
</span><span class="cx"> handler: this._resourcesWasClicked
</span><span class="cx"> },
</span><del>- resourcesSize: {
- tooltip: WebInspector.UIString("Total size of all resources, click to show the Network Requests timeline"),
- handler: this._networkItemWasClicked
- },
- time: {
- tooltip: WebInspector.UIString("Time until the load event fired, click to show the Network Requests timeline"),
- handler: this._networkItemWasClicked
- },
</del><span class="cx"> logs: {
</span><span class="cx"> tooltip: WebInspector.UIString("Console logs, click to show the Console"),
</span><span class="cx"> handler: this._consoleItemWasClicked.bind(this, WebInspector.LogContentView.Scopes.Logs)
</span><span class="lines">@@ -71,17 +63,9 @@
</span><span class="cx"> for (var category of ["logs", "issues", "errors"])
</span><span class="cx"> this._setConsoleItemValue(category, dashboard[category]);
</span><span class="cx">
</span><del>- var timeItem = this._items.time;
- timeItem.text = dashboard.time ? Number.secondsToString(dashboard.time) : "\u2014";
- this._setItemEnabled(timeItem, dashboard.time > 0);
-
</del><span class="cx"> var countItem = this._items.resourcesCount;
</span><span class="cx"> countItem.text = this._formatPossibleLargeNumber(dashboard.resourcesCount);
</span><span class="cx"> this._setItemEnabled(countItem, dashboard.resourcesCount > 0);
</span><del>-
- var sizeItem = this._items.resourcesSize;
- sizeItem.text = dashboard.resourcesSize ? Number.bytesToString(dashboard.resourcesSize, false) : "\u2014";
- this._setItemEnabled(sizeItem, dashboard.resourcesSize > 0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _formatPossibleLargeNumber(number)
</span></span></pre>
</div>
</div>
</body>
</html>