139567 2014-12-11 16:19:06 -0800 [iOS] Predictions are not updated when using navigation buttons 2014-12-12 16:00:09 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified iOS 8.1 RESOLVED FIXED P2 Normal --- 1 enrica enrica commit-queue oldest_to_newest 1054674 0 enrica 2014-12-11 16:19:06 -0800 Predictions on top of the on screen keyboard are not updated when changing focus using the navigation buttons. We need to notify the keyboard that the selection has changed so that it can update the prediction bar. rdar://problem/19132585 1054678 1 243161 enrica 2014-12-11 16:34:55 -0800 Created attachment 243161 Patch 1054681 2 commit-queue 2014-12-11 16:36:48 -0800 Attachment 243161 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm:153: Should have space between @property and attributes. [whitespace/property] [4] ERROR: Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm:153: Missing space after , [whitespace/comma] [3] ERROR: Source/WebKit2/UIProcess/WebPageProxy.h:454: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm:803: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 4 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 1054692 3 243161 mitz 2014-12-11 16:55:53 -0800 Comment on attachment 243161 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243161&action=review > Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm:1187 > + return _formAccessoryView.get().buttonItems; We normally don’t use dot syntax after get(), but instead prefer bracket syntax in this case. I’m assuming it’s OK to call -buttonItems here without a runtime check, because this method will only be called if -buttonItems is defined. If I’m wrong, please add a -respondsToSelector check. 1054873 4 enrica 2014-12-12 11:56:41 -0800 (In reply to comment #3) > Comment on attachment 243161 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=243161&action=review > > > Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm:1187 > > + return _formAccessoryView.get().buttonItems; > > We normally don’t use dot syntax after get(), but instead prefer bracket > syntax in this case. I will do as you suggested. > > I’m assuming it’s OK to call -buttonItems here without a runtime check, > because this method will only be called if -buttonItems is defined. If I’m > wrong, please add a -respondsToSelector check. Yes, it is OK. Thanks for the review! 1055325 5 enrica 2014-12-12 16:00:09 -0800 Committed revision 177246. 243161 2014-12-11 16:34:55 -0800 2014-12-11 16:55:53 -0800 Patch prediction-with-navigation.txt text/plain 8638 enrica SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NzE5MikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDE0LTEyLTExICBFbnJpY2Eg Q2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gUHJlZGljdGlvbnMg YXJlIG5vdCB1cGRhdGVkIHdoZW4gdXNpbmcgbmF2aWdhdGlvbiBidXR0b25zLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5NTY3CisgICAgICAgIHJk YXI6Ly9wcm9ibGVtLzE5MTMyNTg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV2hlbiBtb3ZpbmcgZm9jdXMgcHJvZ3JhbW1hdGljYWxseSwgd2UgbmVl ZCB0byBub3RpZnkgdGhlIGtleWJvYXJkIHNvIHRoYXQgaXQKKyAgICAgICAgY2FuIHVwZGF0ZSB0 aGUgcHJlZGljdGlvbiBiYXIuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6 CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06Cisg ICAgICAgICgtW1dLRm9ybUlucHV0U2Vzc2lvbiBzZXRBY2Nlc3NvcnlWaWV3Q3VzdG9tQnV0dG9u VGl0bGU6XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgcmVxdWlyZXNBY2Nlc3NvcnlWaWV3 XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgaW5wdXRBc3Npc3RhbnRCdXR0b25JdGVtc10p OgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IGFjY2Vzc29yeVRhYjpdKToKKyAgICAgICAgKC1b V0tDb250ZW50VmlldyBfc3RhcnRBc3Npc3RpbmdLZXlib2FyZF0pOgorICAgICAgICAoLVtXS0Nv bnRlbnRWaWV3IF9zdG9wQXNzaXN0aW5nTm9kZV0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3Mv V2ViUGFnZVByb3h5SU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmZvY3Vz TmV4dEFzc2lzdGVkTm9kZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu aDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbjoKKyAg ICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW06CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2U6OmZvY3VzTmV4dEFzc2lzdGVkTm9kZSk6CisKIDIwMTQtMTItMTEgIEJl dGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPgogCiAgICAgICAgIFdLMjogTmVlZCBuZXcgU1BJ IGZvciBXZWJraXQgY2xpZW50cyB0byBvdmVycmlkZSBkZWZhdWx0IGltbWVkaWF0ZSBhY3Rpb24K SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHJldmlzaW9uIDE3 NzE5MikKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkod29ya2lu ZyBjb3B5KQpAQCAtNDUxLDcgKzQ1MSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHBlcmZvcm1BY3Rp b25PbkVsZW1lbnQodWludDMyX3QgYWN0aW9uKTsKICAgICB2b2lkIHNhdmVJbWFnZVRvTGlicmFy eShjb25zdCBTaGFyZWRNZW1vcnk6OkhhbmRsZSYgaW1hZ2VIYW5kbGUsIHVpbnQ2NF90IGltYWdl U2l6ZSk7CiAgICAgdm9pZCBkaWRVcGRhdGVCbG9ja1NlbGVjdGlvbldpdGhUb3VjaCh1aW50MzJf dCB0b3VjaCwgdWludDMyX3QgZmxhZ3MsIGZsb2F0IGdyb3dUaHJlc2hvbGQsIGZsb2F0IHNocmlu a1RocmVzaG9sZCk7Ci0gICAgdm9pZCBmb2N1c05leHRBc3Npc3RlZE5vZGUoYm9vbCBpc0Zvcndh cmQpOworICAgIHZvaWQgZm9jdXNOZXh0QXNzaXN0ZWROb2RlKGJvb2wgaXNGb3J3YXJkLCBzdGQ6 OmZ1bmN0aW9uPHZvaWQgKENhbGxiYWNrQmFzZTo6RXJyb3IpPik7CiAgICAgdm9pZCBzZXRBc3Np c3RlZE5vZGVWYWx1ZShjb25zdCBTdHJpbmcmKTsKICAgICB2b2lkIHNldEFzc2lzdGVkTm9kZVZh bHVlQXNOdW1iZXIoZG91YmxlKTsKICAgICB2b2lkIHNldEFzc2lzdGVkTm9kZVNlbGVjdGVkSW5k ZXgodWludDMyX3QgaW5kZXgsIGJvb2wgYWxsb3dNdWx0aXBsZVNlbGVjdGlvbiA9IGZhbHNlKTsK SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0 aW9uLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250 ZW50Vmlld0ludGVyYWN0aW9uLm1tCShyZXZpc2lvbiAxNzcxOTIpCisrKyBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQkod29ya2luZyBjb3B5 KQpAQCAtMTQ5LDYgKzE0OSwxMCBAQCBAaW50ZXJmYWNlIFVJVmlldyAoVUlWaWV3SW50ZXJuYWxI YWNrKQogKyAoQk9PTClfYWRkQ29tcGxldGlvbjoodm9pZCheKShCT09MKSljb21wbGV0aW9uOwog QGVuZAogCitAaW50ZXJmYWNlIFVJV2ViRm9ybUFjY2Vzc29yeSAoU3RhZ2luZ1RvUmVtb3ZlKQor QHByb3BlcnR5KG5vbmF0b21pYyxyZXRhaW4pIE5TQXJyYXkgKmJ1dHRvbkl0ZW1zOworQGVuZAor CiBAaW50ZXJmYWNlIFdLRm9ybUlucHV0U2Vzc2lvbiA6IE5TT2JqZWN0IDxfV0tGb3JtSW5wdXRT ZXNzaW9uPgogCiAtIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhDb250ZW50VmlldzooV0tDb250ZW50 VmlldyAqKXZpZXcgdXNlck9iamVjdDooTlNPYmplY3QgPE5TU2VjdXJlQ29kaW5nPiAqKXVzZXJP YmplY3Q7CkBAIC0xOTMsNiArMTk3LDggQEAgLSAodm9pZClzZXRBY2Nlc3NvcnlWaWV3Q3VzdG9t QnV0dG9uVGl0bAogICAgICAgICBbW19jb250ZW50VmlldyBmb3JtQWNjZXNzb3J5Vmlld10gc2hv d0F1dG9GaWxsQnV0dG9uV2l0aFRpdGxlOnRpdGxlXTsKICAgICBlbHNlCiAgICAgICAgIFtbX2Nv bnRlbnRWaWV3IGZvcm1BY2Nlc3NvcnlWaWV3XSBoaWRlQXV0b0ZpbGxCdXR0b25dOworICAgIGlm IChVSUN1cnJlbnRVc2VySW50ZXJmYWNlSWRpb21Jc1BhZCgpKQorICAgICAgICBbX2NvbnRlbnRW aWV3IHJlbG9hZElucHV0Vmlld3NdOwogfQogCiAtICh2b2lkKWludmFsaWRhdGUKQEAgLTExNDQs MTAgKzExNTAsMTAgQEAgLSAoQk9PTClyZXF1aXJlc0FjY2Vzc29yeVZpZXcKICAgICBjYXNlIElu cHV0VHlwZTo6UGhvbmU6CiAgICAgY2FzZSBJbnB1dFR5cGU6Ok51bWJlcjoKICAgICBjYXNlIElu cHV0VHlwZTo6TnVtYmVyUGFkOgotICAgICAgICByZXR1cm4gWUVTOworICAgICAgICByZXR1cm4g IVVJQ3VycmVudFVzZXJJbnRlcmZhY2VJZGlvbUlzUGFkKCk7CiAgICAgY2FzZSBJbnB1dFR5cGU6 OkNvbnRlbnRFZGl0YWJsZToKICAgICBjYXNlIElucHV0VHlwZTo6VGV4dEFyZWE6Ci0gICAgICAg IHJldHVybiBZRVM7CisgICAgICAgIHJldHVybiAhVUlDdXJyZW50VXNlckludGVyZmFjZUlkaW9t SXNQYWQoKTsKICAgICBjYXNlIElucHV0VHlwZTo6U2VsZWN0OgogICAgIGNhc2UgSW5wdXRUeXBl OjpEYXRlOgogICAgIGNhc2UgSW5wdXRUeXBlOjpEYXRlVGltZToKQEAgLTExNzIsNiArMTE3OCwx NSBAQCAtIChVSVZpZXcgKilpbnB1dEFjY2Vzc29yeVZpZXcKICAgICByZXR1cm4gX2Zvcm1BY2Nl c3NvcnlWaWV3LmdldCgpOwogfQogCistIChOU0FycmF5ICopaW5wdXRBc3Npc3RhbnRCdXR0b25J dGVtcworeworICAgIGlmICghX2Zvcm1BY2Nlc3NvcnlWaWV3KSB7CisgICAgICAgIF9mb3JtQWNj ZXNzb3J5VmlldyA9IGFkb3B0TlMoW1tVSVdlYkZvcm1BY2Nlc3NvcnkgYWxsb2NdIGluaXRdKTsK KyAgICAgICAgW19mb3JtQWNjZXNzb3J5VmlldyBzZXREZWxlZ2F0ZTpzZWxmXTsKKyAgICB9Cisg ICAgcmV0dXJuIF9mb3JtQWNjZXNzb3J5Vmlldy5nZXQoKS5idXR0b25JdGVtczsKK30KKwogLSAo TlNBcnJheSAqKXN1cHBvcnRlZFBhc3RlYm9hcmRUeXBlc0ZvckN1cnJlbnRTZWxlY3Rpb24KIHsK ICAgICBpZiAoX3BhZ2UtPmVkaXRvclN0YXRlKCkuc2VsZWN0aW9uSXNOb25lKQpAQCAtMTk2Nyw3 ICsxOTgyLDEyIEBAIC0gKHZvaWQpYWNjZXNzb3J5VGFiOihCT09MKWlzTmV4dAogICAgIF9pbnB1 dFBlcmlwaGVyYWwgPSBuaWw7CiAKICAgICBfZGlkQWNjZXNzb3J5VGFiSW5pdGlhdGVGb2N1cyA9 IFlFUzsgLy8gV2lsbCBiZSBjbGVhcmVkIGluIGVpdGhlciAtX2Rpc3BsYXlGb3JtTm9kZUlucHV0 VmlldyBvciAtY2xlYW51cEludGVyYWN0aW9uLgotICAgIF9wYWdlLT5mb2N1c05leHRBc3Npc3Rl ZE5vZGUoaXNOZXh0KTsKKyAgICBbc2VsZiBiZWdpblNlbGVjdGlvbkNoYW5nZV07CisgICAgX3Bh Z2UtPmZvY3VzTmV4dEFzc2lzdGVkTm9kZShpc05leHQsIFtzZWxmXShDYWxsYmFja0Jhc2U6OkVy cm9yKSB7CisgICAgICAgIFtzZWxmIGVuZFNlbGVjdGlvbkNoYW5nZV07CisgICAgICAgIFtzZWxm IHJlbG9hZElucHV0Vmlld3NdOworICAgIH0pOworCiB9CiAKIC0gKHZvaWQpYWNjZXNzb3J5QXV0 b0ZpbGwKQEAgLTI2MzQsNiArMjY1NCw3IEBAIC0gKHZvaWQpdGFrZVRyYWl0c0Zyb206KFVJVGV4 dElucHV0VHJhaXQKIC0gKHZvaWQpX3N0YXJ0QXNzaXN0aW5nS2V5Ym9hcmQKIHsKICAgICBbc2Vs ZiB1c2VTZWxlY3Rpb25Bc3Npc3RhbnRXaXRoTW9kZTpVSVdlYlNlbGVjdGlvbk1vZGVUZXh0T25s eV07CisgICAgW3NlbGYgcmVsb2FkSW5wdXRWaWV3c107CiB9CiAKIC0gKHZvaWQpX3N0b3BBc3Np c3RpbmdLZXlib2FyZApAQCAtMjcxNSw2ICsyNzM2LDcgQEAgLSAodm9pZClfc3RvcEFzc2lzdGlu Z05vZGUKICAgICBfaW5wdXRQZXJpcGhlcmFsID0gbmlsOwogCiAgICAgW3NlbGYgX3N0b3BBc3Np c3RpbmdLZXlib2FyZF07CisgICAgW19mb3JtQWNjZXNzb3J5VmlldyBoaWRlQXV0b0ZpbGxCdXR0 b25dOwogICAgIFtzZWxmIHJlbG9hZElucHV0Vmlld3NdOwogICAgIFtzZWxmIF91cGRhdGVBY2Nl c3NvcnldOwogICAgIC8vIFRoZSBuYW1lIGlzIG1pc2xlYWRpbmcsIGJ1dCB0aGlzIGFjdHVhbGx5 IGNsZWFycyB0aGUgc2VsZWN0aW9uIHZpZXdzIGFuZCByZW1vdmVzIGFueSBzZWxlY3Rpb24uCklu ZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5t bQkocmV2aXNpb24gMTc3MTkyKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XZWJQ YWdlUHJveHlJT1MubW0JKHdvcmtpbmcgY29weSkKQEAgLTgwMCw5ICs4MDAsMTUgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OmRpc2FibGVJbnNwZWN0b3JOb2RlUwogfQogI2VuZGlmCiAKLXZvaWQgV2Vi UGFnZVByb3h5Ojpmb2N1c05leHRBc3Npc3RlZE5vZGUoYm9vbCBpc0ZvcndhcmQpCit2b2lkIFdl YlBhZ2VQcm94eTo6Zm9jdXNOZXh0QXNzaXN0ZWROb2RlKGJvb2wgaXNGb3J3YXJkLCBzdGQ6OmZ1 bmN0aW9uPHZvaWQgKENhbGxiYWNrQmFzZTo6RXJyb3IpPiBjYWxsYmFja0Z1bmN0aW9uKQogewot ICAgIHByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpGb2N1c05leHRBc3Npc3RlZE5v ZGUoaXNGb3J3YXJkKSwgbV9wYWdlSUQpOworICAgIGlmICghaXNWYWxpZCgpKSB7CisgICAgICAg IGNhbGxiYWNrRnVuY3Rpb24oQ2FsbGJhY2tCYXNlOjpFcnJvcjo6VW5rbm93bik7CisgICAgICAg IHJldHVybjsKKyAgICB9CisgICAgCisgICAgdWludDY0X3QgY2FsbGJhY2tJRCA9IG1fY2FsbGJh Y2tzLnB1dChXVEY6Om1vdmUoY2FsbGJhY2tGdW5jdGlvbiksIHN0ZDo6bWFrZV91bmlxdWU8UHJv Y2Vzc1Rocm90dGxlcjo6QmFja2dyb3VuZEFjdGl2aXR5VG9rZW4+KG1fcHJvY2Vzcy0+dGhyb3R0 bGVyKCkpKTsKKyAgICBwcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6V2ViUGFnZTo6Rm9jdXNOZXh0 QXNzaXN0ZWROb2RlKGlzRm9yd2FyZCwgY2FsbGJhY2tJRCksIG1fcGFnZUlEKTsKIH0KIAogdm9p ZCBXZWJQYWdlUHJveHk6OnNldEFzc2lzdGVkTm9kZVZhbHVlKGNvbnN0IFN0cmluZyYgdmFsdWUp CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgJKHJl dmlzaW9uIDE3NzE5MikKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTUxMSw3ICs1MTEsNyBAQCBwdWJsaWM6CiAgICAgdm9p ZCBzdGFydEludGVyYWN0aW9uV2l0aEVsZW1lbnRBdFBvc2l0aW9uKGNvbnN0IFdlYkNvcmU6Oklu dFBvaW50Jik7CiAgICAgdm9pZCBzdG9wSW50ZXJhY3Rpb24oKTsKICAgICB2b2lkIHBlcmZvcm1B Y3Rpb25PbkVsZW1lbnQodWludDMyX3QgYWN0aW9uKTsKLSAgICB2b2lkIGZvY3VzTmV4dEFzc2lz dGVkTm9kZShib29sIGlzRm9yd2FyZCk7CisgICAgdm9pZCBmb2N1c05leHRBc3Npc3RlZE5vZGUo Ym9vbCBpc0ZvcndhcmQsIHVpbnQ2NF90IGNhbGxiYWNrSUQpOwogICAgIHZvaWQgc2V0QXNzaXN0 ZWROb2RlVmFsdWUoY29uc3QgU3RyaW5nJik7CiAgICAgdm9pZCBzZXRBc3Npc3RlZE5vZGVWYWx1 ZUFzTnVtYmVyKGRvdWJsZSk7CiAgICAgdm9pZCBzZXRBc3Npc3RlZE5vZGVTZWxlY3RlZEluZGV4 KHVpbnQzMl90IGluZGV4LCBib29sIGFsbG93TXVsdGlwbGVTZWxlY3Rpb24pOwpJbmRleDogU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2Fn ZXMuaW4JKHJldmlzaW9uIDE3NzE5MikKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCSh3b3JraW5nIGNvcHkpCkBAIC04Miw3ICs4Miw3IEBA IG1lc3NhZ2VzIC0+IFdlYlBhZ2UgTGVnYWN5UmVjZWl2ZXIgewogICAgIFN0YXJ0SW50ZXJhY3Rp b25XaXRoRWxlbWVudEF0UG9zaXRpb24oV2ViQ29yZTo6SW50UG9pbnQgcG9pbnQpCiAgICAgU3Rv cEludGVyYWN0aW9uKCkKICAgICBQZXJmb3JtQWN0aW9uT25FbGVtZW50KHVpbnQzMl90IGFjdGlv bikKLSAgICBGb2N1c05leHRBc3Npc3RlZE5vZGUoYm9vbCBpc0ZvcndhcmQpCisgICAgRm9jdXNO ZXh0QXNzaXN0ZWROb2RlKGJvb2wgaXNGb3J3YXJkLCB1aW50NjRfdCBjYWxsYmFja0lEKQogICAg IFNldEFzc2lzdGVkTm9kZVZhbHVlKFN0cmluZyB2YWx1ZSkKICAgICBTZXRBc3Npc3RlZE5vZGVW YWx1ZUFzTnVtYmVyKGRvdWJsZSB2YWx1ZSkKICAgICBTZXRBc3Npc3RlZE5vZGVTZWxlY3RlZElu ZGV4KHVpbnQzMl90IGluZGV4LCBib29sIGFsbG93TXVsdGlwbGVTZWxlY3Rpb24pCkluZGV4OiBT b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9T Lm1tCShyZXZpc2lvbiAxNzcxOTIpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvaW9zL1dlYlBhZ2VJT1MubW0JKHdvcmtpbmcgY29weSkKQEAgLTIxMjUsMTMgKzIxMjUsMTQg QEAgc3RhdGljIGlubGluZSBib29sIGhhc0Fzc2lzdGFibGVFbGVtZW50KAogICAgIHJldHVybiBu ZXh0QXNzaXN0YWJsZUVsZW1lbnQoc3RhcnROb2RlLCBwYWdlLCBpc0ZvcndhcmQpOwogfQogCi12 b2lkIFdlYlBhZ2U6OmZvY3VzTmV4dEFzc2lzdGVkTm9kZShib29sIGlzRm9yd2FyZCkKK3ZvaWQg V2ViUGFnZTo6Zm9jdXNOZXh0QXNzaXN0ZWROb2RlKGJvb2wgaXNGb3J3YXJkLCB1aW50NjRfdCBj YWxsYmFja0lEKQogewogICAgIEVsZW1lbnQqIG5leHRFbGVtZW50ID0gbmV4dEFzc2lzdGFibGVF bGVtZW50KG1fYXNzaXN0ZWROb2RlLmdldCgpLCAqbV9wYWdlLCBpc0ZvcndhcmQpOwogICAgIG1f dXNlcklzSW50ZXJhY3RpbmcgPSB0cnVlOwogICAgIGlmIChuZXh0RWxlbWVudCkKICAgICAgICAg bmV4dEVsZW1lbnQtPmZvY3VzKCk7CiAgICAgbV91c2VySXNJbnRlcmFjdGluZyA9IGZhbHNlOwor ICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6Vm9pZENhbGxiYWNrKGNhbGxiYWNrSUQp KTsKIH0KIAogdm9pZCBXZWJQYWdlOjpnZXRBc3Npc3RlZE5vZGVJbmZvcm1hdGlvbihBc3Npc3Rl ZE5vZGVJbmZvcm1hdGlvbiYgaW5mb3JtYXRpb24pCg==