| 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) 2012 Google Inc. All rights reserved. | 3 * Copyright (C) 2012 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 1283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1294 * @return {!Array.<V>} | 1294 * @return {!Array.<V>} |
| 1295 * @template K, V | 1295 * @template K, V |
| 1296 * @this {Map.<K, V>} | 1296 * @this {Map.<K, V>} |
| 1297 */ | 1297 */ |
| 1298 Map.prototype.valuesArray = function() | 1298 Map.prototype.valuesArray = function() |
| 1299 { | 1299 { |
| 1300 return Array.from(this.values()); | 1300 return Array.from(this.values()); |
| 1301 } | 1301 } |
| 1302 | 1302 |
| 1303 /** | 1303 /** |
| 1304 * @return {!Array.<K>} | 1304 * @return {!Array<K>} |
| 1305 * @template K, V | 1305 * @template K, V |
| 1306 * @this {Map.<K, V>} | 1306 * @this {Map<K, V>} |
| 1307 */ | 1307 */ |
| 1308 Map.prototype.keysArray = function() | 1308 Map.prototype.keysArray = function() |
| 1309 { | 1309 { |
| 1310 return Array.from(this.keys()); | 1310 return Array.from(this.keys()); |
| 1311 } | 1311 } |
| 1312 | 1312 |
| 1313 /** | 1313 /** |
| 1314 * @constructor | 1314 * @constructor |
| 1315 * @template K, V | 1315 * @template K, V |
| 1316 */ | 1316 */ |
| (...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1649 _tryMerge: function(first, second) | 1649 _tryMerge: function(first, second) |
| 1650 { | 1650 { |
| 1651 var merged = this._mergeCallback && this._mergeCallback(first, second); | 1651 var merged = this._mergeCallback && this._mergeCallback(first, second); |
| 1652 if (!merged) | 1652 if (!merged) |
| 1653 return null; | 1653 return null; |
| 1654 merged.begin = first.begin; | 1654 merged.begin = first.begin; |
| 1655 merged.end = Math.max(first.end, second.end); | 1655 merged.end = Math.max(first.end, second.end); |
| 1656 return merged; | 1656 return merged; |
| 1657 } | 1657 } |
| 1658 } | 1658 } |
| OLD | NEW |