Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(427)

Unified Diff: LayoutTests/http/tests/inspector/debugger-test.js

Issue 15096004: Passing hit breakpoint IDs to ScriptDebugServer. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | LayoutTests/inspector/debugger/set-breakpoint.html » ('j') | Source/devtools/protocol.json » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: LayoutTests/http/tests/inspector/debugger-test.js
diff --git a/LayoutTests/http/tests/inspector/debugger-test.js b/LayoutTests/http/tests/inspector/debugger-test.js
index b111c0dfb9c011c56d362fe7bcf29f91bbeff743..f50be12d443acebe220d4598b3e740cc5bab13f2 100644
--- a/LayoutTests/http/tests/inspector/debugger-test.js
+++ b/LayoutTests/http/tests/inspector/debugger-test.js
@@ -71,10 +71,15 @@ InspectorTest.runDebuggerTestSuite = function(testSuite)
InspectorTest.startDebuggerTest(runner);
}
-InspectorTest.runTestFunctionAndWaitUntilPaused = function(callback)
+InspectorTest.runTestFunction = function()
{
InspectorTest.evaluateInConsole("setTimeout(testFunction, 0)");
InspectorTest.addResult("Set timer for test function.");
+}
+
+InspectorTest.runTestFunctionAndWaitUntilPaused = function(callback)
+{
+ InspectorTest.runTestFunction();
InspectorTest.waitUntilPaused(callback);
};
@@ -82,8 +87,8 @@ InspectorTest.waitUntilPaused = function(callback)
{
callback = InspectorTest.safeWrap(callback);
- if (InspectorTest._callFrames)
- callback(InspectorTest._callFrames);
+ if (InspectorTest._pausedScriptArguments)
+ callback.apply(callback, InspectorTest._pausedScriptArguments);
else
InspectorTest._waitUntilPausedCallback = callback;
};
@@ -92,7 +97,7 @@ InspectorTest.waitUntilResumed = function(callback)
{
callback = InspectorTest.safeWrap(callback);
- if (!InspectorTest._callFrames)
+ if (!InspectorTest._pausedScriptArguments)
callback();
else
InspectorTest._waitUntilResumedCallback = callback;
@@ -134,15 +139,15 @@ InspectorTest.dumpSourceFrameContents = function(sourceFrame)
InspectorTest.addResult("==Source frame contents end==");
};
-InspectorTest._pausedScript = function(callFrames, reason, auxData)
+InspectorTest._pausedScript = function(callFrames, reason, auxData, breakpointIds)
{
if (!InspectorTest._quiet)
InspectorTest.addResult("Script execution paused.");
- InspectorTest._callFrames = callFrames;
+ InspectorTest._pausedScriptArguments = [callFrames, reason, breakpointIds];
if (InspectorTest._waitUntilPausedCallback) {
var callback = InspectorTest._waitUntilPausedCallback;
delete InspectorTest._waitUntilPausedCallback;
- callback(InspectorTest._callFrames);
+ callback.apply(callback, InspectorTest._pausedScriptArguments);
}
}
@@ -150,7 +155,7 @@ InspectorTest._resumedScript = function()
{
if (!InspectorTest._quiet)
InspectorTest.addResult("Script execution resumed.");
- delete InspectorTest._callFrames;
+ delete InspectorTest._pausedScriptArguments;
if (InspectorTest._waitUntilResumedCallback) {
var callback = InspectorTest._waitUntilResumedCallback;
delete InspectorTest._waitUntilResumedCallback;
« no previous file with comments | « no previous file | LayoutTests/inspector/debugger/set-breakpoint.html » ('j') | Source/devtools/protocol.json » ('J')

Powered by Google App Engine
This is Rietveld 408576698