OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2007 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007 Apple Inc. All rights reserved. |
3 * Copyright (C) 2013 Google Inc. All rights reserved. | 3 * Copyright (C) 2013 Google Inc. All rights reserved. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
7 * are met: | 7 * are met: |
8 * | 8 * |
9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
246 } | 246 } |
247 return objectId; | 247 return objectId; |
248 }, | 248 }, |
249 | 249 |
250 /** | 250 /** |
251 * @param {string} objectId | 251 * @param {string} objectId |
252 * @return {Object} | 252 * @return {Object} |
253 */ | 253 */ |
254 _parseObjectId: function(objectId) | 254 _parseObjectId: function(objectId) |
255 { | 255 { |
256 return InjectedScriptHost.evaluate("(" + objectId + ")"); | 256 // FIXME: upstream the change from InjectedScriptHost.evaluate to JSON.p
arse. |
| 257 return /** @type {Object} */ (JSON.parse(objectId)); |
257 }, | 258 }, |
258 | 259 |
259 /** | 260 /** |
260 * @param {string} objectGroupName | 261 * @param {string} objectGroupName |
261 */ | 262 */ |
262 releaseObjectGroup: function(objectGroupName) | 263 releaseObjectGroup: function(objectGroupName) |
263 { | 264 { |
264 var group = this._objectGroups[objectGroupName]; | 265 var group = this._objectGroups[objectGroupName]; |
265 if (!group) | 266 if (!group) |
266 return; | 267 return; |
(...skipping 1143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1410 */ | 1411 */ |
1411 _logEvent: function(event) | 1412 _logEvent: function(event) |
1412 { | 1413 { |
1413 inspectedWindow.console.log(event.type, event); | 1414 inspectedWindow.console.log(event.type, event); |
1414 } | 1415 } |
1415 } | 1416 } |
1416 | 1417 |
1417 injectedScript._commandLineAPIImpl = new CommandLineAPIImpl(); | 1418 injectedScript._commandLineAPIImpl = new CommandLineAPIImpl(); |
1418 return injectedScript; | 1419 return injectedScript; |
1419 }) | 1420 }) |
OLD | NEW |