| OLD | NEW |
|---|
| 1 <html> | 1 <html> |
| 2 <head> | 2 <head> |
| 3 <script type="text/javascript" src="../../http/tests/inspector-protocol/inspecto
r-protocol-test.js"></script> | 3 <script type="text/javascript" src="../../http/tests/inspector-protocol/inspecto
r-protocol-test.js"></script> |
| 4 <script> | 4 <script> |
| 5 | 5 |
| 6 var worker; | 6 var worker; |
| 7 function startWorkerAndRunTest() | 7 function startWorkerAndRunTest() |
| 8 { | 8 { |
| 9 worker = new Worker("resources/dedicated-worker-string-setTimeout.js"); | 9 worker = new Worker("resources/dedicated-worker-string-setTimeout.js"); |
| 10 log("Started worker"); | 10 log("Started worker"); |
| 11 runTest(); | 11 runTest(); |
| 12 } | 12 } |
| 13 | 13 |
| 14 function test() | 14 function test() |
| 15 { | 15 { |
| 16 var workerId; | 16 var workerId; |
| 17 var workerRequestId = 1; | 17 var workerRequestId = 1; |
| 18 function sendCommandToWorker(method, params) | 18 function sendCommandToWorker(method, params) |
| 19 { | 19 { |
| 20 InspectorTest.sendCommand("Worker.sendMessageToWorker", | 20 InspectorTest.sendCommand("Target.sendMessageToTarget", |
| 21 { | 21 { |
| 22 "workerId": workerId, | 22 "targetId": workerId, |
| 23 "message": JSON.stringify({ "method": method, | 23 "message": JSON.stringify({ "method": method, |
| 24 "params": params, | 24 "params": params, |
| 25 "id": workerRequestId }) | 25 "id": workerRequestId }) |
| 26 }); | 26 }); |
| 27 return workerRequestId++; | 27 return workerRequestId++; |
| 28 } | 28 } |
| 29 | 29 |
| 30 function didEnableWorkerDebugging(messageObject) | 30 function didEnableWorkerDebugging(messageObject) |
| 31 { | 31 { |
| 32 if ("error" in messageObject) { | 32 if ("error" in messageObject) { |
| 33 InspectorTest.log("FAIL: Couldn't enable worker debugger: " + messag
eObject.error.message); | 33 InspectorTest.log("FAIL: Couldn't enable worker debugger: " + messag
eObject.error.message); |
| 34 InspectorTest.completeTest(); | 34 InspectorTest.completeTest(); |
| 35 } | 35 } |
| 36 } | 36 } |
| 37 InspectorTest.sendCommand("Worker.enable", {}, didEnableWorkerDebugging); | 37 InspectorTest.sendCommand("Target.setAutoAttach", {autoAttach: true, waitFor
DebuggerOnStart: false}, didEnableWorkerDebugging); |
| 38 | 38 |
| 39 var debuggerEnableRequestId = -1; | 39 var debuggerEnableRequestId = -1; |
| 40 InspectorTest.eventHandler["Worker.workerCreated"] = function(messageObject) | 40 InspectorTest.eventHandler["Target.attachedToTarget"] = function(messageObje
ct) |
| 41 { | 41 { |
| 42 workerId = messageObject["params"]["workerId"]; | 42 workerId = messageObject["params"]["targetInfo"]["targetId"]; |
| 43 InspectorTest.log("Worker created"); | 43 InspectorTest.log("Worker created"); |
| 44 InspectorTest.sendCommand("Worker.connectToWorker", { "workerId": worker
Id }, didConnectToWorker); | 44 InspectorTest.log("didConnectToWorker"); |
| 45 | 45 debuggerEnableRequestId = sendCommandToWorker("Debugger.enable", {}); |
| 46 function didConnectToWorker(messageObject) | |
| 47 { | |
| 48 InspectorTest.log("didConnectToWorker"); | |
| 49 debuggerEnableRequestId = sendCommandToWorker("Debugger.enable", {})
; | |
| 50 } | |
| 51 } | 46 } |
| 52 | 47 |
| 53 var postMessageToWorker = false; | 48 var postMessageToWorker = false; |
| 54 | 49 |
| 55 InspectorTest.eventHandler["Worker.dispatchMessageFromWorker"] = function(me
ssageObject) | 50 InspectorTest.eventHandler["Target.receivedMessageFromTarget"] = function(me
ssageObject) |
| 56 { | 51 { |
| 57 var message = JSON.parse(messageObject["params"]["message"]); | 52 var message = JSON.parse(messageObject["params"]["message"]); |
| 58 if (message["id"] === debuggerEnableRequestId) { | 53 if (message["id"] === debuggerEnableRequestId) { |
| 59 InspectorTest.log("Did enable debugger"); | 54 InspectorTest.log("Did enable debugger"); |
| 60 // Start setTimeout. | 55 // Start setTimeout. |
| 61 InspectorTest.sendCommand("Runtime.evaluate", { "expression": "worke
r.postMessage(1)" }, didPostMessageToWorker); | 56 InspectorTest.sendCommand("Runtime.evaluate", { "expression": "worke
r.postMessage(1)" }, didPostMessageToWorker); |
| 62 function didPostMessageToWorker() | 57 function didPostMessageToWorker() |
| 63 { | 58 { |
| 64 postMessageToWorker = true; | 59 postMessageToWorker = true; |
| 65 InspectorTest.log("Did post message to worker"); | 60 InspectorTest.log("Did post message to worker"); |
| 66 } | 61 } |
| 67 } | 62 } |
| 68 | 63 |
| 69 if (postMessageToWorker && message["method"] === "Debugger.scriptParsed"
) { | 64 if (postMessageToWorker && message["method"] === "Debugger.scriptParsed"
) { |
| 70 var sourceUrl = message["params"]["url"]; | 65 var sourceUrl = message["params"]["url"]; |
| 71 if (!sourceUrl) | 66 if (!sourceUrl) |
| 72 InspectorTest.log("SUCCESS: script created from string parameter
of setTimeout has no url"); | 67 InspectorTest.log("SUCCESS: script created from string parameter
of setTimeout has no url"); |
| 73 else | 68 else |
| 74 InspectorTest.log("FAIL: script created from string parameter of
setTimeout has url " + sourceUrl); | 69 InspectorTest.log("FAIL: script created from string parameter of
setTimeout has url " + sourceUrl); |
| 75 InspectorTest.completeTest(); | 70 InspectorTest.completeTest(); |
| 76 } | 71 } |
| 77 } | 72 } |
| 78 } | 73 } |
| 79 </script> | 74 </script> |
| 80 </head> | 75 </head> |
| 81 <body onLoad="startWorkerAndRunTest();"> | 76 <body onLoad="startWorkerAndRunTest();"> |
| 82 </body> | 77 </body> |
| 83 </html> | 78 </html> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2442083002:
[DevTools] Merge Worker domain to Target, migrate clients. (Closed)
