226685 2021-06-05 12:18:53 -0700 Remove some duplicated code related to scrollbars 2021-06-05 15:55:16 -0700 1 1 1 Unclassified WebKit Scrolling WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser changseok esprehn+autocc ews-watchlist fred.wang glenn kondapallykalyan pdr simon.fraser webkit-bug-importer zalan zimmermann oldest_to_newest 1767144 0 simon.fraser 2021-06-05 12:18:53 -0700 Remove some duplicated code related to scrollbars 1767145 1 430656 simon.fraser 2021-06-05 12:20:01 -0700 Created attachment 430656 Patch 1767156 2 ews-feeder 2021-06-05 15:54:14 -0700 Committed r278527 (238526@main): <https://commits.webkit.org/238526@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 430656. 1767157 3 webkit-bug-importer 2021-06-05 15:55:16 -0700 <rdar://problem/78911460> 430656 2021-06-05 12:20:01 -0700 2021-06-05 15:54:15 -0700 Patch bug-226685-20210605122000.patch text/plain 9217 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NDI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDM2ODJhMDBlOWQyMjAx Mjc5MzdmODExN2RhOGUwYTU1YmM1NGJjYy4uZmVkMGZhNzA3MjI1Y2Q2NjVkMGQyZjc3ZDg3MjY5 ODI4MzRiNGUwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIxLTA2LTA1ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSBzb21l IGR1cGxpY2F0ZWQgY29kZSByZWxhdGVkIHRvIHNjcm9sbGJhcnMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNjY4NQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEg YW5kIFJlbmRlckJveCBoYWQgc29tZSB2ZXJ5IHNpbWlsYXIgY29kZSByZWxhdGVkIHRvIAorICAg ICAgICBjb21wdXRpbmcgd2hldGhlciBzY3JvbGxiYXJzIGFyZSBwcmVzZW50LCBzbyByZW1vdmUg dGhlIGR1cGxpY2F0aW9uLCBhbmQgcHJlcGFyZQorICAgICAgICBmb3IgU2Nyb2xsYmFyT3JpZW50 YXRpb24gdG8gYmVjb21lIGFuIGVudW0gY2xhc3MuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6aGFzQXV0b1Njcm9sbGJh ciBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6Omhhc0Fsd2F5c1ByZXNlbnRT Y3JvbGxiYXIgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpoYXNWZXJ0aWNh bFNjcm9sbGJhcldpdGhBdXRvQmVoYXZpb3IgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyQm94OjpoYXNIb3Jpem9udGFsU2Nyb2xsYmFyV2l0aEF1dG9CZWhhdmlvciBj b25zdCk6IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5oOgorICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWE6OnVwZGF0ZVNjcm9sbGJhcnNBZnRlckxh eW91dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllclNjcm9sbGFibGVBcmVhOjp1cGRh dGVTY3JvbGxiYXJzQWZ0ZXJTdHlsZUNoYW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpzdHlsZVJl cXVpcmVzU2Nyb2xsYmFyKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OnN0eWxlRGVmaW5l c0F1dG9tYXRpY1Njcm9sbGJhcik6IERlbGV0ZWQuCisKIDIwMjEtMDYtMDMgIFNpbW9uIEZyYXNl ciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAoU2FmYXJp IDE0KTogTWVudSBpdGVtcyBqdW1wIGFyb3VuZCBvbiBjb2RlbGVhcm4uY2F0CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IGU3MDc3OTkxNjkyYWY3MjZlMjBhZTJhMDM4 OTliZjVmNDU4NDdiZTIuLjU2NjZjYjVmYjQ0MGJkZDBlM2YxMGRmOThhYzdmYTUxYTJhNjRhZGIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC0xMDYzLDE0ICsxMDYz LDQwIEBAIGJvb2wgUmVuZGVyQm94OjpjYW5Vc2VPdmVybGF5U2Nyb2xsYmFycygpIGNvbnN0CiAg ICAgcmV0dXJuICFzdHlsZSgpLmhhc1BzZXVkb1N0eWxlKFBzZXVkb0lkOjpTY3JvbGxiYXIpICYm IFNjcm9sbGJhclRoZW1lOjp0aGVtZSgpLnVzZXNPdmVybGF5U2Nyb2xsYmFycygpOwogfQogCi1i b29sIFJlbmRlckJveDo6aGFzVmVydGljYWxTY3JvbGxiYXJXaXRoQXV0b0JlaGF2aW9yKCkgY29u c3QKK2Jvb2wgUmVuZGVyQm94OjpoYXNBdXRvU2Nyb2xsYmFyKFNjcm9sbGJhck9yaWVudGF0aW9u IG9yaWVudGF0aW9uKSBjb25zdAogewotICAgIHJldHVybiBoYXNPdmVyZmxvd0NsaXAoKSAmJiAo c3R5bGUoKS5vdmVyZmxvd1koKSA9PSBPdmVyZmxvdzo6QXV0byB8fCAoc3R5bGUoKS5vdmVyZmxv d1koKSA9PSBPdmVyZmxvdzo6U2Nyb2xsICYmIGNhblVzZU92ZXJsYXlTY3JvbGxiYXJzKCkpKTsK KyAgICBpZiAoIWhhc092ZXJmbG93Q2xpcCgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAg ICBhdXRvIGlzQXV0b09yU2Nyb2xsV2l0aE92ZXJsYXlTY3JvbGxiYXIgPSBbJl0oT3ZlcmZsb3cg b3ZlcmZsb3cpIHsKKyAgICAgICAgcmV0dXJuIG92ZXJmbG93ID09IE92ZXJmbG93OjpBdXRvIHx8 IChvdmVyZmxvdyA9PSBPdmVyZmxvdzo6U2Nyb2xsICYmIGNhblVzZU92ZXJsYXlTY3JvbGxiYXJz KCkpOworICAgIH07CisKKyAgICBzd2l0Y2ggKG9yaWVudGF0aW9uKSB7CisgICAgY2FzZSBTY3Jv bGxiYXJPcmllbnRhdGlvbjo6SG9yaXpvbnRhbFNjcm9sbGJhcjoKKyAgICAgICAgcmV0dXJuIGlz QXV0b09yU2Nyb2xsV2l0aE92ZXJsYXlTY3JvbGxiYXIoc3R5bGUoKS5vdmVyZmxvd1goKSk7Cisg ICAgY2FzZSBTY3JvbGxiYXJPcmllbnRhdGlvbjo6VmVydGljYWxTY3JvbGxiYXI6CisgICAgICAg IHJldHVybiBpc0F1dG9PclNjcm9sbFdpdGhPdmVybGF5U2Nyb2xsYmFyKHN0eWxlKCkub3ZlcmZs b3dZKCkpOworICAgIH0KKyAgICByZXR1cm4gZmFsc2U7CiB9CiAKLWJvb2wgUmVuZGVyQm94Ojpo YXNIb3Jpem9udGFsU2Nyb2xsYmFyV2l0aEF1dG9CZWhhdmlvcigpIGNvbnN0Citib29sIFJlbmRl ckJveDo6aGFzQWx3YXlzUHJlc2VudFNjcm9sbGJhcihTY3JvbGxiYXJPcmllbnRhdGlvbiBvcmll bnRhdGlvbikgY29uc3QKIHsKLSAgICByZXR1cm4gaGFzT3ZlcmZsb3dDbGlwKCkgJiYgKHN0eWxl KCkub3ZlcmZsb3dYKCkgPT0gT3ZlcmZsb3c6OkF1dG8gfHwgKHN0eWxlKCkub3ZlcmZsb3dYKCkg PT0gT3ZlcmZsb3c6OlNjcm9sbCAmJiBjYW5Vc2VPdmVybGF5U2Nyb2xsYmFycygpKSk7CisgICAg aWYgKCFoYXNPdmVyZmxvd0NsaXAoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgYXV0 byBpc0Fsd2F5c1Zpc2libGVTY3JvbGxiYXIgPSBbJl0oT3ZlcmZsb3cgb3ZlcmZsb3cpIHsKKyAg ICAgICAgcmV0dXJuIG92ZXJmbG93ID09IE92ZXJmbG93OjpTY3JvbGwgJiYgIWNhblVzZU92ZXJs YXlTY3JvbGxiYXJzKCk7CisgICAgfTsKKworICAgIHN3aXRjaCAob3JpZW50YXRpb24pIHsKKyAg ICBjYXNlIFNjcm9sbGJhck9yaWVudGF0aW9uOjpIb3Jpem9udGFsU2Nyb2xsYmFyOgorICAgICAg ICByZXR1cm4gaXNBbHdheXNWaXNpYmxlU2Nyb2xsYmFyKHN0eWxlKCkub3ZlcmZsb3dYKCkpOwor ICAgIGNhc2UgU2Nyb2xsYmFyT3JpZW50YXRpb246OlZlcnRpY2FsU2Nyb2xsYmFyOgorICAgICAg ICByZXR1cm4gaXNBbHdheXNWaXNpYmxlU2Nyb2xsYmFyKHN0eWxlKCkub3ZlcmZsb3dZKCkpOwor ICAgIH0KKyAgICByZXR1cm4gZmFsc2U7CiB9CiAKIGJvb2wgUmVuZGVyQm94OjpuZWVkc1ByZWZl cnJlZFdpZHRoc1JlY2FsY3VsYXRpb24oKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveC5oCmluZGV4IGE0ZjJlMzFlMjBkZmU3ZGQzMmNjOGE0MTNhYmFmNTVlNDQzMTIxMmUuLjA5 NDk3NmZhYjI4MjM5NGIzYTVhZTQ1NTliNzUyZDI5MmI2MjU4ODUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94LmgKQEAgLTQ4NSwxMCArNDg1LDkgQEAgb3ZlcnJpZGU7CiAgICAgdmly dHVhbCB2b2lkIHN0b3BBdXRvc2Nyb2xsKCkgeyB9CiAgICAgdmlydHVhbCB2b2lkIHBhblNjcm9s bChjb25zdCBJbnRQb2ludCYpOwogCi0gICAgYm9vbCBoYXNWZXJ0aWNhbFNjcm9sbGJhcldpdGhB dXRvQmVoYXZpb3IoKSBjb25zdDsKLSAgICBib29sIGhhc0hvcml6b250YWxTY3JvbGxiYXJXaXRo QXV0b0JlaGF2aW9yKCkgY29uc3Q7Ci0gICAgCiAgICAgYm9vbCBjYW5Vc2VPdmVybGF5U2Nyb2xs YmFycygpIGNvbnN0OworICAgIGJvb2wgaGFzQXV0b1Njcm9sbGJhcihTY3JvbGxiYXJPcmllbnRh dGlvbikgY29uc3Q7CisgICAgYm9vbCBoYXNBbHdheXNQcmVzZW50U2Nyb2xsYmFyKFNjcm9sbGJh ck9yaWVudGF0aW9uKSBjb25zdDsKIAogICAgIGJvb2wgc2Nyb2xsc092ZXJmbG93KCkgY29uc3Qg eyByZXR1cm4gc2Nyb2xsc092ZXJmbG93WCgpIHx8IHNjcm9sbHNPdmVyZmxvd1koKTsgfQogICAg IGJvb2wgc2Nyb2xsc092ZXJmbG93WCgpIGNvbnN0IHsgcmV0dXJuIGhhc092ZXJmbG93Q2xpcCgp ICYmIChzdHlsZSgpLm92ZXJmbG93WCgpID09IE92ZXJmbG93OjpTY3JvbGwgfHwgc3R5bGUoKS5v dmVyZmxvd1goKSA9PSBPdmVyZmxvdzo6QXV0byk7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmNwcAppbmRleCAxYmVkNjQ5 OWE4N2YwZjRiYzU0MmM5ODBkZGExZjUwNjAwMTU5YTYwLi4xZGNkZDExYzBhZjQzMWQ2MjdjNjIx OTQ3YzI2ZDA2YTY2YzA0YmJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEuY3BwCkBAIC0xMDYzLDIwICsxMDYzLDYgQEAg Ym9vbCBSZW5kZXJMYXllclNjcm9sbGFibGVBcmVhOjpoYXNWZXJ0aWNhbE92ZXJmbG93KCkgY29u c3QKICAgICByZXR1cm4gc2Nyb2xsSGVpZ2h0KCkgPiByb3VuZFRvSW50KG1fbGF5ZXIucmVuZGVy Qm94KCktPmNsaWVudEhlaWdodCgpKTsKIH0KIAotc3RhdGljIGJvb2wgc3R5bGVSZXF1aXJlc1Nj cm9sbGJhcihjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIFNjcm9sbGJhck9yaWVudGF0aW9uIGF4 aXMpCi17Ci0gICAgT3ZlcmZsb3cgb3ZlcmZsb3cgPSBheGlzID09IFNjcm9sbGJhck9yaWVudGF0 aW9uOjpIb3Jpem9udGFsU2Nyb2xsYmFyID8gc3R5bGUub3ZlcmZsb3dYKCkgOiBzdHlsZS5vdmVy Zmxvd1koKTsKLSAgICBib29sIG92ZXJmbG93U2Nyb2xsQWN0c0xpa2VBdXRvID0gb3ZlcmZsb3cg PT0gT3ZlcmZsb3c6OlNjcm9sbCAmJiAhc3R5bGUuaGFzUHNldWRvU3R5bGUoUHNldWRvSWQ6OlNj cm9sbGJhcikgJiYgU2Nyb2xsYmFyVGhlbWU6OnRoZW1lKCkudXNlc092ZXJsYXlTY3JvbGxiYXJz KCk7Ci0gICAgcmV0dXJuIG92ZXJmbG93ID09IE92ZXJmbG93OjpTY3JvbGwgJiYgIW92ZXJmbG93 U2Nyb2xsQWN0c0xpa2VBdXRvOwotfQotCi1zdGF0aWMgYm9vbCBzdHlsZURlZmluZXNBdXRvbWF0 aWNTY3JvbGxiYXIoY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBTY3JvbGxiYXJPcmllbnRhdGlv biBheGlzKQotewotICAgIE92ZXJmbG93IG92ZXJmbG93ID0gYXhpcyA9PSBTY3JvbGxiYXJPcmll bnRhdGlvbjo6SG9yaXpvbnRhbFNjcm9sbGJhciA/IHN0eWxlLm92ZXJmbG93WCgpIDogc3R5bGUu b3ZlcmZsb3dZKCk7Ci0gICAgYm9vbCBvdmVyZmxvd1Njcm9sbEFjdHNMaWtlQXV0byA9IG92ZXJm bG93ID09IE92ZXJmbG93OjpTY3JvbGwgJiYgIXN0eWxlLmhhc1BzZXVkb1N0eWxlKFBzZXVkb0lk OjpTY3JvbGxiYXIpICYmIFNjcm9sbGJhclRoZW1lOjp0aGVtZSgpLnVzZXNPdmVybGF5U2Nyb2xs YmFycygpOwotICAgIHJldHVybiBvdmVyZmxvdyA9PSBPdmVyZmxvdzo6QXV0byB8fCBvdmVyZmxv d1Njcm9sbEFjdHNMaWtlQXV0bzsKLX0KLQogdm9pZCBSZW5kZXJMYXllclNjcm9sbGFibGVBcmVh Ojp1cGRhdGVTY3JvbGxiYXJzQWZ0ZXJMYXlvdXQoKQogewogICAgIFJlbmRlckJveCogYm94ID0g bV9sYXllci5yZW5kZXJCb3goKTsKQEAgLTEwOTEsMTkgKzEwNzcsMTkgQEAgdm9pZCBSZW5kZXJM YXllclNjcm9sbGFibGVBcmVhOjp1cGRhdGVTY3JvbGxiYXJzQWZ0ZXJMYXlvdXQoKQogCiAgICAg Ly8gSWYgb3ZlcmZsb3cgcmVxdWlyZXMgYSBzY3JvbGxiYXIsIHRoZW4gd2UganVzdCBuZWVkIHRv IGVuYWJsZSBvciBkaXNhYmxlLgogICAgIGF1dG8mIHJlbmRlcmVyID0gbV9sYXllci5yZW5kZXJl cigpOwotICAgIGlmIChtX2hCYXIgJiYgc3R5bGVSZXF1aXJlc1Njcm9sbGJhcihyZW5kZXJlci5z dHlsZSgpLCBIb3Jpem9udGFsU2Nyb2xsYmFyKSkKKyAgICBpZiAobV9oQmFyICYmIGJveC0+aGFz QWx3YXlzUHJlc2VudFNjcm9sbGJhcihTY3JvbGxiYXJPcmllbnRhdGlvbjo6SG9yaXpvbnRhbFNj cm9sbGJhcikpCiAgICAgICAgIG1faEJhci0+c2V0RW5hYmxlZChoYXNIb3Jpem9udGFsT3ZlcmZs b3cpOwotICAgIGlmIChtX3ZCYXIgJiYgc3R5bGVSZXF1aXJlc1Njcm9sbGJhcihyZW5kZXJlci5z dHlsZSgpLCBWZXJ0aWNhbFNjcm9sbGJhcikpCisgICAgaWYgKG1fdkJhciAmJiBib3gtPmhhc0Fs d2F5c1ByZXNlbnRTY3JvbGxiYXIoU2Nyb2xsYmFyT3JpZW50YXRpb246OlZlcnRpY2FsU2Nyb2xs YmFyKSkKICAgICAgICAgbV92QmFyLT5zZXRFbmFibGVkKGhhc1ZlcnRpY2FsT3ZlcmZsb3cpOwog CiAgICAgLy8gU2Nyb2xsYmFycyB3aXRoIGF1dG8gYmVoYXZpb3IgbWF5IG5lZWQgdG8gbGF5IG91 dCBhZ2FpbiBpZiBzY3JvbGxiYXJzIGdvdCBhZGRlZCBvciByZW1vdmVkLgotICAgIGJvb2wgYXV0 b0hvcml6b250YWxTY3JvbGxCYXJDaGFuZ2VkID0gYm94LT5oYXNIb3Jpem9udGFsU2Nyb2xsYmFy V2l0aEF1dG9CZWhhdmlvcigpICYmIChoYXNIb3Jpem9udGFsU2Nyb2xsYmFyKCkgIT0gaGFzSG9y aXpvbnRhbE92ZXJmbG93KTsKLSAgICBib29sIGF1dG9WZXJ0aWNhbFNjcm9sbEJhckNoYW5nZWQg PSBib3gtPmhhc1ZlcnRpY2FsU2Nyb2xsYmFyV2l0aEF1dG9CZWhhdmlvcigpICYmIChoYXNWZXJ0 aWNhbFNjcm9sbGJhcigpICE9IGhhc1ZlcnRpY2FsT3ZlcmZsb3cpOworICAgIGJvb2wgYXV0b0hv cml6b250YWxTY3JvbGxCYXJDaGFuZ2VkID0gYm94LT5oYXNBdXRvU2Nyb2xsYmFyKFNjcm9sbGJh ck9yaWVudGF0aW9uOjpIb3Jpem9udGFsU2Nyb2xsYmFyKSAmJiAoaGFzSG9yaXpvbnRhbFNjcm9s bGJhcigpICE9IGhhc0hvcml6b250YWxPdmVyZmxvdyk7CisgICAgYm9vbCBhdXRvVmVydGljYWxT Y3JvbGxCYXJDaGFuZ2VkID0gYm94LT5oYXNBdXRvU2Nyb2xsYmFyKFNjcm9sbGJhck9yaWVudGF0 aW9uOjpWZXJ0aWNhbFNjcm9sbGJhcikgJiYgKGhhc1ZlcnRpY2FsU2Nyb2xsYmFyKCkgIT0gaGFz VmVydGljYWxPdmVyZmxvdyk7CiAKICAgICBpZiAoYXV0b0hvcml6b250YWxTY3JvbGxCYXJDaGFu Z2VkIHx8IGF1dG9WZXJ0aWNhbFNjcm9sbEJhckNoYW5nZWQpIHsKLSAgICAgICAgaWYgKGJveC0+ aGFzSG9yaXpvbnRhbFNjcm9sbGJhcldpdGhBdXRvQmVoYXZpb3IoKSkKKyAgICAgICAgaWYgKGJv eC0+aGFzQXV0b1Njcm9sbGJhcihTY3JvbGxiYXJPcmllbnRhdGlvbjo6SG9yaXpvbnRhbFNjcm9s bGJhcikpCiAgICAgICAgICAgICBzZXRIYXNIb3Jpem9udGFsU2Nyb2xsYmFyKGhhc0hvcml6b250 YWxPdmVyZmxvdyk7Ci0gICAgICAgIGlmIChib3gtPmhhc1ZlcnRpY2FsU2Nyb2xsYmFyV2l0aEF1 dG9CZWhhdmlvcigpKQorICAgICAgICBpZiAoYm94LT5oYXNBdXRvU2Nyb2xsYmFyKFNjcm9sbGJh ck9yaWVudGF0aW9uOjpWZXJ0aWNhbFNjcm9sbGJhcikpCiAgICAgICAgICAgICBzZXRIYXNWZXJ0 aWNhbFNjcm9sbGJhcihoYXNWZXJ0aWNhbE92ZXJmbG93KTsKIAogICAgICAgICBpZiAoYXV0b1Zl cnRpY2FsU2Nyb2xsQmFyQ2hhbmdlZCAmJiBzaG91bGRQbGFjZVZlcnRpY2FsU2Nyb2xsYmFyT25M ZWZ0KCkpCkBAIC0xNTY3LDggKzE1NTMsOCBAQCB2b2lkIFJlbmRlckxheWVyU2Nyb2xsYWJsZUFy ZWE6OnVwZGF0ZVNjcm9sbGJhcnNBZnRlclN0eWxlQ2hhbmdlKGNvbnN0IFJlbmRlclN0eQogCiAg ICAgLy8gVG8gYXZvaWQgZG9pbmcgYSByZWxheW91dCBpbiB1cGRhdGVTY3JvbGxiYXJzQWZ0ZXJM YXlvdXQsIHdlIHRyeSB0byBrZWVwIGFueSBhdXRvbWF0aWMgc2Nyb2xsYmFyIHRoYXQgd2FzIGFs cmVhZHkgcHJlc2VudC4KICAgICBib29sIGhhZFZlcnRpY2FsU2Nyb2xsYmFyID0gbV92QmFyOwot ICAgIGJvb2wgbmVlZHNIb3Jpem9udGFsU2Nyb2xsYmFyID0gYm94LT5oYXNPdmVyZmxvd0NsaXAo KSAmJiAoKG1faEJhciAmJiBzdHlsZURlZmluZXNBdXRvbWF0aWNTY3JvbGxiYXIoYm94LT5zdHls ZSgpLCBIb3Jpem9udGFsU2Nyb2xsYmFyKSkgfHwgc3R5bGVSZXF1aXJlc1Njcm9sbGJhcihib3gt PnN0eWxlKCksIEhvcml6b250YWxTY3JvbGxiYXIpKTsKLSAgICBib29sIG5lZWRzVmVydGljYWxT Y3JvbGxiYXIgPSBib3gtPmhhc092ZXJmbG93Q2xpcCgpICYmICgobV92QmFyICYmIHN0eWxlRGVm aW5lc0F1dG9tYXRpY1Njcm9sbGJhcihib3gtPnN0eWxlKCksIFZlcnRpY2FsU2Nyb2xsYmFyKSkg fHwgc3R5bGVSZXF1aXJlc1Njcm9sbGJhcihib3gtPnN0eWxlKCksIFZlcnRpY2FsU2Nyb2xsYmFy KSk7CisgICAgYm9vbCBuZWVkc0hvcml6b250YWxTY3JvbGxiYXIgPSAobV9oQmFyICYmIGJveC0+ aGFzQXV0b1Njcm9sbGJhcihTY3JvbGxiYXJPcmllbnRhdGlvbjo6SG9yaXpvbnRhbFNjcm9sbGJh cikpIHx8IGJveC0+aGFzQWx3YXlzUHJlc2VudFNjcm9sbGJhcihTY3JvbGxiYXJPcmllbnRhdGlv bjo6SG9yaXpvbnRhbFNjcm9sbGJhcik7CisgICAgYm9vbCBuZWVkc1ZlcnRpY2FsU2Nyb2xsYmFy ID0gKG1fdkJhciAmJiBib3gtPmhhc0F1dG9TY3JvbGxiYXIoU2Nyb2xsYmFyT3JpZW50YXRpb246 OlZlcnRpY2FsU2Nyb2xsYmFyKSkgfHwgYm94LT5oYXNBbHdheXNQcmVzZW50U2Nyb2xsYmFyKFNj cm9sbGJhck9yaWVudGF0aW9uOjpWZXJ0aWNhbFNjcm9sbGJhcik7CiAgICAgc2V0SGFzSG9yaXpv bnRhbFNjcm9sbGJhcihuZWVkc0hvcml6b250YWxTY3JvbGxiYXIpOwogICAgIHNldEhhc1ZlcnRp Y2FsU2Nyb2xsYmFyKG5lZWRzVmVydGljYWxTY3JvbGxiYXIpOwogCg==