202889 2019-10-12 17:41:09 -0700 Convert ENinePieceImageRule into an enum class and rename 2019-10-15 15:09:24 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser achristensen commit-queue esprehn+autocc ews-watchlist glenn gyuyoung.kim kondapallykalyan lingcherd_ho macpherson menard pdr simon.fraser webkit-bug-importer wenson_hsieh oldest_to_newest 1579466 0 simon.fraser 2019-10-12 17:41:09 -0700 Convert ENinePieceImageRule into an enum class and rename 1579467 1 380838 simon.fraser 2019-10-12 17:41:40 -0700 Created attachment 380838 Patch 1579468 2 380839 simon.fraser 2019-10-12 17:42:51 -0700 Created attachment 380839 Patch 1579499 3 380839 commit-queue 2019-10-13 10:08:41 -0700 Comment on attachment 380839 Patch Clearing flags on attachment: 380839 Committed r251060: <https://trac.webkit.org/changeset/251060> 1579500 4 commit-queue 2019-10-13 10:08:42 -0700 All reviewed patches have been landed. Closing bug. 1580299 5 lingcherd_ho 2019-10-15 15:09:24 -0700 <rdar://problem/56231369> 380838 2019-10-12 17:41:40 -0700 2019-10-12 17:42:49 -0700 Patch bug-202889-20191012174139.patch text/plain 15554 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxMDUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2Y1YjMxNmM5MGQyYzkw ZjgzNDM0ODIwYTEyNDk4Y2MyOTg1ZmVhNi4uYjMyYTQ5M2NlNzE2ZDAwZDRkMzY1NWZlMmM2M2Q4 NGM2NGRlMmE4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE5LTEwLTEyICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENvbnZlcnQgRU5p bmVQaWVjZUltYWdlUnVsZSBpbnRvIGFuIGVudW0gY2xhc3MgYW5kIHJlbmFtZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAyODg5CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRW51bSBjbGFzc2lmeSBFTmlu ZVBpZWNlSW1hZ2VSdWxlLgorCisgICAgICAgICogY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJh dGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjp2YWx1ZUZvclJlcGVhdFJ1bGUpOgorICAgICAg ICAqIGNzcy9DU1NUb1N0eWxlTWFwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1RvU3R5bGVN YXA6Om1hcE5pbmVQaWVjZUltYWdlUmVwZWF0KToKKyAgICAgICAgKiBjc3MvU3R5bGVCdWlsZGVy Q3VzdG9tLmg6CisgICAgICAgIChXZWJDb3JlOjpBcHBseVByb3BlcnR5Qm9yZGVySW1hZ2VNb2Rp Zmllcjo6YXBwbHlJbml0aWFsVmFsdWUpOgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9OaW5l UGllY2VJbWFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOaW5lUGllY2VJbWFnZTo6TmluZVBp ZWNlSW1hZ2UpOgorICAgICAgICAoV2ViQ29yZTo6TmluZVBpZWNlSW1hZ2U6OmNvbXB1dGVNaWRk bGVUaWxlU2NhbGUpOgorICAgICAgICAoV2ViQ29yZTo6TmluZVBpZWNlSW1hZ2U6OmNvbXB1dGVU aWxlU2NhbGVzKToKKyAgICAgICAgKFdlYkNvcmU6Ok5pbmVQaWVjZUltYWdlOjpEYXRhOjpEYXRh KToKKyAgICAgICAgKFdlYkNvcmU6Ok5pbmVQaWVjZUltYWdlOjpEYXRhOjpjcmVhdGUpOgorICAg ICAgICAqIHJlbmRlcmluZy9zdHlsZS9OaW5lUGllY2VJbWFnZS5oOgorICAgICAgICAoV2ViQ29y ZTo6TmluZVBpZWNlSW1hZ2U6Omhvcml6b250YWxSdWxlIGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6Ok5pbmVQaWVjZUltYWdlOjpzZXRIb3Jpem9udGFsUnVsZSk6CisgICAgICAgIChXZWJDb3Jl OjpOaW5lUGllY2VJbWFnZTo6dmVydGljYWxSdWxlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 Ok5pbmVQaWVjZUltYWdlOjpzZXRWZXJ0aWNhbFJ1bGUpOgorCiAyMDE5LTEwLTEyICBTaW1vbiBG cmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEltcGxlbWVudCBUZXh0 U3RyZWFtLWJhc2VkIGR1bXBpbmcgZm9yIGFsbCB0aGUgUmVuZGVyU3R5bGUgYW5kIFNWR1JlbmRl clN0eWxlIGVudW0gY2xhc3NlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0Nv bXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0 ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAppbmRleCBiMmMyYjQxNWQ2MjZmMzNjMjcyYzg1Y2VjNTkz ZGJlN2Q1ODdhZjYyLi5kN2RhZmEyYjViYjVkNjQ5OTc2ZTA4YzU5MjE3NzU1ZTczYzc0NWExIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9u LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9u LmNwcApAQCAtNDcwLDE3ICs0NzAsMTcgQEAgc3RhdGljIGNvbnN0IENTU1Byb3BlcnR5SUQgY29t cHV0ZWRQcm9wZXJ0aWVzW10gPSB7CiAKIGNvbnN0IHVuc2lnbmVkIG51bUNvbXB1dGVkUHJvcGVy dGllcyA9IFdURl9BUlJBWV9MRU5HVEgoY29tcHV0ZWRQcm9wZXJ0aWVzKTsKIAotc3RhdGljIENT U1ZhbHVlSUQgdmFsdWVGb3JSZXBlYXRSdWxlKGludCBydWxlKQorc3RhdGljIENTU1ZhbHVlSUQg dmFsdWVGb3JSZXBlYXRSdWxlKE5pbmVQaWVjZUltYWdlUnVsZSBydWxlKQogewogICAgIHN3aXRj aCAocnVsZSkgewotICAgICAgICBjYXNlIFJlcGVhdEltYWdlUnVsZToKLSAgICAgICAgICAgIHJl dHVybiBDU1NWYWx1ZVJlcGVhdDsKLSAgICAgICAgY2FzZSBSb3VuZEltYWdlUnVsZToKLSAgICAg ICAgICAgIHJldHVybiBDU1NWYWx1ZVJvdW5kOwotICAgICAgICBjYXNlIFNwYWNlSW1hZ2VSdWxl OgotICAgICAgICAgICAgcmV0dXJuIENTU1ZhbHVlU3BhY2U7Ci0gICAgICAgIGRlZmF1bHQ6Ci0g ICAgICAgICAgICByZXR1cm4gQ1NTVmFsdWVTdHJldGNoOworICAgIGNhc2UgTmluZVBpZWNlSW1h Z2VSdWxlOjpSZXBlYXQ6CisgICAgICAgIHJldHVybiBDU1NWYWx1ZVJlcGVhdDsKKyAgICBjYXNl IE5pbmVQaWVjZUltYWdlUnVsZTo6Um91bmQ6CisgICAgICAgIHJldHVybiBDU1NWYWx1ZVJvdW5k OworICAgIGNhc2UgTmluZVBpZWNlSW1hZ2VSdWxlOjpTcGFjZToKKyAgICAgICAgcmV0dXJuIENT U1ZhbHVlU3BhY2U7CisgICAgZGVmYXVsdDoKKyAgICAgICAgcmV0dXJuIENTU1ZhbHVlU3RyZXRj aDsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NUb1N0eWxl TWFwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NUb1N0eWxlTWFwLmNwcAppbmRleCBlOTNk ZTk5NzJkNGJmMzg5YTMwMDdiZDg3ZWRjN2ExNjczY2ViNjkxLi5jODU5MjBiMDE3MzNjZjk0Yzli YThmNDc2MTM0ZWE4NDAwYzJhYjgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NT VG9TdHlsZU1hcC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1RvU3R5bGVNYXAuY3Bw CkBAIC02NDUsMzYgKzY0NSwzNiBAQCB2b2lkIENTU1RvU3R5bGVNYXA6Om1hcE5pbmVQaWVjZUlt YWdlUmVwZWF0KENTU1ZhbHVlJiB2YWx1ZSwgTmluZVBpZWNlSW1hZ2UmIGltYQogICAgIENTU1Zh bHVlSUQgZmlyc3RJZGVudGlmaWVyID0gcGFpci0+Zmlyc3QoKS0+dmFsdWVJRCgpOwogICAgIENT U1ZhbHVlSUQgc2Vjb25kSWRlbnRpZmllciA9IHBhaXItPnNlY29uZCgpLT52YWx1ZUlEKCk7CiAK LSAgICBFTmluZVBpZWNlSW1hZ2VSdWxlIGhvcml6b250YWxSdWxlOworICAgIE5pbmVQaWVjZUlt YWdlUnVsZSBob3Jpem9udGFsUnVsZTsKICAgICBzd2l0Y2ggKGZpcnN0SWRlbnRpZmllcikgewog ICAgIGNhc2UgQ1NTVmFsdWVTdHJldGNoOgotICAgICAgICBob3Jpem9udGFsUnVsZSA9IFN0cmV0 Y2hJbWFnZVJ1bGU7CisgICAgICAgIGhvcml6b250YWxSdWxlID0gTmluZVBpZWNlSW1hZ2VSdWxl OjpTdHJldGNoOwogICAgICAgICBicmVhazsKICAgICBjYXNlIENTU1ZhbHVlUm91bmQ6Ci0gICAg ICAgIGhvcml6b250YWxSdWxlID0gUm91bmRJbWFnZVJ1bGU7CisgICAgICAgIGhvcml6b250YWxS dWxlID0gTmluZVBpZWNlSW1hZ2VSdWxlOjpSb3VuZDsKICAgICAgICAgYnJlYWs7CiAgICAgY2Fz ZSBDU1NWYWx1ZVNwYWNlOgotICAgICAgICBob3Jpem9udGFsUnVsZSA9IFNwYWNlSW1hZ2VSdWxl OworICAgICAgICBob3Jpem9udGFsUnVsZSA9IE5pbmVQaWVjZUltYWdlUnVsZTo6U3BhY2U7CiAg ICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6IC8vIENTU1ZhbHVlUmVwZWF0Ci0gICAgICAgIGhv cml6b250YWxSdWxlID0gUmVwZWF0SW1hZ2VSdWxlOworICAgICAgICBob3Jpem9udGFsUnVsZSA9 IE5pbmVQaWVjZUltYWdlUnVsZTo6UmVwZWF0OwogICAgICAgICBicmVhazsKICAgICB9CiAgICAg aW1hZ2Uuc2V0SG9yaXpvbnRhbFJ1bGUoaG9yaXpvbnRhbFJ1bGUpOwogCi0gICAgRU5pbmVQaWVj ZUltYWdlUnVsZSB2ZXJ0aWNhbFJ1bGU7CisgICAgTmluZVBpZWNlSW1hZ2VSdWxlIHZlcnRpY2Fs UnVsZTsKICAgICBzd2l0Y2ggKHNlY29uZElkZW50aWZpZXIpIHsKICAgICBjYXNlIENTU1ZhbHVl U3RyZXRjaDoKLSAgICAgICAgdmVydGljYWxSdWxlID0gU3RyZXRjaEltYWdlUnVsZTsKKyAgICAg ICAgdmVydGljYWxSdWxlID0gTmluZVBpZWNlSW1hZ2VSdWxlOjpTdHJldGNoOwogICAgICAgICBi cmVhazsKICAgICBjYXNlIENTU1ZhbHVlUm91bmQ6Ci0gICAgICAgIHZlcnRpY2FsUnVsZSA9IFJv dW5kSW1hZ2VSdWxlOworICAgICAgICB2ZXJ0aWNhbFJ1bGUgPSBOaW5lUGllY2VJbWFnZVJ1bGU6 OlJvdW5kOwogICAgICAgICBicmVhazsKICAgICBjYXNlIENTU1ZhbHVlU3BhY2U6Ci0gICAgICAg IHZlcnRpY2FsUnVsZSA9IFNwYWNlSW1hZ2VSdWxlOworICAgICAgICB2ZXJ0aWNhbFJ1bGUgPSBO aW5lUGllY2VJbWFnZVJ1bGU6OlNwYWNlOwogICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OiAv LyBDU1NWYWx1ZVJlcGVhdAotICAgICAgICB2ZXJ0aWNhbFJ1bGUgPSBSZXBlYXRJbWFnZVJ1bGU7 CisgICAgICAgIHZlcnRpY2FsUnVsZSA9IE5pbmVQaWVjZUltYWdlUnVsZTo6UmVwZWF0OwogICAg ICAgICBicmVhazsKICAgICB9CiAgICAgaW1hZ2Uuc2V0VmVydGljYWxSdWxlKHZlcnRpY2FsUnVs ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmgg Yi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmgKaW5kZXggYzVjMmJmNWQw ZjVmYzc5MTBhZmYxNjI1OTk5MGM0Mzg2NjBjMTQyNC4uMjhkZTExNmM5MjUxZDQxMjg5NTNjNDky ODdlMThhMTczNjViOGQ0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVp bGRlckN1c3RvbS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDdXN0b20u aApAQCAtNTIxLDggKzUyMSw4IEBAIHB1YmxpYzoKICAgICAgICAgICAgIGltYWdlLnNldE91dHNl dChMZW5ndGhCb3goMCkpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgUmVwZWF0 OgotICAgICAgICAgICAgaW1hZ2Uuc2V0SG9yaXpvbnRhbFJ1bGUoU3RyZXRjaEltYWdlUnVsZSk7 Ci0gICAgICAgICAgICBpbWFnZS5zZXRWZXJ0aWNhbFJ1bGUoU3RyZXRjaEltYWdlUnVsZSk7Cisg ICAgICAgICAgICBpbWFnZS5zZXRIb3Jpem9udGFsUnVsZShOaW5lUGllY2VJbWFnZVJ1bGU6OlN0 cmV0Y2gpOworICAgICAgICAgICAgaW1hZ2Uuc2V0VmVydGljYWxSdWxlKE5pbmVQaWVjZUltYWdl UnVsZTo6U3RyZXRjaCk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBTbGljZToK ICAgICAgICAgICAgIC8vIE1hc2tzIGhhdmUgYSBkaWZmZXJlbnQgaW5pdGlhbCB2YWx1ZSBmb3Ig c2xpY2VzLiBQcmVzZXJ2ZSB0aGUgdmFsdWUgb2YgMCBmb3IgYmFja3dhcmRzIGNvbXBhdGliaWxp dHkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvTmluZVBpZWNl SW1hZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL05pbmVQaWVjZUltYWdl LmNwcAppbmRleCA3NjI4NmRlZWE0ZmVkOGZiNzRmODIxN2EwMzE3MjNmN2VjZTQwMjk2Li5iYzU0 MTk3YzYwN2M2YmNhMGQ5ZTEwMWFlNWEyMDRmMWY4Nzk1NzE0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvTmluZVBpZWNlSW1hZ2UuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9OaW5lUGllY2VJbWFnZS5jcHAKQEAgLTQ1LDcgKzQ1LDcg QEAgTmluZVBpZWNlSW1hZ2U6Ok5pbmVQaWVjZUltYWdlKCkKIHsKIH0KIAotTmluZVBpZWNlSW1h Z2U6Ok5pbmVQaWVjZUltYWdlKFJlZlB0cjxTdHlsZUltYWdlPiYmIGltYWdlLCBMZW5ndGhCb3gg aW1hZ2VTbGljZXMsIGJvb2wgZmlsbCwgTGVuZ3RoQm94IGJvcmRlclNsaWNlcywgTGVuZ3RoQm94 IG91dHNldCwgRU5pbmVQaWVjZUltYWdlUnVsZSBob3Jpem9udGFsUnVsZSwgRU5pbmVQaWVjZUlt YWdlUnVsZSB2ZXJ0aWNhbFJ1bGUpCitOaW5lUGllY2VJbWFnZTo6TmluZVBpZWNlSW1hZ2UoUmVm UHRyPFN0eWxlSW1hZ2U+JiYgaW1hZ2UsIExlbmd0aEJveCBpbWFnZVNsaWNlcywgYm9vbCBmaWxs LCBMZW5ndGhCb3ggYm9yZGVyU2xpY2VzLCBMZW5ndGhCb3ggb3V0c2V0LCBOaW5lUGllY2VJbWFn ZVJ1bGUgaG9yaXpvbnRhbFJ1bGUsIE5pbmVQaWVjZUltYWdlUnVsZSB2ZXJ0aWNhbFJ1bGUpCiAg ICAgOiBtX2RhdGEoRGF0YTo6Y3JlYXRlKFdURk1vdmUoaW1hZ2UpLCBpbWFnZVNsaWNlcywgZmls bCwgYm9yZGVyU2xpY2VzLCBvdXRzZXQsIGhvcml6b250YWxSdWxlLCB2ZXJ0aWNhbFJ1bGUpKQog ewogfQpAQCAtMTUwLDcgKzE1MCw3IEBAIEZsb2F0U2l6ZSBOaW5lUGllY2VJbWFnZTo6Y29tcHV0 ZVNpZGVUaWxlU2NhbGUoSW1hZ2VQaWVjZSBwaWVjZSwgY29uc3QgVmVjdG9yPEZsCiAgICAgcmV0 dXJuIEZsb2F0U2l6ZShzY2FsZSwgc2NhbGUpOwogfQogCi1GbG9hdFNpemUgTmluZVBpZWNlSW1h Z2U6OmNvbXB1dGVNaWRkbGVUaWxlU2NhbGUoY29uc3QgVmVjdG9yPEZsb2F0U2l6ZT4mIHNjYWxl cywgY29uc3QgVmVjdG9yPEZsb2F0UmVjdD4mIGRlc3RpbmF0aW9uUmVjdHMsIGNvbnN0IFZlY3Rv cjxGbG9hdFJlY3Q+JiBzb3VyY2VSZWN0cywgRU5pbmVQaWVjZUltYWdlUnVsZSBoUnVsZSwgRU5p bmVQaWVjZUltYWdlUnVsZSB2UnVsZSkKK0Zsb2F0U2l6ZSBOaW5lUGllY2VJbWFnZTo6Y29tcHV0 ZU1pZGRsZVRpbGVTY2FsZShjb25zdCBWZWN0b3I8RmxvYXRTaXplPiYgc2NhbGVzLCBjb25zdCBW ZWN0b3I8RmxvYXRSZWN0PiYgZGVzdGluYXRpb25SZWN0cywgY29uc3QgVmVjdG9yPEZsb2F0UmVj dD4mIHNvdXJjZVJlY3RzLCBOaW5lUGllY2VJbWFnZVJ1bGUgaFJ1bGUsIE5pbmVQaWVjZUltYWdl UnVsZSB2UnVsZSkKIHsKICAgICBGbG9hdFNpemUgc2NhbGUoMSwgMSk7CiAgICAgaWYgKGlzRW1w dHlQaWVjZVJlY3QoTWlkZGxlUGllY2UsIGRlc3RpbmF0aW9uUmVjdHMsIHNvdXJjZVJlY3RzKSkK QEAgLTE1OCwxNCArMTU4LDE0IEBAIEZsb2F0U2l6ZSBOaW5lUGllY2VJbWFnZTo6Y29tcHV0ZU1p ZGRsZVRpbGVTY2FsZShjb25zdCBWZWN0b3I8RmxvYXRTaXplPiYgc2NhbGVzCiAKICAgICAvLyBV bmxpa2UgdGhlIHNpZGUgcGllY2VzLCB0aGUgbWlkZGxlIHBpZWNlIGNhbiBoYXZlICJzdHJldGNo IiBzcGVjaWZpZWQgaW4gb25lIGF4aXMgYnV0IG5vdCB0aGUgb3RoZXIuCiAgICAgLy8gSW4gZmFj dCB0aGUgc2lkZSBwaWVjZXMgZG9uJ3QgZXZlbiB1c2UgdGhlIHNjYWxlIGZhY3RvciB1bmxlc3Mg dGhleSBoYXZlIGEgcnVsZSBvdGhlciB0aGFuICJzdHJldGNoIi4KLSAgICBpZiAoaFJ1bGUgPT0g U3RyZXRjaEltYWdlUnVsZSkKKyAgICBpZiAoaFJ1bGUgPT0gTmluZVBpZWNlSW1hZ2VSdWxlOjpT dHJldGNoKQogICAgICAgICBzY2FsZS5zZXRXaWR0aChkZXN0aW5hdGlvblJlY3RzW01pZGRsZVBp ZWNlXS53aWR0aCgpIC8gc291cmNlUmVjdHNbTWlkZGxlUGllY2VdLndpZHRoKCkpOwogICAgIGVs c2UgaWYgKCFpc0VtcHR5UGllY2VSZWN0KFRvcFBpZWNlLCBkZXN0aW5hdGlvblJlY3RzLCBzb3Vy Y2VSZWN0cykpCiAgICAgICAgIHNjYWxlLnNldFdpZHRoKHNjYWxlc1tUb3BQaWVjZV0ud2lkdGgo KSk7CiAgICAgZWxzZSBpZiAoIWlzRW1wdHlQaWVjZVJlY3QoQm90dG9tUGllY2UsIGRlc3RpbmF0 aW9uUmVjdHMsIHNvdXJjZVJlY3RzKSkKICAgICAgICAgc2NhbGUuc2V0V2lkdGgoc2NhbGVzW0Jv dHRvbVBpZWNlXS53aWR0aCgpKTsKIAotICAgIGlmICh2UnVsZSA9PSBTdHJldGNoSW1hZ2VSdWxl KQorICAgIGlmICh2UnVsZSA9PSBOaW5lUGllY2VJbWFnZVJ1bGU6OlN0cmV0Y2gpCiAgICAgICAg IHNjYWxlLnNldEhlaWdodChkZXN0aW5hdGlvblJlY3RzW01pZGRsZVBpZWNlXS5oZWlnaHQoKSAv IHNvdXJjZVJlY3RzW01pZGRsZVBpZWNlXS5oZWlnaHQoKSk7CiAgICAgZWxzZSBpZiAoIWlzRW1w dHlQaWVjZVJlY3QoTGVmdFBpZWNlLCBkZXN0aW5hdGlvblJlY3RzLCBzb3VyY2VSZWN0cykpCiAg ICAgICAgIHNjYWxlLnNldEhlaWdodChzY2FsZXNbTGVmdFBpZWNlXS5oZWlnaHQoKSk7CkBAIC0x NzUsNyArMTc1LDcgQEAgRmxvYXRTaXplIE5pbmVQaWVjZUltYWdlOjpjb21wdXRlTWlkZGxlVGls ZVNjYWxlKGNvbnN0IFZlY3RvcjxGbG9hdFNpemU+JiBzY2FsZXMKICAgICByZXR1cm4gc2NhbGU7 CiB9CiAKLVZlY3RvcjxGbG9hdFNpemU+IE5pbmVQaWVjZUltYWdlOjpjb21wdXRlVGlsZVNjYWxl cyhjb25zdCBWZWN0b3I8RmxvYXRSZWN0PiYgZGVzdGluYXRpb25SZWN0cywgY29uc3QgVmVjdG9y PEZsb2F0UmVjdD4mIHNvdXJjZVJlY3RzLCBFTmluZVBpZWNlSW1hZ2VSdWxlIGhSdWxlLCBFTmlu ZVBpZWNlSW1hZ2VSdWxlIHZSdWxlKQorVmVjdG9yPEZsb2F0U2l6ZT4gTmluZVBpZWNlSW1hZ2U6 OmNvbXB1dGVUaWxlU2NhbGVzKGNvbnN0IFZlY3RvcjxGbG9hdFJlY3Q+JiBkZXN0aW5hdGlvblJl Y3RzLCBjb25zdCBWZWN0b3I8RmxvYXRSZWN0PiYgc291cmNlUmVjdHMsIE5pbmVQaWVjZUltYWdl UnVsZSBoUnVsZSwgTmluZVBpZWNlSW1hZ2VSdWxlIHZSdWxlKQogewogICAgIFZlY3RvcjxGbG9h dFNpemU+IHNjYWxlcyhNYXhQaWVjZSwgRmxvYXRTaXplKDEsIDEpKTsKIApAQCAtMjIzLDE0ICsy MjMsOSBAQCB2b2lkIE5pbmVQaWVjZUltYWdlOjpwYWludChHcmFwaGljc0NvbnRleHQmIGdyYXBo aWNzQ29udGV4dCwgUmVuZGVyRWxlbWVudCogcmVuZAogICAgIH0KIH0KIAotaW5saW5lIE5pbmVQ aWVjZUltYWdlOjpEYXRhOjpEYXRhKCkKLSAgICA6IGZpbGwoZmFsc2UpCi0gICAgLCBob3Jpem9u dGFsUnVsZShTdHJldGNoSW1hZ2VSdWxlKQotICAgICwgdmVydGljYWxSdWxlKFN0cmV0Y2hJbWFn ZVJ1bGUpCi17Ci19CitpbmxpbmUgTmluZVBpZWNlSW1hZ2U6OkRhdGE6OkRhdGEoKSA9IGRlZmF1 bHQ7CiAKLWlubGluZSBOaW5lUGllY2VJbWFnZTo6RGF0YTo6RGF0YShSZWZQdHI8U3R5bGVJbWFn ZT4mJiBpbWFnZSwgTGVuZ3RoQm94IGltYWdlU2xpY2VzLCBib29sIGZpbGwsIExlbmd0aEJveCBi b3JkZXJTbGljZXMsIExlbmd0aEJveCBvdXRzZXQsIEVOaW5lUGllY2VJbWFnZVJ1bGUgaG9yaXpv bnRhbFJ1bGUsIEVOaW5lUGllY2VJbWFnZVJ1bGUgdmVydGljYWxSdWxlKQoraW5saW5lIE5pbmVQ aWVjZUltYWdlOjpEYXRhOjpEYXRhKFJlZlB0cjxTdHlsZUltYWdlPiYmIGltYWdlLCBMZW5ndGhC b3ggaW1hZ2VTbGljZXMsIGJvb2wgZmlsbCwgTGVuZ3RoQm94IGJvcmRlclNsaWNlcywgTGVuZ3Ro Qm94IG91dHNldCwgTmluZVBpZWNlSW1hZ2VSdWxlIGhvcml6b250YWxSdWxlLCBOaW5lUGllY2VJ bWFnZVJ1bGUgdmVydGljYWxSdWxlKQogICAgIDogZmlsbChmaWxsKQogICAgICwgaG9yaXpvbnRh bFJ1bGUoaG9yaXpvbnRhbFJ1bGUpCiAgICAgLCB2ZXJ0aWNhbFJ1bGUodmVydGljYWxSdWxlKQpA QCAtMjU4LDcgKzI1Myw3IEBAIGlubGluZSBSZWY8TmluZVBpZWNlSW1hZ2U6OkRhdGE+IE5pbmVQ aWVjZUltYWdlOjpEYXRhOjpjcmVhdGUoKQogICAgIHJldHVybiBhZG9wdFJlZigqbmV3IERhdGEp OwogfQogCi1pbmxpbmUgUmVmPE5pbmVQaWVjZUltYWdlOjpEYXRhPiBOaW5lUGllY2VJbWFnZTo6 RGF0YTo6Y3JlYXRlKFJlZlB0cjxTdHlsZUltYWdlPiYmIGltYWdlLCBMZW5ndGhCb3ggaW1hZ2VT bGljZXMsIGJvb2wgZmlsbCwgTGVuZ3RoQm94IGJvcmRlclNsaWNlcywgTGVuZ3RoQm94IG91dHNl dCwgRU5pbmVQaWVjZUltYWdlUnVsZSBob3Jpem9udGFsUnVsZSwgRU5pbmVQaWVjZUltYWdlUnVs ZSB2ZXJ0aWNhbFJ1bGUpCitpbmxpbmUgUmVmPE5pbmVQaWVjZUltYWdlOjpEYXRhPiBOaW5lUGll Y2VJbWFnZTo6RGF0YTo6Y3JlYXRlKFJlZlB0cjxTdHlsZUltYWdlPiYmIGltYWdlLCBMZW5ndGhC b3ggaW1hZ2VTbGljZXMsIGJvb2wgZmlsbCwgTGVuZ3RoQm94IGJvcmRlclNsaWNlcywgTGVuZ3Ro Qm94IG91dHNldCwgTmluZVBpZWNlSW1hZ2VSdWxlIGhvcml6b250YWxSdWxlLCBOaW5lUGllY2VJ bWFnZVJ1bGUgdmVydGljYWxSdWxlKQogewogICAgIHJldHVybiBhZG9wdFJlZigqbmV3IERhdGEo V1RGTW92ZShpbWFnZSksIGltYWdlU2xpY2VzLCBmaWxsLCBib3JkZXJTbGljZXMsIG91dHNldCwg aG9yaXpvbnRhbFJ1bGUsIHZlcnRpY2FsUnVsZSkpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3N0eWxlL05pbmVQaWVjZUltYWdlLmggYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc3R5bGUvTmluZVBpZWNlSW1hZ2UuaAppbmRleCAxMmE5OWJhNzU2OWJlNDMwYTNl ZWY0MDFjYmRkNjg0N2E0OTQ0YTZmLi4xMzNiOWExOTNkN2Q4MzUyMmE0ZjBhNzNjMTkyN2JmNTQ2 MjBhMDU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvTmluZVBp ZWNlSW1hZ2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvTmluZVBpZWNl SW1hZ2UuaApAQCAtMzQsOCArMzQsMTQgQEAgY2xhc3MgTGF5b3V0U2l6ZTsKIGNsYXNzIExheW91 dFJlY3Q7CiBjbGFzcyBSZW5kZXJTdHlsZTsKIAotZW51bSBFTmluZVBpZWNlSW1hZ2VSdWxlIHsg U3RyZXRjaEltYWdlUnVsZSwgUm91bmRJbWFnZVJ1bGUsIFNwYWNlSW1hZ2VSdWxlLCBSZXBlYXRJ bWFnZVJ1bGUgfTsKK2VudW0gY2xhc3MgTmluZVBpZWNlSW1hZ2VSdWxlIDogdWludDhfdCB7Cisg ICAgU3RyZXRjaCwKKyAgICBSb3VuZCwKKyAgICBTcGFjZSwKKyAgICBSZXBlYXQsCit9OwogCisv LyBVc2VkIGZvciBhcnJheSBpbmRleGluZywgc28gbm90IGFuIGVudW0gY2xhc3MuCiBlbnVtIElt YWdlUGllY2UgewogICAgIE1pblBpZWNlID0gMCwKICAgICBUb3BMZWZ0UGllY2UgPSBNaW5QaWVj ZSwKQEAgLTEwMSw3ICsxMDcsNyBAQCBpbmxpbmUgT3B0aW9uYWw8UGh5c2ljYWxCb3hTaWRlPiBp bWFnZVBpZWNlVmVydGljYWxTaWRlKEltYWdlUGllY2UgcGllY2UpCiBjbGFzcyBOaW5lUGllY2VJ bWFnZSB7CiBwdWJsaWM6CiAgICAgTmluZVBpZWNlSW1hZ2UoKTsKLSAgICBOaW5lUGllY2VJbWFn ZShSZWZQdHI8U3R5bGVJbWFnZT4mJiwgTGVuZ3RoQm94IGltYWdlU2xpY2VzLCBib29sIGZpbGws IExlbmd0aEJveCBib3JkZXJTbGljZXMsIExlbmd0aEJveCBvdXRzZXQsIEVOaW5lUGllY2VJbWFn ZVJ1bGUgaG9yaXpvbnRhbFJ1bGUsIEVOaW5lUGllY2VJbWFnZVJ1bGUgdmVydGljYWxSdWxlKTsK KyAgICBOaW5lUGllY2VJbWFnZShSZWZQdHI8U3R5bGVJbWFnZT4mJiwgTGVuZ3RoQm94IGltYWdl U2xpY2VzLCBib29sIGZpbGwsIExlbmd0aEJveCBib3JkZXJTbGljZXMsIExlbmd0aEJveCBvdXRz ZXQsIE5pbmVQaWVjZUltYWdlUnVsZSBob3Jpem9udGFsUnVsZSwgTmluZVBpZWNlSW1hZ2VSdWxl IHZlcnRpY2FsUnVsZSk7CiAKICAgICBib29sIG9wZXJhdG9yPT0oY29uc3QgTmluZVBpZWNlSW1h Z2UmIG90aGVyKSBjb25zdCB7IHJldHVybiBtX2RhdGEgPT0gb3RoZXIubV9kYXRhOyB9CiAgICAg Ym9vbCBvcGVyYXRvciE9KGNvbnN0IE5pbmVQaWVjZUltYWdlJiBvdGhlcikgY29uc3QgeyByZXR1 cm4gbV9kYXRhICE9IG90aGVyLm1fZGF0YTsgfQpAQCAtMTIyLDExICsxMjgsMTEgQEAgcHVibGlj OgogICAgIGNvbnN0IExlbmd0aEJveCYgb3V0c2V0KCkgY29uc3QgeyByZXR1cm4gbV9kYXRhLT5v dXRzZXQ7IH0KICAgICB2b2lkIHNldE91dHNldChMZW5ndGhCb3ggb3V0c2V0KSB7IG1fZGF0YS5h Y2Nlc3MoKS5vdXRzZXQgPSBXVEZNb3ZlKG91dHNldCk7IH0KIAotICAgIEVOaW5lUGllY2VJbWFn ZVJ1bGUgaG9yaXpvbnRhbFJ1bGUoKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxFTmluZVBp ZWNlSW1hZ2VSdWxlPihtX2RhdGEtPmhvcml6b250YWxSdWxlKTsgfQotICAgIHZvaWQgc2V0SG9y aXpvbnRhbFJ1bGUoRU5pbmVQaWVjZUltYWdlUnVsZSBydWxlKSB7IG1fZGF0YS5hY2Nlc3MoKS5o b3Jpem9udGFsUnVsZSA9IHJ1bGU7IH0KKyAgICBOaW5lUGllY2VJbWFnZVJ1bGUgaG9yaXpvbnRh bFJ1bGUoKSBjb25zdCB7IHJldHVybiBtX2RhdGEtPmhvcml6b250YWxSdWxlOyB9CisgICAgdm9p ZCBzZXRIb3Jpem9udGFsUnVsZShOaW5lUGllY2VJbWFnZVJ1bGUgcnVsZSkgeyBtX2RhdGEuYWNj ZXNzKCkuaG9yaXpvbnRhbFJ1bGUgPSBydWxlOyB9CiAgICAgCi0gICAgRU5pbmVQaWVjZUltYWdl UnVsZSB2ZXJ0aWNhbFJ1bGUoKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxFTmluZVBpZWNl SW1hZ2VSdWxlPihtX2RhdGEtPnZlcnRpY2FsUnVsZSk7IH0KLSAgICB2b2lkIHNldFZlcnRpY2Fs UnVsZShFTmluZVBpZWNlSW1hZ2VSdWxlIHJ1bGUpIHsgbV9kYXRhLmFjY2VzcygpLnZlcnRpY2Fs UnVsZSA9IHJ1bGU7IH0KKyAgICBOaW5lUGllY2VJbWFnZVJ1bGUgdmVydGljYWxSdWxlKCkgY29u c3QgeyByZXR1cm4gbV9kYXRhLT52ZXJ0aWNhbFJ1bGU7IH0KKyAgICB2b2lkIHNldFZlcnRpY2Fs UnVsZShOaW5lUGllY2VJbWFnZVJ1bGUgcnVsZSkgeyBtX2RhdGEuYWNjZXNzKCkudmVydGljYWxS dWxlID0gcnVsZTsgfQogCiAgICAgdm9pZCBjb3B5SW1hZ2VTbGljZXNGcm9tKGNvbnN0IE5pbmVQ aWVjZUltYWdlJiBvdGhlcikKICAgICB7CkBAIC0xNzYsMjMgKzE4MiwyMyBAQCBwdWJsaWM6CiAg ICAgc3RhdGljIHZvaWQgc2NhbGVTbGljZXNJZk5lZWRlZChjb25zdCBMYXlvdXRTaXplJiwgTGF5 b3V0Qm94RXh0ZW50JiBzbGljZXMsIGZsb2F0IGRldmljZVNjYWxlRmFjdG9yKTsKIAogICAgIHN0 YXRpYyBGbG9hdFNpemUgY29tcHV0ZVNpZGVUaWxlU2NhbGUoSW1hZ2VQaWVjZSwgY29uc3QgVmVj dG9yPEZsb2F0UmVjdD4mIGRlc3RpbmF0aW9uUmVjdHMsIGNvbnN0IFZlY3RvcjxGbG9hdFJlY3Q+ JiBzb3VyY2VSZWN0cyk7Ci0gICAgc3RhdGljIEZsb2F0U2l6ZSBjb21wdXRlTWlkZGxlVGlsZVNj YWxlKGNvbnN0IFZlY3RvcjxGbG9hdFNpemU+JiBzY2FsZXMsIGNvbnN0IFZlY3RvcjxGbG9hdFJl Y3Q+JiBkZXN0aW5hdGlvblJlY3RzLCBjb25zdCBWZWN0b3I8RmxvYXRSZWN0PiYgc291cmNlUmVj dHMsIEVOaW5lUGllY2VJbWFnZVJ1bGUgaFJ1bGUsIEVOaW5lUGllY2VJbWFnZVJ1bGUgdlJ1bGUp OwotICAgIHN0YXRpYyBWZWN0b3I8RmxvYXRTaXplPiBjb21wdXRlVGlsZVNjYWxlcyhjb25zdCBW ZWN0b3I8RmxvYXRSZWN0PiYgZGVzdGluYXRpb25SZWN0cywgY29uc3QgVmVjdG9yPEZsb2F0UmVj dD4mIHNvdXJjZVJlY3RzLCBFTmluZVBpZWNlSW1hZ2VSdWxlIGhSdWxlLCBFTmluZVBpZWNlSW1h Z2VSdWxlIHZSdWxlKTsKKyAgICBzdGF0aWMgRmxvYXRTaXplIGNvbXB1dGVNaWRkbGVUaWxlU2Nh bGUoY29uc3QgVmVjdG9yPEZsb2F0U2l6ZT4mIHNjYWxlcywgY29uc3QgVmVjdG9yPEZsb2F0UmVj dD4mIGRlc3RpbmF0aW9uUmVjdHMsIGNvbnN0IFZlY3RvcjxGbG9hdFJlY3Q+JiBzb3VyY2VSZWN0 cywgTmluZVBpZWNlSW1hZ2VSdWxlIGhSdWxlLCBOaW5lUGllY2VJbWFnZVJ1bGUgdlJ1bGUpOwor ICAgIHN0YXRpYyBWZWN0b3I8RmxvYXRTaXplPiBjb21wdXRlVGlsZVNjYWxlcyhjb25zdCBWZWN0 b3I8RmxvYXRSZWN0PiYgZGVzdGluYXRpb25SZWN0cywgY29uc3QgVmVjdG9yPEZsb2F0UmVjdD4m IHNvdXJjZVJlY3RzLCBOaW5lUGllY2VJbWFnZVJ1bGUgaFJ1bGUsIE5pbmVQaWVjZUltYWdlUnVs ZSB2UnVsZSk7CiAKICAgICB2b2lkIHBhaW50KEdyYXBoaWNzQ29udGV4dCYsIFJlbmRlckVsZW1l bnQqLCBjb25zdCBSZW5kZXJTdHlsZSYsIGNvbnN0IExheW91dFJlY3QmIGRlc3RpbmF0aW9uLCBj b25zdCBMYXlvdXRTaXplJiBzb3VyY2UsIGZsb2F0IGRldmljZVNjYWxlRmFjdG9yLCBDb21wb3Np dGVPcGVyYXRvcikgY29uc3Q7CiAKIHByaXZhdGU6CiAgICAgc3RydWN0IERhdGEgOiBSZWZDb3Vu dGVkPERhdGE+IHsKICAgICAgICAgc3RhdGljIFJlZjxEYXRhPiBjcmVhdGUoKTsKLSAgICAgICAg c3RhdGljIFJlZjxEYXRhPiBjcmVhdGUoUmVmUHRyPFN0eWxlSW1hZ2U+JiYsIExlbmd0aEJveCBp bWFnZVNsaWNlcywgYm9vbCBmaWxsLCBMZW5ndGhCb3ggYm9yZGVyU2xpY2VzLCBMZW5ndGhCb3gg b3V0c2V0LCBFTmluZVBpZWNlSW1hZ2VSdWxlIGhvcml6b250YWxSdWxlLCBFTmluZVBpZWNlSW1h Z2VSdWxlIHZlcnRpY2FsUnVsZSk7CisgICAgICAgIHN0YXRpYyBSZWY8RGF0YT4gY3JlYXRlKFJl ZlB0cjxTdHlsZUltYWdlPiYmLCBMZW5ndGhCb3ggaW1hZ2VTbGljZXMsIGJvb2wgZmlsbCwgTGVu Z3RoQm94IGJvcmRlclNsaWNlcywgTGVuZ3RoQm94IG91dHNldCwgTmluZVBpZWNlSW1hZ2VSdWxl IGhvcml6b250YWxSdWxlLCBOaW5lUGllY2VJbWFnZVJ1bGUgdmVydGljYWxSdWxlKTsKICAgICAg ICAgUmVmPERhdGE+IGNvcHkoKSBjb25zdDsKIAogICAgICAgICBib29sIG9wZXJhdG9yPT0oY29u c3QgRGF0YSYpIGNvbnN0OwogICAgICAgICBib29sIG9wZXJhdG9yIT0oY29uc3QgRGF0YSYgb3Ro ZXIpIGNvbnN0IHsgcmV0dXJuICEoKnRoaXMgPT0gb3RoZXIpOyB9CiAKLSAgICAgICAgYm9vbCBm aWxsIDogMTsKLSAgICAgICAgdW5zaWduZWQgaG9yaXpvbnRhbFJ1bGUgOiAyOyAvLyBFTmluZVBp ZWNlSW1hZ2VSdWxlCi0gICAgICAgIHVuc2lnbmVkIHZlcnRpY2FsUnVsZSA6IDI7IC8vIEVOaW5l UGllY2VJbWFnZVJ1bGUKKyAgICAgICAgYm9vbCBmaWxsIHsgZmFsc2UgfTsKKyAgICAgICAgTmlu ZVBpZWNlSW1hZ2VSdWxlIGhvcml6b250YWxSdWxlIHsgTmluZVBpZWNlSW1hZ2VSdWxlOjpTdHJl dGNoIH07CisgICAgICAgIE5pbmVQaWVjZUltYWdlUnVsZSB2ZXJ0aWNhbFJ1bGUgeyBOaW5lUGll Y2VJbWFnZVJ1bGU6OlN0cmV0Y2ggfTsKICAgICAgICAgUmVmUHRyPFN0eWxlSW1hZ2U+IGltYWdl OwogICAgICAgICBMZW5ndGhCb3ggaW1hZ2VTbGljZXMgeyB7IDEwMCwgUGVyY2VudCB9LCB7IDEw MCwgUGVyY2VudCB9LCB7IDEwMCwgUGVyY2VudCB9LCB7IDEwMCwgUGVyY2VudCB9IH07CiAgICAg ICAgIExlbmd0aEJveCBib3JkZXJTbGljZXMgeyB7IDEsIFJlbGF0aXZlIH0sIHsgMSwgUmVsYXRp dmUgfSwgeyAxLCBSZWxhdGl2ZSB9LCB7IDEsIFJlbGF0aXZlIH0gfTsKQEAgLTIwMCw3ICsyMDYs NyBAQCBwcml2YXRlOgogCiAgICAgcHJpdmF0ZToKICAgICAgICAgRGF0YSgpOwotICAgICAgICBE YXRhKFJlZlB0cjxTdHlsZUltYWdlPiYmLCBMZW5ndGhCb3ggaW1hZ2VTbGljZXMsIGJvb2wgZmls bCwgTGVuZ3RoQm94IGJvcmRlclNsaWNlcywgTGVuZ3RoQm94IG91dHNldCwgRU5pbmVQaWVjZUlt YWdlUnVsZSBob3Jpem9udGFsUnVsZSwgRU5pbmVQaWVjZUltYWdlUnVsZSB2ZXJ0aWNhbFJ1bGUp OworICAgICAgICBEYXRhKFJlZlB0cjxTdHlsZUltYWdlPiYmLCBMZW5ndGhCb3ggaW1hZ2VTbGlj ZXMsIGJvb2wgZmlsbCwgTGVuZ3RoQm94IGJvcmRlclNsaWNlcywgTGVuZ3RoQm94IG91dHNldCwg TmluZVBpZWNlSW1hZ2VSdWxlIGhvcml6b250YWxSdWxlLCBOaW5lUGllY2VJbWFnZVJ1bGUgdmVy dGljYWxSdWxlKTsKICAgICAgICAgRGF0YShjb25zdCBEYXRhJik7CiAgICAgfTsKIAo= 380839 2019-10-12 17:42:51 -0700 2019-10-13 10:08:41 -0700 Patch bug-202889-20191012174250.patch text/plain 15650 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxMDUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2Y1YjMxNmM5MGQyYzkw ZjgzNDM0ODIwYTEyNDk4Y2MyOTg1ZmVhNi4uNThlNjZiY2Y0OWMzNGRiMThiMTAzYmIxOTMyNWVh YjVlNDQ0ZTAxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE5LTEwLTEyICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENvbnZlcnQgRU5p bmVQaWVjZUltYWdlUnVsZSBpbnRvIGFuIGVudW0gY2xhc3MgYW5kIHJlbmFtZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAyODg5CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRW51bSBjbGFzc2lmeSBFTmlu ZVBpZWNlSW1hZ2VSdWxlLgorICAgICAgICAKKyAgICAgICAgVGhlIGJpdGZpZWxkIGluIE5pbmVQ aWVjZUltYWdlIGlzbid0IHNhdmluZyBhbnl0aGluZyBzbyBkb24ndCB1c2Ugb25lIHRoZXJlLgor CisgICAgICAgICogY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHA6CisgICAgICAg IChXZWJDb3JlOjp2YWx1ZUZvclJlcGVhdFJ1bGUpOgorICAgICAgICAqIGNzcy9DU1NUb1N0eWxl TWFwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1RvU3R5bGVNYXA6Om1hcE5pbmVQaWVjZUlt YWdlUmVwZWF0KToKKyAgICAgICAgKiBjc3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmg6CisgICAgICAg IChXZWJDb3JlOjpBcHBseVByb3BlcnR5Qm9yZGVySW1hZ2VNb2RpZmllcjo6YXBwbHlJbml0aWFs VmFsdWUpOgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9OaW5lUGllY2VJbWFnZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpOaW5lUGllY2VJbWFnZTo6TmluZVBpZWNlSW1hZ2UpOgorICAgICAg ICAoV2ViQ29yZTo6TmluZVBpZWNlSW1hZ2U6OmNvbXB1dGVNaWRkbGVUaWxlU2NhbGUpOgorICAg ICAgICAoV2ViQ29yZTo6TmluZVBpZWNlSW1hZ2U6OmNvbXB1dGVUaWxlU2NhbGVzKToKKyAgICAg ICAgKFdlYkNvcmU6Ok5pbmVQaWVjZUltYWdlOjpEYXRhOjpEYXRhKToKKyAgICAgICAgKFdlYkNv cmU6Ok5pbmVQaWVjZUltYWdlOjpEYXRhOjpjcmVhdGUpOgorICAgICAgICAqIHJlbmRlcmluZy9z dHlsZS9OaW5lUGllY2VJbWFnZS5oOgorICAgICAgICAoV2ViQ29yZTo6TmluZVBpZWNlSW1hZ2U6 Omhvcml6b250YWxSdWxlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Ok5pbmVQaWVjZUltYWdl OjpzZXRIb3Jpem9udGFsUnVsZSk6CisgICAgICAgIChXZWJDb3JlOjpOaW5lUGllY2VJbWFnZTo6 dmVydGljYWxSdWxlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Ok5pbmVQaWVjZUltYWdlOjpz ZXRWZXJ0aWNhbFJ1bGUpOgorCiAyMDE5LTEwLTEyICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFz ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEltcGxlbWVudCBUZXh0U3RyZWFtLWJhc2VkIGR1bXBp bmcgZm9yIGFsbCB0aGUgUmVuZGVyU3R5bGUgYW5kIFNWR1JlbmRlclN0eWxlIGVudW0gY2xhc3Nl cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJh dGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9u LmNwcAppbmRleCBiMmMyYjQxNWQ2MjZmMzNjMjcyYzg1Y2VjNTkzZGJlN2Q1ODdhZjYyLi5kN2Rh ZmEyYjViYjVkNjQ5OTc2ZTA4YzU5MjE3NzU1ZTczYzc0NWExIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcApAQCAtNDcwLDE3ICs0 NzAsMTcgQEAgc3RhdGljIGNvbnN0IENTU1Byb3BlcnR5SUQgY29tcHV0ZWRQcm9wZXJ0aWVzW10g PSB7CiAKIGNvbnN0IHVuc2lnbmVkIG51bUNvbXB1dGVkUHJvcGVydGllcyA9IFdURl9BUlJBWV9M RU5HVEgoY29tcHV0ZWRQcm9wZXJ0aWVzKTsKIAotc3RhdGljIENTU1ZhbHVlSUQgdmFsdWVGb3JS ZXBlYXRSdWxlKGludCBydWxlKQorc3RhdGljIENTU1ZhbHVlSUQgdmFsdWVGb3JSZXBlYXRSdWxl KE5pbmVQaWVjZUltYWdlUnVsZSBydWxlKQogewogICAgIHN3aXRjaCAocnVsZSkgewotICAgICAg ICBjYXNlIFJlcGVhdEltYWdlUnVsZToKLSAgICAgICAgICAgIHJldHVybiBDU1NWYWx1ZVJlcGVh dDsKLSAgICAgICAgY2FzZSBSb3VuZEltYWdlUnVsZToKLSAgICAgICAgICAgIHJldHVybiBDU1NW YWx1ZVJvdW5kOwotICAgICAgICBjYXNlIFNwYWNlSW1hZ2VSdWxlOgotICAgICAgICAgICAgcmV0 dXJuIENTU1ZhbHVlU3BhY2U7Ci0gICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICByZXR1cm4g Q1NTVmFsdWVTdHJldGNoOworICAgIGNhc2UgTmluZVBpZWNlSW1hZ2VSdWxlOjpSZXBlYXQ6Cisg ICAgICAgIHJldHVybiBDU1NWYWx1ZVJlcGVhdDsKKyAgICBjYXNlIE5pbmVQaWVjZUltYWdlUnVs ZTo6Um91bmQ6CisgICAgICAgIHJldHVybiBDU1NWYWx1ZVJvdW5kOworICAgIGNhc2UgTmluZVBp ZWNlSW1hZ2VSdWxlOjpTcGFjZToKKyAgICAgICAgcmV0dXJuIENTU1ZhbHVlU3BhY2U7CisgICAg ZGVmYXVsdDoKKyAgICAgICAgcmV0dXJuIENTU1ZhbHVlU3RyZXRjaDsKICAgICB9CiB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NUb1N0eWxlTWFwLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NUb1N0eWxlTWFwLmNwcAppbmRleCBlOTNkZTk5NzJkNGJmMzg5YTMwMDdi ZDg3ZWRjN2ExNjczY2ViNjkxLi5jODU5MjBiMDE3MzNjZjk0YzliYThmNDc2MTM0ZWE4NDAwYzJh YjgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTVG9TdHlsZU1hcC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1RvU3R5bGVNYXAuY3BwCkBAIC02NDUsMzYgKzY0NSwz NiBAQCB2b2lkIENTU1RvU3R5bGVNYXA6Om1hcE5pbmVQaWVjZUltYWdlUmVwZWF0KENTU1ZhbHVl JiB2YWx1ZSwgTmluZVBpZWNlSW1hZ2UmIGltYQogICAgIENTU1ZhbHVlSUQgZmlyc3RJZGVudGlm aWVyID0gcGFpci0+Zmlyc3QoKS0+dmFsdWVJRCgpOwogICAgIENTU1ZhbHVlSUQgc2Vjb25kSWRl bnRpZmllciA9IHBhaXItPnNlY29uZCgpLT52YWx1ZUlEKCk7CiAKLSAgICBFTmluZVBpZWNlSW1h Z2VSdWxlIGhvcml6b250YWxSdWxlOworICAgIE5pbmVQaWVjZUltYWdlUnVsZSBob3Jpem9udGFs UnVsZTsKICAgICBzd2l0Y2ggKGZpcnN0SWRlbnRpZmllcikgewogICAgIGNhc2UgQ1NTVmFsdWVT dHJldGNoOgotICAgICAgICBob3Jpem9udGFsUnVsZSA9IFN0cmV0Y2hJbWFnZVJ1bGU7CisgICAg ICAgIGhvcml6b250YWxSdWxlID0gTmluZVBpZWNlSW1hZ2VSdWxlOjpTdHJldGNoOwogICAgICAg ICBicmVhazsKICAgICBjYXNlIENTU1ZhbHVlUm91bmQ6Ci0gICAgICAgIGhvcml6b250YWxSdWxl ID0gUm91bmRJbWFnZVJ1bGU7CisgICAgICAgIGhvcml6b250YWxSdWxlID0gTmluZVBpZWNlSW1h Z2VSdWxlOjpSb3VuZDsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBDU1NWYWx1ZVNwYWNlOgot ICAgICAgICBob3Jpem9udGFsUnVsZSA9IFNwYWNlSW1hZ2VSdWxlOworICAgICAgICBob3Jpem9u dGFsUnVsZSA9IE5pbmVQaWVjZUltYWdlUnVsZTo6U3BhY2U7CiAgICAgICAgIGJyZWFrOwogICAg IGRlZmF1bHQ6IC8vIENTU1ZhbHVlUmVwZWF0Ci0gICAgICAgIGhvcml6b250YWxSdWxlID0gUmVw ZWF0SW1hZ2VSdWxlOworICAgICAgICBob3Jpem9udGFsUnVsZSA9IE5pbmVQaWVjZUltYWdlUnVs ZTo6UmVwZWF0OwogICAgICAgICBicmVhazsKICAgICB9CiAgICAgaW1hZ2Uuc2V0SG9yaXpvbnRh bFJ1bGUoaG9yaXpvbnRhbFJ1bGUpOwogCi0gICAgRU5pbmVQaWVjZUltYWdlUnVsZSB2ZXJ0aWNh bFJ1bGU7CisgICAgTmluZVBpZWNlSW1hZ2VSdWxlIHZlcnRpY2FsUnVsZTsKICAgICBzd2l0Y2gg KHNlY29uZElkZW50aWZpZXIpIHsKICAgICBjYXNlIENTU1ZhbHVlU3RyZXRjaDoKLSAgICAgICAg dmVydGljYWxSdWxlID0gU3RyZXRjaEltYWdlUnVsZTsKKyAgICAgICAgdmVydGljYWxSdWxlID0g TmluZVBpZWNlSW1hZ2VSdWxlOjpTdHJldGNoOwogICAgICAgICBicmVhazsKICAgICBjYXNlIENT U1ZhbHVlUm91bmQ6Ci0gICAgICAgIHZlcnRpY2FsUnVsZSA9IFJvdW5kSW1hZ2VSdWxlOworICAg ICAgICB2ZXJ0aWNhbFJ1bGUgPSBOaW5lUGllY2VJbWFnZVJ1bGU6OlJvdW5kOwogICAgICAgICBi cmVhazsKICAgICBjYXNlIENTU1ZhbHVlU3BhY2U6Ci0gICAgICAgIHZlcnRpY2FsUnVsZSA9IFNw YWNlSW1hZ2VSdWxlOworICAgICAgICB2ZXJ0aWNhbFJ1bGUgPSBOaW5lUGllY2VJbWFnZVJ1bGU6 OlNwYWNlOwogICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OiAvLyBDU1NWYWx1ZVJlcGVhdAot ICAgICAgICB2ZXJ0aWNhbFJ1bGUgPSBSZXBlYXRJbWFnZVJ1bGU7CisgICAgICAgIHZlcnRpY2Fs UnVsZSA9IE5pbmVQaWVjZUltYWdlUnVsZTo6UmVwZWF0OwogICAgICAgICBicmVhazsKICAgICB9 CiAgICAgaW1hZ2Uuc2V0VmVydGljYWxSdWxlKHZlcnRpY2FsUnVsZSk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmggYi9Tb3VyY2UvV2ViQ29yZS9j c3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmgKaW5kZXggYzVjMmJmNWQwZjVmYzc5MTBhZmYxNjI1OTk5 MGM0Mzg2NjBjMTQyNC4uMjhkZTExNmM5MjUxZDQxMjg5NTNjNDkyODdlMThhMTczNjViOGQ0NSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckN1c3RvbS5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDdXN0b20uaApAQCAtNTIxLDggKzUyMSw4 IEBAIHB1YmxpYzoKICAgICAgICAgICAgIGltYWdlLnNldE91dHNldChMZW5ndGhCb3goMCkpOwog ICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgUmVwZWF0OgotICAgICAgICAgICAgaW1h Z2Uuc2V0SG9yaXpvbnRhbFJ1bGUoU3RyZXRjaEltYWdlUnVsZSk7Ci0gICAgICAgICAgICBpbWFn ZS5zZXRWZXJ0aWNhbFJ1bGUoU3RyZXRjaEltYWdlUnVsZSk7CisgICAgICAgICAgICBpbWFnZS5z ZXRIb3Jpem9udGFsUnVsZShOaW5lUGllY2VJbWFnZVJ1bGU6OlN0cmV0Y2gpOworICAgICAgICAg ICAgaW1hZ2Uuc2V0VmVydGljYWxSdWxlKE5pbmVQaWVjZUltYWdlUnVsZTo6U3RyZXRjaCk7CiAg ICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBTbGljZToKICAgICAgICAgICAgIC8vIE1h c2tzIGhhdmUgYSBkaWZmZXJlbnQgaW5pdGlhbCB2YWx1ZSBmb3Igc2xpY2VzLiBQcmVzZXJ2ZSB0 aGUgdmFsdWUgb2YgMCBmb3IgYmFja3dhcmRzIGNvbXBhdGliaWxpdHkuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvTmluZVBpZWNlSW1hZ2UuY3BwIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL05pbmVQaWVjZUltYWdlLmNwcAppbmRleCA3NjI4NmRl ZWE0ZmVkOGZiNzRmODIxN2EwMzE3MjNmN2VjZTQwMjk2Li5iYzU0MTk3YzYwN2M2YmNhMGQ5ZTEw MWFlNWEyMDRmMWY4Nzk1NzE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv c3R5bGUvTmluZVBpZWNlSW1hZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dHlsZS9OaW5lUGllY2VJbWFnZS5jcHAKQEAgLTQ1LDcgKzQ1LDcgQEAgTmluZVBpZWNlSW1hZ2U6 Ok5pbmVQaWVjZUltYWdlKCkKIHsKIH0KIAotTmluZVBpZWNlSW1hZ2U6Ok5pbmVQaWVjZUltYWdl KFJlZlB0cjxTdHlsZUltYWdlPiYmIGltYWdlLCBMZW5ndGhCb3ggaW1hZ2VTbGljZXMsIGJvb2wg ZmlsbCwgTGVuZ3RoQm94IGJvcmRlclNsaWNlcywgTGVuZ3RoQm94IG91dHNldCwgRU5pbmVQaWVj ZUltYWdlUnVsZSBob3Jpem9udGFsUnVsZSwgRU5pbmVQaWVjZUltYWdlUnVsZSB2ZXJ0aWNhbFJ1 bGUpCitOaW5lUGllY2VJbWFnZTo6TmluZVBpZWNlSW1hZ2UoUmVmUHRyPFN0eWxlSW1hZ2U+JiYg aW1hZ2UsIExlbmd0aEJveCBpbWFnZVNsaWNlcywgYm9vbCBmaWxsLCBMZW5ndGhCb3ggYm9yZGVy U2xpY2VzLCBMZW5ndGhCb3ggb3V0c2V0LCBOaW5lUGllY2VJbWFnZVJ1bGUgaG9yaXpvbnRhbFJ1 bGUsIE5pbmVQaWVjZUltYWdlUnVsZSB2ZXJ0aWNhbFJ1bGUpCiAgICAgOiBtX2RhdGEoRGF0YTo6 Y3JlYXRlKFdURk1vdmUoaW1hZ2UpLCBpbWFnZVNsaWNlcywgZmlsbCwgYm9yZGVyU2xpY2VzLCBv dXRzZXQsIGhvcml6b250YWxSdWxlLCB2ZXJ0aWNhbFJ1bGUpKQogewogfQpAQCAtMTUwLDcgKzE1 MCw3IEBAIEZsb2F0U2l6ZSBOaW5lUGllY2VJbWFnZTo6Y29tcHV0ZVNpZGVUaWxlU2NhbGUoSW1h Z2VQaWVjZSBwaWVjZSwgY29uc3QgVmVjdG9yPEZsCiAgICAgcmV0dXJuIEZsb2F0U2l6ZShzY2Fs ZSwgc2NhbGUpOwogfQogCi1GbG9hdFNpemUgTmluZVBpZWNlSW1hZ2U6OmNvbXB1dGVNaWRkbGVU aWxlU2NhbGUoY29uc3QgVmVjdG9yPEZsb2F0U2l6ZT4mIHNjYWxlcywgY29uc3QgVmVjdG9yPEZs b2F0UmVjdD4mIGRlc3RpbmF0aW9uUmVjdHMsIGNvbnN0IFZlY3RvcjxGbG9hdFJlY3Q+JiBzb3Vy Y2VSZWN0cywgRU5pbmVQaWVjZUltYWdlUnVsZSBoUnVsZSwgRU5pbmVQaWVjZUltYWdlUnVsZSB2 UnVsZSkKK0Zsb2F0U2l6ZSBOaW5lUGllY2VJbWFnZTo6Y29tcHV0ZU1pZGRsZVRpbGVTY2FsZShj b25zdCBWZWN0b3I8RmxvYXRTaXplPiYgc2NhbGVzLCBjb25zdCBWZWN0b3I8RmxvYXRSZWN0PiYg ZGVzdGluYXRpb25SZWN0cywgY29uc3QgVmVjdG9yPEZsb2F0UmVjdD4mIHNvdXJjZVJlY3RzLCBO aW5lUGllY2VJbWFnZVJ1bGUgaFJ1bGUsIE5pbmVQaWVjZUltYWdlUnVsZSB2UnVsZSkKIHsKICAg ICBGbG9hdFNpemUgc2NhbGUoMSwgMSk7CiAgICAgaWYgKGlzRW1wdHlQaWVjZVJlY3QoTWlkZGxl UGllY2UsIGRlc3RpbmF0aW9uUmVjdHMsIHNvdXJjZVJlY3RzKSkKQEAgLTE1OCwxNCArMTU4LDE0 IEBAIEZsb2F0U2l6ZSBOaW5lUGllY2VJbWFnZTo6Y29tcHV0ZU1pZGRsZVRpbGVTY2FsZShjb25z dCBWZWN0b3I8RmxvYXRTaXplPiYgc2NhbGVzCiAKICAgICAvLyBVbmxpa2UgdGhlIHNpZGUgcGll Y2VzLCB0aGUgbWlkZGxlIHBpZWNlIGNhbiBoYXZlICJzdHJldGNoIiBzcGVjaWZpZWQgaW4gb25l IGF4aXMgYnV0IG5vdCB0aGUgb3RoZXIuCiAgICAgLy8gSW4gZmFjdCB0aGUgc2lkZSBwaWVjZXMg ZG9uJ3QgZXZlbiB1c2UgdGhlIHNjYWxlIGZhY3RvciB1bmxlc3MgdGhleSBoYXZlIGEgcnVsZSBv dGhlciB0aGFuICJzdHJldGNoIi4KLSAgICBpZiAoaFJ1bGUgPT0gU3RyZXRjaEltYWdlUnVsZSkK KyAgICBpZiAoaFJ1bGUgPT0gTmluZVBpZWNlSW1hZ2VSdWxlOjpTdHJldGNoKQogICAgICAgICBz Y2FsZS5zZXRXaWR0aChkZXN0aW5hdGlvblJlY3RzW01pZGRsZVBpZWNlXS53aWR0aCgpIC8gc291 cmNlUmVjdHNbTWlkZGxlUGllY2VdLndpZHRoKCkpOwogICAgIGVsc2UgaWYgKCFpc0VtcHR5UGll Y2VSZWN0KFRvcFBpZWNlLCBkZXN0aW5hdGlvblJlY3RzLCBzb3VyY2VSZWN0cykpCiAgICAgICAg IHNjYWxlLnNldFdpZHRoKHNjYWxlc1tUb3BQaWVjZV0ud2lkdGgoKSk7CiAgICAgZWxzZSBpZiAo IWlzRW1wdHlQaWVjZVJlY3QoQm90dG9tUGllY2UsIGRlc3RpbmF0aW9uUmVjdHMsIHNvdXJjZVJl Y3RzKSkKICAgICAgICAgc2NhbGUuc2V0V2lkdGgoc2NhbGVzW0JvdHRvbVBpZWNlXS53aWR0aCgp KTsKIAotICAgIGlmICh2UnVsZSA9PSBTdHJldGNoSW1hZ2VSdWxlKQorICAgIGlmICh2UnVsZSA9 PSBOaW5lUGllY2VJbWFnZVJ1bGU6OlN0cmV0Y2gpCiAgICAgICAgIHNjYWxlLnNldEhlaWdodChk ZXN0aW5hdGlvblJlY3RzW01pZGRsZVBpZWNlXS5oZWlnaHQoKSAvIHNvdXJjZVJlY3RzW01pZGRs ZVBpZWNlXS5oZWlnaHQoKSk7CiAgICAgZWxzZSBpZiAoIWlzRW1wdHlQaWVjZVJlY3QoTGVmdFBp ZWNlLCBkZXN0aW5hdGlvblJlY3RzLCBzb3VyY2VSZWN0cykpCiAgICAgICAgIHNjYWxlLnNldEhl aWdodChzY2FsZXNbTGVmdFBpZWNlXS5oZWlnaHQoKSk7CkBAIC0xNzUsNyArMTc1LDcgQEAgRmxv YXRTaXplIE5pbmVQaWVjZUltYWdlOjpjb21wdXRlTWlkZGxlVGlsZVNjYWxlKGNvbnN0IFZlY3Rv cjxGbG9hdFNpemU+JiBzY2FsZXMKICAgICByZXR1cm4gc2NhbGU7CiB9CiAKLVZlY3RvcjxGbG9h dFNpemU+IE5pbmVQaWVjZUltYWdlOjpjb21wdXRlVGlsZVNjYWxlcyhjb25zdCBWZWN0b3I8Rmxv YXRSZWN0PiYgZGVzdGluYXRpb25SZWN0cywgY29uc3QgVmVjdG9yPEZsb2F0UmVjdD4mIHNvdXJj ZVJlY3RzLCBFTmluZVBpZWNlSW1hZ2VSdWxlIGhSdWxlLCBFTmluZVBpZWNlSW1hZ2VSdWxlIHZS dWxlKQorVmVjdG9yPEZsb2F0U2l6ZT4gTmluZVBpZWNlSW1hZ2U6OmNvbXB1dGVUaWxlU2NhbGVz KGNvbnN0IFZlY3RvcjxGbG9hdFJlY3Q+JiBkZXN0aW5hdGlvblJlY3RzLCBjb25zdCBWZWN0b3I8 RmxvYXRSZWN0PiYgc291cmNlUmVjdHMsIE5pbmVQaWVjZUltYWdlUnVsZSBoUnVsZSwgTmluZVBp ZWNlSW1hZ2VSdWxlIHZSdWxlKQogewogICAgIFZlY3RvcjxGbG9hdFNpemU+IHNjYWxlcyhNYXhQ aWVjZSwgRmxvYXRTaXplKDEsIDEpKTsKIApAQCAtMjIzLDE0ICsyMjMsOSBAQCB2b2lkIE5pbmVQ aWVjZUltYWdlOjpwYWludChHcmFwaGljc0NvbnRleHQmIGdyYXBoaWNzQ29udGV4dCwgUmVuZGVy RWxlbWVudCogcmVuZAogICAgIH0KIH0KIAotaW5saW5lIE5pbmVQaWVjZUltYWdlOjpEYXRhOjpE YXRhKCkKLSAgICA6IGZpbGwoZmFsc2UpCi0gICAgLCBob3Jpem9udGFsUnVsZShTdHJldGNoSW1h Z2VSdWxlKQotICAgICwgdmVydGljYWxSdWxlKFN0cmV0Y2hJbWFnZVJ1bGUpCi17Ci19Citpbmxp bmUgTmluZVBpZWNlSW1hZ2U6OkRhdGE6OkRhdGEoKSA9IGRlZmF1bHQ7CiAKLWlubGluZSBOaW5l UGllY2VJbWFnZTo6RGF0YTo6RGF0YShSZWZQdHI8U3R5bGVJbWFnZT4mJiBpbWFnZSwgTGVuZ3Ro Qm94IGltYWdlU2xpY2VzLCBib29sIGZpbGwsIExlbmd0aEJveCBib3JkZXJTbGljZXMsIExlbmd0 aEJveCBvdXRzZXQsIEVOaW5lUGllY2VJbWFnZVJ1bGUgaG9yaXpvbnRhbFJ1bGUsIEVOaW5lUGll Y2VJbWFnZVJ1bGUgdmVydGljYWxSdWxlKQoraW5saW5lIE5pbmVQaWVjZUltYWdlOjpEYXRhOjpE YXRhKFJlZlB0cjxTdHlsZUltYWdlPiYmIGltYWdlLCBMZW5ndGhCb3ggaW1hZ2VTbGljZXMsIGJv b2wgZmlsbCwgTGVuZ3RoQm94IGJvcmRlclNsaWNlcywgTGVuZ3RoQm94IG91dHNldCwgTmluZVBp ZWNlSW1hZ2VSdWxlIGhvcml6b250YWxSdWxlLCBOaW5lUGllY2VJbWFnZVJ1bGUgdmVydGljYWxS dWxlKQogICAgIDogZmlsbChmaWxsKQogICAgICwgaG9yaXpvbnRhbFJ1bGUoaG9yaXpvbnRhbFJ1 bGUpCiAgICAgLCB2ZXJ0aWNhbFJ1bGUodmVydGljYWxSdWxlKQpAQCAtMjU4LDcgKzI1Myw3IEBA IGlubGluZSBSZWY8TmluZVBpZWNlSW1hZ2U6OkRhdGE+IE5pbmVQaWVjZUltYWdlOjpEYXRhOjpj cmVhdGUoKQogICAgIHJldHVybiBhZG9wdFJlZigqbmV3IERhdGEpOwogfQogCi1pbmxpbmUgUmVm PE5pbmVQaWVjZUltYWdlOjpEYXRhPiBOaW5lUGllY2VJbWFnZTo6RGF0YTo6Y3JlYXRlKFJlZlB0 cjxTdHlsZUltYWdlPiYmIGltYWdlLCBMZW5ndGhCb3ggaW1hZ2VTbGljZXMsIGJvb2wgZmlsbCwg TGVuZ3RoQm94IGJvcmRlclNsaWNlcywgTGVuZ3RoQm94IG91dHNldCwgRU5pbmVQaWVjZUltYWdl UnVsZSBob3Jpem9udGFsUnVsZSwgRU5pbmVQaWVjZUltYWdlUnVsZSB2ZXJ0aWNhbFJ1bGUpCitp bmxpbmUgUmVmPE5pbmVQaWVjZUltYWdlOjpEYXRhPiBOaW5lUGllY2VJbWFnZTo6RGF0YTo6Y3Jl YXRlKFJlZlB0cjxTdHlsZUltYWdlPiYmIGltYWdlLCBMZW5ndGhCb3ggaW1hZ2VTbGljZXMsIGJv b2wgZmlsbCwgTGVuZ3RoQm94IGJvcmRlclNsaWNlcywgTGVuZ3RoQm94IG91dHNldCwgTmluZVBp ZWNlSW1hZ2VSdWxlIGhvcml6b250YWxSdWxlLCBOaW5lUGllY2VJbWFnZVJ1bGUgdmVydGljYWxS dWxlKQogewogICAgIHJldHVybiBhZG9wdFJlZigqbmV3IERhdGEoV1RGTW92ZShpbWFnZSksIGlt YWdlU2xpY2VzLCBmaWxsLCBib3JkZXJTbGljZXMsIG91dHNldCwgaG9yaXpvbnRhbFJ1bGUsIHZl cnRpY2FsUnVsZSkpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0 eWxlL05pbmVQaWVjZUltYWdlLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvTmlu ZVBpZWNlSW1hZ2UuaAppbmRleCAxMmE5OWJhNzU2OWJlNDMwYTNlZWY0MDFjYmRkNjg0N2E0OTQ0 YTZmLi4xMzNiOWExOTNkN2Q4MzUyMmE0ZjBhNzNjMTkyN2JmNTQ2MjBhMDU0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvTmluZVBpZWNlSW1hZ2UuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvTmluZVBpZWNlSW1hZ2UuaApAQCAtMzQsOCAr MzQsMTQgQEAgY2xhc3MgTGF5b3V0U2l6ZTsKIGNsYXNzIExheW91dFJlY3Q7CiBjbGFzcyBSZW5k ZXJTdHlsZTsKIAotZW51bSBFTmluZVBpZWNlSW1hZ2VSdWxlIHsgU3RyZXRjaEltYWdlUnVsZSwg Um91bmRJbWFnZVJ1bGUsIFNwYWNlSW1hZ2VSdWxlLCBSZXBlYXRJbWFnZVJ1bGUgfTsKK2VudW0g Y2xhc3MgTmluZVBpZWNlSW1hZ2VSdWxlIDogdWludDhfdCB7CisgICAgU3RyZXRjaCwKKyAgICBS b3VuZCwKKyAgICBTcGFjZSwKKyAgICBSZXBlYXQsCit9OwogCisvLyBVc2VkIGZvciBhcnJheSBp bmRleGluZywgc28gbm90IGFuIGVudW0gY2xhc3MuCiBlbnVtIEltYWdlUGllY2UgewogICAgIE1p blBpZWNlID0gMCwKICAgICBUb3BMZWZ0UGllY2UgPSBNaW5QaWVjZSwKQEAgLTEwMSw3ICsxMDcs NyBAQCBpbmxpbmUgT3B0aW9uYWw8UGh5c2ljYWxCb3hTaWRlPiBpbWFnZVBpZWNlVmVydGljYWxT aWRlKEltYWdlUGllY2UgcGllY2UpCiBjbGFzcyBOaW5lUGllY2VJbWFnZSB7CiBwdWJsaWM6CiAg ICAgTmluZVBpZWNlSW1hZ2UoKTsKLSAgICBOaW5lUGllY2VJbWFnZShSZWZQdHI8U3R5bGVJbWFn ZT4mJiwgTGVuZ3RoQm94IGltYWdlU2xpY2VzLCBib29sIGZpbGwsIExlbmd0aEJveCBib3JkZXJT bGljZXMsIExlbmd0aEJveCBvdXRzZXQsIEVOaW5lUGllY2VJbWFnZVJ1bGUgaG9yaXpvbnRhbFJ1 bGUsIEVOaW5lUGllY2VJbWFnZVJ1bGUgdmVydGljYWxSdWxlKTsKKyAgICBOaW5lUGllY2VJbWFn ZShSZWZQdHI8U3R5bGVJbWFnZT4mJiwgTGVuZ3RoQm94IGltYWdlU2xpY2VzLCBib29sIGZpbGws IExlbmd0aEJveCBib3JkZXJTbGljZXMsIExlbmd0aEJveCBvdXRzZXQsIE5pbmVQaWVjZUltYWdl UnVsZSBob3Jpem9udGFsUnVsZSwgTmluZVBpZWNlSW1hZ2VSdWxlIHZlcnRpY2FsUnVsZSk7CiAK ICAgICBib29sIG9wZXJhdG9yPT0oY29uc3QgTmluZVBpZWNlSW1hZ2UmIG90aGVyKSBjb25zdCB7 IHJldHVybiBtX2RhdGEgPT0gb3RoZXIubV9kYXRhOyB9CiAgICAgYm9vbCBvcGVyYXRvciE9KGNv bnN0IE5pbmVQaWVjZUltYWdlJiBvdGhlcikgY29uc3QgeyByZXR1cm4gbV9kYXRhICE9IG90aGVy Lm1fZGF0YTsgfQpAQCAtMTIyLDExICsxMjgsMTEgQEAgcHVibGljOgogICAgIGNvbnN0IExlbmd0 aEJveCYgb3V0c2V0KCkgY29uc3QgeyByZXR1cm4gbV9kYXRhLT5vdXRzZXQ7IH0KICAgICB2b2lk IHNldE91dHNldChMZW5ndGhCb3ggb3V0c2V0KSB7IG1fZGF0YS5hY2Nlc3MoKS5vdXRzZXQgPSBX VEZNb3ZlKG91dHNldCk7IH0KIAotICAgIEVOaW5lUGllY2VJbWFnZVJ1bGUgaG9yaXpvbnRhbFJ1 bGUoKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxFTmluZVBpZWNlSW1hZ2VSdWxlPihtX2Rh dGEtPmhvcml6b250YWxSdWxlKTsgfQotICAgIHZvaWQgc2V0SG9yaXpvbnRhbFJ1bGUoRU5pbmVQ aWVjZUltYWdlUnVsZSBydWxlKSB7IG1fZGF0YS5hY2Nlc3MoKS5ob3Jpem9udGFsUnVsZSA9IHJ1 bGU7IH0KKyAgICBOaW5lUGllY2VJbWFnZVJ1bGUgaG9yaXpvbnRhbFJ1bGUoKSBjb25zdCB7IHJl dHVybiBtX2RhdGEtPmhvcml6b250YWxSdWxlOyB9CisgICAgdm9pZCBzZXRIb3Jpem9udGFsUnVs ZShOaW5lUGllY2VJbWFnZVJ1bGUgcnVsZSkgeyBtX2RhdGEuYWNjZXNzKCkuaG9yaXpvbnRhbFJ1 bGUgPSBydWxlOyB9CiAgICAgCi0gICAgRU5pbmVQaWVjZUltYWdlUnVsZSB2ZXJ0aWNhbFJ1bGUo KSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxFTmluZVBpZWNlSW1hZ2VSdWxlPihtX2RhdGEt PnZlcnRpY2FsUnVsZSk7IH0KLSAgICB2b2lkIHNldFZlcnRpY2FsUnVsZShFTmluZVBpZWNlSW1h Z2VSdWxlIHJ1bGUpIHsgbV9kYXRhLmFjY2VzcygpLnZlcnRpY2FsUnVsZSA9IHJ1bGU7IH0KKyAg ICBOaW5lUGllY2VJbWFnZVJ1bGUgdmVydGljYWxSdWxlKCkgY29uc3QgeyByZXR1cm4gbV9kYXRh LT52ZXJ0aWNhbFJ1bGU7IH0KKyAgICB2b2lkIHNldFZlcnRpY2FsUnVsZShOaW5lUGllY2VJbWFn ZVJ1bGUgcnVsZSkgeyBtX2RhdGEuYWNjZXNzKCkudmVydGljYWxSdWxlID0gcnVsZTsgfQogCiAg ICAgdm9pZCBjb3B5SW1hZ2VTbGljZXNGcm9tKGNvbnN0IE5pbmVQaWVjZUltYWdlJiBvdGhlcikK ICAgICB7CkBAIC0xNzYsMjMgKzE4MiwyMyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIHZvaWQgc2Nh bGVTbGljZXNJZk5lZWRlZChjb25zdCBMYXlvdXRTaXplJiwgTGF5b3V0Qm94RXh0ZW50JiBzbGlj ZXMsIGZsb2F0IGRldmljZVNjYWxlRmFjdG9yKTsKIAogICAgIHN0YXRpYyBGbG9hdFNpemUgY29t cHV0ZVNpZGVUaWxlU2NhbGUoSW1hZ2VQaWVjZSwgY29uc3QgVmVjdG9yPEZsb2F0UmVjdD4mIGRl c3RpbmF0aW9uUmVjdHMsIGNvbnN0IFZlY3RvcjxGbG9hdFJlY3Q+JiBzb3VyY2VSZWN0cyk7Ci0g ICAgc3RhdGljIEZsb2F0U2l6ZSBjb21wdXRlTWlkZGxlVGlsZVNjYWxlKGNvbnN0IFZlY3RvcjxG bG9hdFNpemU+JiBzY2FsZXMsIGNvbnN0IFZlY3RvcjxGbG9hdFJlY3Q+JiBkZXN0aW5hdGlvblJl Y3RzLCBjb25zdCBWZWN0b3I8RmxvYXRSZWN0PiYgc291cmNlUmVjdHMsIEVOaW5lUGllY2VJbWFn ZVJ1bGUgaFJ1bGUsIEVOaW5lUGllY2VJbWFnZVJ1bGUgdlJ1bGUpOwotICAgIHN0YXRpYyBWZWN0 b3I8RmxvYXRTaXplPiBjb21wdXRlVGlsZVNjYWxlcyhjb25zdCBWZWN0b3I8RmxvYXRSZWN0PiYg ZGVzdGluYXRpb25SZWN0cywgY29uc3QgVmVjdG9yPEZsb2F0UmVjdD4mIHNvdXJjZVJlY3RzLCBF TmluZVBpZWNlSW1hZ2VSdWxlIGhSdWxlLCBFTmluZVBpZWNlSW1hZ2VSdWxlIHZSdWxlKTsKKyAg ICBzdGF0aWMgRmxvYXRTaXplIGNvbXB1dGVNaWRkbGVUaWxlU2NhbGUoY29uc3QgVmVjdG9yPEZs b2F0U2l6ZT4mIHNjYWxlcywgY29uc3QgVmVjdG9yPEZsb2F0UmVjdD4mIGRlc3RpbmF0aW9uUmVj dHMsIGNvbnN0IFZlY3RvcjxGbG9hdFJlY3Q+JiBzb3VyY2VSZWN0cywgTmluZVBpZWNlSW1hZ2VS dWxlIGhSdWxlLCBOaW5lUGllY2VJbWFnZVJ1bGUgdlJ1bGUpOworICAgIHN0YXRpYyBWZWN0b3I8 RmxvYXRTaXplPiBjb21wdXRlVGlsZVNjYWxlcyhjb25zdCBWZWN0b3I8RmxvYXRSZWN0PiYgZGVz dGluYXRpb25SZWN0cywgY29uc3QgVmVjdG9yPEZsb2F0UmVjdD4mIHNvdXJjZVJlY3RzLCBOaW5l UGllY2VJbWFnZVJ1bGUgaFJ1bGUsIE5pbmVQaWVjZUltYWdlUnVsZSB2UnVsZSk7CiAKICAgICB2 b2lkIHBhaW50KEdyYXBoaWNzQ29udGV4dCYsIFJlbmRlckVsZW1lbnQqLCBjb25zdCBSZW5kZXJT dHlsZSYsIGNvbnN0IExheW91dFJlY3QmIGRlc3RpbmF0aW9uLCBjb25zdCBMYXlvdXRTaXplJiBz b3VyY2UsIGZsb2F0IGRldmljZVNjYWxlRmFjdG9yLCBDb21wb3NpdGVPcGVyYXRvcikgY29uc3Q7 CiAKIHByaXZhdGU6CiAgICAgc3RydWN0IERhdGEgOiBSZWZDb3VudGVkPERhdGE+IHsKICAgICAg ICAgc3RhdGljIFJlZjxEYXRhPiBjcmVhdGUoKTsKLSAgICAgICAgc3RhdGljIFJlZjxEYXRhPiBj cmVhdGUoUmVmUHRyPFN0eWxlSW1hZ2U+JiYsIExlbmd0aEJveCBpbWFnZVNsaWNlcywgYm9vbCBm aWxsLCBMZW5ndGhCb3ggYm9yZGVyU2xpY2VzLCBMZW5ndGhCb3ggb3V0c2V0LCBFTmluZVBpZWNl SW1hZ2VSdWxlIGhvcml6b250YWxSdWxlLCBFTmluZVBpZWNlSW1hZ2VSdWxlIHZlcnRpY2FsUnVs ZSk7CisgICAgICAgIHN0YXRpYyBSZWY8RGF0YT4gY3JlYXRlKFJlZlB0cjxTdHlsZUltYWdlPiYm LCBMZW5ndGhCb3ggaW1hZ2VTbGljZXMsIGJvb2wgZmlsbCwgTGVuZ3RoQm94IGJvcmRlclNsaWNl cywgTGVuZ3RoQm94IG91dHNldCwgTmluZVBpZWNlSW1hZ2VSdWxlIGhvcml6b250YWxSdWxlLCBO aW5lUGllY2VJbWFnZVJ1bGUgdmVydGljYWxSdWxlKTsKICAgICAgICAgUmVmPERhdGE+IGNvcHko KSBjb25zdDsKIAogICAgICAgICBib29sIG9wZXJhdG9yPT0oY29uc3QgRGF0YSYpIGNvbnN0Owog ICAgICAgICBib29sIG9wZXJhdG9yIT0oY29uc3QgRGF0YSYgb3RoZXIpIGNvbnN0IHsgcmV0dXJu ICEoKnRoaXMgPT0gb3RoZXIpOyB9CiAKLSAgICAgICAgYm9vbCBmaWxsIDogMTsKLSAgICAgICAg dW5zaWduZWQgaG9yaXpvbnRhbFJ1bGUgOiAyOyAvLyBFTmluZVBpZWNlSW1hZ2VSdWxlCi0gICAg ICAgIHVuc2lnbmVkIHZlcnRpY2FsUnVsZSA6IDI7IC8vIEVOaW5lUGllY2VJbWFnZVJ1bGUKKyAg ICAgICAgYm9vbCBmaWxsIHsgZmFsc2UgfTsKKyAgICAgICAgTmluZVBpZWNlSW1hZ2VSdWxlIGhv cml6b250YWxSdWxlIHsgTmluZVBpZWNlSW1hZ2VSdWxlOjpTdHJldGNoIH07CisgICAgICAgIE5p bmVQaWVjZUltYWdlUnVsZSB2ZXJ0aWNhbFJ1bGUgeyBOaW5lUGllY2VJbWFnZVJ1bGU6OlN0cmV0 Y2ggfTsKICAgICAgICAgUmVmUHRyPFN0eWxlSW1hZ2U+IGltYWdlOwogICAgICAgICBMZW5ndGhC b3ggaW1hZ2VTbGljZXMgeyB7IDEwMCwgUGVyY2VudCB9LCB7IDEwMCwgUGVyY2VudCB9LCB7IDEw MCwgUGVyY2VudCB9LCB7IDEwMCwgUGVyY2VudCB9IH07CiAgICAgICAgIExlbmd0aEJveCBib3Jk ZXJTbGljZXMgeyB7IDEsIFJlbGF0aXZlIH0sIHsgMSwgUmVsYXRpdmUgfSwgeyAxLCBSZWxhdGl2 ZSB9LCB7IDEsIFJlbGF0aXZlIH0gfTsKQEAgLTIwMCw3ICsyMDYsNyBAQCBwcml2YXRlOgogCiAg ICAgcHJpdmF0ZToKICAgICAgICAgRGF0YSgpOwotICAgICAgICBEYXRhKFJlZlB0cjxTdHlsZUlt YWdlPiYmLCBMZW5ndGhCb3ggaW1hZ2VTbGljZXMsIGJvb2wgZmlsbCwgTGVuZ3RoQm94IGJvcmRl clNsaWNlcywgTGVuZ3RoQm94IG91dHNldCwgRU5pbmVQaWVjZUltYWdlUnVsZSBob3Jpem9udGFs UnVsZSwgRU5pbmVQaWVjZUltYWdlUnVsZSB2ZXJ0aWNhbFJ1bGUpOworICAgICAgICBEYXRhKFJl ZlB0cjxTdHlsZUltYWdlPiYmLCBMZW5ndGhCb3ggaW1hZ2VTbGljZXMsIGJvb2wgZmlsbCwgTGVu Z3RoQm94IGJvcmRlclNsaWNlcywgTGVuZ3RoQm94IG91dHNldCwgTmluZVBpZWNlSW1hZ2VSdWxl IGhvcml6b250YWxSdWxlLCBOaW5lUGllY2VJbWFnZVJ1bGUgdmVydGljYWxSdWxlKTsKICAgICAg ICAgRGF0YShjb25zdCBEYXRhJik7CiAgICAgfTsKIAo=