<!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>[179396] 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/179396">179396</a></dd>
<dt>Author</dt> <dd>saambarati1@gmail.com</dd>
<dt>Date</dt> <dd>2015-01-29 23:24:20 -0800 (Thu, 29 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Allow text selection when the BasicBlockAnnotator is enabled
https://bugs.webkit.org/show_bug.cgi?id=140987
Reviewed by Timothy Hatcher.
Because the BasicBlockAnnotator no longer sets the background color of
lines that haven't executed to gray, text selection while the
BasicBlockAnnotator is enabled no longer results in a bad user interface.
This patch both allows text selection while the BasicBlockAnnotator is
enabled and also removes the now unused listeners to CodeMirror's focus
and blur events.
* UserInterface/Views/SourceCodeTextEditor.js:
(WebInspector.SourceCodeTextEditor):
(WebInspector.SourceCodeTextEditor.prototype._setTypeTokenAnnotatorEnabledState):
(WebInspector.SourceCodeTextEditor.prototype._makeTypeTokenScrollEventHandler.scrollHandler):
(WebInspector.SourceCodeTextEditor.prototype._makeTypeTokenScrollEventHandler):
(WebInspector.SourceCodeTextEditor.prototype.gainedFocus): Deleted.
(WebInspector.SourceCodeTextEditor.prototype.lostFocus): Deleted.
* UserInterface/Views/TextEditor.js:
(WebInspector.TextEditor):
(WebInspector.TextEditor.prototype.gainedFocus): Deleted.
(WebInspector.TextEditor.prototype.lostFocus): Deleted.</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>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTextEditorjs">trunk/Source/WebInspectorUI/UserInterface/Views/TextEditor.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (179395 => 179396)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-01-30 07:23:00 UTC (rev 179395)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-01-30 07:24:20 UTC (rev 179396)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2015-01-29 Saam Barati <saambarati1@gmail.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Allow text selection when the BasicBlockAnnotator is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=140987
+
+ Reviewed by Timothy Hatcher.
+
+ Because the BasicBlockAnnotator no longer sets the background color of
+ lines that haven't executed to gray, text selection while the
+ BasicBlockAnnotator is enabled no longer results in a bad user interface.
+ This patch both allows text selection while the BasicBlockAnnotator is
+ enabled and also removes the now unused listeners to CodeMirror's focus
+ and blur events.
+
+ * UserInterface/Views/SourceCodeTextEditor.js:
+ (WebInspector.SourceCodeTextEditor):
+ (WebInspector.SourceCodeTextEditor.prototype._setTypeTokenAnnotatorEnabledState):
+ (WebInspector.SourceCodeTextEditor.prototype._makeTypeTokenScrollEventHandler.scrollHandler):
+ (WebInspector.SourceCodeTextEditor.prototype._makeTypeTokenScrollEventHandler):
+ (WebInspector.SourceCodeTextEditor.prototype.gainedFocus): Deleted.
+ (WebInspector.SourceCodeTextEditor.prototype.lostFocus): Deleted.
+ * UserInterface/Views/TextEditor.js:
+ (WebInspector.TextEditor):
+ (WebInspector.TextEditor.prototype.gainedFocus): Deleted.
+ (WebInspector.TextEditor.prototype.lostFocus): Deleted.
+
+2015-01-29 Saam Barati <saambarati1@gmail.com>
+
</ins><span class="cx"> Web Inspector: Make BasicBlockAnnotator lessen the saturation of syntax highlighting instead of graying out unexecuted code
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=141011
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js (179395 => 179396)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2015-01-30 07:23:00 UTC (rev 179395)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2015-01-30 07:24:20 UTC (rev 179396)
</span><span class="lines">@@ -42,8 +42,6 @@
</span><span class="cx">
</span><span class="cx"> this._isProbablyMinified = false;
</span><span class="cx">
</span><del>- this._hasFocus = false;
-
</del><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">@@ -279,20 +277,6 @@
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><del>- gainedFocus: function()
- {
- this._hasFocus = true;
- if (this._basicBlockAnnotator)
- this._basicBlockAnnotator.clear();
- },
-
- lostFocus: function()
- {
- this._hasFocus = false;
- if (this._basicBlockAnnotator && WebInspector.showJavaScriptTypeInformationSetting.value)
- this._basicBlockAnnotator.resume();
- },
-
</del><span class="cx"> toggleTypeAnnotations: function()
</span><span class="cx"> {
</span><span class="cx"> if (!this._typeTokenAnnotator)
</span><span class="lines">@@ -1595,7 +1579,7 @@
</span><span class="cx"> RuntimeAgent.enableTypeProfiler();
</span><span class="cx">
</span><span class="cx"> this._typeTokenAnnotator.reset();
</span><del>- if (this._basicBlockAnnotator && !this._hasFocus) {
</del><ins>+ if (this._basicBlockAnnotator) {
</ins><span class="cx"> console.assert(!this._basicBlockAnnotator.isActive());
</span><span class="cx"> this._basicBlockAnnotator.reset();
</span><span class="cx"> }
</span><span class="lines">@@ -1690,7 +1674,7 @@
</span><span class="cx"> timeoutIdentifier = null;
</span><span class="cx"> if (this._typeTokenAnnotator)
</span><span class="cx"> this._typeTokenAnnotator.resume();
</span><del>- if (!this._hasFocus && this._basicBlockAnnotator)
</del><ins>+ if (this._basicBlockAnnotator)
</ins><span class="cx"> this._basicBlockAnnotator.resume();
</span><span class="cx"> }.bind(this), WebInspector.SourceCodeTextEditor.DurationToUpdateTypeTokensAfterScrolling);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTextEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TextEditor.js (179395 => 179396)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TextEditor.js 2015-01-30 07:23:00 UTC (rev 179395)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TextEditor.js 2015-01-30 07:24:20 UTC (rev 179396)
</span><span class="lines">@@ -45,8 +45,6 @@
</span><span class="cx"> this._codeMirror.on("change", this._contentChanged.bind(this));
</span><span class="cx"> this._codeMirror.on("gutterClick", this._gutterMouseDown.bind(this));
</span><span class="cx"> this._codeMirror.on("gutterContextMenu", this._gutterContextMenu.bind(this));
</span><del>- this._codeMirror.on("focus", this.gainedFocus.bind(this));
- this._codeMirror.on("blur", this.lostFocus.bind(this));
</del><span class="cx"> this._codeMirror.getScrollerElement().addEventListener("click", this._openClickedLinks.bind(this), true);
</span><span class="cx">
</span><span class="cx"> this._completionController = new WebInspector.CodeMirrorCompletionController(this._codeMirror, this);
</span><span class="lines">@@ -827,16 +825,6 @@
</span><span class="cx"> this._codeMirror.operation(prettyPrintAndUpdateEditor.bind(this));
</span><span class="cx"> },
</span><span class="cx">
</span><del>- gainedFocus: function()
- {
- // Implemented by subclasses.
- },
-
- lostFocus: function()
- {
- // Implemented by subclasses.
- },
-
</del><span class="cx"> // Private
</span><span class="cx">
</span><span class="cx"> hasEdits: function()
</span></span></pre>
</div>
</div>
</body>
</html>