<!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>[166190] 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/166190">166190</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2014-03-24 13:57:33 -0700 (Mon, 24 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Lazy load source code referred to from the source map, instead of when
the source code is revealed in the Resources sidebar.
https://bugs.webkit.org/show_bug.cgi?id=130625
Reviewed by Joseph Pecoraro.
* UserInterface/Models/SourceMapResource.js:
(WebInspector.SourceMapResource): Set up the type info here so it can be used to
dispaly the right icon in the sidebar.
(WebInspector.SourceMapResource.prototype.canRequestContentFromBackend): Use _contentRequested.
(WebInspector.SourceMapResource.prototype.requestContentFromBackend.sourceMapResourceLoaded):
Reset finished and remove the type change dance we had before.
* UserInterface/Views/SourceMapResourceTreeElement.js:
(WebInspector.SourceMapResourceTreeElement.prototype.onattach): Removed. Don't request content here.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsSourceMapResourcejs">trunk/Source/WebInspectorUI/UserInterface/Models/SourceMapResource.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSourceMapResourceTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/SourceMapResourceTreeElement.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (166189 => 166190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-03-24 20:51:12 UTC (rev 166189)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-03-24 20:57:33 UTC (rev 166190)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-03-24 Timothy Hatcher <timothy@apple.com>
+
+ Lazy load source code referred to from the source map, instead of when
+ the source code is revealed in the Resources sidebar.
+
+ https://bugs.webkit.org/show_bug.cgi?id=130625
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Models/SourceMapResource.js:
+ (WebInspector.SourceMapResource): Set up the type info here so it can be used to
+ dispaly the right icon in the sidebar.
+ (WebInspector.SourceMapResource.prototype.canRequestContentFromBackend): Use _contentRequested.
+ (WebInspector.SourceMapResource.prototype.requestContentFromBackend.sourceMapResourceLoaded):
+ Reset finished and remove the type change dance we had before.
+ * UserInterface/Views/SourceMapResourceTreeElement.js:
+ (WebInspector.SourceMapResourceTreeElement.prototype.onattach): Removed. Don't request content here.
+
</ins><span class="cx"> 2014-03-23 James Craig <jcraig@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: AXI: add other ARIA one-to-many relationships: owns, flowto, controls.
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsSourceMapResourcejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/SourceMapResource.js (166189 => 166190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/SourceMapResource.js 2014-03-24 20:51:12 UTC (rev 166189)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/SourceMapResource.js 2014-03-24 20:57:33 UTC (rev 166190)
</span><span class="lines">@@ -31,6 +31,21 @@
</span><span class="cx"> console.assert(sourceMap);
</span><span class="cx">
</span><span class="cx"> this._sourceMap = sourceMap;
</span><ins>+ this._contentRequested = false;
+
+ var inheritedMIMEType = this._sourceMap.originalSourceCode instanceof WebInspector.Resource ? this._sourceMap.originalSourceCode.syntheticMIMEType : null;
+
+ var fileExtension = WebInspector.fileExtensionForURL(url);
+ var fileExtensionMIMEType = WebInspector.mimeTypeForFileExtension(fileExtension, true);
+
+ // FIXME: This is a layering violation. It should use a helper function on the
+ // Resource base-class to set _mimeType and _type.
+ this._mimeType = fileExtensionMIMEType || inheritedMIMEType || "text/javascript";
+ this._type = WebInspector.Resource.Type.fromMIMEType(this._mimeType);
+
+ // Mark the resource as loaded so it does not show a spinner in the sidebar.
+ // We will really load the resource the first time content is requested.
+ this.markAsFinished();
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.SourceMapResource.prototype = {
</span><span class="lines">@@ -62,18 +77,22 @@
</span><span class="cx">
</span><span class="cx"> canRequestContentFromBackend: function()
</span><span class="cx"> {
</span><del>- return !this.finished;
</del><ins>+ return !this._contentRequested;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> requestContentFromBackend: function(callback)
</span><span class="cx"> {
</span><ins>+ this._contentRequested = true;
+
+ // Revert the markAsFinished that was done in the constructor.
+ this.revertMarkAsFinished();
+
</ins><span class="cx"> var inlineContent = this._sourceMap.sourceContent(this.url);
</span><span class="cx"> if (inlineContent) {
</span><span class="cx"> // Force inline content to be asynchronous to match the expected load pattern.
</span><span class="cx"> setTimeout(function() {
</span><span class="cx"> // FIXME: We don't know the MIME-type for inline content. Guess by analyzing the content?
</span><del>- // Guess by using the type of the original resource?
- sourceMapResourceLoaded.call(this, null, inlineContent, "text/javascript", 200);
</del><ins>+ sourceMapResourceLoaded.call(this, null, inlineContent, this.mimeType, 200);
</ins><span class="cx"> }.bind(this));
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="lines">@@ -89,29 +108,9 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var fileExtension = WebInspector.fileExtensionForURL(this.url);
- var fileExtensionMIMEType = WebInspector.mimeTypeForFileExtension(fileExtension, true) || "text/javascript";
-
</del><span class="cx"> // FIXME: Add support for picking the best MIME-type. Right now the file extension is the best bet.
</span><del>- mimeType = fileExtensionMIMEType;
</del><ins>+ // The constructor set MIME-type based on the file extension and we ignore mimeType here.
</ins><span class="cx">
</span><del>- var oldType = this._type;
- var oldMIMEType = this._mimeType;
-
- // FIXME: This is a layering violation. It should use a helper function on the Resource base-class.
- this._mimeType = mimeType;
- this._type = WebInspector.Resource.Type.fromMIMEType(this._mimeType);
-
- if (oldMIMEType !== mimeType) {
- // Delete the MIME-type components so the MIME-type is re-parsed the next time it is requested.
- delete this._mimeTypeComponents;
-
- this.dispatchEventToListeners(WebInspector.Resource.Event.MIMETypeDidChange, {oldMIMEType: oldMIMEType});
- }
-
- if (oldType !== this._type)
- this.dispatchEventToListeners(WebInspector.Resource.Event.TypeDidChange, {oldType: oldType});
-
</del><span class="cx"> this.markAsFinished();
</span><span class="cx">
</span><span class="cx"> callback(null, body, base64encoded);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSourceMapResourceTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SourceMapResourceTreeElement.js (166189 => 166190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/SourceMapResourceTreeElement.js 2014-03-24 20:51:12 UTC (rev 166189)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SourceMapResourceTreeElement.js 2014-03-24 20:57:33 UTC (rev 166190)
</span><span class="lines">@@ -41,16 +41,6 @@
</span><span class="cx">
</span><span class="cx"> // Protected
</span><span class="cx">
</span><del>- onattach: function()
- {
- WebInspector.ResourceTreeElement.prototype.onattach.call(this);
-
- // SourceMap resources must be loaded by the frontend, and only
- // then do they get their type information. So force a load as
- // soon as they are attached to the sidebar.
- this.resource.requestContent(function() {});
- },
-
</del><span class="cx"> _updateTitles: function()
</span><span class="cx"> {
</span><span class="cx"> var oldMainTitle = this.mainTitle;
</span></span></pre>
</div>
</div>
</body>
</html>