132043 2014-04-23 00:53:35 -0700 TouchEvent is not handled after releasing any point among touched points. 2014-04-28 09:22:43 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 enmi.lee enmi.lee benjamin commit-queue simon.fraser oldest_to_newest 1003212 0 enmi.lee 2014-04-23 00:53:35 -0700 m_isTrackingTouchEvents is set to false when we release any touched point, so we can not process rest of touched points. In the EFL port's unit test, we test as follows and it fails because #5 and #6 is not processed. 1. first touch start -> 2. second touch start -> 3. second touch move -> 4. second touch end -> 5. first touch move -> 6. first touch end So, I will modify code to set m_isTrackingTouchEvents to false when all touched points are released. 1003220 1 229963 enmi.lee 2014-04-23 01:12:35 -0700 Created attachment 229963 Patch 1003504 2 229963 benjamin 2014-04-23 20:36:33 -0700 Comment on attachment 229963 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=229963&action=review > Source/WebKit2/UIProcess/WebPageProxy.cpp:1532 > - if (event.type() == WebEvent::TouchEnd || event.type() == WebEvent::TouchCancel) > + if ((event.touchPoints().size() <= 1 && event.type() == WebEvent::TouchEnd) || event.type() == WebEvent::TouchCancel) You are right, I completely mishandled multitouch here. :( Unfortunately checking for the size of touchPoints() is not enough. You could have two touch points simultaneously in touchEnd or touchCancel. You will need to loop over the touch points and find if they are all released or canceled. Can you please do that in a little utility function? I separated the iOS touch event dispatch recently and the same bug exist in there. 1003517 3 229963 enmi.lee 2014-04-23 21:15:37 -0700 Comment on attachment 229963 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=229963&action=review >> Source/WebKit2/UIProcess/WebPageProxy.cpp:1532 >> + if ((event.touchPoints().size() <= 1 && event.type() == WebEvent::TouchEnd) || event.type() == WebEvent::TouchCancel) > > You are right, I completely mishandled multitouch here. :( > > Unfortunately checking for the size of touchPoints() is not enough. You could have two touch points simultaneously in touchEnd or touchCancel. You will need to loop over the touch points and find if they are all released or canceled. > > Can you please do that in a little utility function? I separated the iOS touch event dispatch recently and the same bug exist in there. Thanks for review :) I will update new patch. 1003562 4 230055 enmi.lee 2014-04-24 00:06:27 -0700 Created attachment 230055 Patch 1004220 5 230055 benjamin 2014-04-25 14:43:16 -0700 Comment on attachment 230055 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=230055&action=review Thanks for fixing this! > Source/WebKit2/UIProcess/WebPageProxy.cpp:1496 > +bool WebPageProxy::areAllTouchPointsReleased(const WebTouchEvent& event) const This should not be a member of WebPageProxy, the function does not need to access any of the states of WebPageProxy, it should be an utility static function in the implementation file. 1004449 6 230055 enmi.lee 2014-04-27 17:33:49 -0700 Comment on attachment 230055 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=230055&action=review >> Source/WebKit2/UIProcess/WebPageProxy.cpp:1496 >> +bool WebPageProxy::areAllTouchPointsReleased(const WebTouchEvent& event) const > > This should not be a member of WebPageProxy, the function does not need to access any of the states of WebPageProxy, it should be an utility static function in the implementation file. yes, right. I will update new patch for that. 1004452 7 230272 enmi.lee 2014-04-27 17:45:21 -0700 Created attachment 230272 Patch 1004461 8 230272 commit-queue 2014-04-27 19:09:33 -0700 Comment on attachment 230272 Patch Clearing flags on attachment: 230272 Committed r167867: <http://trac.webkit.org/changeset/167867> 1004462 9 commit-queue 2014-04-27 19:09:42 -0700 All reviewed patches have been landed. Closing bug. 1004612 10 simon.fraser 2014-04-28 09:22:43 -0700 This broke the iOS build. 229963 2014-04-23 01:12:35 -0700 2014-04-24 00:06:21 -0700 Patch bug-132043-20140423171211.patch text/plain 1551 enmi.lee U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3NjkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOWM5MjM4MTUyMWI1NGVh NmExNDM2MWZkMzYyY2YyMmM0MTdlZDRkYS4uZTQzMjIxMTM1ZTJiZjc2ZDBhNTlkNmQxY2Y5NmJi MTFhYjE3MzhjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE0LTA0LTIzICBFdW5t aSBMZWUgIDxldW5taTE1LmxlZUBzYW1zdW5nLmNvbT4KKworICAgICAgICBUb3VjaEV2ZW50IGlz IG5vdCBoYW5kbGVkIGFmdGVyIHJlbGVhc2luZyBhbnkgcG9pbnQgYW1vbmcgdG91Y2hlZCBwb2lu dHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzIw NDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBIYW5k bGUgVG91Y2hFdmVudCB1bnRpbCBhbGwgdG91Y2hlZCBwb2ludHMgYXJlIHJlbGVhc2VkIGJ5IHNl dHRpbmcKKyAgICAgICAgdHJhY2tpbmdUb3VjaEV2ZW50cyB2YXJpYWJsZSB0byBmYWxzZSB3aGVu IGxhc3QgcG9pbnQgaXMgcmVsZWFzZWQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpoYW5kbGVUb3VjaEV2ZW50 KToKKwogMjAxNC0wNC0yMiAgQ2hyaXMgRmxlaXphY2ggIDxjZmxlaXphY2hAYXBwbGUuY29tPgog CiAgICAgICAgIEFYOiBpT1MgaGl0LXRlc3RpbmcgZG9lcyBub3Qgd29yayB3aGVuIHBhZ2UgaXMg em9vbWVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IGE4 NTgwNjEzOTE0OTBiMTlkMDU4MGQ1NTdiZDNhZjEyZGQ5MzkyMTQuLmQ2Nzg0YjUxYjZiMjRmODcw YjRlOWIyZWZkMDc2Zjk3NDY4MzRkNmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwCkBAIC0xNTI5LDcgKzE1MjksNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6aGFu ZGxlVG91Y2hFdmVudChjb25zdCBOYXRpdmVXZWJUb3VjaEV2ZW50JiBldmVudCkKICAgICAgICAg fQogICAgIH0KIAotICAgIGlmIChldmVudC50eXBlKCkgPT0gV2ViRXZlbnQ6OlRvdWNoRW5kIHx8 IGV2ZW50LnR5cGUoKSA9PSBXZWJFdmVudDo6VG91Y2hDYW5jZWwpCisgICAgaWYgKChldmVudC50 b3VjaFBvaW50cygpLnNpemUoKSA8PSAxICYmIGV2ZW50LnR5cGUoKSA9PSBXZWJFdmVudDo6VG91 Y2hFbmQpIHx8IGV2ZW50LnR5cGUoKSA9PSBXZWJFdmVudDo6VG91Y2hDYW5jZWwpCiAgICAgICAg IG1faXNUcmFja2luZ1RvdWNoRXZlbnRzID0gZmFsc2U7CiB9CiAjZW5kaWYgLy8gRU5BQkxFKFRP VUNIX0VWRU5UUykK 230055 2014-04-24 00:06:27 -0700 2014-04-27 17:45:16 -0700 Patch bug-132043-20140424160559.patch text/plain 3603 enmi.lee U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3NzQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggM2NhZjU2Mzg0MDY1MGVl ZjM1YzQ0MTIxMjU4NWQyODI0MmYwMmJkNy4uM2MyMWUyMDc1OWEyNDE1NDZlZjdlZjY5ZTg5Yjdh Y2Y4NzMxNWUzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE0LTA0LTI0ICBFdW5t aSBMZWUgIDxldW5taTE1LmxlZUBzYW1zdW5nLmNvbT4KKworICAgICAgICBUb3VjaEV2ZW50IGlz IG5vdCBoYW5kbGVkIGFmdGVyIHJlbGVhc2luZyBhbnkgcG9pbnQgYW1vbmcgdG91Y2hlZCBwb2lu dHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzIw NDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBIYW5k bGUgVG91Y2hFdmVudCB1bnRpbCBhbGwgdG91Y2hlZCBwb2ludHMgYXJlIHJlbGVhc2VkIGJ5IHNl dHRpbmcKKyAgICAgICAgdHJhY2tpbmdUb3VjaEV2ZW50cyB2YXJpYWJsZSB0byBmYWxzZSB3aGVu IGFsbCBwb2ludHMgYXJlIHJlbGVhc2VkLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6YXJlQWxsVG91Y2hQb2lu dHNSZWxlYXNlZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6aGFuZGxlVG91Y2hF dmVudFN5bmNocm9ub3VzbHkpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmhhbmRs ZVRvdWNoRXZlbnRBc3luY2hyb25vdXNseSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94 eTo6aGFuZGxlVG91Y2hFdmVudCk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5o OgorCiAyMDE0LTA0LTIzICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KIAogICAg ICAgICBSZW1vdmUgdW51c2VkIFdLUGFnZVNldE1lbW9yeUNhY2hlQ2xpZW50Q2FsbHNFbmFibGVk IEFQSS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku Y3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggNWI5 NDczMDgwNDNmZjg3MDdiNmNiOGFlYjlkMDNhNTU3MTNhODg4MS4uOWZmZGZhYjNjMjU2YTRhNDg3 YmY0YjQ3OGJlMWMxY2M4YWRiMDc3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5jcHAKQEAgLTE0OTIsNiArMTQ5MiwxNiBAQCBib29sIFdlYlBhZ2VQcm94eTo6c2hv dWxkU3RhcnRUcmFja2luZ1RvdWNoRXZlbnRzKGNvbnN0IFdlYlRvdWNoRXZlbnQmIHRvdWNoU3Rh cgogI2VuZGlmIC8vIEVOQUJMRShBU1lOQ19TQ1JPTExJTkcpCiAgICAgcmV0dXJuIHRydWU7CiB9 CisKK2Jvb2wgV2ViUGFnZVByb3h5OjphcmVBbGxUb3VjaFBvaW50c1JlbGVhc2VkKGNvbnN0IFdl YlRvdWNoRXZlbnQmIGV2ZW50KSBjb25zdAoreworICAgIGZvciAoY29uc3QgYXV0byYgdG91Y2hQ b2ludCA6IGV2ZW50LnRvdWNoUG9pbnRzKCkpIHsKKyAgICAgICAgaWYgKHRvdWNoUG9pbnQuc3Rh dGUoKSAhPSBXZWJQbGF0Zm9ybVRvdWNoUG9pbnQ6OlRvdWNoUmVsZWFzZWQgJiYgdG91Y2hQb2lu dC5zdGF0ZSgpICE9IFdlYlBsYXRmb3JtVG91Y2hQb2ludDo6VG91Y2hDYW5jZWxsZWQpCisgICAg ICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQorCisgICAgcmV0dXJuIHRydWU7Cit9CiAjZW5k aWYKIAogI2lmIEVOQUJMRShJT1NfVE9VQ0hfRVZFTlRTKQpAQCAtMTUxMyw3ICsxNTIzLDcgQEAg dm9pZCBXZWJQYWdlUHJveHk6OmhhbmRsZVRvdWNoRXZlbnRTeW5jaHJvbm91c2x5KGNvbnN0IE5h dGl2ZVdlYlRvdWNoRXZlbnQmIGV2ZW4KICAgICBtX3BhZ2VDbGllbnQuZG9uZVdpdGhUb3VjaEV2 ZW50KGV2ZW50LCBoYW5kbGVkKTsKICAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNzVGltZXIo KS0+c3RvcCgpOwogCi0gICAgaWYgKGV2ZW50LnR5cGUoKSA9PSBXZWJFdmVudDo6VG91Y2hFbmQg fHwgZXZlbnQudHlwZSgpID09IFdlYkV2ZW50OjpUb3VjaENhbmNlbCkKKyAgICBpZiAoYXJlQWxs VG91Y2hQb2ludHNSZWxlYXNlZChldmVudCkpCiAgICAgICAgIG1faXNUcmFja2luZ1RvdWNoRXZl bnRzID0gZmFsc2U7CiB9CiAKQEAgLTE1MjksMTAgKzE1MzksOSBAQCB2b2lkIFdlYlBhZ2VQcm94 eTo6aGFuZGxlVG91Y2hFdmVudEFzeW5jaHJvbm91c2x5KGNvbnN0IE5hdGl2ZVdlYlRvdWNoRXZl bnQmIGV2ZQogCiAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpFdmVudERpc3BhdGNoZXI6 OlRvdWNoRXZlbnQobV9wYWdlSUQsIGV2ZW50KSwgMCk7CiAKLSAgICBpZiAoZXZlbnQudHlwZSgp ID09IFdlYkV2ZW50OjpUb3VjaEVuZCB8fCBldmVudC50eXBlKCkgPT0gV2ViRXZlbnQ6OlRvdWNo Q2FuY2VsKQorICAgIGlmIChhcmVBbGxUb3VjaFBvaW50c1JlbGVhc2VkKGV2ZW50KSkKICAgICAg ICAgbV9pc1RyYWNraW5nVG91Y2hFdmVudHMgPSBmYWxzZTsKIH0KLQogI2VsaWYgRU5BQkxFKFRP VUNIX0VWRU5UUykKIHZvaWQgV2ViUGFnZVByb3h5OjpoYW5kbGVUb3VjaEV2ZW50KGNvbnN0IE5h dGl2ZVdlYlRvdWNoRXZlbnQmIGV2ZW50KQogewpAQCAtMTU2OSw3ICsxNTc4LDcgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OmhhbmRsZVRvdWNoRXZlbnQoY29uc3QgTmF0aXZlV2ViVG91Y2hFdmVudCYg ZXZlbnQpCiAgICAgICAgIH0KICAgICB9CiAKLSAgICBpZiAoZXZlbnQudHlwZSgpID09IFdlYkV2 ZW50OjpUb3VjaEVuZCB8fCBldmVudC50eXBlKCkgPT0gV2ViRXZlbnQ6OlRvdWNoQ2FuY2VsKQor ICAgIGlmIChhcmVBbGxUb3VjaFBvaW50c1JlbGVhc2VkKGV2ZW50KSkKICAgICAgICAgbV9pc1Ry YWNraW5nVG91Y2hFdmVudHMgPSBmYWxzZTsKIH0KICNlbmRpZiAvLyBFTkFCTEUoVE9VQ0hfRVZF TlRTKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5o IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IDM1NGRmYzkx YjZiZGViYTAwZTg0OTQ0NDI4YTlmNTBhMjhjM2M3MGQuLmU2ZGE2ZTUwZmMwOGFjZDVmZDc2MGYz NGY3NjgwZTVlNDMwYzRiOTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmgKQEAgLTEzODksNiArMTM4OSw3IEBAIHByaXZhdGU6CiAKICNpZiBFTkFCTEUoVE9VQ0hfRVZF TlRTKQogICAgIGJvb2wgc2hvdWxkU3RhcnRUcmFja2luZ1RvdWNoRXZlbnRzKGNvbnN0IFdlYlRv dWNoRXZlbnQmKSBjb25zdDsKKyAgICBib29sIGFyZUFsbFRvdWNoUG9pbnRzUmVsZWFzZWQoY29u c3QgV2ViVG91Y2hFdmVudCYpIGNvbnN0OwogI2VuZGlmCiAKICNpZiBFTkFCTEUoTkVUU0NBUEVf UExVR0lOX0FQSSkK 230272 2014-04-27 17:45:21 -0700 2014-04-27 19:09:32 -0700 Patch bug-132043-20140428094458.patch text/plain 3002 enmi.lee U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3Nzg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZDgyYTc5MTMxYjcwMzBk MDA2Zjg3YjA0YzBhNGM0MDAyYmNlYWI2Zi4uYzFhMTc2MjY4ODFjZWRjNDUyNzE5NDQ4OGY0Y2Nj YWMwMTY0N2Q5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE0LTA0LTI3ICBFdW5t aSBMZWUgIDxldW5taTE1LmxlZUBzYW1zdW5nLmNvbT4KKworICAgICAgICBUb3VjaEV2ZW50IGlz IG5vdCBoYW5kbGVkIGFmdGVyIHJlbGVhc2luZyBhbnkgcG9pbnQgYW1vbmcgdG91Y2hlZCBwb2lu dHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzIw NDMKKworICAgICAgICBSZXZpZXdlZCBieSBCZW5qYW1pbiBQb3VsYWluLgorCisgICAgICAgIEhh bmRsZSBUb3VjaEV2ZW50IHVudGlsIGFsbCB0b3VjaGVkIHBvaW50cyBhcmUgcmVsZWFzZWQgYnkg c2V0dGluZworICAgICAgICB0cmFja2luZ1RvdWNoRXZlbnRzIHZhcmlhYmxlIHRvIGZhbHNlIHdo ZW4gYWxsIHBvaW50cyBhcmUgcmVsZWFzZWQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6YXJlQWxsVG91Y2hQb2ludHNSZWxlYXNlZCk6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6aGFuZGxlVG91Y2hFdmVudFN5bmNocm9u b3VzbHkpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmhhbmRsZVRvdWNoRXZlbnRB c3luY2hyb25vdXNseSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6aGFuZGxlVG91 Y2hFdmVudCk6CisKIDIwMTQtMDQtMjQgIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJr aXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxNjc3MDAuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IDRiZjMwYWFmMTkwNDg5 NDQ1M2VlOGJjZmYzOTY1ZTQwMjRkMGVlNWQuLjQ2MGUzMmExMTkxZGQ3MmJkZjllYjJiYzQ4NzM5 NWVjYmY5Yzc4NTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw CkBAIC0xNDkyLDYgKzE0OTIsMTYgQEAgYm9vbCBXZWJQYWdlUHJveHk6OnNob3VsZFN0YXJ0VHJh Y2tpbmdUb3VjaEV2ZW50cyhjb25zdCBXZWJUb3VjaEV2ZW50JiB0b3VjaFN0YXIKICNlbmRpZiAv LyBFTkFCTEUoQVNZTkNfU0NST0xMSU5HKQogICAgIHJldHVybiB0cnVlOwogfQorCitzdGF0aWMg Ym9vbCBhcmVBbGxUb3VjaFBvaW50c1JlbGVhc2VkKGNvbnN0IFdlYlRvdWNoRXZlbnQmIGV2ZW50 KQoreworICAgIGZvciAoY29uc3QgYXV0byYgdG91Y2hQb2ludCA6IGV2ZW50LnRvdWNoUG9pbnRz KCkpIHsKKyAgICAgICAgaWYgKHRvdWNoUG9pbnQuc3RhdGUoKSAhPSBXZWJQbGF0Zm9ybVRvdWNo UG9pbnQ6OlRvdWNoUmVsZWFzZWQgJiYgdG91Y2hQb2ludC5zdGF0ZSgpICE9IFdlYlBsYXRmb3Jt VG91Y2hQb2ludDo6VG91Y2hDYW5jZWxsZWQpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7Cisg ICAgfQorCisgICAgcmV0dXJuIHRydWU7Cit9CiAjZW5kaWYKIAogI2lmIEVOQUJMRShJT1NfVE9V Q0hfRVZFTlRTKQpAQCAtMTUxMyw3ICsxNTIzLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmhhbmRs ZVRvdWNoRXZlbnRTeW5jaHJvbm91c2x5KGNvbnN0IE5hdGl2ZVdlYlRvdWNoRXZlbnQmIGV2ZW4K ICAgICBtX3BhZ2VDbGllbnQuZG9uZVdpdGhUb3VjaEV2ZW50KGV2ZW50LCBoYW5kbGVkKTsKICAg ICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNzVGltZXIoKS0+c3RvcCgpOwogCi0gICAgaWYgKGV2 ZW50LnR5cGUoKSA9PSBXZWJFdmVudDo6VG91Y2hFbmQgfHwgZXZlbnQudHlwZSgpID09IFdlYkV2 ZW50OjpUb3VjaENhbmNlbCkKKyAgICBpZiAoYXJlQWxsVG91Y2hQb2ludHNSZWxlYXNlZChldmVu dCkpCiAgICAgICAgIG1faXNUcmFja2luZ1RvdWNoRXZlbnRzID0gZmFsc2U7CiB9CiAKQEAgLTE1 MjksMTAgKzE1MzksOSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6aGFuZGxlVG91Y2hFdmVudEFzeW5j aHJvbm91c2x5KGNvbnN0IE5hdGl2ZVdlYlRvdWNoRXZlbnQmIGV2ZQogCiAgICAgbV9wcm9jZXNz LT5zZW5kKE1lc3NhZ2VzOjpFdmVudERpc3BhdGNoZXI6OlRvdWNoRXZlbnQobV9wYWdlSUQsIGV2 ZW50KSwgMCk7CiAKLSAgICBpZiAoZXZlbnQudHlwZSgpID09IFdlYkV2ZW50OjpUb3VjaEVuZCB8 fCBldmVudC50eXBlKCkgPT0gV2ViRXZlbnQ6OlRvdWNoQ2FuY2VsKQorICAgIGlmIChhcmVBbGxU b3VjaFBvaW50c1JlbGVhc2VkKGV2ZW50KSkKICAgICAgICAgbV9pc1RyYWNraW5nVG91Y2hFdmVu dHMgPSBmYWxzZTsKIH0KLQogI2VsaWYgRU5BQkxFKFRPVUNIX0VWRU5UUykKIHZvaWQgV2ViUGFn ZVByb3h5OjpoYW5kbGVUb3VjaEV2ZW50KGNvbnN0IE5hdGl2ZVdlYlRvdWNoRXZlbnQmIGV2ZW50 KQogewpAQCAtMTU2OSw3ICsxNTc4LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmhhbmRsZVRvdWNo RXZlbnQoY29uc3QgTmF0aXZlV2ViVG91Y2hFdmVudCYgZXZlbnQpCiAgICAgICAgIH0KICAgICB9 CiAKLSAgICBpZiAoZXZlbnQudHlwZSgpID09IFdlYkV2ZW50OjpUb3VjaEVuZCB8fCBldmVudC50 eXBlKCkgPT0gV2ViRXZlbnQ6OlRvdWNoQ2FuY2VsKQorICAgIGlmIChhcmVBbGxUb3VjaFBvaW50 c1JlbGVhc2VkKGV2ZW50KSkKICAgICAgICAgbV9pc1RyYWNraW5nVG91Y2hFdmVudHMgPSBmYWxz ZTsKIH0KICNlbmRpZiAvLyBFTkFCTEUoVE9VQ0hfRVZFTlRTKQo=