| 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 var onMessageCallbacks = {}; | 7 var onMessageCallbacks = {}; |
| 8 | 8 |
| 9 function startWorker(callback) | 9 function startWorker(callback) |
| 10 { | 10 { |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 var eventName = messageObject["method"]; | 83 var eventName = messageObject["method"]; |
| 84 var eventHandler = workerEventHandler[eventName]; | 84 var eventHandler = workerEventHandler[eventName]; |
| 85 if (eventHandler) | 85 if (eventHandler) |
| 86 eventHandler(messageObject); | 86 eventHandler(messageObject); |
| 87 } | 87 } |
| 88 } | 88 } |
| 89 | 89 |
| 90 function logInWorker(message, next) | 90 function logInWorker(message, next) |
| 91 { | 91 { |
| 92 InspectorTest.log("Logging in worker: " + message); | 92 InspectorTest.log("Logging in worker: " + message); |
| 93 InspectorTest.eventHandler["Console.messageAdded"] = onConsoleMessage; | 93 InspectorTest.eventHandler["Log.entryAdded"] = onLogEntry; |
| 94 InspectorTest.evaluateInPage("logInWorkerFromPage(\"" + message + "\")")
; | 94 InspectorTest.evaluateInPage("logInWorkerFromPage(\"" + message + "\")")
; |
| 95 | 95 |
| 96 function onConsoleMessage(payload) | 96 function onLogEntry(payload) |
| 97 { | 97 { |
| 98 InspectorTest.log("Got console message from page: " + payload.params
.message.text); | 98 InspectorTest.log("Got log message from page: " + payload.params.ent
ry.text); |
| 99 delete InspectorTest.eventHandler["Console.messageAdded"]; | 99 delete InspectorTest.eventHandler["Log.entryAdded"]; |
| 100 next(); | 100 next(); |
| 101 } | 101 } |
| 102 } | 102 } |
| 103 | 103 |
| 104 var gotMessages = []; | 104 var gotMessages = []; |
| 105 var waitingForMessage; | 105 var waitingForMessage; |
| 106 var waitingForMessageCallback; | 106 var waitingForMessageCallback; |
| 107 | 107 |
| 108 function onConsoleAPICalledFromWorker(payload) | 108 function onConsoleAPICalledFromWorker(payload) |
| 109 { | 109 { |
| (...skipping 10 matching lines...) Expand all Loading... |
| 120 next(); | 120 next(); |
| 121 return; | 121 return; |
| 122 } | 122 } |
| 123 waitingForMessage = message; | 123 waitingForMessage = message; |
| 124 waitingForMessageCallback = next; | 124 waitingForMessageCallback = next; |
| 125 } | 125 } |
| 126 | 126 |
| 127 var steps = [ | 127 var steps = [ |
| 128 function listenToConsole(next) | 128 function listenToConsole(next) |
| 129 { | 129 { |
| 130 InspectorTest.sendCommandOrDie("Console.enable", {}, next); | 130 InspectorTest.sendCommandOrDie("Log.enable", {}, next); |
| 131 }, | 131 }, |
| 132 | 132 |
| 133 function start0(next) | 133 function start0(next) |
| 134 { | 134 { |
| 135 InspectorTest.log("Starting worker"); | 135 InspectorTest.log("Starting worker"); |
| 136 InspectorTest.evaluateInPageAsync("startWorker(%callback)", next); | 136 InspectorTest.evaluateInPageAsync("startWorker(%callback)", next); |
| 137 }, | 137 }, |
| 138 | 138 |
| 139 function log0(next) | 139 function log0(next) |
| 140 { | 140 { |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 278 InspectorTest.safeWrap(nextStep)(runNextStep); | 278 InspectorTest.safeWrap(nextStep)(runNextStep); |
| 279 } | 279 } |
| 280 | 280 |
| 281 runNextStep(); | 281 runNextStep(); |
| 282 } | 282 } |
| 283 </script> | 283 </script> |
| 284 </head> | 284 </head> |
| 285 <body onload="runTest()"> | 285 <body onload="runTest()"> |
| 286 </body> | 286 </body> |
| 287 </html> | 287 </html> |
| OLD | NEW |