<!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>[207354] trunk/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/207354">207354</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-14 15:10:54 -0700 (Fri, 14 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Remove uses of delete in SourceCodeTextEditor
https://bugs.webkit.org/show_bug.cgi?id=163379
Patch by Joseph Pecoraro <pecoraro@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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorjs">trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (207353 => 207354)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2016-10-14 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ 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 <pecoraro@apple.com>
+
</ins><span class="cx"> Uncaught Exception: TypeError: this.positionToOffset is not a function - seen hovering expressions with Type Profiler enabled
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=163405
</span><span class="cx"> <rdar://problem/28763953>
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js (207353 => 207354)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -39,7 +39,6 @@
</span><span class="cx"> this._widgetMap = new Map;
</span><span class="cx"> this._contentPopulated = false;
</span><span class="cx"> this._invalidLineNumbers = {0: true};
</span><del>- this._ignoreContentDidChange = 0;
</del><span class="cx"> this._requestingScriptContent = false;
</span><span class="cx"> this._activeCallFrameSourceCodeLocation = null;
</span><span class="cx">
</span><span class="lines">@@ -46,10 +45,17 @@
</span><span class="cx"> this._typeTokenScrollHandler = null;
</span><span class="cx"> this._typeTokenAnnotator = null;
</span><span class="cx"> this._basicBlockAnnotator = null;
</span><ins>+ this._editingController = null;
</ins><span class="cx">
</span><span class="cx"> this._autoFormat = false;
</span><span class="cx"> this._isProbablyMinified = false;
</span><span class="cx">
</span><ins>+ this._ignoreContentDidChange = 0;
+ this._ignoreLocationUpdateBreakpoint = null;
+ this._ignoreBreakpointAddedBreakpoint = null;
+ this._ignoreBreakpointRemovedBreakpoint = null;
+ this._ignoreAllBreakpointLocationUpdates = false;
+
</ins><span class="cx"> // FIXME: Currently this just jumps between resources and related source map resources. It doesn't "jump to symbol" yet.
</span><span class="cx"> this._updateTokenTrackingControllerState();
</span><span class="cx">
</span><span class="lines">@@ -1098,11 +1104,10 @@
</span><span class="cx"> this._addBreakpointWithEditorLineInfo(breakpoint, lineInfo);
</span><span class="cx">
</span><span class="cx"> this._ignoreBreakpointAddedBreakpoint = breakpoint;
</span><del>-
</del><span class="cx"> var shouldSkipEventDispatch = false;
</span><span class="cx"> var shouldSpeculativelyResolveBreakpoint = true;
</span><span class="cx"> WebInspector.debuggerManager.addBreakpoint(breakpoint, shouldSkipEventDispatch, shouldSpeculativelyResolveBreakpoint);
</span><del>- delete this._ignoreBreakpointAddedBreakpoint;
</del><ins>+ this._ignoreBreakpointAddedBreakpoint = null;
</ins><span class="cx">
</span><span class="cx"> // Return the more accurate location and breakpoint info.
</span><span class="cx"> return {
</span><span class="lines">@@ -1128,7 +1133,7 @@
</span><span class="cx">
</span><span class="cx"> this._ignoreBreakpointRemovedBreakpoint = breakpoint;
</span><span class="cx"> WebInspector.debuggerManager.removeBreakpoint(breakpoint);
</span><del>- delete this._ignoreBreakpointAddedBreakpoint;
</del><ins>+ this._ignoreBreakpointRemovedBreakpoint = null;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> textEditorBreakpointMoved(textEditor, oldLineNumber, oldColumnNumber, newLineNumber, newColumnNumber)
</span><span class="lines">@@ -1149,7 +1154,7 @@
</span><span class="cx"> var unformattedNewLineInfo = this._unformattedLineInfoForEditorLineInfo(newLineInfo);
</span><span class="cx"> this._ignoreLocationUpdateBreakpoint = breakpoint;
</span><span class="cx"> breakpoint.sourceCodeLocation.update(this._sourceCode, unformattedNewLineInfo.lineNumber, unformattedNewLineInfo.columnNumber);
</span><del>- delete this._ignoreLocationUpdateBreakpoint;
</del><ins>+ this._ignoreLocationUpdateBreakpoint = null;
</ins><span class="cx">
</span><span class="cx"> var accurateNewLineInfo = this._editorLineInfoForSourceCodeLocation(breakpoint.sourceCodeLocation);
</span><span class="cx"> this._addBreakpointWithEditorLineInfo(breakpoint, accurateNewLineInfo);
</span><span class="lines">@@ -1771,7 +1776,7 @@
</span><span class="cx"> var color = this._editingController.value;
</span><span class="cx"> if (!color || !color.valid) {
</span><span class="cx"> editableMarker.clear();
</span><del>- delete this._editingController;
</del><ins>+ this._editingController = null;
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1786,7 +1791,7 @@
</span><span class="cx"> this._editingController.dismissHoverMenu(discrete);
</span><span class="cx">
</span><span class="cx"> this.tokenTrackingController.hoveredMarker = null;
</span><del>- delete this._editingController;
</del><ins>+ this._editingController = null;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // CodeMirrorEditingController Delegate
</span><span class="lines">@@ -1811,7 +1816,7 @@
</span><span class="cx">
</span><span class="cx"> this._ignoreContentDidChange--;
</span><span class="cx">
</span><del>- delete this._editingController;
</del><ins>+ this._editingController = null;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _setTypeTokenAnnotatorEnabledState(shouldActivate)
</span></span></pre>
</div>
</div>
</body>
</html>