Web Inspector: Console Evaluation links in the Console should not show normally
https://bugs.webkit.org/show_bug.cgi?id=157483
Reviewed by Matt Baker.
* UserInterface/Models/CallFrame.js:
(WebInspector.CallFrame):
(WebInspector.CallFrame.prototype.get isConsoleEvaluation):
(WebInspector.CallFrame.fromDebuggerPayload):
(WebInspector.CallFrame.fromPayload):
Move console evaluation check to the constructor for consistency.
* UserInterface/Views/ConsoleMessageView.js:
(WebInspector.ConsoleMessageView.prototype._appendLocationLink):
* UserInterface/Views/StackTraceView.js:
(WebInspector.StackTraceView):
Only add CallFrameView elements if the corresponding CallFame is not a console evaluation.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@214093 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
index e7f3dbb..d600003 100644
--- a/Source/WebInspectorUI/ChangeLog
+++ b/Source/WebInspectorUI/ChangeLog
@@ -1,3 +1,23 @@
+2017-03-16 Devin Rousso <webkit@devinrousso.com>
+
+ Web Inspector: Console Evaluation links in the Console should not show normally
+ https://bugs.webkit.org/show_bug.cgi?id=157483
+
+ Reviewed by Matt Baker.
+
+ * UserInterface/Models/CallFrame.js:
+ (WebInspector.CallFrame):
+ (WebInspector.CallFrame.prototype.get isConsoleEvaluation):
+ (WebInspector.CallFrame.fromDebuggerPayload):
+ (WebInspector.CallFrame.fromPayload):
+ Move console evaluation check to the constructor for consistency.
+
+ * UserInterface/Views/ConsoleMessageView.js:
+ (WebInspector.ConsoleMessageView.prototype._appendLocationLink):
+ * UserInterface/Views/StackTraceView.js:
+ (WebInspector.StackTraceView):
+ Only add CallFrameView elements if the corresponding CallFame is not a console evaluation.
+
2017-03-16 Matt Baker <mattbaker@apple.com>
Web Inspector: REGRESSION (r213691): Saving DOM breakpoints broken after refactoring
diff --git a/Source/WebInspectorUI/UserInterface/Models/CallFrame.js b/Source/WebInspectorUI/UserInterface/Models/CallFrame.js
index 67778a6b..0c3eec0 100644
--- a/Source/WebInspectorUI/UserInterface/Models/CallFrame.js
+++ b/Source/WebInspectorUI/UserInterface/Models/CallFrame.js
@@ -34,6 +34,12 @@
console.assert(!thisObject || thisObject instanceof WebInspector.RemoteObject);
console.assert(!scopeChain || scopeChain instanceof Array);
+ this._isConsoleEvaluation = sourceCodeLocation && isWebInspectorConsoleEvaluationScript(sourceCodeLocation.sourceCode.sourceURL);
+ if (this._isConsoleEvaluation) {
+ functionName = WebInspector.UIString("Console Evaluation");
+ programCode = true;
+ }
+
this._target = target;
this._id = id || null;
this._sourceCodeLocation = sourceCodeLocation || null;
@@ -56,6 +62,7 @@
get thisObject() { return this._thisObject; }
get scopeChain() { return this._scopeChain; }
get isTailDeleted() { return this._isTailDeleted; }
+ get isConsoleEvaluation() { return this._isConsoleEvaluation; }
saveIdentityToCookie()
{
@@ -204,12 +211,6 @@
let nativeCode = false;
let programCode = WebInspector.CallFrame.programCodeFromPayload(payload);
let isTailDeleted = payload.isTailDeleted;
-
- if (sourceCodeLocation && isWebInspectorConsoleEvaluationScript(sourceCodeLocation.sourceCode.sourceURL)) {
- functionName = WebInspector.UIString("Console Evaluation");
- programCode = true;
- }
-
return new WebInspector.CallFrame(target, id, sourceCodeLocation, functionName, thisObject, scopeChain, nativeCode, programCode, isTailDeleted);
}
@@ -250,11 +251,10 @@
}
}
- if (sourceCodeLocation && isWebInspectorConsoleEvaluationScript(sourceCodeLocation.sourceCode.sourceURL)) {
- functionName = WebInspector.UIString("Console Evaluation");
- programCode = true;
- }
-
- return new WebInspector.CallFrame(target, null, sourceCodeLocation, functionName, null, null, nativeCode, programCode);
+ const id = null;
+ const thisObject = null;
+ const scopeChain = null;
+ const isTailDeleted = false;
+ return new WebInspector.CallFrame(target, id, sourceCodeLocation, functionName, thisObject, scopeChain, nativeCode, programCode, isTailDeleted);
}
};
diff --git a/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js b/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js
index 0fa66f6..d323de3 100644
--- a/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js
+++ b/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js
@@ -343,7 +343,7 @@
});
}
- if (callFrame) {
+ if (callFrame && (!callFrame.isConsoleEvaluation || WebInspector.isDebugUIEnabled())) {
const showFunctionName = !!callFrame.functionName;
var locationElement = new WebInspector.CallFrameView(callFrame, showFunctionName);
locationElement.classList.add("console-message-location");
diff --git a/Source/WebInspectorUI/UserInterface/Views/StackTraceView.js b/Source/WebInspectorUI/UserInterface/Views/StackTraceView.js
index 54df5f3..49a70fd 100644
--- a/Source/WebInspectorUI/UserInterface/Views/StackTraceView.js
+++ b/Source/WebInspectorUI/UserInterface/Views/StackTraceView.js
@@ -35,6 +35,8 @@
for (var callFrame of stackTrace.callFrames) {
if (!callFrame.sourceCodeLocation && callFrame.functionName === null)
continue;
+ if (callFrame.isConsoleEvaluation && !WebInspector.isDebugUIEnabled())
+ continue;
var callFrameElement = new WebInspector.CallFrameView(callFrame, true);
element.appendChild(callFrameElement);
