Title: [207354] trunk/Source/WebInspectorUI
- Revision
- 207354
- Author
- commit-qu...@webkit.org
- Date
- 2016-10-14 15:10:54 -0700 (Fri, 14 Oct 2016)
Log Message
Web Inspector: Remove uses of delete in SourceCodeTextEditor
https://bugs.webkit.org/show_bug.cgi?id=163379
Patch by Joseph Pecoraro <pecor...@apple.com> on 2016-10-14
Reviewed by Timothy Hatcher.
Remove uses of delete and better group member variables.
One of the deletes was deleting an incorrect property.
* UserInterface/Views/SourceCodeTextEditor.js:
(WebInspector.SourceCodeTextEditor):
(WebInspector.SourceCodeTextEditor.prototype.textEditorBreakpointAdded):
(WebInspector.SourceCodeTextEditor.prototype.textEditorBreakpointRemoved):
(WebInspector.SourceCodeTextEditor.prototype.textEditorBreakpointMoved):
(WebInspector.SourceCodeTextEditor.prototype._tokenTrackingControllerHighlightedMarkedExpression):
(WebInspector.SourceCodeTextEditor.prototype._dismissEditingController):
(WebInspector.SourceCodeTextEditor.prototype.editingControllerDidFinishEditing):
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (207353 => 207354)
--- trunk/Source/WebInspectorUI/ChangeLog 2016-10-14 21:52:35 UTC (rev 207353)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-10-14 22:10:54 UTC (rev 207354)
@@ -1,5 +1,24 @@
2016-10-14 Joseph Pecoraro <pecor...@apple.com>
+ Web Inspector: Remove uses of delete in SourceCodeTextEditor
+ https://bugs.webkit.org/show_bug.cgi?id=163379
+
+ Reviewed by Timothy Hatcher.
+
+ Remove uses of delete and better group member variables.
+ One of the deletes was deleting an incorrect property.
+
+ * UserInterface/Views/SourceCodeTextEditor.js:
+ (WebInspector.SourceCodeTextEditor):
+ (WebInspector.SourceCodeTextEditor.prototype.textEditorBreakpointAdded):
+ (WebInspector.SourceCodeTextEditor.prototype.textEditorBreakpointRemoved):
+ (WebInspector.SourceCodeTextEditor.prototype.textEditorBreakpointMoved):
+ (WebInspector.SourceCodeTextEditor.prototype._tokenTrackingControllerHighlightedMarkedExpression):
+ (WebInspector.SourceCodeTextEditor.prototype._dismissEditingController):
+ (WebInspector.SourceCodeTextEditor.prototype.editingControllerDidFinishEditing):
+
+2016-10-14 Joseph Pecoraro <pecor...@apple.com>
+
Uncaught Exception: TypeError: this.positionToOffset is not a function - seen hovering expressions with Type Profiler enabled
https://bugs.webkit.org/show_bug.cgi?id=163405
<rdar://problem/28763953>
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js (207353 => 207354)
--- trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2016-10-14 21:52:35 UTC (rev 207353)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2016-10-14 22:10:54 UTC (rev 207354)
@@ -39,7 +39,6 @@
this._widgetMap = new Map;
this._contentPopulated = false;
this._invalidLineNumbers = {0: true};
- this._ignoreContentDidChange = 0;
this._requestingScriptContent = false;
this._activeCallFrameSourceCodeLocation = null;
@@ -46,10 +45,17 @@
this._typeTokenScrollHandler = null;
this._typeTokenAnnotator = null;
this._basicBlockAnnotator = null;
+ this._editingController = null;
this._autoFormat = false;
this._isProbablyMinified = false;
+ this._ignoreContentDidChange = 0;
+ this._ignoreLocationUpdateBreakpoint = null;
+ this._ignoreBreakpointAddedBreakpoint = null;
+ this._ignoreBreakpointRemovedBreakpoint = null;
+ this._ignoreAllBreakpointLocationUpdates = false;
+
// FIXME: Currently this just jumps between resources and related source map resources. It doesn't "jump to symbol" yet.
this._updateTokenTrackingControllerState();
@@ -1098,11 +1104,10 @@
this._addBreakpointWithEditorLineInfo(breakpoint, lineInfo);
this._ignoreBreakpointAddedBreakpoint = breakpoint;
-
var shouldSkipEventDispatch = false;
var shouldSpeculativelyResolveBreakpoint = true;
WebInspector.debuggerManager.addBreakpoint(breakpoint, shouldSkipEventDispatch, shouldSpeculativelyResolveBreakpoint);
- delete this._ignoreBreakpointAddedBreakpoint;
+ this._ignoreBreakpointAddedBreakpoint = null;
// Return the more accurate location and breakpoint info.
return {
@@ -1128,7 +1133,7 @@
this._ignoreBreakpointRemovedBreakpoint = breakpoint;
WebInspector.debuggerManager.removeBreakpoint(breakpoint);
- delete this._ignoreBreakpointAddedBreakpoint;
+ this._ignoreBreakpointRemovedBreakpoint = null;
}
textEditorBreakpointMoved(textEditor, oldLineNumber, oldColumnNumber, newLineNumber, newColumnNumber)
@@ -1149,7 +1154,7 @@
var unformattedNewLineInfo = this._unformattedLineInfoForEditorLineInfo(newLineInfo);
this._ignoreLocationUpdateBreakpoint = breakpoint;
breakpoint.sourceCodeLocation.update(this._sourceCode, unformattedNewLineInfo.lineNumber, unformattedNewLineInfo.columnNumber);
- delete this._ignoreLocationUpdateBreakpoint;
+ this._ignoreLocationUpdateBreakpoint = null;
var accurateNewLineInfo = this._editorLineInfoForSourceCodeLocation(breakpoint.sourceCodeLocation);
this._addBreakpointWithEditorLineInfo(breakpoint, accurateNewLineInfo);
@@ -1771,7 +1776,7 @@
var color = this._editingController.value;
if (!color || !color.valid) {
editableMarker.clear();
- delete this._editingController;
+ this._editingController = null;
return;
}
}
@@ -1786,7 +1791,7 @@
this._editingController.dismissHoverMenu(discrete);
this.tokenTrackingController.hoveredMarker = null;
- delete this._editingController;
+ this._editingController = null;
}
// CodeMirrorEditingController Delegate
@@ -1811,7 +1816,7 @@
this._ignoreContentDidChange--;
- delete this._editingController;
+ this._editingController = null;
}
_setTypeTokenAnnotatorEnabledState(shouldActivate)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
