Title: [190738] branches/safari-601.1-branch/Source/WebInspectorUI
Diff
Modified: branches/safari-601.1-branch/Source/WebInspectorUI/ChangeLog (190737 => 190738)
--- branches/safari-601.1-branch/Source/WebInspectorUI/ChangeLog 2015-10-08 20:05:41 UTC (rev 190737)
+++ branches/safari-601.1-branch/Source/WebInspectorUI/ChangeLog 2015-10-08 20:17:32 UTC (rev 190738)
@@ -1,5 +1,9 @@
2015-10-08 Lucas Forschler <[email protected]>
+ Rollout r190737
+
+2015-10-08 Lucas Forschler <[email protected]>
+
Merge r188378. rdar://problem/22801980
2015-08-12 Joseph Pecoraro <[email protected]>
Modified: branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Models/Script.js (190737 => 190738)
--- branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Models/Script.js 2015-10-08 20:05:41 UTC (rev 190737)
+++ branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Models/Script.js 2015-10-08 20:17:32 UTC (rev 190738)
@@ -149,7 +149,7 @@
}
this.requestContent().then(function(parameters) {
- makeSyntaxTreeAndCallCallback(parameters.sourceCode.content);
+ makeSyntaxTreeAndCallCallback(parameters.content);
}).catch(function(error) {
makeSyntaxTreeAndCallCallback(null);
});
Modified: branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Models/SourceCode.js (190737 => 190738)
--- branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Models/SourceCode.js 2015-10-08 20:05:41 UTC (rev 190737)
+++ branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Models/SourceCode.js 2015-10-08 20:17:32 UTC (rev 190738)
@@ -189,12 +189,8 @@
this._ignoreRevisionContentDidChangeEvent = true;
revision.content = content || null;
- this._ignoreRevisionContentDidChangeEvent = false;
+ delete this._ignoreRevisionContentDidChangeEvent;
- // 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.
-
return Promise.resolve({
error,
sourceCode: this,
Modified: branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js (190737 => 190738)
--- branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js 2015-10-08 20:05:41 UTC (rev 190737)
+++ branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js 2015-10-08 20:17:32 UTC (rev 190738)
@@ -93,8 +93,7 @@
// Content is ready to show, call the public method now.
console.assert(!this._hasContent());
- console.assert(parameters.sourceCode === this._resource);
- this.contentAvailable(parameters.sourceCode.content, parameters.base64Encoded);
+ this.contentAvailable(parameters.content, parameters.base64Encoded);
},
_contentError: function(error)
Modified: branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js (190737 => 190738)
--- branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2015-10-08 20:05:41 UTC (rev 190737)
+++ branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2015-10-08 20:17:32 UTC (rev 190738)
@@ -451,7 +451,7 @@
return;
var sourceCode = parameters.sourceCode;
- var content = sourceCode.content;
+ var content = parameters.content;
var base64Encoded = parameters.base64Encoded;
console.assert(sourceCode === this._sourceCode);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
