224265 2021-04-06 20:54:05 -0700 [METAL ANGLE] Interface block declerations need to have children marked as struct accesses. Add implicit backing textures for multisample render targets 2021-04-07 12:15:21 -0700 1 1 1 Unclassified WebKit ANGLE WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 johncunningham webkit-unassigned dino ews-watchlist graouts kkinnunen kondapallykalyan webkit-bug-importer oldest_to_newest 1747753 0 johncunningham 2021-04-06 20:54:05 -0700 [METAL ANGLE] Interface block declerations need to have children marked as struct accesses. Add implicit backing textures for multisample render targets 1747755 1 425350 johncunningham 2021-04-06 20:57:32 -0700 Created attachment 425350 Patch 1747757 2 ews-watchlist 2021-04-06 20:58:29 -0700 Note that there are important steps to take when updating ANGLE. See https://trac.webkit.org/wiki/UpdatingANGLE 1747759 3 johncunningham 2021-04-06 21:01:15 -0700 Eventually this logic could be smarter. We may not always need to resolve and store the multisample texture, and the same for loading. 1747760 4 johncunningham 2021-04-06 21:01:24 -0700 Eventually this logic could be smarter. We may not always need to resolve and store the multisample texture, and the same for loading. 1747767 5 425353 johncunningham 2021-04-06 22:02:36 -0700 Created attachment 425353 Patch 1747771 6 425356 johncunningham 2021-04-06 22:29:01 -0700 Created attachment 425356 Patch 1748000 7 ews-feeder 2021-04-07 12:00:37 -0700 Committed r275617: <https://commits.webkit.org/r275617> All reviewed patches have been landed. Closing bug and clearing flags on attachment 425356. 1748002 8 webkit-bug-importer 2021-04-07 12:02:35 -0700 <rdar://problem/76359030> 1748004 9 kpiddington 2021-04-07 12:15:21 -0700 *** Bug 223922 has been marked as a duplicate of this bug. *** 425350 2021-04-06 20:57:32 -0700 2021-04-06 22:02:34 -0700 Patch bug-224265-20210406205731.patch text/plain 4395 johncunningham U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1NTg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggNmI4ZWFjZDZkNmVkYTZmODdkNGQwOWM3MzY1MDc2M2QwNWNlMWMyYi4uY2Q4MTBkNWNmZDgw NjM1YzA5NGEwMTE0YjkzMWJkNzA4MGFkYThkNSAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTA0LTA2ICBKb2huIEN1bm5pbmdoYW0gIDxqb2huY3Vu bmlnaGFtQGFwcGxlLmNvbT4KKworICAgICAgICBbTUVUQUwgQU5HTEVdIEludGVyZmFjZSBibG9j ayBkZWNsZXJhdGlvbnMgbmVlZCB0byBoYXZlIGNoaWxkcmVuIG1hcmtlZCBhcyBzdHJ1Y3QgYWNj ZXNzZXMuIEFkZCBpbXBsaWNpdCBiYWNraW5nIHRleHR1cmVzIGZvciBtdWx0aXNhbXBsZSByZW5k ZXIgdGFyZ2V0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjI0MjY1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBzcmMvY29tcGlsZXIvdHJhbnNsYXRvci9UcmFuc2xhdG9yTWV0YWxEaXJlY3QvUmVkdWNl SW50ZXJmYWNlQmxvY2tzLmNwcDoKKyAgICAgICAgKiBzcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0 YWwvRnJhbWVCdWZmZXJNdGwubW06CisgICAgICAgIChyeDo6RnJhbWVidWZmZXJNdGw6OnNldExv YWRTdG9yZUFjdGlvbk9uUmVuZGVyUGFzc0ZpcnN0U3RhcnQpOgorICAgICAgICAqIHNyYy9saWJB TkdMRS9yZW5kZXJlci9tZXRhbC9SZW5kZXJCdWZmZXJNdGwubW06CisgICAgICAgIChyeDo6UmVu ZGVyYnVmZmVyTXRsOjpzZXRTdG9yYWdlSW1wbCk6CisKIDIwMjEtMDQtMDUgIEFsZXggQ2hyaXN0 ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZXN1cnJlY3QgTWFj IENNYWtlIGJ1aWxkCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvY29t cGlsZXIvdHJhbnNsYXRvci9UcmFuc2xhdG9yTWV0YWxEaXJlY3QvUmVkdWNlSW50ZXJmYWNlQmxv Y2tzLmNwcCBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci90cmFuc2xhdG9y L1RyYW5zbGF0b3JNZXRhbERpcmVjdC9SZWR1Y2VJbnRlcmZhY2VCbG9ja3MuY3BwCmluZGV4IGU0 NzcyYmIzOWUyNGRlMTliNmZiMmZmNTk4Y2U3ZTQ3ZTYyYmEwZGMuLmRhZWRlNzhiYmY4ODY3ZDg5 MWQxZjg1NmQ3OTQ1YjFjZGJlMTI3NWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FO R0xFL3NyYy9jb21waWxlci90cmFuc2xhdG9yL1RyYW5zbGF0b3JNZXRhbERpcmVjdC9SZWR1Y2VJ bnRlcmZhY2VCbG9ja3MuY3BwCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21w aWxlci90cmFuc2xhdG9yL1RyYW5zbGF0b3JNZXRhbERpcmVjdC9SZWR1Y2VJbnRlcmZhY2VCbG9j a3MuY3BwCkBAIC04Niw3ICs4Niw3IEBAIGNsYXNzIFJlZHVjZXIgOiBwdWJsaWMgVEludGVybVJl YnVpbGQKICAgICAgICAgICAgIH0KICAgICAgICAgfQogCi0gICAgICAgIHJldHVybiB7ZGVjbE5v ZGUsIFZpc2l0Qml0czo6TmVpdGhlcn07CisgICAgICAgIHJldHVybiB7ZGVjbE5vZGUsIFZpc2l0 Qml0czo6Qm90aH07CiAgICAgfQogCiAgICAgUHJlUmVzdWx0IHZpc2l0U3ltYm9sUHJlKFRJbnRl cm1TeW1ib2wgJnN5bWJvbE5vZGUpIG92ZXJyaWRlCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQ YXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvRnJhbWVCdWZmZXJNdGwubW0g Yi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvRnJh bWVCdWZmZXJNdGwubW0KaW5kZXggMzEyYTE2OGU4YWQwMzgwMWRmOTg2Y2E2NjdkN2ZiOTgxZDc1 Yjc5MS4uZGMxOTc1ZTMwMzQ5MGQwNTAyZTcxMWFlYTMxYTBkNjIxOGEwYmU3YiAxMDA2NDQKLS0t IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL0Zy YW1lQnVmZmVyTXRsLm1tCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdM RS9yZW5kZXJlci9tZXRhbC9GcmFtZUJ1ZmZlck10bC5tbQpAQCAtNzM3LDMwICs3MzcsMTUgQEAg dm9pZCBGcmFtZWJ1ZmZlck10bDo6c2V0TG9hZFN0b3JlQWN0aW9uT25SZW5kZXJQYXNzRmlyc3RT dGFydCgKIAogICAgIG10bDo6UmVuZGVyUGFzc0F0dGFjaG1lbnREZXNjICZhdHRhY2htZW50ID0g KmF0dGFjaG1lbnRPdXQ7CiAKLSAgICBpZiAoYXR0YWNobWVudC5zdG9yZUFjdGlvbiA9PSBNVExT dG9yZUFjdGlvbkRvbnRDYXJlIHx8Ci0gICAgICAgIGF0dGFjaG1lbnQuc3RvcmVBY3Rpb24gPT0g TVRMU3RvcmVBY3Rpb25NdWx0aXNhbXBsZVJlc29sdmUpCisgICAgaWYgKGF0dGFjaG1lbnQuc3Rv cmVBY3Rpb24gIT0gTVRMU3RvcmVBY3Rpb25Eb250Q2FyZSkKICAgICB7CiAgICAgICAgIC8vIElm IHdlIHByZXZpb3VzbHkgZGlzY2FyZGVkIGF0dGFjaG1lbnQncyBjb250ZW50LCB0aGVuIGRvbid0 IG5lZWQgdG8gbG9hZCBpdC4KLSAgICAgICAgYXR0YWNobWVudC5sb2FkQWN0aW9uID0gTVRMTG9h ZEFjdGlvbkRvbnRDYXJlOwotICAgIH0KLSAgICBlbHNlCi0gICAgewogICAgICAgICBhdHRhY2ht ZW50LmxvYWRBY3Rpb24gPSBNVExMb2FkQWN0aW9uTG9hZDsKICAgICB9CiAKICAgICBpZiAoYXR0 YWNobWVudC5oYXNJbXBsaWNpdE1TVGV4dHVyZSgpKQogICAgIHsKLSAgICAgICAgaWYgKG1CYWNr YnVmZmVyKQotICAgICAgICB7Ci0gICAgICAgICAgICAvLyBEZWZhdWx0IGFjdGlvbiBmb3IgZGVm YXVsdCBmcmFtZWJ1ZmZlciBpcyByZXNvbHZlIGFuZCBrZWVwIE1TIHRleHR1cmUncyBjb250ZW50 LgotICAgICAgICAgICAgLy8gV2Ugb25seSBkaXNjYXJkIE1TIHRleHR1cmUncyBjb250ZW50IGF0 IHRoZSBlbmQgb2YgdGhlIGZyYW1lLiBTZWUgb25GcmFtZUVuZCgpLgotICAgICAgICAgICAgYXR0 YWNobWVudC5zdG9yZUFjdGlvbiA9IE1UTFN0b3JlQWN0aW9uU3RvcmVBbmRNdWx0aXNhbXBsZVJl c29sdmU7Ci0gICAgICAgIH0KLSAgICAgICAgZWxzZQotICAgICAgICB7Ci0gICAgICAgICAgICAv LyBEZWZhdWx0IGFjdGlvbiBpcyByZXNvbHZlIGJ1dCBkb24ndCBrZWVwIE1TIHRleHR1cmUncyBj b250ZW50LgotICAgICAgICAgICAgYXR0YWNobWVudC5zdG9yZUFjdGlvbiA9IE1UTFN0b3JlQWN0 aW9uTXVsdGlzYW1wbGVSZXNvbHZlOwotICAgICAgICB9CisgICAgICAgIGF0dGFjaG1lbnQuc3Rv cmVBY3Rpb24gPSBNVExTdG9yZUFjdGlvblN0b3JlQW5kTXVsdGlzYW1wbGVSZXNvbHZlOwogICAg IH0KICAgICBlbHNlCiAgICAgewpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUv c3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL1JlbmRlckJ1ZmZlck10bC5tbSBiL1NvdXJjZS9U aGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9SZW5kZXJCdWZmZXJN dGwubW0KaW5kZXggZmViOGEwMGEzYjZhY2E2YTVlM2Q2MDg4NzIyZTJjMDI4NTQ1NDIxYi4uYmU5 MmExYmM2YTUzYjQwMzQ3OWM5NGI2NjBhNWI3ZDYzYTY4MTE3ZCAxMDA2NDQKLS0tIGEvU291cmNl L1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL1JlbmRlckJ1ZmZl ck10bC5tbQorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVy ZXIvbWV0YWwvUmVuZGVyQnVmZmVyTXRsLm1tCkBAIC03NCw3ICs3NCw3IEBAIGFuZ2xlOjpSZXN1 bHQgUmVuZGVyYnVmZmVyTXRsOjpzZXRTdG9yYWdlSW1wbChjb25zdCBnbDo6Q29udGV4dCAqY29u dGV4dCwKIAogICAgIGlmICgobVRleHR1cmUgPT0gbnVsbHB0ciB8fCAhbVRleHR1cmUtPnZhbGlk KCkpICYmICh3aWR0aCAhPSAwICYmIGhlaWdodCAhPSAwKSkKICAgICB7Ci0gICAgICAgIGlmIChh Y3R1YWxTYW1wbGVzID09IDEgfHwgKG1Gb3JtYXQuaGFzRGVwdGhBbmRTdGVuY2lsQml0cygpICYm IG1Gb3JtYXQuZ2V0Q2FwcygpLnJlc29sdmUpKQorICAgICAgICBpZiAoYWN0dWFsU2FtcGxlcyA9 PSAxIHx8IChtRm9ybWF0LmdldENhcHMoKS5yZXNvbHZlKSkKICAgICAgICAgewogICAgICAgICAg ICAgQU5HTEVfVFJZKG10bDo6VGV4dHVyZTo6TWFrZTJEVGV4dHVyZShjb250ZXh0TXRsLCBtRm9y bWF0LCBzdGF0aWNfY2FzdDx1aW50MzJfdD4od2lkdGgpLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdGF0aWNfY2FzdDx1aW50MzJfdD4oaGVpZ2h0 KSwgMSwK 425353 2021-04-06 22:02:36 -0700 2021-04-06 22:28:59 -0700 Patch bug-224265-20210406220235.patch text/plain 4394 johncunningham U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1NTg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggNmI4ZWFjZDZkNmVkYTZmODdkNGQwOWM3MzY1MDc2M2QwNWNlMWMyYi4uY2Q4MTBkNWNmZDgw NjM1YzA5NGEwMTE0YjkzMWJkNzA4MGFkYThkNSAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTA0LTA2ICBKb2huIEN1bm5pbmdoYW0gIDxqb2huY3Vu bmlnaGFtQGFwcGxlLmNvbT4KKworICAgICAgICBbTUVUQUwgQU5HTEVdIEludGVyZmFjZSBibG9j ayBkZWNsZXJhdGlvbnMgbmVlZCB0byBoYXZlIGNoaWxkcmVuIG1hcmtlZCBhcyBzdHJ1Y3QgYWNj ZXNzZXMuIEFkZCBpbXBsaWNpdCBiYWNraW5nIHRleHR1cmVzIGZvciBtdWx0aXNhbXBsZSByZW5k ZXIgdGFyZ2V0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjI0MjY1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBzcmMvY29tcGlsZXIvdHJhbnNsYXRvci9UcmFuc2xhdG9yTWV0YWxEaXJlY3QvUmVkdWNl SW50ZXJmYWNlQmxvY2tzLmNwcDoKKyAgICAgICAgKiBzcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0 YWwvRnJhbWVCdWZmZXJNdGwubW06CisgICAgICAgIChyeDo6RnJhbWVidWZmZXJNdGw6OnNldExv YWRTdG9yZUFjdGlvbk9uUmVuZGVyUGFzc0ZpcnN0U3RhcnQpOgorICAgICAgICAqIHNyYy9saWJB TkdMRS9yZW5kZXJlci9tZXRhbC9SZW5kZXJCdWZmZXJNdGwubW06CisgICAgICAgIChyeDo6UmVu ZGVyYnVmZmVyTXRsOjpzZXRTdG9yYWdlSW1wbCk6CisKIDIwMjEtMDQtMDUgIEFsZXggQ2hyaXN0 ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZXN1cnJlY3QgTWFj IENNYWtlIGJ1aWxkCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvY29t cGlsZXIvdHJhbnNsYXRvci9UcmFuc2xhdG9yTWV0YWxEaXJlY3QvUmVkdWNlSW50ZXJmYWNlQmxv Y2tzLmNwcCBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci90cmFuc2xhdG9y L1RyYW5zbGF0b3JNZXRhbERpcmVjdC9SZWR1Y2VJbnRlcmZhY2VCbG9ja3MuY3BwCmluZGV4IGU0 NzcyYmIzOWUyNGRlMTliNmZiMmZmNTk4Y2U3ZTQ3ZTYyYmEwZGMuLmRhZWRlNzhiYmY4ODY3ZDg5 MWQxZjg1NmQ3OTQ1YjFjZGJlMTI3NWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FO R0xFL3NyYy9jb21waWxlci90cmFuc2xhdG9yL1RyYW5zbGF0b3JNZXRhbERpcmVjdC9SZWR1Y2VJ bnRlcmZhY2VCbG9ja3MuY3BwCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21w aWxlci90cmFuc2xhdG9yL1RyYW5zbGF0b3JNZXRhbERpcmVjdC9SZWR1Y2VJbnRlcmZhY2VCbG9j a3MuY3BwCkBAIC04Niw3ICs4Niw3IEBAIGNsYXNzIFJlZHVjZXIgOiBwdWJsaWMgVEludGVybVJl YnVpbGQKICAgICAgICAgICAgIH0KICAgICAgICAgfQogCi0gICAgICAgIHJldHVybiB7ZGVjbE5v ZGUsIFZpc2l0Qml0czo6TmVpdGhlcn07CisgICAgICAgIHJldHVybiB7ZGVjbE5vZGUsIFZpc2l0 Qml0czo6Qm90aH07CiAgICAgfQogCiAgICAgUHJlUmVzdWx0IHZpc2l0U3ltYm9sUHJlKFRJbnRl cm1TeW1ib2wgJnN5bWJvbE5vZGUpIG92ZXJyaWRlCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQ YXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvRnJhbWVCdWZmZXJNdGwubW0g Yi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvRnJh bWVCdWZmZXJNdGwubW0KaW5kZXggMzEyYTE2OGU4YWQwMzgwMWRmOTg2Y2E2NjdkN2ZiOTgxZDc1 Yjc5MS4uMjRjNWZiY2Q4MzY4YTAxM2YxMDkxMzVhZDAwNzlmYTc5YTQ1YzRlYSAxMDA2NDQKLS0t IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL0Zy YW1lQnVmZmVyTXRsLm1tCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdM RS9yZW5kZXJlci9tZXRhbC9GcmFtZUJ1ZmZlck10bC5tbQpAQCAtNzM3LDggKzczNyw3IEBAIHZv aWQgRnJhbWVidWZmZXJNdGw6OnNldExvYWRTdG9yZUFjdGlvbk9uUmVuZGVyUGFzc0ZpcnN0U3Rh cnQoCiAKICAgICBtdGw6OlJlbmRlclBhc3NBdHRhY2htZW50RGVzYyAmYXR0YWNobWVudCA9ICph dHRhY2htZW50T3V0OwogCi0gICAgaWYgKGF0dGFjaG1lbnQuc3RvcmVBY3Rpb24gPT0gTVRMU3Rv cmVBY3Rpb25Eb250Q2FyZSB8fAotICAgICAgICBhdHRhY2htZW50LnN0b3JlQWN0aW9uID09IE1U TFN0b3JlQWN0aW9uTXVsdGlzYW1wbGVSZXNvbHZlKQorICAgIGlmIChhdHRhY2htZW50LnN0b3Jl QWN0aW9uID09IE1UTFN0b3JlQWN0aW9uRG9udENhcmUpCiAgICAgewogICAgICAgICAvLyBJZiB3 ZSBwcmV2aW91c2x5IGRpc2NhcmRlZCBhdHRhY2htZW50J3MgY29udGVudCwgdGhlbiBkb24ndCBu ZWVkIHRvIGxvYWQgaXQuCiAgICAgICAgIGF0dGFjaG1lbnQubG9hZEFjdGlvbiA9IE1UTExvYWRB Y3Rpb25Eb250Q2FyZTsKQEAgLTc1MCwxNyArNzQ5LDcgQEAgdm9pZCBGcmFtZWJ1ZmZlck10bDo6 c2V0TG9hZFN0b3JlQWN0aW9uT25SZW5kZXJQYXNzRmlyc3RTdGFydCgKIAogICAgIGlmIChhdHRh Y2htZW50Lmhhc0ltcGxpY2l0TVNUZXh0dXJlKCkpCiAgICAgewotICAgICAgICBpZiAobUJhY2ti dWZmZXIpCi0gICAgICAgIHsKLSAgICAgICAgICAgIC8vIERlZmF1bHQgYWN0aW9uIGZvciBkZWZh dWx0IGZyYW1lYnVmZmVyIGlzIHJlc29sdmUgYW5kIGtlZXAgTVMgdGV4dHVyZSdzIGNvbnRlbnQu Ci0gICAgICAgICAgICAvLyBXZSBvbmx5IGRpc2NhcmQgTVMgdGV4dHVyZSdzIGNvbnRlbnQgYXQg dGhlIGVuZCBvZiB0aGUgZnJhbWUuIFNlZSBvbkZyYW1lRW5kKCkuCi0gICAgICAgICAgICBhdHRh Y2htZW50LnN0b3JlQWN0aW9uID0gTVRMU3RvcmVBY3Rpb25TdG9yZUFuZE11bHRpc2FtcGxlUmVz b2x2ZTsKLSAgICAgICAgfQotICAgICAgICBlbHNlCi0gICAgICAgIHsKLSAgICAgICAgICAgIC8v IERlZmF1bHQgYWN0aW9uIGlzIHJlc29sdmUgYnV0IGRvbid0IGtlZXAgTVMgdGV4dHVyZSdzIGNv bnRlbnQuCi0gICAgICAgICAgICBhdHRhY2htZW50LnN0b3JlQWN0aW9uID0gTVRMU3RvcmVBY3Rp b25NdWx0aXNhbXBsZVJlc29sdmU7Ci0gICAgICAgIH0KKyAgICAgICAgYXR0YWNobWVudC5zdG9y ZUFjdGlvbiA9IE1UTFN0b3JlQWN0aW9uU3RvcmVBbmRNdWx0aXNhbXBsZVJlc29sdmU7CiAgICAg fQogICAgIGVsc2UKICAgICB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9z cmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvUmVuZGVyQnVmZmVyTXRsLm1tIGIvU291cmNlL1Ro aXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL1JlbmRlckJ1ZmZlck10 bC5tbQppbmRleCBmZWI4YTAwYTNiNmFjYTZhNWUzZDYwODg3MjJlMmMwMjg1NDU0MjFiLi5iZTky YTFiYzZhNTNiNDAzNDc5Yzk0YjY2MGE1YjdkNjNhNjgxMTdkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv VGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvUmVuZGVyQnVmZmVy TXRsLm1tCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJl ci9tZXRhbC9SZW5kZXJCdWZmZXJNdGwubW0KQEAgLTc0LDcgKzc0LDcgQEAgYW5nbGU6OlJlc3Vs dCBSZW5kZXJidWZmZXJNdGw6OnNldFN0b3JhZ2VJbXBsKGNvbnN0IGdsOjpDb250ZXh0ICpjb250 ZXh0LAogCiAgICAgaWYgKChtVGV4dHVyZSA9PSBudWxscHRyIHx8ICFtVGV4dHVyZS0+dmFsaWQo KSkgJiYgKHdpZHRoICE9IDAgJiYgaGVpZ2h0ICE9IDApKQogICAgIHsKLSAgICAgICAgaWYgKGFj dHVhbFNhbXBsZXMgPT0gMSB8fCAobUZvcm1hdC5oYXNEZXB0aEFuZFN0ZW5jaWxCaXRzKCkgJiYg bUZvcm1hdC5nZXRDYXBzKCkucmVzb2x2ZSkpCisgICAgICAgIGlmIChhY3R1YWxTYW1wbGVzID09 IDEgfHwgKG1Gb3JtYXQuZ2V0Q2FwcygpLnJlc29sdmUpKQogICAgICAgICB7CiAgICAgICAgICAg ICBBTkdMRV9UUlkobXRsOjpUZXh0dXJlOjpNYWtlMkRUZXh0dXJlKGNvbnRleHRNdGwsIG1Gb3Jt YXQsIHN0YXRpY19jYXN0PHVpbnQzMl90Pih3aWR0aCksCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXRpY19jYXN0PHVpbnQzMl90PihoZWlnaHQp LCAxLAo= 425356 2021-04-06 22:29:01 -0700 2021-04-07 12:00:37 -0700 Patch bug-224265-20210406222901.patch text/plain 7249 johncunningham U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1NTg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggNmI4ZWFjZDZkNmVkYTZmODdkNGQwOWM3MzY1MDc2M2QwNWNlMWMyYi4uNWU3NTNlOWE4Njk1 MzYzZmMyYmQ4MDUyOGE0ZWU3NmFjMzJlYjhmOSAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA0LTA2ICBKb2huIEN1bm5pbmdoYW0gIDxqb2huY3Vu bmlnaGFtQGFwcGxlLmNvbT4KKworICAgICAgICBbTUVUQUwgQU5HTEVdIEludGVyZmFjZSBibG9j ayBkZWNsZXJhdGlvbnMgbmVlZCB0byBoYXZlIGNoaWxkcmVuIG1hcmtlZCBhcyBzdHJ1Y3QgYWNj ZXNzZXMuIEFkZCBpbXBsaWNpdCBiYWNraW5nIHRleHR1cmVzIGZvciBtdWx0aXNhbXBsZSByZW5k ZXIgdGFyZ2V0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjI0MjY1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBzcmMvY29tcGlsZXIvdHJhbnNsYXRvci9UcmFuc2xhdG9yTWV0YWxEaXJlY3QvUmVkdWNl SW50ZXJmYWNlQmxvY2tzLmNwcDoKKyAgICAgICAgKiBzcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0 YWwvRnJhbWVCdWZmZXJNdGwuaDoKKyAgICAgICAgKiBzcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0 YWwvRnJhbWVCdWZmZXJNdGwubW06CisgICAgICAgIChyeDo6RnJhbWVidWZmZXJNdGw6OnNldExv YWRTdG9yZUFjdGlvbk9uUmVuZGVyUGFzc0ZpcnN0U3RhcnQpOgorICAgICAgICAocng6OkZyYW1l YnVmZmVyTXRsOjpvblN0YXJ0ZWREcmF3aW5nVG9GcmFtZUJ1ZmZlcik6CisgICAgICAgICogc3Jj L2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL1JlbmRlckJ1ZmZlck10bC5tbToKKyAgICAgICAgKHJ4 OjpSZW5kZXJidWZmZXJNdGw6OnNldFN0b3JhZ2VJbXBsKToKKwogMjAyMS0wNC0wNSAgQWxleCBD aHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFJlc3VycmVj dCBNYWMgQ01ha2UgYnVpbGQKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3Ny Yy9jb21waWxlci90cmFuc2xhdG9yL1RyYW5zbGF0b3JNZXRhbERpcmVjdC9SZWR1Y2VJbnRlcmZh Y2VCbG9ja3MuY3BwIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVyL3RyYW5z bGF0b3IvVHJhbnNsYXRvck1ldGFsRGlyZWN0L1JlZHVjZUludGVyZmFjZUJsb2Nrcy5jcHAKaW5k ZXggZTQ3NzJiYjM5ZTI0ZGUxOWI2ZmIyZmY1OThjZTdlNDdlNjJiYTBkYy4uZGFlZGU3OGJiZjg4 NjdkODkxZDFmODU2ZDc5NDViMWNkYmUxMjc1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvc3JjL2NvbXBpbGVyL3RyYW5zbGF0b3IvVHJhbnNsYXRvck1ldGFsRGlyZWN0L1Jl ZHVjZUludGVyZmFjZUJsb2Nrcy5jcHAKKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3Jj L2NvbXBpbGVyL3RyYW5zbGF0b3IvVHJhbnNsYXRvck1ldGFsRGlyZWN0L1JlZHVjZUludGVyZmFj ZUJsb2Nrcy5jcHAKQEAgLTg2LDcgKzg2LDcgQEAgY2xhc3MgUmVkdWNlciA6IHB1YmxpYyBUSW50 ZXJtUmVidWlsZAogICAgICAgICAgICAgfQogICAgICAgICB9CiAKLSAgICAgICAgcmV0dXJuIHtk ZWNsTm9kZSwgVmlzaXRCaXRzOjpOZWl0aGVyfTsKKyAgICAgICAgcmV0dXJuIHtkZWNsTm9kZSwg VmlzaXRCaXRzOjpCb3RofTsKICAgICB9CiAKICAgICBQcmVSZXN1bHQgdmlzaXRTeW1ib2xQcmUo VEludGVybVN5bWJvbCAmc3ltYm9sTm9kZSkgb3ZlcnJpZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9U aGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9GcmFtZUJ1ZmZlck10 bC5oIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFs L0ZyYW1lQnVmZmVyTXRsLmgKaW5kZXggZDg4YjhjMzUwOWQwNzVmYzQ3OTk2OGFkZTc5MmZlYzY3 NjY2MTJhOS4uMzNkMzE0YmMyNDMxNWQ5MmQ5YTJmYzc5YjkwNDFlNzc4OTc1ZDNmMSAxMDA2NDQK LS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFs L0ZyYW1lQnVmZmVyTXRsLmgKKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFO R0xFL3JlbmRlcmVyL21ldGFsL0ZyYW1lQnVmZmVyTXRsLmgKQEAgLTE1NCw3ICsxNTQsNyBAQCBj bGFzcyBGcmFtZWJ1ZmZlck10bCA6IHB1YmxpYyBGcmFtZWJ1ZmZlckltcGwKIAogICAgIC8vIElu aXRpYWxpemUgbG9hZCBzdG9yZSBvcHRpb25zIGZvciBhIHJlbmRlciBwYXNzJ3MgZmlyc3Qgc3Rh cnQgKGkuZS4gbm90IHJlbmRlciBwYXNzIHJlc3VtaW5nCiAgICAgLy8gZnJvbSBpbnRlcnJ1cHRp b25zIHN1Y2ggYXMgdGhvc2UgY2F1c2VkIGJ5IGEgY29udmVyc2lvbiBjb21wdXRlIHBhc3MpCi0g ICAgdm9pZCBzZXRMb2FkU3RvcmVBY3Rpb25PblJlbmRlclBhc3NGaXJzdFN0YXJ0KG10bDo6UmVu ZGVyUGFzc0F0dGFjaG1lbnREZXNjICphdHRhY2htZW50T3V0KTsKKyAgICB2b2lkIHNldExvYWRT dG9yZUFjdGlvbk9uUmVuZGVyUGFzc0ZpcnN0U3RhcnQobXRsOjpSZW5kZXJQYXNzQXR0YWNobWVu dERlc2MgKmF0dGFjaG1lbnRPdXQsIGNvbnN0IGJvb2wgZm9yY2VEZXB0aFN0ZW5jaWxNdWx0aXNh bXBsZUxvYWQpOwogCiAgICAgLy8gRmlsbCBSZW5kZXJQYXNzRGVzYyB3aXRoIHJlbGV2YW50IGF0 dGFjaG1lbnQncyBpbmZvIGZyb20gR0wgZnJvbnQgZW5kLgogICAgIGFuZ2xlOjpSZXN1bHQgcHJl cGFyZVJlbmRlclBhc3MoY29uc3QgZ2w6OkNvbnRleHQgKmNvbnRleHQsIG10bDo6UmVuZGVyUGFz c0Rlc2MgKmRlc2NPdXQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3Jj L2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL0ZyYW1lQnVmZmVyTXRsLm1tIGIvU291cmNlL1RoaXJk UGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL0ZyYW1lQnVmZmVyTXRsLm1t CmluZGV4IDMxMmExNjhlOGFkMDM4MDFkZjk4NmNhNjY3ZDdmYjk4MWQ3NWI3OTEuLjc5NzQxOWJl MDUxZTcxYTA1YTJhODFlNDMxZWI1MDNhZDUxZjFkNTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGly ZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9GcmFtZUJ1ZmZlck10bC5t bQorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0 YWwvRnJhbWVCdWZmZXJNdGwubW0KQEAgLTczMSwxNCArNzMxLDE1IEBAIG10bDo6UmVuZGVyQ29t bWFuZEVuY29kZXIgKkZyYW1lYnVmZmVyTXRsOjplbnN1cmVSZW5kZXJQYXNzU3RhcnRlZChjb25z dCBnbDo6Q29uCiB9CiAKIHZvaWQgRnJhbWVidWZmZXJNdGw6OnNldExvYWRTdG9yZUFjdGlvbk9u UmVuZGVyUGFzc0ZpcnN0U3RhcnQoCi0gICAgbXRsOjpSZW5kZXJQYXNzQXR0YWNobWVudERlc2Mg KmF0dGFjaG1lbnRPdXQpCisgICAgbXRsOjpSZW5kZXJQYXNzQXR0YWNobWVudERlc2MgKmF0dGFj aG1lbnRPdXQsIGNvbnN0IGJvb2wgZm9yY2VEZXB0aFN0ZW5jaWxNdWx0aXNhbXBsZUxvYWQpCiB7 CiAgICAgQVNTRVJUKG1SZW5kZXJQYXNzQ2xlYW5TdGFydCk7CiAKICAgICBtdGw6OlJlbmRlclBh c3NBdHRhY2htZW50RGVzYyAmYXR0YWNobWVudCA9ICphdHRhY2htZW50T3V0OwogCi0gICAgaWYg KGF0dGFjaG1lbnQuc3RvcmVBY3Rpb24gPT0gTVRMU3RvcmVBY3Rpb25Eb250Q2FyZSB8fAotICAg ICAgICBhdHRhY2htZW50LnN0b3JlQWN0aW9uID09IE1UTFN0b3JlQWN0aW9uTXVsdGlzYW1wbGVS ZXNvbHZlKQorICAgIGlmICghZm9yY2VEZXB0aFN0ZW5jaWxNdWx0aXNhbXBsZUxvYWQgJiYKKyAg ICAgICAoYXR0YWNobWVudC5zdG9yZUFjdGlvbiA9PSBNVExTdG9yZUFjdGlvbkRvbnRDYXJlIHx8 CisgICAgICAgIGF0dGFjaG1lbnQuc3RvcmVBY3Rpb24gPT0gTVRMU3RvcmVBY3Rpb25NdWx0aXNh bXBsZVJlc29sdmUpKQogICAgIHsKICAgICAgICAgLy8gSWYgd2UgcHJldmlvdXNseSBkaXNjYXJk ZWQgYXR0YWNobWVudCdzIGNvbnRlbnQsIHRoZW4gZG9uJ3QgbmVlZCB0byBsb2FkIGl0LgogICAg ICAgICBhdHRhY2htZW50LmxvYWRBY3Rpb24gPSBNVExMb2FkQWN0aW9uRG9udENhcmU7CkBAIC03 NTAsMTcgKzc1MSw3IEBAIHZvaWQgRnJhbWVidWZmZXJNdGw6OnNldExvYWRTdG9yZUFjdGlvbk9u UmVuZGVyUGFzc0ZpcnN0U3RhcnQoCiAKICAgICBpZiAoYXR0YWNobWVudC5oYXNJbXBsaWNpdE1T VGV4dHVyZSgpKQogICAgIHsKLSAgICAgICAgaWYgKG1CYWNrYnVmZmVyKQotICAgICAgICB7Ci0g ICAgICAgICAgICAvLyBEZWZhdWx0IGFjdGlvbiBmb3IgZGVmYXVsdCBmcmFtZWJ1ZmZlciBpcyBy ZXNvbHZlIGFuZCBrZWVwIE1TIHRleHR1cmUncyBjb250ZW50LgotICAgICAgICAgICAgLy8gV2Ug b25seSBkaXNjYXJkIE1TIHRleHR1cmUncyBjb250ZW50IGF0IHRoZSBlbmQgb2YgdGhlIGZyYW1l LiBTZWUgb25GcmFtZUVuZCgpLgotICAgICAgICAgICAgYXR0YWNobWVudC5zdG9yZUFjdGlvbiA9 IE1UTFN0b3JlQWN0aW9uU3RvcmVBbmRNdWx0aXNhbXBsZVJlc29sdmU7Ci0gICAgICAgIH0KLSAg ICAgICAgZWxzZQotICAgICAgICB7Ci0gICAgICAgICAgICAvLyBEZWZhdWx0IGFjdGlvbiBpcyBy ZXNvbHZlIGJ1dCBkb24ndCBrZWVwIE1TIHRleHR1cmUncyBjb250ZW50LgotICAgICAgICAgICAg YXR0YWNobWVudC5zdG9yZUFjdGlvbiA9IE1UTFN0b3JlQWN0aW9uTXVsdGlzYW1wbGVSZXNvbHZl OwotICAgICAgICB9CisgICAgICAgIGF0dGFjaG1lbnQuc3RvcmVBY3Rpb24gPSBNVExTdG9yZUFj dGlvblN0b3JlQW5kTXVsdGlzYW1wbGVSZXNvbHZlOwogICAgIH0KICAgICBlbHNlCiAgICAgewpA QCAtNzcyLDE2ICs3NjMsMjAgQEAgdm9pZCBGcmFtZWJ1ZmZlck10bDo6b25TdGFydGVkRHJhd2lu Z1RvRnJhbWVCdWZmZXIoY29uc3QgZ2w6OkNvbnRleHQgKmNvbnRleHQpCiB7CiAgICAgbVJlbmRl clBhc3NDbGVhblN0YXJ0ID0gdHJ1ZTsKIAorICAgIC8vIElmIGFueSBvZiB0aGUgcmVuZGVyIHRh cmdldHMgbmVlZCB0byBsb2FkIHRoZWlyIG11bHRpc2FtcGxlIHRleHR1cmVzLCB3ZSBzaG91bGQg ZG8gdGhlIHNhbWUgZm9yIGRlcHRoL3N0ZW5jaWwuCisgICAgYm9vbCBmb3JjZURlcHRoU3RlbmNp bE11bHRpc2FtcGxlTG9hZCA9IGZhbHNlOworCiAgICAgLy8gQ29tcHV0ZSBsb2FkT3AgYmFzZWQg b24gcHJldmlvdXMgc3RvcmVPcCBhbmQgcmVzZXQgc3RvcmVPcCBmbGFnczoKICAgICBmb3IgKG10 bDo6UmVuZGVyUGFzc0NvbG9yQXR0YWNobWVudERlc2MgJmNvbG9yQXR0YWNobWVudCA6IG1SZW5k ZXJQYXNzRGVzYy5jb2xvckF0dGFjaG1lbnRzKQogICAgIHsKLSAgICAgICAgc2V0TG9hZFN0b3Jl QWN0aW9uT25SZW5kZXJQYXNzRmlyc3RTdGFydCgmY29sb3JBdHRhY2htZW50KTsKKyAgICAgICAg Zm9yY2VEZXB0aFN0ZW5jaWxNdWx0aXNhbXBsZUxvYWQgfD0gY29sb3JBdHRhY2htZW50LnN0b3Jl QWN0aW9uID09IE1UTFN0b3JlQWN0aW9uU3RvcmVBbmRNdWx0aXNhbXBsZVJlc29sdmU7CisgICAg ICAgIHNldExvYWRTdG9yZUFjdGlvbk9uUmVuZGVyUGFzc0ZpcnN0U3RhcnQoJmNvbG9yQXR0YWNo bWVudCwgZmFsc2UpOwogICAgIH0KICAgICAvLyBEZXB0aCBsb2FkL3N0b3JlCi0gICAgc2V0TG9h ZFN0b3JlQWN0aW9uT25SZW5kZXJQYXNzRmlyc3RTdGFydCgmbVJlbmRlclBhc3NEZXNjLmRlcHRo QXR0YWNobWVudCk7CisgICAgc2V0TG9hZFN0b3JlQWN0aW9uT25SZW5kZXJQYXNzRmlyc3RTdGFy dCgmbVJlbmRlclBhc3NEZXNjLmRlcHRoQXR0YWNobWVudCwgZm9yY2VEZXB0aFN0ZW5jaWxNdWx0 aXNhbXBsZUxvYWQpOwogCiAgICAgLy8gU3RlbmNpbCBsb2FkL3N0b3JlCi0gICAgc2V0TG9hZFN0 b3JlQWN0aW9uT25SZW5kZXJQYXNzRmlyc3RTdGFydCgmbVJlbmRlclBhc3NEZXNjLnN0ZW5jaWxB dHRhY2htZW50KTsKKyAgICBzZXRMb2FkU3RvcmVBY3Rpb25PblJlbmRlclBhc3NGaXJzdFN0YXJ0 KCZtUmVuZGVyUGFzc0Rlc2Muc3RlbmNpbEF0dGFjaG1lbnQsIGZvcmNlRGVwdGhTdGVuY2lsTXVs dGlzYW1wbGVMb2FkKTsKIH0KIAogdm9pZCBGcmFtZWJ1ZmZlck10bDo6b25GcmFtZUVuZChjb25z dCBnbDo6Q29udGV4dCAqY29udGV4dCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FO R0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9SZW5kZXJCdWZmZXJNdGwubW0gYi9Tb3Vy Y2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvUmVuZGVyQnVm ZmVyTXRsLm1tCmluZGV4IGZlYjhhMDBhM2I2YWNhNmE1ZTNkNjA4ODcyMmUyYzAyODU0NTQyMWIu LmJlOTJhMWJjNmE1M2I0MDM0NzljOTRiNjYwYTViN2Q2M2E2ODExN2QgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9SZW5kZXJC dWZmZXJNdGwubW0KKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3Jl bmRlcmVyL21ldGFsL1JlbmRlckJ1ZmZlck10bC5tbQpAQCAtNzQsNyArNzQsNyBAQCBhbmdsZTo6 UmVzdWx0IFJlbmRlcmJ1ZmZlck10bDo6c2V0U3RvcmFnZUltcGwoY29uc3QgZ2w6OkNvbnRleHQg KmNvbnRleHQsCiAKICAgICBpZiAoKG1UZXh0dXJlID09IG51bGxwdHIgfHwgIW1UZXh0dXJlLT52 YWxpZCgpKSAmJiAod2lkdGggIT0gMCAmJiBoZWlnaHQgIT0gMCkpCiAgICAgewotICAgICAgICBp ZiAoYWN0dWFsU2FtcGxlcyA9PSAxIHx8IChtRm9ybWF0Lmhhc0RlcHRoQW5kU3RlbmNpbEJpdHMo KSAmJiBtRm9ybWF0LmdldENhcHMoKS5yZXNvbHZlKSkKKyAgICAgICAgaWYgKGFjdHVhbFNhbXBs ZXMgPT0gMSB8fCAobUZvcm1hdC5nZXRDYXBzKCkucmVzb2x2ZSkpCiAgICAgICAgIHsKICAgICAg ICAgICAgIEFOR0xFX1RSWShtdGw6OlRleHR1cmU6Ok1ha2UyRFRleHR1cmUoY29udGV4dE10bCwg bUZvcm1hdCwgc3RhdGljX2Nhc3Q8dWludDMyX3Q+KHdpZHRoKSwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RhdGljX2Nhc3Q8dWludDMyX3Q+KGhl aWdodCksIDEsCg==