156525 2016-04-12 17:02:37 -0700 Should retrieve text surrounding the selection when performing lookup 2016-04-12 18:07:31 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 enrica enrica sam thorton oldest_to_newest 1183296 0 enrica 2016-04-12 17:02:37 -0700 When calling the lookup function, we should include the text surrounding the selected text. rdar://problem/25043678 1183298 1 276292 enrica 2016-04-12 17:10:13 -0700 Created attachment 276292 Patch 1183315 2 enrica 2016-04-12 18:07:31 -0700 Committed revision 199399. 276292 2016-04-12 17:10:13 -0700 2016-04-12 17:11:22 -0700 Patch lookup-surround-wk2.txt text/plain 15300 enrica SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5OTM5NikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQxIEBACisyMDE2LTA0LTEyICBFbnJpY2Eg Q2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgU2hvdWxkIHJldHJpZXZlIHRl eHQgc3Vycm91bmRpbmcgdGhlIHNlbGVjdGlvbiB3aGVuIHBlcmZvcm1pbmcgbG9va3VwLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU2NTI1CisgICAg ICAgIHJkYXI6Ly9wcm9ibGVtLzI1MDQzNjc4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGhlIGxvb2t1cCBmdW5jdGlvbmFsaXR5IHJlcXVpcmVzIHRo ZSBzdXJyb3VuZGluZyB0ZXh0IHRvIGltcHJvdmUKKyAgICAgICAgdGhlIHF1YWxpdHkgb2YgdGhl IHJlc3VsdHMuIFRoaXMgcGF0Y2ggY2hhbmdlcyB0aGUgaW1wbGVtZW50YXRpb24gb2YKKyAgICAg ICAgX2xvb2t1cCB0byByZXRyaWV2ZSB0aGUgdGV4dCBiZWZvcmUgYW5kIHRoZSB0ZXh0IGFmdGVy IHRoZSBzZWxlY3Rpb24uCisgICAgICAgIEl0IGFsc28gcmVuYW1lcyBEaWN0YXRpb25Db250ZXh0 Q2FsbGJhY2sgdG8gU2VsZWN0aW9uQ29udGV4dENhbGxiYWNrIHNvCisgICAgICAgIHRoYXQgaXQg Y2FuIGJlIHVzZWQgZm9yIGJvdGggZGljdGF0aW9uIGFuZCBsb29rdXAsIHNpbmNlIHRoZXkgYm90 aCBuZWVkCisgICAgICAgIHRoZSBzdXJyb3VuZGluZyB0ZXh0LgorCisgICAgICAgICogVUlQcm9j ZXNzL0F1dG9Db3JyZWN0aW9uQ2FsbGJhY2suaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFn ZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbjoK KyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAg ICAgICAgKC1bV0tDb250ZW50VmlldyBfbG9va3VwOl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9p b3MvV2ViUGFnZVByb3h5SU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmF1 dG9jb3JyZWN0aW9uRGF0YUNhbGxiYWNrKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5 OjpzZWxlY3Rpb25Db250ZXh0Q2FsbGJhY2spOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJv eHk6OmdldEF1dG9jb3JyZWN0aW9uQ29udGV4dCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQ cm94eTo6Z2V0U2VsZWN0aW9uQ29udGV4dCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94 eTo6aGFuZGxlVHdvRmluZ2VyVGFwQXRQb2ludCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQ cm94eTo6ZGljdGF0aW9uQ29udGV4dENhbGxiYWNrKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYktp dDo6V2ViUGFnZVByb3h5OjpnZXRMb29rdXBDb250ZXh0QXRQb2ludCk6IERlbGV0ZWQuCisgICAg ICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBh Z2UvaW9zL1dlYlBhZ2VJT1MubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnBlcmZvcm1E ZWZhdWx0QmVoYXZpb3JGb3JLZXlFdmVudCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6Omdl dFNlbGVjdGlvbkNvbnRleHQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjphY2Nlc3NpYmls aXR5T2JqZWN0Rm9yTWFpbkZyYW1lUGx1Z2luKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6 cmVxdWVzdERpY3RhdGlvbkNvbnRleHQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpyZXBs YWNlU2VsZWN0ZWRUZXh0KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6Z2V0TG9va3VwQ29u dGV4dEF0UG9pbnQpOiBEZWxldGVkLgorCiAyMDE2LTA0LTEyICBKb3NlcGggUGVjb3Jhcm8gIDxw ZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogRG9jayBjb250cm9s cyBhcmUgbm90IGF2YWlsYWJsZSBpbiB0b29sYmFyIGlmIFdlYiBJbnNwZWN0b3Igd2luZG93IGxl YXZlcyBmdWxsc2NyZWVuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQXV0b0NvcnJl Y3Rpb25DYWxsYmFjay5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B dXRvQ29ycmVjdGlvbkNhbGxiYWNrLmgJKHJldmlzaW9uIDE5OTM4OCkKKysrIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BdXRvQ29ycmVjdGlvbkNhbGxiYWNrLmgJKHdvcmtpbmcgY29weSkKQEAg LTM2LDcgKzM2LDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAKIHR5cGVkZWYgR2VuZXJpY0NhbGxi YWNrPGNvbnN0IFZlY3RvcjxXZWJDb3JlOjpGbG9hdFJlY3Q+JiwgY29uc3QgU3RyaW5nJiwgZG91 YmxlLCB1aW50NjRfdD4gQXV0b2NvcnJlY3Rpb25EYXRhQ2FsbGJhY2s7CiB0eXBlZGVmIEdlbmVy aWNDYWxsYmFjazxjb25zdCBTdHJpbmcmLCBjb25zdCBTdHJpbmcmLCBjb25zdCBTdHJpbmcmLCBj b25zdCBTdHJpbmcmLCB1aW50NjRfdCwgdWludDY0X3Q+IEF1dG9jb3JyZWN0aW9uQ29udGV4dENh bGxiYWNrOwotdHlwZWRlZiBHZW5lcmljQ2FsbGJhY2s8Y29uc3QgU3RyaW5nJiwgY29uc3QgU3Ry aW5nJiwgY29uc3QgU3RyaW5nJj4gRGljdGF0aW9uQ29udGV4dENhbGxiYWNrOwordHlwZWRlZiBH ZW5lcmljQ2FsbGJhY2s8Y29uc3QgU3RyaW5nJiwgY29uc3QgU3RyaW5nJiwgY29uc3QgU3RyaW5n Jj4gU2VsZWN0aW9uQ29udGV4dENhbGxiYWNrOwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIApJ bmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkocmV2aXNpb24gMTk5 Mzg4KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCSh3b3JraW5n IGNvcHkpCkBAIC01MTUsNyArNTE1LDcgQEAgcHVibGljOgogICAgIHZvaWQgZGlzYWJsZURvdWJs ZVRhcEdlc3R1cmVzRHVyaW5nVGFwSWZOZWNlc3NhcnkodWludDY0X3QgcmVxdWVzdElEKTsKICAg ICB2b2lkIGRpZEZpbmlzaERyYXdpbmdQYWdlc1RvUERGKGNvbnN0IElQQzo6RGF0YVJlZmVyZW5j ZSYpOwogICAgIHZvaWQgY29udGVudFNpemVDYXRlZ29yeURpZENoYW5nZShjb25zdCBTdHJpbmcm IGNvbnRlbnRTaXplQ2F0ZWdvcnkpOwotICAgIHZvaWQgZ2V0TG9va3VwQ29udGV4dEF0UG9pbnQo Y29uc3QgV2ViQ29yZTo6SW50UG9pbnQmLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoY29uc3QgU3RyaW5n JiwgQ2FsbGJhY2tCYXNlOjpFcnJvcik+KTsKKyAgICB2b2lkIGdldFNlbGVjdGlvbkNvbnRleHQo c3RkOjpmdW5jdGlvbjx2b2lkKGNvbnN0IFN0cmluZyYsIGNvbnN0IFN0cmluZyYsIGNvbnN0IFN0 cmluZyYsIENhbGxiYWNrQmFzZTo6RXJyb3IpPik7CiAgICAgdm9pZCBoYW5kbGVUd29GaW5nZXJU YXBBdFBvaW50KGNvbnN0IFdlYkNvcmU6OkludFBvaW50Jiwgc3RkOjpmdW5jdGlvbjx2b2lkKGNv bnN0IFN0cmluZyYsIENhbGxiYWNrQmFzZTo6RXJyb3IpPik7CiAgICAgdm9pZCB1cGRhdGVGb3Jj ZUFsd2F5c1VzZXJTY2FsYWJsZSgpOwogI2VuZGlmCkBAIC0xMzY1LDcgKzEzNjUsNyBAQCBwcml2 YXRlOgogICAgIHZvaWQgdG91Y2hlc0NhbGxiYWNrKGNvbnN0IFdlYkNvcmU6OkludFBvaW50Jiwg dWludDMyX3QsIHVpbnQ2NF90KTsKICAgICB2b2lkIGF1dG9jb3JyZWN0aW9uRGF0YUNhbGxiYWNr KGNvbnN0IFZlY3RvcjxXZWJDb3JlOjpGbG9hdFJlY3Q+JiwgY29uc3QgU3RyaW5nJiwgZmxvYXQs IHVpbnQ2NF90LCB1aW50NjRfdCk7CiAgICAgdm9pZCBhdXRvY29ycmVjdGlvbkNvbnRleHRDYWxs YmFjayhjb25zdCBTdHJpbmcmLCBjb25zdCBTdHJpbmcmLCBjb25zdCBTdHJpbmcmLCBjb25zdCBT dHJpbmcmLCB1aW50NjRfdCwgdWludDY0X3QsIHVpbnQ2NF90KTsKLSAgICB2b2lkIGRpY3RhdGlv bkNvbnRleHRDYWxsYmFjayhjb25zdCBTdHJpbmcmLCBjb25zdCBTdHJpbmcmLCBjb25zdCBTdHJp bmcmLCB1aW50NjRfdCk7CisgICAgdm9pZCBzZWxlY3Rpb25Db250ZXh0Q2FsbGJhY2soY29uc3Qg U3RyaW5nJiwgY29uc3QgU3RyaW5nJiwgY29uc3QgU3RyaW5nJiwgdWludDY0X3QpOwogICAgIHZv aWQgaW50ZXJwcmV0S2V5RXZlbnQoY29uc3QgRWRpdG9yU3RhdGUmLCBib29sIGlzQ2hhckV2ZW50 LCBib29sJiBoYW5kbGVkKTsKICAgICB2b2lkIHNob3dQbGF5YmFja1RhcmdldFBpY2tlcihib29s IGhhc1ZpZGVvLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiBlbGVtZW50UmVjdCk7CiAjZW5kaWYK SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNz YWdlcy5pbgkocmV2aXNpb24gMTk5Mzg4KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5tZXNzYWdlcy5pbgkod29ya2luZyBjb3B5KQpAQCAtMTc0LDcgKzE3NCw3IEBA IG1lc3NhZ2VzIC0+IFdlYlBhZ2VQcm94eSB7CiAgICAgVG91Y2hlc0NhbGxiYWNrKFdlYkNvcmU6 OkludFBvaW50IHBvaW50LCB1aW50MzJfdCB0b3VjaGVzLCB1aW50NjRfdCBjYWxsYmFja0lEKQog ICAgIEF1dG9jb3JyZWN0aW9uRGF0YUNhbGxiYWNrKFZlY3RvcjxXZWJDb3JlOjpGbG9hdFJlY3Q+ IHRleHRSZWN0cywgU3RyaW5nIGZvbnROYW1lLCBkb3VibGUgZm9udFNpemUsIHVpbnQ2NF90IHRy YWl0cywgdWludDY0X3QgY2FsbGJhY2tJRCkKICAgICBBdXRvY29ycmVjdGlvbkNvbnRleHRDYWxs YmFjayhTdHJpbmcgYmVmb3JlVGV4dCwgU3RyaW5nIG1hcmtlZFRleHQsIFN0cmluZyBzZWxlY3Rl ZFRleHQsIFN0cmluZyBhZnRlclRleHQsIHVpbnQ2NF90IGxvY2F0aW9uLCB1aW50NjRfdCBsZW5n dGgsIHVpbnQ2NF90IGNhbGxiYWNrSUQpCi0gICAgRGljdGF0aW9uQ29udGV4dENhbGxiYWNrKFN0 cmluZyBzZWxlY3RlZFRleHQsIFN0cmluZyBiZWZvcmVUZXh0LCBTdHJpbmcgYWZ0ZXJUZXh0LCB1 aW50NjRfdCBjYWxsYmFja0lEKQorICAgIFNlbGVjdGlvbkNvbnRleHRDYWxsYmFjayhTdHJpbmcg c2VsZWN0ZWRUZXh0LCBTdHJpbmcgYmVmb3JlVGV4dCwgU3RyaW5nIGFmdGVyVGV4dCwgdWludDY0 X3QgY2FsbGJhY2tJRCkKICAgICBJbnRlcnByZXRLZXlFdmVudChzdHJ1Y3QgV2ViS2l0OjpFZGl0 b3JTdGF0ZSBzdGF0ZSwgYm9vbCBpc0NoYXJFdmVudCkgLT4gKGJvb2wgaGFuZGxlZCkKICAgICBE aWRSZWNlaXZlUG9zaXRpb25JbmZvcm1hdGlvbihzdHJ1Y3QgV2ViS2l0OjpJbnRlcmFjdGlvbklu Zm9ybWF0aW9uQXRQb3NpdGlvbiBpbmZvcm1hdGlvbikKICAgICBTYXZlSW1hZ2VUb0xpYnJhcnko V2ViS2l0OjpTaGFyZWRNZW1vcnk6OkhhbmRsZSBoYW5kbGUsIHVpbnQ2NF90IHNpemUpCkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5t bQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZp ZXdJbnRlcmFjdGlvbi5tbQkocmV2aXNpb24gMTk5Mzg4KQorKysgU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0JKHdvcmtpbmcgY29weSkKQEAg LTIxNiwxMSArMjE2LDEzIEBAIC0gKHZvaWQpc2hvd1RleHRTZXJ2aWNlRm9yOihOU1N0cmluZyAq KXMKIC0gKHZvaWQpc2NoZWR1bGVDaGluZXNlVHJhbnNsaXRlcmF0aW9uRm9yVGV4dDooTlNTdHJp bmcgKil0ZXh0OwogLSAodm9pZClzaG93U2hhcmVTaGVldEZvcjooTlNTdHJpbmcgKilzZWxlY3Rl ZFRlcm0gZnJvbVJlY3Q6KENHUmVjdClwcmVzZW50YXRpb25SZWN0OwogLSAodm9pZClsb29rdXA6 KE5TU3RyaW5nICopdGV4dFdpdGhDb250ZXh0IGZyb21SZWN0OihDR1JlY3QpcHJlc2VudGF0aW9u UmVjdDsKKy0gKHZvaWQpbG9va3VwOihOU1N0cmluZyAqKXRleHRXaXRoQ29udGV4dCB3aXRoUmFu Z2U6KE5TUmFuZ2UpcmFuZ2UgZnJvbVJlY3Q6KENHUmVjdClwcmVzZW50YXRpb25SZWN0OwogQGVu ZAogCiBAaW50ZXJmYWNlIFVJV0tTZWxlY3Rpb25Bc3Npc3RhbnQgKFN0YWdpbmdUb1JlbW92ZSkK IC0gKHZvaWQpc2hvd1RleHRTZXJ2aWNlRm9yOihOU1N0cmluZyAqKXNlbGVjdGVkVGVybSBmcm9t UmVjdDooQ0dSZWN0KXByZXNlbnRhdGlvblJlY3Q7CiAtICh2b2lkKWxvb2t1cDooTlNTdHJpbmcg Kil0ZXh0V2l0aENvbnRleHQgZnJvbVJlY3Q6KENHUmVjdClwcmVzZW50YXRpb25SZWN0OworLSAo dm9pZClsb29rdXA6KE5TU3RyaW5nICopdGV4dFdpdGhDb250ZXh0IHdpdGhSYW5nZTooTlNSYW5n ZSlyYW5nZSBmcm9tUmVjdDooQ0dSZWN0KXByZXNlbnRhdGlvblJlY3Q7CiBAZW5kCiAKIEBpbnRl cmZhY2UgVUlLZXlib2FyZEltcGwgKFN0YWdpbmdUb1JlbW92ZSkKQEAgLTE2MTUsMTggKzE2MTcs MjYgQEAgLSAoTlNBcnJheSAqKXN1cHBvcnRlZFBhc3RlYm9hcmRUeXBlc0ZvcgogLSAodm9pZClf bG9va3VwOihpZClzZW5kZXIKIHsKICAgICBSZXRhaW5QdHI8V0tDb250ZW50Vmlldz4gdmlldyA9 IHNlbGY7Ci0gICAgX3BhZ2UtPmdldFNlbGVjdGlvbk9yQ29udGVudHNBc1N0cmluZyhbdmlld10o Y29uc3QgU3RyaW5nJiBzdHJpbmcsIENhbGxiYWNrQmFzZTo6RXJyb3IgZXJyb3IpIHsKKyAgICBf cGFnZS0+Z2V0U2VsZWN0aW9uQ29udGV4dChbdmlld10oY29uc3QgU3RyaW5nJiBzZWxlY3RlZFRl eHQsIGNvbnN0IFN0cmluZyYgdGV4dEJlZm9yZSwgY29uc3QgU3RyaW5nJiB0ZXh0QWZ0ZXIsIENh bGxiYWNrQmFzZTo6RXJyb3IgZXJyb3IpIHsKICAgICAgICAgaWYgKGVycm9yICE9IENhbGxiYWNr QmFzZTo6RXJyb3I6Ok5vbmUpCiAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIGlmICghc3Ry aW5nKQorICAgICAgICBpZiAoIXNlbGVjdGVkVGV4dCkKICAgICAgICAgICAgIHJldHVybjsKICAg ICAgICAgCiAgICAgICAgIENHUmVjdCBwcmVzZW50YXRpb25SZWN0ID0gdmlldy0+X3BhZ2UtPmVk aXRvclN0YXRlKCkuc2VsZWN0aW9uSXNSYW5nZSA/IHZpZXctPl9wYWdlLT5lZGl0b3JTdGF0ZSgp LnBvc3RMYXlvdXREYXRhKCkuc2VsZWN0aW9uUmVjdHNbMF0ucmVjdCgpIDogdmlldy0+X3BhZ2Ut PmVkaXRvclN0YXRlKCkucG9zdExheW91dERhdGEoKS5jYXJldFJlY3RBdFN0YXJ0OwogICAgICAg ICAKLSAgICAgICAgaWYgKHZpZXctPl90ZXh0U2VsZWN0aW9uQXNzaXN0YW50ICYmIFt2aWV3LT5f dGV4dFNlbGVjdGlvbkFzc2lzdGFudCByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKGxvb2t1 cDpmcm9tUmVjdDopXSkKLSAgICAgICAgICAgIFt2aWV3LT5fdGV4dFNlbGVjdGlvbkFzc2lzdGFu dCBsb29rdXA6c3RyaW5nIGZyb21SZWN0OnByZXNlbnRhdGlvblJlY3RdOwotICAgICAgICBlbHNl IGlmICh2aWV3LT5fd2ViU2VsZWN0aW9uQXNzaXN0YW50ICYmIFt2aWV3LT5fd2ViU2VsZWN0aW9u QXNzaXN0YW50IHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IobG9va3VwOmZyb21SZWN0Oild KQotICAgICAgICAgICAgW3ZpZXctPl93ZWJTZWxlY3Rpb25Bc3Npc3RhbnQgbG9va3VwOnN0cmlu ZyBmcm9tUmVjdDpwcmVzZW50YXRpb25SZWN0XTsKKyAgICAgICAgU3RyaW5nIHNlbGVjdGlvbkNv bnRleHQgPSB0ZXh0QmVmb3JlICsgc2VsZWN0ZWRUZXh0ICsgdGV4dEFmdGVyOworICAgICAgICBp ZiAodmlldy0+X3RleHRTZWxlY3Rpb25Bc3Npc3RhbnQpIHsKKyAgICAgICAgICAgIGlmIChbdmll dy0+X3RleHRTZWxlY3Rpb25Bc3Npc3RhbnQgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihs b29rdXA6d2l0aFJhbmdlOmZyb21SZWN0OildKQorICAgICAgICAgICAgICAgIFt2aWV3LT5fdGV4 dFNlbGVjdGlvbkFzc2lzdGFudCBsb29rdXA6c2VsZWN0aW9uQ29udGV4dCB3aXRoUmFuZ2U6TlNN YWtlUmFuZ2UodGV4dEJlZm9yZS5sZW5ndGgoKSwgc2VsZWN0ZWRUZXh0Lmxlbmd0aCgpKSBmcm9t UmVjdDpwcmVzZW50YXRpb25SZWN0XTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAg ICBbdmlldy0+X3RleHRTZWxlY3Rpb25Bc3Npc3RhbnQgbG9va3VwOnNlbGVjdGVkVGV4dCBmcm9t UmVjdDpwcmVzZW50YXRpb25SZWN0XTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIGlm IChbdmlldy0+X3dlYlNlbGVjdGlvbkFzc2lzdGFudCByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVj dG9yKGxvb2t1cDp3aXRoUmFuZ2U6ZnJvbVJlY3Q6KV0pCisgICAgICAgICAgICAgICAgW3ZpZXct Pl93ZWJTZWxlY3Rpb25Bc3Npc3RhbnQgbG9va3VwOnNlbGVjdGlvbkNvbnRleHQgd2l0aFJhbmdl Ok5TTWFrZVJhbmdlKHRleHRCZWZvcmUubGVuZ3RoKCksIHNlbGVjdGVkVGV4dC5sZW5ndGgoKSkg ZnJvbVJlY3Q6cHJlc2VudGF0aW9uUmVjdF07CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAg ICAgICAgW3ZpZXctPl93ZWJTZWxlY3Rpb25Bc3Npc3RhbnQgbG9va3VwOnNlbGVjdGVkVGV4dCBm cm9tUmVjdDpwcmVzZW50YXRpb25SZWN0XTsKKyAgICAgICAgfQogICAgIH0pOwogfQogCkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbQko cmV2aXNpb24gMTk5Mzg4KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XZWJQYWdl UHJveHlJT1MubW0JKHdvcmtpbmcgY29weSkKQEAgLTE2MCw5ICsxNjAsOSBAQCB2b2lkIFdlYlBh Z2VQcm94eTo6YXV0b2NvcnJlY3Rpb25EYXRhQ2FsCiAgICAgY2FsbGJhY2stPnBlcmZvcm1DYWxs YmFja1dpdGhSZXR1cm5WYWx1ZShyZWN0cywgZm9udE5hbWUsIGZvbnRTaXplLCBmb250VHJhaXRz KTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OmRpY3RhdGlvbkNvbnRleHRDYWxsYmFjayhjb25z dCBTdHJpbmcmIHNlbGVjdGVkVGV4dCwgY29uc3QgU3RyaW5nJiBiZWZvcmVUZXh0LCBjb25zdCBT dHJpbmcmIGFmdGVyVGV4dCwgdWludDY0X3QgY2FsbGJhY2tJRCkKK3ZvaWQgV2ViUGFnZVByb3h5 OjpzZWxlY3Rpb25Db250ZXh0Q2FsbGJhY2soY29uc3QgU3RyaW5nJiBzZWxlY3RlZFRleHQsIGNv bnN0IFN0cmluZyYgYmVmb3JlVGV4dCwgY29uc3QgU3RyaW5nJiBhZnRlclRleHQsIHVpbnQ2NF90 IGNhbGxiYWNrSUQpCiB7Ci0gICAgYXV0byBjYWxsYmFjayA9IG1fY2FsbGJhY2tzLnRha2U8RGlj dGF0aW9uQ29udGV4dENhbGxiYWNrPihjYWxsYmFja0lEKTsKKyAgICBhdXRvIGNhbGxiYWNrID0g bV9jYWxsYmFja3MudGFrZTxTZWxlY3Rpb25Db250ZXh0Q2FsbGJhY2s+KGNhbGxiYWNrSUQpOwog ICAgIGlmICghY2FsbGJhY2spIHsKICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAg ICAgIHJldHVybjsKQEAgLTU1MywxNSArNTUzLDE1IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpnZXRB dXRvY29ycmVjdGlvbkNvbnQKICAgICBtX3Byb2Nlc3MtPnNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJQ YWdlOjpHZXRBdXRvY29ycmVjdGlvbkNvbnRleHQoKSwgTWVzc2FnZXM6OldlYlBhZ2U6OkdldEF1 dG9jb3JyZWN0aW9uQ29udGV4dDo6UmVwbHkoYmVmb3JlQ29udGV4dCwgbWFya2VkVGV4dCwgc2Vs ZWN0ZWRUZXh0LCBhZnRlckNvbnRleHQsIGxvY2F0aW9uLCBsZW5ndGgpLCBtX3BhZ2VJRCk7CiB9 CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpnZXRMb29rdXBDb250ZXh0QXRQb2ludChjb25zdCBXZWJD b3JlOjpJbnRQb2ludCYgcG9pbnQsIHN0ZDo6ZnVuY3Rpb248dm9pZChjb25zdCBTdHJpbmcmLCBD YWxsYmFja0Jhc2U6OkVycm9yKT4gY2FsbGJhY2tGdW5jdGlvbikKK3ZvaWQgV2ViUGFnZVByb3h5 OjpnZXRTZWxlY3Rpb25Db250ZXh0KHN0ZDo6ZnVuY3Rpb248dm9pZChjb25zdCBTdHJpbmcmLCBj b25zdCBTdHJpbmcmLCBjb25zdCBTdHJpbmcmLCBDYWxsYmFja0Jhc2U6OkVycm9yKT4gY2FsbGJh Y2tGdW5jdGlvbikKIHsKICAgICBpZiAoIWlzVmFsaWQoKSkgewotICAgICAgICBjYWxsYmFja0Z1 bmN0aW9uKFN0cmluZygpLCBDYWxsYmFja0Jhc2U6OkVycm9yOjpVbmtub3duKTsKKyAgICAgICAg Y2FsbGJhY2tGdW5jdGlvbihTdHJpbmcoKSwgU3RyaW5nKCksIFN0cmluZygpLCBDYWxsYmFja0Jh c2U6OkVycm9yOjpVbmtub3duKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICAKICAgICB1 aW50NjRfdCBjYWxsYmFja0lEID0gbV9jYWxsYmFja3MucHV0KFdURk1vdmUoY2FsbGJhY2tGdW5j dGlvbiksIG1fcHJvY2Vzcy0+dGhyb3R0bGVyKCkuYmFja2dyb3VuZEFjdGl2aXR5VG9rZW4oKSk7 Ci0gICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpHZXRMb29rdXBDb250ZXh0 QXRQb2ludChwb2ludCwgY2FsbGJhY2tJRCksIG1fcGFnZUlEKTsKKyAgICBtX3Byb2Nlc3MtPnNl bmQoTWVzc2FnZXM6OldlYlBhZ2U6OkdldFNlbGVjdGlvbkNvbnRleHQoY2FsbGJhY2tJRCksIG1f cGFnZUlEKTsKIH0KIAogdm9pZCBXZWJQYWdlUHJveHk6OmhhbmRsZVR3b0ZpbmdlclRhcEF0UG9p bnQoY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIHBvaW50LCBzdGQ6OmZ1bmN0aW9uPHZvaWQoY29u c3QgU3RyaW5nJiwgQ2FsbGJhY2tCYXNlOjpFcnJvcik+IGNhbGxiYWNrRnVuY3Rpb24pCkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgJKHJldmlzaW9u IDE5OTM4OCkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgJ KHdvcmtpbmcgY29weSkKQEAgLTU1Niw3ICs1NTYsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCByZXNl dEFzc2lzdGVkTm9kZUZvckZyYW1lKFdlYkZyYW1lKik7CiAgICAgV2ViQ29yZTo6SW50UmVjdCBy ZWN0Rm9yRWxlbWVudEF0SW50ZXJhY3Rpb25Mb2NhdGlvbigpOwogICAgIHZvaWQgdXBkYXRlU2Vs ZWN0aW9uQXBwZWFyYW5jZSgpOwotICAgIHZvaWQgZ2V0TG9va3VwQ29udGV4dEF0UG9pbnQoY29u c3QgV2ViQ29yZTo6SW50UG9pbnQsIHVpbnQ2NF90IGNhbGxiYWNrSUQpOworICAgIHZvaWQgZ2V0 U2VsZWN0aW9uQ29udGV4dCh1aW50NjRfdCBjYWxsYmFja0lEKTsKICAgICB2b2lkIGhhbmRsZVR3 b0ZpbmdlclRhcEF0UG9pbnQoY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmLCB1aW50NjRfdCBjYWxs YmFja0lEKTsKICNpZiBFTkFCTEUoSU9TX1RPVUNIX0VWRU5UUykKICAgICB2b2lkIGRpc3BhdGNo QXN5bmNocm9ub3VzVG91Y2hFdmVudHMoY29uc3QgVmVjdG9yPFdlYlRvdWNoRXZlbnQsIDE+JiBx dWV1ZSk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5t ZXNzYWdlcy5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5tZXNzYWdlcy5pbgkocmV2aXNpb24gMTk5Mzg4KQorKysgU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4JKHdvcmtpbmcgY29weSkK QEAgLTkwLDcgKzkwLDcgQEAgbWVzc2FnZXMgLT4gV2ViUGFnZSBMZWdhY3lSZWNlaXZlciB7CiAg ICAgQXBwbGljYXRpb25EaWRCZWNvbWVBY3RpdmUoKQogICAgIENvbnRlbnRTaXplQ2F0ZWdvcnlE aWRDaGFuZ2UoU3RyaW5nIGNvbnRlbnRTaXplQ2F0ZWdvcnkpCiAgICAgRXhlY3V0ZUVkaXRDb21t YW5kV2l0aENhbGxiYWNrKFN0cmluZyBuYW1lLCB1aW50NjRfdCBjYWxsYmFja0lEKQotICAgIEdl dExvb2t1cENvbnRleHRBdFBvaW50KFdlYkNvcmU6OkludFBvaW50IHBvaW50LCB1aW50NjRfdCBj YWxsYmFja0lEKQorICAgIEdldFNlbGVjdGlvbkNvbnRleHQodWludDY0X3QgY2FsbGJhY2tJRCkK ICAgICBTZXRBbGxvd3NNZWRpYURvY3VtZW50SW5saW5lUGxheWJhY2soYm9vbCBhbGxvd3MpCiAg ICAgSGFuZGxlVHdvRmluZ2VyVGFwQXRQb2ludChXZWJDb3JlOjpJbnRQb2ludCBwb2ludCwgdWlu dDY0X3QgY2FsbGJhY2tJRCkKICAgICBVcGRhdGVGb3JjZUFsd2F5c1VzZXJTY2FsYWJsZSgpCklu ZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQ YWdlSU9TLm1tCShyZXZpc2lvbiAxOTkzODgpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0JKHdvcmtpbmcgY29weSkKQEAgLTM5NSwxOCArMzk1 LDIwIEBAIGJvb2wgV2ViUGFnZTo6cGVyZm9ybURlZmF1bHRCZWhhdmlvckZvcksKICAgICByZXR1 cm4gZmFsc2U7CiB9CiAKLXZvaWQgV2ViUGFnZTo6Z2V0TG9va3VwQ29udGV4dEF0UG9pbnQoY29u c3QgV2ViQ29yZTo6SW50UG9pbnQgcG9pbnQsIHVpbnQ2NF90IGNhbGxiYWNrSUQpCit2b2lkIFdl YlBhZ2U6OmdldFNlbGVjdGlvbkNvbnRleHQodWludDY0X3QgY2FsbGJhY2tJRCkKIHsKICAgICBG cmFtZSYgZnJhbWUgPSBtX3BhZ2UtPmZvY3VzQ29udHJvbGxlcigpLmZvY3VzZWRPck1haW5GcmFt ZSgpOwotICAgIFZpc2libGVQb3NpdGlvbiBwb3NpdGlvbiA9IGZyYW1lLnZpc2libGVQb3NpdGlv bkZvclBvaW50KHBvaW50KTsKLSAgICBTdHJpbmcgcmVzdWx0U3RyaW5nOwotICAgIGlmICghcG9z aXRpb24uaXNOdWxsKCkpIHsKLSAgICAgICAgLy8gQXMgY29udGV4dCwgd2UgYXJlIGdvaW5nIHRv IHVzZSAyNTAgY2hhcmFjdGVycyBvZiB0ZXh0IGJlZm9yZSBhbmQgYWZ0ZXIgdGhlIHBvaW50Lgot ICAgICAgICBSZWZQdHI8UmFuZ2U+IGZ1bGxDaGFyYWN0ZXJSYW5nZSA9IHJhbmdlRXhwYW5kZWRB cm91bmRQb3NpdGlvbkJ5Q2hhcmFjdGVycyhwb3NpdGlvbiwgMjUwKTsKLSAgICAgICAgaWYgKGZ1 bGxDaGFyYWN0ZXJSYW5nZSkKLSAgICAgICAgICAgIHJlc3VsdFN0cmluZyA9IHBsYWluVGV4dChm dWxsQ2hhcmFjdGVyUmFuZ2UuZ2V0KCkpOworICAgIGlmICghZnJhbWUuc2VsZWN0aW9uKCkuaXNS YW5nZSgpKSB7CisgICAgICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6U2VsZWN0aW9u Q29udGV4dENhbGxiYWNrKFN0cmluZygpLCBTdHJpbmcoKSwgU3RyaW5nKCksIGNhbGxiYWNrSUQp KTsKKyAgICAgICAgcmV0dXJuOwogICAgIH0KLSAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJv eHk6OlN0cmluZ0NhbGxiYWNrKHJlc3VsdFN0cmluZywgY2FsbGJhY2tJRCkpOworICAgIGNvbnN0 IGludCBzZWxlY3Rpb25FeHRlbmRlZENvbnRleHRMZW5ndGggPSAzNTA7CisgICAgCisgICAgU3Ry aW5nIHNlbGVjdGVkVGV4dCA9IHBsYWluVGV4dFJlcGxhY2luZ05vQnJlYWtTcGFjZShmcmFtZS5z ZWxlY3Rpb24oKS5zZWxlY3Rpb24oKS50b05vcm1hbGl6ZWRSYW5nZSgpLmdldCgpKTsKKyAgICBT dHJpbmcgdGV4dEJlZm9yZSA9IHBsYWluVGV4dFJlcGxhY2luZ05vQnJlYWtTcGFjZShyYW5nZUV4 cGFuZGVkQnlDaGFyYWN0ZXJzSW5EaXJlY3Rpb25BdFdvcmRCb3VuZGFyeShmcmFtZS5zZWxlY3Rp b24oKS5zZWxlY3Rpb24oKS5zdGFydCgpLCBzZWxlY3Rpb25FeHRlbmRlZENvbnRleHRMZW5ndGgs IERpcmVjdGlvbkJhY2t3YXJkKS5nZXQoKSwgVGV4dEl0ZXJhdG9yRGVmYXVsdEJlaGF2aW9yLCB0 cnVlKTsKKyAgICBTdHJpbmcgdGV4dEFmdGVyID0gcGxhaW5UZXh0UmVwbGFjaW5nTm9CcmVha1Nw YWNlKHJhbmdlRXhwYW5kZWRCeUNoYXJhY3RlcnNJbkRpcmVjdGlvbkF0V29yZEJvdW5kYXJ5KGZy YW1lLnNlbGVjdGlvbigpLnNlbGVjdGlvbigpLmVuZCgpLCBzZWxlY3Rpb25FeHRlbmRlZENvbnRl eHRMZW5ndGgsIERpcmVjdGlvbkZvcndhcmQpLmdldCgpLCBUZXh0SXRlcmF0b3JEZWZhdWx0QmVo YXZpb3IsIHRydWUpOworCisgICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpTZWxlY3Rp b25Db250ZXh0Q2FsbGJhY2soc2VsZWN0ZWRUZXh0LCB0ZXh0QmVmb3JlLCB0ZXh0QWZ0ZXIsIGNh bGxiYWNrSUQpKTsKIH0KIAogTlNPYmplY3QgKldlYlBhZ2U6OmFjY2Vzc2liaWxpdHlPYmplY3RG b3JNYWluRnJhbWVQbHVnaW4oKQpAQCAtMTkxMSw3ICsxOTEzLDcgQEAgdm9pZCBXZWJQYWdlOjpy ZXF1ZXN0RGljdGF0aW9uQ29udGV4dCh1aQogICAgICAgICAgICAgY29udGV4dEFmdGVyID0gcGxh aW5UZXh0UmVwbGFjaW5nTm9CcmVha1NwYWNlKFJhbmdlOjpjcmVhdGUoKmZyYW1lLmRvY3VtZW50 KCksIGVuZFBvc2l0aW9uLCBsYXN0UG9zaXRpb24pLnB0cigpKTsKICAgICB9CiAKLSAgICBzZW5k KE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpY3RhdGlvbkNvbnRleHRDYWxsYmFjayhzZWxlY3Rl ZFRleHQsIGNvbnRleHRCZWZvcmUsIGNvbnRleHRBZnRlciwgY2FsbGJhY2tJRCkpOworICAgIHNl bmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6U2VsZWN0aW9uQ29udGV4dENhbGxiYWNrKHNlbGVj dGVkVGV4dCwgY29udGV4dEJlZm9yZSwgY29udGV4dEFmdGVyLCBjYWxsYmFja0lEKSk7CiB9CiAK IHZvaWQgV2ViUGFnZTo6cmVwbGFjZVNlbGVjdGVkVGV4dChjb25zdCBTdHJpbmcmIG9sZFRleHQs IGNvbnN0IFN0cmluZyYgbmV3VGV4dCkK