139556 2014-12-11 12:57:03 -0800 [iOS][WK2] Ignore synthetic click initiated on a previous page 2015-01-22 20:17:08 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 benjamin benjamin andersca ap ddkilzer sam simon.fraser thorton oldest_to_newest 1054593 0 benjamin 2014-12-11 12:57:03 -0800 [iOS][WK2] Ignore synthetic click initiated on a previous page 1054618 1 243146 benjamin 2014-12-11 14:22:30 -0800 Created attachment 243146 Patch 1055355 2 benjamin 2014-12-12 17:17:32 -0800 rdar://problem/18586008 1056252 3 243146 ap 2014-12-16 20:06:12 -0800 Comment on attachment 243146 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243146&action=review > Source/WebKit2/ChangeLog:27 > + First, in the UIProcess, we just cancel the HighlightLongPressGestureRecognizer > + on didCommitLoadForMainFrame. This prevents "fast clicks" from accidentally going through. > + This is not bullet proof because we get didCommitLoadForMainFrame asynchronously but > + killing the timer and gesture seems like a good idea. Also, it's not just the main frame that has this problem, secondary frames too. > Source/WebKit2/ChangeLog:39 > + If the user interaction result in a tap, we send the commit ID along the tap commands. > + In the WebProcess, we know the actual layer tree commit associated with the current page. > + If the tap was generated with a layer ID preceding the current page, we fail the command. I'm somewhat concerned here, because I don't understand how FOUC prevention works. We don't necessarily paint after committing a load, but what happens with events that are delivered when there is some content loaded, but we are blocking painting? Seems like we might still have the same problem. 1062127 4 243146 ddkilzer 2015-01-17 14:43:36 -0800 Comment on attachment 243146 Patch Overall this seems fine, but r- to address Alexey's concerns. 1063481 5 243146 ddkilzer 2015-01-22 15:08:41 -0800 Comment on attachment 243146 Patch Ben and Alexey talked offline. The plan is for Ben to file a follow-up bug for the non-main frame case, but land this fix to move forward with fixing this issue with the main frame. 1063482 6 ddkilzer 2015-01-22 15:08:56 -0800 (In reply to comment #5) > Comment on attachment 243146 [details] > Patch > > Ben and Alexey talked offline. The plan is for Ben to file a follow-up bug > for the non-main frame case, but land this fix to move forward with fixing > this issue with the main frame. r=me 1063586 7 243146 benjamin 2015-01-22 20:17:04 -0800 Comment on attachment 243146 Patch Clearing flags on attachment: 243146 Committed r178980: <http://trac.webkit.org/changeset/178980> 1063587 8 benjamin 2015-01-22 20:17:08 -0800 All reviewed patches have been landed. Closing bug. 243146 2014-12-11 14:22:30 -0800 2015-01-22 20:17:04 -0800 Patch bug-139556-20141211142314.patch text/plain 13246 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3MDQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZmFkODRhOWI1NThlNDg5 MWI4MGJhMzNlYTUxMmU5NWNmNzk3MjdmZi4uYWQ5NDc1YzJiNGYxNmZjMDU5NTU4NGU1NzRlYjJj ZDUwMmVlMDQ0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDYzIEBACisyMDE0LTEyLTExICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdW1dLMl0g SWdub3JlIHN5bnRoZXRpYyBjbGljayBpbml0aWF0ZWQgb24gYSBwcmV2aW91cyBwYWdlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk1NTYKKyAgICAg ICAgcmRhcjovL3Byb2JsZW0vMTg1ODYwMDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBVbmRlciB0aGUgcmlnaHQgYWNjdW11bGF0aW9uIG9mIGJhZCBs dWNrLCBhIHN5bnRoZXRpYyBjbGljayBjb3VsZCBiZSBnZW5lcmF0ZWQKKyAgICAgICAgb24gYSBw YWdlIHRoYXQgbmV2ZXIgYXNrZWQgZm9yIGl0LgorCisgICAgICAgIFdoYXQgaGFwcGVuZWQgd2Fz OgorICAgICAgICAxKSBQYWdlIEZvbyBsaXN0ZW4gdG8gdG91Y2ggZXZlbnQuCisgICAgICAgIDIp IEluIHJlc3BvbnNlIHRvIHRvdWNoIGV2ZW50cywgRm9vIGRlY2lkZXMgdG8gbmF2aWdhdGUgdG8g cGFnZSBCYXIKKyAgICAgICAgICAgKmJ1dCogaXQgZG9lcyBub3QgY2FuY2VsIHRoZSBuYXRpdmUg Z2VzdHVyZSByZWNvZ25pemVycyB3aXRoIHByZXZlbnREZWZhdWx0KCkuCisgICAgICAgIDMpIFBh Z2UgQmFyIGxvYWRzLgorICAgICAgICA0KSBUaGUgbmF0aXZlIGdlc3R1cmUgcmVjb2duaXplciBh c2sgdXMgdG8gY2xpY2ssIHdlIGZvcndhcmQgdGhhdCB0byB0aGUgV2ViUHJvY2VzcworICAgICAg ICAgICBhbmQgZ2VuZXJhdGUgYSBzeW50aGV0aWMgbW91c2UgZXZlbnQuCisgICAgICAgIC0+IEJh ciByZWNlaXZlcyBhIGNsaWNrLgorICAgICAgICBJZiB5b3UgYXJlIHVubHVja3kgZW5vdWdoLCBp dCBsb29rcyBsaWtlIGEgc2luZ2xlIHRhcCBkb2VzIGEgZG91YmxlIGNsaWNrLgorCisgICAgICAg IFRoZXJlIGFyZSB0d28gd2F5cyB0aGlzIHBhdGNoIGF2b2lkcyB0aGUgcHJvYmxlbToKKworICAg ICAgICBGaXJzdCwgaW4gdGhlIFVJUHJvY2Vzcywgd2UganVzdCBjYW5jZWwgdGhlIEhpZ2hsaWdo dExvbmdQcmVzc0dlc3R1cmVSZWNvZ25pemVyCisgICAgICAgIG9uIGRpZENvbW1pdExvYWRGb3JN YWluRnJhbWUuIFRoaXMgcHJldmVudHMgImZhc3QgY2xpY2tzIiBmcm9tIGFjY2lkZW50YWxseSBn b2luZyB0aHJvdWdoLgorICAgICAgICBUaGlzIGlzIG5vdCBidWxsZXQgcHJvb2YgYmVjYXVzZSB3 ZSBnZXQgZGlkQ29tbWl0TG9hZEZvck1haW5GcmFtZSBhc3luY2hyb25vdXNseSBidXQKKyAgICAg ICAga2lsbGluZyB0aGUgdGltZXIgYW5kIGdlc3R1cmUgc2VlbXMgbGlrZSBhIGdvb2QgaWRlYS4K KworICAgICAgICBTZWNvbmQsIHdlIHNraXAgYW55IHRhcCBjb21tYW5kIGF0IHRoZSBXZWJQcm9j ZXNzIGxldmVsIHdoZW4gaXQgd2FzIGlzc3VlZCBmb3IKKyAgICAgICAgdGhlIHByZXZpb3VzIHBh Z2UuIFRoaXMgaXMgdXNpbmcgdGhlIHNhbWUgcHJpbmNpcGxlIHdlIHVzZWQgZm9yIFZpc2libGVD b250ZW50UmVjdDoKKyAgICAgICAgYW55IGlucHV0IGdlbmVyYXRlZCBiZWZvcmUgdGhlIGN1cnJl bnQgbGF5ZXIgdHJlZSBjb21taXQgaXMgdXNlbGVzcyBmb3IgdGhlIGN1cnJlbnQgcGFnZS4KKwor ICAgICAgICBXZSB0cmFjayB0aGUgY29tbWl0IElEIGluIHRoZSBVSVByb2Nlc3Mgd2hlbiB3ZSBk ZWNpZGUgdG8gZG8gdGhlIHRyYWNraW5nIG9yIG5vdC4KKyAgICAgICAgTm90ZSB0aGF0IHdlIGtl ZXAgdGhlIElEIHJlZ2FyZGxlc3Mgb2YgdGhlIHRyYWNraW5nIHN0YXRlLCBpdCBkb2VzIG5vdCBt YXR0ZXIgaWYgd2UgaGF2ZSBzZW50CisgICAgICAgIHRvdWNoIGV2ZW50cywgd2hhdCBtYXR0ZXJz IGlzIHdoYXQgY29udGVudCB3YXMgb24gc2NyZWVuIHdoZW4gdGhlIHRvdWNoIGV2ZW50cyB3ZXJl IGhhbmRsZWQuCisKKyAgICAgICAgSWYgdGhlIHVzZXIgaW50ZXJhY3Rpb24gcmVzdWx0IGluIGEg dGFwLCB3ZSBzZW5kIHRoZSBjb21taXQgSUQgYWxvbmcgdGhlIHRhcCBjb21tYW5kcy4KKyAgICAg ICAgSW4gdGhlIFdlYlByb2Nlc3MsIHdlIGtub3cgdGhlIGFjdHVhbCBsYXllciB0cmVlIGNvbW1p dCBhc3NvY2lhdGVkIHdpdGggdGhlIGN1cnJlbnQgcGFnZS4KKyAgICAgICAgSWYgdGhlIHRhcCB3 YXMgZ2VuZXJhdGVkIHdpdGggYSBsYXllciBJRCBwcmVjZWRpbmcgdGhlIGN1cnJlbnQgcGFnZSwg d2UgZmFpbCB0aGUgY29tbWFuZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHku Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OldlYlBhZ2VQcm94eSk6CisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6aGFuZGxlVG91Y2hFdmVudFN5bmNocm9ub3VzbHkp OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnJlc2V0U3RhdGUpOgorICAgICAgICAq IFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29u dGVudFZpZXcubW06CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX2RpZENvbW1pdExvYWRGb3JN YWluRnJhbWVdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFj dGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfYXR0ZW1wdENsaWNrQXRMb2NhdGlv bjpdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbToKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpjb21taXRQb3RlbnRpYWxUYXApOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlUHJveHk6OmhhbmRsZVRhcCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpkaWRDb21taXRM b2FkKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorICAgICAgICAq IFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluOgorICAgICAgICAqIFdlYlBy b2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZTo6aGFuZGxlVGFwKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6Y29tbWl0UG90ZW50aWFs VGFwKToKKwogMjAxNC0xMi0wOSAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4K IAogICAgICAgICBLb3RvZXJpIHNvbWV0aW1lcyBkb2Vzbid0IGNvcnJlY3RseSBwcm9jZXNzIHRo ZSBmaXJzdCBjaGFuYXJhY3RlciBpbiBhIHRleHQgZmllbGQgaW4gU2FmYXJpIDcuMSBvciA2LjIK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggYjUzNTE1ZTUz NWNhY2VhZmU2NGMzZTliZjM0NGI2NjAyYjg1NTk4NS4uNmY5Nzk5ZmRiZWFjZTExZGYwNDZjM2Ji ODhhYzRmY2U2MTVlZWNiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHAKQEAgLTI3OSw2ICsyNzksNyBAQCBXZWJQYWdlUHJveHk6OldlYlBhZ2VQcm94eShQYWdl Q2xpZW50JiBwYWdlQ2xpZW50LCBXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MsIHVpbgogICAgICwg bV9keW5hbWljVmlld3BvcnRTaXplVXBkYXRlV2FpdGluZ0ZvclRhcmdldChmYWxzZSkKICAgICAs IG1fZHluYW1pY1ZpZXdwb3J0U2l6ZVVwZGF0ZVdhaXRpbmdGb3JMYXllclRyZWVDb21taXQoZmFs c2UpCiAgICAgLCBtX2R5bmFtaWNWaWV3cG9ydFNpemVVcGRhdGVMYXllclRyZWVUcmFuc2FjdGlv bklEKDApCisgICAgLCBtX2xheWVyVHJlZVRyYW5zYWN0aW9uSWRBdExhc3RUb3VjaFN0YXJ0KDAp CiAjZW5kaWYKICAgICAsIG1fZ2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXIoKnRo aXMpCiAgICAgLCBtX25vdGlmaWNhdGlvblBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlcigqdGhpcykK QEAgLTE3MTUsOCArMTcxNiwxMCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6aGFuZGxlVG91Y2hFdmVu dFN5bmNocm9ub3VzbHkoY29uc3QgTmF0aXZlV2ViVG91Y2hFdmVudCYgZXZlbgogICAgIGlmICgh aXNWYWxpZCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoZXZlbnQudHlwZSgpID09IFdl YkV2ZW50OjpUb3VjaFN0YXJ0KQorICAgIGlmIChldmVudC50eXBlKCkgPT0gV2ViRXZlbnQ6OlRv dWNoU3RhcnQpIHsKICAgICAgICAgbV9pc1RyYWNraW5nVG91Y2hFdmVudHMgPSBzaG91bGRTdGFy dFRyYWNraW5nVG91Y2hFdmVudHMoZXZlbnQpOworICAgICAgICBtX2xheWVyVHJlZVRyYW5zYWN0 aW9uSWRBdExhc3RUb3VjaFN0YXJ0ID0gZG93bmNhc3Q8UmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0Fy ZWFQcm94eT4oKmRyYXdpbmdBcmVhKCkpLmxhc3RDb21taXR0ZWRMYXllclRyZWVUcmFuc2FjdGlv bklEKCk7CisgICAgfQogCiAgICAgaWYgKCFtX2lzVHJhY2tpbmdUb3VjaEV2ZW50cykKICAgICAg ICAgcmV0dXJuOwpAQCAtNDUxNCw2ICs0NTE3LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnJlc2V0 U3RhdGUoUmVzZXRTdGF0ZVJlYXNvbiByZXNldFN0YXRlUmVhc29uKQogICAgIG1fZHluYW1pY1Zp ZXdwb3J0U2l6ZVVwZGF0ZVdhaXRpbmdGb3JUYXJnZXQgPSBmYWxzZTsKICAgICBtX2R5bmFtaWNW aWV3cG9ydFNpemVVcGRhdGVXYWl0aW5nRm9yTGF5ZXJUcmVlQ29tbWl0ID0gZmFsc2U7CiAgICAg bV9keW5hbWljVmlld3BvcnRTaXplVXBkYXRlTGF5ZXJUcmVlVHJhbnNhY3Rpb25JRCA9IDA7Cisg ICAgbV9sYXllclRyZWVUcmFuc2FjdGlvbklkQXRMYXN0VG91Y2hTdGFydCA9IDA7CiAjZW5kaWYK IAogICAgIENhbGxiYWNrQmFzZTo6RXJyb3IgZXJyb3I7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmgKaW5kZXggOWI1NWMwNzcwYWQyYTRjZjlkNWFjZmM0YWEwZGMxNjMyZWRj OTNjYi4uY2YwMTlhNjAzZjkyZTQ5ZmE3YTlhMjViYWViNDEyZTQ2YzEwNWJmYSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtODY0LDYgKzg2NCw3IEBAIHB1Ymxp YzoKICAgICB2b2lkIGNvbW1pdFBvdGVudGlhbFRhcCgpOwogICAgIHZvaWQgY2FuY2VsUG90ZW50 aWFsVGFwKCk7CiAgICAgdm9pZCB0YXBIaWdobGlnaHRBdFBvc2l0aW9uKGNvbnN0IFdlYkNvcmU6 OkZsb2F0UG9pbnQmLCB1aW50NjRfdCYgcmVxdWVzdElEKTsKKyAgICB2b2lkIGhhbmRsZVRhcChj b25zdCBXZWJDb3JlOjpGbG9hdFBvaW50Jik7CiAKICAgICB2b2lkIGluc3BlY3Rvck5vZGVTZWFy Y2hNb3ZlZFRvUG9zaXRpb24oY29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYpOwogICAgIHZvaWQg aW5zcGVjdG9yTm9kZVNlYXJjaEVuZGVkQXRQb3NpdGlvbihjb25zdCBXZWJDb3JlOjpGbG9hdFBv aW50Jik7CkBAIC0xMzc5LDYgKzEzODAsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9keW5hbWlj Vmlld3BvcnRTaXplVXBkYXRlV2FpdGluZ0ZvclRhcmdldDsKICAgICBib29sIG1fZHluYW1pY1Zp ZXdwb3J0U2l6ZVVwZGF0ZVdhaXRpbmdGb3JMYXllclRyZWVDb21taXQ7CiAgICAgdWludDY0X3Qg bV9keW5hbWljVmlld3BvcnRTaXplVXBkYXRlTGF5ZXJUcmVlVHJhbnNhY3Rpb25JRDsKKyAgICB1 aW50NjRfdCBtX2xheWVyVHJlZVRyYW5zYWN0aW9uSWRBdExhc3RUb3VjaFN0YXJ0OwogI2VuZGlm CiAKICNpZiBFTkFCTEUoVklCUkFUSU9OKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lv cy9XS0NvbnRlbnRWaWV3Lm1tCmluZGV4IDE3MWUxYjJkZGNkNWExNjc3Y2Y1YTVmMTZjOWE0ZjA3 ZmE2NTU2NzUuLjQzZmM4NmY2YWQ5NmVhOTRlMmQyNGUwZGYyNzA0N2FjOGM1ODM3YzAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbQorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW0KQEAgLTQ0Nyw2 ICs0NDcsNyBAQCBwcml2YXRlOgogLSAodm9pZClfZGlkQ29tbWl0TG9hZEZvck1haW5GcmFtZQog ewogICAgIFtzZWxmIF9zdG9wQXNzaXN0aW5nTm9kZV07CisgICAgW3NlbGYgX2NhbmNlbExvbmdQ cmVzc0dlc3R1cmVSZWNvZ25pemVyXTsKICAgICBbX3dlYlZpZXcgX2RpZENvbW1pdExvYWRGb3JN YWluRnJhbWVdOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9z L1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9p b3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCmluZGV4IDk2NDZjMDc2M2YwMDcwZWU1ZTMx ODJlMTJhYWVkZTlmNTQyOTgwZTkuLjNjNGIzOWQyZGY2NWYwYjhiNGIxOTA2MzdiYTIwOGNhMDYx MmJmNjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50 Vmlld0ludGVyYWN0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tD b250ZW50Vmlld0ludGVyYWN0aW9uLm1tCkBAIC0xMDczLDcgKzEwNzMsNyBAQCBzdGF0aWMgdm9p ZCBjYW5jZWxQb3RlbnRpYWxUYXBJZk5lY2Vzc2FyeShXS0NvbnRlbnRWaWV3KiBjb250ZW50Vmll dykKICAgICBpZiAoIVtzZWxmIGlzRmlyc3RSZXNwb25kZXJdKQogICAgICAgICBbc2VsZiBiZWNv bWVGaXJzdFJlc3BvbmRlcl07CiAKLSAgICBfcGFnZS0+cHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6 OldlYlBhZ2U6OkhhbmRsZVRhcChJbnRQb2ludChsb2NhdGlvbikpLCBfcGFnZS0+cGFnZUlEKCkp OworICAgIF9wYWdlLT5oYW5kbGVUYXAobG9jYXRpb24pOwogfQogCiAtICh2b2lkKXVzZVNlbGVj dGlvbkFzc2lzdGFudFdpdGhNb2RlOihVSVdlYlNlbGVjdGlvbk1vZGUpc2VsZWN0aW9uTW9kZQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJveHlJT1Mu bW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbQppbmRl eCBjNWQ0MWJlMzgxNDgxNjg4OGU2MzgzM2Y3Y2Q0ZWFmYmEwMjAyMjNlLi43Mjc2ZTFhM2NmODEy ODEwOWQyYjJkYmJkNTU1OTZiNjliODg0OTE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbQpAQCAtNjg2LDcgKzY4Niw3IEBAIHZvaWQgV2Vi UGFnZVByb3h5Ojpwb3RlbnRpYWxUYXBBdFBvc2l0aW9uKGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9p bnQmIHBvc2l0aW9uLCB1CiAKIHZvaWQgV2ViUGFnZVByb3h5Ojpjb21taXRQb3RlbnRpYWxUYXAo KQogewotICAgIHByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpDb21taXRQb3RlbnRp YWxUYXAoKSwgbV9wYWdlSUQpOworICAgIHByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdl OjpDb21taXRQb3RlbnRpYWxUYXAobV9sYXllclRyZWVUcmFuc2FjdGlvbklkQXRMYXN0VG91Y2hT dGFydCksIG1fcGFnZUlEKTsKIH0KIAogdm9pZCBXZWJQYWdlUHJveHk6OmNhbmNlbFBvdGVudGlh bFRhcCgpCkBAIC02OTksNiArNjk5LDExIEBAIHZvaWQgV2ViUGFnZVByb3h5Ojp0YXBIaWdobGln aHRBdFBvc2l0aW9uKGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmIHBvc2l0aW9uLCB1CiAgICAg cHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlRhcEhpZ2hsaWdodEF0UG9zaXRpb24o cmVxdWVzdElELCBwb3NpdGlvbiksIG1fcGFnZUlEKTsKIH0KIAordm9pZCBXZWJQYWdlUHJveHk6 OmhhbmRsZVRhcChjb25zdCBGbG9hdFBvaW50JiBsb2NhdGlvbikKK3sKKyAgICBwcm9jZXNzKCku c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6SGFuZGxlVGFwKHJvdW5kZWRJbnRQb2ludChsb2NhdGlv biksIG1fbGF5ZXJUcmVlVHJhbnNhY3Rpb25JZEF0TGFzdFRvdWNoU3RhcnQpLCBtX3BhZ2VJRCk7 Cit9CisKIHZvaWQgV2ViUGFnZVByb3h5OjppbnNwZWN0b3JOb2RlU2VhcmNoTW92ZWRUb1Bvc2l0 aW9uKGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmIHBvc2l0aW9uKQogewogICAgIHByb2Nlc3Mo KS5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpJbnNwZWN0b3JOb2RlU2VhcmNoTW92ZWRUb1Bvc2l0 aW9uKHBvc2l0aW9uKSwgbV9wYWdlSUQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IDkwYTI0MTVhMTI4OTFlNTc2MzgwYzE4OTQ3OTYyOTQx NjBkMjkwNTAuLmQ4MmM3ZDAxOTBlYjFjMTBmOGYyMTgyZDc2ODIyZmRlNDhkOTNhZDcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTQ1MDks NiArNDUwOSw3IEBAIHZvaWQgV2ViUGFnZTo6ZGlkQ29tbWl0TG9hZChXZWJGcmFtZSogZnJhbWUp CiAgICAgbV9maXJzdExheWVyVHJlZVRyYW5zYWN0aW9uSURBZnRlckRpZENvbW1pdExvYWQgPSBk b3duY2FzdDxSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYT4oKm1fZHJhd2luZ0FyZWEpLm5leHRU cmFuc2FjdGlvbklEKCk7CiAgICAgbV91c2VySGFzQ2hhbmdlZFBhZ2VTY2FsZUZhY3RvciA9IGZh bHNlOwogICAgIG1fZXN0aW1hdGVkTGF0ZW5jeSA9IHN0ZDo6Y2hyb25vOjptaWxsaXNlY29uZHMo MTAwMCAvIDYwKTsKKyAgICBjYW5jZWxQb3RlbnRpYWxUYXAoKTsKIAogI2lmIEVOQUJMRShJT1Nf VE9VQ0hfRVZFTlRTKQogICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLmV2ZW50RGlzcGF0Y2hlcigp LmNsZWFyUXVldWVkVG91Y2hFdmVudHNGb3JQYWdlKCp0aGlzKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmggYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCmluZGV4IDkxZDkxOTM4YmM1YzlkMDZlYThlMDYx OTkyODM3NDc1OTM2NWFiOGYuLjdhYWFhNjk5MjUwMjRhNTdjYjdjYWVkYzBlYTliZjQzMTJhNGJk MzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaApAQCAt NDcyLDkgKzQ3Miw5IEBAIHB1YmxpYzoKICAgICBib29sIGFsbG93c1VzZXJTY2FsaW5nKCkgY29u c3Q7CiAgICAgYm9vbCBoYXNTdGFibGVQYWdlU2NhbGVGYWN0b3IoKSBjb25zdCB7IHJldHVybiBt X2hhc1N0YWJsZVBhZ2VTY2FsZUZhY3RvcjsgfQogCi0gICAgdm9pZCBoYW5kbGVUYXAoY29uc3Qg V2ViQ29yZTo6SW50UG9pbnQmKTsKKyAgICB2b2lkIGhhbmRsZVRhcChjb25zdCBXZWJDb3JlOjpJ bnRQb2ludCYsIHVpbnQ2NF90IGxhc3RMYXllclRyZWVUcmFuc2NhdGlvbklkKTsKICAgICB2b2lk IHBvdGVudGlhbFRhcEF0UG9zaXRpb24odWludDY0X3QgcmVxdWVzdElELCBjb25zdCBXZWJDb3Jl OjpGbG9hdFBvaW50Jik7Ci0gICAgdm9pZCBjb21taXRQb3RlbnRpYWxUYXAoKTsKKyAgICB2b2lk IGNvbW1pdFBvdGVudGlhbFRhcCh1aW50NjRfdCBsYXN0TGF5ZXJUcmVlVHJhbnNjYXRpb25JZCk7 CiAgICAgdm9pZCBjb21taXRQb3RlbnRpYWxUYXBGYWlsZWQoKTsKICAgICB2b2lkIGNhbmNlbFBv dGVudGlhbFRhcCgpOwogICAgIHZvaWQgdGFwSGlnaGxpZ2h0QXRQb3NpdGlvbih1aW50NjRfdCBy ZXF1ZXN0SUQsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KaW5kZXggYWU3 OTdlY2NmMzMwMmMwMzg2Mzg0ZmRkYjQ2NDg4YTRlZjMxMjUzMi4uMmI0NzYyM2QyNWJiNjIzYmQy OTU0OWFmOWFmZjVmOGYwNWRhNzA4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KQEAgLTQ5LDkgKzQ5LDkgQEAgbWVz c2FnZXMgLT4gV2ViUGFnZSBMZWdhY3lSZWNlaXZlciB7CiAgICAgRHluYW1pY1ZpZXdwb3J0U2l6 ZVVwZGF0ZShXZWJDb3JlOjpGbG9hdFNpemUgbWluaW11bUxheW91dFNpemUsIFdlYkNvcmU6OkZs b2F0U2l6ZSBtYXhpbXVtVW5vYnNjdXJlZFNpemUsIFdlYkNvcmU6OkZsb2F0UmVjdCB0YXJnZXRF eHBvc2VkQ29udGVudFJlY3QsIFdlYkNvcmU6OkZsb2F0UmVjdCB0YXJnZXRVbm9ic2N1cmVkUmVj dCwgV2ViQ29yZTo6RmxvYXRSZWN0IHRhcmdldFVub2JzY3VyZWRSZWN0SW5TY3JvbGxWaWV3Q29v cmRpbmF0ZXMsIGRvdWJsZSBzY2FsZSwgaW50MzJfdCBkZXZpY2VPcmllbnRhdGlvbikKICAgICBT eW5jaHJvbml6ZUR5bmFtaWNWaWV3cG9ydFVwZGF0ZSgpIC0+IChkb3VibGUgbmV3VGFyZ2V0U2Nh bGUsIFdlYkNvcmU6OkZsb2F0UG9pbnQgbmV3U2Nyb2xsUG9zaXRpb24sIHVpbnQ2NF90IG5leHRW YWxpZExheWVyVHJlZVRyYW5zYWN0aW9uSUQpCiAKLSAgICBIYW5kbGVUYXAoV2ViQ29yZTo6SW50 UG9pbnQgcG9pbnQpCisgICAgSGFuZGxlVGFwKFdlYkNvcmU6OkludFBvaW50IHBvaW50LCB1aW50 NjRfdCBsYXN0TGF5ZXJUcmVlVHJhbnNjYXRpb25JZCkKICAgICBQb3RlbnRpYWxUYXBBdFBvc2l0 aW9uKHVpbnQ2NF90IHJlcXVlc3RJRCwgV2ViQ29yZTo6RmxvYXRQb2ludCBwb2ludCkKLSAgICBD b21taXRQb3RlbnRpYWxUYXAoKQorICAgIENvbW1pdFBvdGVudGlhbFRhcCh1aW50NjRfdCBsYXN0 TGF5ZXJUcmVlVHJhbnNjYXRpb25JZCkKICAgICBDYW5jZWxQb3RlbnRpYWxUYXAoKQogICAgIFRh cEhpZ2hsaWdodEF0UG9zaXRpb24odWludDY0X3QgcmVxdWVzdElELCBXZWJDb3JlOjpGbG9hdFBv aW50IHBvaW50KQogICAgIEluc3BlY3Rvck5vZGVTZWFyY2hNb3ZlZFRvUG9zaXRpb24oV2ViQ29y ZTo6RmxvYXRQb2ludCBwb2ludCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbSBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQppbmRleCBjZGIyNTZjYTg3MjViMTZhMTdhNjA2MWNj ZDBlODQ1NDA5ZmE5NTg2Li5iMzVmZDExZWVmNGI5N2E2MmU1Zjc2MGUzN2RkODZhZjdhOTRjODEw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBh Z2VJT1MubW0KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQ YWdlSU9TLm1tCkBAIC01MDAsOCArNTAwLDEzIEBAIHZvaWQgV2ViUGFnZTo6Y29tcGxldGVTeW50 aGV0aWNDbGljayhOb2RlKiBub2RlUmVzcG9uZGluZ1RvQ2xpY2ssIGNvbnN0IFdlYkNvcmU6CiAg ICAgICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkTm90SGFuZGxlVGFwQXNDbGlj ayhyb3VuZGVkSW50UG9pbnQobG9jYXRpb24pKSk7CiB9CiAKLXZvaWQgV2ViUGFnZTo6aGFuZGxl VGFwKGNvbnN0IEludFBvaW50JiBwb2ludCkKK3ZvaWQgV2ViUGFnZTo6aGFuZGxlVGFwKGNvbnN0 IEludFBvaW50JiBwb2ludCwgdWludDY0X3QgbGFzdExheWVyVHJlZVRyYW5zY2F0aW9uSWQpCiB7 CisgICAgaWYgKGxhc3RMYXllclRyZWVUcmFuc2NhdGlvbklkIDwgbV9maXJzdExheWVyVHJlZVRy YW5zYWN0aW9uSURBZnRlckRpZENvbW1pdExvYWQpIHsKKyAgICAgICAgc2VuZChNZXNzYWdlczo6 V2ViUGFnZVByb3h5OjpEaWROb3RIYW5kbGVUYXBBc0NsaWNrKHJvdW5kZWRJbnRQb2ludChtX3Bv dGVudGlhbFRhcExvY2F0aW9uKSkpOworICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAgRmxv YXRQb2ludCBhZGp1c3RlZFBvaW50OwogICAgIE5vZGUqIG5vZGVSZXNwb25kaW5nVG9DbGljayA9 IG1fcGFnZS0+bWFpbkZyYW1lKCkubm9kZVJlc3BvbmRpbmdUb0NsaWNrRXZlbnRzKHBvaW50LCBh ZGp1c3RlZFBvaW50KTsKICAgICBoYW5kbGVTeW50aGV0aWNDbGljayhub2RlUmVzcG9uZGluZ1Rv Q2xpY2ssIGFkanVzdGVkUG9pbnQpOwpAQCAtNTQ5LDkgKzU1NCw5IEBAIHZvaWQgV2ViUGFnZTo6 cG90ZW50aWFsVGFwQXRQb3NpdGlvbih1aW50NjRfdCByZXF1ZXN0SUQsIGNvbnN0IFdlYkNvcmU6 OkZsb2F0UG9pCiAgICAgc2VuZFRhcEhpZ2hsaWdodEZvck5vZGVJZk5lY2Vzc2FyeShyZXF1ZXN0 SUQsIG1fcG90ZW50aWFsVGFwTm9kZS5nZXQoKSk7CiB9CiAKLXZvaWQgV2ViUGFnZTo6Y29tbWl0 UG90ZW50aWFsVGFwKCkKK3ZvaWQgV2ViUGFnZTo6Y29tbWl0UG90ZW50aWFsVGFwKHVpbnQ2NF90 IGxhc3RMYXllclRyZWVUcmFuc2NhdGlvbklkKQogewotICAgIGlmICghbV9wb3RlbnRpYWxUYXBO b2RlIHx8ICFtX3BvdGVudGlhbFRhcE5vZGUtPnJlbmRlcmVyKCkpIHsKKyAgICBpZiAoIW1fcG90 ZW50aWFsVGFwTm9kZSB8fCAhbV9wb3RlbnRpYWxUYXBOb2RlLT5yZW5kZXJlcigpIHx8IGxhc3RM YXllclRyZWVUcmFuc2NhdGlvbklkIDwgbV9maXJzdExheWVyVHJlZVRyYW5zYWN0aW9uSURBZnRl ckRpZENvbW1pdExvYWQpIHsKICAgICAgICAgY29tbWl0UG90ZW50aWFsVGFwRmFpbGVkKCk7CiAg ICAgICAgIHJldHVybjsKICAgICB9Cg==