Skip to content

GitLab

T
tangled
Commit c5e54136 authored by aandrey@chromium.org's avatar aandrey@chromium.org
Browse files
Options

DevTools: Don't stop debugger inside V8 internal scripts with empty stack trace. 

R=yurys
TEST=inspector/sources/debugger/debugger-autocontinue-on-syntax-error.html, inspector/sources/debugger/debugger-step-into-v8-internals.html

Review URL: https://codereview.chromium.org/424813004

git-svn-id: svn://svn.chromium.org/blink/trunk@179137 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 05e61f73
Show whitespace changes
Inline Side-by-side
Showing with 155 additions and 96 deletions
third_party/WebKit/LayoutTests/http/tests/inspector/debugger-test.js
View file @ c5e54136
...@@ -159,6 +159,51 @@ InspectorTest.waitUntilPausedAndDumpStackAndResume = function(callback, options) ...@@ -159,6 +159,51 @@ InspectorTest.waitUntilPausedAndDumpStackAndResume = function(callback, options)
} }
}; };
InspectorTest.waitUntilPausedAndPerformSteppingActions = function(actions, callback)
{
callback = InspectorTest.safeWrap(callback);
InspectorTest.waitUntilPaused(didPause);
function didPause(callFrames, reason, breakpointIds, asyncStackTrace)
{
var action = actions.shift();
if (action === "Print") {
InspectorTest.captureStackTrace(callFrames, asyncStackTrace);
InspectorTest.addResult("");
while (action === "Print")
action = actions.shift();
}
if (!action) {
callback()
return;
}
InspectorTest.addResult("Executing " + action + "...");
switch (action) {
case "StepInto":
WebInspector.panels.sources._stepIntoButton.element.click();
break;
case "StepOver":
WebInspector.panels.sources._stepOverButton.element.click();
break;
case "StepOut":
WebInspector.panels.sources._stepOutButton.element.click();
break;
case "Resume":
WebInspector.panels.sources.togglePause();
break;
default:
InspectorTest.addResult("FAIL: Unknown action: " + action);
callback()
return;
}
InspectorTest.waitUntilResumed(InspectorTest.waitUntilPaused.bind(InspectorTest, didPause));
}
};
InspectorTest.captureStackTrace = function(callFrames, asyncStackTrace, options) InspectorTest.captureStackTrace = function(callFrames, asyncStackTrace, options)
{ {
InspectorTest.addResult(InspectorTest.captureStackTraceIntoString(callFrames, asyncStackTrace, options)); InspectorTest.addResult(InspectorTest.captureStackTraceIntoString(callFrames, asyncStackTrace, options));
......
third_party/WebKit/LayoutTests/inspector/sources/debugger/debugger-step-into-v8-internals-expected.txt 0 → 100644
View file @ c5e54136
Tests that debugger will not step into V8 internal scripts.
Set timer for test function.
Call stack:
0) (debugger-step-into-v8-internals.html:10)
Executing StepInto...
Call stack:
0) (debugger-step-into-v8-internals.html:11)
Executing StepInto...
Call stack:
0) (debugger-step-into-v8-internals.html:14)
Executing StepInto...
Call stack:
0) (debugger-step-into-v8-internals.html:15)
third_party/WebKit/LayoutTests/inspector/sources/debugger/debugger-step-into-v8-internals.html 0 → 100644
View file @ c5e54136
<html>
<head>
<script src="../../../http/tests/inspector/inspector-test.js"></script>
<script src="../../../http/tests/inspector/debugger-test.js"></script>
<script>
function testFunction()
{
Promise.resolve(42).then(function() {
debugger;
}).then(function() {
var dummy1 = 1;
var dummy2 = 2;
debugger;
});
}
function test()
{
InspectorTest.setQuiet(true);
InspectorTest.startDebuggerTest(step1);
function step1()
{
InspectorTest.runTestFunctionAndWaitUntilPaused(step2);
}
function step2()
{
var actions = [
"Print", // debugger;
"StepInto", "Print",
"StepInto", "Print",
"StepInto", "Print",
];
InspectorTest.waitUntilPausedAndPerformSteppingActions(actions, step3);
}
function step3()
{
InspectorTest.completeDebuggerTest();
}
}
</script>
</head>
<body onload="runTest()">
<input type='button' onclick='testFunction()' value='Test'/>
<p>
Tests that debugger will not step into V8 internal scripts.
</p>
</body>
</html>
third_party/WebKit/LayoutTests/inspector/sources/debugger/frameworks-step-from-framework.html
View file @ c5e54136
...@@ -28,9 +28,11 @@ function test() ...@@ -28,9 +28,11 @@ function test()
{ {
xhrPane = WebInspector.panels.sources.sidebarPanes.xhrBreakpoints; xhrPane = WebInspector.panels.sources.sidebarPanes.xhrBreakpoints;
xhrPane._setBreakpoint("foo", true); xhrPane._setBreakpoint("foo", true);
InspectorTest.runTestFunctionAndWaitUntilPaused(didPause); InspectorTest.runTestFunctionAndWaitUntilPaused(step2);
} }
function step2()
{
var actions = [ var actions = [
"Print", // debugger; "Print", // debugger;
"StepInto", "Print", "StepInto", "Print",
...@@ -40,45 +42,10 @@ function test() ...@@ -40,45 +42,10 @@ function test()
"Resume", "Print", // should stop on XHR.send() "Resume", "Print", // should stop on XHR.send()
"StepInto", "Print", // should step inside framework "StepInto", "Print", // should step inside framework
]; ];
InspectorTest.waitUntilPausedAndPerformSteppingActions(actions, step3);
function didPause(callFrames, reason, breakpointIds, asyncStackTrace)
{
var action = actions.shift();
if (action === "Print") {
InspectorTest.captureStackTrace(callFrames);
InspectorTest.addResult("");
while (action === "Print")
action = actions.shift();
}
if (!action) {
completeTest()
return;
}
InspectorTest.addResult("Executing " + action + "...");
switch (action) {
case "StepInto":
WebInspector.panels.sources._stepIntoButton.element.click();
break;
case "StepOver":
WebInspector.panels.sources._stepOverButton.element.click();
break;
case "StepOut":
WebInspector.panels.sources._stepOutButton.element.click();
break;
case "Resume":
InspectorTest.resumeExecution(InspectorTest.waitUntilPaused.bind(InspectorTest, didPause));
break;
default:
InspectorTest.addResult("FAIL: Unknown action: " + action);
completeTest()
return;
}
InspectorTest.waitUntilResumed(InspectorTest.waitUntilPaused.bind(InspectorTest, didPause));
} }
function completeTest() function step3()
{ {
xhrPane._removeBreakpoint("foo"); xhrPane._removeBreakpoint("foo");
InspectorTest.completeDebuggerTest(); InspectorTest.completeDebuggerTest();
......
third_party/WebKit/LayoutTests/inspector/sources/debugger/frameworks-steppings.html
View file @ c5e54136
...@@ -50,9 +50,11 @@ function test() ...@@ -50,9 +50,11 @@ function test()
function step1() function step1()
{ {
InspectorTest.runTestFunctionAndWaitUntilPaused(didPause); InspectorTest.runTestFunctionAndWaitUntilPaused(step2);
} }
function step2()
{
var actions = [ var actions = [
"Print", // debugger; "Print", // debugger;
"StepInto", "StepInto", "Print", // callback1 "StepInto", "StepInto", "Print", // callback1
...@@ -66,39 +68,12 @@ function test() ...@@ -66,39 +68,12 @@ function test()
"StepOver", "Print", // return to callback2 "StepOver", "Print", // return to callback2
"StepInto", "Print", // return to callback1 "StepInto", "Print", // return to callback1
]; ];
InspectorTest.waitUntilPausedAndPerformSteppingActions(actions, step3);
function didPause(callFrames, reason, breakpointIds, asyncStackTrace)
{
var action = actions.shift();
if (action === "Print") {
InspectorTest.captureStackTrace(callFrames);
InspectorTest.addResult("");
while (action === "Print")
action = actions.shift();
}
if (!action) {
InspectorTest.completeDebuggerTest();
return;
} }
InspectorTest.addResult("Executing " + action + "..."); function step3()
switch (action) { {
case "StepInto":
WebInspector.panels.sources._stepIntoButton.element.click();
break;
case "StepOver":
WebInspector.panels.sources._stepOverButton.element.click();
break;
case "StepOut":
WebInspector.panels.sources._stepOutButton.element.click();
break;
default:
InspectorTest.addResult("FAIL: Unknown action: " + action);
InspectorTest.completeDebuggerTest(); InspectorTest.completeDebuggerTest();
return;
}
InspectorTest.waitUntilResumed(InspectorTest.waitUntilPaused.bind(InspectorTest, didPause));
} }
} }
......
third_party/WebKit/Source/bindings/core/v8/ScriptDebugServer.cpp
View file @ c5e54136
...@@ -492,10 +492,6 @@ void ScriptDebugServer::handleV8DebugEvent(const v8::Debug::EventDetails& eventD ...@@ -492,10 +492,6 @@ void ScriptDebugServer::handleV8DebugEvent(const v8::Debug::EventDetails& eventD
v8::Handle<v8::Object> object = v8::Handle<v8::Object>::Cast(value); v8::Handle<v8::Object> object = v8::Handle<v8::Object>::Cast(value);
dispatchDidParseSource(listener, object, event != v8::AfterCompile ? CompileError : CompileSuccess); dispatchDidParseSource(listener, object, event != v8::AfterCompile ? CompileError : CompileSuccess);
} else if (event == v8::Exception) { } else if (event == v8::Exception) {
v8::Local<v8::StackTrace> stackTrace = v8::StackTrace::CurrentStackTrace(m_isolate, 1);
// Stack trace is empty in case of syntax error. Silently continue execution in such cases.
if (!stackTrace->GetFrameCount())
return;
v8::Handle<v8::Object> eventData = eventDetails.GetEventData(); v8::Handle<v8::Object> eventData = eventDetails.GetEventData();
v8::Handle<v8::Value> exception = callInternalGetterFunction(eventData, "exception", m_isolate); v8::Handle<v8::Value> exception = callInternalGetterFunction(eventData, "exception", m_isolate);
handleProgramBreak(ScriptState::from(eventContext), eventDetails.GetExecutionState(), exception, v8::Handle<v8::Array>()); handleProgramBreak(ScriptState::from(eventContext), eventDetails.GetExecutionState(), exception, v8::Handle<v8::Array>());
......
third_party/WebKit/Source/core/inspector/InspectorDebuggerAgent.cpp
View file @ c5e54136
...@@ -1297,7 +1297,9 @@ void InspectorDebuggerAgent::didParseSource(const String& scriptId, const Script ...@@ -1297,7 +1297,9 @@ void InspectorDebuggerAgent::didParseSource(const String& scriptId, const Script
ScriptDebugListener::SkipPauseRequest InspectorDebuggerAgent::didPause(ScriptState* scriptState, const ScriptValue& callFrames, const ScriptValue& exception, const Vector<String>& hitBreakpoints) ScriptDebugListener::SkipPauseRequest InspectorDebuggerAgent::didPause(ScriptState* scriptState, const ScriptValue& callFrames, const ScriptValue& exception, const Vector<String>& hitBreakpoints)
{ {
ScriptDebugListener::SkipPauseRequest result; ScriptDebugListener::SkipPauseRequest result;
if (m_javaScriptPauseScheduled) if (callFrames.isEmpty())
result = ScriptDebugListener::Continue; // Skip pauses inside V8 internal scripts and on syntax errors.
else if (m_javaScriptPauseScheduled)
result = ScriptDebugListener::NoSkip; // Don't skip explicit pause requests from front-end. result = ScriptDebugListener::NoSkip; // Don't skip explicit pause requests from front-end.
else if (m_skipAllPauses) else if (m_skipAllPauses)
result = ScriptDebugListener::Continue; result = ScriptDebugListener::Continue;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment