Changeset 207354 in webkit


Ignore:
Timestamp:
Oct 14, 2016 3:10:54 PM (7 years ago)
Author:
commit-queue@webkit.org
Message:

Web Inspector: Remove uses of delete in SourceCodeTextEditor
https://bugs.webkit.org/show_bug.cgi?id=163379

Patch by Joseph Pecoraro <Joseph Pecoraro> 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):

Location:
trunk/Source/WebInspectorUI
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebInspectorUI/ChangeLog

    r207329 r207354  
     12016-10-14  Joseph Pecoraro  <pecoraro@apple.com>
     2
     3        Web Inspector: Remove uses of delete in SourceCodeTextEditor
     4        https://bugs.webkit.org/show_bug.cgi?id=163379
     5
     6        Reviewed by Timothy Hatcher.
     7
     8        Remove uses of delete and better group member variables.
     9        One of the deletes was deleting an incorrect property.
     10
     11        * UserInterface/Views/SourceCodeTextEditor.js:
     12        (WebInspector.SourceCodeTextEditor):
     13        (WebInspector.SourceCodeTextEditor.prototype.textEditorBreakpointAdded):
     14        (WebInspector.SourceCodeTextEditor.prototype.textEditorBreakpointRemoved):
     15        (WebInspector.SourceCodeTextEditor.prototype.textEditorBreakpointMoved):
     16        (WebInspector.SourceCodeTextEditor.prototype._tokenTrackingControllerHighlightedMarkedExpression):
     17        (WebInspector.SourceCodeTextEditor.prototype._dismissEditingController):
     18        (WebInspector.SourceCodeTextEditor.prototype.editingControllerDidFinishEditing):
     19
    1202016-10-14  Joseph Pecoraro  <pecoraro@apple.com>
    221
  • trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js

    r207329 r207354  
    4040        this._contentPopulated = false;
    4141        this._invalidLineNumbers = {0: true};
    42         this._ignoreContentDidChange = 0;
    4342        this._requestingScriptContent = false;
    4443        this._activeCallFrameSourceCodeLocation = null;
     
    4746        this._typeTokenAnnotator = null;
    4847        this._basicBlockAnnotator = null;
     48        this._editingController = null;
    4949
    5050        this._autoFormat = false;
    5151        this._isProbablyMinified = false;
     52
     53        this._ignoreContentDidChange = 0;
     54        this._ignoreLocationUpdateBreakpoint = null;
     55        this._ignoreBreakpointAddedBreakpoint = null;
     56        this._ignoreBreakpointRemovedBreakpoint = null;
     57        this._ignoreAllBreakpointLocationUpdates = false;
    5258
    5359        // FIXME: Currently this just jumps between resources and related source map resources. It doesn't "jump to symbol" yet.
     
    10991105
    11001106        this._ignoreBreakpointAddedBreakpoint = breakpoint;
    1101 
    11021107        var shouldSkipEventDispatch = false;
    11031108        var shouldSpeculativelyResolveBreakpoint = true;
    11041109        WebInspector.debuggerManager.addBreakpoint(breakpoint, shouldSkipEventDispatch, shouldSpeculativelyResolveBreakpoint);
    1105         delete this._ignoreBreakpointAddedBreakpoint;
     1110        this._ignoreBreakpointAddedBreakpoint = null;
    11061111
    11071112        // Return the more accurate location and breakpoint info.
     
    11291134        this._ignoreBreakpointRemovedBreakpoint = breakpoint;
    11301135        WebInspector.debuggerManager.removeBreakpoint(breakpoint);
    1131         delete this._ignoreBreakpointAddedBreakpoint;
     1136        this._ignoreBreakpointRemovedBreakpoint = null;
    11321137    }
    11331138
     
    11501155        this._ignoreLocationUpdateBreakpoint = breakpoint;
    11511156        breakpoint.sourceCodeLocation.update(this._sourceCode, unformattedNewLineInfo.lineNumber, unformattedNewLineInfo.columnNumber);
    1152         delete this._ignoreLocationUpdateBreakpoint;
     1157        this._ignoreLocationUpdateBreakpoint = null;
    11531158
    11541159        var accurateNewLineInfo = this._editorLineInfoForSourceCodeLocation(breakpoint.sourceCodeLocation);
     
    17721777            if (!color || !color.valid) {
    17731778                editableMarker.clear();
    1774                 delete this._editingController;
     1779                this._editingController = null;
    17751780                return;
    17761781            }
     
    17871792
    17881793        this.tokenTrackingController.hoveredMarker = null;
    1789         delete this._editingController;
     1794        this._editingController = null;
    17901795    }
    17911796
     
    18121817        this._ignoreContentDidChange--;
    18131818
    1814         delete this._editingController;
     1819        this._editingController = null;
    18151820    }
    18161821
Note: See TracChangeset for help on using the changeset viewer.