<!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>[190737] branches/safari-601.1-branch/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/190737">190737</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2015-10-08 13:05:41 -0700 (Thu, 08 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/188378">r188378</a>. rdar://problem/22801980</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6011branchSourceWebInspectorUIChangeLog">branches/safari-601.1-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari6011branchSourceWebInspectorUIUserInterfaceModelsScriptjs">branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Models/Script.js</a></li>
<li><a href="#branchessafari6011branchSourceWebInspectorUIUserInterfaceModelsSourceCodejs">branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Models/SourceCode.js</a></li>
<li><a href="#branchessafari6011branchSourceWebInspectorUIUserInterfaceViewsResourceContentViewjs">branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js</a></li>
<li><a href="#branchessafari6011branchSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorjs">branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6011branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebInspectorUI/ChangeLog (190736 => 190737)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebInspectorUI/ChangeLog 2015-10-08 20:00:57 UTC (rev 190736)
+++ branches/safari-601.1-branch/Source/WebInspectorUI/ChangeLog 2015-10-08 20:05:41 UTC (rev 190737)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2015-10-08 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188378. rdar://problem/22801980
+
+ 2015-08-12 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Sometimes CSS resources don't update after editing via Styles panel
+ https://bugs.webkit.org/show_bug.cgi?id=143244
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Models/SourceCode.js:
+ (WebInspector.SourceCode.prototype._processContent):
+ This code is brittle and we should move off of putting the
+ possibly stale content in the Promise result.
+
+ * UserInterface/Views/ResourceContentView.js:
+ (WebInspector.ResourceContentView.prototype._contentAvailable):
+ * UserInterface/Views/SourceCodeTextEditor.js:
+ (WebInspector.SourceCodeTextEditor.prototype._contentAvailable):
+ * UserInterface/Models/Script.js:
+ (WebInspector.Script.prototype.requestScriptSyntaxTree):
+ Use the current source code's content.
+
+2015-10-08 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r187052. rdar://problem/22801992
</span><span class="cx">
</span><span class="cx"> 2015-07-20 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebInspectorUIUserInterfaceModelsScriptjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Models/Script.js (190736 => 190737)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Models/Script.js 2015-10-08 20:00:57 UTC (rev 190736)
+++ branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Models/Script.js 2015-10-08 20:05:41 UTC (rev 190737)
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this.requestContent().then(function(parameters) {
</span><del>- makeSyntaxTreeAndCallCallback(parameters.content);
</del><ins>+ makeSyntaxTreeAndCallCallback(parameters.sourceCode.content);
</ins><span class="cx"> }).catch(function(error) {
</span><span class="cx"> makeSyntaxTreeAndCallCallback(null);
</span><span class="cx"> });
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebInspectorUIUserInterfaceModelsSourceCodejs"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Models/SourceCode.js (190736 => 190737)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Models/SourceCode.js 2015-10-08 20:00:57 UTC (rev 190736)
+++ branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Models/SourceCode.js 2015-10-08 20:05:41 UTC (rev 190737)
</span><span class="lines">@@ -189,8 +189,12 @@
</span><span class="cx">
</span><span class="cx"> this._ignoreRevisionContentDidChangeEvent = true;
</span><span class="cx"> revision.content = content || null;
</span><del>- delete this._ignoreRevisionContentDidChangeEvent;
</del><ins>+ this._ignoreRevisionContentDidChangeEvent = false;
</ins><span class="cx">
</span><ins>+ // FIXME: Returning the content in this promise is misleading. It may not be current content
+ // now, and it may become out-dated later on. We should drop content from this promise
+ // and require clients to ask for the current contents from the sourceCode in the result.
+
</ins><span class="cx"> return Promise.resolve({
</span><span class="cx"> error,
</span><span class="cx"> sourceCode: this,
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebInspectorUIUserInterfaceViewsResourceContentViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js (190736 => 190737)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js 2015-10-08 20:00:57 UTC (rev 190736)
+++ branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js 2015-10-08 20:05:41 UTC (rev 190737)
</span><span class="lines">@@ -93,7 +93,8 @@
</span><span class="cx">
</span><span class="cx"> // Content is ready to show, call the public method now.
</span><span class="cx"> console.assert(!this._hasContent());
</span><del>- this.contentAvailable(parameters.content, parameters.base64Encoded);
</del><ins>+ console.assert(parameters.sourceCode === this._resource);
+ this.contentAvailable(parameters.sourceCode.content, parameters.base64Encoded);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _contentError: function(error)
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js (190736 => 190737)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2015-10-08 20:00:57 UTC (rev 190736)
+++ branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2015-10-08 20:05:41 UTC (rev 190737)
</span><span class="lines">@@ -451,7 +451,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> var sourceCode = parameters.sourceCode;
</span><del>- var content = parameters.content;
</del><ins>+ var content = sourceCode.content;
</ins><span class="cx"> var base64Encoded = parameters.base64Encoded;
</span><span class="cx">
</span><span class="cx"> console.assert(sourceCode === this._sourceCode);
</span></span></pre>
</div>
</div>
</body>
</html>