| 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-loop.js"); | 9 worker = new Worker("resources/dedicated-worker-loop.js"); |
| 10 worker.onmessage = function(event) | 10 worker.onmessage = function(event) |
| 11 { | 11 { |
| 12 if (event.data === "WorkerMessageReceived") | 12 if (event.data === "WorkerMessageReceived") |
| 13 evaluateInFrontend("InspectorTest.workerMessageReceived()"); | 13 evaluateInFrontend("InspectorTest.workerMessageReceived()"); |
| 14 }; | 14 }; |
| 15 log("Started worker"); | 15 log("Started worker"); |
| 16 runTest(); | 16 runTest(); |
| 17 } | 17 } |
| 18 | 18 |
| 19 function test() | 19 function test() |
| 20 { | 20 { |
| 21 var workerId; | 21 var workerId; |
| 22 var workerRequestId = 1; | 22 var workerRequestId = 1; |
| 23 function sendCommandToWorker(method, params) | 23 function sendCommandToWorker(method, params) |
| 24 { | 24 { |
| 25 InspectorTest.sendCommand("Worker.sendMessageToWorker", | 25 InspectorTest.sendCommand("Target.sendMessageToTarget", |
| 26 { | 26 { |
| 27 "workerId": workerId, | 27 "targetId": workerId, |
| 28 "message": JSON.stringify({ "method": method, | 28 "message": JSON.stringify({ "method": method, |
| 29 "params": params, | 29 "params": params, |
| 30 "id": workerRequestId }) | 30 "id": workerRequestId }) |
| 31 }); | 31 }); |
| 32 return workerRequestId++; | 32 return workerRequestId++; |
| 33 } | 33 } |
| 34 | 34 |
| 35 function didEnableWorkerDebugging(messageObject) | 35 function didEnableWorkerDebugging(messageObject) |
| 36 { | 36 { |
| 37 if ("error" in messageObject) { | 37 if ("error" in messageObject) { |
| 38 InspectorTest.log("FAIL: Couldn't enable worker debugger: " + messag
eObject.error.message); | 38 InspectorTest.log("FAIL: Couldn't enable worker debugger: " + messag
eObject.error.message); |
| 39 InspectorTest.completeTest(); | 39 InspectorTest.completeTest(); |
| 40 } | 40 } |
| 41 } | 41 } |
| 42 InspectorTest.sendCommand("Worker.enable", {}, didEnableWorkerDebugging); | 42 InspectorTest.sendCommand("Target.setAutoAttach", {autoAttach: true, waitFor
DebuggerOnStart: false}, didEnableWorkerDebugging); |
| 43 | 43 |
| 44 var evaluateRequestId = -1; | 44 var evaluateRequestId = -1; |
| 45 var debuggerEnableRequestId = -1; | 45 var debuggerEnableRequestId = -1; |
| 46 InspectorTest.eventHandler["Worker.workerCreated"] = function(messageObject) | 46 InspectorTest.eventHandler["Target.attachedToTarget"] = function(messageObje
ct) |
| 47 { | 47 { |
| 48 workerId = messageObject["params"]["workerId"]; | 48 workerId = messageObject["params"]["targetInfo"]["targetId"]; |
| 49 InspectorTest.log("Worker created"); | 49 InspectorTest.log("Worker created"); |
| 50 InspectorTest.sendCommand("Worker.connectToWorker", { "workerId": worker
Id }, didConnectToWorker); | 50 InspectorTest.log("didConnectToWorker"); |
| 51 | 51 // Enable debugger so that V8 can interrupt and handle inspector command
s while there is a script running in a tight loop. |
| 52 function didConnectToWorker(messageObject) | 52 debuggerEnableRequestId = sendCommandToWorker("Debugger.enable", {}); |
| 53 { | |
| 54 InspectorTest.log("didConnectToWorker"); | |
| 55 // Enable debugger so that V8 can interrupt and handle inspector com
mands while there is a script running in a tight loop. | |
| 56 debuggerEnableRequestId = sendCommandToWorker("Debugger.enable", {})
; | |
| 57 } | |
| 58 } | 53 } |
| 59 | 54 |
| 60 InspectorTest.workerMessageReceived = function() | 55 InspectorTest.workerMessageReceived = function() |
| 61 { | 56 { |
| 62 evaluateRequestId = sendCommandToWorker("Runtime.evaluate", { "expressio
n": "message_id > 1"}); | 57 evaluateRequestId = sendCommandToWorker("Runtime.evaluate", { "expressio
n": "message_id > 1"}); |
| 63 } | 58 } |
| 64 | 59 |
| 65 InspectorTest.eventHandler["Worker.dispatchMessageFromWorker"] = function(me
ssageObject) | 60 InspectorTest.eventHandler["Target.receivedMessageFromTarget"] = function(me
ssageObject) |
| 66 { | 61 { |
| 67 var message = JSON.parse(messageObject["params"]["message"]); | 62 var message = JSON.parse(messageObject["params"]["message"]); |
| 68 if (message["id"] === debuggerEnableRequestId) { | 63 if (message["id"] === debuggerEnableRequestId) { |
| 69 InspectorTest.log("Did enable debugger"); | 64 InspectorTest.log("Did enable debugger"); |
| 70 // Start tight loop in the worker. | 65 // Start tight loop in the worker. |
| 71 InspectorTest.sendCommand("Runtime.evaluate", { "expression": "worke
r.postMessage(1)" }, didPostMessageToWorker); | 66 InspectorTest.sendCommand("Runtime.evaluate", { "expression": "worke
r.postMessage(1)" }, didPostMessageToWorker); |
| 72 function didPostMessageToWorker() | 67 function didPostMessageToWorker() |
| 73 { | 68 { |
| 74 InspectorTest.log("Did post message to worker"); | 69 InspectorTest.log("Did post message to worker"); |
| 75 } | 70 } |
| 76 } | 71 } |
| 77 if (message["id"] === evaluateRequestId) { | 72 if (message["id"] === evaluateRequestId) { |
| 78 var value = message["result"]["result"]["value"]; | 73 var value = message["result"]["result"]["value"]; |
| 79 if (value === true) | 74 if (value === true) |
| 80 InspectorTest.log("SUCCESS: evaluated, result: " + value); | 75 InspectorTest.log("SUCCESS: evaluated, result: " + value); |
| 81 else | 76 else |
| 82 InspectorTest.log("FAIL: evaluated, result: " + value); | 77 InspectorTest.log("FAIL: evaluated, result: " + value); |
| 83 InspectorTest.completeTest(); | 78 InspectorTest.completeTest(); |
| 84 } | 79 } |
| 85 } | 80 } |
| 86 } | 81 } |
| 87 </script> | 82 </script> |
| 88 </head> | 83 </head> |
| 89 <body onLoad="startWorkerAndRunTest();"> | 84 <body onLoad="startWorkerAndRunTest();"> |
| 90 </body> | 85 </body> |
| 91 </html> | 86 </html> |
| OLD | NEW |