152543 2015-12-23 17:51:18 -0800 Use "constrainedBetween" in more places 2015-12-23 19:43:52 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser cmarcelo commit-queue jamesr luiz simon.fraser thorton tonikitoo zalan oldest_to_newest 1151226 0 simon.fraser 2015-12-23 17:51:18 -0800 Use "constrainedBetween" in more places 1151227 1 267883 simon.fraser 2015-12-23 17:52:55 -0800 Created attachment 267883 Patch 1151235 2 267883 commit-queue 2015-12-23 19:43:48 -0800 Comment on attachment 267883 Patch Clearing flags on attachment: 267883 Committed r194410: <http://trac.webkit.org/changeset/194410> 1151236 3 commit-queue 2015-12-23 19:43:52 -0800 All reviewed patches have been landed. Closing bug. 267883 2015-12-23 17:52:55 -0800 2015-12-23 19:43:48 -0800 Patch bug-152543-20151223175218.patch text/plain 11427 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0NDA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzEyMjlkMWM4ZjZkZjYx NjU2MTE4YjU3NGIzZWJhODAxMDBjMDJmMi4uZGFjZGZjOGViMmQyOTRmODkyMjE2NmRiZDhiYjRm ZmNkNzMxNjcwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQwIEBACiAyMDE1LTEyLTIzICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIFVzZSAiY29uc3Ry YWluZWRCZXR3ZWVuIiBpbiBtb3JlIHBsYWNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUyNTQzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgUmVwbGFjZSBjb2RlIHRoYXQgY29udHJhaW5zIHBvaW50cyB2 aWEgc2hydW5rVG8vZXhwYW5kZWRUbygpIHdpdGggY2FsbHMKKyAgICAgICAgdG8gY29uc3RyYWlu ZWRCZXR3ZWVuKCksIGFuZCBpbXBsZW1lbnQgY29uc3RyYWluZWRCZXR3ZWVuKCkgb24gSW50UG9p bnQsCisgICAgICAgIEZsb2F0UG9pbnQgYW5kIExheW91dFBvaW50LgorCisgICAgICAgIENvbnZl cnQgc29tZSBmdW5jdGlvbnMgdGhhdCByZXR1cm4gcG9pbnRzIHRvIG1vcmUgbW9kZXJuIHN5bnRh eC4KKworICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGlu Z05vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5n Tm9kZTo6c2V0U2Nyb2xsUG9zaXRpb24pOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9s bGluZ1RyZWVTY3JvbGxpbmdOb2RlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1Ry ZWVTY3JvbGxpbmdOb2RlOjpzZXRTY3JvbGxQb3NpdGlvbik6CisgICAgICAgICogcGxhdGZvcm0v U2Nyb2xsVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3OjphZGp1c3RTY3Jv bGxQb3NpdGlvbldpdGhpblJhbmdlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9GbG9h dFBvaW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZsb2F0UG9pbnQ6OmNvbnN0cmFpbmVkQmV0 d2Vlbik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRQb2ludC5oOgorICAgICAg ICAoV2ViQ29yZTo6RmxvYXRQb2ludDo6c2hydW5rVG8pOgorICAgICAgICAoV2ViQ29yZTo6Rmxv YXRQb2ludDo6ZXhwYW5kZWRUbyk6CisgICAgICAgIChXZWJDb3JlOjpGbG9hdFBvaW50Ojp0cmFu c3Bvc2VkUG9pbnQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ludFBvaW50LmNwcDoK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9MYXlvdXRQb2ludC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXRQb2ludDo6Y29uc3RyYWluZWRCZXR3ZWVuKToKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9MYXlvdXRQb2ludC5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0UG9p bnQ6OmV4cGFuZGVkVG8pOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0UG9pbnQ6OnNocnVua1Rv KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dFBvaW50Ojp0cmFuc3Bvc2VkUG9pbnQpOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0UG9pbnQ6OmZyYWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dFBvaW50OjpvcGVyYXRvciBGbG9hdFBvaW50KToKKworMjAxNS0xMi0yMyAgU2ltb24g RnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKwogICAgICAgICBSRUdSRVNTSU9OIChy MTg3NTkzKTogU2Nyb2xsIHBvc2l0aW9uIGp1bXBzIHdoZW4gc2VsZWN0aW5nIHRleHQgaW4gYW4g aWZyYW1lCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NTI1NDEKICAgICAgICAgcmRhcjovL3Byb2JsZW0vMjM4ODYxODEKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCAwNDM5 YjAyZWNlODZkNzNmNmJjOTFhMTEzZTgzYjNlYzU4NjFlZWVjLi4xNjg1MDE3YzQxNDcyMTVhMjc2 YmNhNmVkODA2YzdjNjBmMGFkNWZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTUt MTItMjMgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAg VXNlICJjb25zdHJhaW5lZEJldHdlZW4iIGluIG1vcmUgcGxhY2VzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTI1NDMKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXBsYWNlIGNvZGUgdGhhdCBjb250cmFp bnMgcG9pbnRzIHZpYSBzaHJ1bmtUby9leHBhbmRlZFRvKCkgd2l0aCBjYWxscworICAgICAgICB0 byBjb25zdHJhaW5lZEJldHdlZW4oKSwgYW5kIGltcGxlbWVudCBjb25zdHJhaW5lZEJldHdlZW4o KSBvbiBJbnRQb2ludCwKKyAgICAgICAgRmxvYXRQb2ludCBhbmQgTGF5b3V0UG9pbnQuCisKKyAg ICAgICAgQ29udmVydCBzb21lIGZ1bmN0aW9ucyB0aGF0IHJldHVybiBwb2ludHMgdG8gbW9yZSBt b2Rlcm4gc3ludGF4LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcu bW06CisgICAgICAgIChjb25zdHJhaW5Db250ZW50T2Zmc2V0KToKKwogMjAxNS0xMi0yMiAgSHVu c2VvcCBKZW9uZyAgPGhzODUuamVvbmdAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0VGTF0gZXdr X2FwcGxpY2F0aW9uX2NhY2hlX21hbmFnZXIgdGVzdCBmYWlsZWQgYWZ0ZXIgcjE5MzgxMgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZUZyYW1l U2Nyb2xsaW5nTm9kZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxp bmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlLmNwcAppbmRleCA0MTAzNzQ4NzBlNDhiZTVlNDY5ZTk2 NjQyYTM0YzA2MDY1MTU4NzNkLi44YWQzMzRhYjYwNWRmYjkzYmZhYTFhNzI2ZjdjZDNmNjVkM2Fj ZmIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdU cmVlRnJhbWVTY3JvbGxpbmdOb2RlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9s bGluZy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlLmNwcApAQCAtODIsMTAgKzgyLDcg QEAgdm9pZCBTY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlOjpzY3JvbGxCeVdpdGhvdXRD b250ZW50RWRnZUNvbnN0cmFpbnRzKGNvbnMKIAogdm9pZCBTY3JvbGxpbmdUcmVlRnJhbWVTY3Jv bGxpbmdOb2RlOjpzZXRTY3JvbGxQb3NpdGlvbihjb25zdCBGbG9hdFBvaW50JiBzY3JvbGxQb3Np dGlvbikKIHsKLSAgICBGbG9hdFBvaW50IG5ld1Njcm9sbFBvc2l0aW9uID0gc2Nyb2xsUG9zaXRp b247Ci0gICAgbmV3U2Nyb2xsUG9zaXRpb24gPSBuZXdTY3JvbGxQb3NpdGlvbi5zaHJ1bmtUbyht YXhpbXVtU2Nyb2xsUG9zaXRpb24oKSk7Ci0gICAgbmV3U2Nyb2xsUG9zaXRpb24gPSBuZXdTY3Jv bGxQb3NpdGlvbi5leHBhbmRlZFRvKG1pbmltdW1TY3JvbGxQb3NpdGlvbigpKTsKLQorICAgIEZs b2F0UG9pbnQgbmV3U2Nyb2xsUG9zaXRpb24gPSBzY3JvbGxQb3NpdGlvbi5jb25zdHJhaW5lZEJl dHdlZW4obWluaW11bVNjcm9sbFBvc2l0aW9uKCksIG1heGltdW1TY3JvbGxQb3NpdGlvbigpKTsK ICAgICBzZXRTY3JvbGxQb3NpdGlvbldpdGhvdXRDb250ZW50RWRnZUNvbnN0cmFpbnRzKG5ld1Nj cm9sbFBvc2l0aW9uKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3Jv bGxpbmcvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUuY3BwCmluZGV4IDlhNGZmOTVl ZjMzMmM4YzQ1Y2ZjMWI1NWFkNGI1MDM3M2YyOGYxNTUuLjg0NTdlMTljMGRlNjFkNzFlYTAzYjlh NGM2Yjk3MTk2ZmFkNjZiNDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xs aW5nL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZS5jcHAKQEAgLTEwMywxMCAr MTAzLDcgQEAgdm9pZCBTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZTo6dXBkYXRlTGF5ZXJzQWZ0 ZXJBbmNlc3RvckNoYW5nZShjb25zdCBTY3JvbGxpbmcKIAogdm9pZCBTY3JvbGxpbmdUcmVlU2Ny b2xsaW5nTm9kZTo6c2V0U2Nyb2xsUG9zaXRpb24oY29uc3QgRmxvYXRQb2ludCYgc2Nyb2xsUG9z aXRpb24pCiB7Ci0gICAgRmxvYXRQb2ludCBuZXdTY3JvbGxQb3NpdGlvbiA9IHNjcm9sbFBvc2l0 aW9uOwotICAgIG5ld1Njcm9sbFBvc2l0aW9uID0gbmV3U2Nyb2xsUG9zaXRpb24uc2hydW5rVG8o bWF4aW11bVNjcm9sbFBvc2l0aW9uKCkpOwotICAgIG5ld1Njcm9sbFBvc2l0aW9uID0gbmV3U2Ny b2xsUG9zaXRpb24uZXhwYW5kZWRUbyhtaW5pbXVtU2Nyb2xsUG9zaXRpb24oKSk7Ci0KKyAgICBG bG9hdFBvaW50IG5ld1Njcm9sbFBvc2l0aW9uID0gc2Nyb2xsUG9zaXRpb24uY29uc3RyYWluZWRC ZXR3ZWVuKG1pbmltdW1TY3JvbGxQb3NpdGlvbigpLCBtYXhpbXVtU2Nyb2xsUG9zaXRpb24oKSk7 CiAgICAgc2V0U2Nyb2xsUG9zaXRpb25XaXRob3V0Q29udGVudEVkZ2VDb25zdHJhaW50cyhuZXdT Y3JvbGxQb3NpdGlvbik7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L1Njcm9sbFZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAK aW5kZXggZDBkZDJhOTZkM2FhNTg0ODI4ODU2MWM5MDcxMGU5YWNkODk4Mjk3OS4uZjIzMDExODM3 OWFkNGQzN2I4MWZjNjVlNjU1NGMwNWQyNjA5MDdkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v U2Nyb2xsVmlldy5jcHAKQEAgLTQwMyw5ICs0MDMsNyBAQCBJbnRQb2ludCBTY3JvbGxWaWV3Ojph ZGp1c3RTY3JvbGxQb3NpdGlvbldpdGhpblJhbmdlKGNvbnN0IEludFBvaW50JiBzY3JvbGxQb2lu dAogICAgIGlmICghY29uc3RyYWluc1Njcm9sbGluZ1RvQ29udGVudEVkZ2UoKSkKICAgICAgICAg cmV0dXJuIHNjcm9sbFBvaW50OwogCi0gICAgSW50UG9pbnQgbmV3U2Nyb2xsUG9zaXRpb24gPSBz Y3JvbGxQb2ludC5zaHJ1bmtUbyhtYXhpbXVtU2Nyb2xsUG9zaXRpb24oKSk7Ci0gICAgbmV3U2Ny b2xsUG9zaXRpb24gPSBuZXdTY3JvbGxQb3NpdGlvbi5leHBhbmRlZFRvKG1pbmltdW1TY3JvbGxQ b3NpdGlvbigpKTsKLSAgICByZXR1cm4gbmV3U2Nyb2xsUG9zaXRpb247CisgICAgcmV0dXJuIHNj cm9sbFBvaW50LmNvbnN0cmFpbmVkQmV0d2VlbihtaW5pbXVtU2Nyb2xsUG9zaXRpb24oKSwgbWF4 aW11bVNjcm9sbFBvc2l0aW9uKCkpOwogfQogCiBJbnRTaXplIFNjcm9sbFZpZXc6OmRvY3VtZW50 U2Nyb2xsT2Zmc2V0UmVsYXRpdmVUb1ZpZXdPcmlnaW4oKSBjb25zdApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRQb2ludC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFBvaW50LmNwcAppbmRleCAzYzM2N2ZiNTUxYTg4 ZGZmZTQzODBiMjgxZWRkMjk3MjlmYmNiNGFjLi5hMWMxYTc0MmVjYzhkZDkyM2ExYmRhZmFhMTBi YjY3ZGFkNjFmZGE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9GbG9hdFBvaW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9G bG9hdFBvaW50LmNwcApAQCAtNDEsNiArNDEsMTQgQEAgRmxvYXRQb2ludDo6RmxvYXRQb2ludChj b25zdCBJbnRQb2ludCYgcCkgOiBtX3gocC54KCkpLCBtX3kocC55KCkpCiB7CiB9CiAKK0Zsb2F0 UG9pbnQgRmxvYXRQb2ludDo6Y29uc3RyYWluZWRCZXR3ZWVuKGNvbnN0IEZsb2F0UG9pbnQmIG1p biwgY29uc3QgRmxvYXRQb2ludCYgbWF4KSBjb25zdAoreworICAgIHJldHVybiB7CisgICAgICAg IHN0ZDo6bWF4KG1pbi54KCksIHN0ZDo6bWluKG1heC54KCksIG1feCkpLAorICAgICAgICBzdGQ6 Om1heChtaW4ueSgpLCBzdGQ6Om1pbihtYXgueSgpLCBtX3kpKQorICAgIH07Cit9CisKIHZvaWQg RmxvYXRQb2ludDo6bm9ybWFsaXplKCkKIHsKICAgICBmbG9hdCB0ZW1wTGVuZ3RoID0gbGVuZ3Ro KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFBv aW50LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFBvaW50LmgKaW5k ZXggMjQ2M2RmYjYzYzY1ZTYxNjYxYjBhMDRhZjM4ZjM0ZWUxZTQ2ZDQ4Ni4uMzJhNGE3ODcyMWI3 NTQ0YTcwNjI4MWY2YjA5ZTMwMjRiN2YxMjVmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRQb2ludC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0Zsb2F0UG9pbnQuaApAQCAtMTIxLDE5ICsxMjEsMjEgQEAgcHVibGljOgog ICAgICAgICByZXR1cm4gbV94ICogbV94ICsgbV95ICogbV95OwogICAgIH0KIAorICAgIFdFQkNP UkVfRVhQT1JUIEZsb2F0UG9pbnQgY29uc3RyYWluZWRCZXR3ZWVuKGNvbnN0IEZsb2F0UG9pbnQm IG1pbiwgY29uc3QgRmxvYXRQb2ludCYgbWF4KSBjb25zdDsKKwogICAgIEZsb2F0UG9pbnQgc2hy dW5rVG8oY29uc3QgRmxvYXRQb2ludCYgb3RoZXIpIGNvbnN0CiAgICAgewotICAgICAgICByZXR1 cm4gRmxvYXRQb2ludChzdGQ6Om1pbihtX3gsIG90aGVyLm1feCksIHN0ZDo6bWluKG1feSwgb3Ro ZXIubV95KSk7CisgICAgICAgIHJldHVybiB7IHN0ZDo6bWluKG1feCwgb3RoZXIubV94KSwgc3Rk OjptaW4obV95LCBvdGhlci5tX3kpIH07CiAgICAgfQogCiAgICAgRmxvYXRQb2ludCBleHBhbmRl ZFRvKGNvbnN0IEZsb2F0UG9pbnQmIG90aGVyKSBjb25zdAogICAgIHsKLSAgICAgICAgcmV0dXJu IEZsb2F0UG9pbnQoc3RkOjptYXgobV94LCBvdGhlci5tX3gpLCBzdGQ6Om1heChtX3ksIG90aGVy Lm1feSkpOworICAgICAgICByZXR1cm4geyBzdGQ6Om1heChtX3gsIG90aGVyLm1feCksIHN0ZDo6 bWF4KG1feSwgb3RoZXIubV95KSB9OwogICAgIH0KIAogICAgIEZsb2F0UG9pbnQgdHJhbnNwb3Nl ZFBvaW50KCkgY29uc3QKICAgICB7Ci0gICAgICAgIHJldHVybiBGbG9hdFBvaW50KG1feSwgbV94 KTsKKyAgICAgICAgcmV0dXJuIHsgbV95LCBtX3ggfTsKICAgICB9CiAKICNpZiBVU0UoQ0cpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9JbnRQb2ludC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9JbnRQb2ludC5jcHAKaW5kZXggMGY3 ZGVhYjIyMTMzMDc4NjM1ZmI0NjU5MTY0MWVkYzFhZWExNTIyNS4uNThkZjUyNjI3YWQ4ZThlYjA1 NzJmM2U0NjgxOWJjY2FjOWI5N2UxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvSW50UG9pbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL0ludFBvaW50LmNwcApAQCAtNDUsNyArNDUsNiBAQCBJbnRQb2ludCBJbnRQb2ludDo6 Y29uc3RyYWluZWRCZXR3ZWVuKGNvbnN0IEludFBvaW50JiBtaW4sIGNvbnN0IEludFBvaW50JiBt YXgpCiAgICAgfTsKIH0KIAotCiBUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJlYW0mIHRz LCBjb25zdCBJbnRQb2ludCYgcCkKIHsKICAgICByZXR1cm4gdHMgPDwgIigiIDw8IHAueCgpIDw8 ICIsIiA8PCBwLnkoKSA8PCAiKSI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9MYXlvdXRQb2ludC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9MYXlvdXRQb2ludC5jcHAKaW5kZXggMTc3MDdiNDdmZjNiNDdkMTU2MTlmYzMyODQ1NGRj NjdiMWEzZTgyZC4uYzI4OWFiZGNhY2QzMjIzNWRkZDk5MDEzODAwYmMzNWI2M2MwMzk3YyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTGF5b3V0UG9pbnQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0xheW91dFBvaW50LmNwcApA QCAtMzAsNiArMzAsMTQgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitMYXlvdXRQb2ludCBM YXlvdXRQb2ludDo6Y29uc3RyYWluZWRCZXR3ZWVuKGNvbnN0IExheW91dFBvaW50JiBtaW4sIGNv bnN0IExheW91dFBvaW50JiBtYXgpIGNvbnN0Cit7CisgICAgcmV0dXJuIHsKKyAgICAgICAgc3Rk OjptYXgobWluLngoKSwgc3RkOjptaW4obWF4LngoKSwgbV94KSksCisgICAgICAgIHN0ZDo6bWF4 KG1pbi55KCksIHN0ZDo6bWluKG1heC55KCksIG1feSkpCisgICAgfTsKK30KKwogVGV4dFN0cmVh bSYgb3BlcmF0b3I8PChUZXh0U3RyZWFtJiB0cywgY29uc3QgTGF5b3V0UG9pbnQmIHApCiB7CiAg ICAgLy8gRklYTUU6IFRoZXNlIHNob3VsZCBiZSBwcmludGVkIGFzIGZsb2F0cy4gS2VlcGluZyB0 aGVtIGludHMgZm9yIGNvbnNpc3RlbmN5IHdpdGggcGVydmlvdXMgdGVzdCBleHBlY3RhdGlvbnMu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9MYXlvdXRQb2lu dC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTGF5b3V0UG9pbnQuaAppbmRl eCBlMTBkNTgzMzQwYmRhM2I3ODg4ODhkYmJiY2M0MmNhZTBkNzEzN2IzLi44MTIwZWMxZTY5OWYy NWM2YWZhNTcxNzllOThiZTBmMmNmNDc2ZWVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9MYXlvdXRQb2ludC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0xheW91dFBvaW50LmgKQEAgLTYwLDE1ICs2MCwxNyBAQCBwdWJsaWM6CiAg ICAgICAgIG1feCAqPSBzeDsKICAgICAgICAgbV95ICo9IHN5OwogICAgIH0KLSAgICAKKworICAg IExheW91dFBvaW50IGNvbnN0cmFpbmVkQmV0d2Vlbihjb25zdCBMYXlvdXRQb2ludCYgbWluLCBj b25zdCBMYXlvdXRQb2ludCYgbWF4KSBjb25zdDsKKwogICAgIExheW91dFBvaW50IGV4cGFuZGVk VG8oY29uc3QgTGF5b3V0UG9pbnQmIG90aGVyKSBjb25zdAogICAgIHsKLSAgICAgICAgcmV0dXJu IExheW91dFBvaW50KHN0ZDo6bWF4KG1feCwgb3RoZXIubV94KSwgc3RkOjptYXgobV95LCBvdGhl ci5tX3kpKTsKKyAgICAgICAgcmV0dXJuIHsgc3RkOjptYXgobV94LCBvdGhlci5tX3gpLCBzdGQ6 Om1heChtX3ksIG90aGVyLm1feSkgfTsKICAgICB9CiAKICAgICBMYXlvdXRQb2ludCBzaHJ1bmtU byhjb25zdCBMYXlvdXRQb2ludCYgb3RoZXIpIGNvbnN0CiAgICAgewotICAgICAgICByZXR1cm4g TGF5b3V0UG9pbnQoc3RkOjptaW4obV94LCBvdGhlci5tX3gpLCBzdGQ6Om1pbihtX3ksIG90aGVy Lm1feSkpOworICAgICAgICByZXR1cm4geyBzdGQ6Om1pbihtX3gsIG90aGVyLm1feCksIHN0ZDo6 bWluKG1feSwgb3RoZXIubV95KSB9OwogICAgIH0KIAogICAgIHZvaWQgY2xhbXBOZWdhdGl2ZVRv WmVybygpCkBAIC03OCwxNSArODAsMTUgQEAgcHVibGljOgogCiAgICAgTGF5b3V0UG9pbnQgdHJh bnNwb3NlZFBvaW50KCkgY29uc3QKICAgICB7Ci0gICAgICAgIHJldHVybiBMYXlvdXRQb2ludCht X3ksIG1feCk7CisgICAgICAgIHJldHVybiB7IG1feSwgbV94IH07CiAgICAgfQogCiAgICAgTGF5 b3V0UG9pbnQgZnJhY3Rpb24oKSBjb25zdAogICAgIHsKLSAgICAgICAgcmV0dXJuIExheW91dFBv aW50KG1feC5mcmFjdGlvbigpLCBtX3kuZnJhY3Rpb24oKSk7CisgICAgICAgIHJldHVybiB7IG1f eC5mcmFjdGlvbigpLCBtX3kuZnJhY3Rpb24oKSB9OwogICAgIH0KIAotICAgIG9wZXJhdG9yIEZs b2F0UG9pbnQoKSBjb25zdCB7IHJldHVybiBGbG9hdFBvaW50KG1feCwgbV95KTsgfQorICAgIG9w ZXJhdG9yIEZsb2F0UG9pbnQoKSBjb25zdCB7IHJldHVybiB7IG1feCwgbV95IH07IH0KIAogcHJp dmF0ZToKICAgICBMYXlvdXRVbml0IG1feCwgbV95OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQppbmRleCAxMDc2NzI2OWQ5YWFhYTI0ZDZlMTYz MGM2YjIzM2Q2YmMzZjczNThiLi5mZmY4ZDE3NmIxZDg3OWFhOWQwMWMwMDY4NjFiZjM0YWNjMDRj MTdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vi Vmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmll dy5tbQpAQCAtMTI1OSw5ICsxMjU5LDcgQEAgLSAodm9pZClfem9vbVRvUmVjdDooV2ViQ29yZTo6 RmxvYXRSZWN0KXRhcmdldFJlY3QgYXRTY2FsZTooZG91YmxlKXNjYWxlIG9yaWdpbjoKIHN0YXRp YyBXZWJDb3JlOjpGbG9hdFBvaW50IGNvbnN0cmFpbkNvbnRlbnRPZmZzZXQoV2ViQ29yZTo6Rmxv YXRQb2ludCBjb250ZW50T2Zmc2V0LCBXZWJDb3JlOjpGbG9hdFNpemUgY29udGVudFNpemUsIFdl YkNvcmU6OkZsb2F0U2l6ZSB1bm9ic2N1cmVkQ29udGVudFNpemUpCiB7CiAgICAgV2ViQ29yZTo6 RmxvYXRTaXplIG1heGltdW1Db250ZW50T2Zmc2V0ID0gY29udGVudFNpemUgLSB1bm9ic2N1cmVk Q29udGVudFNpemU7Ci0gICAgY29udGVudE9mZnNldCA9IGNvbnRlbnRPZmZzZXQuc2hydW5rVG8o V2ViQ29yZTo6RmxvYXRQb2ludChtYXhpbXVtQ29udGVudE9mZnNldC53aWR0aCgpLCBtYXhpbXVt Q29udGVudE9mZnNldC5oZWlnaHQoKSkpOwotICAgIGNvbnRlbnRPZmZzZXQgPSBjb250ZW50T2Zm c2V0LmV4cGFuZGVkVG8oV2ViQ29yZTo6RmxvYXRQb2ludCgpKTsKLSAgICByZXR1cm4gY29udGVu dE9mZnNldDsKKyAgICByZXR1cm4gY29udGVudE9mZnNldC5jb25zdHJhaW5lZEJldHdlZW4oV2Vi Q29yZTo6RmxvYXRQb2ludCgpLCBXZWJDb3JlOjpGbG9hdFBvaW50KG1heGltdW1Db250ZW50T2Zm c2V0KSk7CiB9CiAKIC0gKHZvaWQpX3Njcm9sbFRvQ29udGVudE9mZnNldDooV2ViQ29yZTo6Rmxv YXRQb2ludCljb250ZW50T2Zmc2V0SW5QYWdlQ29vcmRpbmF0ZXMgc2Nyb2xsT3JpZ2luOihXZWJD b3JlOjpJbnRQb2ludClzY3JvbGxPcmlnaW4K