| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2014 Google Inc. All rights reserved. | 2 * Copyright (C) 2014 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| 11 * copyright notice, this list of conditions and the following disclaimer | 11 * copyright notice, this list of conditions and the following disclaimer |
| 12 * in the documentation and/or other materials provided with the | 12 * in the documentation and/or other materials provided with the |
| 13 * distribution. | 13 * distribution. |
| 14 * * Neither the name of Google Inc. nor the names of its | 14 * * Neither the name of Google Inc. nor the names of its |
| 15 * contributors may be used to endorse or promote products derived from | 15 * contributors may be used to endorse or promote products derived from |
| 16 * this software without specific prior written permission. | 16 * this software without specific prior written permission. |
| 17 * | 17 * |
| 18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | 18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
| 19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | 19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
| 20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
| 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
| 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | |
| 31 /** | 30 /** |
| 32 * @constructor | 31 * @unrestricted |
| 33 * @param {string} appName | |
| 34 */ | 32 */ |
| 35 WebInspector.Worker = function(appName) | 33 WebInspector.Worker = class { |
| 36 { | 34 /** |
| 37 var url = appName + ".js"; | 35 * @param {string} appName |
| 38 var remoteBase = Runtime.queryParam("remoteBase"); | 36 */ |
| 37 constructor(appName) { |
| 38 var url = appName + '.js'; |
| 39 var remoteBase = Runtime.queryParam('remoteBase'); |
| 39 if (remoteBase) | 40 if (remoteBase) |
| 40 url += "?remoteBase=" + remoteBase; | 41 url += '?remoteBase=' + remoteBase; |
| 41 | 42 |
| 42 /** @type {!Promise<!Worker>} */ | 43 /** @type {!Promise<!Worker>} */ |
| 43 this._workerPromise = new Promise(fulfill => { | 44 this._workerPromise = new Promise(fulfill => { |
| 44 this._worker = new Worker(url); | 45 this._worker = new Worker(url); |
| 45 this._worker.onmessage = onMessage.bind(this); | 46 this._worker.onmessage = onMessage.bind(this); |
| 46 | 47 |
| 47 /** | 48 /** |
| 48 * @param {!Event} event | 49 * @param {!Event} event |
| 49 * @this {WebInspector.Worker} | 50 * @this {WebInspector.Worker} |
| 50 */ | 51 */ |
| 51 function onMessage(event) | 52 function onMessage(event) { |
| 52 { | 53 console.assert(event.data === 'workerReady'); |
| 53 console.assert(event.data === "workerReady"); | 54 this._worker.onmessage = null; |
| 54 this._worker.onmessage = null; | 55 fulfill(this._worker); |
| 55 fulfill(this._worker); | 56 // No need to hold a reference to worker anymore as it's stored in |
| 56 // No need to hold a reference to worker anymore as it's stored in | 57 // the resolved promise. |
| 57 // the resolved promise. | 58 this._worker = null; |
| 58 this._worker = null; | 59 } |
| 59 } | |
| 60 }); | 60 }); |
| 61 } |
| 62 |
| 63 /** |
| 64 * @param {*} message |
| 65 */ |
| 66 postMessage(message) { |
| 67 this._workerPromise.then(worker => { |
| 68 if (!this._disposed) |
| 69 worker.postMessage(message); |
| 70 }); |
| 71 } |
| 72 |
| 73 dispose() { |
| 74 this._disposed = true; |
| 75 this._workerPromise.then(worker => worker.terminate()); |
| 76 } |
| 77 |
| 78 terminate() { |
| 79 this.dispose(); |
| 80 } |
| 81 |
| 82 /** |
| 83 * @param {?function(!MessageEvent<*>)} listener |
| 84 */ |
| 85 set onmessage(listener) { |
| 86 this._workerPromise.then(worker => worker.onmessage = listener); |
| 87 } |
| 88 |
| 89 /** |
| 90 * @param {?function(!Event)} listener |
| 91 */ |
| 92 set onerror(listener) { |
| 93 this._workerPromise.then(worker => worker.onerror = listener); |
| 94 } |
| 61 }; | 95 }; |
| 62 | |
| 63 WebInspector.Worker.prototype = { | |
| 64 /** | |
| 65 * @param {*} message | |
| 66 */ | |
| 67 postMessage: function(message) | |
| 68 { | |
| 69 this._workerPromise.then(worker => { | |
| 70 if (!this._disposed) | |
| 71 worker.postMessage(message); | |
| 72 }); | |
| 73 }, | |
| 74 | |
| 75 dispose: function() | |
| 76 { | |
| 77 this._disposed = true; | |
| 78 this._workerPromise.then(worker => worker.terminate()); | |
| 79 }, | |
| 80 | |
| 81 terminate: function() | |
| 82 { | |
| 83 this.dispose(); | |
| 84 }, | |
| 85 | |
| 86 /** | |
| 87 * @param {?function(!MessageEvent<*>)} listener | |
| 88 */ | |
| 89 set onmessage(listener) | |
| 90 { | |
| 91 this._workerPromise.then(worker => worker.onmessage = listener); | |
| 92 }, | |
| 93 | |
| 94 /** | |
| 95 * @param {?function(!Event)} listener | |
| 96 */ | |
| 97 set onerror(listener) | |
| 98 { | |
| 99 this._workerPromise.then(worker => worker.onerror = listener); | |
| 100 } | |
| 101 }; | |
| OLD | NEW |