189813 2018-09-20 19:01:41 -0700 Simplify the logic around has*ScrollbarWithAutoBehavior 2018-09-21 13:31:31 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 189811 1 simon.fraser simon.fraser simon.fraser webkit-bug-importer zalan oldest_to_newest 1461651 0 simon.fraser 2018-09-20 19:01:41 -0700 Simplify the logic around has*ScrollbarWithAutoBehavior 1461655 1 350302 simon.fraser 2018-09-20 19:04:05 -0700 Created attachment 350302 Patch 1461663 2 simon.fraser 2018-09-20 19:11:28 -0700 Depends on the patch in bug 189811. 1461964 3 350393 simon.fraser 2018-09-21 11:44:12 -0700 Created attachment 350393 Patch 1462048 4 simon.fraser 2018-09-21 13:30:20 -0700 https://trac.webkit.org/r236356 1462050 5 webkit-bug-importer 2018-09-21 13:31:31 -0700 <rdar://problem/44690526> 350302 2018-09-20 19:04:05 -0700 2018-09-21 11:44:11 -0700 Patch bug-189813-20180920190405.patch text/plain 6257 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2Mjc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzk1N2VlOTY1MGU4ZTY1 NmE1MDRkYWM0YTc1YzNmYzY3ZGRiZWI5ZS4uN2JmNTRiNTg1NGUzNTYzYmQzNWRjNTEwMzhjNWEy MmY3ZTFiZTk1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE4LTA5LTIwICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFNpbXBsaWZ5IHRo ZSBsb2dpYyBhcm91bmQgaGFzKlNjcm9sbGJhcldpdGhBdXRvQmVoYXZpb3IKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTgxMworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBib29sZWFuIGxvZ2ljIGlu IHNjcm9sbHNPdmVyZmxvd1goKSBhbmQgaGFzSG9yaXpvbnRhbFNjcm9sbGJhcldpdGhBdXRvQmVo YXZpb3IoKSAoYW5kIHRoZSB2ZXJ0aWNhbAorICAgICAgICBlcXVpdmFsZW50cykgcmVkdWNlcyBz aW1wbHkgdG8gaGFzT3ZlcmZsb3dDbGlwKCkgJiYgKHN0eWxlKCkub3ZlcmZsb3dYKCkgPT0gT3Zl cmZsb3c6OlNjcm9sbCB8fCBzdHlsZSgpLm92ZXJmbG93WCgpID09IE92ZXJmbG93OjpBdXRvKTsK KyAgICAgICAgCisgICAgICAgIFNpbWlsYXJseSwgUmVuZGVyQm94OjppbnRyaW5zaWNTY3JvbGxi YXJMb2dpY2FsV2lkdGgoKSBqdXN0IG5lZWRzIHRoZSBwYXJ0IG9mIHRoZSBsb2dpYworICAgICAg ICB0aGF0IGFza3Mgd2hldGhlciB0aGUgdGhlbWUgdXNlcyBvdmVybGF5IHNjcm9sbGJhcnMgd2hp Y2ggYXJlIG5vdCBjdXN0b21pemVkIChhbmQgdGh1cworICAgICAgICB0dXJuZWQgaW50byBub24t b3ZlcmxheSBzY3JvbGxiYXJzKS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjppbnRyaW5zaWNTY3JvbGxiYXJMb2dpY2Fs V2lkdGggY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpjYW5Vc2VPdmVybGF5 U2Nyb2xsYmFycyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6Omhhc1ZlcnRp Y2FsU2Nyb2xsYmFyV2l0aEF1dG9CZWhhdmlvciBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJCb3g6Omhhc0hvcml6b250YWxTY3JvbGxiYXJXaXRoQXV0b0JlaGF2aW9yIGNvbnN0KToK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94Lmg6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJCb3g6OnNjcm9sbHNPdmVyZmxvd1ggY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy Qm94OjpzY3JvbGxzT3ZlcmZsb3dZIGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy TGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnVwZGF0ZVNjcm9sbGJh cnNBZnRlckxheW91dCk6CisKIDIwMTgtMDktMjAgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNl ckBhcHBsZS5jb20+CiAKICAgICAgICAgTWFrZSAib3ZlcmZsb3c6IG92ZXJsYXkiIGEgc3lub255 bSBmb3IgIm92ZXJmbG93OiBhdXRvIgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNw cAppbmRleCA0NDk0ZGY1OWI3ODY4Y2RiYjg5MWIxOWFmODdjNDY3ODJiODliMTJkLi43N2JmMmQy N2QzYTQyNDczYWE0NWRlMmQzZWVhZWMzNjhmODExYWZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQm94LmNwcApAQCAtNzcyLDEyICs3NzIsMTIgQEAgaW50IFJlbmRlckJveDo6aW50 cmluc2ljU2Nyb2xsYmFyTG9naWNhbFdpZHRoKCkgY29uc3QKICAgICBpZiAoIWhhc092ZXJmbG93 Q2xpcCgpKQogICAgICAgICByZXR1cm4gMDsKIAotICAgIGlmIChpc0hvcml6b250YWxXcml0aW5n TW9kZSgpICYmIChzdHlsZSgpLm92ZXJmbG93WSgpID09IE92ZXJmbG93OjpTY3JvbGwgJiYgIWhh c1ZlcnRpY2FsU2Nyb2xsYmFyV2l0aEF1dG9CZWhhdmlvcigpKSkgeworICAgIGlmIChpc0hvcml6 b250YWxXcml0aW5nTW9kZSgpICYmIChzdHlsZSgpLm92ZXJmbG93WSgpID09IE92ZXJmbG93OjpT Y3JvbGwgJiYgIWNhblVzZU92ZXJsYXlTY3JvbGxiYXJzKCkpKSB7CiAgICAgICAgIEFTU0VSVChs YXllcigpICYmIGxheWVyKCktPmhhc1ZlcnRpY2FsU2Nyb2xsYmFyKCkpOwogICAgICAgICByZXR1 cm4gdmVydGljYWxTY3JvbGxiYXJXaWR0aCgpOwogICAgIH0KIAotICAgIGlmICghaXNIb3Jpem9u dGFsV3JpdGluZ01vZGUoKSAmJiAoc3R5bGUoKS5vdmVyZmxvd1goKSA9PSBPdmVyZmxvdzo6U2Ny b2xsICYmICFoYXNIb3Jpem9udGFsU2Nyb2xsYmFyV2l0aEF1dG9CZWhhdmlvcigpKSkgeworICAg IGlmICghaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSAmJiAoc3R5bGUoKS5vdmVyZmxvd1goKSA9 PSBPdmVyZmxvdzo6U2Nyb2xsICYmICFjYW5Vc2VPdmVybGF5U2Nyb2xsYmFycygpKSkgewogICAg ICAgICBBU1NFUlQobGF5ZXIoKSAmJiBsYXllcigpLT5oYXNIb3Jpem9udGFsU2Nyb2xsYmFyKCkp OwogICAgICAgICByZXR1cm4gaG9yaXpvbnRhbFNjcm9sbGJhckhlaWdodCgpOwogICAgIH0KQEAg LTkzNCwxNiArOTM0LDE5IEBAIHZvaWQgUmVuZGVyQm94OjpwYW5TY3JvbGwoY29uc3QgSW50UG9p bnQmIHNvdXJjZSkKICAgICAgICAgbGF5ZXIoKS0+cGFuU2Nyb2xsRnJvbVBvaW50KHNvdXJjZSk7 CiB9CiAKK2Jvb2wgUmVuZGVyQm94OjpjYW5Vc2VPdmVybGF5U2Nyb2xsYmFycygpIGNvbnN0Cit7 CisgICAgcmV0dXJuICFzdHlsZSgpLmhhc1BzZXVkb1N0eWxlKFBzZXVkb0lkOjpTY3JvbGxiYXIp ICYmIFNjcm9sbGJhclRoZW1lOjp0aGVtZSgpLnVzZXNPdmVybGF5U2Nyb2xsYmFycygpOworfQor CiBib29sIFJlbmRlckJveDo6aGFzVmVydGljYWxTY3JvbGxiYXJXaXRoQXV0b0JlaGF2aW9yKCkg Y29uc3QKIHsKLSAgICBib29sIG92ZXJmbG93U2Nyb2xsQWN0c0xpa2VBdXRvID0gc3R5bGUoKS5v dmVyZmxvd1koKSA9PSBPdmVyZmxvdzo6U2Nyb2xsICYmICFzdHlsZSgpLmhhc1BzZXVkb1N0eWxl KFBzZXVkb0lkOjpTY3JvbGxiYXIpICYmIFNjcm9sbGJhclRoZW1lOjp0aGVtZSgpLnVzZXNPdmVy bGF5U2Nyb2xsYmFycygpOwotICAgIHJldHVybiBoYXNPdmVyZmxvd0NsaXAoKSAmJiAoc3R5bGUo KS5vdmVyZmxvd1koKSA9PSBPdmVyZmxvdzo6QXV0byB8fCBvdmVyZmxvd1Njcm9sbEFjdHNMaWtl QXV0byk7CisgICAgcmV0dXJuIGhhc092ZXJmbG93Q2xpcCgpICYmIChzdHlsZSgpLm92ZXJmbG93 WSgpID09IE92ZXJmbG93OjpBdXRvIHx8IChzdHlsZSgpLm92ZXJmbG93WSgpID09IE92ZXJmbG93 OjpTY3JvbGwgJiYgY2FuVXNlT3ZlcmxheVNjcm9sbGJhcnMoKSkpOwogfQogCiBib29sIFJlbmRl ckJveDo6aGFzSG9yaXpvbnRhbFNjcm9sbGJhcldpdGhBdXRvQmVoYXZpb3IoKSBjb25zdAogewot ICAgIGJvb2wgb3ZlcmZsb3dTY3JvbGxBY3RzTGlrZUF1dG8gPSBzdHlsZSgpLm92ZXJmbG93WCgp ID09IE92ZXJmbG93OjpTY3JvbGwgJiYgIXN0eWxlKCkuaGFzUHNldWRvU3R5bGUoUHNldWRvSWQ6 OlNjcm9sbGJhcikgJiYgU2Nyb2xsYmFyVGhlbWU6OnRoZW1lKCkudXNlc092ZXJsYXlTY3JvbGxi YXJzKCk7Ci0gICAgcmV0dXJuIGhhc092ZXJmbG93Q2xpcCgpICYmIChzdHlsZSgpLm92ZXJmbG93 WCgpID09IE92ZXJmbG93OjpBdXRvIHx8IG92ZXJmbG93U2Nyb2xsQWN0c0xpa2VBdXRvKTsKKyAg ICByZXR1cm4gaGFzT3ZlcmZsb3dDbGlwKCkgJiYgKHN0eWxlKCkub3ZlcmZsb3dYKCkgPT0gT3Zl cmZsb3c6OkF1dG8gfHwgKHN0eWxlKCkub3ZlcmZsb3dYKCkgPT0gT3ZlcmZsb3c6OlNjcm9sbCAm JiBjYW5Vc2VPdmVybGF5U2Nyb2xsYmFycygpKSk7CiB9CiAKIGJvb2wgUmVuZGVyQm94OjpuZWVk c1ByZWZlcnJlZFdpZHRoc1JlY2FsY3VsYXRpb24oKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJveC5oCmluZGV4IDgxNjYzZjc0ZDJiOWFkZDEzYmU2ZDY0N2I0MzI1ZWNkYWM0NmNl ZjUuLjYwOThiYWM2NjlkODQ0Mjk5YWJhY2U4MDdjNmY5ZWQ0NTc3NTFlMjUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKQEAgLTQ1OSwxMCArNDU5LDEyIEBAIHB1YmxpYzoKIAog ICAgIGJvb2wgaGFzVmVydGljYWxTY3JvbGxiYXJXaXRoQXV0b0JlaGF2aW9yKCkgY29uc3Q7CiAg ICAgYm9vbCBoYXNIb3Jpem9udGFsU2Nyb2xsYmFyV2l0aEF1dG9CZWhhdmlvcigpIGNvbnN0Owor ICAgIAorICAgIGJvb2wgY2FuVXNlT3ZlcmxheVNjcm9sbGJhcnMoKSBjb25zdDsKIAogICAgIGJv b2wgc2Nyb2xsc092ZXJmbG93KCkgY29uc3QgeyByZXR1cm4gc2Nyb2xsc092ZXJmbG93WCgpIHx8 IHNjcm9sbHNPdmVyZmxvd1koKTsgfQotICAgIGJvb2wgc2Nyb2xsc092ZXJmbG93WCgpIGNvbnN0 IHsgcmV0dXJuIGhhc092ZXJmbG93Q2xpcCgpICYmIChzdHlsZSgpLm92ZXJmbG93WCgpID09IE92 ZXJmbG93OjpTY3JvbGwgfHwgaGFzSG9yaXpvbnRhbFNjcm9sbGJhcldpdGhBdXRvQmVoYXZpb3Io KSk7IH0KLSAgICBib29sIHNjcm9sbHNPdmVyZmxvd1koKSBjb25zdCB7IHJldHVybiBoYXNPdmVy Zmxvd0NsaXAoKSAmJiAoc3R5bGUoKS5vdmVyZmxvd1koKSA9PSBPdmVyZmxvdzo6U2Nyb2xsIHx8 IGhhc1ZlcnRpY2FsU2Nyb2xsYmFyV2l0aEF1dG9CZWhhdmlvcigpKTsgfQorICAgIGJvb2wgc2Ny b2xsc092ZXJmbG93WCgpIGNvbnN0IHsgcmV0dXJuIGhhc092ZXJmbG93Q2xpcCgpICYmIChzdHls ZSgpLm92ZXJmbG93WCgpID09IE92ZXJmbG93OjpTY3JvbGwgfHwgc3R5bGUoKS5vdmVyZmxvd1go KSA9PSBPdmVyZmxvdzo6QXV0byk7IH0KKyAgICBib29sIHNjcm9sbHNPdmVyZmxvd1koKSBjb25z dCB7IHJldHVybiBoYXNPdmVyZmxvd0NsaXAoKSAmJiAoc3R5bGUoKS5vdmVyZmxvd1koKSA9PSBP dmVyZmxvdzo6U2Nyb2xsIHx8IHN0eWxlKCkub3ZlcmZsb3dZKCkgPT0gT3ZlcmZsb3c6OkF1dG8p OyB9CiAKICAgICBib29sIGhhc0hvcml6b250YWxPdmVyZmxvdygpIGNvbnN0IHsgcmV0dXJuIHNj cm9sbFdpZHRoKCkgIT0gcm91bmRUb0ludChjbGllbnRXaWR0aCgpKTsgfQogICAgIGJvb2wgaGFz VmVydGljYWxPdmVyZmxvdygpIGNvbnN0IHsgcmV0dXJuIHNjcm9sbEhlaWdodCgpICE9IHJvdW5k VG9JbnQoY2xpZW50SGVpZ2h0KCkpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyLmNwcAppbmRleCA0OTc1YzhlOWQxMTFjMGE4YTNjNWRkN2IwYzZlYzZkODExYWNmZTU1Li5k NzhjYTY0MWE3MDQxMTZlNGQ2ZjVlZmYxNDcyZDk1OTgyNTVkYjhiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTM1MTUsNyArMzUxNSw2IEBAIHZvaWQgUmVu ZGVyTGF5ZXI6OnVwZGF0ZVNjcm9sbGJhcnNBZnRlckxheW91dCgpCiAKICAgICAgICAgaWYgKHJl bmRlcmVyKCkuc3R5bGUoKS5vdmVyZmxvd1goKSA9PSBPdmVyZmxvdzo6QXV0byB8fCByZW5kZXJl cigpLnN0eWxlKCkub3ZlcmZsb3dZKCkgPT0gT3ZlcmZsb3c6OkF1dG8pIHsKICAgICAgICAgICAg IGlmICghbV9pbk92ZXJmbG93UmVsYXlvdXQpIHsKLSAgICAgICAgICAgICAgICAvLyBPdXIgcHJv cHJpZXRhcnkgb3ZlcmZsb3c6IG92ZXJsYXkgdmFsdWUgZG9lc24ndCB0cmlnZ2VyIGEgbGF5b3V0 LgogICAgICAgICAgICAgICAgIG1faW5PdmVyZmxvd1JlbGF5b3V0ID0gdHJ1ZTsKICAgICAgICAg ICAgICAgICByZW5kZXJlcigpLnNldE5lZWRzTGF5b3V0KE1hcmtPbmx5VGhpcyk7CiAgICAgICAg ICAgICAgICAgaWYgKGlzPFJlbmRlckJsb2NrPihyZW5kZXJlcigpKSkgewo= 350393 2018-09-21 11:44:12 -0700 2018-09-21 13:15:38 -0700 Patch bug-189813-20180921114412.patch text/plain 6257 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2MzQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDhiZjFhYmI5MWI1MWEx Mjk4ZjVmMjJjYTI5NzM4NGI5MThhNzZjNS4uMWVhNTUzYWRlY2YxNmQyNDVhMTIyMWM2MmEwZWQx YzcwMTY4MmJiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE4LTA5LTIwICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFNpbXBsaWZ5IHRo ZSBsb2dpYyBhcm91bmQgaGFzKlNjcm9sbGJhcldpdGhBdXRvQmVoYXZpb3IKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTgxMworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBib29sZWFuIGxvZ2ljIGlu IHNjcm9sbHNPdmVyZmxvd1goKSBhbmQgaGFzSG9yaXpvbnRhbFNjcm9sbGJhcldpdGhBdXRvQmVo YXZpb3IoKSAoYW5kIHRoZSB2ZXJ0aWNhbAorICAgICAgICBlcXVpdmFsZW50cykgcmVkdWNlcyBz aW1wbHkgdG8gaGFzT3ZlcmZsb3dDbGlwKCkgJiYgKHN0eWxlKCkub3ZlcmZsb3dYKCkgPT0gT3Zl cmZsb3c6OlNjcm9sbCB8fCBzdHlsZSgpLm92ZXJmbG93WCgpID09IE92ZXJmbG93OjpBdXRvKTsK KyAgICAgICAgCisgICAgICAgIFNpbWlsYXJseSwgUmVuZGVyQm94OjppbnRyaW5zaWNTY3JvbGxi YXJMb2dpY2FsV2lkdGgoKSBqdXN0IG5lZWRzIHRoZSBwYXJ0IG9mIHRoZSBsb2dpYworICAgICAg ICB0aGF0IGFza3Mgd2hldGhlciB0aGUgdGhlbWUgdXNlcyBvdmVybGF5IHNjcm9sbGJhcnMgd2hp Y2ggYXJlIG5vdCBjdXN0b21pemVkIChhbmQgdGh1cworICAgICAgICB0dXJuZWQgaW50byBub24t b3ZlcmxheSBzY3JvbGxiYXJzKS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjppbnRyaW5zaWNTY3JvbGxiYXJMb2dpY2Fs V2lkdGggY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpjYW5Vc2VPdmVybGF5 U2Nyb2xsYmFycyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6Omhhc1ZlcnRp Y2FsU2Nyb2xsYmFyV2l0aEF1dG9CZWhhdmlvciBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJCb3g6Omhhc0hvcml6b250YWxTY3JvbGxiYXJXaXRoQXV0b0JlaGF2aW9yIGNvbnN0KToK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94Lmg6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJCb3g6OnNjcm9sbHNPdmVyZmxvd1ggY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy Qm94OjpzY3JvbGxzT3ZlcmZsb3dZIGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy TGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnVwZGF0ZVNjcm9sbGJh cnNBZnRlckxheW91dCk6CisKIDIwMTgtMDktMjAgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNl ckBhcHBsZS5jb20+CiAKICAgICAgICAgTWFrZSAib3ZlcmZsb3c6IG92ZXJsYXkiIGEgc3lub255 bSBmb3IgIm92ZXJmbG93OiBhdXRvIgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNw cAppbmRleCA0NDk0ZGY1OWI3ODY4Y2RiYjg5MWIxOWFmODdjNDY3ODJiODliMTJkLi43N2JmMmQy N2QzYTQyNDczYWE0NWRlMmQzZWVhZWMzNjhmODExYWZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQm94LmNwcApAQCAtNzcyLDEyICs3NzIsMTIgQEAgaW50IFJlbmRlckJveDo6aW50 cmluc2ljU2Nyb2xsYmFyTG9naWNhbFdpZHRoKCkgY29uc3QKICAgICBpZiAoIWhhc092ZXJmbG93 Q2xpcCgpKQogICAgICAgICByZXR1cm4gMDsKIAotICAgIGlmIChpc0hvcml6b250YWxXcml0aW5n TW9kZSgpICYmIChzdHlsZSgpLm92ZXJmbG93WSgpID09IE92ZXJmbG93OjpTY3JvbGwgJiYgIWhh c1ZlcnRpY2FsU2Nyb2xsYmFyV2l0aEF1dG9CZWhhdmlvcigpKSkgeworICAgIGlmIChpc0hvcml6 b250YWxXcml0aW5nTW9kZSgpICYmIChzdHlsZSgpLm92ZXJmbG93WSgpID09IE92ZXJmbG93OjpT Y3JvbGwgJiYgIWNhblVzZU92ZXJsYXlTY3JvbGxiYXJzKCkpKSB7CiAgICAgICAgIEFTU0VSVChs YXllcigpICYmIGxheWVyKCktPmhhc1ZlcnRpY2FsU2Nyb2xsYmFyKCkpOwogICAgICAgICByZXR1 cm4gdmVydGljYWxTY3JvbGxiYXJXaWR0aCgpOwogICAgIH0KIAotICAgIGlmICghaXNIb3Jpem9u dGFsV3JpdGluZ01vZGUoKSAmJiAoc3R5bGUoKS5vdmVyZmxvd1goKSA9PSBPdmVyZmxvdzo6U2Ny b2xsICYmICFoYXNIb3Jpem9udGFsU2Nyb2xsYmFyV2l0aEF1dG9CZWhhdmlvcigpKSkgeworICAg IGlmICghaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSAmJiAoc3R5bGUoKS5vdmVyZmxvd1goKSA9 PSBPdmVyZmxvdzo6U2Nyb2xsICYmICFjYW5Vc2VPdmVybGF5U2Nyb2xsYmFycygpKSkgewogICAg ICAgICBBU1NFUlQobGF5ZXIoKSAmJiBsYXllcigpLT5oYXNIb3Jpem9udGFsU2Nyb2xsYmFyKCkp OwogICAgICAgICByZXR1cm4gaG9yaXpvbnRhbFNjcm9sbGJhckhlaWdodCgpOwogICAgIH0KQEAg LTkzNCwxNiArOTM0LDE5IEBAIHZvaWQgUmVuZGVyQm94OjpwYW5TY3JvbGwoY29uc3QgSW50UG9p bnQmIHNvdXJjZSkKICAgICAgICAgbGF5ZXIoKS0+cGFuU2Nyb2xsRnJvbVBvaW50KHNvdXJjZSk7 CiB9CiAKK2Jvb2wgUmVuZGVyQm94OjpjYW5Vc2VPdmVybGF5U2Nyb2xsYmFycygpIGNvbnN0Cit7 CisgICAgcmV0dXJuICFzdHlsZSgpLmhhc1BzZXVkb1N0eWxlKFBzZXVkb0lkOjpTY3JvbGxiYXIp ICYmIFNjcm9sbGJhclRoZW1lOjp0aGVtZSgpLnVzZXNPdmVybGF5U2Nyb2xsYmFycygpOworfQor CiBib29sIFJlbmRlckJveDo6aGFzVmVydGljYWxTY3JvbGxiYXJXaXRoQXV0b0JlaGF2aW9yKCkg Y29uc3QKIHsKLSAgICBib29sIG92ZXJmbG93U2Nyb2xsQWN0c0xpa2VBdXRvID0gc3R5bGUoKS5v dmVyZmxvd1koKSA9PSBPdmVyZmxvdzo6U2Nyb2xsICYmICFzdHlsZSgpLmhhc1BzZXVkb1N0eWxl KFBzZXVkb0lkOjpTY3JvbGxiYXIpICYmIFNjcm9sbGJhclRoZW1lOjp0aGVtZSgpLnVzZXNPdmVy bGF5U2Nyb2xsYmFycygpOwotICAgIHJldHVybiBoYXNPdmVyZmxvd0NsaXAoKSAmJiAoc3R5bGUo KS5vdmVyZmxvd1koKSA9PSBPdmVyZmxvdzo6QXV0byB8fCBvdmVyZmxvd1Njcm9sbEFjdHNMaWtl QXV0byk7CisgICAgcmV0dXJuIGhhc092ZXJmbG93Q2xpcCgpICYmIChzdHlsZSgpLm92ZXJmbG93 WSgpID09IE92ZXJmbG93OjpBdXRvIHx8IChzdHlsZSgpLm92ZXJmbG93WSgpID09IE92ZXJmbG93 OjpTY3JvbGwgJiYgY2FuVXNlT3ZlcmxheVNjcm9sbGJhcnMoKSkpOwogfQogCiBib29sIFJlbmRl ckJveDo6aGFzSG9yaXpvbnRhbFNjcm9sbGJhcldpdGhBdXRvQmVoYXZpb3IoKSBjb25zdAogewot ICAgIGJvb2wgb3ZlcmZsb3dTY3JvbGxBY3RzTGlrZUF1dG8gPSBzdHlsZSgpLm92ZXJmbG93WCgp ID09IE92ZXJmbG93OjpTY3JvbGwgJiYgIXN0eWxlKCkuaGFzUHNldWRvU3R5bGUoUHNldWRvSWQ6 OlNjcm9sbGJhcikgJiYgU2Nyb2xsYmFyVGhlbWU6OnRoZW1lKCkudXNlc092ZXJsYXlTY3JvbGxi YXJzKCk7Ci0gICAgcmV0dXJuIGhhc092ZXJmbG93Q2xpcCgpICYmIChzdHlsZSgpLm92ZXJmbG93 WCgpID09IE92ZXJmbG93OjpBdXRvIHx8IG92ZXJmbG93U2Nyb2xsQWN0c0xpa2VBdXRvKTsKKyAg ICByZXR1cm4gaGFzT3ZlcmZsb3dDbGlwKCkgJiYgKHN0eWxlKCkub3ZlcmZsb3dYKCkgPT0gT3Zl cmZsb3c6OkF1dG8gfHwgKHN0eWxlKCkub3ZlcmZsb3dYKCkgPT0gT3ZlcmZsb3c6OlNjcm9sbCAm JiBjYW5Vc2VPdmVybGF5U2Nyb2xsYmFycygpKSk7CiB9CiAKIGJvb2wgUmVuZGVyQm94OjpuZWVk c1ByZWZlcnJlZFdpZHRoc1JlY2FsY3VsYXRpb24oKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJveC5oCmluZGV4IDgxNjYzZjc0ZDJiOWFkZDEzYmU2ZDY0N2I0MzI1ZWNkYWM0NmNl ZjUuLjYwOThiYWM2NjlkODQ0Mjk5YWJhY2U4MDdjNmY5ZWQ0NTc3NTFlMjUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKQEAgLTQ1OSwxMCArNDU5LDEyIEBAIHB1YmxpYzoKIAog ICAgIGJvb2wgaGFzVmVydGljYWxTY3JvbGxiYXJXaXRoQXV0b0JlaGF2aW9yKCkgY29uc3Q7CiAg ICAgYm9vbCBoYXNIb3Jpem9udGFsU2Nyb2xsYmFyV2l0aEF1dG9CZWhhdmlvcigpIGNvbnN0Owor ICAgIAorICAgIGJvb2wgY2FuVXNlT3ZlcmxheVNjcm9sbGJhcnMoKSBjb25zdDsKIAogICAgIGJv b2wgc2Nyb2xsc092ZXJmbG93KCkgY29uc3QgeyByZXR1cm4gc2Nyb2xsc092ZXJmbG93WCgpIHx8 IHNjcm9sbHNPdmVyZmxvd1koKTsgfQotICAgIGJvb2wgc2Nyb2xsc092ZXJmbG93WCgpIGNvbnN0 IHsgcmV0dXJuIGhhc092ZXJmbG93Q2xpcCgpICYmIChzdHlsZSgpLm92ZXJmbG93WCgpID09IE92 ZXJmbG93OjpTY3JvbGwgfHwgaGFzSG9yaXpvbnRhbFNjcm9sbGJhcldpdGhBdXRvQmVoYXZpb3Io KSk7IH0KLSAgICBib29sIHNjcm9sbHNPdmVyZmxvd1koKSBjb25zdCB7IHJldHVybiBoYXNPdmVy Zmxvd0NsaXAoKSAmJiAoc3R5bGUoKS5vdmVyZmxvd1koKSA9PSBPdmVyZmxvdzo6U2Nyb2xsIHx8 IGhhc1ZlcnRpY2FsU2Nyb2xsYmFyV2l0aEF1dG9CZWhhdmlvcigpKTsgfQorICAgIGJvb2wgc2Ny b2xsc092ZXJmbG93WCgpIGNvbnN0IHsgcmV0dXJuIGhhc092ZXJmbG93Q2xpcCgpICYmIChzdHls ZSgpLm92ZXJmbG93WCgpID09IE92ZXJmbG93OjpTY3JvbGwgfHwgc3R5bGUoKS5vdmVyZmxvd1go KSA9PSBPdmVyZmxvdzo6QXV0byk7IH0KKyAgICBib29sIHNjcm9sbHNPdmVyZmxvd1koKSBjb25z dCB7IHJldHVybiBoYXNPdmVyZmxvd0NsaXAoKSAmJiAoc3R5bGUoKS5vdmVyZmxvd1koKSA9PSBP dmVyZmxvdzo6U2Nyb2xsIHx8IHN0eWxlKCkub3ZlcmZsb3dZKCkgPT0gT3ZlcmZsb3c6OkF1dG8p OyB9CiAKICAgICBib29sIGhhc0hvcml6b250YWxPdmVyZmxvdygpIGNvbnN0IHsgcmV0dXJuIHNj cm9sbFdpZHRoKCkgIT0gcm91bmRUb0ludChjbGllbnRXaWR0aCgpKTsgfQogICAgIGJvb2wgaGFz VmVydGljYWxPdmVyZmxvdygpIGNvbnN0IHsgcmV0dXJuIHNjcm9sbEhlaWdodCgpICE9IHJvdW5k VG9JbnQoY2xpZW50SGVpZ2h0KCkpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyLmNwcAppbmRleCA0OTc1YzhlOWQxMTFjMGE4YTNjNWRkN2IwYzZlYzZkODExYWNmZTU1Li5k NzhjYTY0MWE3MDQxMTZlNGQ2ZjVlZmYxNDcyZDk1OTgyNTVkYjhiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTM1MTUsNyArMzUxNSw2IEBAIHZvaWQgUmVu ZGVyTGF5ZXI6OnVwZGF0ZVNjcm9sbGJhcnNBZnRlckxheW91dCgpCiAKICAgICAgICAgaWYgKHJl bmRlcmVyKCkuc3R5bGUoKS5vdmVyZmxvd1goKSA9PSBPdmVyZmxvdzo6QXV0byB8fCByZW5kZXJl cigpLnN0eWxlKCkub3ZlcmZsb3dZKCkgPT0gT3ZlcmZsb3c6OkF1dG8pIHsKICAgICAgICAgICAg IGlmICghbV9pbk92ZXJmbG93UmVsYXlvdXQpIHsKLSAgICAgICAgICAgICAgICAvLyBPdXIgcHJv cHJpZXRhcnkgb3ZlcmZsb3c6IG92ZXJsYXkgdmFsdWUgZG9lc24ndCB0cmlnZ2VyIGEgbGF5b3V0 LgogICAgICAgICAgICAgICAgIG1faW5PdmVyZmxvd1JlbGF5b3V0ID0gdHJ1ZTsKICAgICAgICAg ICAgICAgICByZW5kZXJlcigpLnNldE5lZWRzTGF5b3V0KE1hcmtPbmx5VGhpcyk7CiAgICAgICAg ICAgICAgICAgaWYgKGlzPFJlbmRlckJsb2NrPihyZW5kZXJlcigpKSkgewo=