210141 2020-04-07 12:13:36 -0700 Use RectEdges<> in some scrolling tree code 2020-04-07 14:34:14 -0700 1 1 1 Unclassified WebKit Scrolling WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser cmarcelo ews-watchlist fred.wang jamesr luiz simon.fraser thorton tonikitoo webkit-bug-importer oldest_to_newest 1638715 0 simon.fraser 2020-04-07 12:13:36 -0700 Use RectEdges<> in some scrolling tree code 1638716 1 395720 simon.fraser 2020-04-07 12:14:53 -0700 Created attachment 395720 Patch 1638722 2 395720 thorton 2020-04-07 12:28:01 -0700 Comment on attachment 395720 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395720&action=review > Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp:160 > + // Top, right, bottom, left. Too bad there's not a good way to say this in not-a-comment. 1638805 3 ews-feeder 2020-04-07 14:33:09 -0700 Committed r259672: <https://trac.webkit.org/changeset/259672> All reviewed patches have been landed. Closing bug and clearing flags on attachment 395720. 1638806 4 webkit-bug-importer 2020-04-07 14:34:14 -0700 <rdar://problem/61410720> 395720 2020-04-07 12:14:53 -0700 2020-04-07 14:33:09 -0700 Patch bug-210141-20200407121452.patch text/plain 12632 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NTgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjNhODA5YjdjOTA1NDQ4 ODcxNDY3NjQ2NTdkYzNiODAxYjVmYWVmZC4uZjc2NWUyMDhiMDBmZGQ1ZDVlZTYxODY1MGJlMjQx ZDlmMWI5OTcwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIwLTA0LTA3ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFVzZSBSZWN0RWRn ZXM8PiBpbiBzb21lIHNjcm9sbGluZyB0cmVlIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDE0MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCB1dGlsaXR5IGZ1bmN0aW9ucyBvbiBTY3JvbGxp bmdUcmVlU2Nyb2xsaW5nTm9kZSB0byBnZXQgcGlubmVkIGFuZCBydWJiZXJiYW5kIHN0YXRlLgor ICAgICAgICBVc2UgdGhlbSB0byBwdXNoIG1haW4gZnJhbWUgc3RhdGUgdG8gdGhlIHNjcm9sbGlu ZyB0cmVlICh3aGljaCB3ZSBkbyBzbyB3ZSBjYW4gc2FmZWx5CisgICAgICAgIGFjY2VzcyB0aGUg c3RhdGUgZnJvbSB0aGUgRXZlbnREaXNwYXRjaGVyIHRocmVhZCkuCisKKyAgICAgICAgKiBwYWdl L3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGlu Z1RyZWU6OnNldE1haW5GcmFtZVBpbm5lZFN0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9s bGluZ1RyZWU6OnNldE1haW5GcmFtZUNhblJ1YmJlckJhbmQpOgorICAgICAgICAoV2ViQ29yZTo6 U2Nyb2xsaW5nVHJlZTo6d2lsbFdoZWVsRXZlbnRTdGFydFN3aXBlR2VzdHVyZSk6CisgICAgICAg IChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlOjpzZXRNYWluRnJhbWVQaW5TdGF0ZSk6IERlbGV0ZWQu CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlOjpzZXRDYW5SdWJiZXJCYW5kU3RhdGUp OiBEZWxldGVkLgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuaDoKKyAg ICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZTo6ZWRnZVBpbm5lZFN0 YXRlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2Rl Ojppc1J1YmJlckJhbmRpbmcgY29uc3QpOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9s bGluZ1RyZWVTY3JvbGxpbmdOb2RlLmg6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvbWFjL1Nj cm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpT Y3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlTWFjOjp1cGRhdGVNYWluRnJhbWVQaW5BbmRS dWJiZXJiYW5kU3RhdGUpOgorCiAyMDIwLTA0LTA2ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFz ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIE1ha2UgUmVuZGVyT2JqZWN0IFRleHRTdHJlYW0tbG9n Z2FibGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cKaW5kZXggYzU1YjQ4NzM1NjllZDQ3NzExYzA2MGYzZGM1OGRiMDM0YmUwNjAy Ni4uMWJiNjEzZDBhYThjMmE4NTM0ZDQ4YjMxODhkZGNlMTNmOTYzNmU2MyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNSBAQAorMjAyMC0wNC0wNyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFw cGxlLmNvbT4KKworICAgICAgICBVc2UgUmVjdEVkZ2VzPD4gaW4gc29tZSBzY3JvbGxpbmcgdHJl ZSBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MTAxNDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisg ICAgICAgIENvbnN0cnVjdCBhIFJlY3RFZGdlczw+LiBPcmRlciBpcyB0b3AsIHJpZ2h0LCBib3R0 b20sIGxlZnQuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvRXZlbnREaXNwYXRjaGVy LmNwcDoKKyAgICAgICAgKFdlYktpdDo6RXZlbnREaXNwYXRjaGVyOjp3aGVlbEV2ZW50KToKKwog MjAyMC0wNC0wNiAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBsZS5jb20+CiAKICAgICAgICAgQ3Jh c2hUcmFjZXI6IE1vYmlsZVNhZmFyaSBhdCBXZWJLaXQ6IFdlYktpdDo6U3lzdGVtUHJldmlld0Nv bnRyb2xsZXI6OnVwZGF0ZVByb2dyZXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xs aW5nL1Njcm9sbGluZ1RyZWUuY3BwCmluZGV4IDlmNzMxOTU2OTkzOGM5YjI1MzY4NzBiNmY2YzRl MzExMjQ4ZTIwM2EuLmVmNzE2NDVhMTEwYWIwMDM3NDUzY2U2MGU3NWFlMjgzMDU3NGU1NDUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuY3BwCkBA IC0zODMsMjQgKzM4MywxOCBAQCB2b2lkIFNjcm9sbGluZ1RyZWU6OnNldE1haW5GcmFtZUlzU2Ny b2xsU25hcHBpbmcoYm9vbCBpc1Njcm9sbFNuYXBwaW5nKQogICAgIG1fdHJlZVN0YXRlLm1haW5G cmFtZUlzU2Nyb2xsU25hcHBpbmcgPSBpc1Njcm9sbFNuYXBwaW5nOwogfQogCi12b2lkIFNjcm9s bGluZ1RyZWU6OnNldE1haW5GcmFtZVBpblN0YXRlKGJvb2wgcGlubmVkVG9UaGVMZWZ0LCBib29s IHBpbm5lZFRvVGhlUmlnaHQsIGJvb2wgcGlubmVkVG9UaGVUb3AsIGJvb2wgcGlubmVkVG9UaGVC b3R0b20pCit2b2lkIFNjcm9sbGluZ1RyZWU6OnNldE1haW5GcmFtZVBpbm5lZFN0YXRlKFJlY3RF ZGdlczxib29sPiBlZGdlUGlubmluZ1N0YXRlKQogewogICAgIExvY2tIb2xkZXIgbG9ja2VyKG1f c3dpcGVTdGF0ZU11dGV4KTsKIAotICAgIG1fc3dpcGVTdGF0ZS5tYWluRnJhbWVQaW5uZWRUb1Ro ZUxlZnQgPSBwaW5uZWRUb1RoZUxlZnQ7Ci0gICAgbV9zd2lwZVN0YXRlLm1haW5GcmFtZVBpbm5l ZFRvVGhlUmlnaHQgPSBwaW5uZWRUb1RoZVJpZ2h0OwotICAgIG1fc3dpcGVTdGF0ZS5tYWluRnJh bWVQaW5uZWRUb1RoZVRvcCA9IHBpbm5lZFRvVGhlVG9wOwotICAgIG1fc3dpcGVTdGF0ZS5tYWlu RnJhbWVQaW5uZWRUb1RoZUJvdHRvbSA9IHBpbm5lZFRvVGhlQm90dG9tOworICAgIG1fc3dpcGVT dGF0ZS5tYWluRnJhbWVQaW5uZWRTdGF0ZSA9IGVkZ2VQaW5uaW5nU3RhdGU7CiB9CiAKLXZvaWQg U2Nyb2xsaW5nVHJlZTo6c2V0Q2FuUnViYmVyQmFuZFN0YXRlKGJvb2wgY2FuUnViYmVyQmFuZEF0 TGVmdCwgYm9vbCBjYW5SdWJiZXJCYW5kQXRSaWdodCwgYm9vbCBjYW5SdWJiZXJCYW5kQXRUb3As IGJvb2wgY2FuUnViYmVyQmFuZEF0Qm90dG9tKQordm9pZCBTY3JvbGxpbmdUcmVlOjpzZXRNYWlu RnJhbWVDYW5SdWJiZXJCYW5kKFJlY3RFZGdlczxib29sPiBjYW5SdWJiZXJCYW5kKQogewogICAg IExvY2tIb2xkZXIgbG9ja2VyKG1fc3dpcGVTdGF0ZU11dGV4KTsKIAotICAgIG1fc3dpcGVTdGF0 ZS5ydWJiZXJCYW5kc0F0TGVmdCA9IGNhblJ1YmJlckJhbmRBdExlZnQ7Ci0gICAgbV9zd2lwZVN0 YXRlLnJ1YmJlckJhbmRzQXRSaWdodCA9IGNhblJ1YmJlckJhbmRBdFJpZ2h0OwotICAgIG1fc3dp cGVTdGF0ZS5ydWJiZXJCYW5kc0F0VG9wID0gY2FuUnViYmVyQmFuZEF0VG9wOwotICAgIG1fc3dp cGVTdGF0ZS5ydWJiZXJCYW5kc0F0Qm90dG9tID0gY2FuUnViYmVyQmFuZEF0Qm90dG9tOworICAg IG1fc3dpcGVTdGF0ZS5jYW5SdWJiZXJCYW5kID0gY2FuUnViYmVyQmFuZDsKIH0KIAogLy8gQ2Fu IGJlIGNhbGxlZCBmcm9tIHRoZSBtYWluIHRocmVhZC4KQEAgLTQyNSwxMyArNDE5LDEzIEBAIGJv b2wgU2Nyb2xsaW5nVHJlZTo6d2lsbFdoZWVsRXZlbnRTdGFydFN3aXBlR2VzdHVyZShjb25zdCBQ bGF0Zm9ybVdoZWVsRXZlbnQmIHdoCiAKICAgICBMb2NrSG9sZGVyIGxvY2sobV9zd2lwZVN0YXRl TXV0ZXgpOwogCi0gICAgaWYgKHdoZWVsRXZlbnQuZGVsdGFYKCkgPiAwICYmIG1fc3dpcGVTdGF0 ZS5tYWluRnJhbWVQaW5uZWRUb1RoZUxlZnQgJiYgIW1fc3dpcGVTdGF0ZS5ydWJiZXJCYW5kc0F0 TGVmdCkKKyAgICBpZiAod2hlZWxFdmVudC5kZWx0YVgoKSA+IDAgJiYgbV9zd2lwZVN0YXRlLm1h aW5GcmFtZVBpbm5lZFN0YXRlLmxlZnQoKSAmJiAhbV9zd2lwZVN0YXRlLmNhblJ1YmJlckJhbmQu bGVmdCgpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICBpZiAod2hlZWxFdmVudC5kZWx0YVgo KSA8IDAgJiYgbV9zd2lwZVN0YXRlLm1haW5GcmFtZVBpbm5lZFRvVGhlUmlnaHQgJiYgIW1fc3dp cGVTdGF0ZS5ydWJiZXJCYW5kc0F0UmlnaHQpCisgICAgaWYgKHdoZWVsRXZlbnQuZGVsdGFYKCkg PCAwICYmIG1fc3dpcGVTdGF0ZS5tYWluRnJhbWVQaW5uZWRTdGF0ZS5yaWdodCgpICYmICFtX3N3 aXBlU3RhdGUuY2FuUnViYmVyQmFuZC5yaWdodCgpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKLSAg ICBpZiAod2hlZWxFdmVudC5kZWx0YVkoKSA+IDAgJiYgbV9zd2lwZVN0YXRlLm1haW5GcmFtZVBp bm5lZFRvVGhlVG9wICYmICFtX3N3aXBlU3RhdGUucnViYmVyQmFuZHNBdFRvcCkKKyAgICBpZiAo d2hlZWxFdmVudC5kZWx0YVkoKSA+IDAgJiYgbV9zd2lwZVN0YXRlLm1haW5GcmFtZVBpbm5lZFN0 YXRlLnRvcCgpICYmICFtX3N3aXBlU3RhdGUuY2FuUnViYmVyQmFuZC50b3AoKSkKICAgICAgICAg cmV0dXJuIHRydWU7Ci0gICAgaWYgKHdoZWVsRXZlbnQuZGVsdGFZKCkgPCAwICYmIG1fc3dpcGVT dGF0ZS5tYWluRnJhbWVQaW5uZWRUb1RoZUJvdHRvbSAmJiAhbV9zd2lwZVN0YXRlLnJ1YmJlckJh bmRzQXRCb3R0b20pCisgICAgaWYgKHdoZWVsRXZlbnQuZGVsdGFZKCkgPCAwICYmIG1fc3dpcGVT dGF0ZS5tYWluRnJhbWVQaW5uZWRTdGF0ZS5ib3R0b20oKSAmJiAhbV9zd2lwZVN0YXRlLmNhblJ1 YmJlckJhbmQuYm90dG9tKCkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgcmV0dXJuIGZh bHNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5n VHJlZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5oCmlu ZGV4IDVmNjg5Mzg3NzU2NmNhZDU3Mjg2OWMwMmM2NzRmM2RiZTEyZmIzMTIuLjk0MDYzYjM0NDc1 ZTgxZjI3YzliZDZjNzMyOGY5ZmJjYjVlMzBiZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmgKQEAgLTI4LDYgKzI4LDcgQEAKICNpZiBFTkFCTEUo QVNZTkNfU0NST0xMSU5HKQogCiAjaW5jbHVkZSAiUGxhdGZvcm1XaGVlbEV2ZW50LmgiCisjaW5j bHVkZSAiUmVjdEVkZ2VzLmgiCiAjaW5jbHVkZSAiUmVnaW9uLmgiCiAjaW5jbHVkZSAiU2Nyb2xs aW5nQ29vcmRpbmF0b3IuaCIKICNpbmNsdWRlICJXaGVlbEV2ZW50VGVzdE1vbml0b3IuaCIKQEAg LTExOCwxMCArMTE5LDEwIEBAIHB1YmxpYzoKICAgICBXRUJDT1JFX0VYUE9SVCB2aXJ0dWFsIHZv aWQgY3VycmVudFNuYXBQb2ludEluZGljZXNEaWRDaGFuZ2UoU2Nyb2xsaW5nTm9kZUlELCB1bnNp Z25lZCBob3Jpem9udGFsLCB1bnNpZ25lZCB2ZXJ0aWNhbCkgPSAwOwogI2VuZGlmCiAKLSAgICB2 b2lkIHNldE1haW5GcmFtZVBpblN0YXRlKGJvb2wgcGlubmVkVG9UaGVMZWZ0LCBib29sIHBpbm5l ZFRvVGhlUmlnaHQsIGJvb2wgcGlubmVkVG9UaGVUb3AsIGJvb2wgcGlubmVkVG9UaGVCb3R0b20p OworICAgIHZvaWQgc2V0TWFpbkZyYW1lUGlubmVkU3RhdGUoUmVjdEVkZ2VzPGJvb2w+KTsKIAog ICAgIC8vIENhbiBiZSBjYWxsZWQgZnJvbSBhbnkgdGhyZWFkLiBXaWxsIHVwZGF0ZSB3aGF0IGVk Z2VzIGFsbG93IHJ1YmJlci1iYW5kaW5nLgotICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc2V0Q2Fu UnViYmVyQmFuZFN0YXRlKGJvb2wgY2FuUnViYmVyQmFuZEF0TGVmdCwgYm9vbCBjYW5SdWJiZXJC YW5kQXRSaWdodCwgYm9vbCBjYW5SdWJiZXJCYW5kQXRUb3AsIGJvb2wgY2FuUnViYmVyQmFuZEF0 Qm90dG9tKTsKKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldE1haW5GcmFtZUNhblJ1YmJlckJh bmQoUmVjdEVkZ2VzPGJvb2w+KTsKIAogICAgIGJvb2wgaXNIYW5kbGluZ1Byb2dyYW1tYXRpY1Nj cm9sbCgpIGNvbnN0IHsgcmV0dXJuIG1faXNIYW5kbGluZ1Byb2dyYW1tYXRpY1Njcm9sbDsgfQog ICAgIHZvaWQgc2V0SXNIYW5kbGluZ1Byb2dyYW1tYXRpY1Njcm9sbChib29sIGlzSGFuZGxpbmdQ cm9ncmFtbWF0aWNTY3JvbGwpIHsgbV9pc0hhbmRsaW5nUHJvZ3JhbW1hdGljU2Nyb2xsID0gaXNI YW5kbGluZ1Byb2dyYW1tYXRpY1Njcm9sbDsgfQpAQCAtMjEyLDEwICsyMTMsOSBAQCBwcml2YXRl OgogICAgICAgICBib29sIHJ1YmJlckJhbmRzQXRSaWdodCB7IHRydWUgfTsKICAgICAgICAgYm9v bCBydWJiZXJCYW5kc0F0VG9wIHsgdHJ1ZSB9OwogICAgICAgICBib29sIHJ1YmJlckJhbmRzQXRC b3R0b20geyB0cnVlIH07Ci0gICAgICAgIGJvb2wgbWFpbkZyYW1lUGlubmVkVG9UaGVMZWZ0IHsg dHJ1ZSB9OwotICAgICAgICBib29sIG1haW5GcmFtZVBpbm5lZFRvVGhlUmlnaHQgeyB0cnVlIH07 Ci0gICAgICAgIGJvb2wgbWFpbkZyYW1lUGlubmVkVG9UaGVUb3AgeyB0cnVlIH07Ci0gICAgICAg IGJvb2wgbWFpbkZyYW1lUGlubmVkVG9UaGVCb3R0b20geyB0cnVlIH07CisgICAgICAgIAorICAg ICAgICBSZWN0RWRnZXM8Ym9vbD4gY2FuUnViYmVyQmFuZCAgeyB0cnVlLCB0cnVlLCB0cnVlLCB0 cnVlIH07CisgICAgICAgIFJlY3RFZGdlczxib29sPiBtYWluRnJhbWVQaW5uZWRTdGF0ZSB7IHRy dWUsIHRydWUsIHRydWUsIHRydWUgfTsKICAgICB9OwogCiAgICAgTG9jayBtX3N3aXBlU3RhdGVN dXRleDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGlu Z1RyZWVTY3JvbGxpbmdOb2RlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Nj cm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlLmNwcAppbmRleCBlOGU2N2U5MGJhODg2MmZiZDAyZDJk MTljODI3ZGQ1YzlkNWQzZjM4Li5kY2IwYTA5NDZkYWYzZTNmZWEwMjRhODYyNjFhODZiYzg5Njcx MjNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdU cmVlU2Nyb2xsaW5nTm9kZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv U2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUuY3BwCkBAIC0xNTEsNiArMTUxLDMzIEBAIGJvb2wg U2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGU6OnNjcm9sbExpbWl0UmVhY2hlZChjb25zdCBQbGF0 Zm9ybVdoZWVsRXZlbnQmIHdoCiAgICAgcmV0dXJuIG5ld1Njcm9sbFBvc2l0aW9uID09IG9sZFNj cm9sbFBvc2l0aW9uOwogfQogCitSZWN0RWRnZXM8Ym9vbD4gU2Nyb2xsaW5nVHJlZVNjcm9sbGlu Z05vZGU6OmVkZ2VQaW5uZWRTdGF0ZSgpIGNvbnN0Cit7CisgICAgYXV0byBzY3JvbGxQb3NpdGlv biA9IGN1cnJlbnRTY3JvbGxQb3NpdGlvbigpOworICAgIGF1dG8gbWluU2Nyb2xsUG9zaXRpb24g PSBtaW5pbXVtU2Nyb2xsUG9zaXRpb24oKTsKKyAgICBhdXRvIG1heFNjcm9sbFBvc2l0aW9uID0g bWF4aW11bVNjcm9sbFBvc2l0aW9uKCk7CisKKyAgICAvLyBUb3AsIHJpZ2h0LCBib3R0b20sIGxl ZnQuCisgICAgcmV0dXJuIHsKKyAgICAgICAgc2Nyb2xsUG9zaXRpb24ueSgpIDw9IG1pblNjcm9s bFBvc2l0aW9uLnkoKSwKKyAgICAgICAgc2Nyb2xsUG9zaXRpb24ueCgpID49IG1heFNjcm9sbFBv c2l0aW9uLngoKSwKKyAgICAgICAgc2Nyb2xsUG9zaXRpb24ueSgpID49IG1heFNjcm9sbFBvc2l0 aW9uLnkoKSwKKyAgICAgICAgc2Nyb2xsUG9zaXRpb24ueCgpIDw9IG1pblNjcm9sbFBvc2l0aW9u LngoKQorICAgIH07Cit9CisKK2Jvb2wgU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGU6OmlzUnVi YmVyQmFuZGluZygpIGNvbnN0Cit7CisgICAgYXV0byBzY3JvbGxQb3NpdGlvbiA9IGN1cnJlbnRT Y3JvbGxQb3NpdGlvbigpOworICAgIGF1dG8gbWluU2Nyb2xsUG9zaXRpb24gPSBtaW5pbXVtU2Ny b2xsUG9zaXRpb24oKTsKKyAgICBhdXRvIG1heFNjcm9sbFBvc2l0aW9uID0gbWF4aW11bVNjcm9s bFBvc2l0aW9uKCk7CisKKyAgICByZXR1cm4gc2Nyb2xsUG9zaXRpb24ueCgpIDwgbWluU2Nyb2xs UG9zaXRpb24ueCgpCisgICAgICAgIHx8IHNjcm9sbFBvc2l0aW9uLngoKSA+IG1heFNjcm9sbFBv c2l0aW9uLngoKQorICAgICAgICB8fCBzY3JvbGxQb3NpdGlvbi55KCkgPCBtaW5TY3JvbGxQb3Np dGlvbi55KCkKKyAgICAgICAgfHwgc2Nyb2xsUG9zaXRpb24ueSgpID4gbWF4U2Nyb2xsUG9zaXRp b24ueSgpOworfQorCiBGbG9hdFBvaW50IFNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlOjphZGp1 c3RlZFNjcm9sbFBvc2l0aW9uKGNvbnN0IEZsb2F0UG9pbnQmIHNjcm9sbFBvc2l0aW9uLCBTY3Jv bGxDbGFtcGluZyBjbGFtcGluZykgY29uc3QKIHsKICAgICBpZiAoY2xhbXBpbmcgPT0gU2Nyb2xs Q2xhbXBpbmc6OkNsYW1wZWQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9s bGluZy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9z Y3JvbGxpbmcvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUuaAppbmRleCBlODk1YzZkODAzMzY0 MTZjN2JmNWZiMDhlMzFjODEwYjA2ZWZlOWM5Li5hMmMwMjFlZmQwYzMyMDljZWE3MmQzMjVmZmIw YTdjMmU0OGZlYWYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9T Y3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Ny b2xsaW5nL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlLmgKQEAgLTI4LDYgKzI4LDcgQEAKICNp ZiBFTkFCTEUoQVNZTkNfU0NST0xMSU5HKQogCiAjaW5jbHVkZSAiSW50UmVjdC5oIgorI2luY2x1 ZGUgIlJlY3RFZGdlcy5oIgogI2luY2x1ZGUgIlNjcm9sbFNuYXBPZmZzZXRzSW5mby5oIgogI2lu Y2x1ZGUgIlNjcm9sbFR5cGVzLmgiCiAjaW5jbHVkZSAiU2Nyb2xsYWJsZUFyZWEuaCIKQEAgLTU4 LDYgKzU5LDkgQEAgcHVibGljOgogICAgIEZsb2F0UG9pbnQgY3VycmVudFNjcm9sbE9mZnNldCgp IGNvbnN0IHsgcmV0dXJuIFNjcm9sbGFibGVBcmVhOjpzY3JvbGxPZmZzZXRGcm9tUG9zaXRpb24o bV9jdXJyZW50U2Nyb2xsUG9zaXRpb24sIHRvRmxvYXRTaXplKG1fc2Nyb2xsT3JpZ2luKSk7IH0K ICAgICBGbG9hdFBvaW50IGxhc3RDb21taXR0ZWRTY3JvbGxQb3NpdGlvbigpIGNvbnN0IHsgcmV0 dXJuIG1fbGFzdENvbW1pdHRlZFNjcm9sbFBvc2l0aW9uOyB9CiAgICAgRmxvYXRTaXplIHNjcm9s bERlbHRhU2luY2VMYXN0Q29tbWl0KCkgY29uc3QgeyByZXR1cm4gbV9jdXJyZW50U2Nyb2xsUG9z aXRpb24gLSBtX2xhc3RDb21taXR0ZWRTY3JvbGxQb3NpdGlvbjsgfQorICAgIAorICAgIFJlY3RF ZGdlczxib29sPiBlZGdlUGlubmVkU3RhdGUoKSBjb25zdDsKKyAgICBib29sIGlzUnViYmVyQmFu ZGluZygpIGNvbnN0OwogCiAgICAgLy8gVGhlc2UgYXJlIGltcGVyYXRpdmU7IHRoZXkgYWRqdXN0 IHRoZSBzY3JvbGxpbmcgbGF5ZXJzLgogICAgIHZvaWQgc2Nyb2xsVG8oY29uc3QgRmxvYXRQb2lu dCYsIFNjcm9sbFR5cGUgPSBTY3JvbGxUeXBlOjpVc2VyLCBTY3JvbGxDbGFtcGluZyA9IFNjcm9s bENsYW1waW5nOjpDbGFtcGVkKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Ny b2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlTWFjLm1tIGIvU291cmNl L1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05v ZGVNYWMubW0KaW5kZXggYWJhYWE3NzUxMDk3YmVkNDM5ODAxM2YyMDQzMDczMWFiMmEyYzYxMS4u NDkzZTc3Y2Y5NTJkNGE0MjRiNTc4ZTlkNzBkNDBlMzdhM2M2MmZjZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGlu Z05vZGVNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9s bGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVNYWMubW0KQEAgLTI2MCwyMCArMjYwLDggQEAgdm9p ZCBTY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlTWFjOjp1cGRhdGVNYWluRnJhbWVQaW5B bmRSdWJiZXJiYW5kU3RhdGUoKQogewogICAgIEFTU0VSVChpc1Jvb3ROb2RlKCkpOwogCi0gICAg YXV0byBzY3JvbGxQb3NpdGlvbiA9IGN1cnJlbnRTY3JvbGxQb3NpdGlvbigpOwotICAgIGJvb2wg cGlubmVkVG9UaGVMZWZ0ID0gc2Nyb2xsUG9zaXRpb24ueCgpIDw9IG1pbmltdW1TY3JvbGxQb3Np dGlvbigpLngoKTsKLSAgICBib29sIHBpbm5lZFRvVGhlUmlnaHQgPSBzY3JvbGxQb3NpdGlvbi54 KCkgPj0gbWF4aW11bVNjcm9sbFBvc2l0aW9uKCkueCgpOwotICAgIGJvb2wgcGlubmVkVG9UaGVU b3AgPSBzY3JvbGxQb3NpdGlvbi55KCkgPD0gbWluaW11bVNjcm9sbFBvc2l0aW9uKCkueSgpOwot ICAgIGJvb2wgcGlubmVkVG9UaGVCb3R0b20gPSBzY3JvbGxQb3NpdGlvbi55KCkgPj0gbWF4aW11 bVNjcm9sbFBvc2l0aW9uKCkueSgpOwotCi0gICAgc2Nyb2xsaW5nVHJlZSgpLnNldE1haW5GcmFt ZVBpblN0YXRlKHBpbm5lZFRvVGhlTGVmdCwgcGlubmVkVG9UaGVSaWdodCwgcGlubmVkVG9UaGVU b3AsIHBpbm5lZFRvVGhlQm90dG9tKTsKLQotICAgIGJvb2wgcnViYmVyYmFuZGluZyA9IHNjcm9s bFBvc2l0aW9uLngoKSA8IG1pbmltdW1TY3JvbGxQb3NpdGlvbigpLngoKQotICAgICAgICB8fCBz Y3JvbGxQb3NpdGlvbi54KCkgPiBtYXhpbXVtU2Nyb2xsUG9zaXRpb24oKS54KCkKLSAgICAgICAg fHwgc2Nyb2xsUG9zaXRpb24ueSgpIDwgbWluaW11bVNjcm9sbFBvc2l0aW9uKCkueSgpCi0gICAg ICAgIHx8IHNjcm9sbFBvc2l0aW9uLnkoKSA+IG1heGltdW1TY3JvbGxQb3NpdGlvbigpLnkoKTsK LSAgICAKLSAgICBzY3JvbGxpbmdUcmVlKCkuc2V0TWFpbkZyYW1lSXNSdWJiZXJCYW5kaW5nKHJ1 YmJlcmJhbmRpbmcpOworICAgIHNjcm9sbGluZ1RyZWUoKS5zZXRNYWluRnJhbWVQaW5uZWRTdGF0 ZShlZGdlUGlubmVkU3RhdGUoKSk7CisgICAgc2Nyb2xsaW5nVHJlZSgpLnNldE1haW5GcmFtZUlz UnViYmVyQmFuZGluZyhpc1J1YmJlckJhbmRpbmcoKSk7CiB9CiAKIHVuc2lnbmVkIFNjcm9sbGlu Z1RyZWVGcmFtZVNjcm9sbGluZ05vZGVNYWM6OmV4cG9zZWRVbmZpbGxlZEFyZWEoKSBjb25zdApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvRXZlbnREaXNwYXRj aGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0V2ZW50RGlzcGF0Y2hl ci5jcHAKaW5kZXggNzQ0ZjYyOTk4NjY0YWM5OGIzMzZlODk4ZDZjYTU3MTdmN2FhYzg5MC4uN2Rk ODBhNDMyYjM1OTBiNmI1MWVmNmYxMjQyMmZiZDRlYzRiNGUzYSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvRXZlbnREaXNwYXRjaGVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9FdmVudERpc3BhdGNoZXIuY3BwCkBAIC0xMjQs NyArMTI0LDcgQEAgdm9pZCBFdmVudERpc3BhdGNoZXI6OndoZWVsRXZlbnQoUGFnZUlkZW50aWZp ZXIgcGFnZUlELCBjb25zdCBXZWJXaGVlbEV2ZW50JiB3aGUKICAgICAgICAgLy8gc2Nyb2xsaW5n IHRyZWUgY2FuIGJlIG5vdGlmaWVkLgogICAgICAgICAvLyBXZSBvbmx5IG5lZWQgdG8gZG8gdGhp cyBhdCB0aGUgYmVnaW5uaW5nIG9mIHRoZSBnZXN0dXJlLgogICAgICAgICBpZiAocGxhdGZvcm1X aGVlbEV2ZW50LnBoYXNlKCkgPT0gUGxhdGZvcm1XaGVlbEV2ZW50UGhhc2VCZWdhbikKLSAgICAg ICAgICAgIHNjcm9sbGluZ1RyZWUtPnNldENhblJ1YmJlckJhbmRTdGF0ZShjYW5SdWJiZXJCYW5k QXRMZWZ0LCBjYW5SdWJiZXJCYW5kQXRSaWdodCwgY2FuUnViYmVyQmFuZEF0VG9wLCBjYW5SdWJi ZXJCYW5kQXRCb3R0b20pOworICAgICAgICAgICAgc2Nyb2xsaW5nVHJlZS0+c2V0TWFpbkZyYW1l Q2FuUnViYmVyQmFuZCh7IGNhblJ1YmJlckJhbmRBdFRvcCwgY2FuUnViYmVyQmFuZEF0UmlnaHQs IGNhblJ1YmJlckJhbmRBdEJvdHRvbSwgY2FuUnViYmVyQmFuZEF0TGVmdCB9KTsKIAogICAgICAg ICBTY3JvbGxpbmdFdmVudFJlc3VsdCByZXN1bHQgPSBzY3JvbGxpbmdUcmVlLT50cnlUb0hhbmRs ZVdoZWVsRXZlbnQocGxhdGZvcm1XaGVlbEV2ZW50KTsKIAo=