<!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>[198555] 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/198555">198555</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2016-03-22 14:44:19 -0700 (Tue, 22 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Consider Automation script names as internal and hide them
https://bugs.webkit.org/show_bug.cgi?id=155753
rdar://problem/25293310
Reviewed by Joseph Pecoraro.
* UserInterface/Base/Utilities.js:
(isWebKitInternalScript): Renamed from isWebInspectorDebugScript.
Check for "__Web" prefix and "__" suffix.
* UserInterface/Controllers/DebuggerManager.js:
(WebInspector.DebuggerManager):
(WebInspector.DebuggerManager.prototype.get knownNonResourceScripts):
(WebInspector.DebuggerManager.prototype.reset):
(WebInspector.DebuggerManager.prototype.debuggerDidPause):
(WebInspector.DebuggerManager.prototype.scriptDidParse):
(WebInspector.DebuggerManager.prototype._debugUIEnabledDidChange):
Renamed _inspectorDebugScripts to _internalWebKitScripts. And renamed
isWebInspectorDebugScript to isWebKitInternalScript.
* UserInterface/Protocol/RemoteObject.js:
(WebInspector.RemoteObject.prototype.findFunctionSourceCodeLocation):
Renamed isWebInspectorDebugScript to isWebKitInternalScript.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseUtilitiesjs">trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersDebuggerManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolRemoteObjectjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/RemoteObject.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (198554 => 198555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-03-22 21:42:06 UTC (rev 198554)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-03-22 21:44:19 UTC (rev 198555)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-03-22 Timothy Hatcher <timothy@apple.com>
+
+ Web Inspector: Consider Automation script names as internal and hide them
+
+ https://bugs.webkit.org/show_bug.cgi?id=155753
+ rdar://problem/25293310
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Base/Utilities.js:
+ (isWebKitInternalScript): Renamed from isWebInspectorDebugScript.
+ Check for "__Web" prefix and "__" suffix.
+
+ * UserInterface/Controllers/DebuggerManager.js:
+ (WebInspector.DebuggerManager):
+ (WebInspector.DebuggerManager.prototype.get knownNonResourceScripts):
+ (WebInspector.DebuggerManager.prototype.reset):
+ (WebInspector.DebuggerManager.prototype.debuggerDidPause):
+ (WebInspector.DebuggerManager.prototype.scriptDidParse):
+ (WebInspector.DebuggerManager.prototype._debugUIEnabledDidChange):
+ Renamed _inspectorDebugScripts to _internalWebKitScripts. And renamed
+ isWebInspectorDebugScript to isWebKitInternalScript.
+
+ * UserInterface/Protocol/RemoteObject.js:
+ (WebInspector.RemoteObject.prototype.findFunctionSourceCodeLocation):
+ Renamed isWebInspectorDebugScript to isWebKitInternalScript.
+
</ins><span class="cx"> 2016-03-22 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: REGRESSION: Shift + Click on record button should create a new recording
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseUtilitiesjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js (198554 => 198555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js 2016-03-22 21:42:06 UTC (rev 198554)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js 2016-03-22 21:44:19 UTC (rev 198555)
</span><span class="lines">@@ -1186,9 +1186,9 @@
</span><span class="cx"> return url === "__WebInspectorInternal__";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function isWebInspectorDebugScript(url)
</del><ins>+function isWebKitInternalScript(url)
</ins><span class="cx"> {
</span><del>- return url && url.startsWith("__WebInspector");
</del><ins>+ return url && url.startsWith("__Web") && url.endsWith("__");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function isFunctionStringNativeCode(str)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersDebuggerManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js (198554 => 198555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js 2016-03-22 21:42:06 UTC (rev 198554)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js 2016-03-22 21:44:19 UTC (rev 198555)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> this._pauseReason = null;
</span><span class="cx"> this._pauseData = null;
</span><span class="cx">
</span><del>- this._inspectorDebugScripts = [];
</del><ins>+ this._internalWebKitScripts = [];
</ins><span class="cx"> this._scriptIdMap = new Map;
</span><span class="cx"> this._scriptURLMap = new Map;
</span><span class="cx">
</span><span class="lines">@@ -327,7 +327,7 @@
</span><span class="cx"> for (let script of this._scriptIdMap.values()) {
</span><span class="cx"> if (script.resource)
</span><span class="cx"> continue;
</span><del>- if (!WebInspector.isDebugUIEnabled() && isWebInspectorDebugScript(script.url))
</del><ins>+ if (!WebInspector.isDebugUIEnabled() && isWebKitInternalScript(script.url))
</ins><span class="cx"> continue;
</span><span class="cx"> knownScripts.push(script);
</span><span class="cx"> }
</span><span class="lines">@@ -447,7 +447,7 @@
</span><span class="cx"> this._pauseReason = null;
</span><span class="cx"> this._pauseData = null;
</span><span class="cx">
</span><del>- this._inspectorDebugScripts = [];
</del><ins>+ this._internalWebKitScripts = [];
</ins><span class="cx"> this._scriptIdMap.clear();
</span><span class="cx"> this._scriptURLMap.clear();
</span><span class="cx">
</span><span class="lines">@@ -497,7 +497,7 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> // Exclude the case where the call frame is in the inspector code.
</span><del>- if (!WebInspector.isDebugUIEnabled() && isWebInspectorDebugScript(sourceCodeLocation.sourceCode.url))
</del><ins>+ if (!WebInspector.isDebugUIEnabled() && isWebKitInternalScript(sourceCodeLocation.sourceCode.url))
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> let scopeChain = this._scopeChainFromPayload(callFramePayload.scopeChain);
</span><span class="lines">@@ -556,8 +556,8 @@
</span><span class="cx"> scripts.push(script);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (isWebInspectorDebugScript(script.url)) {
- this._inspectorDebugScripts.push(script);
</del><ins>+ if (isWebKitInternalScript(script.url)) {
+ this._internalWebKitScripts.push(script);
</ins><span class="cx"> if (!WebInspector.isDebugUIEnabled())
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -925,7 +925,7 @@
</span><span class="cx"> _debugUIEnabledDidChange()
</span><span class="cx"> {
</span><span class="cx"> let eventType = WebInspector.isDebugUIEnabled() ? WebInspector.DebuggerManager.Event.ScriptAdded : WebInspector.DebuggerManager.Event.ScriptRemoved;
</span><del>- for (let script of this._inspectorDebugScripts)
</del><ins>+ for (let script of this._internalWebKitScripts)
</ins><span class="cx"> this.dispatchEventToListeners(eventType, {script});
</span><span class="cx"> }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolRemoteObjectjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/RemoteObject.js (198554 => 198555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/RemoteObject.js 2016-03-22 21:42:06 UTC (rev 198554)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/RemoteObject.js 2016-03-22 21:44:19 UTC (rev 198555)
</span><span class="lines">@@ -513,7 +513,7 @@
</span><span class="cx"> var location = response.location;
</span><span class="cx"> var sourceCode = WebInspector.debuggerManager.scriptForIdentifier(location.scriptId);
</span><span class="cx">
</span><del>- if (!sourceCode || (!WebInspector.isDebugUIEnabled() && isWebInspectorDebugScript(sourceCode.url))) {
</del><ins>+ if (!sourceCode || (!WebInspector.isDebugUIEnabled() && isWebKitInternalScript(sourceCode.url))) {
</ins><span class="cx"> result.resolve(WebInspector.RemoteObject.SourceCodeLocationPromise.NoSourceFound);
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>