178953 2017-10-27 14:24:46 -0700 [WebGL] Optimization to skip painting if texture and source surface hasn't changed isn't working; re-optimize. 2017-10-30 15:44:02 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble commit-queue dino webkit-bug-importer oldest_to_newest 1365506 0 jer.noble 2017-10-27 14:24:46 -0700 [WebGL] Optimization to skip painting if texture and source surface hasn't changed isn't working; re-optimize. 1365512 1 325199 jer.noble 2017-10-27 14:32:43 -0700 Created attachment 325199 Patch 1365518 2 325200 jer.noble 2017-10-27 14:38:27 -0700 Created attachment 325200 Patch for landing 1365524 3 webkit-bug-importer 2017-10-27 14:43:22 -0700 <rdar://problem/35229056> 1366212 4 325200 commit-queue 2017-10-30 15:44:00 -0700 Comment on attachment 325200 Patch for landing Clearing flags on attachment: 325200 Committed r224207: <https://trac.webkit.org/changeset/224207> 1366213 5 commit-queue 2017-10-30 15:44:02 -0700 All reviewed patches have been landed. Closing bug. 325199 2017-10-27 14:32:43 -0700 2017-10-27 14:38:25 -0700 Patch bug-178953-20171027143242.patch text/plain 10082 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzOTQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWE1MjE1NzVkYWU1MzUz MTE3NmJlYjQwMjFjMWM2ZTlmY2ViZTExMS4uZTVmNjE4NmMwYjllNDVmY2RiNWM1YWJiN2VmOTU3 MTA0MzAyYTg1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDE3LTEwLTI3ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJHTF0gT3B0aW1pemF0 aW9uIHRvIHNraXAgcGFpbnRpbmcgaWYgdGV4dHVyZSBhbmQgc291cmNlIHN1cmZhY2UgaGFzbid0 IGNoYW5nZWQgaXNuJ3Qgd29ya2luZzsgcmUtb3B0aW1pemUuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzg5NTMKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgInNlZWQiIHZhbHVlIG9mIHRoZSBjdXJy ZW50IGJvdW5kIHRleHR1cmUgbmV2ZXIgbWF0Y2hlcyB0aGUgbGFzdCBzYXZlZCB2YWx1ZSBpbgor ICAgICAgICBWaWRlb1RleHR1cmVDb3BpZXJDVjo6Y29weUltYWdlVG9QbGF0Zm9ybVRleHR1cmUo KS4gVGhlIHZhbHVlIGlzIG1vZGlmaWVkIGJ5IHRoZSBmdW5jdGlvbgorICAgICAgICBpdHNlbGYs IHNvIGEgZnJlc2ggdmFsdWUgbmVlZHMgdG8gYmUgcmUtcXVlcmllZCBhZnRlciB0aGUgaW1hZ2Un cyBzdXJmYWNlIGlzIGF0dGFjaGVkIHRvIHRoZQorICAgICAgICB0ZXh0dXJlLgorCisgICAgICAg IE9uY2UgdGhpcyBmaXggaXMgaW4sIGhvd2V2ZXIsIHRoZSA8Y2FudmFzPiBiZWluZyBwYWludGVk IHdpbGwgZmxhc2ggd2hlbiBubyBuZXcgaW1hZ2UgaXMKKyAgICAgICAgYXZhaWxhYmxlLiBUaGlz IGlzIGJlY2F1c2UgdGhlIHdyb25nIHRleHR1cmUgdGFyZ2V0IGlzIGJlaW5nIHJlc3RvcmVkIGJ5 IHRoZSBHQzNEU3RhdGVTYXZlcgorICAgICAgICBhdCB0aGUgZW5kIG9mIGNvcHlJbWFnZVRvUGxh dGZvcm1UZXh0dXJlKCkuIFdoaWxlIHdlJ3JlIGZpeGluZyB0aGF0LCB3ZSBtYXkgYXMgd2VsbCB1 c2UgdGhlCisgICAgICAgIHRleHR1cmUgc3RhdGUgc2F2ZWQgYnkgdGhlIEdyYXBoaWNzQ29udGV4 dDNEIGl0c2VsZiB0byByZXN0b3JlIHRoZSBjb3JyZWN0IHRleHR1cmUgdW5pdCwKKyAgICAgICAg dGV4dHVyZSB0YXJnZXQsIGFuZCB0ZXh0dXJlLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvR3JhcGhpY3NDb250ZXh0M0QuaDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4 dDNEOjphY3RpdmVUZXh0dXJlVW5pdCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGlj c0NvbnRleHQzRDo6Y3VycmVudEJvdW5kVGV4dHVyZSBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl OjpHcmFwaGljc0NvbnRleHQzRDo6Y3VycmVudEJvdW5kVGFyZ2V0IGNvbnN0KToKKyAgICAgICAg KFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDNEOjpHcmFwaGljc0NvbnRleHQzRFN0YXRlOjpjdXJy ZW50Qm91bmRUZXh0dXJlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4 dDNEOjpHcmFwaGljc0NvbnRleHQzRFN0YXRlOjpib3VuZFRleHR1cmUgY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0M0Q6OkdyYXBoaWNzQ29udGV4dDNEU3RhdGU6OmN1 cnJlbnRCb3VuZFRhcmdldCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRl eHQzRDo6R3JhcGhpY3NDb250ZXh0M0RTdGF0ZTo6Ym91bmRUYXJnZXQgY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0M0Q6OkdyYXBoaWNzQ29udGV4dDNEU3RhdGU6OmN1 cnJlbnRCb3VuZFRleHR1cmUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3ND b250ZXh0M0Q6OkdyYXBoaWNzQ29udGV4dDNEU3RhdGU6OmJvdW5kVGV4dHVyZSk6IERlbGV0ZWQu CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQzRDo6R3JhcGhpY3NDb250ZXh0M0RT dGF0ZTo6Ym91bmRUYXJnZXQpOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2N2L1ZpZGVvVGV4dHVyZUNvcGllckNWLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlZpZGVvVGV4 dHVyZUNvcGllckNWOjpjb3B5SW1hZ2VUb1BsYXRmb3JtVGV4dHVyZSk6CisgICAgICAgIChXZWJD b3JlOjpWaWRlb1RleHR1cmVDb3BpZXJDVjo6R0MzRFN0YXRlU2F2ZXI6OkdDM0RTdGF0ZVNhdmVy KToKKyAgICAgICAgKFdlYkNvcmU6OlZpZGVvVGV4dHVyZUNvcGllckNWOjpHQzNEU3RhdGVTYXZl cjo6fkdDM0RTdGF0ZVNhdmVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jdi9WaWRl b1RleHR1cmVDb3BpZXJDVi5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9H cmFwaGljc0NvbnRleHQzRE9wZW5HTENvbW1vbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFw aGljc0NvbnRleHQzRDo6cHJlcGFyZVRleHR1cmUpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhp Y3NDb250ZXh0M0Q6OmFjdGl2ZVRleHR1cmUpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3ND b250ZXh0M0Q6OmJpbmRUZXh0dXJlKToKKwogMjAxNy0xMC0yNSAgSmVyIE5vYmxlICA8amVyLm5v YmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBVTlBBQ0tfRkxJUF9ZIGlzIGJyb2tlbiBmb3IgTVNF LWJhY2tlZCB2aWRlb3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL0dyYXBoaWNzQ29udGV4dDNELmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9HcmFwaGljc0NvbnRleHQzRC5oCmluZGV4IGZiNmY5MjkxZWVmMTk1ZDY5ZDNjMGIyZDRhNDZj ZjQxZDY5ZTJlNjAuLmRmY2MzNjQzMzgxMWFiOGE0NmU0YTQyMWY3YWFjMDMwY2U2MjhkZWMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4 dDNELmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250 ZXh0M0QuaApAQCAtMTI4NSw2ICsxMjg1LDkgQEAgcHVibGljOgogCiAgICAgdm9pZCBzZXRGYWls TmV4dEdQVVN0YXR1c0NoZWNrKCkgeyBtX2ZhaWxOZXh0U3RhdHVzQ2hlY2sgPSB0cnVlOyB9CiAK KyAgICBHQzNEZW51bSBhY3RpdmVUZXh0dXJlVW5pdCgpIGNvbnN0IHsgcmV0dXJuIG1fc3RhdGUu YWN0aXZlVGV4dHVyZVVuaXQ7IH0KKyAgICBHQzNEZW51bSBjdXJyZW50Qm91bmRUZXh0dXJlKCkg Y29uc3QgeyByZXR1cm4gbV9zdGF0ZS5jdXJyZW50Qm91bmRUZXh0dXJlKCk7IH0KKyAgICBHQzNE ZW51bSBjdXJyZW50Qm91bmRUYXJnZXQoKSBjb25zdCB7IHJldHVybiBtX3N0YXRlLmN1cnJlbnRC b3VuZFRhcmdldCgpOyB9CiAgICAgdW5zaWduZWQgdGV4dHVyZVNlZWQoR0MzRHVpbnQgdGV4dHVy ZSkgeyByZXR1cm4gbV9zdGF0ZS50ZXh0dXJlU2VlZENvdW50LmNvdW50KHRleHR1cmUpOyB9CiAK IHByaXZhdGU6CkBAIC0xNDMxLDcgKzE0MzQsNyBAQCBwcml2YXRlOgogCiAgICAgc3RydWN0IEdy YXBoaWNzQ29udGV4dDNEU3RhdGUgewogICAgICAgICBHQzNEdWludCBib3VuZEZCTyB7IDAgfTsK LSAgICAgICAgR0MzRGVudW0gYWN0aXZlVGV4dHVyZSB7IEdyYXBoaWNzQ29udGV4dDNEOjpURVhU VVJFMCB9OworICAgICAgICBHQzNEZW51bSBhY3RpdmVUZXh0dXJlVW5pdCB7IEdyYXBoaWNzQ29u dGV4dDNEOjpURVhUVVJFMCB9OwogCiAgICAgICAgIHVzaW5nIEJvdW5kVGV4dHVyZU1hcCA9IEhh c2hNYXA8R0MzRGVudW0sCiAgICAgICAgICAgICBzdGQ6OnBhaXI8R0MzRHVpbnQsIEdDM0RlbnVt PiwKQEAgLTE0NDAsOCArMTQ0Myw4IEBAIHByaXZhdGU6CiAgICAgICAgICAgICBXVEY6OlBhaXJI YXNoVHJhaXRzPFdURjo6VW5zaWduZWRXaXRoWmVyb0tleUhhc2hUcmFpdHM8R0MzRHVpbnQ+LCBX VEY6OlVuc2lnbmVkV2l0aFplcm9LZXlIYXNoVHJhaXRzPEdDM0R1aW50Pj4KICAgICAgICAgPjsK ICAgICAgICAgQm91bmRUZXh0dXJlTWFwIGJvdW5kVGV4dHVyZU1hcDsKLSAgICAgICAgR0MzRHVp bnQgY3VycmVudEJvdW5kVGV4dHVyZSgpIHsgcmV0dXJuIGJvdW5kVGV4dHVyZShhY3RpdmVUZXh0 dXJlKTsgfQotICAgICAgICBHQzNEdWludCBib3VuZFRleHR1cmUoR0MzRGVudW0gdGV4dHVyZVVu aXQpCisgICAgICAgIEdDM0R1aW50IGN1cnJlbnRCb3VuZFRleHR1cmUoKSBjb25zdCB7IHJldHVy biBib3VuZFRleHR1cmUoYWN0aXZlVGV4dHVyZVVuaXQpOyB9CisgICAgICAgIEdDM0R1aW50IGJv dW5kVGV4dHVyZShHQzNEZW51bSB0ZXh0dXJlVW5pdCkgY29uc3QKICAgICAgICAgewogICAgICAg ICAgICAgYXV0byBpdGVyYXRvciA9IGJvdW5kVGV4dHVyZU1hcC5maW5kKHRleHR1cmVVbml0KTsK ICAgICAgICAgICAgIGlmIChpdGVyYXRvciAhPSBib3VuZFRleHR1cmVNYXAuZW5kKCkpCkBAIC0x NDQ5LDcgKzE0NTIsOCBAQCBwcml2YXRlOgogICAgICAgICAgICAgcmV0dXJuIDA7CiAgICAgICAg IH0KIAotICAgICAgICBHQzNEZW51bSBib3VuZFRhcmdldChHQzNEZW51bSB0ZXh0dXJlVW5pdCkK KyAgICAgICAgR0MzRHVpbnQgY3VycmVudEJvdW5kVGFyZ2V0KCkgY29uc3QgeyByZXR1cm4gYm91 bmRUYXJnZXQoYWN0aXZlVGV4dHVyZVVuaXQpOyB9CisgICAgICAgIEdDM0RlbnVtIGJvdW5kVGFy Z2V0KEdDM0RlbnVtIHRleHR1cmVVbml0KSBjb25zdAogICAgICAgICB7CiAgICAgICAgICAgICBh dXRvIGl0ZXJhdG9yID0gYm91bmRUZXh0dXJlTWFwLmZpbmQodGV4dHVyZVVuaXQpOwogICAgICAg ICAgICAgaWYgKGl0ZXJhdG9yICE9IGJvdW5kVGV4dHVyZU1hcC5lbmQoKSkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2N2L1ZpZGVvVGV4dHVyZUNvcGllckNW LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2N2L1ZpZGVvVGV4dHVyZUNv cGllckNWLmNwcAppbmRleCBmOTQyYThjNzRiMWZhN2VlNzY2MmNkNzVhMjBlZDZhM2VjNTA3MDJl Li4wMzhhYTU3M2EzMmY3ZjU1MTQ1NDIyYWE3YTA5MDdmMDAzMGNhZDU2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jdi9WaWRlb1RleHR1cmVDb3BpZXJDVi5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY3YvVmlkZW9UZXh0dXJl Q29waWVyQ1YuY3BwCkBAIC01MTcsMTEgKzUxNywxMCBAQCBib29sIFZpZGVvVGV4dHVyZUNvcGll ckNWOjpjb3B5SW1hZ2VUb1BsYXRmb3JtVGV4dHVyZShDVlBpeGVsQnVmZmVyUmVmIGltYWdlLCBz aQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBhdXRvIG5ld1N1cmZhY2VTZWVkID0gSU9T dXJmYWNlR2V0U2VlZChzdXJmYWNlKTsKLSAgICBhdXRvIG5ld1RleHR1cmVTZWVkID0gbV9jb250 ZXh0LT50ZXh0dXJlU2VlZChvdXRwdXRUZXh0dXJlKTsKICAgICBpZiAoZmxpcFkgPT0gbV9sYXN0 RmxpcFkKICAgICAgICAgJiYgc3VyZmFjZSA9PSBtX2xhc3RTdXJmYWNlIAogICAgICAgICAmJiBu ZXdTdXJmYWNlU2VlZCA9PSBtX2xhc3RTdXJmYWNlU2VlZAotICAgICAgICAmJiBsYXN0VGV4dHVy ZVNlZWQob3V0cHV0VGV4dHVyZSkgPT0gbmV3VGV4dHVyZVNlZWQpIHsKKyAgICAgICAgJiYgbGFz dFRleHR1cmVTZWVkKG91dHB1dFRleHR1cmUpID09IG1fY29udGV4dC0+dGV4dHVyZVNlZWQob3V0 cHV0VGV4dHVyZSkpIHsKICAgICAgICAgLy8gSWYgdGhlIHRleHR1cmUgaGFzbid0IGJlZW4gbW9k aWZpZWQgc2luY2UgdGhlIGxhc3QgdGltZSB3ZSBjb3BpZWQgdG8gaXQsIGFuZCB0aGUKICAgICAg ICAgLy8gaW1hZ2UgaGFzbid0IGJlZW4gbW9kaWZpZWQgc2luY2UgdGhlIGxhc3QgdGltZSBpdCB3 YXMgY29waWVkLCB0aGlzIGlzIGEgbm8tb3AuCiAgICAgICAgIHJldHVybiB0cnVlOwpAQCAtNjE5 LDcgKzYxOCw3IEBAIGJvb2wgVmlkZW9UZXh0dXJlQ29waWVyQ1Y6OmNvcHlJbWFnZVRvUGxhdGZv cm1UZXh0dXJlKENWUGl4ZWxCdWZmZXJSZWYgaW1hZ2UsIHNpCiAKICAgICBtX2xhc3RTdXJmYWNl ID0gc3VyZmFjZTsKICAgICBtX2xhc3RTdXJmYWNlU2VlZCA9IG5ld1N1cmZhY2VTZWVkOwotICAg IG1fbGFzdFRleHR1cmVTZWVkLnNldChvdXRwdXRUZXh0dXJlLCBuZXdUZXh0dXJlU2VlZCk7Cisg ICAgbV9sYXN0VGV4dHVyZVNlZWQuc2V0KG91dHB1dFRleHR1cmUsIG1fY29udGV4dC0+dGV4dHVy ZVNlZWQob3V0cHV0VGV4dHVyZSkpOwogICAgIG1fbGFzdEZsaXBZID0gZmxpcFk7CiAKICAgICBy ZXR1cm4gdHJ1ZTsKQEAgLTcyMyw3ICs3MjIsOSBAQCBib29sIFZpZGVvVGV4dHVyZUNvcGllckNW Ojpjb3B5VmlkZW9UZXh0dXJlVG9QbGF0Zm9ybVRleHR1cmUoUGxhdGZvcm0zRE9iamVjdCB2aQog VmlkZW9UZXh0dXJlQ29waWVyQ1Y6OkdDM0RTdGF0ZVNhdmVyOjpHQzNEU3RhdGVTYXZlcihHcmFw aGljc0NvbnRleHQzRCYgY29udGV4dCkKICAgICA6IG1fY29udGV4dChjb250ZXh0KQogewotICAg IG1fY29udGV4dC5nZXRJbnRlZ2VydihHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRV9CSU5ESU5H XzJELCAmbV90ZXh0dXJlKTsKKyAgICBtX2FjdGl2ZVRleHR1cmVVbml0ID0gbV9jb250ZXh0LmFj dGl2ZVRleHR1cmUoKTsKKyAgICBtX2JvdW5kVGFyZ2V0ID0gbV9jb250ZXh0LmN1cnJlbnRCb3Vu ZFRhcmdldCgpOworICAgIG1fYm91bmRUZXh0dXJlID0gbV9jb250ZXh0LmN1cnJlbnRCb3VuZFRl eHR1cmUoKTsKICAgICBtX2NvbnRleHQuZ2V0SW50ZWdlcnYoR3JhcGhpY3NDb250ZXh0M0Q6OkZS QU1FQlVGRkVSX0JJTkRJTkcsICZtX2ZyYW1lYnVmZmVyKTsKICAgICBtX2NvbnRleHQuZ2V0SW50 ZWdlcnYoR3JhcGhpY3NDb250ZXh0M0Q6OkNVUlJFTlRfUFJPR1JBTSwgJm1fcHJvZ3JhbSk7CiAg ICAgbV9jb250ZXh0LmdldEludGVnZXJ2KEdyYXBoaWNzQ29udGV4dDNEOjpBUlJBWV9CVUZGRVJf QklORElORywgJm1fYXJyYXlCdWZmZXIpOwpAQCAtNzQxLDcgKzc0Miw4IEBAIFZpZGVvVGV4dHVy ZUNvcGllckNWOjpHQzNEU3RhdGVTYXZlcjo6fkdDM0RTdGF0ZVNhdmVyKCkKICAgICBtX2NvbnRl eHQuYmluZEJ1ZmZlcihHcmFwaGljc0NvbnRleHQzRDo6QVJSQVlfQlVGRkVSLCBtX2FycmF5QnVm ZmVyKTsKICAgICBtX2NvbnRleHQudmVydGV4QXR0cmliUG9pbnRlcihtX3ZlcnRleEF0dHJpYklu ZGV4LCBtX3ZlcnRleEF0dHJpYlNpemUsIG1fdmVydGV4QXR0cmliVHlwZSwgbV92ZXJ0ZXhBdHRy aWJOb3JtYWxpemVkLCBtX3ZlcnRleEF0dHJpYlN0cmlkZSwgbV92ZXJ0ZXhBdHRyaWJQb2ludGVy KTsKIAotICAgIG1fY29udGV4dC5iaW5kVGV4dHVyZShHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVS RV9CSU5ESU5HXzJELCBtX3RleHR1cmUpOworICAgIG1fY29udGV4dC5hY3RpdmVUZXh0dXJlKG1f YWN0aXZlVGV4dHVyZVVuaXQpOworICAgIG1fY29udGV4dC5iaW5kVGV4dHVyZShtX2JvdW5kVGFy Z2V0LCBtX2JvdW5kVGV4dHVyZSk7CiAgICAgbV9jb250ZXh0LmJpbmRGcmFtZWJ1ZmZlcihHcmFw aGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVIsIG1fZnJhbWVidWZmZXIpOwogICAgIG1fY29udGV4 dC51c2VQcm9ncmFtKG1fcHJvZ3JhbSk7CiAgICAgbV9jb250ZXh0LnZpZXdwb3J0KG1fdmlld3Bv cnRbMF0sIG1fdmlld3BvcnRbMV0sIG1fdmlld3BvcnRbMl0sIG1fdmlld3BvcnRbM10pOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY3YvVmlkZW9UZXh0dXJl Q29waWVyQ1YuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2N2L1ZpZGVvVGV4 dHVyZUNvcGllckNWLmgKaW5kZXggZjdmZDA3ODc3MmZmNzgxZDE0YjhmNDc3ZGYwNDkxNWU0NjBm MjUzMi4uMDI2ODU3NjE2MTVhYTNhNDdhNjE4MTBkOTYxYWQzYWI1NjAzYzFkZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY3YvVmlkZW9UZXh0dXJlQ29waWVy Q1YuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jdi9WaWRlb1RleHR1 cmVDb3BpZXJDVi5oCkBAIC02Niw3ICs2Niw5IEBAIHByaXZhdGU6CiAKICAgICBwcml2YXRlOgog ICAgICAgICBHcmFwaGljc0NvbnRleHQzRCYgbV9jb250ZXh0OwotICAgICAgICBHQzNEaW50IG1f dGV4dHVyZSB7IDAgfTsKKyAgICAgICAgR0MzRGVudW0gbV9hY3RpdmVUZXh0dXJlVW5pdCB7IDAg fTsKKyAgICAgICAgR0MzRGVudW0gbV9ib3VuZFRhcmdldCB7IDAgfTsKKyAgICAgICAgR0MzRGVu dW0gbV9ib3VuZFRleHR1cmUgeyAwIH07CiAgICAgICAgIEdDM0RpbnQgbV9mcmFtZWJ1ZmZlciB7 IDAgfTsKICAgICAgICAgR0MzRGludCBtX3Byb2dyYW0geyAwIH07CiAgICAgICAgIEdDM0RpbnQg bV9hcnJheUJ1ZmZlciB7IDAgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL29wZW5nbC9HcmFwaGljc0NvbnRleHQzRE9wZW5HTENvbW1vbi5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvR3JhcGhpY3NDb250ZXh0M0RPcGVu R0xDb21tb24uY3BwCmluZGV4IDQ5NWFiNGI0ZGNmMzk5OGYyYTNkZmE5ZjZmNzgwZjc3MjFlMGM2 M2EuLmRhNmRmY2ZiODE0M2QxZTNlODNjYzFjMDk5MTQ4NjJlNTcyZmVhYzYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HcmFwaGljc0NvbnRleHQz RE9wZW5HTENvbW1vbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv b3BlbmdsL0dyYXBoaWNzQ29udGV4dDNET3BlbkdMQ29tbW9uLmNwcApAQCAtMjYyLDcgKzI2Miw3 IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0M0Q6OnByZXBhcmVUZXh0dXJlKCkKIAogICAgIDo6Z2xB Y3RpdmVUZXh0dXJlKEdMX1RFWFRVUkUwKTsKICAgICA6OmdsQmluZFRleHR1cmUoR0xfVEVYVFVS RV8yRCwgbV9zdGF0ZS5ib3VuZFRhcmdldChHTF9URVhUVVJFMCkgPT0gR0xfVEVYVFVSRV8yRCA/ IG1fc3RhdGUuYm91bmRUZXh0dXJlKEdMX1RFWFRVUkUwKSA6IDApOwotICAgIDo6Z2xBY3RpdmVU ZXh0dXJlKG1fc3RhdGUuYWN0aXZlVGV4dHVyZSk7CisgICAgOjpnbEFjdGl2ZVRleHR1cmUobV9z dGF0ZS5hY3RpdmVUZXh0dXJlVW5pdCk7CiAgICAgaWYgKG1fc3RhdGUuYm91bmRGQk8gIT0gbV9m Ym8pCiAgICAgICAgIDo6Z2xCaW5kRnJhbWVidWZmZXJFWFQoR3JhcGhpY3NDb250ZXh0M0Q6OkZS QU1FQlVGRkVSLCBtX3N0YXRlLmJvdW5kRkJPKTsKICAgICA6OmdsRmx1c2goKTsKQEAgLTQ1Miw3 ICs0NTIsNyBAQCBJbnRTaXplIEdyYXBoaWNzQ29udGV4dDNEOjpnZXRJbnRlcm5hbEZyYW1lYnVm ZmVyU2l6ZSgpIGNvbnN0CiB2b2lkIEdyYXBoaWNzQ29udGV4dDNEOjphY3RpdmVUZXh0dXJlKEdD M0RlbnVtIHRleHR1cmUpCiB7CiAgICAgbWFrZUNvbnRleHRDdXJyZW50KCk7Ci0gICAgbV9zdGF0 ZS5hY3RpdmVUZXh0dXJlID0gdGV4dHVyZTsKKyAgICBtX3N0YXRlLmFjdGl2ZVRleHR1cmVVbml0 ID0gdGV4dHVyZTsKICAgICA6OmdsQWN0aXZlVGV4dHVyZSh0ZXh0dXJlKTsKIH0KIApAQCAtNTA1 LDcgKzUwNSw3IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0M0Q6OmJpbmRSZW5kZXJidWZmZXIoR0Mz RGVudW0gdGFyZ2V0LCBQbGF0Zm9ybTNET2JqZWN0IHJlbmRlCiB2b2lkIEdyYXBoaWNzQ29udGV4 dDNEOjpiaW5kVGV4dHVyZShHQzNEZW51bSB0YXJnZXQsIFBsYXRmb3JtM0RPYmplY3QgdGV4dHVy ZSkKIHsKICAgICBtYWtlQ29udGV4dEN1cnJlbnQoKTsKLSAgICBtX3N0YXRlLnNldEJvdW5kVGV4 dHVyZShtX3N0YXRlLmFjdGl2ZVRleHR1cmUsIHRleHR1cmUsIHRhcmdldCk7CisgICAgbV9zdGF0 ZS5zZXRCb3VuZFRleHR1cmUobV9zdGF0ZS5hY3RpdmVUZXh0dXJlVW5pdCwgdGV4dHVyZSwgdGFy Z2V0KTsKICAgICA6OmdsQmluZFRleHR1cmUodGFyZ2V0LCB0ZXh0dXJlKTsKIH0KIAo= 325200 2017-10-27 14:38:27 -0700 2017-10-30 15:44:00 -0700 Patch for landing bug-178953-20171027143826.patch text/plain 10084 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzOTQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWE1MjE1NzVkYWU1MzUz MTE3NmJlYjQwMjFjMWM2ZTlmY2ViZTExMS4uMTJjZjUxMGUxZDAwYmJhZWFjMzQ4NWUyYmViZmFj MjE5MTc4YThjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDE3LTEwLTI3ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJHTF0gT3B0aW1pemF0 aW9uIHRvIHNraXAgcGFpbnRpbmcgaWYgdGV4dHVyZSBhbmQgc291cmNlIHN1cmZhY2UgaGFzbid0 IGNoYW5nZWQgaXNuJ3Qgd29ya2luZzsgcmUtb3B0aW1pemUuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzg5NTMKKworICAgICAgICBSZXZpZXdlZCBi eSBEZWFuIEphY2tzb24uCisKKyAgICAgICAgVGhlICJzZWVkIiB2YWx1ZSBvZiB0aGUgY3VycmVu dCBib3VuZCB0ZXh0dXJlIG5ldmVyIG1hdGNoZXMgdGhlIGxhc3Qgc2F2ZWQgdmFsdWUgaW4KKyAg ICAgICAgVmlkZW9UZXh0dXJlQ29waWVyQ1Y6OmNvcHlJbWFnZVRvUGxhdGZvcm1UZXh0dXJlKCku IFRoZSB2YWx1ZSBpcyBtb2RpZmllZCBieSB0aGUgZnVuY3Rpb24KKyAgICAgICAgaXRzZWxmLCBz byBhIGZyZXNoIHZhbHVlIG5lZWRzIHRvIGJlIHJlLXF1ZXJpZWQgYWZ0ZXIgdGhlIGltYWdlJ3Mg c3VyZmFjZSBpcyBhdHRhY2hlZCB0byB0aGUKKyAgICAgICAgdGV4dHVyZS4KKworICAgICAgICBP bmNlIHRoaXMgZml4IGlzIGluLCBob3dldmVyLCB0aGUgPGNhbnZhcz4gYmVpbmcgcGFpbnRlZCB3 aWxsIGZsYXNoIHdoZW4gbm8gbmV3IGltYWdlIGlzCisgICAgICAgIGF2YWlsYWJsZS4gVGhpcyBp cyBiZWNhdXNlIHRoZSB3cm9uZyB0ZXh0dXJlIHRhcmdldCBpcyBiZWluZyByZXN0b3JlZCBieSB0 aGUgR0MzRFN0YXRlU2F2ZXIKKyAgICAgICAgYXQgdGhlIGVuZCBvZiBjb3B5SW1hZ2VUb1BsYXRm b3JtVGV4dHVyZSgpLiBXaGlsZSB3ZSdyZSBmaXhpbmcgdGhhdCwgd2UgbWF5IGFzIHdlbGwgdXNl IHRoZQorICAgICAgICB0ZXh0dXJlIHN0YXRlIHNhdmVkIGJ5IHRoZSBHcmFwaGljc0NvbnRleHQz RCBpdHNlbGYgdG8gcmVzdG9yZSB0aGUgY29ycmVjdCB0ZXh0dXJlIHVuaXQsCisgICAgICAgIHRl eHR1cmUgdGFyZ2V0LCBhbmQgdGV4dHVyZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L0dyYXBoaWNzQ29udGV4dDNELmg6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQz RDo6YWN0aXZlVGV4dHVyZVVuaXQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3ND b250ZXh0M0Q6OmN1cnJlbnRCb3VuZFRleHR1cmUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6 R3JhcGhpY3NDb250ZXh0M0Q6OmN1cnJlbnRCb3VuZFRhcmdldCBjb25zdCk6CisgICAgICAgIChX ZWJDb3JlOjpHcmFwaGljc0NvbnRleHQzRDo6R3JhcGhpY3NDb250ZXh0M0RTdGF0ZTo6Y3VycmVu dEJvdW5kVGV4dHVyZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQz RDo6R3JhcGhpY3NDb250ZXh0M0RTdGF0ZTo6Ym91bmRUZXh0dXJlIGNvbnN0KToKKyAgICAgICAg KFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDNEOjpHcmFwaGljc0NvbnRleHQzRFN0YXRlOjpjdXJy ZW50Qm91bmRUYXJnZXQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0 M0Q6OkdyYXBoaWNzQ29udGV4dDNEU3RhdGU6OmJvdW5kVGFyZ2V0IGNvbnN0KToKKyAgICAgICAg KFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDNEOjpHcmFwaGljc0NvbnRleHQzRFN0YXRlOjpjdXJy ZW50Qm91bmRUZXh0dXJlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29u dGV4dDNEOjpHcmFwaGljc0NvbnRleHQzRFN0YXRlOjpib3VuZFRleHR1cmUpOiBEZWxldGVkLgor ICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0M0Q6OkdyYXBoaWNzQ29udGV4dDNEU3Rh dGU6OmJvdW5kVGFyZ2V0KTogRGVsZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9j di9WaWRlb1RleHR1cmVDb3BpZXJDVi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWaWRlb1RleHR1 cmVDb3BpZXJDVjo6Y29weUltYWdlVG9QbGF0Zm9ybVRleHR1cmUpOgorICAgICAgICAoV2ViQ29y ZTo6VmlkZW9UZXh0dXJlQ29waWVyQ1Y6OkdDM0RTdGF0ZVNhdmVyOjpHQzNEU3RhdGVTYXZlcik6 CisgICAgICAgIChXZWJDb3JlOjpWaWRlb1RleHR1cmVDb3BpZXJDVjo6R0MzRFN0YXRlU2F2ZXI6 On5HQzNEU3RhdGVTYXZlcik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY3YvVmlkZW9U ZXh0dXJlQ29waWVyQ1YuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvR3Jh cGhpY3NDb250ZXh0M0RPcGVuR0xDb21tb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhp Y3NDb250ZXh0M0Q6OnByZXBhcmVUZXh0dXJlKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNz Q29udGV4dDNEOjphY3RpdmVUZXh0dXJlKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29u dGV4dDNEOjpiaW5kVGV4dHVyZSk6CisKIDIwMTctMTAtMjUgIEplciBOb2JsZSAgPGplci5ub2Js ZUBhcHBsZS5jb20+CiAKICAgICAgICAgVU5QQUNLX0ZMSVBfWSBpcyBicm9rZW4gZm9yIE1TRS1i YWNrZWQgdmlkZW9zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9HcmFwaGljc0NvbnRleHQzRC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv R3JhcGhpY3NDb250ZXh0M0QuaAppbmRleCBmYjZmOTI5MWVlZjE5NWQ2OWQzYzBiMmQ0YTQ2Y2Y0 MWQ2OWUyZTYwLi5kZmNjMzY0MzM4MTFhYjhhNDZlNGE0MjFmN2FhYzAzMGNlNjI4ZGVjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQz RC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4 dDNELmgKQEAgLTEyODUsNiArMTI4NSw5IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgc2V0RmFpbE5l eHRHUFVTdGF0dXNDaGVjaygpIHsgbV9mYWlsTmV4dFN0YXR1c0NoZWNrID0gdHJ1ZTsgfQogCisg ICAgR0MzRGVudW0gYWN0aXZlVGV4dHVyZVVuaXQoKSBjb25zdCB7IHJldHVybiBtX3N0YXRlLmFj dGl2ZVRleHR1cmVVbml0OyB9CisgICAgR0MzRGVudW0gY3VycmVudEJvdW5kVGV4dHVyZSgpIGNv bnN0IHsgcmV0dXJuIG1fc3RhdGUuY3VycmVudEJvdW5kVGV4dHVyZSgpOyB9CisgICAgR0MzRGVu dW0gY3VycmVudEJvdW5kVGFyZ2V0KCkgY29uc3QgeyByZXR1cm4gbV9zdGF0ZS5jdXJyZW50Qm91 bmRUYXJnZXQoKTsgfQogICAgIHVuc2lnbmVkIHRleHR1cmVTZWVkKEdDM0R1aW50IHRleHR1cmUp IHsgcmV0dXJuIG1fc3RhdGUudGV4dHVyZVNlZWRDb3VudC5jb3VudCh0ZXh0dXJlKTsgfQogCiBw cml2YXRlOgpAQCAtMTQzMSw3ICsxNDM0LDcgQEAgcHJpdmF0ZToKIAogICAgIHN0cnVjdCBHcmFw aGljc0NvbnRleHQzRFN0YXRlIHsKICAgICAgICAgR0MzRHVpbnQgYm91bmRGQk8geyAwIH07Ci0g ICAgICAgIEdDM0RlbnVtIGFjdGl2ZVRleHR1cmUgeyBHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVS RTAgfTsKKyAgICAgICAgR0MzRGVudW0gYWN0aXZlVGV4dHVyZVVuaXQgeyBHcmFwaGljc0NvbnRl eHQzRDo6VEVYVFVSRTAgfTsKIAogICAgICAgICB1c2luZyBCb3VuZFRleHR1cmVNYXAgPSBIYXNo TWFwPEdDM0RlbnVtLAogICAgICAgICAgICAgc3RkOjpwYWlyPEdDM0R1aW50LCBHQzNEZW51bT4s CkBAIC0xNDQwLDggKzE0NDMsOCBAQCBwcml2YXRlOgogICAgICAgICAgICAgV1RGOjpQYWlySGFz aFRyYWl0czxXVEY6OlVuc2lnbmVkV2l0aFplcm9LZXlIYXNoVHJhaXRzPEdDM0R1aW50PiwgV1RG OjpVbnNpZ25lZFdpdGhaZXJvS2V5SGFzaFRyYWl0czxHQzNEdWludD4+CiAgICAgICAgID47CiAg ICAgICAgIEJvdW5kVGV4dHVyZU1hcCBib3VuZFRleHR1cmVNYXA7Ci0gICAgICAgIEdDM0R1aW50 IGN1cnJlbnRCb3VuZFRleHR1cmUoKSB7IHJldHVybiBib3VuZFRleHR1cmUoYWN0aXZlVGV4dHVy ZSk7IH0KLSAgICAgICAgR0MzRHVpbnQgYm91bmRUZXh0dXJlKEdDM0RlbnVtIHRleHR1cmVVbml0 KQorICAgICAgICBHQzNEdWludCBjdXJyZW50Qm91bmRUZXh0dXJlKCkgY29uc3QgeyByZXR1cm4g Ym91bmRUZXh0dXJlKGFjdGl2ZVRleHR1cmVVbml0KTsgfQorICAgICAgICBHQzNEdWludCBib3Vu ZFRleHR1cmUoR0MzRGVudW0gdGV4dHVyZVVuaXQpIGNvbnN0CiAgICAgICAgIHsKICAgICAgICAg ICAgIGF1dG8gaXRlcmF0b3IgPSBib3VuZFRleHR1cmVNYXAuZmluZCh0ZXh0dXJlVW5pdCk7CiAg ICAgICAgICAgICBpZiAoaXRlcmF0b3IgIT0gYm91bmRUZXh0dXJlTWFwLmVuZCgpKQpAQCAtMTQ0 OSw3ICsxNDUyLDggQEAgcHJpdmF0ZToKICAgICAgICAgICAgIHJldHVybiAwOwogICAgICAgICB9 CiAKLSAgICAgICAgR0MzRGVudW0gYm91bmRUYXJnZXQoR0MzRGVudW0gdGV4dHVyZVVuaXQpCisg ICAgICAgIEdDM0R1aW50IGN1cnJlbnRCb3VuZFRhcmdldCgpIGNvbnN0IHsgcmV0dXJuIGJvdW5k VGFyZ2V0KGFjdGl2ZVRleHR1cmVVbml0KTsgfQorICAgICAgICBHQzNEZW51bSBib3VuZFRhcmdl dChHQzNEZW51bSB0ZXh0dXJlVW5pdCkgY29uc3QKICAgICAgICAgewogICAgICAgICAgICAgYXV0 byBpdGVyYXRvciA9IGJvdW5kVGV4dHVyZU1hcC5maW5kKHRleHR1cmVVbml0KTsKICAgICAgICAg ICAgIGlmIChpdGVyYXRvciAhPSBib3VuZFRleHR1cmVNYXAuZW5kKCkpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jdi9WaWRlb1RleHR1cmVDb3BpZXJDVi5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jdi9WaWRlb1RleHR1cmVDb3Bp ZXJDVi5jcHAKaW5kZXggZjk0MmE4Yzc0YjFmYTdlZTc2NjJjZDc1YTIwZWQ2YTNlYzUwNzAyZS4u ZDYxYjlhMjM2YzMyOGJiMGVmYzI4N2JhMWJhZmUyYzQ3YzAxMWI0ZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY3YvVmlkZW9UZXh0dXJlQ29waWVyQ1YuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2N2L1ZpZGVvVGV4dHVyZUNv cGllckNWLmNwcApAQCAtNTE3LDExICs1MTcsMTAgQEAgYm9vbCBWaWRlb1RleHR1cmVDb3BpZXJD Vjo6Y29weUltYWdlVG9QbGF0Zm9ybVRleHR1cmUoQ1ZQaXhlbEJ1ZmZlclJlZiBpbWFnZSwgc2kK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgYXV0byBuZXdTdXJmYWNlU2VlZCA9IElPU3Vy ZmFjZUdldFNlZWQoc3VyZmFjZSk7Ci0gICAgYXV0byBuZXdUZXh0dXJlU2VlZCA9IG1fY29udGV4 dC0+dGV4dHVyZVNlZWQob3V0cHV0VGV4dHVyZSk7CiAgICAgaWYgKGZsaXBZID09IG1fbGFzdEZs aXBZCiAgICAgICAgICYmIHN1cmZhY2UgPT0gbV9sYXN0U3VyZmFjZSAKICAgICAgICAgJiYgbmV3 U3VyZmFjZVNlZWQgPT0gbV9sYXN0U3VyZmFjZVNlZWQKLSAgICAgICAgJiYgbGFzdFRleHR1cmVT ZWVkKG91dHB1dFRleHR1cmUpID09IG5ld1RleHR1cmVTZWVkKSB7CisgICAgICAgICYmIGxhc3RU ZXh0dXJlU2VlZChvdXRwdXRUZXh0dXJlKSA9PSBtX2NvbnRleHQtPnRleHR1cmVTZWVkKG91dHB1 dFRleHR1cmUpKSB7CiAgICAgICAgIC8vIElmIHRoZSB0ZXh0dXJlIGhhc24ndCBiZWVuIG1vZGlm aWVkIHNpbmNlIHRoZSBsYXN0IHRpbWUgd2UgY29waWVkIHRvIGl0LCBhbmQgdGhlCiAgICAgICAg IC8vIGltYWdlIGhhc24ndCBiZWVuIG1vZGlmaWVkIHNpbmNlIHRoZSBsYXN0IHRpbWUgaXQgd2Fz IGNvcGllZCwgdGhpcyBpcyBhIG5vLW9wLgogICAgICAgICByZXR1cm4gdHJ1ZTsKQEAgLTYxOSw3 ICs2MTgsNyBAQCBib29sIFZpZGVvVGV4dHVyZUNvcGllckNWOjpjb3B5SW1hZ2VUb1BsYXRmb3Jt VGV4dHVyZShDVlBpeGVsQnVmZmVyUmVmIGltYWdlLCBzaQogCiAgICAgbV9sYXN0U3VyZmFjZSA9 IHN1cmZhY2U7CiAgICAgbV9sYXN0U3VyZmFjZVNlZWQgPSBuZXdTdXJmYWNlU2VlZDsKLSAgICBt X2xhc3RUZXh0dXJlU2VlZC5zZXQob3V0cHV0VGV4dHVyZSwgbmV3VGV4dHVyZVNlZWQpOworICAg IG1fbGFzdFRleHR1cmVTZWVkLnNldChvdXRwdXRUZXh0dXJlLCBtX2NvbnRleHQtPnRleHR1cmVT ZWVkKG91dHB1dFRleHR1cmUpKTsKICAgICBtX2xhc3RGbGlwWSA9IGZsaXBZOwogCiAgICAgcmV0 dXJuIHRydWU7CkBAIC03MjMsNyArNzIyLDkgQEAgYm9vbCBWaWRlb1RleHR1cmVDb3BpZXJDVjo6 Y29weVZpZGVvVGV4dHVyZVRvUGxhdGZvcm1UZXh0dXJlKFBsYXRmb3JtM0RPYmplY3QgdmkKIFZp ZGVvVGV4dHVyZUNvcGllckNWOjpHQzNEU3RhdGVTYXZlcjo6R0MzRFN0YXRlU2F2ZXIoR3JhcGhp Y3NDb250ZXh0M0QmIGNvbnRleHQpCiAgICAgOiBtX2NvbnRleHQoY29udGV4dCkKIHsKLSAgICBt X2NvbnRleHQuZ2V0SW50ZWdlcnYoR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfQklORElOR18y RCwgJm1fdGV4dHVyZSk7CisgICAgbV9hY3RpdmVUZXh0dXJlVW5pdCA9IG1fY29udGV4dC5hY3Rp dmVUZXh0dXJlVW5pdCgpOworICAgIG1fYm91bmRUYXJnZXQgPSBtX2NvbnRleHQuY3VycmVudEJv dW5kVGFyZ2V0KCk7CisgICAgbV9ib3VuZFRleHR1cmUgPSBtX2NvbnRleHQuY3VycmVudEJvdW5k VGV4dHVyZSgpOwogICAgIG1fY29udGV4dC5nZXRJbnRlZ2VydihHcmFwaGljc0NvbnRleHQzRDo6 RlJBTUVCVUZGRVJfQklORElORywgJm1fZnJhbWVidWZmZXIpOwogICAgIG1fY29udGV4dC5nZXRJ bnRlZ2VydihHcmFwaGljc0NvbnRleHQzRDo6Q1VSUkVOVF9QUk9HUkFNLCAmbV9wcm9ncmFtKTsK ICAgICBtX2NvbnRleHQuZ2V0SW50ZWdlcnYoR3JhcGhpY3NDb250ZXh0M0Q6OkFSUkFZX0JVRkZF Ul9CSU5ESU5HLCAmbV9hcnJheUJ1ZmZlcik7CkBAIC03NDEsNyArNzQyLDggQEAgVmlkZW9UZXh0 dXJlQ29waWVyQ1Y6OkdDM0RTdGF0ZVNhdmVyOjp+R0MzRFN0YXRlU2F2ZXIoKQogICAgIG1fY29u dGV4dC5iaW5kQnVmZmVyKEdyYXBoaWNzQ29udGV4dDNEOjpBUlJBWV9CVUZGRVIsIG1fYXJyYXlC dWZmZXIpOwogICAgIG1fY29udGV4dC52ZXJ0ZXhBdHRyaWJQb2ludGVyKG1fdmVydGV4QXR0cmli SW5kZXgsIG1fdmVydGV4QXR0cmliU2l6ZSwgbV92ZXJ0ZXhBdHRyaWJUeXBlLCBtX3ZlcnRleEF0 dHJpYk5vcm1hbGl6ZWQsIG1fdmVydGV4QXR0cmliU3RyaWRlLCBtX3ZlcnRleEF0dHJpYlBvaW50 ZXIpOwogCi0gICAgbV9jb250ZXh0LmJpbmRUZXh0dXJlKEdyYXBoaWNzQ29udGV4dDNEOjpURVhU VVJFX0JJTkRJTkdfMkQsIG1fdGV4dHVyZSk7CisgICAgbV9jb250ZXh0LmFjdGl2ZVRleHR1cmUo bV9hY3RpdmVUZXh0dXJlVW5pdCk7CisgICAgbV9jb250ZXh0LmJpbmRUZXh0dXJlKG1fYm91bmRU YXJnZXQsIG1fYm91bmRUZXh0dXJlKTsKICAgICBtX2NvbnRleHQuYmluZEZyYW1lYnVmZmVyKEdy YXBoaWNzQ29udGV4dDNEOjpGUkFNRUJVRkZFUiwgbV9mcmFtZWJ1ZmZlcik7CiAgICAgbV9jb250 ZXh0LnVzZVByb2dyYW0obV9wcm9ncmFtKTsKICAgICBtX2NvbnRleHQudmlld3BvcnQobV92aWV3 cG9ydFswXSwgbV92aWV3cG9ydFsxXSwgbV92aWV3cG9ydFsyXSwgbV92aWV3cG9ydFszXSk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jdi9WaWRlb1RleHR1 cmVDb3BpZXJDVi5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY3YvVmlkZW9U ZXh0dXJlQ29waWVyQ1YuaAppbmRleCBmN2ZkMDc4NzcyZmY3ODFkMTRiOGY0NzdkZjA0OTE1ZTQ2 MGYyNTMyLi4wMjY4NTc2MTYxNWFhM2E0N2E2MTgxMGQ5NjFhZDNhYjU2MDNjMWRmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jdi9WaWRlb1RleHR1cmVDb3Bp ZXJDVi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2N2L1ZpZGVvVGV4 dHVyZUNvcGllckNWLmgKQEAgLTY2LDcgKzY2LDkgQEAgcHJpdmF0ZToKIAogICAgIHByaXZhdGU6 CiAgICAgICAgIEdyYXBoaWNzQ29udGV4dDNEJiBtX2NvbnRleHQ7Ci0gICAgICAgIEdDM0RpbnQg bV90ZXh0dXJlIHsgMCB9OworICAgICAgICBHQzNEZW51bSBtX2FjdGl2ZVRleHR1cmVVbml0IHsg MCB9OworICAgICAgICBHQzNEZW51bSBtX2JvdW5kVGFyZ2V0IHsgMCB9OworICAgICAgICBHQzNE ZW51bSBtX2JvdW5kVGV4dHVyZSB7IDAgfTsKICAgICAgICAgR0MzRGludCBtX2ZyYW1lYnVmZmVy IHsgMCB9OwogICAgICAgICBHQzNEaW50IG1fcHJvZ3JhbSB7IDAgfTsKICAgICAgICAgR0MzRGlu dCBtX2FycmF5QnVmZmVyIHsgMCB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3Mvb3BlbmdsL0dyYXBoaWNzQ29udGV4dDNET3BlbkdMQ29tbW9uLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HcmFwaGljc0NvbnRleHQzRE9w ZW5HTENvbW1vbi5jcHAKaW5kZXggNDk1YWI0YjRkY2YzOTk4ZjJhM2RmYTlmNmY3ODBmNzcyMWUw YzYzYS4uZGE2ZGZjZmI4MTQzZDFlM2U4M2NjMWMwOTkxNDg2MmU1NzJmZWFjNiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dyYXBoaWNzQ29udGV4 dDNET3BlbkdMQ29tbW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9vcGVuZ2wvR3JhcGhpY3NDb250ZXh0M0RPcGVuR0xDb21tb24uY3BwCkBAIC0yNjIsNyArMjYy LDcgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQzRDo6cHJlcGFyZVRleHR1cmUoKQogCiAgICAgOjpn bEFjdGl2ZVRleHR1cmUoR0xfVEVYVFVSRTApOwogICAgIDo6Z2xCaW5kVGV4dHVyZShHTF9URVhU VVJFXzJELCBtX3N0YXRlLmJvdW5kVGFyZ2V0KEdMX1RFWFRVUkUwKSA9PSBHTF9URVhUVVJFXzJE ID8gbV9zdGF0ZS5ib3VuZFRleHR1cmUoR0xfVEVYVFVSRTApIDogMCk7Ci0gICAgOjpnbEFjdGl2 ZVRleHR1cmUobV9zdGF0ZS5hY3RpdmVUZXh0dXJlKTsKKyAgICA6OmdsQWN0aXZlVGV4dHVyZSht X3N0YXRlLmFjdGl2ZVRleHR1cmVVbml0KTsKICAgICBpZiAobV9zdGF0ZS5ib3VuZEZCTyAhPSBt X2ZibykKICAgICAgICAgOjpnbEJpbmRGcmFtZWJ1ZmZlckVYVChHcmFwaGljc0NvbnRleHQzRDo6 RlJBTUVCVUZGRVIsIG1fc3RhdGUuYm91bmRGQk8pOwogICAgIDo6Z2xGbHVzaCgpOwpAQCAtNDUy LDcgKzQ1Miw3IEBAIEludFNpemUgR3JhcGhpY3NDb250ZXh0M0Q6OmdldEludGVybmFsRnJhbWVi dWZmZXJTaXplKCkgY29uc3QKIHZvaWQgR3JhcGhpY3NDb250ZXh0M0Q6OmFjdGl2ZVRleHR1cmUo R0MzRGVudW0gdGV4dHVyZSkKIHsKICAgICBtYWtlQ29udGV4dEN1cnJlbnQoKTsKLSAgICBtX3N0 YXRlLmFjdGl2ZVRleHR1cmUgPSB0ZXh0dXJlOworICAgIG1fc3RhdGUuYWN0aXZlVGV4dHVyZVVu aXQgPSB0ZXh0dXJlOwogICAgIDo6Z2xBY3RpdmVUZXh0dXJlKHRleHR1cmUpOwogfQogCkBAIC01 MDUsNyArNTA1LDcgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQzRDo6YmluZFJlbmRlcmJ1ZmZlcihH QzNEZW51bSB0YXJnZXQsIFBsYXRmb3JtM0RPYmplY3QgcmVuZGUKIHZvaWQgR3JhcGhpY3NDb250 ZXh0M0Q6OmJpbmRUZXh0dXJlKEdDM0RlbnVtIHRhcmdldCwgUGxhdGZvcm0zRE9iamVjdCB0ZXh0 dXJlKQogewogICAgIG1ha2VDb250ZXh0Q3VycmVudCgpOwotICAgIG1fc3RhdGUuc2V0Qm91bmRU ZXh0dXJlKG1fc3RhdGUuYWN0aXZlVGV4dHVyZSwgdGV4dHVyZSwgdGFyZ2V0KTsKKyAgICBtX3N0 YXRlLnNldEJvdW5kVGV4dHVyZShtX3N0YXRlLmFjdGl2ZVRleHR1cmVVbml0LCB0ZXh0dXJlLCB0 YXJnZXQpOwogICAgIDo6Z2xCaW5kVGV4dHVyZSh0YXJnZXQsIHRleHR1cmUpOwogfQogCg==