| Index: LayoutTests/inspector/sources/debugger/frameworks-step-from-framework.html
|
| diff --git a/LayoutTests/inspector/sources/debugger/frameworks-step-from-framework.html b/LayoutTests/inspector/sources/debugger/frameworks-step-from-framework.html
|
| index 2caad80d8ab7f3eb1af8e9c124b7ec2bd36de8cd..37ee7b5501a0aeb3c4681579e7e8d4cba5684826 100644
|
| --- a/LayoutTests/inspector/sources/debugger/frameworks-step-from-framework.html
|
| +++ b/LayoutTests/inspector/sources/debugger/frameworks-step-from-framework.html
|
| @@ -28,57 +28,24 @@ function test()
|
| {
|
| xhrPane = WebInspector.panels.sources.sidebarPanes.xhrBreakpoints;
|
| xhrPane._setBreakpoint("foo", true);
|
| - InspectorTest.runTestFunctionAndWaitUntilPaused(didPause);
|
| + InspectorTest.runTestFunctionAndWaitUntilPaused(step2);
|
| }
|
|
|
| - var actions = [
|
| - "Print", // debugger;
|
| - "StepInto", "Print",
|
| - "StepOver", "Print",
|
| - "StepOut", "Print",
|
| - "StepInto", "Print", // should not step inside
|
| - "Resume", "Print", // should stop on XHR.send()
|
| - "StepInto", "Print", // should step inside framework
|
| - ];
|
| -
|
| - function didPause(callFrames, reason, breakpointIds, asyncStackTrace)
|
| + function step2()
|
| {
|
| - 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));
|
| + var actions = [
|
| + "Print", // debugger;
|
| + "StepInto", "Print",
|
| + "StepOver", "Print",
|
| + "StepOut", "Print",
|
| + "StepInto", "Print", // should not step inside
|
| + "Resume", "Print", // should stop on XHR.send()
|
| + "StepInto", "Print", // should step inside framework
|
| + ];
|
| + InspectorTest.waitUntilPausedAndPerformSteppingActions(actions, step3);
|
| }
|
|
|
| - function completeTest()
|
| + function step3()
|
| {
|
| xhrPane._removeBreakpoint("foo");
|
| InspectorTest.completeDebuggerTest();
|
|
|