<!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>[214436] 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/214436">214436</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-27 16:19:21 -0700 (Mon, 27 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Resource Details Sidebar displays previous image metrics when viewing resource where content load failed
https://bugs.webkit.org/show_bug.cgi?id=170065
<rdar://problem/27081591>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2017-03-27
Reviewed by Matt Baker.
* UserInterface/Models/Resource.js:
(WebInspector.Resource.prototype.getImageSize.imageDidLoad):
(WebInspector.Resource.prototype.getImageSize.requestContentFailure):
(WebInspector.Resource.prototype.getImageSize):
If the requestContent failed, return a null image size.
* UserInterface/Views/ResourceDetailsSidebarPanel.js:
(WebInspector.ResourceDetailsSidebarPanel.prototype._refreshImageSizeSection.hideImageSection):
(WebInspector.ResourceDetailsSidebarPanel.prototype._refreshImageSizeSection):
If the callback is called with a null size, hide the image size section.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsResourcejs">trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsResourceDetailsSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/ResourceDetailsSidebarPanel.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (214435 => 214436)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2017-03-27 22:56:32 UTC (rev 214435)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-03-27 23:19:21 UTC (rev 214436)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-03-27 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Resource Details Sidebar displays previous image metrics when viewing resource where content load failed
+ https://bugs.webkit.org/show_bug.cgi?id=170065
+ <rdar://problem/27081591>
+
+ Reviewed by Matt Baker.
+
+ * UserInterface/Models/Resource.js:
+ (WebInspector.Resource.prototype.getImageSize.imageDidLoad):
+ (WebInspector.Resource.prototype.getImageSize.requestContentFailure):
+ (WebInspector.Resource.prototype.getImageSize):
+ If the requestContent failed, return a null image size.
+
+ * UserInterface/Views/ResourceDetailsSidebarPanel.js:
+ (WebInspector.ResourceDetailsSidebarPanel.prototype._refreshImageSizeSection.hideImageSection):
+ (WebInspector.ResourceDetailsSidebarPanel.prototype._refreshImageSizeSection):
+ If the callback is called with a null size, hide the image size section.
+
</ins><span class="cx"> 2017-03-24 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: RTL: number scripts are used inconsistently throughout the UI
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsResourcejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js (214435 => 214436)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js 2017-03-27 22:56:32 UTC (rev 214435)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js 2017-03-27 23:19:21 UTC (rev 214436)
</span><span class="lines">@@ -694,7 +694,7 @@
</span><span class="cx">
</span><span class="cx"> // See if we've already computed and cached the image size,
</span><span class="cx"> // in which case we can provide them directly.
</span><del>- if (this._imageSize) {
</del><ins>+ if (this._imageSize !== undefined) {
</ins><span class="cx"> callback(this._imageSize);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -702,8 +702,7 @@
</span><span class="cx"> var objectURL = null;
</span><span class="cx">
</span><span class="cx"> // Event handler for the image "load" event.
</span><del>- function imageDidLoad()
- {
</del><ins>+ function imageDidLoad() {
</ins><span class="cx"> URL.revokeObjectURL(objectURL);
</span><span class="cx">
</span><span class="cx"> // Cache the image metrics.
</span><span class="lines">@@ -715,6 +714,11 @@
</span><span class="cx"> callback(this._imageSize);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function requestContentFailure() {
+ this._imageSize = null;
+ callback(this._imageSize);
+ }
+
</ins><span class="cx"> // Create an <img> element that we'll use to load the image resource
</span><span class="cx"> // so that we can query its intrinsic size.
</span><span class="cx"> var image = new Image;
</span><span class="lines">@@ -723,7 +727,7 @@
</span><span class="cx"> // Set the image source using an object URL once we've obtained its data.
</span><span class="cx"> this.requestContent().then(function(content) {
</span><span class="cx"> objectURL = image.src = content.sourceCode.createObjectURL();
</span><del>- });
</del><ins>+ }, requestContentFailure.bind(this));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> requestContent()
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsResourceDetailsSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceDetailsSidebarPanel.js (214435 => 214436)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceDetailsSidebarPanel.js 2017-03-27 22:56:32 UTC (rev 214435)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceDetailsSidebarPanel.js 2017-03-27 23:19:21 UTC (rev 214436)
</span><span class="lines">@@ -434,11 +434,15 @@
</span><span class="cx"> if (!resource)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ function hideImageSection() {
+ let imageSectionElement = this._imageSizeSection.element;
+ if (imageSectionElement.parentNode)
+ this.contentView.element.removeChild(imageSectionElement);
+ }
+
</ins><span class="cx"> // Hide the section if we're not dealing with an image or if the load failed.
</span><span class="cx"> if (resource.type !== WebInspector.Resource.Type.Image || resource.failed) {
</span><del>- var imageSectionElement = this._imageSizeSection.element;
- if (imageSectionElement.parentNode)
- this.contentView.element.removeChild(imageSectionElement);
</del><ins>+ hideImageSection.call(this);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -447,8 +451,11 @@
</span><span class="cx">
</span><span class="cx"> // Get the metrics for this resource and fill in the metrics rows with that information.
</span><span class="cx"> resource.getImageSize((size) => {
</span><del>- this._imageWidthRow.value = WebInspector.UIString("%dpx").format(size.width);
- this._imageHeightRow.value = WebInspector.UIString("%dpx").format(size.height);
</del><ins>+ if (size) {
+ this._imageWidthRow.value = WebInspector.UIString("%dpx").format(size.width);
+ this._imageHeightRow.value = WebInspector.UIString("%dpx").format(size.height);
+ } else
+ hideImageSection.call(this);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>