Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 cr.define('serviceworker', function() { | 5 cr.define('serviceworker', function() { |
| 6 'use strict'; | 6 'use strict'; |
| 7 | 7 |
| 8 function initialize() { | 8 function initialize() { |
| 9 update(); | 9 update(); |
| 10 } | 10 } |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 69 var callback = commandCallbacks[callbackId]; | 69 var callback = commandCallbacks[callbackId]; |
| 70 delete commandCallbacks[callbackId]; | 70 delete commandCallbacks[callbackId]; |
| 71 if (callback) { | 71 if (callback) { |
| 72 callback(status); | 72 callback(status); |
| 73 } | 73 } |
| 74 update(); | 74 update(); |
| 75 } | 75 } |
| 76 | 76 |
| 77 var allLogMessages = {}; | 77 var allLogMessages = {}; |
| 78 // Set log for a worker version. | 78 // Set log for a worker version. |
| 79 function fillLogForVersion(partition_id, version) { | 79 function fillLogForVersion(container, partition_id, version) { |
| 80 if (!version) { | 80 if (!version) { |
| 81 return; | 81 return; |
| 82 } | 82 } |
| 83 if (!(partition_id in allLogMessages)) { | 83 if (!(partition_id in allLogMessages)) { |
| 84 allLogMessages[partition_id] = {}; | 84 allLogMessages[partition_id] = {}; |
| 85 } | 85 } |
| 86 var logMessages = allLogMessages[partition_id]; | 86 var logMessages = allLogMessages[partition_id]; |
| 87 if (version.version_id in logMessages) { | 87 if (version.version_id in logMessages) { |
| 88 version.log = logMessages[version.version_id]; | 88 version.log = logMessages[version.version_id]; |
| 89 } else { | 89 } else { |
| 90 version.log = ''; | 90 version.log = ''; |
| 91 } | 91 } |
| 92 var logAreas = container.querySelectorAll('textarea.serviceworker-log'); | |
| 93 for (var i = 0; i < logAreas.length; ++i) { | |
| 94 var logArea = logAreas[i]; | |
| 95 if (logArea.partition_id == partition_id && | |
| 96 logArea.version_id == version.version_id) { | |
|
horo
2014/10/16 03:39:35
+2 indent
shimazu
2014/10/16 07:42:54
Done.
| |
| 97 logArea.value = version.log; | |
| 98 } | |
| 99 } | |
| 92 } | 100 } |
| 93 | 101 |
| 94 // Get the unregistered workers. | 102 // Get the unregistered workers. |
| 95 // |unregistered_registrations| will be filled with the registrations which | 103 // |unregistered_registrations| will be filled with the registrations which |
| 96 // are in |live_registrations| but not in |stored_registrations|. | 104 // are in |live_registrations| but not in |stored_registrations|. |
| 97 // |unregistered_versions| will be filled with the versions which | 105 // |unregistered_versions| will be filled with the versions which |
| 98 // are in |live_versions| but not in |stored_registrations| nor in | 106 // are in |live_versions| but not in |stored_registrations| nor in |
| 99 // |live_registrations|. | 107 // |live_registrations|. |
| 100 function getUnregisteredWorkers(stored_registrations, | 108 function getUnregisteredWorkers(stored_registrations, |
| 101 live_registrations, | 109 live_registrations, |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 150 for (var i = 0; i < container.childNodes.length; ++i) { | 158 for (var i = 0; i < container.childNodes.length; ++i) { |
| 151 if (container.childNodes[i].partition_id == partition_id) { | 159 if (container.childNodes[i].partition_id == partition_id) { |
| 152 template = container.childNodes[i]; | 160 template = container.childNodes[i]; |
| 153 } | 161 } |
| 154 } | 162 } |
| 155 // This is probably the first time we're loading. | 163 // This is probably the first time we're loading. |
| 156 if (!template) { | 164 if (!template) { |
| 157 template = jstGetTemplate('serviceworker-list-template'); | 165 template = jstGetTemplate('serviceworker-list-template'); |
| 158 container.appendChild(template); | 166 container.appendChild(template); |
| 159 } | 167 } |
| 160 var fillLogFunc = fillLogForVersion.bind(this, partition_id); | 168 var fillLogFunc = fillLogForVersion.bind(this, container, partition_id); |
| 161 stored_registrations.forEach(function(registration) { | 169 stored_registrations.forEach(function(registration) { |
| 162 [registration.active, registration.waiting].forEach(fillLogFunc); | 170 [registration.active, registration.waiting].forEach(fillLogFunc); |
| 163 }); | 171 }); |
| 164 unregistered_registrations.forEach(function(registration) { | 172 unregistered_registrations.forEach(function(registration) { |
| 165 [registration.active, registration.waiting].forEach(fillLogFunc); | 173 [registration.active, registration.waiting].forEach(fillLogFunc); |
| 166 }); | 174 }); |
| 167 unregistered_versions.forEach(fillLogFunc); | 175 unregistered_versions.forEach(fillLogFunc); |
| 168 jstProcess(new JsEvalContext({ | 176 jstProcess(new JsEvalContext({ |
| 169 stored_registrations: stored_registrations, | 177 stored_registrations: stored_registrations, |
| 170 unregistered_registrations: unregistered_registrations, | 178 unregistered_registrations: unregistered_registrations, |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 232 if (version_id in logMessages) { | 240 if (version_id in logMessages) { |
| 233 logMessages[version_id] += message; | 241 logMessages[version_id] += message; |
| 234 } else { | 242 } else { |
| 235 logMessages[version_id] = message; | 243 logMessages[version_id] = message; |
| 236 } | 244 } |
| 237 | 245 |
| 238 var logAreas = document.querySelectorAll('textarea.serviceworker-log'); | 246 var logAreas = document.querySelectorAll('textarea.serviceworker-log'); |
| 239 for (var i = 0; i < logAreas.length; ++i) { | 247 for (var i = 0; i < logAreas.length; ++i) { |
| 240 var logArea = logAreas[i]; | 248 var logArea = logAreas[i]; |
| 241 if (logArea.partition_id == partition_id && | 249 if (logArea.partition_id == partition_id && |
| 242 logArea.version_id == version_id) { | 250 logArea.version_id == version_id) { |
|
horo
2014/10/16 03:39:35
+2 indent please :)
shimazu
2014/10/16 07:42:54
Done.
| |
| 243 logArea.value += message; | 251 logArea.value += message; |
| 244 } | 252 } |
| 245 } | 253 } |
| 246 } | 254 } |
| 247 | 255 |
| 248 return { | 256 return { |
| 249 initialize: initialize, | 257 initialize: initialize, |
| 250 onOptions: onOptions, | 258 onOptions: onOptions, |
| 251 onOperationComplete: onOperationComplete, | 259 onOperationComplete: onOperationComplete, |
| 252 onPartitionData: onPartitionData, | 260 onPartitionData: onPartitionData, |
| 253 onWorkerStarted: onWorkerStarted, | 261 onWorkerStarted: onWorkerStarted, |
| 254 onWorkerStopped: onWorkerStopped, | 262 onWorkerStopped: onWorkerStopped, |
| 255 onErrorReported: onErrorReported, | 263 onErrorReported: onErrorReported, |
| 256 onConsoleMessageReported: onConsoleMessageReported, | 264 onConsoleMessageReported: onConsoleMessageReported, |
| 257 onVersionStateChanged: onVersionStateChanged, | 265 onVersionStateChanged: onVersionStateChanged, |
| 258 onRegistrationStored: onRegistrationStored, | 266 onRegistrationStored: onRegistrationStored, |
| 259 onRegistrationDeleted: onRegistrationDeleted, | 267 onRegistrationDeleted: onRegistrationDeleted, |
| 260 }; | 268 }; |
| 261 }); | 269 }); |
| 262 | 270 |
| 263 document.addEventListener('DOMContentLoaded', serviceworker.initialize); | 271 document.addEventListener('DOMContentLoaded', serviceworker.initialize); |
| OLD | NEW |