<!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>[207267] trunk</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/207267">207267</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-12 19:05:44 -0700 (Wed, 12 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: step-into `console.log(o)` should not step through inspector javascript
https://bugs.webkit.org/show_bug.cgi?id=161656
<rdar://problem/28181123>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-10-12
Reviewed by Timothy Hatcher.
Source/JavaScriptCore:
* debugger/Debugger.h:
* debugger/Debugger.cpp:
(JSC::Debugger::pauseIfNeeded):
If the Script is blacklisted skip checking if we need to pause.
(JSC::Debugger::isBlacklisted):
(JSC::Debugger::addToBlacklist):
(JSC::Debugger::clearBlacklist):
Add the ability to add a Script to a blacklist. Currently the blacklist
only prevents pausing in the Script.
* inspector/agents/InspectorDebuggerAgent.cpp:
(Inspector::isWebKitInjectedScript):
(Inspector::InspectorDebuggerAgent::didParseSource):
Always add Internal InjectedScripts to the Debugger's blacklist.
(Inspector::InspectorDebuggerAgent::clearDebuggerBreakpointState):
Clear blacklists when clearing debugger state.
LayoutTests:
* inspector/debugger/stepping/stepping-internal-scripts-expected.txt: Added.
* inspector/debugger/stepping/stepping-internal-scripts.html: Added.
Ensure step-into a console.log statement steps past it, and doesn't pause
inside the non-visible internal script.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerbreakpointsyntaxerrortoplevelhtml">trunk/LayoutTests/inspector/debugger/breakpoint-syntax-error-top-level.html</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggercpp">trunk/Source/JavaScriptCore/debugger/Debugger.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggerh">trunk/Source/JavaScriptCore/debugger/Debugger.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsinspectordebuggersteppingsteppinginternalscriptsexpectedtxt">trunk/LayoutTests/inspector/debugger/stepping/stepping-internal-scripts-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggersteppingsteppinginternalscriptshtml">trunk/LayoutTests/inspector/debugger/stepping/stepping-internal-scripts.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (207266 => 207267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-13 01:42:53 UTC (rev 207266)
+++ trunk/LayoutTests/ChangeLog 2016-10-13 02:05:44 UTC (rev 207267)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-10-12 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: step-into `console.log(o)` should not step through inspector javascript
+ https://bugs.webkit.org/show_bug.cgi?id=161656
+ <rdar://problem/28181123>
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/debugger/stepping/stepping-internal-scripts-expected.txt: Added.
+ * inspector/debugger/stepping/stepping-internal-scripts.html: Added.
+ Ensure step-into a console.log statement steps past it, and doesn't pause
+ inside the non-visible internal script.
+
</ins><span class="cx"> 2016-10-12 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, add expected file for new test after r207239
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerbreakpointsyntaxerrortoplevelhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/breakpoint-syntax-error-top-level.html (207266 => 207267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/breakpoint-syntax-error-top-level.html 2016-10-13 01:42:53 UTC (rev 207266)
+++ trunk/LayoutTests/inspector/debugger/breakpoint-syntax-error-top-level.html 2016-10-13 02:05:44 UTC (rev 207267)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> name: "TopLevelSyntaxErrorDontCrash",
</span><span class="cx"> description: "Make sure exceptions from top-level syntax errors don't cause us to crash.",
</span><span class="cx"> test: (resolve, reject) => {
</span><del>- InspectorProtocol.eventHandler["Debugger.paused"] = function(messageObject) {
</del><ins>+ InspectorProtocol.eventHandler["Debugger.paused"] = function(messageObject) {
</ins><span class="cx"> InspectorProtocol.sendCommand("Debugger.resume");
</span><span class="cx">
</span><span class="cx"> ProtocolTest.pass("Paused on the breakpoint after syntax error at top level without crashing.");
</span><span class="lines">@@ -37,6 +37,6 @@
</span><span class="cx"> </script>
</span><span class="cx"> </head>
</span><span class="cx"> <body onload="runTest()">
</span><del>-<p> Making sure we don't crash when having a top-level syntax error. </p>
</del><ins>+<p>Making sure we don't crash when having a top-level syntax error.</p>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggersteppingsteppinginternalscriptsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/debugger/stepping/stepping-internal-scripts-expected.txt (0 => 207267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/stepping/stepping-internal-scripts-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/debugger/stepping/stepping-internal-scripts-expected.txt 2016-10-13 02:05:44 UTC (rev 207267)
</span><span class="lines">@@ -0,0 +1,124 @@
</span><ins>+CONSOLE MESSAGE: line 9: [object Window]
+CONSOLE MESSAGE: line 10: [object Console]
+CONSOLE MESSAGE: line 11: string
+CONSOLE MESSAGE: line 9: [object Window]
+CONSOLE MESSAGE: line 10: [object Console]
+CONSOLE MESSAGE: line 11: string
+Checking pause locations when stepping in and over statements that make use of Internal scripts.
+
+
+== Running test suite: Debugger.stepping.internal
+-- Running test case: Debugger.stepping.internal.ConsoleLog.StepOver
+EXPRESSION: setTimeout(entryConsoleLog)
+STEPS: over, over, over, over, resume
+PAUSED (debugger-statement)
+PAUSE AT entryConsoleLog:8:5
+ 4 <script src="../resources/log-pause-location.js"></script>
+ 5 <script>
+ 6 function entryConsoleLog() {
+ -> 7 |debugger;
+ 8 console.log(window);
+ 9 console.log(console);
+ 10 console.log("string");
+
+ACTION: step-over
+PAUSE AT entryConsoleLog:9:5
+ 5 <script>
+ 6 function entryConsoleLog() {
+ 7 debugger;
+ -> 8 |console.log(window);
+ 9 console.log(console);
+ 10 console.log("string");
+ 11 }
+
+ACTION: step-over
+PAUSE AT entryConsoleLog:10:5
+ 6 function entryConsoleLog() {
+ 7 debugger;
+ 8 console.log(window);
+ -> 9 |console.log(console);
+ 10 console.log("string");
+ 11 }
+ 12
+
+ACTION: step-over
+PAUSE AT entryConsoleLog:11:5
+ 7 debugger;
+ 8 console.log(window);
+ 9 console.log(console);
+ -> 10 |console.log("string");
+ 11 }
+ 12
+ 13 // ---------
+
+ACTION: step-over
+PAUSE AT entryConsoleLog:12:2
+ 8 console.log(window);
+ 9 console.log(console);
+ 10 console.log("string");
+ -> 11 }|
+ 12
+ 13 // ---------
+ 14
+
+ACTION: resume
+RESUMED
+PASS: Should have used all steps.
+
+-- Running test case: Debugger.stepping.internal.ConsoleLog.StepIn
+EXPRESSION: setTimeout(entryConsoleLog)
+STEPS: over, in, in, in, resume
+PAUSED (debugger-statement)
+PAUSE AT entryConsoleLog:8:5
+ 4 <script src="../resources/log-pause-location.js"></script>
+ 5 <script>
+ 6 function entryConsoleLog() {
+ -> 7 |debugger;
+ 8 console.log(window);
+ 9 console.log(console);
+ 10 console.log("string");
+
+ACTION: step-over
+PAUSE AT entryConsoleLog:9:5
+ 5 <script>
+ 6 function entryConsoleLog() {
+ 7 debugger;
+ -> 8 |console.log(window);
+ 9 console.log(console);
+ 10 console.log("string");
+ 11 }
+
+ACTION: step-in
+PAUSE AT entryConsoleLog:10:5
+ 6 function entryConsoleLog() {
+ 7 debugger;
+ 8 console.log(window);
+ -> 9 |console.log(console);
+ 10 console.log("string");
+ 11 }
+ 12
+
+ACTION: step-in
+PAUSE AT entryConsoleLog:11:5
+ 7 debugger;
+ 8 console.log(window);
+ 9 console.log(console);
+ -> 10 |console.log("string");
+ 11 }
+ 12
+ 13 // ---------
+
+ACTION: step-in
+PAUSE AT entryConsoleLog:12:2
+ 8 console.log(window);
+ 9 console.log(console);
+ 10 console.log("string");
+ -> 11 }|
+ 12
+ 13 // ---------
+ 14
+
+ACTION: resume
+RESUMED
+PASS: Should have used all steps.
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggersteppingsteppinginternalscriptshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/debugger/stepping/stepping-internal-scripts.html (0 => 207267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/stepping/stepping-internal-scripts.html (rev 0)
+++ trunk/LayoutTests/inspector/debugger/stepping/stepping-internal-scripts.html 2016-10-13 02:05:44 UTC (rev 207267)
</span><span class="lines">@@ -0,0 +1,57 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../../http/tests/inspector/resources/inspector-test.js"></script>
+<script src="../resources/log-pause-location.js"></script>
+<script>
+function entryConsoleLog() {
+ debugger;
+ console.log(window);
+ console.log(console);
+ console.log("string");
+}
+
+// ---------
+
+function test()
+{
+ let suite = InspectorTest.createAsyncSuite("Debugger.stepping.internal");
+
+ window.initializeSteppingTestSuite(suite);
+
+ addSteppingTestCase({
+ name: "Debugger.stepping.internal.ConsoleLog.StepOver",
+ description: "Should be able to step over console.log statements which use the Internal InjectedScript.",
+ expression: "setTimeout(entryConsoleLog)",
+ steps: [
+ "over",
+ "over", // console.log(window)
+ "over", // console.log(console)
+ "over", // console.log("string")
+ "resume",
+ ]
+ });
+
+ addSteppingTestCase({
+ name: "Debugger.stepping.internal.ConsoleLog.StepIn",
+ description: "Should not be able to step into console.log statements which use the Internal InjectedScript.",
+ expression: "setTimeout(entryConsoleLog)",
+ steps: [
+ "over",
+ "in", // console.log(window)
+ "in", // console.log(console)
+ "in", // console.log("string")
+ "resume",
+ ]
+ });
+
+ loadMainPageContent().then(() => {
+ suite.runTestCasesAndFinish();
+ });
+}
+</script>
+</head>
+<body onload="runTest()">
+<p>Checking pause locations when stepping in and over statements that make use of Internal scripts.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (207266 => 207267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-10-13 01:42:53 UTC (rev 207266)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-10-13 02:05:44 UTC (rev 207267)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-10-12 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: step-into `console.log(o)` should not step through inspector javascript
+ https://bugs.webkit.org/show_bug.cgi?id=161656
+ <rdar://problem/28181123>
+
+ Reviewed by Timothy Hatcher.
+
+ * debugger/Debugger.h:
+ * debugger/Debugger.cpp:
+ (JSC::Debugger::pauseIfNeeded):
+ If the Script is blacklisted skip checking if we need to pause.
+
+ (JSC::Debugger::isBlacklisted):
+ (JSC::Debugger::addToBlacklist):
+ (JSC::Debugger::clearBlacklist):
+ Add the ability to add a Script to a blacklist. Currently the blacklist
+ only prevents pausing in the Script.
+
+ * inspector/agents/InspectorDebuggerAgent.cpp:
+ (Inspector::isWebKitInjectedScript):
+ (Inspector::InspectorDebuggerAgent::didParseSource):
+ Always add Internal InjectedScripts to the Debugger's blacklist.
+
+ (Inspector::InspectorDebuggerAgent::clearDebuggerBreakpointState):
+ Clear blacklists when clearing debugger state.
+
</ins><span class="cx"> 2016-10-12 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> B3 needs a special WasmBoundsCheck Opcode
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/Debugger.cpp (207266 => 207267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2016-10-13 01:42:53 UTC (rev 207266)
+++ trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2016-10-13 02:05:44 UTC (rev 207267)
</span><span class="lines">@@ -691,6 +691,10 @@
</span><span class="cx"> if (m_suppressAllPauses)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ intptr_t sourceID = DebuggerCallFrame::sourceIDForCallFrame(m_currentCallFrame);
+ if (isBlacklisted(sourceID))
+ return;
+
</ins><span class="cx"> DebuggerPausedScope debuggerPausedScope(*this);
</span><span class="cx">
</span><span class="cx"> bool pauseNow = m_pauseAtNextOpportunity;
</span><span class="lines">@@ -700,7 +704,6 @@
</span><span class="cx"> bool didHitBreakpoint = false;
</span><span class="cx">
</span><span class="cx"> Breakpoint breakpoint;
</span><del>- intptr_t sourceID = DebuggerCallFrame::sourceIDForCallFrame(m_currentCallFrame);
</del><span class="cx"> TextPosition position = DebuggerCallFrame::positionForCallFrame(m_currentCallFrame);
</span><span class="cx"> pauseNow |= didHitBreakpoint = hasBreakpoint(sourceID, position, &breakpoint);
</span><span class="cx"> m_lastExecutedLine = position.m_line.zeroBasedInt();
</span><span class="lines">@@ -912,4 +915,19 @@
</span><span class="cx"> return m_currentDebuggerCallFrame.get();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool Debugger::isBlacklisted(SourceID sourceID) const
+{
+ return m_blacklistedScripts.contains(sourceID);
+}
+
+void Debugger::addToBlacklist(SourceID sourceID)
+{
+ m_blacklistedScripts.add(sourceID);
+}
+
+void Debugger::clearBlacklist()
+{
+ m_blacklistedScripts.clear();
+}
+
</ins><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/Debugger.h (207266 => 207267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/Debugger.h 2016-10-13 01:42:53 UTC (rev 207266)
+++ trunk/Source/JavaScriptCore/debugger/Debugger.h 2016-10-13 02:05:44 UTC (rev 207267)
</span><span class="lines">@@ -110,6 +110,10 @@
</span><span class="cx"> void stepOverStatement();
</span><span class="cx"> void stepOutOfFunction();
</span><span class="cx">
</span><ins>+ bool isBlacklisted(SourceID) const;
+ void addToBlacklist(SourceID);
+ void clearBlacklist();
+
</ins><span class="cx"> bool isPaused() const { return m_isPaused; }
</span><span class="cx"> bool isStepping() const { return m_steppingMode == SteppingModeEnabled; }
</span><span class="cx">
</span><span class="lines">@@ -216,7 +220,8 @@
</span><span class="cx">
</span><span class="cx"> VM& m_vm;
</span><span class="cx"> HashSet<JSGlobalObject*> m_globalObjects;
</span><del>- HashMap<SourceID, DebuggerParseData> m_parseDataMap;
</del><ins>+ HashMap<SourceID, DebuggerParseData, WTF::IntHash<SourceID>, WTF::UnsignedWithZeroKeyHashTraits<SourceID>> m_parseDataMap;
+ HashSet<SourceID, WTF::IntHash<SourceID>, WTF::UnsignedWithZeroKeyHashTraits<SourceID>> m_blacklistedScripts;
</ins><span class="cx">
</span><span class="cx"> PauseOnExceptionsState m_pauseOnExceptionsState;
</span><span class="cx"> bool m_pauseAtNextOpportunity : 1;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp (207266 => 207267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp 2016-10-13 01:42:53 UTC (rev 207266)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp 2016-10-13 02:05:44 UTC (rev 207267)
</span><span class="lines">@@ -681,6 +681,11 @@
</span><span class="cx"> return script.sourceMappingURL;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool isWebKitInjectedScript(const String& sourceURL)
+{
+ return sourceURL.startsWith("__InjectedScript_") && sourceURL.endsWith(".js");
+}
+
</ins><span class="cx"> void InspectorDebuggerAgent::didParseSource(JSC::SourceID sourceID, const Script& script)
</span><span class="cx"> {
</span><span class="cx"> String scriptIDStr = String::number(sourceID);
</span><span class="lines">@@ -696,6 +701,9 @@
</span><span class="cx">
</span><span class="cx"> m_scripts.set(sourceID, script);
</span><span class="cx">
</span><ins>+ if (hasSourceURL && isWebKitInjectedScript(sourceURL))
+ m_scriptDebugServer.addToBlacklist(sourceID);
+
</ins><span class="cx"> String scriptURLForBreakpoints = hasSourceURL ? script.sourceURL : script.url;
</span><span class="cx"> if (scriptURLForBreakpoints.isEmpty())
</span><span class="cx"> return;
</span><span class="lines">@@ -868,6 +876,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_scriptDebugServer.clearBreakpointActions();
</span><span class="cx"> m_scriptDebugServer.clearBreakpoints();
</span><ins>+ m_scriptDebugServer.clearBlacklist();
</ins><span class="cx">
</span><span class="cx"> m_pausedScriptState = nullptr;
</span><span class="cx"> m_currentCallStack = { };
</span></span></pre>
</div>
</div>
</body>
</html>