141001 2015-01-28 10:02:53 -0800 Scroll snap points do not work in the vertical direction 2015-01-28 18:15:45 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bfulgham bfulgham bdakin bfulgham simon.fraser webkit-bug-importer oldest_to_newest 1064938 0 245550 bfulgham 2015-01-28 10:02:53 -0800 Created attachment 245550 Example of horizontal and vertical scroll snap points Scroll snap points work properly in the horizontal direction, but not in the vertical. See the attached example page. The top example works properly, but the bottom fails. 1064940 1 bfulgham 2015-01-28 10:04:16 -0800 The problem seems to be in EventHandler::defaultWheelEventHandler: When scrolling in the horizontal direction, we do not mark the wheelEvent as 'default handled', which allows the event to bubble up and get handled by the snap logic. When scrolling in the vertical direction, we do mark the event as 'default handled', which prevents us from bubbling the event up to the snap logic. 1064941 2 webkit-bug-importer 2015-01-28 10:04:37 -0800 <rdar://problem/19632089> 1064947 3 bfulgham 2015-01-28 10:21:26 -0800 Actually, it looks like the difference might be in ScrollAnimatorMac::handleWheelEvent. We ask the ScrollAnimator to handle the wheel event directly in the vertical case, rather than passing it along to the scroll elasticity controller. 1065074 4 245580 bfulgham 2015-01-28 16:44:59 -0800 Created attachment 245580 Patch 1065079 5 245580 bdakin 2015-01-28 16:51:53 -0800 Comment on attachment 245580 Patch R=me assuming this does not break rubber-banding in overflow areas and iframes. 1065115 6 bfulgham 2015-01-28 18:15:45 -0800 Committed r179324: <http://trac.webkit.org/changeset/179324> 245550 2015-01-28 10:02:53 -0800 2015-01-28 10:02:53 -0800 Example of horizontal and vertical scroll snap points scroll-snap-mandatory.html text/html 2782 bfulgham PCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgo8aHRtbD4KICAg IDxoZWFkPgogICAgICAgIDxzdHlsZT4KICAgICAgICAgICAgaW1nIHsKICAgICAgICAgICAgICAg IHdpZHRoOjUwMHB4OwogICAgICAgICAgICB9CiAgICAgICAgICAgIC5ob3Jpem9udGFsR2FsbGVy eSB7CiAgICAgICAgICAgICAgICB3aWR0aDogNTAwcHg7CiAgICAgICAgICAgICAgICBoZWlnaHQ6 IDUwMHB4OwogICAgICAgICAgICAgICAgb3ZlcmZsb3cteTogaGlkZGVuOwogICAgICAgICAgICAg ICAgb3ZlcmZsb3cteDogYXV0bzsKICAgICAgICAgICAgICAgIC13ZWJraXQtc2Nyb2xsLXNuYXAt cG9pbnRzLXg6IHJlcGVhdCgxMDAlKTsKICAgICAgICAgICAgICAgIC13ZWJraXQtc2Nyb2xsLXNu YXAtdHlwZTogbWFuZGF0b3J5OwogICAgICAgICAgICB9CiAgICAgICAgICAgIC5ob3Jpem9udGFs R2FsbGVyeURyYXdlciB7CiAgICAgICAgICAgICAgICB3aWR0aDogMzAwMHB4OwogICAgICAgICAg ICAgICAgaGVpZ2h0OiA1MDBweDsKICAgICAgICAgICAgfQogICAgICAgICAgICAudmVydGljYWxH YWxsZXJ5IHsKICAgICAgICAgICAgICAgIHdpZHRoOiA1MDBweDsKICAgICAgICAgICAgICAgIGhl aWdodDogNTAwcHg7CiAgICAgICAgICAgICAgICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7CiAgICAg ICAgICAgICAgICBvdmVyZmxvdy14OiBoaWRkZW47CiAgICAgICAgICAgICAgICBvdmVyZmxvdy15 OiBhdXRvOwogICAgICAgICAgICAgICAgLXdlYmtpdC1zY3JvbGwtc25hcC1wb2ludHMteTogcmVw ZWF0KDEwMCUpOwogICAgICAgICAgICAgICAgLXdlYmtpdC1zY3JvbGwtc25hcC10eXBlOiBtYW5k YXRvcnk7CiAgICAgICAgICAgIH0KICAgICAgICAgICAgLnZlcnRpY2FsR2FsbGVyeURyYXdlciB7 CiAgICAgICAgICAgICAgICB3aWR0aDogNTAwcHg7CiAgICAgICAgICAgICAgICBoZWlnaHQ6IDMw MDBweDsKICAgICAgICAgICAgfQogICAgICAgICAgICAuY29sb3JCb3ggewogICAgICAgICAgICAg ICAgaGVpZ2h0OiA1MDBweDsKICAgICAgICAgICAgICAgIHdpZHRoOiA1MDBweDsKICAgICAgICAg ICAgICAgIGZsb2F0OiBsZWZ0OwogICAgICAgICAgICAgICAgLXdlYmtpdC1zY3JvbGwtc25hcC1j b29yZGluYXRlOiA1MCUgNTAlOwogICAgICAgICAgICB9CiAgICAgICAgICAgICNpdGVtMCB7CiAg ICAgICAgICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiAjRkYwMDAwOwogICAgICAgICAgICB9CiAg ICAgICAgICAgICNpdGVtMSB7CiAgICAgICAgICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiAjMDBG RjAwOwogICAgICAgICAgICB9CiAgICAgICAgICAgICNpdGVtMiB7CiAgICAgICAgICAgICAgICBi YWNrZ3JvdW5kLWNvbG9yOiAjMDAwMEZGOwogICAgICAgICAgICB9CiAgICAgICAgICAgICNpdGVt MyB7CiAgICAgICAgICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiAjMDBGRkZGOwogICAgICAgICAg ICB9CiAgICAgICAgICAgICNpdGVtNCB7CiAgICAgICAgICAgICAgICBiYWNrZ3JvdW5kLWNvbG9y OiAjRkZGRjAwOwogICAgICAgICAgICB9CiAgICAgICAgICAgICNpdGVtNSB7CiAgICAgICAgICAg ICAgICBiYWNrZ3JvdW5kLWNvbG9yOiAjRkYwMEZGOwogICAgICAgICAgICB9CiAgICAgICAgPC9z dHlsZT4KICAgIDwvaGVhZD4KICAgIDxib2R5PgogICAgICAgIDxkaXYgc3R5bGU9InBvc2l0aW9u OiByZWxhdGl2ZTsgaGVpZ2h0OiA1MDBweDsgd2lkdGg6IDUwMHB4Ij4KICAgICAgICAgICAgPGRp diBjbGFzcz0iaG9yaXpvbnRhbEdhbGxlcnkiPgogICAgICAgICAgICAgICAgPGRpdiBjbGFzcz0i aG9yaXpvbnRhbEdhbGxlcnlEcmF3ZXIiPgogICAgICAgICAgICAgICAgICAgIDxkaXYgaWQ9Iml0 ZW0wIiBjbGFzcz0iY29sb3JCb3giPjwvZGl2PgogICAgICAgICAgICAgICAgICAgIDxkaXYgaWQ9 Iml0ZW0xIiBjbGFzcz0iY29sb3JCb3giPjwvZGl2PgogICAgICAgICAgICAgICAgICAgIDxkaXYg aWQ9Iml0ZW0yIiBjbGFzcz0iY29sb3JCb3giPjwvZGl2PgogICAgICAgICAgICAgICAgICAgIDxk aXYgaWQ9Iml0ZW0zIiBjbGFzcz0iY29sb3JCb3giPjwvZGl2PgogICAgICAgICAgICAgICAgICAg IDxkaXYgaWQ9Iml0ZW00IiBjbGFzcz0iY29sb3JCb3giPjwvZGl2PgogICAgICAgICAgICAgICAg ICAgIDxkaXYgaWQ9Iml0ZW01IiBjbGFzcz0iY29sb3JCb3giPjwvZGl2PgogICAgICAgICAgICAg ICAgPC9kaXY+CiAgICAgICAgICAgIDwvZGl2PgogICAgICAgICAgICA8ZGl2IGNsYXNzPSJ2ZXJ0 aWNhbEdhbGxlcnkiPgogICAgICAgICAgICAgICAgPGRpdiBjbGFzcz0idmVydGljYWxHYWxsZXJ5 RHJhd2VyIj4KICAgICAgICAgICAgICAgICAgICA8ZGl2IGlkPSJpdGVtMCIgY2xhc3M9ImNvbG9y Qm94Ij48L2Rpdj4KICAgICAgICAgICAgICAgICAgICA8ZGl2IGlkPSJpdGVtMSIgY2xhc3M9ImNv bG9yQm94Ij48L2Rpdj4KICAgICAgICAgICAgICAgICAgICA8ZGl2IGlkPSJpdGVtMiIgY2xhc3M9 ImNvbG9yQm94Ij48L2Rpdj4KICAgICAgICAgICAgICAgICAgICA8ZGl2IGlkPSJpdGVtMyIgY2xh c3M9ImNvbG9yQm94Ij48L2Rpdj4KICAgICAgICAgICAgICAgICAgICA8ZGl2IGlkPSJpdGVtNCIg Y2xhc3M9ImNvbG9yQm94Ij48L2Rpdj4KICAgICAgICAgICAgICAgICAgICA8ZGl2IGlkPSJpdGVt NSIgY2xhc3M9ImNvbG9yQm94Ij48L2Rpdj4KICAgICAgICAgICAgICAgIDwvZGl2PgogICAgICAg ICAgICA8L2Rpdj4KICAgICAgICA8L2Rpdj4KICAgIDwvYm9keT4KPC9odG1sPg== 245580 2015-01-28 16:44:59 -0800 2015-01-28 16:51:53 -0800 Patch bug-141001-20150128164504.patch text/plain 6010 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3OTMxNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE1LTAxLTI4ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFNjcm9sbCBzbmFwIHBvaW50 cyBkbyBub3Qgd29yayBpbiB0aGUgdmVydGljYWwgZGlyZWN0aW9uCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDEwMDEKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzE5NjMyMDg5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIE5ldyBzY3JvbGwgc25hcCB0ZXN0cyBhcmUgYmVpbmcgcHJlcGFyZWQgc2VwYXJh dGVseS4gQSBtYW51YWwgdGVzdCBjYXNlIGlzIGF0dGFjaGVkIHRvIHRoZSBpc3N1ZS4KKworICAg ICAgICAqIHBhZ2UvRXZlbnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmhhbmRsZVdo ZWVsRXZlbnRJbkFwcHJvcHJpYXRlRW5jbG9zaW5nQm94Rm9yU2luZ2xlQXhpcyk6IFdlIHdhbnQg dG8gY29uc2lkZXIgbW9tZW50dW0gZW5kIHBoYXNlCisgICAgICAgIHdoZW4gZGVhbGluZyB3aXRo IFNjcm9sbCBTbmFwIFBvaW50cy4KKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvQXhpc1Njcm9sbFNu YXBBbmltYXRvci5tbToKKyAgICAgICAgKFdlYkNvcmU6OkF4aXNTY3JvbGxTbmFwQW5pbWF0b3I6 OmhhbmRsZVdoZWVsRXZlbnQpOiBXZSBkbyBOT1Qgd2FudCB0byBiYWlsIG91dCBlYXJseSBoZXJl LiBJbiBmYWN0LCBpdCdzIHN0cmFuZ2UKKyAgICAgICAgdGhhdCB0aGlzIGNvZGUgd2FzIGxpa2Ug dGhpcyBhdCBhbGwsIHNpbmNlIGl0IG1lYW50IGEgbGFyZ2UgbnVtYmVyIG9mIGNhc2VzIHdlcmUg bm90IGJlaW5nIHVzZWQuIFdlIGFsc28gd2FudCB0bworICAgICAgICB0cmlnZ2VyIHRoZSBzY3Jv bGwgc25hcCBhbmltYXRpb24gKHdoZW4gYXBwbGljYWJsZSkgdXBvbiBhbiBpbmVydGlhIHNjcm9s bCBlbmQuCisgICAgICAgICogcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1tOgorICAg ICAgICAoV2ViQ29yZTo6Z2VzdHVyZVNob3VsZEJlZ2luU25hcCk6IEFkZGVkLgorICAgICAgICAo V2ViQ29yZTo6U2Nyb2xsQW5pbWF0b3JNYWM6OmFsbG93c1ZlcnRpY2FsU3RyZXRjaGluZyk6IElm IHdlIGhhdmUgYXV0b21hdGljIGVsYXN0aWNpdHksIGFuZCB3ZSBoYXZlIGFjdGl2ZSBzY3JvbGwK KyAgICAgICAgc25hcCBwb2ludHMsIHdlIHdhbnQgdG8gbGV0IHRoZSBzY3JvbGwgc25hcCBhbmlt YXRvciBkZWFsIHdpdGggdGhlIGdlc3R1cmUuCisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxBbmlt YXRvck1hYzo6YWxsb3dzSG9yaXpvbnRhbFN0cmV0Y2hpbmcpOiBEaXR0by4KKwogMjAxNS0wMS0y OCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFNpbXBsZSBsaW5l IGxheW91dDogRHJvcCB1bmNvbW1pdHRlZC9jb21taXR0ZWQgdGVybXMgZnJvbSBMaW5lU3RhdGUu CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCShyZXZpc2lvbiAxNzkyNzQp CisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTMwMiw2ICszMDIsOSBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaGFuZGxlV2hlZWxFdmVudElu QXBwCiAgICAgYm9vbCBzaG91bGRIYW5kbGVFdmVudCA9IChheGlzID09IFNjcm9sbEV2ZW50QXhp czo6VmVydGljYWwgJiYgd2hlZWxFdmVudC0+ZGVsdGFZKCkpIHx8IChheGlzID09IFNjcm9sbEV2 ZW50QXhpczo6SG9yaXpvbnRhbCAmJiB3aGVlbEV2ZW50LT5kZWx0YVgoKSk7CiAjaWYgUExBVEZP Uk0oTUFDKQogICAgIHNob3VsZEhhbmRsZUV2ZW50IHw9IHdoZWVsRXZlbnQtPnBoYXNlKCkgPT0g UGxhdGZvcm1XaGVlbEV2ZW50UGhhc2VFbmRlZDsKKyNpZiBFTkFCTEUoQ1NTX1NDUk9MTF9TTkFQ KQorICAgIHNob3VsZEhhbmRsZUV2ZW50IHw9IHdoZWVsRXZlbnQtPm1vbWVudHVtUGhhc2UoKSA9 PSBQbGF0Zm9ybVdoZWVsRXZlbnRQaGFzZUVuZGVkOworI2VuZGlmCiAjZW5kaWYKICAgICBpZiAo IXN0YXJ0Tm9kZS0+cmVuZGVyZXIoKSB8fCAhc2hvdWxkSGFuZGxlRXZlbnQpCiAgICAgICAgIHJl dHVybiBmYWxzZTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9BeGlzU2Nyb2xs U25hcEFuaW1hdG9yLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21h Yy9BeGlzU2Nyb2xsU25hcEFuaW1hdG9yLm1tCShyZXZpc2lvbiAxNzkyNzQpCisrKyBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9tYWMvQXhpc1Njcm9sbFNuYXBBbmltYXRvci5tbQkod29ya2luZyBj b3B5KQpAQCAtMTAyLDggKzEwMiw2IEBAIHZvaWQgQXhpc1Njcm9sbFNuYXBBbmltYXRvcjo6aGFu ZGxlV2hlZWwKIHsKICAgICBmbG9hdCB3aGVlbERlbHRhID0gbV9heGlzID09IFNjcm9sbEV2ZW50 QXhpczo6SG9yaXpvbnRhbCA/IC1ldmVudC5kZWx0YVgoKSA6IC1ldmVudC5kZWx0YVkoKTsKICAg ICBXaGVlbEV2ZW50U3RhdHVzIHdoZWVsU3RhdHVzID0gdG9XaGVlbEV2ZW50U3RhdHVzKGV2ZW50 LnBoYXNlKCksIGV2ZW50Lm1vbWVudHVtUGhhc2UoKSk7Ci0gICAgaWYgKCh3aGVlbFN0YXR1cyA9 PSBXaGVlbEV2ZW50U3RhdHVzOjpVc2VyU2Nyb2xsaW5nIHx8IHdoZWVsU3RhdHVzID09IFdoZWVs RXZlbnRTdGF0dXM6OkluZXJ0aWFsU2Nyb2xsaW5nIHx8IHdoZWVsU3RhdHVzID09IFdoZWVsRXZl bnRTdGF0dXM6OkluZXJ0aWFsU2Nyb2xsQmVnaW4pICYmICF3aGVlbERlbHRhKQotICAgICAgICBy ZXR1cm47CiAKICAgICBzd2l0Y2ggKHdoZWVsU3RhdHVzKSB7CiAgICAgY2FzZSBXaGVlbEV2ZW50 U3RhdHVzOjpVc2VyU2Nyb2xsQmVnaW46CkBAIC0xMzQsNiArMTMyLDcgQEAgdm9pZCBBeGlzU2Ny b2xsU25hcEFuaW1hdG9yOjpoYW5kbGVXaGVlbAogICAgICAgICBicmVhazsKIAogICAgIGNhc2Ug V2hlZWxFdmVudFN0YXR1czo6SW5lcnRpYWxTY3JvbGxFbmQ6CisgICAgICAgIGJlZ2luU2Nyb2xs U25hcEFuaW1hdGlvbihTY3JvbGxTbmFwU3RhdGU6OlNuYXBwaW5nKTsKICAgICAgICAgY2xlYXJJ bml0aWFsV2hlZWxEZWx0YVdpbmRvdygpOwogICAgICAgICBtX3Nob3VsZE92ZXJyaWRlV2hlZWxF dmVudCA9IGZhbHNlOwogICAgICAgICBicmVhazsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMubW0JKHJldmlzaW9uIDE3OTI3NCkKKysr IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5tbQkod29ya2lu ZyBjb3B5KQpAQCAtMTE1Miw2ICsxMTUyLDIxIEBAIGJvb2wgU2Nyb2xsQW5pbWF0b3JNYWM6Omlz QWxyZWFkeVBpbm5lZEkKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKKyNpZiBFTkFCTEUoQ1NTX1ND Uk9MTF9TTkFQKQorc3RhdGljIGJvb2wgZ2VzdHVyZVNob3VsZEJlZ2luU25hcChjb25zdCBQbGF0 Zm9ybVdoZWVsRXZlbnQmIHdoZWVsRXZlbnQsIGNvbnN0IFZlY3RvcjxMYXlvdXRVbml0Piogc25h cE9mZnNldHMpCit7CisgICAgaWYgKCFzbmFwT2Zmc2V0cykKKyAgICAgICAgcmV0dXJuIGZhbHNl OworICAgIAorICAgIGlmICgod2hlZWxFdmVudC5waGFzZSgpICE9IFBsYXRmb3JtV2hlZWxFdmVu dFBoYXNlRW5kZWQpCisgICAgICAgICYmICEod2hlZWxFdmVudC5waGFzZSgpID09IFBsYXRmb3Jt V2hlZWxFdmVudFBoYXNlTm9uZSAmJiB3aGVlbEV2ZW50Lm1vbWVudHVtUGhhc2UoKSA9PSBQbGF0 Zm9ybVdoZWVsRXZlbnRQaGFzZUVuZGVkKSkgeworICAgICAgICByZXR1cm4gZmFsc2U7CisgICAg fQorCisgICAgcmV0dXJuIHRydWU7Cit9CisjZW5kaWYKKwogYm9vbCBTY3JvbGxBbmltYXRvck1h Yzo6YWxsb3dzVmVydGljYWxTdHJldGNoaW5nKGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYgd2hl ZWxFdmVudCkKIHsKICAgICBzd2l0Y2ggKG1fc2Nyb2xsYWJsZUFyZWEtPnZlcnRpY2FsU2Nyb2xs RWxhc3RpY2l0eSgpKSB7CkBAIC0xMTYwLDYgKzExNzUsMTAgQEAgYm9vbCBTY3JvbGxBbmltYXRv ck1hYzo6YWxsb3dzVmVydGljYWxTdAogICAgICAgICBTY3JvbGxiYXIqIHZTY3JvbGxlciA9IG1f c2Nyb2xsYWJsZUFyZWEtPnZlcnRpY2FsU2Nyb2xsYmFyKCk7CiAgICAgICAgIGJvb2wgc2Nyb2xs YmFyc0FsbG93U3RyZXRjaGluZyA9ICgodlNjcm9sbGVyICYmIHZTY3JvbGxlci0+ZW5hYmxlZCgp KSB8fCAoIWhTY3JvbGxlciB8fCAhaFNjcm9sbGVyLT5lbmFibGVkKCkpKTsKICAgICAgICAgYm9v bCBldmVudFByZXZlbnRzU3RyZXRjaGluZyA9IG1fc2Nyb2xsYWJsZUFyZWEtPmhhc1Njcm9sbGFi bGVPclJ1YmJlcmJhbmRhYmxlQW5jZXN0b3IoKSAmJiBuZXdHZXN0dXJlSXNTdGFydGluZyh3aGVl bEV2ZW50KSAmJiBpc0FscmVhZHlQaW5uZWRJbkRpcmVjdGlvbk9mR2VzdHVyZSh3aGVlbEV2ZW50 LCBTY3JvbGxFdmVudEF4aXM6OlZlcnRpY2FsKTsKKyNpZiBFTkFCTEUoQ1NTX1NDUk9MTF9TTkFQ KQorICAgICAgICBpZiAoIWV2ZW50UHJldmVudHNTdHJldGNoaW5nKQorICAgICAgICAgICAgZXZl bnRQcmV2ZW50c1N0cmV0Y2hpbmcgPSBnZXN0dXJlU2hvdWxkQmVnaW5TbmFwKHdoZWVsRXZlbnQs IG1fc2Nyb2xsYWJsZUFyZWEtPnZlcnRpY2FsU25hcE9mZnNldHMoKSk7CisjZW5kaWYKICAgICAg ICAgcmV0dXJuIHNjcm9sbGJhcnNBbGxvd1N0cmV0Y2hpbmcgJiYgIWV2ZW50UHJldmVudHNTdHJl dGNoaW5nOwogICAgIH0KICAgICBjYXNlIFNjcm9sbEVsYXN0aWNpdHlOb25lOgpAQCAtMTE4MCw2 ICsxMTk5LDEwIEBAIGJvb2wgU2Nyb2xsQW5pbWF0b3JNYWM6OmFsbG93c0hvcml6b250YWwKICAg ICAgICAgU2Nyb2xsYmFyKiB2U2Nyb2xsZXIgPSBtX3Njcm9sbGFibGVBcmVhLT52ZXJ0aWNhbFNj cm9sbGJhcigpOwogICAgICAgICBib29sIHNjcm9sbGJhcnNBbGxvd1N0cmV0Y2hpbmcgPSAoKGhT Y3JvbGxlciAmJiBoU2Nyb2xsZXItPmVuYWJsZWQoKSkgfHwgKCF2U2Nyb2xsZXIgfHwgIXZTY3Jv bGxlci0+ZW5hYmxlZCgpKSk7CiAgICAgICAgIGJvb2wgZXZlbnRQcmV2ZW50c1N0cmV0Y2hpbmcg PSBtX3Njcm9sbGFibGVBcmVhLT5oYXNTY3JvbGxhYmxlT3JSdWJiZXJiYW5kYWJsZUFuY2VzdG9y KCkgJiYgbmV3R2VzdHVyZUlzU3RhcnRpbmcod2hlZWxFdmVudCkgJiYgaXNBbHJlYWR5UGlubmVk SW5EaXJlY3Rpb25PZkdlc3R1cmUod2hlZWxFdmVudCwgU2Nyb2xsRXZlbnRBeGlzOjpIb3Jpem9u dGFsKTsKKyNpZiBFTkFCTEUoQ1NTX1NDUk9MTF9TTkFQKQorICAgICAgICBpZiAoIWV2ZW50UHJl dmVudHNTdHJldGNoaW5nKQorICAgICAgICAgICAgZXZlbnRQcmV2ZW50c1N0cmV0Y2hpbmcgPSBn ZXN0dXJlU2hvdWxkQmVnaW5TbmFwKHdoZWVsRXZlbnQsIG1fc2Nyb2xsYWJsZUFyZWEtPmhvcml6 b250YWxTbmFwT2Zmc2V0cygpKTsKKyNlbmRpZgogICAgICAgICByZXR1cm4gc2Nyb2xsYmFyc0Fs bG93U3RyZXRjaGluZyAmJiAhZXZlbnRQcmV2ZW50c1N0cmV0Y2hpbmc7CiAgICAgfQogICAgIGNh c2UgU2Nyb2xsRWxhc3RpY2l0eU5vbmU6Cg==