Index: LayoutTests/inspector/sources/debugger/frameworks-step-into-skips-setTimeout.html |
diff --git a/LayoutTests/inspector/sources/debugger/frameworks-step-from-framework.html b/LayoutTests/inspector/sources/debugger/frameworks-step-into-skips-setTimeout.html |
similarity index 56% |
copy from LayoutTests/inspector/sources/debugger/frameworks-step-from-framework.html |
copy to LayoutTests/inspector/sources/debugger/frameworks-step-into-skips-setTimeout.html |
index b3c1175158efb1c8a88261175e353a1c2474e69f..5bc7d344139698a676c6c9db8aa599deb04d1239 100644 |
--- a/LayoutTests/inspector/sources/debugger/frameworks-step-from-framework.html |
+++ b/LayoutTests/inspector/sources/debugger/frameworks-step-into-skips-setTimeout.html |
@@ -5,12 +5,24 @@ |
<script src="resources/framework.js"></script> |
<script> |
+var counter = 0; |
+ |
function testFunction() |
{ |
- Framework.safeRun(Framework.breakInFramework, Framework.empty) |
- Framework.safeRun(Framework.empty); // should not step inside |
- Framework.empty(); // dummy call |
- Framework.sendXHR('/foo?a=b'); |
+ Framework.scheduleUntilDone(callback, 0); |
+} |
+ |
+function callback() |
+{ |
+ ++counter; |
+ if (counter === 1) |
+ stop(); |
+ return counter === 2; |
+} |
+ |
+function stop() |
+{ |
+ debugger; |
} |
function test() |
@@ -18,15 +30,10 @@ function test() |
var frameworkRegexString = "/framework\\.js$"; |
WebInspector.settings.skipStackFramesPattern.set(frameworkRegexString); |
- InspectorTest.setQuiet(true); |
- InspectorTest.startDebuggerTest(step1); |
- |
- var xhrPane; |
+ InspectorTest.startDebuggerTest(step1, true); |
function step1() |
{ |
- xhrPane = WebInspector.panels.sources.sidebarPanes.xhrBreakpoints; |
- xhrPane._setBreakpoint("foo", true); |
InspectorTest.runTestFunctionAndWaitUntilPaused(step2); |
} |
@@ -34,19 +41,15 @@ function test() |
{ |
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 |
+ "StepInto", "Print", |
+ "StepInto", "Print", // Should NOT stop on setTimeout() inside framework |
]; |
InspectorTest.waitUntilPausedAndPerformSteppingActions(actions, step3); |
} |
function step3() |
{ |
- xhrPane._removeBreakpoint("foo"); |
InspectorTest.completeDebuggerTest(); |
} |
} |
@@ -57,7 +60,7 @@ function test() |
<body onload="runTest()"> |
<input type='button' onclick='testFunction()' value='Test'/> |
<p> |
-Tests stepping from framework call frames. |
+Tests that stepping into blackboxed framework will not pause on setTimeout() inside the framework. |
</p> |
</body> |
</html> |