130560 2014-03-20 21:18:15 -0700 Add a combined decodeAndFlush to TextResourceDecoder 2014-03-21 09:55:20 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 darin darin commit-queue japhet oldest_to_newest 992894 0 darin 2014-03-20 21:18:15 -0700 Add a combined decodeAndFlush to TextResourceDecoder 992895 1 227380 darin 2014-03-20 21:22:40 -0700 Created attachment 227380 Patch 992929 2 227380 kling 2014-03-20 23:23:14 -0700 Comment on attachment 227380 Patch r=me Crazy that we didn't have this already! 992943 3 227380 commit-queue 2014-03-21 00:12:35 -0700 Comment on attachment 227380 Patch Clearing flags on attachment: 227380 Committed r166046: <http://trac.webkit.org/changeset/166046> 992944 4 commit-queue 2014-03-21 00:12:39 -0700 All reviewed patches have been landed. Closing bug. 993160 5 227380 ap 2014-03-21 09:55:20 -0700 Comment on attachment 227380 Patch It would be nice to synchronize TextResourceDecoder and TextCodec interfaces one day (one has a decodeAndFlush funciton, another has a "flush" boolean argument in decode()). 227380 2014-03-20 21:22:40 -0700 2014-03-21 09:55:20 -0700 Patch bug-130560-20140320212228.patch text/plain 17836 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2MDM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmIyMGNlOTMzMmEzYWNi NDMyMDc3OWVlMDI3Yjg3ZjAwZmNiNGExNy4uZjliNWNhOTJlOGIzZTk0YzI2MjdhODFjYzM0MmYx MmVkNmJlOWE0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDE0LTAzLTIwICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgYSBjb21iaW5lZCBkZWNv ZGVBbmRGbHVzaCB0byBUZXh0UmVzb3VyY2VEZWNvZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzA1NjAKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNvcmUuZXhwLmluOiBBZGRlZCBuZXcgc3lt Ym9sIGZvciBkZWNvZGVBbmRGbHVzaC4gQWxzbyByZS1kaWQKKyAgICAgICAgdGhlIGdlb21ldHJ5 IHR5cGVzICNpZiBzbyBpdCB3b3VsZCBzb3J0IG1vcmUgbG9naWNhbGx5LgorCisgICAgICAgICog ZmlsZWFwaS9GaWxlUmVhZGVyTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZpbGVSZWFk ZXJMb2FkZXI6OmNvbnZlcnRUb1RleHQpOiBVc2UgZGVjb2RlQW5kRmx1c2guCisgICAgICAgICog aW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNw ZWN0b3JQYWdlQWdlbnQ6OmNhY2hlZFJlc291cmNlQ29udGVudCk6IERpdHRvLgorICAgICAgICAq IGluc3BlY3Rvci9OZXR3b3JrUmVzb3VyY2VzRGF0YS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpO ZXR3b3JrUmVzb3VyY2VzRGF0YTo6UmVzb3VyY2VEYXRhOjpkZWNvZGVEYXRhVG9Db250ZW50KTog RGl0dG8uCisKKyAgICAgICAgKiBsb2FkZXIvVGV4dFJlc291cmNlRGVjb2Rlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpUZXh0UmVzb3VyY2VEZWNvZGVyOjpkZWNvZGVBbmRGbHVzaCk6IEFkZGVk LgorICAgICAgICAqIGxvYWRlci9UZXh0UmVzb3VyY2VEZWNvZGVyLmg6IERpdHRvLgorCisgICAg ICAgICogbG9hZGVyL2FwcGNhY2hlL01hbmlmZXN0UGFyc2VyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OnBhcnNlTWFuaWZlc3QpOiBVc2UgZGVjb2RlQW5kRmx1c2guCisgICAgICAgICogbG9hZGVy L2NhY2hlL0NhY2hlZENTU1N0eWxlU2hlZXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVk Q1NTU3R5bGVTaGVldDo6c2hlZXRUZXh0KTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpDYWNo ZWRDU1NTdHlsZVNoZWV0OjpmaW5pc2hMb2FkaW5nKTogRGl0dG8uCisKKyAgICAgICAgKiBsb2Fk ZXIvY2FjaGUvQ2FjaGVkRm9udC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRGb250Ojpl bnN1cmVTVkdGb250RGF0YSk6IFVzZSBkZWNvZGVBbmRGbHVzaC4gQWxzbyB1c2UgbnVsbHB0ci4K KyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZEZvbnQ6OmdldFNWR0ZvbnRCeUlkKTogVXNlIGRlc2Nl bmRhbnRzT2ZUeXBlPFNWR0ZvbnRFbGVtZW50PgorICAgICAgICBpbnN0ZWFkIG9mIHVzaW5nIGEg Tm9kZUxpc3QuIE11Y2ggbW9yZSBlZmZpY2llbnQhCisKKyAgICAgICAgKiBsb2FkZXIvY2FjaGUv Q2FjaGVkU1ZHRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkU1ZHRG9jdW1l bnQ6OmZpbmlzaExvYWRpbmcpOiBVc2UgZGVjb2RlQW5kRmx1c2guCisgICAgICAgICogbG9hZGVy L2NhY2hlL0NhY2hlZFNjcmlwdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRTY3JpcHQ6 OnNjcmlwdCk6IERpdHRvLgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRYU0xTdHlsZVNo ZWV0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFhTTFN0eWxlU2hlZXQ6OmZpbmlzaExv YWRpbmcpOiBEaXR0by4KKyAgICAgICAgKiBwYWdlL1BhZ2UuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UGFnZTo6dXNlclN0eWxlU2hlZXQpOiBEaXR0by4KKwogMjAxNC0wMy0yMCAgTWFydGluIFJv Ymluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gU3VwcHJlc3Mg ZXJyb3JzIGFib3V0IHVzaW5nIGdka190aHJlYWRzX2VudGVyIGdka190aHJlYWRzX2xlYXZlCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cKaW5kZXggMDg1ODEzOTlmYjkyZjAzZjI0ZWY4OTQ3ZjgwYjYyNzgyMTI2MDMz ZS4uNzM3NzFhYTA3NTgwNDgyYjU5MTdjOTI1MWIxMDJmM2JlNmE5OWRkNSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE0LTAzLTIwICBEYXJpbiBBZGxlciAgPGRhcmluQGFw cGxlLmNvbT4KKworICAgICAgICBBZGQgYSBjb21iaW5lZCBkZWNvZGVBbmRGbHVzaCB0byBUZXh0 UmVzb3VyY2VEZWNvZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMzA1NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFdlYlZpZXcvV2ViVmlldy5tbToKKyAgICAgICAgKCtbV2ViVmlldyBfZGVjb2Rl RGF0YTpdKTogVXNlIGRlY29kZUFuZEZsdXNoLgorCiAyMDE0LTAzLTIwICBBbmRlcnMgQ2FybHNz b24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IGJ1aWxkLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4gYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3Jl LmV4cC5pbgppbmRleCAxZjcxYTUxOTA5NzVhNjFmMzVmMWE2MjQzYjM3ZWE2NzFjODk3YjQ2Li5l ZTQzMjdjYWY3OWJlZjI3NjJjYmYwYjk1MGFiNjk1MzBkNmM5ZTE0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4 cC5pbgpAQCAtMjAxNywxMSArMjAxNyw2IEBAIF93a1NpZ25hbENGUmVhZFN0cmVhbUVuZAogX3dr U2lnbmFsQ0ZSZWFkU3RyZWFtRXJyb3IKIF93a1NpZ25hbENGUmVhZFN0cmVhbUhhc0J5dGVzCiAK LSNpZiAhZGVmaW5lZChOU0dFT01FVFJZX1RZUEVTX1NBTUVfQVNfQ0dHRU9NRVRSWV9UWVBFUykg JiYgUExBVEZPUk0oTUFDKQotX19aTjdXZWJDb3JlN0ludFNpemVDMUVSSzdfTlNTaXplCi1fX1pO SzdXZWJDb3JlN0ludFNpemVjdjdfTlNTaXplRXYKLSNlbmRpZgotCiAjaWYgIWRlZmluZWQoTkRF QlVHKQogX19aTjdXZWJDb3JlMTRTUUxpdGVEYXRhYmFzZTIyZGlzYWJsZVRocmVhZGluZ0NoZWNr c0V2CiBfX1pON1dlYkNvcmUyNE5vRXZlbnREaXNwYXRjaEFzc2VydGlvbjdzX2NvdW50RQpAQCAt MjE0Niw2ICsyMTQxLDcgQEAgX19aTjdXZWJDb3JlMTdTY3JvbGxiYXJUaGVtZU1hYzIzc2V0VXBP dmVyaGFuZ0FyZWFTaGFkb3dFUDdDQUxheWVyCiBfX1pON1dlYkNvcmUxN1Njcm9sbGJhclRoZW1l TWFjMjRyZW1vdmVPdmVyaGFuZ0FyZWFTaGFkb3dFUDdDQUxheWVyCiBfX1pON1dlYkNvcmUxN1Nj cm9sbGJhclRoZW1lTWFjMjdzZXRVcE92ZXJoYW5nQXJlYUJhY2tncm91bmRFUDdDQUxheWVyUktO U181Q29sb3JFCiBfX1pON1dlYkNvcmUxN1Njcm9sbGJhclRoZW1lTWFjMjhyZW1vdmVPdmVyaGFu Z0FyZWFCYWNrZ3JvdW5kRVA3Q0FMYXllcgorX19aTjdXZWJDb3JlMTlUZXh0UmVzb3VyY2VEZWNv ZGVyMTRkZWNvZGVBbmRGbHVzaEVQS2NtCiBfX1pON1dlYkNvcmUxOWFwcGxpY2F0aW9uSXNTYWZh cmlFdgogX19aTjdXZWJDb3JlMjBQbGF0Zm9ybUV2ZW50RmFjdG9yeTI0Y3JlYXRlUGxhdGZvcm1N b3VzZUV2ZW50RVA3TlNFdmVudFA2TlNWaWV3CiBfX1pON1dlYkNvcmUyMFBsYXRmb3JtRXZlbnRG YWN0b3J5MjdjcmVhdGVQbGF0Zm9ybUtleWJvYXJkRXZlbnRFUDdOU0V2ZW50CkBAIC0yMzE1LDYg KzIzMTEsMTEgQEAgX3drV2luZG93U2V0QWxwaGEKIF93a1dpbmRvd1NldFNjYWxlZEZyYW1lCiAj ZW5kaWYKIAorI2lmIFBMQVRGT1JNKE1BQykgJiYgIWRlZmluZWQoTlNHRU9NRVRSWV9UWVBFU19T QU1FX0FTX0NHR0VPTUVUUllfVFlQRVMpCitfX1pON1dlYkNvcmU3SW50U2l6ZUMxRVJLN19OU1Np emUKK19fWk5LN1dlYkNvcmU3SW50U2l6ZWN2N19OU1NpemVFdgorI2VuZGlmCisKICNpZiBQTEFU Rk9STShNQUMpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTA4MAogX19a TjdXZWJDb3JlMjRUZXh0QWx0ZXJuYXRpdmVXaXRoUmFuZ2VDMUVQMThOU1RleHRBbHRlcm5hdGl2 ZXM4X05TUmFuZ2UKIF9fWk43V2ViQ29yZTI3QWx0ZXJuYXRpdmVUZXh0VUlDb250cm9sbGVyMTVh ZGRBbHRlcm5hdGl2ZXNFUktOM1dURjlSZXRhaW5QdHJJMThOU1RleHRBbHRlcm5hdGl2ZXNFRQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZmlsZWFwaS9GaWxlUmVhZGVyTG9hZGVyLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvRmlsZVJlYWRlckxvYWRlci5jcHAKaW5kZXggMDA3ZmY3 MGE5NWFlYWVjYTZmZGE5ODA5ZDI1ZGMyODk3OGMwMjYyMy4uMDZmZDNkM2E4ODVlMzBlMjJjNDZk YjVjNmFkYWEzYjUwMzdiNjFhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZmlsZWFwaS9G aWxlUmVhZGVyTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9maWxlYXBpL0ZpbGVSZWFk ZXJMb2FkZXIuY3BwCkBAIC0zMTYsMTUgKzMxNiwxMiBAQCB2b2lkIEZpbGVSZWFkZXJMb2FkZXI6 OmNvbnZlcnRUb1RleHQoKQogICAgIC8vIHJlcXVpcmVtZW50IGluIG9yZGVyIHRvIGJlIGNvbnNp c3RlbnQgd2l0aCBob3cgV2ViS2l0IGRlY29kZXMgdGhlIHdlYiBjb250ZW50OiBhbHdheXMgaGFz IHRoZSBCT00gb3ZlcnJpZGUgdGhlCiAgICAgLy8gcHJvdmlkZWQgZW5jb2RpbmcuICAgICAKICAg ICAvLyBGSVhNRTogY29uc2lkZXIgc3VwcG9ydGluZyBpbmNyZW1lbnRhbCBkZWNvZGluZyB0byBp bXByb3ZlIHRoZSBwZXJmLgotICAgIFN0cmluZ0J1aWxkZXIgYnVpbGRlcjsKICAgICBpZiAoIW1f ZGVjb2RlcikKICAgICAgICAgbV9kZWNvZGVyID0gVGV4dFJlc291cmNlRGVjb2Rlcjo6Y3JlYXRl KCJ0ZXh0L3BsYWluIiwgbV9lbmNvZGluZy5pc1ZhbGlkKCkgPyBtX2VuY29kaW5nIDogVVRGOEVu Y29kaW5nKCkpOwotICAgIGJ1aWxkZXIuYXBwZW5kKG1fZGVjb2Rlci0+ZGVjb2RlKHN0YXRpY19j YXN0PGNvbnN0IGNoYXIqPihtX3Jhd0RhdGEtPmRhdGEoKSksIG1fYnl0ZXNMb2FkZWQpKTsKLQog ICAgIGlmIChpc0NvbXBsZXRlZCgpKQotICAgICAgICBidWlsZGVyLmFwcGVuZChtX2RlY29kZXIt PmZsdXNoKCkpOwotCi0gICAgbV9zdHJpbmdSZXN1bHQgPSBidWlsZGVyLnRvU3RyaW5nKCk7Cisg ICAgICAgIG1fc3RyaW5nUmVzdWx0ID0gbV9kZWNvZGVyLT5kZWNvZGVBbmRGbHVzaChzdGF0aWNf Y2FzdDxjb25zdCBjaGFyKj4obV9yYXdEYXRhLT5kYXRhKCkpLCBtX2J5dGVzTG9hZGVkKTsKKyAg ICBlbHNlCisgICAgICAgIG1fc3RyaW5nUmVzdWx0ID0gbV9kZWNvZGVyLT5kZWNvZGUoc3RhdGlj X2Nhc3Q8Y29uc3QgY2hhcio+KG1fcmF3RGF0YS0+ZGF0YSgpKSwgbV9ieXRlc0xvYWRlZCk7CiB9 CiAKIHZvaWQgRmlsZVJlYWRlckxvYWRlcjo6Y29udmVydFRvRGF0YVVSTCgpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuY3BwCmluZGV4IGE1M2VkZGYw MzJhMjU4YTRmMDhhMzQwMGNmYzhmZDg4YzgyNmE5YzguLjY3NmRhNTk0M2E3M2Q4ZDFlM2UyZGNj MzI4M2YzOTk4NmUxOWZjMTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JQYWdlQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JQYWdlQWdlbnQuY3BwCkBAIC0xODYsOCArMTg2LDcgQEAgYm9vbCBJbnNwZWN0b3JQYWdl QWdlbnQ6OmNhY2hlZFJlc291cmNlQ29udGVudChDYWNoZWRSZXNvdXJjZSogY2FjaGVkUmVzb3Vy Y2UsIFMKICAgICAgICAgICAgIC8vIFdlIHNob3cgY29udGVudCBmb3IgcmF3IHJlc291cmNlcyBv bmx5IGZvciBjZXJ0YWluIG1pbWUgdHlwZXMgKHRleHQsIGh0bWwgYW5kIHhtbCkuIE90aGVyd2lz ZSBkZWNvZGVyIHdpbGwgYmUgbnVsbC4KICAgICAgICAgICAgIGlmICghZGVjb2RlcikKICAgICAg ICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICBTdHJpbmcgY29udGVudCA9IGRl Y29kZXItPmRlY29kZShidWZmZXItPmRhdGEoKSwgYnVmZmVyLT5zaXplKCkpOwotICAgICAgICAg ICAgKnJlc3VsdCA9IGNvbnRlbnQgKyBkZWNvZGVyLT5mbHVzaCgpOworICAgICAgICAgICAgKnJl c3VsdCA9IGRlY29kZXItPmRlY29kZUFuZEZsdXNoKGJ1ZmZlci0+ZGF0YSgpLCBidWZmZXItPnNp emUoKSk7CiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgfQogICAgICAgICBkZWZh dWx0OgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL05ldHdvcmtSZXNvdXJj ZXNEYXRhLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9OZXR3b3JrUmVzb3VyY2VzRGF0 YS5jcHAKaW5kZXggMmFmMDAxYzVhNWU0ZjA3NWQxMzNmYWVhODE3Zjg3NDk3YWY3ZTE3My4uYzVl MDk2Y2JlNjVlNGZkY2NjMWQ3NzcyYzQ0NmY0OGY3NTU4ZGZlOCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL05ldHdvcmtSZXNvdXJjZXNEYXRhLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvTmV0d29ya1Jlc291cmNlc0RhdGEuY3BwCkBAIC0xMzUsOCArMTM1 LDcgQEAgc2l6ZV90IE5ldHdvcmtSZXNvdXJjZXNEYXRhOjpSZXNvdXJjZURhdGE6OmRlY29kZURh dGFUb0NvbnRlbnQoKQogewogICAgIEFTU0VSVCghaGFzQ29udGVudCgpKTsKICAgICBzaXplX3Qg ZGF0YUxlbmd0aCA9IG1fZGF0YUJ1ZmZlci0+c2l6ZSgpOwotICAgIG1fY29udGVudCA9IG1fZGVj b2Rlci0+ZGVjb2RlKG1fZGF0YUJ1ZmZlci0+ZGF0YSgpLCBtX2RhdGFCdWZmZXItPnNpemUoKSk7 Ci0gICAgbV9jb250ZW50LmFwcGVuZChtX2RlY29kZXItPmZsdXNoKCkpOworICAgIG1fY29udGVu dCA9IG1fZGVjb2Rlci0+ZGVjb2RlQW5kRmx1c2gobV9kYXRhQnVmZmVyLT5kYXRhKCksIG1fZGF0 YUJ1ZmZlci0+c2l6ZSgpKTsKICAgICBtX2RhdGFCdWZmZXIgPSBudWxscHRyOwogICAgIHJldHVy biBjb250ZW50U2l6ZUluQnl0ZXMobV9jb250ZW50KSAtIGRhdGFMZW5ndGg7CiB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvVGV4dFJlc291cmNlRGVjb2Rlci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvVGV4dFJlc291cmNlRGVjb2Rlci5jcHAKaW5kZXggNTEwNWFlMGJi YzczMThmZGJjYTZlZDIyZTFlM2QxMmQyYjAwNzRkNS4uMzY2NmZlYjFkNTM4OWYxZGRlODJlNDYy NjkzYWQ1MmI2YzBlNTRiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1RleHRS ZXNvdXJjZURlY29kZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9UZXh0UmVzb3Vy Y2VEZWNvZGVyLmNwcApAQCAtNjYzLDQgKzY2MywxMCBAQCBTdHJpbmcgVGV4dFJlc291cmNlRGVj b2Rlcjo6Zmx1c2goKQogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKK1N0cmluZyBUZXh0UmVzb3Vy Y2VEZWNvZGVyOjpkZWNvZGVBbmRGbHVzaChjb25zdCBjaGFyKiBkYXRhLCBzaXplX3QgbGVuZ3Ro KQoreworICAgIFN0cmluZyBkZWNvZGVkID0gZGVjb2RlKGRhdGEsIGxlbmd0aCk7CisgICAgcmV0 dXJuIGRlY29kZWQgKyBmbHVzaCgpOworfQorCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvVGV4dFJlc291cmNlRGVjb2Rlci5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Rl eHRSZXNvdXJjZURlY29kZXIuaAppbmRleCBlNTFmMWY3YThhZmI1ZmZjYjMxYzJiM2QzNWJhZGIw ZWMxYzM3ZmM1Li5hYmVlN2QxNWIzMzMxYTg3YTIzMTY0YjA1NWIyYWY1YTk5NzUzOTY5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvVGV4dFJlc291cmNlRGVjb2Rlci5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9UZXh0UmVzb3VyY2VEZWNvZGVyLmgKQEAgLTU1LDYgKzU1 LDggQEAgcHVibGljOgogICAgIFN0cmluZyBkZWNvZGUoY29uc3QgY2hhciogZGF0YSwgc2l6ZV90 IGxlbmd0aCk7CiAgICAgU3RyaW5nIGZsdXNoKCk7CiAKKyAgICBTdHJpbmcgZGVjb2RlQW5kRmx1 c2goY29uc3QgY2hhciogZGF0YSwgc2l6ZV90IGxlbmd0aCk7CisKICAgICB2b2lkIHNldEhpbnRF bmNvZGluZyhjb25zdCBUZXh0UmVzb3VyY2VEZWNvZGVyKiBoaW50RGVjb2RlcikKICAgICB7CiAg ICAgICAgIC8vIGhpbnRFbmNvZGluZyBpcyBmb3IgdXNlIHdpdGggYXV0b2RldGVjdGlvbiwgd2hp Y2ggc2hvdWxkIGJlIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FwcGNhY2hl L01hbmlmZXN0UGFyc2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9NYW5p ZmVzdFBhcnNlci5jcHAKaW5kZXggYTQ3YWExNTBlYzVmOTBkYjVmZTM4OWJlNjc5NGQ4OTBmMGQy NWY2NS4uZjIzMzczMjRkMjlmY2U1YzhhZTIxZWFkOWViZDliZjkxYjEyZGQ2ZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FwcGNhY2hlL01hbmlmZXN0UGFyc2VyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvTWFuaWZlc3RQYXJzZXIuY3BwCkBAIC00 Myw5ICs0Myw3IEBAIGJvb2wgcGFyc2VNYW5pZmVzdChjb25zdCBVUkwmIG1hbmlmZXN0VVJMLCBj b25zdCBjaGFyKiBkYXRhLCBpbnQgbGVuZ3RoLCBNYW5pZmVzCiAKICAgICBNb2RlIG1vZGUgPSBF eHBsaWNpdDsKIAotICAgIFJlZlB0cjxUZXh0UmVzb3VyY2VEZWNvZGVyPiBkZWNvZGVyID0gVGV4 dFJlc291cmNlRGVjb2Rlcjo6Y3JlYXRlKCJ0ZXh0L2NhY2hlLW1hbmlmZXN0IiwgIlVURi04Iik7 Ci0gICAgU3RyaW5nIHMgPSBkZWNvZGVyLT5kZWNvZGUoZGF0YSwgbGVuZ3RoKTsKLSAgICBzLmFw cGVuZChkZWNvZGVyLT5mbHVzaCgpKTsKKyAgICBTdHJpbmcgcyA9IFRleHRSZXNvdXJjZURlY29k ZXI6OmNyZWF0ZSgidGV4dC9jYWNoZS1tYW5pZmVzdCIsICJVVEYtOCIpLT5kZWNvZGVBbmRGbHVz aChkYXRhLCBsZW5ndGgpOwogICAgIAogICAgIC8vIExvb2sgZm9yIHRoZSBtYWdpYyBzaWduYXR1 cmU6ICJeXHhGRUZGP0NBQ0hFIE1BTklGRVNUWyBcdF0/IiAodGhlIEJPTSBpcyByZW1vdmVkIGJ5 IFRleHRSZXNvdXJjZURlY29kZXIpLgogICAgIC8vIEV4YW1wbGU6ICJDQUNIRSBNQU5JRkVTVCAj Y29tbWVudCIgaXMgYSB2YWxpZCBzaWduYXR1cmUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvY2FjaGUvQ2FjaGVkQ1NTU3R5bGVTaGVldC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvY2FjaGUvQ2FjaGVkQ1NTU3R5bGVTaGVldC5jcHAKaW5kZXggZGI4ZjZkMDE1NjVhZTRh MGJjZGIzZDhlZDBlODA0NzY1YjM5YWYzMy4uZGQ0ZGZjODFhYmU1Nzc5YzJlY2I5NWE4ZTM5NGNl ZTExYTEzYzY4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hl ZENTU1N0eWxlU2hlZXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNo ZWRDU1NTdHlsZVNoZWV0LmNwcApAQCAtODgsOSArODgsNyBAQCBjb25zdCBTdHJpbmcgQ2FjaGVk Q1NTU3R5bGVTaGVldDo6c2hlZXRUZXh0KGJvb2wgZW5mb3JjZU1JTUVUeXBlLCBib29sKiBoYXNW YWxpZAogICAgICAgICByZXR1cm4gbV9kZWNvZGVkU2hlZXRUZXh0OwogICAgIAogICAgIC8vIERv bid0IGNhY2hlIHRoZSBkZWNvZGVkIHRleHQsIHJlZ2VuZXJhdGluZyBpcyBjaGVhcCBhbmQgaXQg Y2FuIHVzZSBxdWl0ZSBhIGJpdCBvZiBtZW1vcnkKLSAgICBTdHJpbmcgc2hlZXRUZXh0ID0gbV9k ZWNvZGVyLT5kZWNvZGUobV9kYXRhLT5kYXRhKCksIG1fZGF0YS0+c2l6ZSgpKTsKLSAgICBzaGVl dFRleHQuYXBwZW5kKG1fZGVjb2Rlci0+Zmx1c2goKSk7Ci0gICAgcmV0dXJuIHNoZWV0VGV4dDsK KyAgICByZXR1cm4gbV9kZWNvZGVyLT5kZWNvZGVBbmRGbHVzaChtX2RhdGEtPmRhdGEoKSwgbV9k YXRhLT5zaXplKCkpOwogfQogCiB2b2lkIENhY2hlZENTU1N0eWxlU2hlZXQ6OmZpbmlzaExvYWRp bmcoUmVzb3VyY2VCdWZmZXIqIGRhdGEpCkBAIC05OCwxMCArOTYsOCBAQCB2b2lkIENhY2hlZENT U1N0eWxlU2hlZXQ6OmZpbmlzaExvYWRpbmcoUmVzb3VyY2VCdWZmZXIqIGRhdGEpCiAgICAgbV9k YXRhID0gZGF0YTsKICAgICBzZXRFbmNvZGVkU2l6ZShtX2RhdGEuZ2V0KCkgPyBtX2RhdGEtPnNp emUoKSA6IDApOwogICAgIC8vIERlY29kZSB0aGUgZGF0YSB0byBmaW5kIG91dCB0aGUgZW5jb2Rp bmcgYW5kIGtlZXAgdGhlIHNoZWV0IHRleHQgYXJvdW5kIGR1cmluZyBjaGVja05vdGlmeSgpCi0g ICAgaWYgKG1fZGF0YSkgewotICAgICAgICBtX2RlY29kZWRTaGVldFRleHQgPSBtX2RlY29kZXIt PmRlY29kZShtX2RhdGEtPmRhdGEoKSwgbV9kYXRhLT5zaXplKCkpOwotICAgICAgICBtX2RlY29k ZWRTaGVldFRleHQuYXBwZW5kKG1fZGVjb2Rlci0+Zmx1c2goKSk7Ci0gICAgfQorICAgIGlmICht X2RhdGEpCisgICAgICAgIG1fZGVjb2RlZFNoZWV0VGV4dCA9IG1fZGVjb2Rlci0+ZGVjb2RlQW5k Rmx1c2gobV9kYXRhLT5kYXRhKCksIG1fZGF0YS0+c2l6ZSgpKTsKICAgICBzZXRMb2FkaW5nKGZh bHNlKTsKICAgICBjaGVja05vdGlmeSgpOwogICAgIC8vIENsZWFyIHRoZSBkZWNvZGVkIHRleHQg YXMgaXQgaXMgdW5saWtlbHkgdG8gYmUgbmVlZGVkIGltbWVkaWF0ZWx5IGFnYWluIGFuZCBpcyBj aGVhcCB0byByZWdlbmVyYXRlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2Nh Y2hlL0NhY2hlZEZvbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEZv bnQuY3BwCmluZGV4IDE0MjgzZmM3NzNlNjViNjcwOWFlZmIzOTg3YjZkMjIzNzUyZGYxZWMuLjFk MTQ2NjVjOGYxMDU0MmE2NDQ3NGYxYWYzNmNjNTYzMDFkYWIxMGUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRGb250LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvY2FjaGUvQ2FjaGVkRm9udC5jcHAKQEAgLTM2LDYgKzM2LDcgQEAKICNpbmNsdWRl ICJSZXNvdXJjZUJ1ZmZlci5oIgogI2luY2x1ZGUgIlNoYXJlZEJ1ZmZlci5oIgogI2luY2x1ZGUg IlRleHRSZXNvdXJjZURlY29kZXIuaCIKKyNpbmNsdWRlICJUeXBlZEVsZW1lbnREZXNjZW5kYW50 SXRlcmF0b3IuaCIKICNpbmNsdWRlICJXT0ZGRmlsZUZvcm1hdC5oIgogI2luY2x1ZGUgPHd0Zi9W ZWN0b3IuaD4KIApAQCAtMTI5LDUyICsxMzAsMzMgQEAgRm9udFBsYXRmb3JtRGF0YSBDYWNoZWRG b250OjpwbGF0Zm9ybURhdGFGcm9tQ3VzdG9tRGF0YShmbG9hdCBzaXplLCBib29sIGJvbGQsIGIK IH0KIAogI2lmIEVOQUJMRShTVkdfRk9OVFMpCisKIGJvb2wgQ2FjaGVkRm9udDo6ZW5zdXJlU1ZH Rm9udERhdGEoKQogewogICAgIGlmICghbV9leHRlcm5hbFNWR0RvY3VtZW50ICYmICFlcnJvck9j Y3VycmVkKCkgJiYgIWlzTG9hZGluZygpICYmIG1fZGF0YSkgewotICAgICAgICBtX2V4dGVybmFs U1ZHRG9jdW1lbnQgPSBTVkdEb2N1bWVudDo6Y3JlYXRlKDAsIFVSTCgpKTsKLQorICAgICAgICBt X2V4dGVybmFsU1ZHRG9jdW1lbnQgPSBTVkdEb2N1bWVudDo6Y3JlYXRlKG51bGxwdHIsIFVSTCgp KTsKICAgICAgICAgUmVmUHRyPFRleHRSZXNvdXJjZURlY29kZXI+IGRlY29kZXIgPSBUZXh0UmVz b3VyY2VEZWNvZGVyOjpjcmVhdGUoImFwcGxpY2F0aW9uL3htbCIpOwotICAgICAgICBTdHJpbmcg c3ZnU291cmNlID0gZGVjb2Rlci0+ZGVjb2RlKG1fZGF0YS0+ZGF0YSgpLCBtX2RhdGEtPnNpemUo KSk7Ci0gICAgICAgIHN2Z1NvdXJjZS5hcHBlbmQoZGVjb2Rlci0+Zmx1c2goKSk7Ci0gICAgICAg IAotICAgICAgICBtX2V4dGVybmFsU1ZHRG9jdW1lbnQtPnNldENvbnRlbnQoc3ZnU291cmNlKTsK LSAgICAgICAgCisgICAgICAgIG1fZXh0ZXJuYWxTVkdEb2N1bWVudC0+c2V0Q29udGVudChkZWNv ZGVyLT5kZWNvZGVBbmRGbHVzaChtX2RhdGEtPmRhdGEoKSwgbV9kYXRhLT5zaXplKCkpKTsKICAg ICAgICAgaWYgKGRlY29kZXItPnNhd0Vycm9yKCkpCi0gICAgICAgICAgICBtX2V4dGVybmFsU1ZH RG9jdW1lbnQgPSAwOworICAgICAgICAgICAgbV9leHRlcm5hbFNWR0RvY3VtZW50ID0gbnVsbHB0 cjsKICAgICB9Ci0KICAgICByZXR1cm4gbV9leHRlcm5hbFNWR0RvY3VtZW50OwogfQogCiBTVkdG b250RWxlbWVudCogQ2FjaGVkRm9udDo6Z2V0U1ZHRm9udEJ5SWQoY29uc3QgU3RyaW5nJiBmb250 TmFtZSkgY29uc3QKIHsKLSAgICBSZWZQdHI8Tm9kZUxpc3Q+IGxpc3QgPSBtX2V4dGVybmFsU1ZH RG9jdW1lbnQtPmdldEVsZW1lbnRzQnlUYWdOYW1lTlMoU1ZHTmFtZXM6OmZvbnRUYWcubmFtZXNw YWNlVVJJKCksIFNWR05hbWVzOjpmb250VGFnLmxvY2FsTmFtZSgpKTsKLSAgICBpZiAoIWxpc3Qp Ci0gICAgICAgIHJldHVybiAwOwotCi0gICAgdW5zaWduZWQgbGlzdExlbmd0aCA9IGxpc3QtPmxl bmd0aCgpOwotICAgIGlmICghbGlzdExlbmd0aCkKLSAgICAgICAgcmV0dXJuIDA7Ci0KLSNpZm5k ZWYgTkRFQlVHCi0gICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGxpc3RMZW5ndGg7ICsraSkg ewotICAgICAgICBBU1NFUlQobGlzdC0+aXRlbShpKSk7Ci0gICAgICAgIEFTU0VSVChpc1NWR0Zv bnRFbGVtZW50KGxpc3QtPml0ZW0oaSkpKTsKLSAgICB9Ci0jZW5kaWYKKyAgICBhdXRvIGVsZW1l bnRzID0gZGVzY2VuZGFudHNPZlR5cGU8U1ZHRm9udEVsZW1lbnQ+KCptX2V4dGVybmFsU1ZHRG9j dW1lbnQpOwogCiAgICAgaWYgKGZvbnROYW1lLmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJuIHRv U1ZHRm9udEVsZW1lbnQobGlzdC0+aXRlbSgwKSk7CisgICAgICAgIHJldHVybiBlbGVtZW50cy5m aXJzdCgpOwogCi0gICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGxpc3RMZW5ndGg7ICsraSkg ewotICAgICAgICBTVkdGb250RWxlbWVudCogZWxlbWVudCA9IHRvU1ZHRm9udEVsZW1lbnQobGlz dC0+aXRlbShpKSk7Ci0gICAgICAgIGlmIChlbGVtZW50LT5nZXRJZEF0dHJpYnV0ZSgpID09IGZv bnROYW1lKQotICAgICAgICAgICAgcmV0dXJuIGVsZW1lbnQ7CisgICAgZm9yIChhdXRvJiBlbGVt ZW50IDogZWxlbWVudHMpIHsKKyAgICAgICAgaWYgKGVsZW1lbnQuZ2V0SWRBdHRyaWJ1dGUoKSA9 PSBmb250TmFtZSkKKyAgICAgICAgICAgIHJldHVybiAmZWxlbWVudDsKICAgICB9Ci0KLSAgICBy ZXR1cm4gMDsKKyAgICByZXR1cm4gbnVsbHB0cjsKIH0KKwogI2VuZGlmCiAKIHZvaWQgQ2FjaGVk Rm9udDo6YWxsQ2xpZW50c1JlbW92ZWQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9h ZGVyL2NhY2hlL0NhY2hlZFNWR0RvY3VtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9j YWNoZS9DYWNoZWRTVkdEb2N1bWVudC5jcHAKaW5kZXggYTQ0ODA4NjMzZjgwN2M0MDI3ZGUxZDhk NDQ4OTY4NDM0N2I1YzEzNy4uMzJhNjFiM2IzYTkzOTgwNjlhMWQyZmJmZjVkNzZlOTZmODRiNTdi YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFNWR0RvY3Vt ZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkU1ZHRG9jdW1l bnQuY3BwCkBAIC01NCwxMiArNTQsOSBAQCBTdHJpbmcgQ2FjaGVkU1ZHRG9jdW1lbnQ6OmVuY29k aW5nKCkgY29uc3QKIHZvaWQgQ2FjaGVkU1ZHRG9jdW1lbnQ6OmZpbmlzaExvYWRpbmcoUmVzb3Vy Y2VCdWZmZXIqIGRhdGEpCiB7CiAgICAgaWYgKGRhdGEpIHsKLSAgICAgICAgU3RyaW5nQnVpbGRl ciBkZWNvZGVkVGV4dDsKLSAgICAgICAgZGVjb2RlZFRleHQuYXBwZW5kKG1fZGVjb2Rlci0+ZGVj b2RlKGRhdGEtPmRhdGEoKSwgZGF0YS0+c2l6ZSgpKSk7Ci0gICAgICAgIGRlY29kZWRUZXh0LmFw cGVuZChtX2RlY29kZXItPmZsdXNoKCkpOwogICAgICAgICAvLyBXZSBkb24ndCBuZWVkIHRvIGNy ZWF0ZSBhIG5ldyBmcmFtZSBiZWNhdXNlIHRoZSBuZXcgZG9jdW1lbnQgYmVsb25ncyB0byB0aGUg cGFyZW50IFVzZUVsZW1lbnQuCi0gICAgICAgIG1fZG9jdW1lbnQgPSBTVkdEb2N1bWVudDo6Y3Jl YXRlKDAsIHJlc3BvbnNlKCkudXJsKCkpOwotICAgICAgICBtX2RvY3VtZW50LT5zZXRDb250ZW50 KGRlY29kZWRUZXh0LnRvU3RyaW5nKCkpOworICAgICAgICBtX2RvY3VtZW50ID0gU1ZHRG9jdW1l bnQ6OmNyZWF0ZShudWxscHRyLCByZXNwb25zZSgpLnVybCgpKTsKKyAgICAgICAgbV9kb2N1bWVu dC0+c2V0Q29udGVudChtX2RlY29kZXItPmRlY29kZUFuZEZsdXNoKGRhdGEtPmRhdGEoKSwgZGF0 YS0+c2l6ZSgpKSk7CiAgICAgfQogICAgIENhY2hlZFJlc291cmNlOjpmaW5pc2hMb2FkaW5nKGRh dGEpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFNj cmlwdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkU2NyaXB0LmNwcApp bmRleCBlZGM2ODVmZGNmMjVmMDJmMDUxNDFkYzU2OGFiNTBkMzhkMTI5MDQyLi5kOTg3NWVkODIy Mzk3OTZhMDc3MTIzMmY0MTdhNzA4ZWFjMDQ0NGMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvY2FjaGUvQ2FjaGVkU2NyaXB0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvY2FjaGUvQ2FjaGVkU2NyaXB0LmNwcApAQCAtNzMsOCArNzMsNyBAQCBjb25zdCBTdHJpbmcm IENhY2hlZFNjcmlwdDo6c2NyaXB0KCkKICAgICBBU1NFUlQoIWlzUHVyZ2VhYmxlKCkpOwogCiAg ICAgaWYgKCFtX3NjcmlwdCAmJiBtX2RhdGEpIHsKLSAgICAgICAgbV9zY3JpcHQgPSBtX2RlY29k ZXItPmRlY29kZShtX2RhdGEtPmRhdGEoKSwgZW5jb2RlZFNpemUoKSk7Ci0gICAgICAgIG1fc2Ny aXB0LmFwcGVuZChtX2RlY29kZXItPmZsdXNoKCkpOworICAgICAgICBtX3NjcmlwdCA9IG1fZGVj b2Rlci0+ZGVjb2RlQW5kRmx1c2gobV9kYXRhLT5kYXRhKCksIGVuY29kZWRTaXplKCkpOwogICAg ICAgICBzZXREZWNvZGVkU2l6ZShtX3NjcmlwdC5zaXplSW5CeXRlcygpKTsKICAgICB9CiAgICAg bV9kZWNvZGVkRGF0YURlbGV0aW9uVGltZXIucmVzdGFydCgpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFhTTFN0eWxlU2hlZXQuY3BwIGIvU291cmNlL1dl YkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFhTTFN0eWxlU2hlZXQuY3BwCmluZGV4IDdhNDlhYzA2 MTcwZDlkM2Y1MjU3YzE3ODYzMDM1YzVkOTI4YmE3N2UuLjY2ZjFlYzVhN2FlNGJlYjMxNDUzMTU4 ZGRlMmY5OTZkMTliNDJlNzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNo ZS9DYWNoZWRYU0xTdHlsZVNoZWV0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2Fj aGUvQ2FjaGVkWFNMU3R5bGVTaGVldC5jcHAKQEAgLTY3LDEwICs2Nyw4IEBAIHZvaWQgQ2FjaGVk WFNMU3R5bGVTaGVldDo6ZmluaXNoTG9hZGluZyhSZXNvdXJjZUJ1ZmZlciogZGF0YSkKIHsKICAg ICBtX2RhdGEgPSBkYXRhOwogICAgIHNldEVuY29kZWRTaXplKG1fZGF0YS5nZXQoKSA/IG1fZGF0 YS0+c2l6ZSgpIDogMCk7Ci0gICAgaWYgKG1fZGF0YS5nZXQoKSkgewotICAgICAgICBtX3NoZWV0 ID0gbV9kZWNvZGVyLT5kZWNvZGUobV9kYXRhLT5kYXRhKCksIGVuY29kZWRTaXplKCkpOwotICAg ICAgICBtX3NoZWV0LmFwcGVuZChtX2RlY29kZXItPmZsdXNoKCkpOwotICAgIH0KKyAgICBpZiAo bV9kYXRhLmdldCgpKQorICAgICAgICBtX3NoZWV0ID0gbV9kZWNvZGVyLT5kZWNvZGVBbmRGbHVz aChtX2RhdGEtPmRhdGEoKSwgZW5jb2RlZFNpemUoKSk7CiAgICAgc2V0TG9hZGluZyhmYWxzZSk7 CiAgICAgY2hlY2tOb3RpZnkoKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv UGFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCmluZGV4IGJjZDI5ODg2Y2U0 ZWM5ODhiMTE0OWQ4ODA3MGNlNDQ5NDU1NWYxNTIuLmIzYjE1ODk4ZTU4NTkxZGIzMWZmZmQ2ZDAx OTcwZGFiY2U2ZTBmM2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcApAQCAtOTI0LDkgKzkyNCw3IEBAIGNv bnN0IFN0cmluZyYgUGFnZTo6dXNlclN0eWxlU2hlZXQoKSBjb25zdAogICAgIGlmICghZGF0YSkK ICAgICAgICAgcmV0dXJuIG1fdXNlclN0eWxlU2hlZXQ7CiAKLSAgICBSZWZQdHI8VGV4dFJlc291 cmNlRGVjb2Rlcj4gZGVjb2RlciA9IFRleHRSZXNvdXJjZURlY29kZXI6OmNyZWF0ZSgidGV4dC9j c3MiKTsKLSAgICBtX3VzZXJTdHlsZVNoZWV0ID0gZGVjb2Rlci0+ZGVjb2RlKGRhdGEtPmRhdGEo KSwgZGF0YS0+c2l6ZSgpKTsKLSAgICBtX3VzZXJTdHlsZVNoZWV0LmFwcGVuZChkZWNvZGVyLT5m bHVzaCgpKTsKKyAgICBtX3VzZXJTdHlsZVNoZWV0ID0gVGV4dFJlc291cmNlRGVjb2Rlcjo6Y3Jl YXRlKCJ0ZXh0L2NzcyIpLT5kZWNvZGVBbmRGbHVzaChkYXRhLT5kYXRhKCksIGRhdGEtPnNpemUo KSk7CiAKICAgICByZXR1cm4gbV91c2VyU3R5bGVTaGVldDsKIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZp ZXcvV2ViVmlldy5tbQppbmRleCBjMTYyNzI1Mzg2NzcxN2RjZTY4OTc2NDg1ZGE1ZDIyYTVlYzlj MjkwLi41YzBjY2E5MThiOTUxMmE5YjFmZmE1YWVmOTU4NTIzMTkwNWE4NjUzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KKysrIGIvU291cmNlL1dlYktp dC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCkBAIC0yNzU5LDEwICsyNzU5LDcgQEAgKyAoQk9PTClf Y2FuSGFuZGxlUmVxdWVzdDooTlNVUkxSZXF1ZXN0ICopcmVxdWVzdAogKyAoTlNTdHJpbmcgKilf ZGVjb2RlRGF0YTooTlNEYXRhICopZGF0YQogewogICAgIEhUTUxOYW1lczo6aW5pdCgpOyAvLyB0 aGlzIG1ldGhvZCBpcyB1c2VkIGZvciBpbXBvcnRpbmcgYm9va21hcmtzIGF0IHN0YXJ0dXAsIHNv IEhUTUxOYW1lcyBhcmUgbGlrZWx5IHRvIGJlIHVuaW5pdGlhbGl6ZWQgeWV0Ci0gICAgUmVmUHRy PFRleHRSZXNvdXJjZURlY29kZXI+IGRlY29kZXIgPSBUZXh0UmVzb3VyY2VEZWNvZGVyOjpjcmVh dGUoInRleHQvaHRtbCIpOyAvLyBib29rbWFyayBmaWxlcyBhcmUgSFRNTAotICAgIFN0cmluZyBy ZXN1bHQgPSBkZWNvZGVyLT5kZWNvZGUoc3RhdGljX2Nhc3Q8Y29uc3QgY2hhcio+KFtkYXRhIGJ5 dGVzXSksIFtkYXRhIGxlbmd0aF0pOwotICAgIHJlc3VsdC5hcHBlbmQoZGVjb2Rlci0+Zmx1c2go KSk7Ci0gICAgcmV0dXJuIHJlc3VsdDsKKyAgICByZXR1cm4gVGV4dFJlc291cmNlRGVjb2Rlcjo6 Y3JlYXRlKCJ0ZXh0L2h0bWwiKS0+ZGVjb2RlQW5kRmx1c2goc3RhdGljX2Nhc3Q8Y29uc3QgY2hh cio+KFtkYXRhIGJ5dGVzXSksIFtkYXRhIGxlbmd0aF0pOyAvLyBib29rbWFyayBmaWxlcyBhcmUg SFRNTAogfQogCiAtICh2b2lkKV9wdXNoUGVyZm9ybWluZ1Byb2dyYW1tYXRpY0ZvY3VzCg==