129052 2014-02-19 10:57:37 -0800 [JS] Convert Promise.prototype.catch to be a built-in 2014-02-19 15:26:12 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam commit-queue oldest_to_newest 982439 0 sam 2014-02-19 10:57:37 -0800 [JS] Convert Promise.prototype.catch to be a built-in 982443 1 224656 sam 2014-02-19 11:00:02 -0800 Created attachment 224656 Patch 982493 2 224656 ggaren 2014-02-19 12:15:59 -0800 Comment on attachment 224656 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=224656&action=review > Source/JavaScriptCore/builtins/Promise.prototype.js:33 > + var then = this.then; > + if (typeof then !== "function") > + throw new @TypeError("Promise.prototype.catch requires that |onRejected| be a function"); > + > + return then.@call(this, undefined, onRejected); return this.then(undefined, onRejected); 982547 3 224677 sam 2014-02-19 14:32:10 -0800 Created attachment 224677 Patch 982555 4 224677 ggaren 2014-02-19 14:47:32 -0800 Comment on attachment 224677 Patch r=me 982580 5 224677 commit-queue 2014-02-19 15:26:10 -0800 Comment on attachment 224677 Patch Clearing flags on attachment: 224677 Committed r164396: <http://trac.webkit.org/changeset/164396> 982581 6 commit-queue 2014-02-19 15:26:12 -0800 All reviewed patches have been landed. Closing bug. 224656 2014-02-19 11:00:02 -0800 2014-02-19 14:32:09 -0800 Patch bug-129052-20140219110001.patch text/plain 6965 sam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTY0Mzc0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBA CisyMDE0LTAyLTE5ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW0pT XSBDb252ZXJ0IFByb21pc2UucHJvdG90eXBlLmNhdGNoIHRvIGJlIGEgYnVpbHQtaW4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyOTA1MgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogR05VbWFrZWZpbGUu bGlzdC5hbToKKyAgICAgICAgKiBKYXZhU2NyaXB0Q29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhw cm9qOgorICAgICAgICAqIGJ1aWx0aW5zL1Byb21pc2UucHJvdG90eXBlLmpzOiBBZGRlZC4KKyAg ICAgICAgKGNhdGNoKTogQWRkIEpTIGJhc2VkIGltcGxlbWVudGF0aW9uIG9mIFByb21pc2UucHJv dG90eXBlLmNhdGNoLgorCisgICAgICAgICogcnVudGltZS9KU1Byb21pc2VQcm90b3R5cGUuY3Bw OgorICAgICAgICBSZW1vdmUgdGhlIEMrKyBpbXBsZW1lbnRhdGlvbiBvZiBQcm9taXNlLnByb3Rv dHlwZS5jYXRjaC4KKwogMjAxNC0wMi0xOSAgcGVhdm9Ab3V0bG9vay5jb20gIDxwZWF2b0BvdXRs b29rLmNvbT4KIAogICAgICAgICBbV2luXVtMTElOVF0gSW5jb3JyZWN0IHN0YWNrIGFsaWdubWVu dC4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9HTlVtYWtlZmlsZS5saXN0LmFtCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9HTlVtYWtlZmlsZS5saXN0LmFtCShyZXZp c2lvbiAxNjQzNjYpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvR05VbWFrZWZpbGUubGlzdC5h bQkod29ya2luZyBjb3B5KQpAQCAtMzksNiArMzksNyBAQCBqYXZhc2NyaXB0Y29yZV9idWlsdF9u b3NvdXJjZXMgKz0gXAogCiBqYXZhc2NyaXB0Y29yZV9idWlsdGluc19qc19ub3NvdXJjZXMgKz0g XAogCVNvdXJjZS9KYXZhU2NyaXB0Q29yZS9idWlsdGlucy9BcnJheS5wcm90b3R5cGUuanMKKwlT b3VyY2UvSmF2YVNjcmlwdENvcmUvYnVpbHRpbnMvUHJvbWlzZS5wcm90b3R5cGUuanMKIAogamF2 YXNjcmlwdGNvcmVfc291cmNlcyArPSBcCiAJU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9BUElD YWxsYmFja0Z1bmN0aW9uLmggXApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3Jp cHRDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0ph dmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHJl dmlzaW9uIDE2NDM2NikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS54 Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCSh3b3JraW5nIGNvcHkpCkBAIC0yMjY1LDYgKzIyNjUs NyBAQAogCQk3QzE4NEUyMTE3QkVFMjQwMDA3Q0I2M0EgLyogSlNQcm9taXNlQ29uc3RydWN0b3Iu aCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gSlNQcm9taXNlQ29uc3RydWN0b3Iu aDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJN0MxODRFMjQxN0JGRkEzNjAwN0NCNjNB IC8qIEpTUHJvbWlzZUNvbnN0cnVjdG9yLmx1dC5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu Y2U7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBKU1Byb21pc2VD b25zdHJ1Y3Rvci5sdXQuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJN0MxODRFMjUx N0JGRkEzNjAwN0NCNjNBIC8qIEpTUHJvbWlzZVByb3RvdHlwZS5sdXQuaCAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRo ID0gSlNQcm9taXNlUHJvdG90eXBlLmx1dC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9Owor CQk3Q0ZCQUMxQzE4QjUzNUU1MDBEMDA3NTAgLyogUHJvbWlzZS5wcm90b3R5cGUuanMgKi8gPSB7 aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5 cGUgPSBzb3VyY2Vjb2RlLmphdmFzY3JpcHQ7IHBhdGggPSBQcm9taXNlLnByb3RvdHlwZS5qczsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJN0U0RUU3MDgwRUJCNzk2MzAwNTkzNEFBIC8q IFN0cnVjdHVyZUNoYWluLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29k aW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFN0cnVj dHVyZUNoYWluLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTdFNEVFNzBFMEVCQjdB NUIwMDU5MzRBQSAvKiBTdHJ1Y3R1cmVDaGFpbi5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy ZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNw cC5jcHA7IHBhdGggPSBTdHJ1Y3R1cmVDaGFpbi5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IH07CiAJCTdFRkYwMDYzMEVDMDVBOUEwMEFBN0M5MyAvKiBOb2RlSW5mby5oICovID0ge2lzYSA9 IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0g c291cmNlY29kZS5jLmg7IHBhdGggPSBOb2RlSW5mby5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4i OyB9OwpAQCAtNDc1Niw2ICs0NzU3LDcgQEAKIAkJCQlBN0Q4MDFBMTE4ODBENjZFMDAyNkMzOUIg LyogQnVpbHRpbkV4ZWN1dGFibGVzLmNwcCAqLywKIAkJCQlBN0Q4MDFBMjE4ODBENjZFMDAyNkMz OUIgLyogQnVpbHRpbkV4ZWN1dGFibGVzLmggKi8sCiAJCQkJQTc1RUU5QjAxOEFBQjdFMjAwQUFE MDQzIC8qIEJ1aWx0aW5OYW1lcy5oICovLAorCQkJCTdDRkJBQzFDMThCNTM1RTUwMEQwMDc1MCAv KiBQcm9taXNlLnByb3RvdHlwZS5qcyAqLywKIAkJCSk7CiAJCQlwYXRoID0gYnVpbHRpbnM7CiAJ CQlzb3VyY2VUcmVlID0gIjxncm91cD4iOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J1 aWx0aW5zL1Byb21pc2UucHJvdG90eXBlLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9idWlsdGlucy9Qcm9taXNlLnByb3RvdHlwZS5qcwkocmV2aXNpb24gMCkKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9idWlsdGlucy9Qcm9taXNlLnByb3RvdHlwZS5qcwkod29ya2lu ZyBjb3B5KQpAQCAtMCwwICsxLDM0IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDE0IEFwcGxl IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNl IGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNh dGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9u cworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0 IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBj b25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1 dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAor ICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBk aXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJp YWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJF IElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycn CisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJV VCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRB QklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NM QUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUwor ICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lB TCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJV VCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1Ig U0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICog SU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJ VFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJ TkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkg T1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBU SEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworZnVuY3Rpb24gY2F0Y2gob25S ZWplY3RlZCkgeworICAgICJ1c2Ugc3RyaWN0IjsKKworICAgIHZhciB0aGVuID0gdGhpcy50aGVu OworICAgIGlmICh0eXBlb2YgdGhlbiAhPT0gImZ1bmN0aW9uIikKKyAgICAgICAgdGhyb3cgbmV3 IEBUeXBlRXJyb3IoIlByb21pc2UucHJvdG90eXBlLmNhdGNoIHJlcXVpcmVzIHRoYXQgfG9uUmVq ZWN0ZWR8IGJlIGEgZnVuY3Rpb24iKTsKKworICAgIHJldHVybiB0aGVuLkBjYWxsKHRoaXMsIHVu ZGVmaW5lZCwgb25SZWplY3RlZCk7Cit9CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9KU1Byb21pc2VQcm90b3R5cGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL0pTUHJvbWlzZVByb3RvdHlwZS5jcHAJKHJldmlzaW9uIDE2NDM2NikK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTUHJvbWlzZVByb3RvdHlwZS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTQ0LDcgKzQ0LDYgQEAgbmFtZXNwYWNlIEpTQyB7CiBTVEFUSUNf QVNTRVJUX0lTX1RSSVZJQUxMWV9ERVNUUlVDVElCTEUoSlNQcm9taXNlUHJvdG90eXBlKTsKIAog c3RhdGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgSlNQcm9taXNlUHJvdG90eXBlRnVu Y1RoZW4oRXhlY1N0YXRlKik7Ci1zdGF0aWMgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBK U1Byb21pc2VQcm90b3R5cGVGdW5jQ2F0Y2goRXhlY1N0YXRlKik7CiAKIH0KIApAQCAtMTg3LDMx ICsxODYsNiBAQCBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIEpTUHJvbWlzZVByCiAgICAg cmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc0Nhc3Q8SlNQcm9taXNlRGVmZXJyZWQqPihkZWZlcnJl ZCktPnByb21pc2UoKSk7CiB9CiAKLUVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgSlNQcm9t aXNlUHJvdG90eXBlRnVuY0NhdGNoKEV4ZWNTdGF0ZSogZXhlYykKLXsKLSAgICAvLyAtLSBQcm9t aXNlLnByb3RvdHlwZS5jYXRjaChvblJlamVjdGVkKSAtLQotCi0gICAgLy8gMS4gTGV0ICdwcm9t aXNlJyBiZSB0aGUgdGhpcyB2YWx1ZS4KLSAgICBKU1ZhbHVlIHByb21pc2UgPSBleGVjLT50aGlz VmFsdWUoKTsKLSAgICAKLSAgICAvLyAyLiBSZXR1cm4gdGhlIHJlc3VsdCBvZiBjYWxsaW5nIElu dm9rZShwcm9taXNlLCAidGhlbiIsICh1bmRlZmluZWQsIG9uUmVqZWN0ZWQpKS4KLSAgICAvLyBO T1RFOiBJbnZva2UgZG9lcyBub3Qgc2VlbSB0byBiZSBkZWZpbmVkIGFueXdoZXJlLCBzbyBJIGFt IGd1ZXNzaW5nIGhlcmUuCi0gICAgSlNWYWx1ZSB0aGVuVmFsdWUgPSBwcm9taXNlLmdldChleGVj LCBleGVjLT52bSgpLnByb3BlcnR5TmFtZXMtPnRoZW4pOwotICAgIGlmIChleGVjLT5oYWRFeGNl cHRpb24oKSkKLSAgICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc1VuZGVmaW5lZCgpKTsK LQotICAgIENhbGxEYXRhIHRoZW5DYWxsRGF0YTsKLSAgICBDYWxsVHlwZSB0aGVuQ2FsbFR5cGUg PSBnZXRDYWxsRGF0YSh0aGVuVmFsdWUsIHRoZW5DYWxsRGF0YSk7Ci0gICAgaWYgKHRoZW5DYWxs VHlwZSA9PSBDYWxsVHlwZU5vbmUpCi0gICAgICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUodGhy b3dUeXBlRXJyb3IoZXhlYykpOwotCi0gICAgTWFya2VkQXJndW1lbnRCdWZmZXIgYXJndW1lbnRz OwotICAgIGFyZ3VtZW50cy5hcHBlbmQoanNVbmRlZmluZWQoKSk7Ci0gICAgYXJndW1lbnRzLmFw cGVuZChleGVjLT5hcmd1bWVudCgwKSk7Ci0KLSAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGNh bGwoZXhlYywgdGhlblZhbHVlLCB0aGVuQ2FsbFR5cGUsIHRoZW5DYWxsRGF0YSwgcHJvbWlzZSwg YXJndW1lbnRzKSk7Ci19Ci0KIH0gLy8gbmFtZXNwYWNlIEpTQwogCiAjZW5kaWYgLy8gRU5BQkxF KFBST01JU0VTKQo= 224677 2014-02-19 14:32:10 -0800 2014-02-19 15:26:10 -0800 Patch bug-129052-20140219143209.patch text/plain 6793 sam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTY0Mzc0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBA CisyMDE0LTAyLTE5ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW0pT XSBDb252ZXJ0IFByb21pc2UucHJvdG90eXBlLmNhdGNoIHRvIGJlIGEgYnVpbHQtaW4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyOTA1MgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogR05VbWFrZWZpbGUu bGlzdC5hbToKKyAgICAgICAgKiBKYXZhU2NyaXB0Q29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhw cm9qOgorICAgICAgICAqIGJ1aWx0aW5zL1Byb21pc2UucHJvdG90eXBlLmpzOiBBZGRlZC4KKyAg ICAgICAgKGNhdGNoKTogQWRkIEpTIGJhc2VkIGltcGxlbWVudGF0aW9uIG9mIFByb21pc2UucHJv dG90eXBlLmNhdGNoLgorCisgICAgICAgICogcnVudGltZS9KU1Byb21pc2VQcm90b3R5cGUuY3Bw OgorICAgICAgICBSZW1vdmUgdGhlIEMrKyBpbXBsZW1lbnRhdGlvbiBvZiBQcm9taXNlLnByb3Rv dHlwZS5jYXRjaC4KKwogMjAxNC0wMi0xOSAgcGVhdm9Ab3V0bG9vay5jb20gIDxwZWF2b0BvdXRs b29rLmNvbT4KIAogICAgICAgICBbV2luXVtMTElOVF0gSW5jb3JyZWN0IHN0YWNrIGFsaWdubWVu dC4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9HTlVtYWtlZmlsZS5saXN0LmFtCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9HTlVtYWtlZmlsZS5saXN0LmFtCShyZXZp c2lvbiAxNjQzNjYpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvR05VbWFrZWZpbGUubGlzdC5h bQkod29ya2luZyBjb3B5KQpAQCAtMzksNiArMzksNyBAQCBqYXZhc2NyaXB0Y29yZV9idWlsdF9u b3NvdXJjZXMgKz0gXAogCiBqYXZhc2NyaXB0Y29yZV9idWlsdGluc19qc19ub3NvdXJjZXMgKz0g XAogCVNvdXJjZS9KYXZhU2NyaXB0Q29yZS9idWlsdGlucy9BcnJheS5wcm90b3R5cGUuanMKKwlT b3VyY2UvSmF2YVNjcmlwdENvcmUvYnVpbHRpbnMvUHJvbWlzZS5wcm90b3R5cGUuanMKIAogamF2 YXNjcmlwdGNvcmVfc291cmNlcyArPSBcCiAJU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9BUElD YWxsYmFja0Z1bmN0aW9uLmggXApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3Jp cHRDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0ph dmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHJl dmlzaW9uIDE2NDM2NikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS54 Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCSh3b3JraW5nIGNvcHkpCkBAIC0yMjY1LDYgKzIyNjUs NyBAQAogCQk3QzE4NEUyMTE3QkVFMjQwMDA3Q0I2M0EgLyogSlNQcm9taXNlQ29uc3RydWN0b3Iu aCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gSlNQcm9taXNlQ29uc3RydWN0b3Iu aDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJN0MxODRFMjQxN0JGRkEzNjAwN0NCNjNB IC8qIEpTUHJvbWlzZUNvbnN0cnVjdG9yLmx1dC5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu Y2U7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBKU1Byb21pc2VD b25zdHJ1Y3Rvci5sdXQuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJN0MxODRFMjUx N0JGRkEzNjAwN0NCNjNBIC8qIEpTUHJvbWlzZVByb3RvdHlwZS5sdXQuaCAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRo ID0gSlNQcm9taXNlUHJvdG90eXBlLmx1dC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9Owor CQk3Q0ZCQUMxQzE4QjUzNUU1MDBEMDA3NTAgLyogUHJvbWlzZS5wcm90b3R5cGUuanMgKi8gPSB7 aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5 cGUgPSBzb3VyY2Vjb2RlLmphdmFzY3JpcHQ7IHBhdGggPSBQcm9taXNlLnByb3RvdHlwZS5qczsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJN0U0RUU3MDgwRUJCNzk2MzAwNTkzNEFBIC8q IFN0cnVjdHVyZUNoYWluLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29k aW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFN0cnVj dHVyZUNoYWluLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTdFNEVFNzBFMEVCQjdB NUIwMDU5MzRBQSAvKiBTdHJ1Y3R1cmVDaGFpbi5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy ZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNw cC5jcHA7IHBhdGggPSBTdHJ1Y3R1cmVDaGFpbi5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IH07CiAJCTdFRkYwMDYzMEVDMDVBOUEwMEFBN0M5MyAvKiBOb2RlSW5mby5oICovID0ge2lzYSA9 IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0g c291cmNlY29kZS5jLmg7IHBhdGggPSBOb2RlSW5mby5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4i OyB9OwpAQCAtNDc1Niw2ICs0NzU3LDcgQEAKIAkJCQlBN0Q4MDFBMTE4ODBENjZFMDAyNkMzOUIg LyogQnVpbHRpbkV4ZWN1dGFibGVzLmNwcCAqLywKIAkJCQlBN0Q4MDFBMjE4ODBENjZFMDAyNkMz OUIgLyogQnVpbHRpbkV4ZWN1dGFibGVzLmggKi8sCiAJCQkJQTc1RUU5QjAxOEFBQjdFMjAwQUFE MDQzIC8qIEJ1aWx0aW5OYW1lcy5oICovLAorCQkJCTdDRkJBQzFDMThCNTM1RTUwMEQwMDc1MCAv KiBQcm9taXNlLnByb3RvdHlwZS5qcyAqLywKIAkJCSk7CiAJCQlwYXRoID0gYnVpbHRpbnM7CiAJ CQlzb3VyY2VUcmVlID0gIjxncm91cD4iOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J1 aWx0aW5zL1Byb21pc2UucHJvdG90eXBlLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9idWlsdGlucy9Qcm9taXNlLnByb3RvdHlwZS5qcwkocmV2aXNpb24gMCkKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9idWlsdGlucy9Qcm9taXNlLnByb3RvdHlwZS5qcwkod29ya2lu ZyBjb3B5KQpAQCAtMCwwICsxLDMwIEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDE0IEFwcGxl IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNl IGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNh dGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9u cworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0 IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBj b25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1 dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAor ICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBk aXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJp YWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJF IElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycn CisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJV VCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRB QklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NM QUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUwor ICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lB TCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJV VCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1Ig U0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICog SU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJ VFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJ TkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkg T1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBU SEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworZnVuY3Rpb24gY2F0Y2gob25S ZWplY3RlZCkgeworICAgICJ1c2Ugc3RyaWN0IjsKKworICAgIHJldHVybiB0aGlzLnRoZW4odW5k ZWZpbmVkLCBvblJlamVjdGVkKTsKK30KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL0pTUHJvbWlzZVByb3RvdHlwZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvSlNQcm9taXNlUHJvdG90eXBlLmNwcAkocmV2aXNpb24gMTY0MzY2KQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNQcm9taXNlUHJvdG90eXBlLmNwcAko d29ya2luZyBjb3B5KQpAQCAtNDQsNyArNDQsNiBAQCBuYW1lc3BhY2UgSlNDIHsKIFNUQVRJQ19B U1NFUlRfSVNfVFJJVklBTExZX0RFU1RSVUNUSUJMRShKU1Byb21pc2VQcm90b3R5cGUpOwogCiBz dGF0aWMgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBKU1Byb21pc2VQcm90b3R5cGVGdW5j VGhlbihFeGVjU3RhdGUqKTsKLXN0YXRpYyBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIEpT UHJvbWlzZVByb3RvdHlwZUZ1bmNDYXRjaChFeGVjU3RhdGUqKTsKIAogfQogCkBAIC0xODcsMzEg KzE4Niw2IEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgSlNQcm9taXNlUHIKICAgICBy ZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzQ2FzdDxKU1Byb21pc2VEZWZlcnJlZCo+KGRlZmVycmVk KS0+cHJvbWlzZSgpKTsKIH0KIAotRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBKU1Byb21p c2VQcm90b3R5cGVGdW5jQ2F0Y2goRXhlY1N0YXRlKiBleGVjKQotewotICAgIC8vIC0tIFByb21p c2UucHJvdG90eXBlLmNhdGNoKG9uUmVqZWN0ZWQpIC0tCi0KLSAgICAvLyAxLiBMZXQgJ3Byb21p c2UnIGJlIHRoZSB0aGlzIHZhbHVlLgotICAgIEpTVmFsdWUgcHJvbWlzZSA9IGV4ZWMtPnRoaXNW YWx1ZSgpOwotICAgIAotICAgIC8vIDIuIFJldHVybiB0aGUgcmVzdWx0IG9mIGNhbGxpbmcgSW52 b2tlKHByb21pc2UsICJ0aGVuIiwgKHVuZGVmaW5lZCwgb25SZWplY3RlZCkpLgotICAgIC8vIE5P VEU6IEludm9rZSBkb2VzIG5vdCBzZWVtIHRvIGJlIGRlZmluZWQgYW55d2hlcmUsIHNvIEkgYW0g Z3Vlc3NpbmcgaGVyZS4KLSAgICBKU1ZhbHVlIHRoZW5WYWx1ZSA9IHByb21pc2UuZ2V0KGV4ZWMs IGV4ZWMtPnZtKCkucHJvcGVydHlOYW1lcy0+dGhlbik7Ci0gICAgaWYgKGV4ZWMtPmhhZEV4Y2Vw dGlvbigpKQotICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzVW5kZWZpbmVkKCkpOwot Ci0gICAgQ2FsbERhdGEgdGhlbkNhbGxEYXRhOwotICAgIENhbGxUeXBlIHRoZW5DYWxsVHlwZSA9 IGdldENhbGxEYXRhKHRoZW5WYWx1ZSwgdGhlbkNhbGxEYXRhKTsKLSAgICBpZiAodGhlbkNhbGxU eXBlID09IENhbGxUeXBlTm9uZSkKLSAgICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZSh0aHJv d1R5cGVFcnJvcihleGVjKSk7Ci0KLSAgICBNYXJrZWRBcmd1bWVudEJ1ZmZlciBhcmd1bWVudHM7 Ci0gICAgYXJndW1lbnRzLmFwcGVuZChqc1VuZGVmaW5lZCgpKTsKLSAgICBhcmd1bWVudHMuYXBw ZW5kKGV4ZWMtPmFyZ3VtZW50KDApKTsKLQotICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoY2Fs bChleGVjLCB0aGVuVmFsdWUsIHRoZW5DYWxsVHlwZSwgdGhlbkNhbGxEYXRhLCBwcm9taXNlLCBh cmd1bWVudHMpKTsKLX0KLQogfSAvLyBuYW1lc3BhY2UgSlNDCiAKICNlbmRpZiAvLyBFTkFCTEUo UFJPTUlTRVMpCg==