231087 2021-10-01 11:17:52 -0700 Further cleanup of macOS rubberbanding code 2021-10-01 13:54:30 -0700 1 1 1 Unclassified WebKit Scrolling WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser simon.fraser webkit-bug-importer zalan oldest_to_newest 1799411 0 simon.fraser 2021-10-01 11:17:52 -0700 Further cleanup of macOS rubberbanding code 1799412 1 439879 simon.fraser 2021-10-01 11:18:44 -0700 Created attachment 439879 Patch 1799497 2 ews-feeder 2021-10-01 13:25:56 -0700 Committed r283393 (242397@main): <https://commits.webkit.org/242397@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 439879. 1799498 3 webkit-bug-importer 2021-10-01 13:26:19 -0700 <rdar://problem/83779552> 439879 2021-10-01 11:18:44 -0700 2021-10-01 13:54:30 -0700 Patch bug-231087-20211001111843.patch text/plain 15428 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzMzU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjFmYTAwZmU3Y2MwODFk ZjNjOTkwMmY3ZDU5N2JkOWQzNzY4ODk3Zi4uMjA2M2QzNzQ3YTJjM2ViYTEzMjdkMDFiNTBiNjZj M2Y3NmQxOTMzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTEwLTAxICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEZ1cnRoZXIgY2xl YW51cCBvZiBtYWNPUyBydWJiZXJiYW5kaW5nIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMTA4NworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFNwbGl0IGNodW5rcyBvZiBydWJiZXItYmFuZGluZyBs b2dpYyBpbnRvIHRoZWlyIG93biBmdW5jdGlvbnMgZm9yIGNsYXJpdHksCisgICAgICAgIHNlcGFy YXRpbmcgdGhlICJjb21wdXRlIHRoZSBkZWx0YSIgYW5kICJhcHBseSB0aGUgZGVsdGEiIHBhcnRz LgorCisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXIuaDoKKyAg ICAgICAgKiBwbGF0Zm9ybS9tYWMvU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXIubW06CisgICAg ICAgIChXZWJDb3JlOjpTY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlcjo6aGFuZGxlV2hlZWxFdmVu dCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlcjo6bW9kaWZ5 U2Nyb2xsRGVsdGFGb3JTdHJldGNoaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ0Vm ZmVjdHNDb250cm9sbGVyOjphcHBseVNjcm9sbERlbHRhV2l0aFN0cmV0Y2hpbmcpOgorCiAyMDIx LTA5LTMwICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAg IFJlbmFtZSBzbmFwUnViYmVyQmFuZCgpIHRvIGhhdmUgYSBjbGVhcmVyIG5hbWUKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlci5oCmlu ZGV4IGY3MTNhNDVkOGI0ZGM2NjdjYWViYmU0YThkYmJhYzBiYzE1ODE2NmMuLmMzZGQxNjMwN2Nh ZTQxNTExYTE3MTlhZjA5NDFjYTFjOTUyYmY2NTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL1Njcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXIuaApAQCAtMTk4LDYgKzE5OCw5 IEBAIHByaXZhdGU6CiAgICAgdm9pZCBzdGFydERlZmVycmluZ1doZWVsRXZlbnRUZXN0Q29tcGxl dGlvbkR1ZVRvU2Nyb2xsU25hcHBpbmcoKTsKICAgICB2b2lkIHN0b3BEZWZlcnJpbmdXaGVlbEV2 ZW50VGVzdENvbXBsZXRpb25EdWVUb1Njcm9sbFNuYXBwaW5nKCk7CiAKKyAgICBib29sIG1vZGlm eVNjcm9sbERlbHRhRm9yU3RyZXRjaGluZyhjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmLCBGbG9h dFNpemUmLCBib29sIGlzSG9yaXpvbnRhbGx5U3RyZXRjaGVkLCBib29sIGlzVmVydGljYWxseVN0 cmV0Y2hlZCk7CisgICAgYm9vbCBhcHBseVNjcm9sbERlbHRhV2l0aFN0cmV0Y2hpbmcoY29uc3Qg UGxhdGZvcm1XaGVlbEV2ZW50JiwgRmxvYXRTaXplLCBib29sIGlzSG9yaXpvbnRhbGx5U3RyZXRj aGVkLCBib29sIGlzVmVydGljYWxseVN0cmV0Y2hlZCk7CisKICAgICB2b2lkIHN0YXJ0UnViYmVy YmFuZEFuaW1hdGlvbklmTmVjZXNzYXJ5KCk7CiAgICAgdm9pZCBzdGFydFJ1YmJlcmJhbmRBbmlt YXRpb24oKTsKICAgICB2b2lkIHN0b3BSdWJiZXJiYW5kQW5pbWF0aW9uKCk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXIu bW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xs ZXIubW0KaW5kZXggZDYzMmEzN2M2NzNjZWE3ZDljMzYwNzAwODlmNTZjZTE4YWYyNzQxNi4uZGU1 NTViMjgyMzE5YWJlMjk0M2I4ZGFkNWFkZmVhMmQwOGYwZGI3MiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyLm1tCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlci5t bQpAQCAtMTc2LDE0MiArMTc2LDU2IEBAIGJvb2wgU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXI6 OmhhbmRsZVdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiB3aGVlCiAgICAgICAg IHJldHVybiBmYWxzZTsKICAgICB9CiAKLSAgICAvLyBSZXNldCB1bmFwcGxpZWQgb3ZlcnNjcm9s bCBiZWNhdXNlIHdlIG1heSBkZWNpZGUgdG8gcmVtb3ZlIGRlbHRhIGF0IHZhcmlvdXMgcG9pbnRz IGFuZCBwdXQgaXQgaW50byB0aGlzIHZhbHVlLgotICAgIGF1dG8gZGVsdGEgPSBzdGQ6OmV4Y2hh bmdlKG1fdW5hcHBsaWVkT3ZlcnNjcm9sbERlbHRhLCB7IH0pOwotCiAgICAgSW50U2l6ZSBzdHJl dGNoQW1vdW50ID0gbV9jbGllbnQuc3RyZXRjaEFtb3VudCgpOwogICAgIGJvb2wgaXNWZXJ0aWNh bGx5U3RyZXRjaGVkID0gc3RyZXRjaEFtb3VudC5oZWlnaHQoKTsKICAgICBib29sIGlzSG9yaXpv bnRhbGx5U3RyZXRjaGVkID0gc3RyZXRjaEFtb3VudC53aWR0aCgpOwogCi0gICAgYXV0byBldmVu dENvYWxlc2NlZERlbHRhID0gKGlzVmVydGljYWxseVN0cmV0Y2hlZCB8fCBpc0hvcml6b250YWxs eVN0cmV0Y2hlZCkgPyAtd2hlZWxFdmVudC51bmFjY2VsZXJhdGVkU2Nyb2xsaW5nRGVsdGEoKSA6 IC13aGVlbEV2ZW50LmRlbHRhKCk7Ci0gICAgZGVsdGEgKz0gZXZlbnRDb2FsZXNjZWREZWx0YTsK LQotICAgIC8vIEZJWE1FOiBBbGwgb2YgdGhlIGNvZGUgYmVsb3cgY291bGQgYmUgc2ltcGxpZmll ZCBzaW5jZSBwcmVkb21pbmFudEF4aXMgaXMga25vd24sIGFuZCB3ZSB6ZXJvIG91dCB0aGUgZGVs dGEgb24gdGhlIG90aGVyIGF4aXMuCi0gICAgYXV0byBhZmZlY3RlZFNpZGUgPSBhZmZlY3RlZFNp ZGVPbkRvbWluYW50QXhpcyhkZWx0YSk7Ci0KLSAgICBmbG9hdCBkZWx0YVggPSBkZWx0YS53aWR0 aCgpOwotICAgIGZsb2F0IGRlbHRhWSA9IGRlbHRhLmhlaWdodCgpOworICAgIC8vIE11Y2ggb2Yg dGhpcyBjb2RlLCBpbmNsdWRpbmcgdGhpcyB1c2Ugb2YgdW5hY2NlbGVyYXRlZCBkZWx0YXMgd2hl biBzdHJldGNoZWQsIGlzIGJhc2VkIG9uIEFwcEtpdCBiZWhhdmlvci4KKyAgICBhdXRvIGV2ZW50 RGVsdGEgPSAoaXNWZXJ0aWNhbGx5U3RyZXRjaGVkIHx8IGlzSG9yaXpvbnRhbGx5U3RyZXRjaGVk KSA/IC13aGVlbEV2ZW50LnVuYWNjZWxlcmF0ZWRTY3JvbGxpbmdEZWx0YSgpIDogLXdoZWVsRXZl bnQuZGVsdGEoKTsKIAotICAgIGJvb2wgc2hvdWxkU3RyZXRjaCA9IGZhbHNlOworICAgIC8vIFJl c2V0IHVuYXBwbGllZCBvdmVyc2Nyb2xsIGJlY2F1c2Ugd2UgbWF5IGRlY2lkZSB0byByZW1vdmUg ZGVsdGEgYXQgdmFyaW91cyBwb2ludHMgYW5kIHB1dCBpdCBpbnRvIHRoaXMgdmFsdWUuCisgICAg YXV0byBkZWx0YSA9IHN0ZDo6ZXhjaGFuZ2UobV91bmFwcGxpZWRPdmVyc2Nyb2xsRGVsdGEsIHsg fSk7CisgICAgZGVsdGEgKz0gZXZlbnREZWx0YTsKIAogICAgIGF1dG8gbW9tZW50dW1QaGFzZSA9 IHdoZWVsRXZlbnQubW9tZW50dW1QaGFzZSgpOwotCiAgICAgaWYgKCFtX21vbWVudHVtU2Nyb2xs SW5Qcm9ncmVzcyAmJiAobW9tZW50dW1QaGFzZSA9PSBQbGF0Zm9ybVdoZWVsRXZlbnRQaGFzZTo6 QmVnYW4gfHwgbW9tZW50dW1QaGFzZSA9PSBQbGF0Zm9ybVdoZWVsRXZlbnRQaGFzZTo6Q2hhbmdl ZCkpCiAgICAgICAgIG1fbW9tZW50dW1TY3JvbGxJblByb2dyZXNzID0gdHJ1ZTsKIAorICAgIGJv b2wgc2hvdWxkU3RyZXRjaCA9IGZhbHNlOwogICAgIGF1dG8gdGltZURlbHRhID0gd2hlZWxFdmVu dC50aW1lc3RhbXAoKSAtIG1fbGFzdE1vbWVudHVtU2Nyb2xsVGltZXN0YW1wOwogICAgIGlmICht X2luU2Nyb2xsR2VzdHVyZSB8fCBtX21vbWVudHVtU2Nyb2xsSW5Qcm9ncmVzcykgewogICAgICAg ICBpZiAobV9sYXN0TW9tZW50dW1TY3JvbGxUaW1lc3RhbXAgJiYgdGltZURlbHRhID4gMF9zICYm IHRpbWVEZWx0YSA8IHNjcm9sbFZlbG9jaXR5WmVyb2luZ1RpbWVvdXQpIHsKLSAgICAgICAgICAg IG1fbW9tZW50dW1WZWxvY2l0eSA9IGV2ZW50Q29hbGVzY2VkRGVsdGEgLyB0aW1lRGVsdGEuc2Vj b25kcygpOworICAgICAgICAgICAgbV9tb21lbnR1bVZlbG9jaXR5ID0gZXZlbnREZWx0YSAvIHRp bWVEZWx0YS5zZWNvbmRzKCk7CiAgICAgICAgICAgICBtX2xhc3RNb21lbnR1bVNjcm9sbFRpbWVz dGFtcCA9IHdoZWVsRXZlbnQudGltZXN0YW1wKCk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAg ICAgICBtX2xhc3RNb21lbnR1bVNjcm9sbFRpbWVzdGFtcCA9IHdoZWVsRXZlbnQudGltZXN0YW1w KCk7CiAgICAgICAgICAgICBtX21vbWVudHVtVmVsb2NpdHkgPSB7IH07CiAgICAgICAgIH0KIAot ICAgICAgICBpZiAoaXNWZXJ0aWNhbGx5U3RyZXRjaGVkKSB7Ci0gICAgICAgICAgICBpZiAoIWlz SG9yaXpvbnRhbGx5U3RyZXRjaGVkICYmIGlzSG9yaXpvbnRhbFNpZGUoYWZmZWN0ZWRTaWRlKSAm JiBtX2NsaWVudC5pc1Bpbm5lZE9uU2lkZSgqYWZmZWN0ZWRTaWRlKSkgewotICAgICAgICAgICAg ICAgIC8vIFN0cmV0Y2hpbmcgb25seSBpbiB0aGUgdmVydGljYWwuCi0gICAgICAgICAgICAgICAg aWYgKGRlbHRhWSAmJiAoZmFic2YoZGVsdGFYIC8gZGVsdGFZKSA8IHJ1YmJlcmJhbmREaXJlY3Rp b25Mb2NrU3RyZXRjaFJhdGlvKSkKLSAgICAgICAgICAgICAgICAgICAgZGVsdGFYID0gMDsKLSAg ICAgICAgICAgICAgICBlbHNlIGlmIChmYWJzZihkZWx0YVgpIDwgcnViYmVyYmFuZE1pbmltdW1S ZXF1aXJlZERlbHRhQmVmb3JlU3RyZXRjaCkgewotICAgICAgICAgICAgICAgICAgICBtX3VuYXBw bGllZE92ZXJzY3JvbGxEZWx0YS5leHBhbmQoZGVsdGFYLCAwKTsKLSAgICAgICAgICAgICAgICAg ICAgZGVsdGFYID0gMDsKLSAgICAgICAgICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgICAgICAg ICAgbV91bmFwcGxpZWRPdmVyc2Nyb2xsRGVsdGEuZXhwYW5kKGRlbHRhWCwgMCk7Ci0gICAgICAg ICAgICB9Ci0gICAgICAgIH0gZWxzZSBpZiAoaXNIb3Jpem9udGFsbHlTdHJldGNoZWQpIHsKLSAg ICAgICAgICAgIC8vIFN0cmV0Y2hpbmcgb25seSBpbiB0aGUgaG9yaXpvbnRhbC4KLSAgICAgICAg ICAgIGlmIChpc1ZlcnRpY2FsU2lkZShhZmZlY3RlZFNpZGUpICYmIG1fY2xpZW50LmlzUGlubmVk T25TaWRlKCphZmZlY3RlZFNpZGUpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGRlbHRhWCAmJiAo ZmFic2YoZGVsdGFZIC8gZGVsdGFYKSA8IHJ1YmJlcmJhbmREaXJlY3Rpb25Mb2NrU3RyZXRjaFJh dGlvKSkKLSAgICAgICAgICAgICAgICAgICAgZGVsdGFZID0gMDsKLSAgICAgICAgICAgICAgICBl bHNlIGlmIChmYWJzZihkZWx0YVkpIDwgcnViYmVyYmFuZE1pbmltdW1SZXF1aXJlZERlbHRhQmVm b3JlU3RyZXRjaCkgewotICAgICAgICAgICAgICAgICAgICBtX3VuYXBwbGllZE92ZXJzY3JvbGxE ZWx0YS5leHBhbmQoMCwgZGVsdGFZKTsKLSAgICAgICAgICAgICAgICAgICAgZGVsdGFZID0gMDsK LSAgICAgICAgICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgICAgICAgICAgbV91bmFwcGxpZWRP dmVyc2Nyb2xsRGVsdGEuZXhwYW5kKDAsIGRlbHRhWSk7Ci0gICAgICAgICAgICB9Ci0gICAgICAg IH0gZWxzZSB7Ci0gICAgICAgICAgICAvLyBOb3Qgc3RyZXRjaGluZyBhdCBhbGwgeWV0LgotICAg ICAgICAgICAgaWYgKGFmZmVjdGVkU2lkZSAmJiBtX2NsaWVudC5pc1Bpbm5lZE9uU2lkZSgqYWZm ZWN0ZWRTaWRlKSkgewotICAgICAgICAgICAgICAgIGlmIChmYWJzZihkZWx0YVkpID49IGZhYnNm KGRlbHRhWCkpIHsKLSAgICAgICAgICAgICAgICAgICAgaWYgKGZhYnNmKGRlbHRhWCkgPCBydWJi ZXJiYW5kTWluaW11bVJlcXVpcmVkRGVsdGFCZWZvcmVTdHJldGNoKSB7Ci0gICAgICAgICAgICAg ICAgICAgICAgICBtX3VuYXBwbGllZE92ZXJzY3JvbGxEZWx0YS5leHBhbmQoZGVsdGFYLCAwKTsK LSAgICAgICAgICAgICAgICAgICAgICAgIGRlbHRhWCA9IDA7Ci0gICAgICAgICAgICAgICAgICAg IH0gZWxzZQotICAgICAgICAgICAgICAgICAgICAgICAgbV91bmFwcGxpZWRPdmVyc2Nyb2xsRGVs dGEuZXhwYW5kKGRlbHRhWCwgMCk7Ci0gICAgICAgICAgICAgICAgfQotCi0gICAgICAgICAgICAg ICAgaWYgKCFtX2NsaWVudC5hbGxvd3NIb3Jpem9udGFsU3RyZXRjaGluZyh3aGVlbEV2ZW50KSkK LSAgICAgICAgICAgICAgICAgICAgZGVsdGFYID0gMDsKLQotICAgICAgICAgICAgICAgIGlmICgh bV9jbGllbnQuYWxsb3dzVmVydGljYWxTdHJldGNoaW5nKHdoZWVsRXZlbnQpKQotICAgICAgICAg ICAgICAgICAgICBkZWx0YVkgPSAwOwotCi0gICAgICAgICAgICAgICAgc2hvdWxkU3RyZXRjaCA9 IGRlbHRhWCB8fCBkZWx0YVk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0KKyAgICAgICAgc2hv dWxkU3RyZXRjaCA9IG1vZGlmeVNjcm9sbERlbHRhRm9yU3RyZXRjaGluZyh3aGVlbEV2ZW50LCBk ZWx0YSwgaXNIb3Jpem9udGFsbHlTdHJldGNoZWQsIGlzVmVydGljYWxseVN0cmV0Y2hlZCk7CiAg ICAgfQogCiAgICAgYm9vbCBoYW5kbGVkID0gdHJ1ZTsKIAotICAgIGlmIChkZWx0YVggfHwgZGVs dGFZKSB7Ci0gICAgICAgIGlmICghKHNob3VsZFN0cmV0Y2ggfHwgaXNWZXJ0aWNhbGx5U3RyZXRj aGVkIHx8IGlzSG9yaXpvbnRhbGx5U3RyZXRjaGVkKSkgewotICAgICAgICAgICAgaWYgKGRlbHRh WSkgewotICAgICAgICAgICAgICAgIGRlbHRhWSAqPSBzY3JvbGxXaGVlbE11bHRpcGxpZXIoKTsK LSAgICAgICAgICAgICAgICBtX2NsaWVudC5pbW1lZGlhdGVTY3JvbGxCeShGbG9hdFNpemUoMCwg ZGVsdGFZKSk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBpZiAoZGVsdGFYKSB7Ci0gICAg ICAgICAgICAgICAgZGVsdGFYICo9IHNjcm9sbFdoZWVsTXVsdGlwbGllcigpOwotICAgICAgICAg ICAgICAgIG1fY2xpZW50LmltbWVkaWF0ZVNjcm9sbEJ5KEZsb2F0U2l6ZShkZWx0YVgsIDApKTsK LSAgICAgICAgICAgIH0KLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIGFmZmVjdGVkU2lk ZSA9IGFmZmVjdGVkU2lkZU9uRG9taW5hbnRBeGlzKHsgZGVsdGFYLCBkZWx0YVkgfSk7Ci0gICAg ICAgICAgICBpZiAoZGVsdGFYKSB7Ci0gICAgICAgICAgICAgICAgaWYgKCFtX2NsaWVudC5hbGxv d3NIb3Jpem9udGFsU3RyZXRjaGluZyh3aGVlbEV2ZW50KSkgewotICAgICAgICAgICAgICAgICAg ICBkZWx0YVggPSAwOwotICAgICAgICAgICAgICAgICAgICBldmVudENvYWxlc2NlZERlbHRhLnNl dFdpZHRoKDApOwotICAgICAgICAgICAgICAgICAgICBoYW5kbGVkID0gZmFsc2U7Ci0gICAgICAg ICAgICAgICAgfSBlbHNlIGlmICghaXNIb3Jpem9udGFsbHlTdHJldGNoZWQgJiYgIW1fY2xpZW50 LmlzUGlubmVkT25TaWRlKCphZmZlY3RlZFNpZGUpKSB7Ci0gICAgICAgICAgICAgICAgICAgIGRl bHRhWCAqPSBzY3JvbGxXaGVlbE11bHRpcGxpZXIoKTsKLQotICAgICAgICAgICAgICAgICAgICBt X2NsaWVudC5pbW1lZGlhdGVTY3JvbGxCeVdpdGhvdXRDb250ZW50RWRnZUNvbnN0cmFpbnRzKEZs b2F0U2l6ZShkZWx0YVgsIDApKTsKLSAgICAgICAgICAgICAgICAgICAgZGVsdGFYID0gMDsKLSAg ICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIGlmIChkZWx0YVkp IHsKLSAgICAgICAgICAgICAgICBpZiAoIW1fY2xpZW50LmFsbG93c1ZlcnRpY2FsU3RyZXRjaGlu Zyh3aGVlbEV2ZW50KSkgewotICAgICAgICAgICAgICAgICAgICBkZWx0YVkgPSAwOwotICAgICAg ICAgICAgICAgICAgICBldmVudENvYWxlc2NlZERlbHRhLnNldEhlaWdodCgwKTsKLSAgICAgICAg ICAgICAgICAgICAgaGFuZGxlZCA9IGZhbHNlOwotICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAo IWlzVmVydGljYWxseVN0cmV0Y2hlZCAmJiAhbV9jbGllbnQuaXNQaW5uZWRPblNpZGUoKmFmZmVj dGVkU2lkZSkpIHsKLSAgICAgICAgICAgICAgICAgICAgZGVsdGFZICo9IHNjcm9sbFdoZWVsTXVs dGlwbGllcigpOwotCi0gICAgICAgICAgICAgICAgICAgIG1fY2xpZW50LmltbWVkaWF0ZVNjcm9s bEJ5V2l0aG91dENvbnRlbnRFZGdlQ29uc3RyYWludHMoRmxvYXRTaXplKDAsIGRlbHRhWSkpOwot ICAgICAgICAgICAgICAgICAgICBkZWx0YVkgPSAwOwotICAgICAgICAgICAgICAgIH0KLSAgICAg ICAgICAgIH0KKyAgICBpZiAoIWRlbHRhLmlzWmVybygpKSB7CisgICAgICAgIGlmIChzaG91bGRT dHJldGNoIHx8IGlzVmVydGljYWxseVN0cmV0Y2hlZCB8fCBpc0hvcml6b250YWxseVN0cmV0Y2hl ZCkgeworICAgICAgICAgICAgaWYgKGRlbHRhLndpZHRoKCkgJiYgIW1fY2xpZW50LmFsbG93c0hv cml6b250YWxTdHJldGNoaW5nKHdoZWVsRXZlbnQpKQorICAgICAgICAgICAgICAgIGhhbmRsZWQg PSBmYWxzZTsKIAotICAgICAgICAgICAgSW50U2l6ZSBzdHJldGNoQW1vdW50ID0gbV9jbGllbnQu c3RyZXRjaEFtb3VudCgpOworICAgICAgICAgICAgaWYgKGRlbHRhLmhlaWdodCgpICYmICFtX2Ns aWVudC5hbGxvd3NWZXJ0aWNhbFN0cmV0Y2hpbmcod2hlZWxFdmVudCkpCisgICAgICAgICAgICAg ICAgaGFuZGxlZCA9IGZhbHNlOwogCisgICAgICAgICAgICBib29sIGNhblN0YXJ0QW5pbWF0aW9u ID0gYXBwbHlTY3JvbGxEZWx0YVdpdGhTdHJldGNoaW5nKHdoZWVsRXZlbnQsIGRlbHRhLCBpc0hv cml6b250YWxseVN0cmV0Y2hlZCwgaXNWZXJ0aWNhbGx5U3RyZXRjaGVkKTsKICAgICAgICAgICAg IGlmIChtX21vbWVudHVtU2Nyb2xsSW5Qcm9ncmVzcykgewotICAgICAgICAgICAgICAgIGF1dG8g c2lkZUFmZmVjdGVkQnlFdmVudERlbHRhID0gYWZmZWN0ZWRTaWRlT25Eb21pbmFudEF4aXMoZXZl bnRDb2FsZXNjZWREZWx0YSk7Ci0gICAgICAgICAgICAgICAgaWYgKCghc2lkZUFmZmVjdGVkQnlF dmVudERlbHRhIHx8IG1fY2xpZW50LmlzUGlubmVkT25TaWRlKCpzaWRlQWZmZWN0ZWRCeUV2ZW50 RGVsdGEpKSAmJiBtX2xhc3RNb21lbnR1bVNjcm9sbFRpbWVzdGFtcCkgeworICAgICAgICAgICAg ICAgIGlmIChjYW5TdGFydEFuaW1hdGlvbiAmJiBtX2xhc3RNb21lbnR1bVNjcm9sbFRpbWVzdGFt cCkgewogICAgICAgICAgICAgICAgICAgICBtX2lnbm9yZU1vbWVudHVtU2Nyb2xscyA9IHRydWU7 CiAgICAgICAgICAgICAgICAgICAgIG1fbW9tZW50dW1TY3JvbGxJblByb2dyZXNzID0gZmFsc2U7 CiAgICAgICAgICAgICAgICAgICAgIHN0YXJ0UnViYmVyYmFuZEFuaW1hdGlvbklmTmVjZXNzYXJ5 KCk7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQotCi0gICAgICAgICAgICBtX3N0 cmV0Y2hTY3JvbGxGb3JjZS5zZXRXaWR0aChtX3N0cmV0Y2hTY3JvbGxGb3JjZS53aWR0aCgpICsg ZGVsdGFYKTsKLSAgICAgICAgICAgIG1fc3RyZXRjaFNjcm9sbEZvcmNlLnNldEhlaWdodChtX3N0 cmV0Y2hTY3JvbGxGb3JjZS5oZWlnaHQoKSArIGRlbHRhWSk7Ci0KLSAgICAgICAgICAgIEZsb2F0 U2l6ZSBkYW1wZWREZWx0YShjZWlsZihlbGFzdGljRGVsdGFGb3JSZWJvdW5kRGVsdGEobV9zdHJl dGNoU2Nyb2xsRm9yY2Uud2lkdGgoKSkpLCBjZWlsZihlbGFzdGljRGVsdGFGb3JSZWJvdW5kRGVs dGEobV9zdHJldGNoU2Nyb2xsRm9yY2UuaGVpZ2h0KCkpKSk7Ci0KLSAgICAgICAgICAgIExPR19X SVRIX1NUUkVBTShTY3JvbGxBbmltYXRpb25zLCBzdHJlYW0gPDwgIlNjcm9sbGluZ0VmZmVjdHND b250cm9sbGVyOjpoYW5kbGVXaGVlbEV2ZW50KCkgLSBzdHJldGNoU2Nyb2xsRm9yY2UgIiA8PCBt X3N0cmV0Y2hTY3JvbGxGb3JjZSA8PCAiIG1vdmUgZGVsdGEgIiA8PCBGbG9hdFNpemUoZGVsdGFY LCBkZWx0YVkpIDw8ICIgZGFtcGVkRGVsdGEgIiA8PCBkYW1wZWREZWx0YSk7Ci0KLSAgICAgICAg ICAgIG1fY2xpZW50LmltbWVkaWF0ZVNjcm9sbEJ5V2l0aG91dENvbnRlbnRFZGdlQ29uc3RyYWlu dHMoZGFtcGVkRGVsdGEgLSBzdHJldGNoQW1vdW50KTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAg ICAgICAgIGRlbHRhLnNjYWxlKHNjcm9sbFdoZWVsTXVsdGlwbGllcigpKTsKKyAgICAgICAgICAg IG1fY2xpZW50LmltbWVkaWF0ZVNjcm9sbEJ5KGRlbHRhKTsKICAgICAgICAgfQogICAgIH0KIApA QCAtMzI2LDYgKzI0MCwxMTQgQEAgYm9vbCBTY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlcjo6aGFu ZGxlV2hlZWxFdmVudChjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmIHdoZWUKICAgICByZXR1cm4g aGFuZGxlZDsKIH0KIAorYm9vbCBTY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlcjo6bW9kaWZ5U2Ny b2xsRGVsdGFGb3JTdHJldGNoaW5nKGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYgd2hlZWxFdmVu dCwgRmxvYXRTaXplJiBkZWx0YSwgYm9vbCBpc0hvcml6b250YWxseVN0cmV0Y2hlZCwgYm9vbCBp c1ZlcnRpY2FsbHlTdHJldGNoZWQpCit7CisgICAgYXV0byBhZmZlY3RlZFNpZGUgPSBhZmZlY3Rl ZFNpZGVPbkRvbWluYW50QXhpcyhkZWx0YSk7CisgICAgaWYgKGlzVmVydGljYWxseVN0cmV0Y2hl ZCkgeworICAgICAgICBpZiAoIWlzSG9yaXpvbnRhbGx5U3RyZXRjaGVkICYmIGlzSG9yaXpvbnRh bFNpZGUoYWZmZWN0ZWRTaWRlKSAmJiBtX2NsaWVudC5pc1Bpbm5lZE9uU2lkZSgqYWZmZWN0ZWRT aWRlKSkgeworICAgICAgICAgICAgLy8gU3RyZXRjaGluZyBvbmx5IGluIHRoZSB2ZXJ0aWNhbC4K KyAgICAgICAgICAgIGlmIChkZWx0YS5oZWlnaHQoKSAmJiAoZmFic2YoZGVsdGEud2lkdGgoKSAv IGRlbHRhLmhlaWdodCgpKSA8IHJ1YmJlcmJhbmREaXJlY3Rpb25Mb2NrU3RyZXRjaFJhdGlvKSkK KyAgICAgICAgICAgICAgICBkZWx0YS5zZXRXaWR0aCgwKTsKKyAgICAgICAgICAgIGVsc2UgaWYg KGZhYnNmKGRlbHRhLndpZHRoKCkpIDwgcnViYmVyYmFuZE1pbmltdW1SZXF1aXJlZERlbHRhQmVm b3JlU3RyZXRjaCkgeworICAgICAgICAgICAgICAgIG1fdW5hcHBsaWVkT3ZlcnNjcm9sbERlbHRh LmV4cGFuZChkZWx0YS53aWR0aCgpLCAwKTsKKyAgICAgICAgICAgICAgICBkZWx0YS5zZXRXaWR0 aCgwKTsKKyAgICAgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgICAgIG1fdW5hcHBsaWVkT3Zl cnNjcm9sbERlbHRhLmV4cGFuZChkZWx0YS53aWR0aCgpLCAwKTsKKyAgICAgICAgfQorCisgICAg ICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKKyAgICBpZiAoaXNIb3Jpem9udGFsbHlTdHJldGNo ZWQpIHsKKyAgICAgICAgLy8gU3RyZXRjaGluZyBvbmx5IGluIHRoZSBob3Jpem9udGFsLgorICAg ICAgICBpZiAoaXNWZXJ0aWNhbFNpZGUoYWZmZWN0ZWRTaWRlKSAmJiBtX2NsaWVudC5pc1Bpbm5l ZE9uU2lkZSgqYWZmZWN0ZWRTaWRlKSkgeworICAgICAgICAgICAgaWYgKGRlbHRhLndpZHRoKCkg JiYgKGZhYnNmKGRlbHRhLmhlaWdodCgpIC8gZGVsdGEud2lkdGgoKSkgPCBydWJiZXJiYW5kRGly ZWN0aW9uTG9ja1N0cmV0Y2hSYXRpbykpCisgICAgICAgICAgICAgICAgZGVsdGEuc2V0SGVpZ2h0 KDApOworICAgICAgICAgICAgZWxzZSBpZiAoZmFic2YoZGVsdGEuaGVpZ2h0KCkpIDwgcnViYmVy YmFuZE1pbmltdW1SZXF1aXJlZERlbHRhQmVmb3JlU3RyZXRjaCkgeworICAgICAgICAgICAgICAg IG1fdW5hcHBsaWVkT3ZlcnNjcm9sbERlbHRhLmV4cGFuZCgwLCBkZWx0YS5oZWlnaHQoKSk7Cisg ICAgICAgICAgICAgICAgZGVsdGEuc2V0SGVpZ2h0KDApOworICAgICAgICAgICAgfSBlbHNlCisg ICAgICAgICAgICAgICAgbV91bmFwcGxpZWRPdmVyc2Nyb2xsRGVsdGEuZXhwYW5kKDAsIGRlbHRh LmhlaWdodCgpKTsKKyAgICAgICAgfQorCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisK KyAgICAvLyBOb3Qgc3RyZXRjaGluZyBhdCBhbGwgeWV0LgorICAgIGlmIChhZmZlY3RlZFNpZGUg JiYgbV9jbGllbnQuaXNQaW5uZWRPblNpZGUoKmFmZmVjdGVkU2lkZSkpIHsKKyAgICAgICAgaWYg KGZhYnNmKGRlbHRhLmhlaWdodCgpKSA+PSBmYWJzZihkZWx0YS53aWR0aCgpKSkgeworICAgICAg ICAgICAgaWYgKGZhYnNmKGRlbHRhLndpZHRoKCkpIDwgcnViYmVyYmFuZE1pbmltdW1SZXF1aXJl ZERlbHRhQmVmb3JlU3RyZXRjaCkgeworICAgICAgICAgICAgICAgIG1fdW5hcHBsaWVkT3ZlcnNj cm9sbERlbHRhLmV4cGFuZChkZWx0YS53aWR0aCgpLCAwKTsKKyAgICAgICAgICAgICAgICBkZWx0 YS5zZXRXaWR0aCgwKTsKKyAgICAgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgICAgIG1fdW5h cHBsaWVkT3ZlcnNjcm9sbERlbHRhLmV4cGFuZChkZWx0YS53aWR0aCgpLCAwKTsKKyAgICAgICAg fQorCisgICAgICAgIGlmICghbV9jbGllbnQuYWxsb3dzSG9yaXpvbnRhbFN0cmV0Y2hpbmcod2hl ZWxFdmVudCkpCisgICAgICAgICAgICBkZWx0YS5zZXRXaWR0aCgwKTsKKworICAgICAgICBpZiAo IW1fY2xpZW50LmFsbG93c1ZlcnRpY2FsU3RyZXRjaGluZyh3aGVlbEV2ZW50KSkKKyAgICAgICAg ICAgIGRlbHRhLnNldEhlaWdodCgwKTsKKworICAgICAgICByZXR1cm4gIWRlbHRhLmlzWmVybygp OworICAgIH0KKyAgICAKKyAgICByZXR1cm4gZmFsc2U7Cit9CisKK2Jvb2wgU2Nyb2xsaW5nRWZm ZWN0c0NvbnRyb2xsZXI6OmFwcGx5U2Nyb2xsRGVsdGFXaXRoU3RyZXRjaGluZyhjb25zdCBQbGF0 Zm9ybVdoZWVsRXZlbnQmIHdoZWVsRXZlbnQsIEZsb2F0U2l6ZSBkZWx0YSwgYm9vbCBpc0hvcml6 b250YWxseVN0cmV0Y2hlZCwgYm9vbCBpc1ZlcnRpY2FsbHlTdHJldGNoZWQpCit7CisgICAgYXV0 byBldmVudERlbHRhID0gKGlzVmVydGljYWxseVN0cmV0Y2hlZCB8fCBpc0hvcml6b250YWxseVN0 cmV0Y2hlZCkgPyAtd2hlZWxFdmVudC51bmFjY2VsZXJhdGVkU2Nyb2xsaW5nRGVsdGEoKSA6IC13 aGVlbEV2ZW50LmRlbHRhKCk7CisgICAgYXV0byBhZmZlY3RlZFNpZGUgPSBhZmZlY3RlZFNpZGVP bkRvbWluYW50QXhpcyhkZWx0YSk7CisKKyAgICBGbG9hdFNpemUgZGVsdGFUb1Njcm9sbDsKKwor ICAgIGlmIChkZWx0YS53aWR0aCgpKSB7CisgICAgICAgIGlmICghbV9jbGllbnQuYWxsb3dzSG9y aXpvbnRhbFN0cmV0Y2hpbmcod2hlZWxFdmVudCkpIHsKKyAgICAgICAgICAgIGRlbHRhLnNldFdp ZHRoKDApOworICAgICAgICAgICAgZXZlbnREZWx0YS5zZXRXaWR0aCgwKTsKKyAgICAgICAgfSBl bHNlIGlmICghaXNIb3Jpem9udGFsbHlTdHJldGNoZWQgJiYgIW1fY2xpZW50LmlzUGlubmVkT25T aWRlKCphZmZlY3RlZFNpZGUpKSB7CisgICAgICAgICAgICBkZWx0YS5zY2FsZShzY3JvbGxXaGVl bE11bHRpcGxpZXIoKSwgMSk7CisgICAgICAgICAgICBkZWx0YVRvU2Nyb2xsICs9IEZsb2F0U2l6 ZSB7IGRlbHRhLndpZHRoKCksIDAgfTsKKyAgICAgICAgICAgIGRlbHRhLnNldFdpZHRoKDApOwor ICAgICAgICB9CisgICAgfQorCisgICAgaWYgKGRlbHRhLmhlaWdodCgpKSB7CisgICAgICAgIGlm ICghbV9jbGllbnQuYWxsb3dzVmVydGljYWxTdHJldGNoaW5nKHdoZWVsRXZlbnQpKSB7CisgICAg ICAgICAgICBkZWx0YS5zZXRIZWlnaHQoMCk7CisgICAgICAgICAgICBldmVudERlbHRhLnNldEhl aWdodCgwKTsKKyAgICAgICAgfSBlbHNlIGlmICghaXNWZXJ0aWNhbGx5U3RyZXRjaGVkICYmICFt X2NsaWVudC5pc1Bpbm5lZE9uU2lkZSgqYWZmZWN0ZWRTaWRlKSkgeworICAgICAgICAgICAgZGVs dGEuc2NhbGUoMSwgc2Nyb2xsV2hlZWxNdWx0aXBsaWVyKCkpOworICAgICAgICAgICAgZGVsdGFU b1Njcm9sbCArPSBGbG9hdFNpemUgeyAwLCBkZWx0YS5oZWlnaHQoKSB9OworICAgICAgICAgICAg ZGVsdGEuc2V0SGVpZ2h0KDApOworICAgICAgICB9CisgICAgfQorCisgICAgaWYgKCFkZWx0YVRv U2Nyb2xsLmlzWmVybygpKQorICAgICAgICBtX2NsaWVudC5pbW1lZGlhdGVTY3JvbGxCeVdpdGhv dXRDb250ZW50RWRnZUNvbnN0cmFpbnRzKGRlbHRhVG9TY3JvbGwpOworCisgICAgYm9vbCBjYW5T dGFydEFuaW1hdGlvbiA9IGZhbHNlOworICAgIGlmIChtX21vbWVudHVtU2Nyb2xsSW5Qcm9ncmVz cykgeworICAgICAgICAvLyBDb21wdXRlIGNhblN0YXJ0QW5pbWF0aW9uLCB3aGljaCBsb29rcyBh dCBpc1Bpbm5lZE9uU2lkZSgpLCBiZWZvcmUgYXBwbHlpbmcgdGhlIHN0cmV0Y2ggZGVsdGEuCisg ICAgICAgIGF1dG8gc2lkZUFmZmVjdGVkQnlFdmVudERlbHRhID0gYWZmZWN0ZWRTaWRlT25Eb21p bmFudEF4aXMoZXZlbnREZWx0YSk7CisgICAgICAgIGNhblN0YXJ0QW5pbWF0aW9uID0gIXNpZGVB ZmZlY3RlZEJ5RXZlbnREZWx0YSB8fCBtX2NsaWVudC5pc1Bpbm5lZE9uU2lkZSgqc2lkZUFmZmVj dGVkQnlFdmVudERlbHRhKTsKKyAgICB9CisKKyAgICBtX3N0cmV0Y2hTY3JvbGxGb3JjZSArPSBk ZWx0YTsKKyAgICBhdXRvIGRhbXBlZERlbHRhID0gRmxvYXRTaXplIHsKKyAgICAgICAgY2VpbGYo ZWxhc3RpY0RlbHRhRm9yUmVib3VuZERlbHRhKG1fc3RyZXRjaFNjcm9sbEZvcmNlLndpZHRoKCkp KSwKKyAgICAgICAgY2VpbGYoZWxhc3RpY0RlbHRhRm9yUmVib3VuZERlbHRhKG1fc3RyZXRjaFNj cm9sbEZvcmNlLmhlaWdodCgpKSkKKyAgICB9OworCisgICAgTE9HX1dJVEhfU1RSRUFNKFNjcm9s bEFuaW1hdGlvbnMsIHN0cmVhbSA8PCAiU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXI6OmFwcGx5 U2Nyb2xsRGVsdGFXaXRoU3RyZXRjaGluZygpIC0gc3RyZXRjaFNjcm9sbEZvcmNlICIgPDwgbV9z dHJldGNoU2Nyb2xsRm9yY2UgPDwgIiBtb3ZlIGRlbHRhICIgPDwgZGVsdGEgPDwgIiBkYW1wZWRE ZWx0YSAiIDw8IGRhbXBlZERlbHRhKTsKKworICAgIGF1dG8gc3RyZXRjaEFtb3VudCA9IG1fY2xp ZW50LnN0cmV0Y2hBbW91bnQoKTsKKyAgICBtX2NsaWVudC5pbW1lZGlhdGVTY3JvbGxCeVdpdGhv dXRDb250ZW50RWRnZUNvbnN0cmFpbnRzKGRhbXBlZERlbHRhIC0gc3RyZXRjaEFtb3VudCk7CisK KyAgICByZXR1cm4gY2FuU3RhcnRBbmltYXRpb247Cit9CisKIEZsb2F0U2l6ZSBTY3JvbGxpbmdF ZmZlY3RzQ29udHJvbGxlcjo6d2hlZWxEZWx0YUJpYXNpbmdUb3dhcmRzVmVydGljYWwoY29uc3Qg UGxhdGZvcm1XaGVlbEV2ZW50JiB3aGVlbEV2ZW50KQogewogICAgIHJldHVybiBkZWx0YUFsaWdu ZWRUb0RvbWluYW50QXhpcyh3aGVlbEV2ZW50LmRlbHRhKCkpOwo=