<!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>[183863] 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/183863">183863</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-06 00:06:54 -0700 (Wed, 06 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: SourceCodeTextEditor shows "undefined" instead of resource content when pausing during resource load
https://bugs.webkit.org/show_bug.cgi?id=144662
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-05-06
Reviewed by Timothy Hatcher.
* UserInterface/Protocol/InspectorBackend.js:
(InspectorBackend.Command.prototype.promise):
Start standardizing on rejecting Promises with Error objects.
* UserInterface/Views/ResourceContentView.js:
(WebInspector.ResourceContentView):
(WebInspector.ResourceContentView.prototype._protocolError):
When there is a protocol error, show a nice UI string for the error.
(WebInspector.ResourceContentView.prototype._contentAvailable):
(WebInspector.ResourceContentView.prototype._contentError):
(WebInspector.ResourceContentView.prototype._hasContent):
Whenever we hit an error case in ResourceContentView, check to make sure
that a subclass hasn't already populated the content view with content.
This can happen when a TextResourceContentView populates a Resource with
Script content while paused, because the Resource content would be
unavailable. We check that content has loaded by checking that the
indeterminate spinner is no longer showing.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolInspectorBackendjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsResourceContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (183862 => 183863)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-05-06 07:02:36 UTC (rev 183862)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-05-06 07:06:54 UTC (rev 183863)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-05-06 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: SourceCodeTextEditor shows "undefined" instead of resource content when pausing during resource load
+ https://bugs.webkit.org/show_bug.cgi?id=144662
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Protocol/InspectorBackend.js:
+ (InspectorBackend.Command.prototype.promise):
+ Start standardizing on rejecting Promises with Error objects.
+
+ * UserInterface/Views/ResourceContentView.js:
+ (WebInspector.ResourceContentView):
+ (WebInspector.ResourceContentView.prototype._protocolError):
+ When there is a protocol error, show a nice UI string for the error.
+
+ (WebInspector.ResourceContentView.prototype._contentAvailable):
+ (WebInspector.ResourceContentView.prototype._contentError):
+ (WebInspector.ResourceContentView.prototype._hasContent):
+ Whenever we hit an error case in ResourceContentView, check to make sure
+ that a subclass hasn't already populated the content view with content.
+ This can happen when a TextResourceContentView populates a Resource with
+ Script content while paused, because the Resource content would be
+ unavailable. We check that content has loaded by checking that the
+ indeterminate spinner is no longer showing.
+
</ins><span class="cx"> 2015-05-05 Andres Gomez <agomez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Web Inspector: Further optimize SVG images
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolInspectorBackendjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js (183862 => 183863)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js 2015-05-06 07:02:36 UTC (rev 183862)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js 2015-05-06 07:06:54 UTC (rev 183863)
</span><span class="lines">@@ -433,7 +433,7 @@
</span><span class="cx"> var promiseArguments = Array.from(arguments);
</span><span class="cx"> return new Promise(function(resolve, reject) {
</span><span class="cx"> function convertToPromiseCallback(error, payload) {
</span><del>- return error ? reject(error) : resolve(payload);
</del><ins>+ return error ? reject(new Error(error)) : resolve(payload);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: this should be indicated by invoking the command differently, rather
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsResourceContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js (183862 => 183863)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js 2015-05-06 07:02:36 UTC (rev 183862)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js 2015-05-06 07:06:54 UTC (rev 183863)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> this.element.addEventListener("click", this._mouseWasClicked.bind(this), false);
</span><span class="cx">
</span><span class="cx"> // Request content last so the spinner will always be removed in case the content is immediately available.
</span><del>- resource.requestContent().then(this._contentAvailable.bind(this)).catch(this._contentError.bind(this));
</del><ins>+ resource.requestContent().then(this._contentAvailable.bind(this)).catch(this._protocolError.bind(this));
</ins><span class="cx">
</span><span class="cx"> if (!this.managesOwnIssues) {
</span><span class="cx"> WebInspector.issueManager.addEventListener(WebInspector.IssueManager.Event.IssueWasAdded, this._issueWasAdded, this);
</span><span class="lines">@@ -87,24 +87,34 @@
</span><span class="cx"> _contentAvailable: function(parameters)
</span><span class="cx"> {
</span><span class="cx"> if (parameters.error) {
</span><del>- this._contentError({ message: parameters.error });
</del><ins>+ this._contentError(parameters.error);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Content is ready to show, call the public method now.
</span><ins>+ console.assert(!this._hasContent());
</ins><span class="cx"> this.contentAvailable(parameters.content, parameters.base64Encoded);
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _contentError: function(error)
</span><span class="cx"> {
</span><del>- // Don't show an error message if there is already an error message showing (like one added by addIssue.)
- if (this.element.querySelector(".message-text-view.error"))
</del><ins>+ if (this._hasContent())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this.element.removeChildren();
</span><del>- this.element.appendChild(WebInspector.createMessageTextView(error.message, true));
</del><ins>+ this.element.appendChild(WebInspector.createMessageTextView(error, true));
</ins><span class="cx"> },
</span><span class="cx">
</span><ins>+ _protocolError: function(error)
+ {
+ this._contentError(WebInspector.UIString("An error occurred trying to load the resource."));
+ },
+
+ _hasContent: function()
+ {
+ return !this.element.querySelector(WebInspector.IndeterminateProgressSpinner.StyleClassName);
+ },
+
</ins><span class="cx"> _issueWasAdded: function(event)
</span><span class="cx"> {
</span><span class="cx"> console.assert(!this.managesOwnIssues);
</span></span></pre>
</div>
</div>
</body>
</html>