230451 2021-09-18 16:43:05 -0700 Scroll offsets in ScrollingMomentumCalculator should be FloatPoint, not FloatSize 2021-09-18 17:57: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 tonikitoo webkit-bug-importer wenson_hsieh oldest_to_newest 1794820 0 simon.fraser 2021-09-18 16:43:05 -0700 Scroll offsets in ScrollingMomentumCalculator should be FloatPoint, not FloatSize 1794821 1 438570 simon.fraser 2021-09-18 16:43:59 -0700 Created attachment 438570 Patch 1794823 2 ews-feeder 2021-09-18 17:56:22 -0700 Committed r282732 (241869@main): <https://commits.webkit.org/241869@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 438570. 1794824 3 webkit-bug-importer 2021-09-18 17:57:14 -0700 <rdar://problem/83275268> 438570 2021-09-18 16:43:59 -0700 2021-09-18 17:56:23 -0700 Patch bug-230451-20210918164359.patch text/plain 13479 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyNzMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGE5ZTM1YTYzY2E3Njlh ZTQwY2RjOTA3OTBiZGQ3NjY4YWQxOWMwNy4uZTM1M2JjOWUxNjEwMGJmN2QxNDNkNzJhMGFjZjg3 MzZhMGM3ZTNhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIxLTA5LTE4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFNjcm9sbCBvZmZz ZXRzIGluIFNjcm9sbGluZ01vbWVudHVtQ2FsY3VsYXRvciBzaG91bGQgYmUgRmxvYXRQb2ludCwg bm90IEZsb2F0U2l6ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjMwNDUxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgU2Nyb2xsIG9mZnNldHMgYXJlIGdlbmVyYWxseSByZXByZXNlbnRlZCBhcyBJbnRQb2lu dCBvciBGbG9hdFBvaW50LiBIYXZlCisgICAgICAgIFNjcm9sbGluZ01vbWVudHVtQ2FsY3VsYXRv ciBjb25mb3JtIHRvIHRoaXMgY29udmVudGlvbi4KKworICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5n L1Njcm9sbGluZ01vbWVudHVtQ2FsY3VsYXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3Jv bGxpbmdNb21lbnR1bUNhbGN1bGF0b3I6OlNjcm9sbGluZ01vbWVudHVtQ2FsY3VsYXRvcik6Cisg ICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdNb21lbnR1bUNhbGN1bGF0b3I6OnNldFJldGFyZ2V0 ZWRTY3JvbGxPZmZzZXQpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nTW9tZW50dW1DYWxj dWxhdG9yOjpwcmVkaWN0ZWREZXN0aW5hdGlvbk9mZnNldCk6CisgICAgICAgIChXZWJDb3JlOjpC YXNpY1Njcm9sbGluZ01vbWVudHVtQ2FsY3VsYXRvcjo6bGluZWFybHlJbnRlcnBvbGF0ZWRPZmZz ZXRBdFByb2dyZXNzKToKKyAgICAgICAgKFdlYkNvcmU6OkJhc2ljU2Nyb2xsaW5nTW9tZW50dW1D YWxjdWxhdG9yOjpjdWJpY2FsbHlJbnRlcnBvbGF0ZWRPZmZzZXRBdFByb2dyZXNzIGNvbnN0KToK KyAgICAgICAgKFdlYkNvcmU6OkJhc2ljU2Nyb2xsaW5nTW9tZW50dW1DYWxjdWxhdG9yOjpzY3Jv bGxPZmZzZXRBZnRlckVsYXBzZWRUaW1lKToKKyAgICAgICAgKFdlYkNvcmU6OkJhc2ljU2Nyb2xs aW5nTW9tZW50dW1DYWxjdWxhdG9yOjppbml0aWFsaXplSW50ZXJwb2xhdGlvbkNvZWZmaWNpZW50 c0lmTmVjZXNzYXJ5KToKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdNb21lbnR1 bUNhbGN1bGF0b3IuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ01vbWVudHVtQ2FsY3Vs YXRvcjo6cmV0YXJnZXRlZFNjcm9sbE9mZnNldCBjb25zdCk6CisgICAgICAgICogcGFnZS9zY3Jv bGxpbmcvbWFjL1Njcm9sbGluZ01vbWVudHVtQ2FsY3VsYXRvck1hYy5oOgorICAgICAgICAqIHBh Z2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdNb21lbnR1bUNhbGN1bGF0b3JNYWMubW06CisgICAg ICAgIChXZWJDb3JlOjpTY3JvbGxpbmdNb21lbnR1bUNhbGN1bGF0b3JNYWM6OnNjcm9sbE9mZnNl dEFmdGVyRWxhcHNlZFRpbWUpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nTW9tZW50dW1D YWxjdWxhdG9yTWFjOjpwcmVkaWN0ZWREZXN0aW5hdGlvbk9mZnNldCk6CisgICAgICAgIChXZWJD b3JlOjpTY3JvbGxpbmdNb21lbnR1bUNhbGN1bGF0b3JNYWM6OnJldGFyZ2V0ZWRTY3JvbGxPZmZz ZXREaWRDaGFuZ2UpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nTW9tZW50dW1DYWxjdWxh dG9yTWFjOjplbnN1cmVQbGF0Zm9ybU1vbWVudHVtQ2FsY3VsYXRvcik6CisKIDIwMjEtMDktMTgg IFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgSGF2ZSBT Y3JvbGxBbmltYXRpb24gd29yayBpbiB0ZXJtcyBvZiBvZmZzZXRzLCBub3QgcG9zaXRpb25zCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdNb21lbnR1 bUNhbGN1bGF0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5n TW9tZW50dW1DYWxjdWxhdG9yLmNwcAppbmRleCAxYmZlZmFhY2I4YzcxMTUwNzM1YzQ3NTgwY2Iy Y2ZhMGI4NjQ2NTRhLi5hYzA2OGMzNjUwYTAzOGRjODE3YmE5ZGUzMzIwOTNiNGM3NTg2MmE0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdNb21lbnR1 bUNhbGN1bGF0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9s bGluZ01vbWVudHVtQ2FsY3VsYXRvci5jcHAKQEAgLTQ1LDEzICs0NSwxMyBAQCBzdGF0aWMgaW5s aW5lIGZsb2F0IHByb2plY3RlZEluZXJ0aWFsU2Nyb2xsRGlzdGFuY2UoZmxvYXQgaW5pdGlhbFdo ZWVsRGVsdGEpCiBTY3JvbGxpbmdNb21lbnR1bUNhbGN1bGF0b3I6OlNjcm9sbGluZ01vbWVudHVt Q2FsY3VsYXRvcihjb25zdCBGbG9hdFNpemUmIHZpZXdwb3J0U2l6ZSwgY29uc3QgRmxvYXRTaXpl JiBjb250ZW50U2l6ZSwgY29uc3QgRmxvYXRQb2ludCYgaW5pdGlhbE9mZnNldCwgY29uc3QgRmxv YXRTaXplJiBpbml0aWFsRGVsdGEsIGNvbnN0IEZsb2F0U2l6ZSYgaW5pdGlhbFZlbG9jaXR5KQog ICAgIDogbV9pbml0aWFsRGVsdGEoaW5pdGlhbERlbHRhKQogICAgICwgbV9pbml0aWFsVmVsb2Np dHkoaW5pdGlhbFZlbG9jaXR5KQotICAgICwgbV9pbml0aWFsU2Nyb2xsT2Zmc2V0KGluaXRpYWxP ZmZzZXQueCgpLCBpbml0aWFsT2Zmc2V0LnkoKSkKKyAgICAsIG1faW5pdGlhbFNjcm9sbE9mZnNl dChpbml0aWFsT2Zmc2V0KQogICAgICwgbV92aWV3cG9ydFNpemUodmlld3BvcnRTaXplKQogICAg ICwgbV9jb250ZW50U2l6ZShjb250ZW50U2l6ZSkKIHsKIH0KIAotdm9pZCBTY3JvbGxpbmdNb21l bnR1bUNhbGN1bGF0b3I6OnNldFJldGFyZ2V0ZWRTY3JvbGxPZmZzZXQoY29uc3QgRmxvYXRTaXpl JiB0YXJnZXQpCit2b2lkIFNjcm9sbGluZ01vbWVudHVtQ2FsY3VsYXRvcjo6c2V0UmV0YXJnZXRl ZFNjcm9sbE9mZnNldChjb25zdCBGbG9hdFBvaW50JiB0YXJnZXQpCiB7CiAgICAgaWYgKG1fcmV0 YXJnZXRlZFNjcm9sbE9mZnNldCAmJiBtX3JldGFyZ2V0ZWRTY3JvbGxPZmZzZXQgPT0gdGFyZ2V0 KQogICAgICAgICByZXR1cm47CkBAIC02MCwxMCArNjAsMTAgQEAgdm9pZCBTY3JvbGxpbmdNb21l bnR1bUNhbGN1bGF0b3I6OnNldFJldGFyZ2V0ZWRTY3JvbGxPZmZzZXQoY29uc3QgRmxvYXRTaXpl JiB0YXIKICAgICByZXRhcmdldGVkU2Nyb2xsT2Zmc2V0RGlkQ2hhbmdlKCk7CiB9CiAKLUZsb2F0 U2l6ZSBTY3JvbGxpbmdNb21lbnR1bUNhbGN1bGF0b3I6OnByZWRpY3RlZERlc3RpbmF0aW9uT2Zm c2V0KCkKK0Zsb2F0UG9pbnQgU2Nyb2xsaW5nTW9tZW50dW1DYWxjdWxhdG9yOjpwcmVkaWN0ZWRE ZXN0aW5hdGlvbk9mZnNldCgpCiB7Ci0gICAgZmxvYXQgaW5pdGlhbE9mZnNldFggPSBjbGFtcFRv PGZsb2F0PihtX2luaXRpYWxTY3JvbGxPZmZzZXQud2lkdGgoKSArIHByb2plY3RlZEluZXJ0aWFs U2Nyb2xsRGlzdGFuY2UobV9pbml0aWFsRGVsdGEud2lkdGgoKSksIDAsIG1fY29udGVudFNpemUu d2lkdGgoKSAtIG1fdmlld3BvcnRTaXplLndpZHRoKCkpOwotICAgIGZsb2F0IGluaXRpYWxPZmZz ZXRZID0gY2xhbXBUbzxmbG9hdD4obV9pbml0aWFsU2Nyb2xsT2Zmc2V0LmhlaWdodCgpICsgcHJv amVjdGVkSW5lcnRpYWxTY3JvbGxEaXN0YW5jZShtX2luaXRpYWxEZWx0YS5oZWlnaHQoKSksIDAs IG1fY29udGVudFNpemUuaGVpZ2h0KCkgLSBtX3ZpZXdwb3J0U2l6ZS5oZWlnaHQoKSk7CisgICAg ZmxvYXQgaW5pdGlhbE9mZnNldFggPSBjbGFtcFRvPGZsb2F0PihtX2luaXRpYWxTY3JvbGxPZmZz ZXQueCgpICsgcHJvamVjdGVkSW5lcnRpYWxTY3JvbGxEaXN0YW5jZShtX2luaXRpYWxEZWx0YS53 aWR0aCgpKSwgMCwgbV9jb250ZW50U2l6ZS53aWR0aCgpIC0gbV92aWV3cG9ydFNpemUud2lkdGgo KSk7CisgICAgZmxvYXQgaW5pdGlhbE9mZnNldFkgPSBjbGFtcFRvPGZsb2F0PihtX2luaXRpYWxT Y3JvbGxPZmZzZXQueSgpICsgcHJvamVjdGVkSW5lcnRpYWxTY3JvbGxEaXN0YW5jZShtX2luaXRp YWxEZWx0YS5oZWlnaHQoKSksIDAsIG1fY29udGVudFNpemUuaGVpZ2h0KCkgLSBtX3ZpZXdwb3J0 U2l6ZS5oZWlnaHQoKSk7CiAgICAgcmV0dXJuIHsgaW5pdGlhbE9mZnNldFgsIGluaXRpYWxPZmZz ZXRZIH07CiB9CiAKQEAgLTg1LDE1ICs4NSwxNSBAQCBCYXNpY1Njcm9sbGluZ01vbWVudHVtQ2Fs Y3VsYXRvcjo6QmFzaWNTY3JvbGxpbmdNb21lbnR1bUNhbGN1bGF0b3IoY29uc3QgRmxvYXRTaQog ewogfQogCi1GbG9hdFNpemUgQmFzaWNTY3JvbGxpbmdNb21lbnR1bUNhbGN1bGF0b3I6OmxpbmVh cmx5SW50ZXJwb2xhdGVkT2Zmc2V0QXRQcm9ncmVzcyhmbG9hdCBwcm9ncmVzcykKK0Zsb2F0UG9p bnQgQmFzaWNTY3JvbGxpbmdNb21lbnR1bUNhbGN1bGF0b3I6OmxpbmVhcmx5SW50ZXJwb2xhdGVk T2Zmc2V0QXRQcm9ncmVzcyhmbG9hdCBwcm9ncmVzcykKIHsKICAgICByZXR1cm4gbV9pbml0aWFs U2Nyb2xsT2Zmc2V0ICsgcHJvZ3Jlc3MgKiAocmV0YXJnZXRlZFNjcm9sbE9mZnNldCgpIC0gbV9p bml0aWFsU2Nyb2xsT2Zmc2V0KTsKIH0KIAotRmxvYXRTaXplIEJhc2ljU2Nyb2xsaW5nTW9tZW50 dW1DYWxjdWxhdG9yOjpjdWJpY2FsbHlJbnRlcnBvbGF0ZWRPZmZzZXRBdFByb2dyZXNzKGZsb2F0 IHByb2dyZXNzKSBjb25zdAorRmxvYXRQb2ludCBCYXNpY1Njcm9sbGluZ01vbWVudHVtQ2FsY3Vs YXRvcjo6Y3ViaWNhbGx5SW50ZXJwb2xhdGVkT2Zmc2V0QXRQcm9ncmVzcyhmbG9hdCBwcm9ncmVz cykgY29uc3QKIHsKICAgICBBU1NFUlQoIW1fZm9yY2VMaW5lYXJBbmltYXRpb25DdXJ2ZSk7Ci0g ICAgRmxvYXRTaXplIGludGVycG9sYXRlZFBvaW50OworICAgIEZsb2F0UG9pbnQgaW50ZXJwb2xh dGVkUG9pbnQ7CiAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCA0OyArK2kpCiAgICAgICAgIGludGVy cG9sYXRlZFBvaW50ICs9IHN0ZDo6cG93KHByb2dyZXNzLCBpKSAqIG1fc25hcEFuaW1hdGlvbkN1 cnZlQ29lZmZpY2llbnRzW2ldOwogCkBAIC0xMDksOCArMTA5LDcgQEAgRmxvYXRQb2ludCBCYXNp Y1Njcm9sbGluZ01vbWVudHVtQ2FsY3VsYXRvcjo6c2Nyb2xsT2Zmc2V0QWZ0ZXJFbGFwc2VkVGlt ZShTZWNvbmQKICAgICB9CiAKICAgICBmbG9hdCBwcm9ncmVzcyA9IGFuaW1hdGlvblByb2dyZXNz QWZ0ZXJFbGFwc2VkVGltZShlbGFwc2VkVGltZSk7Ci0gICAgYXV0byBvZmZzZXRBc1NpemUgPSBt X2ZvcmNlTGluZWFyQW5pbWF0aW9uQ3VydmUgPyBsaW5lYXJseUludGVycG9sYXRlZE9mZnNldEF0 UHJvZ3Jlc3MocHJvZ3Jlc3MpIDogY3ViaWNhbGx5SW50ZXJwb2xhdGVkT2Zmc2V0QXRQcm9ncmVz cyhwcm9ncmVzcyk7Ci0gICAgcmV0dXJuIEZsb2F0UG9pbnQob2Zmc2V0QXNTaXplLndpZHRoKCks IG9mZnNldEFzU2l6ZS5oZWlnaHQoKSk7CisgICAgcmV0dXJuIG1fZm9yY2VMaW5lYXJBbmltYXRp b25DdXJ2ZSA/IGxpbmVhcmx5SW50ZXJwb2xhdGVkT2Zmc2V0QXRQcm9ncmVzcyhwcm9ncmVzcykg OiBjdWJpY2FsbHlJbnRlcnBvbGF0ZWRPZmZzZXRBdFByb2dyZXNzKHByb2dyZXNzKTsKIH0KIAog U2Vjb25kcyBCYXNpY1Njcm9sbGluZ01vbWVudHVtQ2FsY3VsYXRvcjo6YW5pbWF0aW9uRHVyYXRp b24oKQpAQCAtMTYzLDEyICsxNjIsMTMgQEAgdm9pZCBCYXNpY1Njcm9sbGluZ01vbWVudHVtQ2Fs Y3VsYXRvcjo6aW5pdGlhbGl6ZUludGVycG9sYXRpb25Db2VmZmljaWVudHNJZk5lY2UKICAgICB9 CiAKICAgICBmbG9hdCBzaWRlTGVuZ3RoID0gc3RhcnRUb0VuZERpc3RhbmNlIC8gKDIuMGYgKiBj b3NUaGV0YSArIDEuMGYpOwotICAgIEZsb2F0U2l6ZSBjb250cm9sVmVjdG9yMSA9IG1faW5pdGlh bFNjcm9sbE9mZnNldCArIHNpZGVMZW5ndGggKiBtX2luaXRpYWxEZWx0YSAvIGluaXRpYWxEZWx0 YU1hZ25pdHVkZTsKKyAgICBhdXRvIGluaXRpYWxPZmZzZXRBc1NpemUgPSB0b0Zsb2F0U2l6ZSht X2luaXRpYWxTY3JvbGxPZmZzZXQpOworICAgIEZsb2F0U2l6ZSBjb250cm9sVmVjdG9yMSA9IGlu aXRpYWxPZmZzZXRBc1NpemUgKyBzaWRlTGVuZ3RoICogbV9pbml0aWFsRGVsdGEgLyBpbml0aWFs RGVsdGFNYWduaXR1ZGU7CiAgICAgRmxvYXRTaXplIGNvbnRyb2xWZWN0b3IyID0gY29udHJvbFZl Y3RvcjEgKyAoc2lkZUxlbmd0aCAqIHN0YXJ0VG9FbmRWZWN0b3IgLyBzdGFydFRvRW5kRGlzdGFu Y2UpOwotICAgIG1fc25hcEFuaW1hdGlvbkN1cnZlQ29lZmZpY2llbnRzWzBdID0gbV9pbml0aWFs U2Nyb2xsT2Zmc2V0OwotICAgIG1fc25hcEFuaW1hdGlvbkN1cnZlQ29lZmZpY2llbnRzWzFdID0g MyAqIChjb250cm9sVmVjdG9yMSAtIG1faW5pdGlhbFNjcm9sbE9mZnNldCk7Ci0gICAgbV9zbmFw QW5pbWF0aW9uQ3VydmVDb2VmZmljaWVudHNbMl0gPSAzICogKG1faW5pdGlhbFNjcm9sbE9mZnNl dCAtIDIgKiBjb250cm9sVmVjdG9yMSArIGNvbnRyb2xWZWN0b3IyKTsKLSAgICBtX3NuYXBBbmlt YXRpb25DdXJ2ZUNvZWZmaWNpZW50c1szXSA9IDMgKiAoY29udHJvbFZlY3RvcjEgLSBjb250cm9s VmVjdG9yMikgLSBtX2luaXRpYWxTY3JvbGxPZmZzZXQgKyByZXRhcmdldGVkU2Nyb2xsT2Zmc2V0 KCk7CisgICAgbV9zbmFwQW5pbWF0aW9uQ3VydmVDb2VmZmljaWVudHNbMF0gPSBpbml0aWFsT2Zm c2V0QXNTaXplOworICAgIG1fc25hcEFuaW1hdGlvbkN1cnZlQ29lZmZpY2llbnRzWzFdID0gMyAq IChjb250cm9sVmVjdG9yMSAtIGluaXRpYWxPZmZzZXRBc1NpemUpOworICAgIG1fc25hcEFuaW1h dGlvbkN1cnZlQ29lZmZpY2llbnRzWzJdID0gMyAqIChpbml0aWFsT2Zmc2V0QXNTaXplIC0gMiAq IGNvbnRyb2xWZWN0b3IxICsgY29udHJvbFZlY3RvcjIpOworICAgIG1fc25hcEFuaW1hdGlvbkN1 cnZlQ29lZmZpY2llbnRzWzNdID0gMyAqIChjb250cm9sVmVjdG9yMSAtIGNvbnRyb2xWZWN0b3Iy KSAtIGluaXRpYWxPZmZzZXRBc1NpemUgKyB0b0Zsb2F0U2l6ZShyZXRhcmdldGVkU2Nyb2xsT2Zm c2V0KCkpOwogICAgIG1fZm9yY2VMaW5lYXJBbmltYXRpb25DdXJ2ZSA9IGZhbHNlOwogfQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdNb21lbnR1 bUNhbGN1bGF0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ01v bWVudHVtQ2FsY3VsYXRvci5oCmluZGV4IGVkY2RjZjdjNWM3MTQ5NjljNTQ4MTc0ZDNiN2FhNTkz MjA2YWVlYzYuLjRjNzUxMzNmZjgxZWM0MWM0N2U0OWIwODU1ODhiODBhM2YzZGUyZTEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ01vbWVudHVtQ2Fs Y3VsYXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ01v bWVudHVtQ2FsY3VsYXRvci5oCkBAIC0zNywyOCArMzcsMzAgQEAgY2xhc3MgRmxvYXRTaXplOwog Y2xhc3MgU2Nyb2xsaW5nTW9tZW50dW1DYWxjdWxhdG9yIHsKICAgICBXVEZfTUFLRV9GQVNUX0FM TE9DQVRFRDsKIHB1YmxpYzoKLSAgICBTY3JvbGxpbmdNb21lbnR1bUNhbGN1bGF0b3IoY29uc3Qg RmxvYXRTaXplJiB2aWV3cG9ydFNpemUsIGNvbnN0IEZsb2F0U2l6ZSYgY29udGVudFNpemUsIGNv bnN0IEZsb2F0UG9pbnQmIGluaXRpYWxPZmZzZXQsIGNvbnN0IEZsb2F0U2l6ZSYgaW5pdGlhbERl bHRhLCBjb25zdCBGbG9hdFNpemUmIGluaXRpYWxWZWxvY2l0eSk7Ci0gICAgc3RhdGljIHN0ZDo6 dW5pcXVlX3B0cjxTY3JvbGxpbmdNb21lbnR1bUNhbGN1bGF0b3I+IGNyZWF0ZShjb25zdCBGbG9h dFNpemUmIHZpZXdwb3J0U2l6ZSwgY29uc3QgRmxvYXRTaXplJiBjb250ZW50U2l6ZSwgY29uc3Qg RmxvYXRQb2ludCYgaW5pdGlhbE9mZnNldCwgY29uc3QgRmxvYXRTaXplJiBpbml0aWFsRGVsdGEs IGNvbnN0IEZsb2F0U2l6ZSYgaW5pdGlhbFZlbG9jaXR5KTsKICAgICBXRUJDT1JFX0VYUE9SVCBz dGF0aWMgdm9pZCBzZXRQbGF0Zm9ybU1vbWVudHVtU2Nyb2xsaW5nUHJlZGljdGlvbkVuYWJsZWQo Ym9vbCk7CisKKyAgICBzdGF0aWMgc3RkOjp1bmlxdWVfcHRyPFNjcm9sbGluZ01vbWVudHVtQ2Fs Y3VsYXRvcj4gY3JlYXRlKGNvbnN0IEZsb2F0U2l6ZSYgdmlld3BvcnRTaXplLCBjb25zdCBGbG9h dFNpemUmIGNvbnRlbnRTaXplLCBjb25zdCBGbG9hdFBvaW50JiBpbml0aWFsT2Zmc2V0LCBjb25z dCBGbG9hdFNpemUmIGluaXRpYWxEZWx0YSwgY29uc3QgRmxvYXRTaXplJiBpbml0aWFsVmVsb2Np dHkpOworCisgICAgU2Nyb2xsaW5nTW9tZW50dW1DYWxjdWxhdG9yKGNvbnN0IEZsb2F0U2l6ZSYg dmlld3BvcnRTaXplLCBjb25zdCBGbG9hdFNpemUmIGNvbnRlbnRTaXplLCBjb25zdCBGbG9hdFBv aW50JiBpbml0aWFsT2Zmc2V0LCBjb25zdCBGbG9hdFNpemUmIGluaXRpYWxEZWx0YSwgY29uc3Qg RmxvYXRTaXplJiBpbml0aWFsVmVsb2NpdHkpOwogICAgIHZpcnR1YWwgflNjcm9sbGluZ01vbWVu dHVtQ2FsY3VsYXRvcigpID0gZGVmYXVsdDsKIAogICAgIHZpcnR1YWwgRmxvYXRQb2ludCBzY3Jv bGxPZmZzZXRBZnRlckVsYXBzZWRUaW1lKFNlY29uZHMpID0gMDsKICAgICB2aXJ0dWFsIFNlY29u ZHMgYW5pbWF0aW9uRHVyYXRpb24oKSA9IDA7Ci0gICAgdmlydHVhbCBGbG9hdFNpemUgcHJlZGlj dGVkRGVzdGluYXRpb25PZmZzZXQoKTsKLSAgICB2b2lkIHNldFJldGFyZ2V0ZWRTY3JvbGxPZmZz ZXQoY29uc3QgRmxvYXRTaXplJik7CisgICAgdmlydHVhbCBGbG9hdFBvaW50IHByZWRpY3RlZERl c3RpbmF0aW9uT2Zmc2V0KCk7CisgICAgdm9pZCBzZXRSZXRhcmdldGVkU2Nyb2xsT2Zmc2V0KGNv bnN0IEZsb2F0UG9pbnQmKTsKIAogcHJvdGVjdGVkOgotICAgIGNvbnN0IEZsb2F0U2l6ZSYgcmV0 YXJnZXRlZFNjcm9sbE9mZnNldCgpIGNvbnN0IHsgcmV0dXJuIG1fcmV0YXJnZXRlZFNjcm9sbE9m ZnNldC52YWx1ZSgpOyB9CisgICAgY29uc3QgRmxvYXRQb2ludCYgcmV0YXJnZXRlZFNjcm9sbE9m ZnNldCgpIGNvbnN0IHsgcmV0dXJuIG1fcmV0YXJnZXRlZFNjcm9sbE9mZnNldC52YWx1ZSgpOyB9 CiAgICAgdmlydHVhbCB2b2lkIHJldGFyZ2V0ZWRTY3JvbGxPZmZzZXREaWRDaGFuZ2UoKSB7IH0K IAogICAgIEZsb2F0U2l6ZSBtX2luaXRpYWxEZWx0YTsKICAgICBGbG9hdFNpemUgbV9pbml0aWFs VmVsb2NpdHk7Ci0gICAgRmxvYXRTaXplIG1faW5pdGlhbFNjcm9sbE9mZnNldDsKKyAgICBGbG9h dFBvaW50IG1faW5pdGlhbFNjcm9sbE9mZnNldDsKICAgICBGbG9hdFNpemUgbV92aWV3cG9ydFNp emU7CiAgICAgRmxvYXRTaXplIG1fY29udGVudFNpemU7CiAKIHByaXZhdGU6Ci0gICAgc3RkOjpv cHRpb25hbDxGbG9hdFNpemU+IG1fcmV0YXJnZXRlZFNjcm9sbE9mZnNldDsKKyAgICBzdGQ6Om9w dGlvbmFsPEZsb2F0UG9pbnQ+IG1fcmV0YXJnZXRlZFNjcm9sbE9mZnNldDsKIH07CiAKIGNsYXNz IEJhc2ljU2Nyb2xsaW5nTW9tZW50dW1DYWxjdWxhdG9yIGZpbmFsIDogcHVibGljIFNjcm9sbGlu Z01vbWVudHVtQ2FsY3VsYXRvciB7CkBAIC03MSw4ICs3Myw4IEBAIHByaXZhdGU6CiAgICAgdm9p ZCBpbml0aWFsaXplSW50ZXJwb2xhdGlvbkNvZWZmaWNpZW50c0lmTmVjZXNzYXJ5KCk7CiAgICAg dm9pZCBpbml0aWFsaXplU25hcFByb2dyZXNzQ3VydmUoKTsKICAgICBmbG9hdCBhbmltYXRpb25Q cm9ncmVzc0FmdGVyRWxhcHNlZFRpbWUoU2Vjb25kcykgY29uc3Q7Ci0gICAgRmxvYXRTaXplIGxp bmVhcmx5SW50ZXJwb2xhdGVkT2Zmc2V0QXRQcm9ncmVzcyhmbG9hdCBwcm9ncmVzcyk7Ci0gICAg RmxvYXRTaXplIGN1YmljYWxseUludGVycG9sYXRlZE9mZnNldEF0UHJvZ3Jlc3MoZmxvYXQgcHJv Z3Jlc3MpIGNvbnN0OworICAgIEZsb2F0UG9pbnQgbGluZWFybHlJbnRlcnBvbGF0ZWRPZmZzZXRB dFByb2dyZXNzKGZsb2F0IHByb2dyZXNzKTsKKyAgICBGbG9hdFBvaW50IGN1YmljYWxseUludGVy cG9sYXRlZE9mZnNldEF0UHJvZ3Jlc3MoZmxvYXQgcHJvZ3Jlc3MpIGNvbnN0OwogCiAgICAgZmxv YXQgbV9zbmFwQW5pbWF0aW9uQ3VydmVNYWduaXR1ZGUgeyAwIH07CiAgICAgZmxvYXQgbV9zbmFw QW5pbWF0aW9uRGVjYXlGYWN0b3IgeyAwIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nTW9tZW50dW1DYWxjdWxhdG9yTWFjLmggYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nTW9tZW50dW1DYWxjdWxhdG9y TWFjLmgKaW5kZXggODlmMzM2YjZlOWM2MDVjMmY5NDQ4Y2RmMWFjZTIyZTc0OGQ2NTIxYS4uM2I1 N2Y1MzViZTY2MWIyMTM3OTRjNzkyYWY2NzQ1YTNkYTIwYjJiNiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ01vbWVudHVtQ2FsY3VsYXRvck1h Yy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdNb21l bnR1bUNhbGN1bGF0b3JNYWMuaApAQCAtMzksOCArMzksOSBAQCBwdWJsaWM6CiBwcml2YXRlOgog ICAgIEZsb2F0UG9pbnQgc2Nyb2xsT2Zmc2V0QWZ0ZXJFbGFwc2VkVGltZShTZWNvbmRzKSBmaW5h bDsKICAgICBTZWNvbmRzIGFuaW1hdGlvbkR1cmF0aW9uKCkgZmluYWw7Ci0gICAgRmxvYXRTaXpl IHByZWRpY3RlZERlc3RpbmF0aW9uT2Zmc2V0KCkgZmluYWw7CisgICAgRmxvYXRQb2ludCBwcmVk aWN0ZWREZXN0aW5hdGlvbk9mZnNldCgpIGZpbmFsOwogICAgIHZvaWQgcmV0YXJnZXRlZFNjcm9s bE9mZnNldERpZENoYW5nZSgpIGZpbmFsOworCiAgICAgX05TU2Nyb2xsaW5nTW9tZW50dW1DYWxj dWxhdG9yICplbnN1cmVQbGF0Zm9ybU1vbWVudHVtQ2FsY3VsYXRvcigpOwogICAgIGJvb2wgcmVx dWlyZXNNb21lbnR1bVNjcm9sbGluZygpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nTW9tZW50dW1DYWxjdWxhdG9yTWFjLm1tIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ01vbWVudHVtQ2FsY3VsYXRv ck1hYy5tbQppbmRleCA3YTM3MzIwZTdkMmRkODA5ODVkZjI0ZDM2NTc3OWRhZWVkMTExNTkwLi42 ZGMyMWVhNjU1NjVmN2U1OTQ5YjFmMjQ1ZjhjMzA2MTllZjk4NmFlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nTW9tZW50dW1DYWxjdWxhdG9y TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdN b21lbnR1bUNhbGN1bGF0b3JNYWMubW0KQEAgLTUyLDEyICs1MiwxMiBAQCBTY3JvbGxpbmdNb21l bnR1bUNhbGN1bGF0b3JNYWM6OlNjcm9sbGluZ01vbWVudHVtQ2FsY3VsYXRvck1hYyhjb25zdCBG bG9hdFNpemUmCiBGbG9hdFBvaW50IFNjcm9sbGluZ01vbWVudHVtQ2FsY3VsYXRvck1hYzo6c2Ny b2xsT2Zmc2V0QWZ0ZXJFbGFwc2VkVGltZShTZWNvbmRzIGVsYXBzZWRUaW1lKQogewogICAgIGlm ICghcmVxdWlyZXNNb21lbnR1bVNjcm9sbGluZygpKQotICAgICAgICByZXR1cm4geyByZXRhcmdl dGVkU2Nyb2xsT2Zmc2V0KCkud2lkdGgoKSwgcmV0YXJnZXRlZFNjcm9sbE9mZnNldCgpLmhlaWdo dCgpIH07CisgICAgICAgIHJldHVybiByZXRhcmdldGVkU2Nyb2xsT2Zmc2V0KCk7CiAKICAgICBy ZXR1cm4gW2Vuc3VyZVBsYXRmb3JtTW9tZW50dW1DYWxjdWxhdG9yKCkgcG9zaXRpb25BZnRlckR1 cmF0aW9uOmVsYXBzZWRUaW1lLnZhbHVlKCldOwogfQogCi1GbG9hdFNpemUgU2Nyb2xsaW5nTW9t ZW50dW1DYWxjdWxhdG9yTWFjOjpwcmVkaWN0ZWREZXN0aW5hdGlvbk9mZnNldCgpCitGbG9hdFBv aW50IFNjcm9sbGluZ01vbWVudHVtQ2FsY3VsYXRvck1hYzo6cHJlZGljdGVkRGVzdGluYXRpb25P ZmZzZXQoKQogewogICAgIGlmICghZ0VuYWJsZVBsYXRmb3JtTW9tZW50dW1TY3JvbGxpbmdQcmVk aWN0aW9uKQogICAgICAgICByZXR1cm4gU2Nyb2xsaW5nTW9tZW50dW1DYWxjdWxhdG9yOjpwcmVk aWN0ZWREZXN0aW5hdGlvbk9mZnNldCgpOwpAQCAtNjksNyArNjksNyBAQCBGbG9hdFNpemUgU2Ny b2xsaW5nTW9tZW50dW1DYWxjdWxhdG9yTWFjOjpwcmVkaWN0ZWREZXN0aW5hdGlvbk9mZnNldCgp CiB2b2lkIFNjcm9sbGluZ01vbWVudHVtQ2FsY3VsYXRvck1hYzo6cmV0YXJnZXRlZFNjcm9sbE9m ZnNldERpZENoYW5nZSgpCiB7CiAgICAgX05TU2Nyb2xsaW5nTW9tZW50dW1DYWxjdWxhdG9yICpj YWxjdWxhdG9yID0gZW5zdXJlUGxhdGZvcm1Nb21lbnR1bUNhbGN1bGF0b3IoKTsKLSAgICBjYWxj dWxhdG9yLmRlc3RpbmF0aW9uT3JpZ2luID0gTlNNYWtlUG9pbnQocmV0YXJnZXRlZFNjcm9sbE9m ZnNldCgpLndpZHRoKCksIHJldGFyZ2V0ZWRTY3JvbGxPZmZzZXQoKS5oZWlnaHQoKSk7CisgICAg Y2FsY3VsYXRvci5kZXN0aW5hdGlvbk9yaWdpbiA9IHJldGFyZ2V0ZWRTY3JvbGxPZmZzZXQoKTsK ICAgICBbY2FsY3VsYXRvciBjYWxjdWxhdGVUb1JlYWNoRGVzdGluYXRpb25dOwogfQogCkBAIC05 Myw3ICs5Myw3IEBAIF9OU1Njcm9sbGluZ01vbWVudHVtQ2FsY3VsYXRvciAqU2Nyb2xsaW5nTW9t ZW50dW1DYWxjdWxhdG9yTWFjOjplbnN1cmVQbGF0Zm9ybU1vCiAgICAgaWYgKG1fcGxhdGZvcm1N b21lbnR1bUNhbGN1bGF0b3IpCiAgICAgICAgIHJldHVybiBtX3BsYXRmb3JtTW9tZW50dW1DYWxj dWxhdG9yLmdldCgpOwogCi0gICAgTlNQb2ludCBvcmlnaW4gPSBOU01ha2VQb2ludChtX2luaXRp YWxTY3JvbGxPZmZzZXQud2lkdGgoKSwgbV9pbml0aWFsU2Nyb2xsT2Zmc2V0LmhlaWdodCgpKTsK KyAgICBOU1BvaW50IG9yaWdpbiA9IG1faW5pdGlhbFNjcm9sbE9mZnNldDsKICAgICBOU1JlY3Qg Y29udGVudEZyYW1lID0gTlNNYWtlUmVjdCgwLCAwLCBtX2NvbnRlbnRTaXplLndpZHRoKCksIG1f Y29udGVudFNpemUuaGVpZ2h0KCkpOwogICAgIE5TUG9pbnQgdmVsb2NpdHkgPSBOU01ha2VQb2lu dChtX2luaXRpYWxWZWxvY2l0eS53aWR0aCgpLCBtX2luaXRpYWxWZWxvY2l0eS5oZWlnaHQoKSk7 CiAgICAgbV9wbGF0Zm9ybU1vbWVudHVtQ2FsY3VsYXRvciA9IGFkb3B0TlMoW1tfTlNTY3JvbGxp bmdNb21lbnR1bUNhbGN1bGF0b3IgYWxsb2NdIGluaXRXaXRoSW5pdGlhbE9yaWdpbjpvcmlnaW4g dmVsb2NpdHk6dmVsb2NpdHkgZG9jdW1lbnRGcmFtZTpjb250ZW50RnJhbWUgY29uc3RyYWluZWRD bGlwcGluZ09yaWdpbjpOU1plcm9Qb2ludCBjbGlwcGluZ1NpemU6bV92aWV3cG9ydFNpemUgdG9s ZXJhbmNlOk5TTWFrZVNpemUoMSwgMSldKTsK