230732 2021-09-23 17:21:22 -0700 Move ScrollSnapAnimatorState's ScrollAnimationMomentum into ScrollingEffectsController 2021-09-23 22:09:19 -0700 1 1 1 Unclassified WebKit Scrolling WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser mrobinson simon.fraser webkit-bug-importer wenson_hsieh oldest_to_newest 1796727 0 simon.fraser 2021-09-23 17:21:22 -0700 Move ScrollSnapAnimatorState's ScrollAnimationMomentum into ScrollingEffectsController 1796730 1 439109 simon.fraser 2021-09-23 17:23:50 -0700 Created attachment 439109 Patch 1796737 2 439109 wenson_hsieh 2021-09-23 17:28:54 -0700 Comment on attachment 439109 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=439109&action=review > Source/WebCore/platform/ScrollingEffectsController.cpp:145 > + m_currentAnimation = WTF::makeUnique<ScrollAnimationMomentum>(*this); Nit - you can omit this `WTF::` 1796776 3 simon.fraser 2021-09-23 22:08:04 -0700 https://trac.webkit.org/changeset/283026/webkit 1796778 4 webkit-bug-importer 2021-09-23 22:09:19 -0700 <rdar://problem/83480219> 439109 2021-09-23 17:23:50 -0700 2021-09-23 17:28:54 -0700 Patch bug-230732-20210923172349.patch text/plain 11957 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzMDE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGM1NDVmMzMyODE0OWI3 ZWU0NzRkMzRjNWM3OTZlOTU3Zjg0MDI5Zi4uYzE0MWFkMjE1MzYyZjdjMDIxM2U4YThiYTk4YTNh ZWM5NDc4NzY3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIxLTA5LTIzICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgU2Nyb2xs U25hcEFuaW1hdG9yU3RhdGUncyBTY3JvbGxBbmltYXRpb25Nb21lbnR1bSBpbnRvIFNjcm9sbGlu Z0VmZmVjdHNDb250cm9sbGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMzA3MzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBDb250aW51aW5nIHRoZSB3b3JrIHRvIG1vdmUgYWxsIGFuaW1hdGlvbnMgaW50 byBTY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlciwgbW92ZQorICAgICAgICB0aGUgU2Nyb2xsQW5p bWF0aW9uTW9tZW50dW0gdGhhdCBTY3JvbGxTbmFwQW5pbWF0b3JTdGF0ZSB1c2VzIGludG8gU2Ny b2xsaW5nRWZmZWN0c0NvbnRyb2xsZXIuCisKKyAgICAgICAgU2Nyb2xsU25hcEFuaW1hdG9yU3Rh dGUgaXMgbm8gbG9uZ2VyIGEgU2Nyb2xsQW5pbWF0aW9uQ2xpZW50LgorCisgICAgICAgIFNjcm9s bGluZ0VmZmVjdHNDb250cm9sbGVyOjp1cGRhdGVTY3JvbGxTbmFwQW5pbWF0aW5nU3RhdGUoKSwg d2hpY2ggaXMgTWFjLW9ubHkgY29kZQorICAgICAgICAoYnV0IHByb2JhYmx5IGRvZW5zJ3QgbmVl ZCB0byBiZSkgY2FuIG5vdyBjb25zdWx0IHRoZSBhbmltYXRpb24gZGlyZWN0bHkuCisKKyAgICAg ICAgKiBwbGF0Zm9ybS9TY3JvbGxTbmFwQW5pbWF0b3JTdGF0ZS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpTY3JvbGxTbmFwQW5pbWF0b3JTdGF0ZTo6c2V0dXBBbmltYXRpb25Gb3JTdGF0ZSk6Cisg ICAgICAgIChXZWJDb3JlOjpTY3JvbGxTbmFwQW5pbWF0b3JTdGF0ZTo6dGVhcmRvd25BbmltYXRp b25Gb3JTdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxTbmFwQW5pbWF0b3JTdGF0ZTo6 Y3VycmVudEFuaW1hdGVkU2Nyb2xsT2Zmc2V0IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdl YkNvcmU6OlNjcm9sbFNuYXBBbmltYXRvclN0YXRlOjpzY3JvbGxFeHRlbnRzRm9yQW5pbWF0aW9u KTogRGVsZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxTbmFwQW5pbWF0b3JTdGF0ZS5o OgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsU25hcEFuaW1hdG9yU3RhdGU6OlNjcm9sbFNuYXBB bmltYXRvclN0YXRlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxpbmdFZmZlY3RzQ29udHJv bGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlcjo6 c3RhcnRNb21lbnR1bVNjcm9sbFdpdGhJbml0aWFsVmVsb2NpdHkpOgorICAgICAgICAoV2ViQ29y ZTo6U2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXI6OnNldFNuYXBPZmZzZXRzSW5mbyk6CisgICAg ICAgICogcGxhdGZvcm0vU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBw bGF0Zm9ybS9tYWMvU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXIubW06CisgICAgICAgIChXZWJD b3JlOjpTY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlcjo6dXBkYXRlU2Nyb2xsU25hcEFuaW1hdGlu Z1N0YXRlKToKKwogMjAyMS0wOS0yMyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxl LmNvbT4KIAogICAgICAgICBNb3ZlIHRoZSBTY3JvbGxBbmltYXRpb25TbW9vdGggZnJvbSBTY3Jv bGxBbmltYXRvciBpbnRvIFNjcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxTbmFwQW5pbWF0b3JTdGF0ZS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxTbmFwQW5pbWF0b3JTdGF0ZS5jcHAKaW5kZXggZjBi NGViNGYzNThmYjAyMzdkYTk2YzFkOWM2MzEwMGRhODRiZDBkYi4uNDQ1MjVjNWIxNTdjYTc0NjE5 YzI1NTIyZWVjMTdjZTVjOGM3Yjg1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vU2Nyb2xsU25hcEFuaW1hdG9yU3RhdGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL1Njcm9sbFNuYXBBbmltYXRvclN0YXRlLmNwcApAQCAtMjYsNyArMjYsNyBAQAogI2luY2x1 ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlNjcm9sbFNuYXBBbmltYXRvclN0YXRlLmgiCiAKLSNp bmNsdWRlICJTY3JvbGxBbmltYXRpb25Nb21lbnR1bS5oIgorI2luY2x1ZGUgIlNjcm9sbGluZ0Vm ZmVjdHNDb250cm9sbGVyLmgiCiAjaW5jbHVkZSA8d3RmL01hdGhFeHRyYXMuaD4KICNpbmNsdWRl IDx3dGYvdGV4dC9UZXh0U3RyZWFtLmg+CiAKQEAgLTUwLDEzICs1MCw3IEBAIGJvb2wgU2Nyb2xs U25hcEFuaW1hdG9yU3RhdGU6OnNldHVwQW5pbWF0aW9uRm9yU3RhdGUoU2Nyb2xsU25hcFN0YXRl IHN0YXRlLCBjb25zCiAgICAgaWYgKG1fY3VycmVudFN0YXRlID09IHN0YXRlKQogICAgICAgICBy ZXR1cm4gZmFsc2U7CiAKLSAgICBtX3Njcm9sbEV4dGVudHMgPSBzY3JvbGxFeHRlbnRzOwotCi0g ICAgaWYgKG1fbW9tZW50dW1TY3JvbGxBbmltYXRpb24pCi0gICAgICAgIG1fbW9tZW50dW1TY3Jv bGxBbmltYXRpb24tPnN0b3AoKTsKLQotICAgIG1fbW9tZW50dW1TY3JvbGxBbmltYXRpb24gPSBX VEY6Om1ha2VVbmlxdWU8U2Nyb2xsQW5pbWF0aW9uTW9tZW50dW0+KCp0aGlzKTsKLSAgICBib29s IGFuaW1hdGluZyA9IG1fbW9tZW50dW1TY3JvbGxBbmltYXRpb24tPnN0YXJ0QW5pbWF0ZWRTY3Jv bGxXaXRoSW5pdGlhbFZlbG9jaXR5KGluaXRpYWxPZmZzZXQsIGluaXRpYWxWZWxvY2l0eSwgaW5p dGlhbERlbHRhLCBbJl0oY29uc3QgRmxvYXRQb2ludCYgdGFyZ2V0T2Zmc2V0KSB7CisgICAgYm9v bCBhbmltYXRpbmcgPSBtX3Njcm9sbENvbnRyb2xsZXIuc3RhcnRNb21lbnR1bVNjcm9sbFdpdGhJ bml0aWFsVmVsb2NpdHkoaW5pdGlhbE9mZnNldCwgaW5pdGlhbFZlbG9jaXR5LCBpbml0aWFsRGVs dGEsIFsmXShjb25zdCBGbG9hdFBvaW50JiB0YXJnZXRPZmZzZXQpIHsKICAgICAgICAgZmxvYXQg dGFyZ2V0T2Zmc2V0WCwgdGFyZ2V0T2Zmc2V0WTsKICAgICAgICAgc3RkOjp0aWUodGFyZ2V0T2Zm c2V0WCwgbV9hY3RpdmVTbmFwSW5kZXhYKSA9IHRhcmdldE9mZnNldEZvclN0YXJ0T2Zmc2V0KFNj cm9sbEV2ZW50QXhpczo6SG9yaXpvbnRhbCwgc2Nyb2xsRXh0ZW50cywgaW5pdGlhbE9mZnNldC54 KCksIHRhcmdldE9mZnNldCwgcGFnZVNjYWxlLCBpbml0aWFsRGVsdGEud2lkdGgoKSk7CiAgICAg ICAgIHN0ZDo6dGllKHRhcmdldE9mZnNldFksIG1fYWN0aXZlU25hcEluZGV4WSkgPSB0YXJnZXRP ZmZzZXRGb3JTdGFydE9mZnNldChTY3JvbGxFdmVudEF4aXM6OlZlcnRpY2FsLCBzY3JvbGxFeHRl bnRzLCBpbml0aWFsT2Zmc2V0LnkoKSwgdGFyZ2V0T2Zmc2V0LCBwYWdlU2NhbGUsIGluaXRpYWxE ZWx0YS5oZWlnaHQoKSk7CkBAIC02Nyw3ICs2MSw2IEBAIGJvb2wgU2Nyb2xsU25hcEFuaW1hdG9y U3RhdGU6OnNldHVwQW5pbWF0aW9uRm9yU3RhdGUoU2Nyb2xsU25hcFN0YXRlIHN0YXRlLCBjb25z CiAgICAgaWYgKCFhbmltYXRpbmcpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIG1fc3Rh cnRUaW1lID0gTW9ub3RvbmljVGltZTo6bm93KCk7CiAgICAgbV9jdXJyZW50U3RhdGUgPSBzdGF0 ZTsKICAgICByZXR1cm4gYW5pbWF0aW5nOwogfQpAQCAtMTQ5LDI0ICsxNDIsMTAgQEAgdm9pZCBT Y3JvbGxTbmFwQW5pbWF0b3JTdGF0ZTo6dGVhcmRvd25BbmltYXRpb25Gb3JTdGF0ZShTY3JvbGxT bmFwU3RhdGUgc3RhdGUpCiAgICAgaWYgKG1fY3VycmVudFN0YXRlID09IHN0YXRlKQogICAgICAg ICByZXR1cm47CiAKLSAgICBtX21vbWVudHVtU2Nyb2xsQW5pbWF0aW9uID0gbnVsbHB0cjsKLSAg ICBtX3N0YXJ0VGltZSA9IHsgfTsKKyAgICBtX3Njcm9sbENvbnRyb2xsZXIuc3RvcEFuaW1hdGVk U2Nyb2xsKCk7CiAgICAgbV9jdXJyZW50U3RhdGUgPSBzdGF0ZTsKIH0KIAotRmxvYXRQb2ludCBT Y3JvbGxTbmFwQW5pbWF0b3JTdGF0ZTo6Y3VycmVudEFuaW1hdGVkU2Nyb2xsT2Zmc2V0KE1vbm90 b25pY1RpbWUgY3VycmVudFRpbWUsIGJvb2wmIGlzQW5pbWF0aW9uQ29tcGxldGUpIGNvbnN0Ci17 Ci0gICAgaWYgKCFtX21vbWVudHVtU2Nyb2xsQW5pbWF0aW9uKSB7Ci0gICAgICAgIGlzQW5pbWF0 aW9uQ29tcGxldGUgPSB0cnVlOwotICAgICAgICByZXR1cm4geyB9OwotICAgIH0KLQotICAgIGF1 dG8gY3VycmVudE9mZnNldCA9IG1fbW9tZW50dW1TY3JvbGxBbmltYXRpb24tPnNlcnZpY2VBbmlt YXRpb24oY3VycmVudFRpbWUpOwotICAgIGlzQW5pbWF0aW9uQ29tcGxldGUgPSAhbV9tb21lbnR1 bVNjcm9sbEFuaW1hdGlvbi0+aXNBY3RpdmUoKTsKLQotICAgIHJldHVybiBjdXJyZW50T2Zmc2V0 OwotfQotCiBzdGQ6OnBhaXI8ZmxvYXQsIHN0ZDo6b3B0aW9uYWw8dW5zaWduZWQ+PiBTY3JvbGxT bmFwQW5pbWF0b3JTdGF0ZTo6dGFyZ2V0T2Zmc2V0Rm9yU3RhcnRPZmZzZXQoU2Nyb2xsRXZlbnRB eGlzIGF4aXMsIGNvbnN0IFNjcm9sbEV4dGVudHMmIHNjcm9sbEV4dGVudHMsIGZsb2F0IHN0YXJ0 T2Zmc2V0LCBGbG9hdFBvaW50IHByZWRpY3RlZE9mZnNldCwgZmxvYXQgcGFnZVNjYWxlLCBmbG9h dCBpbml0aWFsRGVsdGEpIGNvbnN0CiB7CiAgICAgYXV0byBtaW5TY3JvbGxPZmZzZXQgPSAoYXhp cyA9PSBTY3JvbGxFdmVudEF4aXM6Okhvcml6b250YWwpID8gc2Nyb2xsRXh0ZW50cy5taW5pbXVt U2Nyb2xsT2Zmc2V0KCkueCgpIDogc2Nyb2xsRXh0ZW50cy5taW5pbXVtU2Nyb2xsT2Zmc2V0KCku eSgpOwpAQCAtMTgxLDExICsxNjAsNiBAQCBzdGQ6OnBhaXI8ZmxvYXQsIHN0ZDo6b3B0aW9uYWw8 dW5zaWduZWQ+PiBTY3JvbGxTbmFwQW5pbWF0b3JTdGF0ZTo6dGFyZ2V0T2Zmc2V0RgogICAgIHJl dHVybiBzdGQ6Om1ha2VfcGFpcihwYWdlU2NhbGUgKiBjbGFtcFRvPGZsb2F0PihmbG9hdCB7IHRh cmdldE9mZnNldCB9LCBtaW5TY3JvbGxPZmZzZXQsIG1heFNjcm9sbE9mZnNldCksIHNuYXBJbmRl eCk7CiB9CiAKLVNjcm9sbEV4dGVudHMgU2Nyb2xsU25hcEFuaW1hdG9yU3RhdGU6OnNjcm9sbEV4 dGVudHNGb3JBbmltYXRpb24oU2Nyb2xsQW5pbWF0aW9uJikKLXsKLSAgICByZXR1cm4gbV9zY3Jv bGxFeHRlbnRzOwotfQotCiBUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJlYW0mIHRzLCBj b25zdCBTY3JvbGxTbmFwQW5pbWF0b3JTdGF0ZSYgc3RhdGUpCiB7CiAgICAgdHMgPDwgIlNjcm9s bFNuYXBBbmltYXRvclN0YXRlIjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L1Njcm9sbFNuYXBBbmltYXRvclN0YXRlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3Jv bGxTbmFwQW5pbWF0b3JTdGF0ZS5oCmluZGV4IGRmOTRiNDZiOTM1NjAxNWJkMjhiOWNjNGMyZTIw MmQzMWExMDdkOTQuLjk4YzQyOGVkOWVhMDUzNDgzNDRlYTU1YTk0ZjY2YzBlYmFhZjQyOTcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFNuYXBBbmltYXRvclN0YXRl LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsU25hcEFuaW1hdG9yU3RhdGUu aApAQCAtNDAsNiArNDAsOCBAQCBjbGFzcyBUZXh0U3RyZWFtOwogCiBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAKK2NsYXNzIFNjcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyOworCiBlbnVtIGNsYXNzIFNj cm9sbFNuYXBTdGF0ZSB7CiAgICAgU25hcHBpbmcsCiAgICAgR2xpZGluZywKQEAgLTQ3LDkgKzQ5 LDEyIEBAIGVudW0gY2xhc3MgU2Nyb2xsU25hcFN0YXRlIHsKICAgICBVc2VySW50ZXJhY3Rpb24K IH07CiAKLWNsYXNzIFNjcm9sbFNuYXBBbmltYXRvclN0YXRlIDogcHVibGljIFNjcm9sbEFuaW1h dGlvbkNsaWVudCB7CitjbGFzcyBTY3JvbGxTbmFwQW5pbWF0b3JTdGF0ZSB7CiAgICAgV1RGX01B S0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6CisgICAgU2Nyb2xsU25hcEFuaW1hdG9yU3RhdGUo U2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXImIHNjcm9sbENvbnRyb2xsZXIpCisgICAgICAgIDog bV9zY3JvbGxDb250cm9sbGVyKHNjcm9sbENvbnRyb2xsZXIpCisgICAgeyB9CiAgICAgdmlydHVh bCB+U2Nyb2xsU25hcEFuaW1hdG9yU3RhdGUoKTsKIAogICAgIGNvbnN0IFZlY3RvcjxTbmFwT2Zm c2V0PExheW91dFVuaXQ+PiYgc25hcE9mZnNldHNGb3JBeGlzKFNjcm9sbEV2ZW50QXhpcyBheGlz KSBjb25zdApAQCAtODQsOCArODksNiBAQCBwdWJsaWM6CiAKICAgICBib29sIHNldE5lYXJlc3RT Y3JvbGxTbmFwSW5kZXhGb3JPZmZzZXQoU2Nyb2xsT2Zmc2V0LCBjb25zdCBTY3JvbGxFeHRlbnRz JiwgZmxvYXQgcGFnZVNjYWxlKTsKIAotICAgIEZsb2F0UG9pbnQgY3VycmVudEFuaW1hdGVkU2Ny b2xsT2Zmc2V0KE1vbm90b25pY1RpbWUsIGJvb2wmIGlzQW5pbWF0aW9uQ29tcGxldGUpIGNvbnN0 OwotCiAgICAgLy8gU3RhdGUgdHJhbnNpdGlvbiBoZWxwZXJzLgogICAgIC8vIFRoZXNlIHJldHVy biB0cnVlIGlmIHRoZXkgc3RhcnQgYSBuZXcgYW5pbWF0aW9uLgogICAgIGJvb2wgdHJhbnNpdGlv blRvU25hcEFuaW1hdGlvblN0YXRlKGNvbnN0IFNjcm9sbEV4dGVudHMmLCBmbG9hdCBwYWdlU2Nh bGUsIGNvbnN0IEZsb2F0UG9pbnQmIGluaXRpYWxPZmZzZXQpOwpAQCAtOTksMjAgKzEwMiwxNCBA QCBwcml2YXRlOgogICAgIGJvb2wgc2V0dXBBbmltYXRpb25Gb3JTdGF0ZShTY3JvbGxTbmFwU3Rh dGUsIGNvbnN0IFNjcm9sbEV4dGVudHMmLCBmbG9hdCBwYWdlU2NhbGUsIGNvbnN0IEZsb2F0UG9p bnQmIGluaXRpYWxPZmZzZXQsIGNvbnN0IEZsb2F0U2l6ZSYgaW5pdGlhbFZlbG9jaXR5LCBjb25z dCBGbG9hdFNpemUmIGluaXRpYWxEZWx0YSk7CiAgICAgdm9pZCB0ZWFyZG93bkFuaW1hdGlvbkZv clN0YXRlKFNjcm9sbFNuYXBTdGF0ZSk7CiAKLSAgICAvLyBTY3JvbGxBbmltYXRpb25DbGllbnQu Ci0gICAgU2Nyb2xsRXh0ZW50cyBzY3JvbGxFeHRlbnRzRm9yQW5pbWF0aW9uKFNjcm9sbEFuaW1h dGlvbiYpIGZpbmFsOworICAgIFNjcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyJiBtX3Njcm9sbENv bnRyb2xsZXI7CiAKICAgICBTY3JvbGxTbmFwU3RhdGUgbV9jdXJyZW50U3RhdGUgeyBTY3JvbGxT bmFwU3RhdGU6OlVzZXJJbnRlcmFjdGlvbiB9OwogCiAgICAgTGF5b3V0U2Nyb2xsU25hcE9mZnNl dHNJbmZvIG1fc25hcE9mZnNldHNJbmZvOwotICAgIAotICAgIFNjcm9sbEV4dGVudHMgbV9zY3Jv bGxFeHRlbnRzOwogCiAgICAgc3RkOjpvcHRpb25hbDx1bnNpZ25lZD4gbV9hY3RpdmVTbmFwSW5k ZXhYOwogICAgIHN0ZDo6b3B0aW9uYWw8dW5zaWduZWQ+IG1fYWN0aXZlU25hcEluZGV4WTsKLQot ICAgIE1vbm90b25pY1RpbWUgbV9zdGFydFRpbWU7Ci0gICAgc3RkOjp1bmlxdWVfcHRyPFNjcm9s bEFuaW1hdGlvbk1vbWVudHVtPiBtX21vbWVudHVtU2Nyb2xsQW5pbWF0aW9uOwogfTsKIAogV1RG OjpUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFdURjo6VGV4dFN0cmVhbSYsIGNvbnN0IFNjcm9sbFNu YXBBbmltYXRvclN0YXRlJik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9T Y3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9T Y3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlci5jcHAKaW5kZXggNzkyMTY4MGU2NWIxMWI3ZDk2N2U5 MTVlMWMxNzY1ZjIyM2VhYjhlMS4uYzliMmY1Y2RhYWVkZTNkMTA2NDE5ZDI3ZjYyYzg0NGE3YTk1 MzA1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsaW5nRWZmZWN0 c0NvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGluZ0Vm ZmVjdHNDb250cm9sbGVyLmNwcApAQCAtMzEsNiArMzEsNyBAQAogI2luY2x1ZGUgIkxvZ2dpbmcu aCIKICNpbmNsdWRlICJQbGF0Zm9ybVdoZWVsRXZlbnQuaCIKICNpbmNsdWRlICJTY3JvbGxBbmlt YXRpb25LaW5ldGljLmgiCisjaW5jbHVkZSAiU2Nyb2xsQW5pbWF0aW9uTW9tZW50dW0uaCIKICNp bmNsdWRlICJTY3JvbGxBbmltYXRpb25TbW9vdGguaCIKICNpbmNsdWRlICJTY3JvbGxhYmxlQXJl YS5oIgogI2luY2x1ZGUgIldoZWVsRXZlbnRUZXN0TW9uaXRvci5oIgpAQCAtMTMxLDYgKzEzMiwy MSBAQCBib29sIFNjcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyOjpwcm9jZXNzV2hlZWxFdmVudEZv cktpbmV0aWNTY3JvbGxpbmcoY29uc3QgUGxhdAogICAgIHJldHVybiBmYWxzZTsKIH0KIAorYm9v bCBTY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlcjo6c3RhcnRNb21lbnR1bVNjcm9sbFdpdGhJbml0 aWFsVmVsb2NpdHkoY29uc3QgRmxvYXRQb2ludCYgaW5pdGlhbE9mZnNldCwgY29uc3QgRmxvYXRT aXplJiBpbml0aWFsVmVsb2NpdHksIGNvbnN0IEZsb2F0U2l6ZSYgaW5pdGlhbERlbHRhLCBjb25z dCBXVEY6OkZ1bmN0aW9uPEZsb2F0UG9pbnQoY29uc3QgRmxvYXRQb2ludCYpPiYgZGVzdGluYXRp b25Nb2RpZmllcikKK3sKKyAgICBpZiAobV9jdXJyZW50QW5pbWF0aW9uKSB7CisgICAgICAgIGlm IChpczxTY3JvbGxBbmltYXRpb25Nb21lbnR1bT4obV9jdXJyZW50QW5pbWF0aW9uLmdldCgpKSkK KyAgICAgICAgICAgIG1fY3VycmVudEFuaW1hdGlvbi0+c3RvcCgpOworICAgICAgICBlbHNlCisg ICAgICAgICAgICBtX2N1cnJlbnRBbmltYXRpb24gPSBudWxscHRyOworICAgIH0KKworICAgIGlm ICghbV9jdXJyZW50QW5pbWF0aW9uKQorICAgICAgICBtX2N1cnJlbnRBbmltYXRpb24gPSBXVEY6 Om1ha2VVbmlxdWU8U2Nyb2xsQW5pbWF0aW9uTW9tZW50dW0+KCp0aGlzKTsKKworICAgIHJldHVy biBkb3duY2FzdDxTY3JvbGxBbmltYXRpb25Nb21lbnR1bT4oKm1fY3VycmVudEFuaW1hdGlvbiku c3RhcnRBbmltYXRlZFNjcm9sbFdpdGhJbml0aWFsVmVsb2NpdHkoaW5pdGlhbE9mZnNldCwgaW5p dGlhbFZlbG9jaXR5LCBpbml0aWFsRGVsdGEsIGRlc3RpbmF0aW9uTW9kaWZpZXIpOworfQorCiB2 b2lkIFNjcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyOjpzZXRJc0FuaW1hdGluZ1J1YmJlckJhbmQo Ym9vbCBpc0FuaW1hdGluZ1J1YmJlckJhbmQpCiB7CiAgICAgaWYgKGlzQW5pbWF0aW5nUnViYmVy QmFuZCA9PSBtX2lzQW5pbWF0aW5nUnViYmVyQmFuZCkKQEAgLTE3OCw3ICsxOTQsNyBAQCB2b2lk IFNjcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyOjpzZXRTbmFwT2Zmc2V0c0luZm8oY29uc3QgTGF5 b3V0U2Nyb2xsU25hcE9mZnNldAogCiAgICAgYm9vbCBzaG91bGRDb21wdXRlQ3VycmVudFNuYXBJ bmRpY2VzID0gIW1fc2Nyb2xsU25hcFN0YXRlOwogICAgIGlmICghbV9zY3JvbGxTbmFwU3RhdGUp Ci0gICAgICAgIG1fc2Nyb2xsU25hcFN0YXRlID0gbWFrZVVuaXF1ZTxTY3JvbGxTbmFwQW5pbWF0 b3JTdGF0ZT4oKTsKKyAgICAgICAgbV9zY3JvbGxTbmFwU3RhdGUgPSBtYWtlVW5pcXVlPFNjcm9s bFNuYXBBbmltYXRvclN0YXRlPigqdGhpcyk7CiAKICAgICBtX3Njcm9sbFNuYXBTdGF0ZS0+c2V0 U25hcE9mZnNldEluZm8oc25hcE9mZnNldEluZm8pOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9TY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlci5oIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXIuaAppbmRleCBlNzVhOTVhMGQ4 NzU1NzFkMDliNDc2MWY0OTk3ZjZiNzQ5NTZiMmY1Li43MGMxOGVmZDNiZDQ5NzRiMTNlZjM3ZWZl MTlkNWNlMGUzY2JlMmFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3Jv bGxpbmdFZmZlY3RzQ29udHJvbGxlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Nj cm9sbGluZ0VmZmVjdHNDb250cm9sbGVyLmgKQEAgLTEzOCw2ICsxMzgsOCBAQCBwdWJsaWM6CiAg ICAgLy8gRklYTUU6IEhhY2sgZm9yIFNjcm9sbEFuaW1hdG9yR2VuZXJpYy4gTmVlZHMgY2xlYW51 cC4KICAgICBib29sIHByb2Nlc3NXaGVlbEV2ZW50Rm9yS2luZXRpY1Njcm9sbGluZyhjb25zdCBQ bGF0Zm9ybVdoZWVsRXZlbnQmKTsKIAorICAgIGJvb2wgc3RhcnRNb21lbnR1bVNjcm9sbFdpdGhJ bml0aWFsVmVsb2NpdHkoY29uc3QgRmxvYXRQb2ludCYgaW5pdGlhbE9mZnNldCwgY29uc3QgRmxv YXRTaXplJiBpbml0aWFsVmVsb2NpdHksIGNvbnN0IEZsb2F0U2l6ZSYgaW5pdGlhbERlbHRhLCBj b25zdCBXVEY6OkZ1bmN0aW9uPEZsb2F0UG9pbnQoY29uc3QgRmxvYXRQb2ludCYpPiYgZGVzdGlu YXRpb25Nb2RpZmllcik7CisKICAgICB2b2lkIGJlZ2luS2V5Ym9hcmRTY3JvbGxpbmcoKTsKICAg ICB2b2lkIHN0b3BLZXlib2FyZFNjcm9sbGluZygpOwogICAgIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyLm1tIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyLm1tCmlu ZGV4IGFjMjc3NDY0NTIzODY2ZDhiZWI5ZDMwN2IyZGMwMTRhN2ZhNzJjNjcuLjI3Mzk1OGI3ZjE3 MDA2NjhmZWI3ZTYxNDQ2M2NiMWZjM2VkNGI3OWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL21hYy9TY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlci5tbQorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXIubW0KQEAgLTc1 NSw4ICs3NTUsMTcgQEAgdm9pZCBTY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlcjo6dXBkYXRlU2Ny b2xsU25hcEFuaW1hdGluZ1N0YXRlKE1vbm90b25pY1RpbWUgY3UKICAgICAgICAgcmV0dXJuOwog ICAgIH0KIAotICAgIGJvb2wgaXNBbmltYXRpb25Db21wbGV0ZTsKLSAgICBhdXRvIGFuaW1hdGlv bk9mZnNldCA9IG1fc2Nyb2xsU25hcFN0YXRlLT5jdXJyZW50QW5pbWF0ZWRTY3JvbGxPZmZzZXQo Y3VycmVudFRpbWUsIGlzQW5pbWF0aW9uQ29tcGxldGUpOworICAgIGlmICghaXM8U2Nyb2xsQW5p bWF0aW9uTW9tZW50dW0+KG1fY3VycmVudEFuaW1hdGlvbi5nZXQoKSkpIHsKKyAgICAgICAgbV9z Y3JvbGxTbmFwU3RhdGUtPnRyYW5zaXRpb25Ub0Rlc3RpbmF0aW9uUmVhY2hlZFN0YXRlKCk7Cisg ICAgICAgIHN0b3BTY3JvbGxTbmFwQW5pbWF0aW9uKCk7CisgICAgICAgIHJldHVybjsKKyAgICB9 CisKKyAgICBhdXRvJiBtb21lbnR1bVNjcm9sbEFuaW1hdGlvbiA9IGRvd25jYXN0PFNjcm9sbEFu aW1hdGlvbk1vbWVudHVtPigqbV9jdXJyZW50QW5pbWF0aW9uKTsKKworICAgIGF1dG8gYW5pbWF0 aW9uT2Zmc2V0ID0gbW9tZW50dW1TY3JvbGxBbmltYXRpb24uc2VydmljZUFuaW1hdGlvbihjdXJy ZW50VGltZSk7CisgICAgYm9vbCBpc0FuaW1hdGlvbkNvbXBsZXRlID0gIW1vbWVudHVtU2Nyb2xs QW5pbWF0aW9uLmlzQWN0aXZlKCk7CisKICAgICBMT0dfV0lUSF9TVFJFQU0oU2Nyb2xsU25hcCwg c3RyZWFtIDw8ICJTY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlciAiIDw8IHRoaXMgPDwgIiB1cGRh dGVTY3JvbGxTbmFwQW5pbWF0aW5nU3RhdGUgLSBpc0FuaW1hdGlvbkNvbXBsZXRlICIgPDwgaXNB bmltYXRpb25Db21wbGV0ZSA8PCAiIGFuaW1hdGlvbk9mZnNldCAiIDw8IGFuaW1hdGlvbk9mZnNl dCA8PCAiIChtYWluIHRocmVhZCAiIDw8IGlzTWFpblRocmVhZCgpIDw8ICIpIik7CiAKICAgICBz Y3JvbGxUb09mZnNldEZvckFuaW1hdGlvbihhbmltYXRpb25PZmZzZXQpOwo=