Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(822)

Unified Diff: third_party/WebKit/Source/devtools/front_end/source_frame/UISourceCodeFrame.js

Issue 2729783002: DevTools: Diff subsystem (Closed)
Patch Set: nullable diff Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/devtools/front_end/source_frame/UISourceCodeFrame.js
diff --git a/third_party/WebKit/Source/devtools/front_end/source_frame/UISourceCodeFrame.js b/third_party/WebKit/Source/devtools/front_end/source_frame/UISourceCodeFrame.js
index d1db34bc172d7a4e7f1c63f980909b3ba00c62fb..c238ffc87ae9a8c7bfd3aa3d20b5973768ddbffe 100644
--- a/third_party/WebKit/Source/devtools/front_end/source_frame/UISourceCodeFrame.js
+++ b/third_party/WebKit/Source/devtools/front_end/source_frame/UISourceCodeFrame.js
@@ -39,7 +39,8 @@ SourceFrame.UISourceCodeFrame = class extends SourceFrame.SourceFrame {
this.setEditable(this._canEditSource());
if (Runtime.experiments.isEnabled('sourceDiff'))
- this._diff = new SourceFrame.SourceCodeDiff(uiSourceCode.requestOriginalContent(), this.textEditor);
+ this._diff = new SourceFrame.SourceCodeDiff(WorkspaceDiff.workspaceDiff(), uiSourceCode, this.textEditor);
+
/** @type {?UI.AutocompleteConfig} */
this._autocompleteConfig = {isWordChar: Common.TextUtils.isWordChar};
@@ -167,8 +168,6 @@ SourceFrame.UISourceCodeFrame = class extends SourceFrame.SourceFrame {
* @override
*/
onTextEditorContentSet() {
- if (this._diff)
- this._diff.updateDiffMarkersImmediately();
super.onTextEditorContentSet();
for (var message of this._allMessages())
this._addMessageToSource(message);
@@ -190,8 +189,6 @@ SourceFrame.UISourceCodeFrame = class extends SourceFrame.SourceFrame {
* @param {!Common.TextRange} newRange
*/
onTextChanged(oldRange, newRange) {
- if (this._diff)
- this._diff.updateDiffMarkersWhenPossible();
super.onTextChanged(oldRange, newRange);
this._errorPopoverHelper.hidePopover();
if (this._isSettingContent)
@@ -321,6 +318,8 @@ SourceFrame.UISourceCodeFrame = class extends SourceFrame.SourceFrame {
}
dispose() {
+ if (this._diff)
+ this._diff.dispose();
this.textEditor.dispose();
Common.moduleSetting('textEditorAutocompletion').removeChangeListener(this._updateAutocomplete, this);
this.detach();

Powered by Google App Engine
This is Rietveld 408576698