230981 2021-09-29 13:47:50 -0700 Minor cleanup of some rubber-banding code in ScrollingEffectsController 2021-09-29 19:34:15 -0700 1 1 1 Unclassified WebKit Scrolling WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser simon.fraser thorton webkit-bug-importer oldest_to_newest 1798540 0 simon.fraser 2021-09-29 13:47:50 -0700 Minor cleanup of some rubber-banding code in ScrollingEffectsController 1798542 1 439650 simon.fraser 2021-09-29 13:48:43 -0700 Created attachment 439650 Patch 1798732 2 ews-feeder 2021-09-29 19:33:09 -0700 Committed r283296 (242321@main): <https://commits.webkit.org/242321@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 439650. 1798733 3 webkit-bug-importer 2021-09-29 19:34:15 -0700 <rdar://problem/83700160> 439650 2021-09-29 13:48:43 -0700 2021-09-29 19:33:09 -0700 Patch bug-230981-20210929134842.patch text/plain 12752 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzMTgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjE1M2YwZGE2MGY1ZjRl NDNkMTlkOWIwZWYxZDkyYjNmMTg4ODA1Ny4uMGM4NWNkZmFmYjkzNzM5ZThkZTJhN2VkMTMzY2U2 ZDMzNmM3YTIyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTA5LTI5ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1pbm9yIGNsZWFu dXAgb2Ygc29tZSBydWJiZXItYmFuZGluZyBjb2RlIGluIFNjcm9sbGluZ0VmZmVjdHNDb250cm9s bGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzA5 ODEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBcyBh IHByZWN1cnNvciB0byB1bnJhdmVsaW5nIHNvbWUgb2YgdGhlIGNvbXBsZXhpdHkgb2YgdGhlIHJ1 YmJlci1iYW5kaW5nIGNvZGUsCisgICAgICAgIHRpZHkgdXAgbmFtaW5nIGFuZCBjb2RlIGluIFNj cm9sbGluZ0VmZmVjdHNDb250cm9sbGVyOjpoYW5kbGVXaGVlbEV2ZW50KCkuIE5vCisgICAgICAg IGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIHBsYXRmb3JtL1BsYXRmb3JtV2hlZWxFdmVu dC5oOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1XaGVlbEV2ZW50Ojp1bmFjY2VsZXJhdGVk U2Nyb2xsaW5nRGVsdGEgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1XaGVlbEV2 ZW50Ojp1bmFjY2VsZXJhdGVkU2Nyb2xsaW5nRGVsdGFYIGNvbnN0KTogRGVsZXRlZC4KKyAgICAg ICAgKFdlYkNvcmU6OlBsYXRmb3JtV2hlZWxFdmVudDo6dW5hY2NlbGVyYXRlZFNjcm9sbGluZ0Rl bHRhWSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsaW5nRWZmZWN0 c0NvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvU2Nyb2xsaW5nRWZmZWN0c0Nv bnRyb2xsZXIubW06CisgICAgICAgIChXZWJDb3JlOjpjb252ZXJ0VG9Qcm9taW5lbnRBeGlzRmF2 b3JpbmdWZXJ0aWNhbCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdFZmZlY3RzQ29udHJv bGxlcjo6aGFuZGxlV2hlZWxFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdFZmZl Y3RzQ29udHJvbGxlcjo6d2hlZWxEZWx0YUJpYXNpbmdUb3dhcmRzVmVydGljYWwpOgorCiAyMDIx LTA5LTI4ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgTW92ZSBD cm9zcy1PcmlnaW4tT3BlbmVyLVBvbGljeSBoYW5kbGluZyB0byB0aGUgTmV0d29ya1Byb2Nlc3MK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1BsYXRmb3JtV2hlZWxFdmVudC5o IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUGxhdGZvcm1XaGVlbEV2ZW50LmgKaW5kZXggMDRl NjY3MzIyYWRmNjUwNzdhZTRiODNhODI0Mzg1ZTI1MmQyY2FlNS4uNzA1ZTVkZDYwZDkzYWUwNjNm NWIzMWRlNTM0NzQ3Y2Q4MzdmNDY5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vUGxhdGZvcm1XaGVlbEV2ZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUGxh dGZvcm1XaGVlbEV2ZW50LmgKQEAgLTE1MCw4ICsxNTAsNyBAQCBwdWJsaWM6CiAKICNpZiBQTEFU Rk9STShDT0NPQSkKICAgICB1bnNpZ25lZCBzY3JvbGxDb3VudCgpIGNvbnN0IHsgcmV0dXJuIG1f c2Nyb2xsQ291bnQ7IH0KLSAgICBmbG9hdCB1bmFjY2VsZXJhdGVkU2Nyb2xsaW5nRGVsdGFYKCkg Y29uc3QgeyByZXR1cm4gbV91bmFjY2VsZXJhdGVkU2Nyb2xsaW5nRGVsdGFYOyB9Ci0gICAgZmxv YXQgdW5hY2NlbGVyYXRlZFNjcm9sbGluZ0RlbHRhWSgpIGNvbnN0IHsgcmV0dXJuIG1fdW5hY2Nl bGVyYXRlZFNjcm9sbGluZ0RlbHRhWTsgfQorICAgIEZsb2F0U2l6ZSB1bmFjY2VsZXJhdGVkU2Ny b2xsaW5nRGVsdGEoKSBjb25zdCB7IHJldHVybiB7IG1fdW5hY2NlbGVyYXRlZFNjcm9sbGluZ0Rl bHRhWCwgbV91bmFjY2VsZXJhdGVkU2Nyb2xsaW5nRGVsdGFZIH07IH0KICNlbmRpZgogCiAjaWYg RU5BQkxFKEFTWU5DX1NDUk9MTElORykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL1Njcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9TY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlci5oCmluZGV4IGI2MjRiMDI2NTFlZGY2Njc2NzY5 NWRlNWVmMTdlZGQ2ZDQwZTMyYzMuLmE1ZDQyYjFjZDJmODgwMWQ4N2M3YjY2YzVmMzU0ZGEyNjRj OTBjMGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGluZ0VmZmVj dHNDb250cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsaW5nRWZm ZWN0c0NvbnRyb2xsZXIuaApAQCAtMjM0LDcgKzIzNCw3IEBAIHByaXZhdGU6CiAKICNpZiBQTEFU Rk9STShNQUMpCiAgICAgV2FsbFRpbWUgbV9sYXN0TW9tZW50dW1TY3JvbGxUaW1lc3RhbXA7Ci0g ICAgRmxvYXRTaXplIG1fb3ZlcmZsb3dTY3JvbGxEZWx0YTsKKyAgICBGbG9hdFNpemUgbV91bmFw cGxpZWRPdmVyc2Nyb2xsRGVsdGE7CiAgICAgRmxvYXRTaXplIG1fc3RyZXRjaFNjcm9sbEZvcmNl OwogICAgIEZsb2F0U2l6ZSBtX21vbWVudHVtVmVsb2NpdHk7CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlci5tbSBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlci5tbQpp bmRleCA5MGYxOWU0N2U2MzljMzI4OTZlMzg0ZTVlMDFlZDU1YzNiMGUwYzJkLi41NTllNTQ2ZTQz ODhkYjcxMzEwYjc5NzA3ODZlYTgyMmMyZGQyODg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXIubW0KKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyLm1tCkBAIC04 Myw2ICs4MywxNSBAQCB2b2lkIFNjcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyOjpzdG9wQWxsVGlt ZXJzKCkKICNlbmRpZgogfQogCisKK3N0YXRpYyBGbG9hdFNpemUgY29udmVydFRvUHJvbWluZW50 QXhpc0Zhdm9yaW5nVmVydGljYWwoRmxvYXRTaXplIGRlbHRhKQoreworICAgIGlmIChmYWJzZihk ZWx0YS5oZWlnaHQoKSkgPj0gZmFic2YoZGVsdGEud2lkdGgoKSkpCisgICAgICAgIHJldHVybiB7 IDAsIGRlbHRhLmhlaWdodCgpIH07CisKKyAgICByZXR1cm4geyBkZWx0YS53aWR0aCgpLCAwIH07 Cit9CisKIGJvb2wgU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXI6OmhhbmRsZVdoZWVsRXZlbnQo Y29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiB3aGVlbEV2ZW50KQogewogICAgIGlmIChwcm9jZXNz V2hlZWxFdmVudEZvclNjcm9sbFNuYXAod2hlZWxFdmVudCkpCkBAIC0xMDksNyArMTE4LDcgQEAg Ym9vbCBTY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlcjo6aGFuZGxlV2hlZWxFdmVudChjb25zdCBQ bGF0Zm9ybVdoZWVsRXZlbnQmIHdoZWUKICAgICAgICAgSW50U2l6ZSBzdHJldGNoQW1vdW50ID0g bV9jbGllbnQuc3RyZXRjaEFtb3VudCgpOwogICAgICAgICBtX3N0cmV0Y2hTY3JvbGxGb3JjZS5z ZXRXaWR0aChyZWJvdW5kRGVsdGFGb3JFbGFzdGljRGVsdGEoc3RyZXRjaEFtb3VudC53aWR0aCgp KSk7CiAgICAgICAgIG1fc3RyZXRjaFNjcm9sbEZvcmNlLnNldEhlaWdodChyZWJvdW5kRGVsdGFG b3JFbGFzdGljRGVsdGEoc3RyZXRjaEFtb3VudC5oZWlnaHQoKSkpOwotICAgICAgICBtX292ZXJm bG93U2Nyb2xsRGVsdGEgPSB7IH07CisgICAgICAgIG1fdW5hcHBsaWVkT3ZlcnNjcm9sbERlbHRh ID0geyB9OwogCiAgICAgICAgIHN0b3BTbmFwUnViYmVyYmFuZEFuaW1hdGlvbigpOwogICAgICAg ICB1cGRhdGVSdWJiZXJCYW5kaW5nU3RhdGUoKTsKQEAgLTEzNiw1NCArMTQ1LDM1IEBAIGJvb2wg U2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXI6OmhhbmRsZVdoZWVsRXZlbnQoY29uc3QgUGxhdGZv cm1XaGVlbEV2ZW50JiB3aGVlCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKLSAgICBm bG9hdCBkZWx0YVggPSBtX292ZXJmbG93U2Nyb2xsRGVsdGEud2lkdGgoKTsKLSAgICBmbG9hdCBk ZWx0YVkgPSBtX292ZXJmbG93U2Nyb2xsRGVsdGEuaGVpZ2h0KCk7Ci0KLSAgICAvLyBSZXNldCBv dmVyZmxvdyB2YWx1ZXMgYmVjYXVzZSB3ZSBtYXkgZGVjaWRlIHRvIHJlbW92ZSBkZWx0YSBhdCB2 YXJpb3VzIHBvaW50cyBhbmQgcHV0IGl0IGludG8gb3ZlcmZsb3cuCi0gICAgbV9vdmVyZmxvd1Nj cm9sbERlbHRhID0geyB9OworICAgIC8vIFJlc2V0IHVuYXBwbGllZCBvdmVyc2Nyb2xsIGJlY2F1 c2Ugd2UgbWF5IGRlY2lkZSB0byByZW1vdmUgZGVsdGEgYXQgdmFyaW91cyBwb2ludHMgYW5kIHB1 dCBpdCBpbnRvIHRoaXMgdmFsdWUuCisgICAgYXV0byBkZWx0YSA9IHN0ZDo6ZXhjaGFuZ2UobV91 bmFwcGxpZWRPdmVyc2Nyb2xsRGVsdGEsIHsgfSk7CiAKICAgICBJbnRTaXplIHN0cmV0Y2hBbW91 bnQgPSBtX2NsaWVudC5zdHJldGNoQW1vdW50KCk7CiAgICAgYm9vbCBpc1ZlcnRpY2FsbHlTdHJl dGNoZWQgPSBzdHJldGNoQW1vdW50LmhlaWdodCgpOwogICAgIGJvb2wgaXNIb3Jpem9udGFsbHlT dHJldGNoZWQgPSBzdHJldGNoQW1vdW50LndpZHRoKCk7CiAKLSAgICBmbG9hdCBldmVudENvYWxl c2NlZERlbHRhWDsKLSAgICBmbG9hdCBldmVudENvYWxlc2NlZERlbHRhWTsKLQotICAgIGlmIChp c1ZlcnRpY2FsbHlTdHJldGNoZWQgfHwgaXNIb3Jpem9udGFsbHlTdHJldGNoZWQpIHsKLSAgICAg ICAgZXZlbnRDb2FsZXNjZWREZWx0YVggPSAtd2hlZWxFdmVudC51bmFjY2VsZXJhdGVkU2Nyb2xs aW5nRGVsdGFYKCk7Ci0gICAgICAgIGV2ZW50Q29hbGVzY2VkRGVsdGFZID0gLXdoZWVsRXZlbnQu dW5hY2NlbGVyYXRlZFNjcm9sbGluZ0RlbHRhWSgpOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIGV2 ZW50Q29hbGVzY2VkRGVsdGFYID0gLXdoZWVsRXZlbnQuZGVsdGFYKCk7Ci0gICAgICAgIGV2ZW50 Q29hbGVzY2VkRGVsdGFZID0gLXdoZWVsRXZlbnQuZGVsdGFZKCk7Ci0gICAgfQorICAgIGF1dG8g ZXZlbnRDb2FsZXNjZWREZWx0YSA9IChpc1ZlcnRpY2FsbHlTdHJldGNoZWQgfHwgaXNIb3Jpem9u dGFsbHlTdHJldGNoZWQpID8gLXdoZWVsRXZlbnQudW5hY2NlbGVyYXRlZFNjcm9sbGluZ0RlbHRh KCkgOiAtd2hlZWxFdmVudC5kZWx0YSgpOworICAgIGRlbHRhICs9IGV2ZW50Q29hbGVzY2VkRGVs dGE7CiAKLSAgICBkZWx0YVggKz0gZXZlbnRDb2FsZXNjZWREZWx0YVg7Ci0gICAgZGVsdGFZICs9 IGV2ZW50Q29hbGVzY2VkRGVsdGFZOwotCi0gICAgLy8gU2xpZ2h0bHkgcHJlZmVyIHNjcm9sbGlu ZyB2ZXJ0aWNhbGx5IGJ5IGFwcGx5aW5nIHRoZSA9IGNhc2UgdG8gZGVsdGFZCi0gICAgLy8gRklY TUU6IFVzZSB3aGVlbERlbHRhQmlhc2luZ1Rvd2FyZHNWZXJ0aWNhbCgpLgotICAgIGlmIChmYWJz ZihkZWx0YVkpID49IGZhYnNmKGRlbHRhWCkpCi0gICAgICAgIGRlbHRhWCA9IDA7Ci0gICAgZWxz ZQotICAgICAgICBkZWx0YVkgPSAwOworICAgIGRlbHRhID0gY29udmVydFRvUHJvbWluZW50QXhp c0Zhdm9yaW5nVmVydGljYWwoZGVsdGEpOworICAgIGZsb2F0IGRlbHRhWCA9IGRlbHRhLndpZHRo KCk7CisgICAgZmxvYXQgZGVsdGFZID0gZGVsdGEuaGVpZ2h0KCk7CiAKICAgICBib29sIHNob3Vs ZFN0cmV0Y2ggPSBmYWxzZTsKIAotICAgIFBsYXRmb3JtV2hlZWxFdmVudFBoYXNlIG1vbWVudHVt UGhhc2UgPSB3aGVlbEV2ZW50Lm1vbWVudHVtUGhhc2UoKTsKKyAgICBhdXRvIG1vbWVudHVtUGhh c2UgPSB3aGVlbEV2ZW50Lm1vbWVudHVtUGhhc2UoKTsKIAotICAgIC8vIElmIHdlIGFyZSBzdGFy dGluZyBtb21lbnR1bSBzY3JvbGxpbmcgdGhlbiBkbyBzb21lIHNldHVwLgogICAgIGlmICghbV9t b21lbnR1bVNjcm9sbEluUHJvZ3Jlc3MgJiYgKG1vbWVudHVtUGhhc2UgPT0gUGxhdGZvcm1XaGVl bEV2ZW50UGhhc2U6OkJlZ2FuIHx8IG1vbWVudHVtUGhhc2UgPT0gUGxhdGZvcm1XaGVlbEV2ZW50 UGhhc2U6OkNoYW5nZWQpKQogICAgICAgICBtX21vbWVudHVtU2Nyb2xsSW5Qcm9ncmVzcyA9IHRy dWU7CiAKICAgICBhdXRvIHRpbWVEZWx0YSA9IHdoZWVsRXZlbnQudGltZXN0YW1wKCkgLSBtX2xh c3RNb21lbnR1bVNjcm9sbFRpbWVzdGFtcDsKICAgICBpZiAobV9pblNjcm9sbEdlc3R1cmUgfHwg bV9tb21lbnR1bVNjcm9sbEluUHJvZ3Jlc3MpIHsKICAgICAgICAgaWYgKG1fbGFzdE1vbWVudHVt U2Nyb2xsVGltZXN0YW1wICYmIHRpbWVEZWx0YSA+IDBfcyAmJiB0aW1lRGVsdGEgPCBzY3JvbGxW ZWxvY2l0eVplcm9pbmdUaW1lb3V0KSB7Ci0gICAgICAgICAgICBtX21vbWVudHVtVmVsb2NpdHku c2V0V2lkdGgoZXZlbnRDb2FsZXNjZWREZWx0YVggLyB0aW1lRGVsdGEuc2Vjb25kcygpKTsKLSAg ICAgICAgICAgIG1fbW9tZW50dW1WZWxvY2l0eS5zZXRIZWlnaHQoZXZlbnRDb2FsZXNjZWREZWx0 YVkgLyB0aW1lRGVsdGEuc2Vjb25kcygpKTsKKyAgICAgICAgICAgIG1fbW9tZW50dW1WZWxvY2l0 eSA9IGV2ZW50Q29hbGVzY2VkRGVsdGEgLyB0aW1lRGVsdGEuc2Vjb25kcygpOwogICAgICAgICAg ICAgbV9sYXN0TW9tZW50dW1TY3JvbGxUaW1lc3RhbXAgPSB3aGVlbEV2ZW50LnRpbWVzdGFtcCgp OwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgbV9sYXN0TW9tZW50dW1TY3JvbGxUaW1l c3RhbXAgPSB3aGVlbEV2ZW50LnRpbWVzdGFtcCgpOwotICAgICAgICAgICAgbV9tb21lbnR1bVZl bG9jaXR5ID0gRmxvYXRTaXplKCk7CisgICAgICAgICAgICBtX21vbWVudHVtVmVsb2NpdHkgPSB7 IH07CiAgICAgICAgIH0KIAogICAgICAgICBpZiAoaXNWZXJ0aWNhbGx5U3RyZXRjaGVkKSB7CkBA IC0xOTIsMTAgKzE4MiwxMCBAQCBib29sIFNjcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyOjpoYW5k bGVXaGVlbEV2ZW50KGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYgd2hlZQogICAgICAgICAgICAg ICAgIGlmIChkZWx0YVkgJiYgKGZhYnNmKGRlbHRhWCAvIGRlbHRhWSkgPCBydWJiZXJiYW5kRGly ZWN0aW9uTG9ja1N0cmV0Y2hSYXRpbykpCiAgICAgICAgICAgICAgICAgICAgIGRlbHRhWCA9IDA7 CiAgICAgICAgICAgICAgICAgZWxzZSBpZiAoZmFic2YoZGVsdGFYKSA8IHJ1YmJlcmJhbmRNaW5p bXVtUmVxdWlyZWREZWx0YUJlZm9yZVN0cmV0Y2gpIHsKLSAgICAgICAgICAgICAgICAgICAgbV9v dmVyZmxvd1Njcm9sbERlbHRhLnNldFdpZHRoKG1fb3ZlcmZsb3dTY3JvbGxEZWx0YS53aWR0aCgp ICsgZGVsdGFYKTsKKyAgICAgICAgICAgICAgICAgICAgbV91bmFwcGxpZWRPdmVyc2Nyb2xsRGVs dGEuZXhwYW5kKGRlbHRhWCwgMCk7CiAgICAgICAgICAgICAgICAgICAgIGRlbHRhWCA9IDA7CiAg ICAgICAgICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICAgICAgICAgIG1fb3ZlcmZsb3dTY3Jv bGxEZWx0YS5zZXRXaWR0aChtX292ZXJmbG93U2Nyb2xsRGVsdGEud2lkdGgoKSArIGRlbHRhWCk7 CisgICAgICAgICAgICAgICAgICAgIG1fdW5hcHBsaWVkT3ZlcnNjcm9sbERlbHRhLmV4cGFuZChk ZWx0YVgsIDApOwogICAgICAgICAgICAgfQogICAgICAgICB9IGVsc2UgaWYgKGlzSG9yaXpvbnRh bGx5U3RyZXRjaGVkKSB7CiAgICAgICAgICAgICAvLyBTdHJldGNoaW5nIG9ubHkgaW4gdGhlIGhv cml6b250YWwuCkBAIC0yMDMsMjAgKzE5MywyMCBAQCBib29sIFNjcm9sbGluZ0VmZmVjdHNDb250 cm9sbGVyOjpoYW5kbGVXaGVlbEV2ZW50KGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYgd2hlZQog ICAgICAgICAgICAgICAgIGlmIChkZWx0YVggJiYgKGZhYnNmKGRlbHRhWSAvIGRlbHRhWCkgPCBy dWJiZXJiYW5kRGlyZWN0aW9uTG9ja1N0cmV0Y2hSYXRpbykpCiAgICAgICAgICAgICAgICAgICAg IGRlbHRhWSA9IDA7CiAgICAgICAgICAgICAgICAgZWxzZSBpZiAoZmFic2YoZGVsdGFZKSA8IHJ1 YmJlcmJhbmRNaW5pbXVtUmVxdWlyZWREZWx0YUJlZm9yZVN0cmV0Y2gpIHsKLSAgICAgICAgICAg ICAgICAgICAgbV9vdmVyZmxvd1Njcm9sbERlbHRhLnNldEhlaWdodChtX292ZXJmbG93U2Nyb2xs RGVsdGEuaGVpZ2h0KCkgKyBkZWx0YVkpOworICAgICAgICAgICAgICAgICAgICBtX3VuYXBwbGll ZE92ZXJzY3JvbGxEZWx0YS5leHBhbmQoMCwgZGVsdGFZKTsKICAgICAgICAgICAgICAgICAgICAg ZGVsdGFZID0gMDsKICAgICAgICAgICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgICAgICAgICAg bV9vdmVyZmxvd1Njcm9sbERlbHRhLnNldEhlaWdodChtX292ZXJmbG93U2Nyb2xsRGVsdGEuaGVp Z2h0KCkgKyBkZWx0YVkpOworICAgICAgICAgICAgICAgICAgICBtX3VuYXBwbGllZE92ZXJzY3Jv bGxEZWx0YS5leHBhbmQoMCwgZGVsdGFZKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfSBlbHNl IHsKICAgICAgICAgICAgIC8vIE5vdCBzdHJldGNoaW5nIGF0IGFsbCB5ZXQuCiAgICAgICAgICAg ICBpZiAobV9jbGllbnQuaXNQaW5uZWRGb3JTY3JvbGxEZWx0YShGbG9hdFNpemUoZGVsdGFYLCBk ZWx0YVkpKSkgewogICAgICAgICAgICAgICAgIGlmIChmYWJzZihkZWx0YVkpID49IGZhYnNmKGRl bHRhWCkpIHsKICAgICAgICAgICAgICAgICAgICAgaWYgKGZhYnNmKGRlbHRhWCkgPCBydWJiZXJi YW5kTWluaW11bVJlcXVpcmVkRGVsdGFCZWZvcmVTdHJldGNoKSB7Ci0gICAgICAgICAgICAgICAg ICAgICAgICBtX292ZXJmbG93U2Nyb2xsRGVsdGEuc2V0V2lkdGgobV9vdmVyZmxvd1Njcm9sbERl bHRhLndpZHRoKCkgKyBkZWx0YVgpOworICAgICAgICAgICAgICAgICAgICAgICAgbV91bmFwcGxp ZWRPdmVyc2Nyb2xsRGVsdGEuZXhwYW5kKGRlbHRhWCwgMCk7CiAgICAgICAgICAgICAgICAgICAg ICAgICBkZWx0YVggPSAwOwogICAgICAgICAgICAgICAgICAgICB9IGVsc2UKLSAgICAgICAgICAg ICAgICAgICAgICAgIG1fb3ZlcmZsb3dTY3JvbGxEZWx0YS5zZXRXaWR0aChtX292ZXJmbG93U2Ny b2xsRGVsdGEud2lkdGgoKSArIGRlbHRhWCk7CisgICAgICAgICAgICAgICAgICAgICAgICBtX3Vu YXBwbGllZE92ZXJzY3JvbGxEZWx0YS5leHBhbmQoZGVsdGFYLCAwKTsKICAgICAgICAgICAgICAg ICB9CiAKICAgICAgICAgICAgICAgICBpZiAoIW1fY2xpZW50LmFsbG93c0hvcml6b250YWxTdHJl dGNoaW5nKHdoZWVsRXZlbnQpKQpAQCAtMjQ2LDcgKzIzNiw3IEBAIGJvb2wgU2Nyb2xsaW5nRWZm ZWN0c0NvbnRyb2xsZXI6OmhhbmRsZVdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50 JiB3aGVlCiAgICAgICAgICAgICBpZiAoZGVsdGFYKSB7CiAgICAgICAgICAgICAgICAgaWYgKCFt X2NsaWVudC5hbGxvd3NIb3Jpem9udGFsU3RyZXRjaGluZyh3aGVlbEV2ZW50KSkgewogICAgICAg ICAgICAgICAgICAgICBkZWx0YVggPSAwOwotICAgICAgICAgICAgICAgICAgICBldmVudENvYWxl c2NlZERlbHRhWCA9IDA7CisgICAgICAgICAgICAgICAgICAgIGV2ZW50Q29hbGVzY2VkRGVsdGEu c2V0V2lkdGgoMCk7CiAgICAgICAgICAgICAgICAgICAgIGhhbmRsZWQgPSBmYWxzZTsKICAgICAg ICAgICAgICAgICB9IGVsc2UgaWYgKCFpc0hvcml6b250YWxseVN0cmV0Y2hlZCAmJiAhbV9jbGll bnQuaXNQaW5uZWRGb3JTY3JvbGxEZWx0YShGbG9hdFNpemUoZGVsdGFYLCAwKSkpIHsKICAgICAg ICAgICAgICAgICAgICAgZGVsdGFYICo9IHNjcm9sbFdoZWVsTXVsdGlwbGllcigpOwpAQCAtMjU5 LDcgKzI0OSw3IEBAIGJvb2wgU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXI6OmhhbmRsZVdoZWVs RXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiB3aGVlCiAgICAgICAgICAgICBpZiAoZGVs dGFZKSB7CiAgICAgICAgICAgICAgICAgaWYgKCFtX2NsaWVudC5hbGxvd3NWZXJ0aWNhbFN0cmV0 Y2hpbmcod2hlZWxFdmVudCkpIHsKICAgICAgICAgICAgICAgICAgICAgZGVsdGFZID0gMDsKLSAg ICAgICAgICAgICAgICAgICAgZXZlbnRDb2FsZXNjZWREZWx0YVkgPSAwOworICAgICAgICAgICAg ICAgICAgICBldmVudENvYWxlc2NlZERlbHRhLnNldEhlaWdodCgwKTsKICAgICAgICAgICAgICAg ICAgICAgaGFuZGxlZCA9IGZhbHNlOwogICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAoIWlzVmVy dGljYWxseVN0cmV0Y2hlZCAmJiAhbV9jbGllbnQuaXNQaW5uZWRGb3JTY3JvbGxEZWx0YShGbG9h dFNpemUoMCwgZGVsdGFZKSkpIHsKICAgICAgICAgICAgICAgICAgICAgZGVsdGFZICo9IHNjcm9s bFdoZWVsTXVsdGlwbGllcigpOwpAQCAtMjcyLDcgKzI2Miw3IEBAIGJvb2wgU2Nyb2xsaW5nRWZm ZWN0c0NvbnRyb2xsZXI6OmhhbmRsZVdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50 JiB3aGVlCiAgICAgICAgICAgICBJbnRTaXplIHN0cmV0Y2hBbW91bnQgPSBtX2NsaWVudC5zdHJl dGNoQW1vdW50KCk7CiAKICAgICAgICAgICAgIGlmIChtX21vbWVudHVtU2Nyb2xsSW5Qcm9ncmVz cykgewotICAgICAgICAgICAgICAgIGlmICgobV9jbGllbnQuaXNQaW5uZWRGb3JTY3JvbGxEZWx0 YShGbG9hdFNpemUoZXZlbnRDb2FsZXNjZWREZWx0YVgsIGV2ZW50Q29hbGVzY2VkRGVsdGFZKSkg fHwgKGZhYnNmKGV2ZW50Q29hbGVzY2VkRGVsdGFYKSArIGZhYnNmKGV2ZW50Q29hbGVzY2VkRGVs dGFZKSA8PSAwKSkgJiYgbV9sYXN0TW9tZW50dW1TY3JvbGxUaW1lc3RhbXApIHsKKyAgICAgICAg ICAgICAgICBpZiAoKG1fY2xpZW50LmlzUGlubmVkRm9yU2Nyb2xsRGVsdGEoZXZlbnRDb2FsZXNj ZWREZWx0YSkgfHwgZXZlbnRDb2FsZXNjZWREZWx0YS5pc1plcm8oKSkgJiYgbV9sYXN0TW9tZW50 dW1TY3JvbGxUaW1lc3RhbXApIHsKICAgICAgICAgICAgICAgICAgICAgbV9pZ25vcmVNb21lbnR1 bVNjcm9sbHMgPSB0cnVlOwogICAgICAgICAgICAgICAgICAgICBtX21vbWVudHVtU2Nyb2xsSW5Q cm9ncmVzcyA9IGZhbHNlOwogICAgICAgICAgICAgICAgICAgICBzbmFwUnViYmVyQmFuZCgpOwpA QCAtMjg0LDcgKzI3NCw3IEBAIGJvb2wgU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXI6OmhhbmRs ZVdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiB3aGVlCiAKICAgICAgICAgICAg IEZsb2F0U2l6ZSBkYW1wZWREZWx0YShjZWlsZihlbGFzdGljRGVsdGFGb3JSZWJvdW5kRGVsdGEo bV9zdHJldGNoU2Nyb2xsRm9yY2Uud2lkdGgoKSkpLCBjZWlsZihlbGFzdGljRGVsdGFGb3JSZWJv dW5kRGVsdGEobV9zdHJldGNoU2Nyb2xsRm9yY2UuaGVpZ2h0KCkpKSk7CiAKLSAgICAgICAgICAg IExPR19XSVRIX1NUUkVBTShTY3JvbGxBbmltYXRpb25zLCBzdHJlYW0gPDwgIlNjcm9sbGluZ0Vm ZmVjdHNDb250cm9sbGVyOjpoYW5kbGVXaGVlbEV2ZW50KCkgLSBvdmVyc2Nyb2xsZWQgYnkgIiA8 PCBtX292ZXJmbG93U2Nyb2xsRGVsdGEgPDwgIiBzdHJldGNoU2Nyb2xsRm9yY2UgIiA8PCBtX3N0 cmV0Y2hTY3JvbGxGb3JjZSA8PCAiIG1vdmUgZGVsdGEgIiA8PCBGbG9hdFNpemUoZGVsdGFYLCBk ZWx0YVkpIDw8ICIgZGFtcGVkRGVsdGEgIiA8PCBkYW1wZWREZWx0YSk7CisgICAgICAgICAgICBM T0dfV0lUSF9TVFJFQU0oU2Nyb2xsQW5pbWF0aW9ucywgc3RyZWFtIDw8ICJTY3JvbGxpbmdFZmZl Y3RzQ29udHJvbGxlcjo6aGFuZGxlV2hlZWxFdmVudCgpIC0gc3RyZXRjaFNjcm9sbEZvcmNlICIg PDwgbV9zdHJldGNoU2Nyb2xsRm9yY2UgPDwgIiBtb3ZlIGRlbHRhICIgPDwgRmxvYXRTaXplKGRl bHRhWCwgZGVsdGFZKSA8PCAiIGRhbXBlZERlbHRhICIgPDwgZGFtcGVkRGVsdGEpOwogCiAgICAg ICAgICAgICBtX2NsaWVudC5pbW1lZGlhdGVTY3JvbGxCeVdpdGhvdXRDb250ZW50RWRnZUNvbnN0 cmFpbnRzKGRhbXBlZERlbHRhIC0gc3RyZXRjaEFtb3VudCk7CiAgICAgICAgIH0KQEAgLTMwMywx NSArMjkzLDcgQEAgYm9vbCBTY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlcjo6aGFuZGxlV2hlZWxF dmVudChjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmIHdoZWUKIAogRmxvYXRTaXplIFNjcm9sbGlu Z0VmZmVjdHNDb250cm9sbGVyOjp3aGVlbERlbHRhQmlhc2luZ1Rvd2FyZHNWZXJ0aWNhbChjb25z dCBQbGF0Zm9ybVdoZWVsRXZlbnQmIHdoZWVsRXZlbnQpCiB7Ci0gICAgYXV0byBkZWx0YVggPSB3 aGVlbEV2ZW50LmRlbHRhWCgpOwotICAgIGF1dG8gZGVsdGFZID0gd2hlZWxFdmVudC5kZWx0YVko KTsKLQotICAgIGlmIChmYWJzZihkZWx0YVkpID49IGZhYnNmKGRlbHRhWCkpCi0gICAgICAgIGRl bHRhWCA9IDA7Ci0gICAgZWxzZQotICAgICAgICBkZWx0YVkgPSAwOwotCi0gICAgcmV0dXJuIHsg ZGVsdGFYLCBkZWx0YVkgfTsKKyAgICByZXR1cm4gY29udmVydFRvUHJvbWluZW50QXhpc0Zhdm9y aW5nVmVydGljYWwod2hlZWxFdmVudC5kZWx0YSgpKTsKIH0KIAogc3RkOjpvcHRpb25hbDxTY3Jv bGxEaXJlY3Rpb24+IFNjcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyOjpkaXJlY3Rpb25Gcm9tRXZl bnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiB3aGVlbEV2ZW50LCBzdGQ6Om9wdGlvbmFsPFNj cm9sbEV2ZW50QXhpcz4gYXhpcywgV2hlZWxBeGlzQmlhcyBiaWFzKQo=