133243 2014-05-23 16:57:35 -0700 REGRESSION (WebKit2): Keyboard disappears/appears automatically between text boxes 2014-05-23 17:19:17 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) iPhone / iPad Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 enrica enrica oldest_to_newest 1011420 0 enrica 2014-05-23 16:57:35 -0700 Given the asynchronous nature of WebKit2, the keyboard layer can receive requests to dismiss the keyboard and show the keyboard in two different spins of the runloop which causes the keyboard to animate out and in again when moving from one text field to another. <rdar://problem/16761913> 1011423 1 232005 enrica 2014-05-23 17:02:18 -0700 Created attachment 232005 Patch 1011426 2 232005 benjamin 2014-05-23 17:07:26 -0700 Comment on attachment 232005 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=232005&action=review > Source/WebKit2/ChangeLog:11 > + We need to ensure that when an element loses focus and another one gets it, > + this is handled in one single message in the UI process to avoid seeing > + the keyboard animating in and out. I would also add a paragraph explaining the "block trick". 1011428 3 enrica 2014-05-23 17:19:09 -0700 Committed revision 169294. 1011429 4 enrica 2014-05-23 17:19:17 -0700 Committed revision 169294. 232005 2014-05-23 17:02:18 -0700 2014-05-23 17:07:25 -0700 Patch nokeybinout.txt text/plain 12987 enrica SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2OTI5MCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBACisyMDE0LTA1LTIzICBFbnJpY2Eg Q2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAoV2ViS2l0 Mik6IEtleWJvYXJkIGRpc2FwcGVhcnMvYXBwZWFycyBhdXRvbWF0aWNhbGx5IGJldHdlZW4gdGV4 dCBib3hlcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEzMzI0MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTY3NjE5MTM+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgbmVlZCB0byBlbnN1cmUgdGhh dCB3aGVuIGFuIGVsZW1lbnQgbG9zZXMgZm9jdXMgYW5kIGFub3RoZXIgb25lIGdldHMgaXQsCisg ICAgICAgIHRoaXMgaXMgaGFuZGxlZCBpbiBvbmUgc2luZ2xlIG1lc3NhZ2UgaW4gdGhlIFVJIHBy b2Nlc3MgdG8gYXZvaWQgc2VlaW5nCisgICAgICAgIHRoZSBrZXlib2FyZCBhbmltYXRpbmcgaW4g YW5kIG91dC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9QYWdlQ2xpZW50Lmg6CisgICAgICAgICog VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJv eHkubWVzc2FnZXMuaW46CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1wbElP Uy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvUGFnZUNsaWVudEltcGxJT1MubW06CisgICAg ICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpzdGFydEFzc2lzdGluZ05vZGUpOgorICAgICAg ICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmg6CisgICAgICAgICog VUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06CisgICAgICAgICgtW1dL Q29udGVudFZpZXcgX3N0YXJ0QXNzaXN0aW5nTm9kZTp1c2VySXNJbnRlcmFjdGluZzpibHVyUHJl dmlvdXNOb2RlOnVzZXJPYmplY3Q6XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX3N0YXJ0 QXNzaXN0aW5nTm9kZTp1c2VySXNJbnRlcmFjdGluZzp1c2VyT2JqZWN0Ol0pOiBEZWxldGVkLgor ICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV2ViUGFnZVByb3h5SU9TLm1tOgorICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlUHJveHk6OnN0YXJ0QXNzaXN0aW5nTm9kZSk6CisgICAgICAgICogV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpXZWJQ YWdlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorICAgICAgICAq IFdlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbToKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZTo6ZWxlbWVudERpZEZvY3VzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6ZWxl bWVudERpZEJsdXIpOgorCiAyMDE0LTA1LTIzICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25A YXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIFdLUERGVmlldyBzaG91bGQgaGF2ZSBhIHBhZ2Ug aW5kaWNhdG9yCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgJKHJldmlz aW9uIDE2OTI1OSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgJKHdv cmtpbmcgY29weSkKQEAgLTI0Nyw3ICsyNDcsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lk IGRpZENvbW1pdExheWVyVHJlZShjb25zdCBSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbiYpID0g MDsKICAgICB2aXJ0dWFsIHZvaWQgZHluYW1pY1ZpZXdwb3J0VXBkYXRlQ2hhbmdlZFRhcmdldChk b3VibGUgbmV3U2NhbGUsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmIG5ld1Njcm9sbFBvc2l0 aW9uKSA9IDA7CiAKLSAgICB2aXJ0dWFsIHZvaWQgc3RhcnRBc3Npc3RpbmdOb2RlKGNvbnN0IEFz c2lzdGVkTm9kZUluZm9ybWF0aW9uJiwgYm9vbCB1c2VySXNJbnRlcmFjdGluZywgQVBJOjpPYmpl Y3QqIHVzZXJEYXRhKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIHN0YXJ0QXNzaXN0aW5nTm9kZShj b25zdCBBc3Npc3RlZE5vZGVJbmZvcm1hdGlvbiYsIGJvb2wgdXNlcklzSW50ZXJhY3RpbmcsIGJv b2wgYmx1clByZXZpb3VzTm9kZSwgQVBJOjpPYmplY3QqIHVzZXJEYXRhKSA9IDA7CiAgICAgdmly dHVhbCB2b2lkIHN0b3BBc3Npc3RpbmdOb2RlKCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBzZWxl Y3Rpb25EaWRDaGFuZ2UoKSA9IDA7CiAgICAgdmlydHVhbCBib29sIGludGVycHJldEtleUV2ZW50 KGNvbnN0IE5hdGl2ZVdlYktleWJvYXJkRXZlbnQmLCBib29sIGlzQ2hhckV2ZW50KSA9IDA7Cklu ZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCShyZXZpc2lvbiAxNjky NTkpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHdvcmtpbmcg Y29weSkKQEAgLTEzOTMsNyArMTM5Myw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBkeW5hbWljVmll d3BvcnRVcGRhdGVDaGFuZ2VkVGFyZ2V0KGRvdWJsZSBuZXdUYXJnZXRTY2FsZSwgY29uc3QgV2Vi Q29yZTo6RmxvYXRQb2ludCYgbmV3U2Nyb2xsUG9zaXRpb24pOwogICAgIHZvaWQgZGlkR2V0VGFw SGlnaGxpZ2h0R2VvbWV0cmllcyh1aW50NjRfdCByZXF1ZXN0SUQsIGNvbnN0IFdlYkNvcmU6OkNv bG9yJiBjb2xvciwgY29uc3QgVmVjdG9yPFdlYkNvcmU6OkZsb2F0UXVhZD4mIGdlb21ldHJpZXMs IGNvbnN0IFdlYkNvcmU6OkludFNpemUmIHRvcExlZnRSYWRpdXMsIGNvbnN0IFdlYkNvcmU6Oklu dFNpemUmIHRvcFJpZ2h0UmFkaXVzLCBjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBib3R0b21MZWZ0 UmFkaXVzLCBjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBib3R0b21SaWdodFJhZGl1cyk7CiAKLSAg ICB2b2lkIHN0YXJ0QXNzaXN0aW5nTm9kZShjb25zdCBBc3Npc3RlZE5vZGVJbmZvcm1hdGlvbiYs IGJvb2wgdXNlcklzSW50ZXJhY3RpbmcsIElQQzo6TWVzc2FnZURlY29kZXImKTsKKyAgICB2b2lk IHN0YXJ0QXNzaXN0aW5nTm9kZShjb25zdCBBc3Npc3RlZE5vZGVJbmZvcm1hdGlvbiYsIGJvb2wg dXNlcklzSW50ZXJhY3RpbmcsIGJvb2wgYmx1clByZXZpb3VzTm9kZSwgSVBDOjpNZXNzYWdlRGVj b2RlciYpOwogICAgIHZvaWQgc3RvcEFzc2lzdGluZ05vZGUoKTsKIAogI2lmIEVOQUJMRShJTlNQ RUNUT1IpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3Nh Z2VzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkubWVzc2FnZXMuaW4JKHJldmlzaW9uIDE2OTI1OSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTMyNSw3ICsz MjUsNyBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlUHJveHkgewogICAgIER5bmFtaWNWaWV3cG9ydFVw ZGF0ZUNoYW5nZWRUYXJnZXQoZG91YmxlIG5ld1RhcmdldFNjYWxlLCBXZWJDb3JlOjpGbG9hdFBv aW50IG5ld1Njcm9sbFBvc2l0aW9uKQogICAgIERpZEdldFRhcEhpZ2hsaWdodEdlb21ldHJpZXMo dWludDY0X3QgcmVxdWVzdElELCBXZWJDb3JlOjpDb2xvciBjb2xvciwgVmVjdG9yPFdlYkNvcmU6 OkZsb2F0UXVhZD4gZ2VvbWV0cmllcywgV2ViQ29yZTo6SW50U2l6ZSB0b3BMZWZ0UmFkaXVzLCBX ZWJDb3JlOjpJbnRTaXplIHRvcFJpZ2h0UmFkaXVzLCBXZWJDb3JlOjpJbnRTaXplIGJvdHRvbUxl ZnRSYWRpdXMsIFdlYkNvcmU6OkludFNpemUgYm90dG9tUmlnaHRSYWRpdXMpCiAKLSAgICBTdGFy dEFzc2lzdGluZ05vZGUoV2ViS2l0OjpBc3Npc3RlZE5vZGVJbmZvcm1hdGlvbiBpbmZvcm1hdGlv biwgYm9vbCB1c2VySXNJbnRlcmFjdGluZywgV2ViS2l0OjpJbmplY3RlZEJ1bmRsZVVzZXJNZXNz YWdlRW5jb2RlciB1c2VyRGF0YSkgVmFyaWFkaWMKKyAgICBTdGFydEFzc2lzdGluZ05vZGUoV2Vi S2l0OjpBc3Npc3RlZE5vZGVJbmZvcm1hdGlvbiBpbmZvcm1hdGlvbiwgYm9vbCB1c2VySXNJbnRl cmFjdGluZywgYm9vbCBibHVyUHJldmlvdXNOb2RlLCBXZWJLaXQ6OkluamVjdGVkQnVuZGxlVXNl ck1lc3NhZ2VFbmNvZGVyIHVzZXJEYXRhKSBWYXJpYWRpYwogICAgIFN0b3BBc3Npc3RpbmdOb2Rl KCkKICAgICBOb3RpZnlSZXZlYWxlZFNlbGVjdGlvbigpCiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9pb3MvUGFnZUNsaWVudEltcGxJT1MuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1BhZ2VDbGllbnRJbXBsSU9TLmgJKHJldmlzaW9uIDE2OTI1 OSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvUGFnZUNsaWVudEltcGxJT1MuaAko d29ya2luZyBjb3B5KQpAQCAtMTEyLDcgKzExMiw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2 b2lkIGRpZENvbW1pdExheWVyVHJlZShjb25zdCBSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbiYp IG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBkeW5hbWljVmlld3BvcnRVcGRhdGVDaGFuZ2Vk VGFyZ2V0KGRvdWJsZSBuZXdTY2FsZSwgY29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYgbmV3U2Ny b2xsUG9zaXRpb24pIG92ZXJyaWRlOwogCi0gICAgdmlydHVhbCB2b2lkIHN0YXJ0QXNzaXN0aW5n Tm9kZShjb25zdCBBc3Npc3RlZE5vZGVJbmZvcm1hdGlvbiYsIGJvb2wgdXNlcklzSW50ZXJhY3Rp bmcsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSkgb3ZlcnJpZGU7CisgICAgdmlydHVhbCB2b2lkIHN0 YXJ0QXNzaXN0aW5nTm9kZShjb25zdCBBc3Npc3RlZE5vZGVJbmZvcm1hdGlvbiYsIGJvb2wgdXNl cklzSW50ZXJhY3RpbmcsIGJvb2wgYmx1clByZXZpb3VzTm9kZSwgQVBJOjpPYmplY3QqIHVzZXJE YXRhKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgc3RvcEFzc2lzdGluZ05vZGUoKSBvdmVy cmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgc2VsZWN0aW9uRGlkQ2hhbmdlKCkgb3ZlcnJpZGU7CiAg ICAgdmlydHVhbCBib29sIGludGVycHJldEtleUV2ZW50KGNvbnN0IE5hdGl2ZVdlYktleWJvYXJk RXZlbnQmLCBib29sIGlzQ2hhckV2ZW50KSBvdmVycmlkZTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9pb3MvUGFnZUNsaWVudEltcGxJT1MubW0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1wbElPUy5tbQkocmV2aXNpb24gMTY5 MjU5KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1wbElPUy5t bQkod29ya2luZyBjb3B5KQpAQCAtNDExLDcgKzQxMSw3IEBAIHZvaWQgUGFnZUNsaWVudEltcGw6 OmR5bmFtaWNWaWV3cG9ydFVwZGEKICAgICBbbV93ZWJWaWV3IF9keW5hbWljVmlld3BvcnRVcGRh dGVDaGFuZ2VkVGFyZ2V0VG9TY2FsZTpuZXdTY2FsZSBwb3NpdGlvbjpuZXdTY3JvbGxQb3NpdGlv bl07CiB9CiAKLXZvaWQgUGFnZUNsaWVudEltcGw6OnN0YXJ0QXNzaXN0aW5nTm9kZShjb25zdCBB c3Npc3RlZE5vZGVJbmZvcm1hdGlvbiYgbm9kZUluZm9ybWF0aW9uLCBib29sIHVzZXJJc0ludGVy YWN0aW5nLCBBUEk6Ok9iamVjdCogdXNlckRhdGEpCit2b2lkIFBhZ2VDbGllbnRJbXBsOjpzdGFy dEFzc2lzdGluZ05vZGUoY29uc3QgQXNzaXN0ZWROb2RlSW5mb3JtYXRpb24mIG5vZGVJbmZvcm1h dGlvbiwgYm9vbCB1c2VySXNJbnRlcmFjdGluZywgYm9vbCBibHVyUHJldmlvdXNOb2RlLCBBUEk6 Ok9iamVjdCogdXNlckRhdGEpCiB7CiAgICAgTUVTU0FHRV9DSEVDSyghdXNlckRhdGEgfHwgdXNl ckRhdGEtPnR5cGUoKSA9PSBBUEk6Ok9iamVjdDo6VHlwZTo6RGF0YSk7CiAKQEAgLTQyNyw3ICs0 MjcsNyBAQCB2b2lkIFBhZ2VDbGllbnRJbXBsOjpzdGFydEFzc2lzdGluZ05vZGUoCiAgICAgICAg IH0KICAgICB9CiAKLSAgICBbbV9jb250ZW50VmlldyBfc3RhcnRBc3Npc3RpbmdOb2RlOm5vZGVJ bmZvcm1hdGlvbiB1c2VySXNJbnRlcmFjdGluZzp1c2VySXNJbnRlcmFjdGluZyB1c2VyT2JqZWN0 OnVzZXJPYmplY3RdOworICAgIFttX2NvbnRlbnRWaWV3IF9zdGFydEFzc2lzdGluZ05vZGU6bm9k ZUluZm9ybWF0aW9uIHVzZXJJc0ludGVyYWN0aW5nOnVzZXJJc0ludGVyYWN0aW5nIGJsdXJQcmV2 aW91c05vZGU6Ymx1clByZXZpb3VzTm9kZSB1c2VyT2JqZWN0OnVzZXJPYmplY3RdOwogfQogCiB2 b2lkIFBhZ2VDbGllbnRJbXBsOjpzdG9wQXNzaXN0aW5nTm9kZSgpCkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9u LmgJKHJldmlzaW9uIDE2OTI1OSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tD b250ZW50Vmlld0ludGVyYWN0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTE1NSw3ICsxNTUsNyBA QCBzdHJ1Y3QgV0tBdXRvQ29ycmVjdGlvbkRhdGEgewogLSAodm9pZClfY29tbWl0UG90ZW50aWFs VGFwRmFpbGVkOwogLSAodm9pZClfZGlkR2V0VGFwSGlnaGxpZ2h0Rm9yUmVxdWVzdDoodWludDY0 X3QpcmVxdWVzdElEIGNvbG9yOihjb25zdCBXZWJDb3JlOjpDb2xvciYpY29sb3IgcXVhZHM6KGNv bnN0IFZlY3RvcjxXZWJDb3JlOjpGbG9hdFF1YWQ+JiloaWdobGlnaHRlZFF1YWRzIHRvcExlZnRS YWRpdXM6KGNvbnN0IFdlYkNvcmU6OkludFNpemUmKXRvcExlZnRSYWRpdXMgdG9wUmlnaHRSYWRp dXM6KGNvbnN0IFdlYkNvcmU6OkludFNpemUmKXRvcFJpZ2h0UmFkaXVzIGJvdHRvbUxlZnRSYWRp dXM6KGNvbnN0IFdlYkNvcmU6OkludFNpemUmKWJvdHRvbUxlZnRSYWRpdXMgYm90dG9tUmlnaHRS YWRpdXM6KGNvbnN0IFdlYkNvcmU6OkludFNpemUmKWJvdHRvbVJpZ2h0UmFkaXVzOwogCi0tICh2 b2lkKV9zdGFydEFzc2lzdGluZ05vZGU6KGNvbnN0IFdlYktpdDo6QXNzaXN0ZWROb2RlSW5mb3Jt YXRpb24mKWluZm9ybWF0aW9uIHVzZXJJc0ludGVyYWN0aW5nOihCT09MKXVzZXJJc0ludGVyYWN0 aW5nIHVzZXJPYmplY3Q6KE5TT2JqZWN0IDxOU1NlY3VyZUNvZGluZz4gKil1c2VyT2JqZWN0Owor LSAodm9pZClfc3RhcnRBc3Npc3RpbmdOb2RlOihjb25zdCBXZWJLaXQ6OkFzc2lzdGVkTm9kZUlu Zm9ybWF0aW9uJilpbmZvcm1hdGlvbiB1c2VySXNJbnRlcmFjdGluZzooQk9PTCl1c2VySXNJbnRl cmFjdGluZyBibHVyUHJldmlvdXNOb2RlOihCT09MKWJsdXJQcmV2aW91c05vZGUgdXNlck9iamVj dDooTlNPYmplY3QgPE5TU2VjdXJlQ29kaW5nPiAqKXVzZXJPYmplY3Q7CiAtICh2b2lkKV9zdG9w QXNzaXN0aW5nTm9kZTsKIC0gKHZvaWQpX3NlbGVjdGlvbkNoYW5nZWQ7CiAtICh2b2lkKV91cGRh dGVDaGFuZ2VkU2VsZWN0aW9uOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9X S0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0JKHJldmlzaW9uIDE2OTI4 MikKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0 aW9uLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yMTMyLDExICsyMTMyLDE0IEBAIC0gKFVJV2ViRm9y bUFjY2Vzc29yeSAqKWZvcm1BY2Nlc3NvcnlWaWUKICAgICByZXR1cm4gX2Zvcm1BY2Nlc3NvcnlW aWV3LmdldCgpOwogfQogCi0tICh2b2lkKV9zdGFydEFzc2lzdGluZ05vZGU6KGNvbnN0IEFzc2lz dGVkTm9kZUluZm9ybWF0aW9uJilpbmZvcm1hdGlvbiB1c2VySXNJbnRlcmFjdGluZzooQk9PTCl1 c2VySXNJbnRlcmFjdGluZyB1c2VyT2JqZWN0OihOU09iamVjdCA8TlNTZWN1cmVDb2Rpbmc+ICop dXNlck9iamVjdAorLSAodm9pZClfc3RhcnRBc3Npc3RpbmdOb2RlOihjb25zdCBBc3Npc3RlZE5v ZGVJbmZvcm1hdGlvbiYpaW5mb3JtYXRpb24gdXNlcklzSW50ZXJhY3Rpbmc6KEJPT0wpdXNlcklz SW50ZXJhY3RpbmcgYmx1clByZXZpb3VzTm9kZTooQk9PTClibHVyUHJldmlvdXNOb2RlIHVzZXJP YmplY3Q6KE5TT2JqZWN0IDxOU1NlY3VyZUNvZGluZz4gKil1c2VyT2JqZWN0CiB7CiAgICAgaWYg KCF1c2VySXNJbnRlcmFjdGluZyAmJiAhX3RleHRTZWxlY3Rpb25Bc3Npc3RhbnQpCiAgICAgICAg IHJldHVybjsKIAorICAgIGlmIChibHVyUHJldmlvdXNOb2RlKQorICAgICAgICBbc2VsZiBfc3Rv cEFzc2lzdGluZ05vZGVdOworCiAgICAgLy8gRklYTUU6IFdlIHNob3VsZCByZW1vdmUgdGhpcyBj aGVjayB3aGVuIHdlIG1hbmFnZSB0byBzZW5kIFN0YXJ0QXNzaXN0aW5nTm9kZSBmcm9tIHRoZSBX ZWJQcm9jZXNzCiAgICAgLy8gb25seSB3aGVuIGl0IGlzIHRydWx5IHRpbWUgdG8gc2hvdyB0aGUg a2V5Ym9hcmQuCiAgICAgaWYgKF9hc3Npc3RlZE5vZGVJbmZvcm1hdGlvbi5lbGVtZW50VHlwZSA9 PSBpbmZvcm1hdGlvbi5lbGVtZW50VHlwZSAmJiBfYXNzaXN0ZWROb2RlSW5mb3JtYXRpb24uZWxl bWVudFJlY3QgPT0gaW5mb3JtYXRpb24uZWxlbWVudFJlY3QpCkluZGV4OiBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbQkocmV2aXNpb24gMTY5MjU5 KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJveHlJT1MubW0JKHdv cmtpbmcgY29weSkKQEAgLTU1NywxNCArNTU3LDE0IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRH ZXRUYXBIaWdobGlnaHRHZW8KICAgICBtX3BhZ2VDbGllbnQuZGlkR2V0VGFwSGlnaGxpZ2h0R2Vv bWV0cmllcyhyZXF1ZXN0SUQsIGNvbG9yLCBoaWdobGlnaHRlZFF1YWRzLCB0b3BMZWZ0UmFkaXVz LCB0b3BSaWdodFJhZGl1cywgYm90dG9tTGVmdFJhZGl1cywgYm90dG9tUmlnaHRSYWRpdXMpOwog fQogCi12b2lkIFdlYlBhZ2VQcm94eTo6c3RhcnRBc3Npc3RpbmdOb2RlKGNvbnN0IEFzc2lzdGVk Tm9kZUluZm9ybWF0aW9uJiBpbmZvcm1hdGlvbiwgYm9vbCB1c2VySXNJbnRlcmFjdGluZywgSVBD OjpNZXNzYWdlRGVjb2RlciYgZGVjb2RlcikKK3ZvaWQgV2ViUGFnZVByb3h5OjpzdGFydEFzc2lz dGluZ05vZGUoY29uc3QgQXNzaXN0ZWROb2RlSW5mb3JtYXRpb24mIGluZm9ybWF0aW9uLCBib29s IHVzZXJJc0ludGVyYWN0aW5nLCBib29sIGJsdXJQcmV2aW91c05vZGUsIElQQzo6TWVzc2FnZURl Y29kZXImIGRlY29kZXIpCiB7CiAgICAgUmVmUHRyPEFQSTo6T2JqZWN0PiB1c2VyRGF0YTsKICAg ICBXZWJDb250ZXh0VXNlck1lc3NhZ2VEZWNvZGVyIG1lc3NhZ2VEZWNvZGVyKHVzZXJEYXRhLCBw cm9jZXNzKCkpOwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUobWVzc2FnZURlY29kZXIpKQogICAg ICAgICByZXR1cm47CiAKLSAgICBtX3BhZ2VDbGllbnQuc3RhcnRBc3Npc3RpbmdOb2RlKGluZm9y bWF0aW9uLCB1c2VySXNJbnRlcmFjdGluZywgdXNlckRhdGEuZ2V0KCkpOworICAgIG1fcGFnZUNs aWVudC5zdGFydEFzc2lzdGluZ05vZGUoaW5mb3JtYXRpb24sIHVzZXJJc0ludGVyYWN0aW5nLCBi bHVyUHJldmlvdXNOb2RlLCB1c2VyRGF0YS5nZXQoKSk7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5 OjpzdG9wQXNzaXN0aW5nTm9kZSgpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UuY3BwCShyZXZpc2lvbiAxNjkyNTkpCisrKyBTb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI5NSw2 ICsyOTUsNyBAQCBXZWJQYWdlOjpXZWJQYWdlKHVpbnQ2NF90IHBhZ2VJRCwgY29uc3QgCiAgICAg LCBtX3NjYWxlV2FzU2V0QnlVSVByb2Nlc3MoZmFsc2UpCiAgICAgLCBtX3VzZXJIYXNDaGFuZ2Vk UGFnZVNjYWxlRmFjdG9yKGZhbHNlKQogICAgICwgbV91c2VySXNJbnRlcmFjdGluZyhmYWxzZSkK KyAgICAsIG1faGFzUGVuZGluZ0JsdXJOb3RpZmljYXRpb24oZmFsc2UpCiAgICAgLCBtX3NjcmVl blNpemUocGFyYW1ldGVycy5zY3JlZW5TaXplKQogICAgICwgbV9hdmFpbGFibGVTY3JlZW5TaXpl KHBhcmFtZXRlcnMuYXZhaWxhYmxlU2NyZWVuU2l6ZSkKICAgICAsIG1faW5EeW5hbWljU2l6ZVVw ZGF0ZShmYWxzZSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuaAkocmV2aXNpb24gMTY5MjU5KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtMTIwMiw2ICsxMjAyLDcgQEAgcHJp dmF0ZToKICAgICBib29sIG1fc2NhbGVXYXNTZXRCeVVJUHJvY2VzczsKICAgICBib29sIG1fdXNl ckhhc0NoYW5nZWRQYWdlU2NhbGVGYWN0b3I7CiAgICAgYm9vbCBtX3VzZXJJc0ludGVyYWN0aW5n OworICAgIGJvb2wgbV9oYXNQZW5kaW5nQmx1ck5vdGlmaWNhdGlvbjsKICAgICBXZWJDb3JlOjpG bG9hdFNpemUgbV9zY3JlZW5TaXplOwogICAgIFdlYkNvcmU6OkZsb2F0U2l6ZSBtX2F2YWlsYWJs ZVNjcmVlblNpemU7CiAgICAgUmVmUHRyPFdlYkNvcmU6OlJhbmdlPiBtX2N1cnJlbnRCbG9ja1Nl bGVjdGlvbjsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2Vi UGFnZUlPUy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvaW9zL1dlYlBhZ2VJT1MubW0JKHJldmlzaW9uIDE2OTI1OSkKKysrIFNvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQkod29ya2luZyBjb3B5KQpAQCAt MTkwMCwxNCArMTkwMCwyMCBAQCB2b2lkIFdlYlBhZ2U6OmVsZW1lbnREaWRGb2N1cyhXZWJDb3Jl OjpOCiAgICAgICAgIGlmIChtX3VzZXJJc0ludGVyYWN0aW5nKQogICAgICAgICAgICAgbV9mb3Jt Q2xpZW50LT53aWxsQmVnaW5JbnB1dFNlc3Npb24odGhpcywgdG9FbGVtZW50KG5vZGUpLCBXZWJG cmFtZTo6ZnJvbUNvcmVGcmFtZSgqbm9kZS0+ZG9jdW1lbnQoKS5mcmFtZSgpKSwgdXNlckRhdGEp OwogCi0gICAgICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6U3RhcnRBc3Npc3RpbmdO b2RlKGluZm9ybWF0aW9uLCBtX3VzZXJJc0ludGVyYWN0aW5nLCBJbmplY3RlZEJ1bmRsZVVzZXJN ZXNzYWdlRW5jb2Rlcih1c2VyRGF0YS5nZXQoKSkpKTsKKyAgICAgICAgc2VuZChNZXNzYWdlczo6 V2ViUGFnZVByb3h5OjpTdGFydEFzc2lzdGluZ05vZGUoaW5mb3JtYXRpb24sIG1fdXNlcklzSW50 ZXJhY3RpbmcsIG1faGFzUGVuZGluZ0JsdXJOb3RpZmljYXRpb24sIEluamVjdGVkQnVuZGxlVXNl ck1lc3NhZ2VFbmNvZGVyKHVzZXJEYXRhLmdldCgpKSkpOworICAgICAgICBtX2hhc1BlbmRpbmdC bHVyTm90aWZpY2F0aW9uID0gZmFsc2U7CiAgICAgfQogfQogCiB2b2lkIFdlYlBhZ2U6OmVsZW1l bnREaWRCbHVyKFdlYkNvcmU6Ok5vZGUqIG5vZGUpCiB7CiAgICAgaWYgKG1fYXNzaXN0ZWROb2Rl ID09IG5vZGUpIHsKLSAgICAgICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpTdG9wQXNz aXN0aW5nTm9kZSgpKTsKKyAgICAgICAgbV9oYXNQZW5kaW5nQmx1ck5vdGlmaWNhdGlvbiA9IHRy dWU7CisgICAgICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIF57 CisgICAgICAgICAgICBpZiAobV9oYXNQZW5kaW5nQmx1ck5vdGlmaWNhdGlvbikKKyAgICAgICAg ICAgICAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlN0b3BBc3Npc3RpbmdOb2RlKCkp OworICAgICAgICAgICAgbV9oYXNQZW5kaW5nQmx1ck5vdGlmaWNhdGlvbiA9IGZhbHNlOworICAg ICAgICB9KTsKICAgICAgICAgbV9hc3Npc3RlZE5vZGUgPSAwOwogICAgIH0KIH0K