101896 2012-11-11 22:46:20 -0800 PDFPlugin should use PDFKit's context menu instead of the default WebKit one 2022-02-22 13:59:14 -0800 1 1 1 Unclassified WebKit PDF 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=237059 InRadar P2 Normal --- 1 thorton webkit-unassigned adele ap mitz webkit.review.bot oldest_to_newest 764062 0 thorton 2012-11-11 22:46:20 -0800 Technically, we should hand the context menu through the somewhat-complex context menu system so that clients can add custom menu items. I'll do that in a followup patch. This also makes most of the context menu items function properly (except the ones that already have FIXMEs in PDFPlugin). <rdar://problem/12555173> 764070 1 173564 thorton 2012-11-11 22:55:29 -0800 Created attachment 173564 patch 764074 2 webkit.review.bot 2012-11-11 22:58:28 -0800 Attachment 173564 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit..." exit_code: 1 Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h:96: The parameter name "event" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 1 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 764943 3 thorton 2012-11-12 16:26:44 -0800 Thanks, Anders! http://trac.webkit.org/changeset/134326 173564 2012-11-11 22:55:29 -0800 2012-11-12 16:10:44 -0800 patch context-menu.diff text/plain 18548 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmZGRkNDc3Li5mNDYzYjViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDUg QEAKKzIwMTItMTEtMTEgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgUERGUGx1Z2luIHNob3VsZCB1c2UgUERGS2l0J3MgY29udGV4dCBtZW51IGluc3Rl YWQgb2YgdGhlIGRlZmF1bHQgV2ViS2l0IG9uZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxODk2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMjU1 NTE3Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBT aG93IHRoZSBjb250ZXh0IG1lbnUgdGhhdCBQREZLaXQgdmVuZHMgdXMgaW5zdGVhZCBvZiB0aGUg ZGVmYXVsdCBXZWJLaXQgb25lCisgICAgICAgIHdoZW4gUERGUGx1Z2luIGlzIHRvbGQgdG8gc2hv dyBhIGNvbnRleHQgbWVudS4KKworICAgICAgICBBbHNvLCByZWFjdCB0byB0aGUgZGlkQ2hhbmdl Q29udGVudFNjYWxlRmFjdG9yIGNhbGxiYWNrLCBzbyB0aGF0IHdoZW4gdGhlIGNvbnRleHQKKyAg ICAgICAgbWVudSAob3IgSFVEKSBpcyB1c2VkIHRvIGNoYW5nZSB0aGUgc2NhbGUgZmFjdG9yLCB3 ZSBjYW4gaW5mb3JtIFBsdWdpblZpZXcuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMv UERGL1BERkxheWVyQ29udHJvbGxlckRldGFpbHMuaDoKKyAgICAgICAgQWRkIHBkZkxheWVyQ29u dHJvbGxlcjpkaWRDaGFuZ2VDb250ZW50U2NhbGVGYWN0b3I6IGRlbGVnYXRlIGNhbGxiYWNrLgor ICAgICAgICBSZW5hbWUgdGlsZVNjYWxlRmFjdG9yIHRvIGNvbnRlbnRTY2FsZUZhY3Rvci4KKyAg ICAgICAgQWRkIHJpZ2h0TW91c2VEb3duOiBhbmQgbWVudUZvckV2ZW50OiBvbiBQREZMYXllckNv bnRyb2xsZXIuCisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW4uaDoK KyAgICAgICAgKFBERlBsdWdpbik6CisgICAgICAgIEFkZCBub3RpZnlDb250ZW50U2NhbGVGYWN0 b3JDaGFuZ2VkLCBoYW5kbGVDb250ZXh0TWVudUV2ZW50LCBhbmQgbnNFdmVudEZvcldlYk1vdXNl RXZlbnQuCisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW4ubW06Cisg ICAgICAgICgtW1dLUERGTGF5ZXJDb250cm9sbGVyRGVsZWdhdGUgcGRmTGF5ZXJDb250cm9sbGVy OmRpZENoYW5nZUNvbnRlbnRTY2FsZUZhY3RvcjpdKTogRm9yd2FyZCBjb250ZW50IHNjYWxlIGZh Y3RvciBjaGFuZ2VzIHRvIFBERlBsdWdpbi4KKyAgICAgICAgKFdlYktpdDo6UERGUGx1Z2luOjpw ZGZEb2N1bWVudERpZExvYWQpOiBSZW5hbWUgdGlsZVNjYWxlRmFjdG9yIHRvIGNvbnRlbnRTY2Fs ZUZhY3Rvci4KKyAgICAgICAgKFdlYktpdDo6UERGUGx1Z2luOjpnZW9tZXRyeURpZENoYW5nZSk6 IFJlbmFtZSB0aWxlU2NhbGVGYWN0b3IgdG8gY29udGVudFNjYWxlRmFjdG9yLgorICAgICAgICAo V2ViS2l0OjpldmVudFR5cGVGcm9tV2ViRXZlbnQpOiBJdCB0dXJucyBvdXQgd2UgY2FuIGluZmVy IHdoZXRoZXIgdGhlIG1vdXNlIGlzIGJlaW5nIGRyYWdnZWQgZHVyaW5nIGEgTW91c2VNb3ZlIGV2 ZW50CisgICAgICAgIGJ5IHdoZXRoZXIgaXQgaGFzIGEgbW91c2UgYnV0dG9uIGFzc29jaWF0ZWQg d2l0aCBpdCBvciBub3QsIHNvIHdlIGRvbid0IG5lZWQgdG8gdHJhY2sgdGhpcyBzdGF0ZSBtYW51 YWxseS4KKyAgICAgICAgKFdlYktpdDo6UERGUGx1Z2luOjpuc0V2ZW50Rm9yV2ViTW91c2VFdmVu dCk6IEZhY3RvciB0aGUgcGFydCBvZiBoYW5kbGVNb3VzZUV2ZW50IHRoYXQgY3JlYXRlcyBOU0V2 ZW50cyogb3V0IGludG8gaXRzIG93biBmdW5jdGlvbi4KKyAgICAgICAgKFdlYktpdDo6UERGUGx1 Z2luOjpoYW5kbGVNb3VzZUV2ZW50KToKKyAgICAgICAgRG9uJ3QgdHJhY2sgbW91c2VCdXR0b25J c0Rvd24gbWFudWFsbHksIG1ha2UgdXNlIG9mIHRoZSBuZXcgbnNFdmVudEZvcldlYk1vdXNlRXZl bnQuCisgICAgICAgIEhhbmQgcmlnaHRNb3VzZURvd246IHRvIFBERkxheWVyQ29udHJvbGxlciBp bnN0ZWFkIG9mIG1vdXNlRG93bjogaWYgbmVjZXNzYXJ5LgorICAgICAgICAoV2ViS2l0OjpQREZQ bHVnaW46OmhhbmRsZUNvbnRleHRNZW51RXZlbnQpOiBHcmFiIHRoZSByZWxldmFudCBOU01lbnUg ZnJvbSBQREZLaXQgYW5kIGRpc3BsYXkgaXQuCisgICAgICAgIChXZWJLaXQ6OlBERlBsdWdpbjo6 aGFuZGxlS2V5Ym9hcmRFdmVudCk6IERvbid0IHBhc3MgYSBib2d1cyBtb3VzZUJ1dHRvbklzRG93 biB0byBldmVudFR5cGVGcm9tV2ViRXZlbnQuCisgICAgICAgIChXZWJLaXQ6OlBERlBsdWdpbjo6 bm90aWZ5Q29udGVudFNjYWxlRmFjdG9yQ2hhbmdlZCk6IFVwZGF0ZSBQbHVnaW5WaWV3IGFuZCBj by4ncyBub3Rpb24gb2YgcGFnZSBzY2FsZSB3aGVuCisgICAgICAgIFBERktpdCBjaGFuZ2VzIGl0 IChnZW5lcmFsbHkgZnJvbSB0aGUgY29udGV4dCBtZW51L0hVRCkuIEFsc28gdXBkYXRlIHBhZ2Ug c2l6ZSBhbmQgc2Nyb2xsYmFyIHNpemUvcG9zaXRpb24uCisgICAgICAgIChXZWJLaXQ6OlBERlBs dWdpbjo6c2V0U2Nyb2xsT2Zmc2V0KTogRG9uJ3QgY2FsbCBTaW1wbGVQREZQbHVnaW4ncyBpbXBs ZW1lbnRhdGlvbiwgYXMgUERGS2l0IGhhbmRsZXMgaW52YWxpZGF0aW9uIGl0c2VsZi4KKyAgICAg ICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbkNob2ljZUFubm90YXRpb24ubW06 CisgICAgICAgIChXZWJLaXQ6OlBERlBsdWdpbkNob2ljZUFubm90YXRpb246OnVwZGF0ZUdlb21l dHJ5KTogUmVuYW1lIHRpbGVTY2FsZUZhY3RvciB0byBjb250ZW50U2NhbGVGYWN0b3IuCisgICAg ICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW5UZXh0QW5ub3RhdGlvbi5tbToK KyAgICAgICAgKFdlYktpdDo6UERGUGx1Z2luVGV4dEFubm90YXRpb246OnVwZGF0ZUdlb21ldHJ5 KTogUmVuYW1lIHRpbGVTY2FsZUZhY3RvciB0byBjb250ZW50U2NhbGVGYWN0b3IuCisgICAgICAg ICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9TaW1wbGVQREZQbHVnaW4uaDogTWFrZSBtX3Njcm9s bE9mZnNldCBwcm90ZWN0ZWQuCisKIDIwMTItMTEtMDkgIFJpY2sgQnllcnMgIDxyYnllcnNAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIE5vIHRlc3RzIGZvciBjaGFuZ2luZyBtb3VzZSBjdXJzb3Jz CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERkxh eWVyQ29udHJvbGxlckRldGFpbHMuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lu cy9QREYvUERGTGF5ZXJDb250cm9sbGVyRGV0YWlscy5oCmluZGV4IGI4ZjZhOTUuLjgzYzVmOWUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERGTGF5 ZXJDb250cm9sbGVyRGV0YWlscy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1 Z2lucy9QREYvUERGTGF5ZXJDb250cm9sbGVyRGV0YWlscy5oCkBAIC0zNiw2ICszNiw3IEBACiAK IC0gKHZvaWQpcGRmTGF5ZXJDb250cm9sbGVyOihQREZMYXllckNvbnRyb2xsZXIgKilwZGZMYXll ckNvbnRyb2xsZXIgZGlkQ2hhbmdlQWN0aXZlQW5ub3RhdGlvbjooUERGQW5ub3RhdGlvbiAqKWFu bm90YXRpb247CiAtICh2b2lkKXBkZkxheWVyQ29udHJvbGxlcjooUERGTGF5ZXJDb250cm9sbGVy ICopcGRmTGF5ZXJDb250cm9sbGVyIGNsaWNrZWRMaW5rV2l0aFVSTDooTlNVUkwgKil1cmw7Cist ICh2b2lkKXBkZkxheWVyQ29udHJvbGxlcjooUERGTGF5ZXJDb250cm9sbGVyICopcGRmTGF5ZXJD b250cm9sbGVyIGRpZENoYW5nZUNvbnRlbnRTY2FsZUZhY3RvcjooQ0dGbG9hdClzY2FsZUZhY3Rv cjsKIAogQGVuZAogCkBAIC01Myw4ICs1NCw4IEBACiAtICh2b2lkKXNldERpc3BsYXlNb2RlOihp bnQpbW9kZTsKIC0gKHZvaWQpc2V0RGlzcGxheXNQYWdlQnJlYWtzOihCT09MKXBhZ2VCcmVha3M7 CiAKLS0gKENHRmxvYXQpdGlsZVNjYWxlRmFjdG9yOwotLSAodm9pZClzZXRUaWxlU2NhbGVGYWN0 b3I6KENHRmxvYXQpc2NhbGVGYWN0b3I7CistIChDR0Zsb2F0KWNvbnRlbnRTY2FsZUZhY3RvcjsK Ky0gKHZvaWQpc2V0Q29udGVudFNjYWxlRmFjdG9yOihDR0Zsb2F0KXNjYWxlRmFjdG9yOwogCiAt IChDR1NpemUpY29udGVudFNpemU7CiAtIChDR1NpemUpY29udGVudFNpemVSZXNwZWN0aW5nWm9v bTsKQEAgLTY4LDEyICs2OSwxNSBAQAogLSAodm9pZClzY3JvbGxXaXRoRGVsdGE6KENHU2l6ZSlk ZWx0YTsKIAogLSAodm9pZCltb3VzZURvd246KE5TRXZlbnQgKilldmVudDsKKy0gKHZvaWQpcmln aHRNb3VzZURvd246KE5TRXZlbnQgKilldmVudDsKIC0gKHZvaWQpbW91c2VNb3ZlZDooTlNFdmVu dCAqKWV2ZW50OwogLSAodm9pZCltb3VzZVVwOihOU0V2ZW50ICopZXZlbnQ7CiAtICh2b2lkKW1v dXNlRHJhZ2dlZDooTlNFdmVudCAqKWV2ZW50OwogLSAodm9pZCltb3VzZUVudGVyZWQ6KE5TRXZl bnQgKilldmVudDsKIC0gKHZvaWQpbW91c2VFeGl0ZWQ6KE5TRXZlbnQgKilldmVudDsKIAorLSAo TlNNZW51ICopbWVudUZvckV2ZW50OihOU0V2ZW50ICopZXZlbnQ7CisKIC0gKE5TQXJyYXkgKilm aW5kU3RyaW5nOihOU1N0cmluZyAqKXN0cmluZyBjYXNlU2Vuc2l0aXZlOihCT09MKWlzQ2FzZVNl bnNpdGl2ZSBoaWdobGlnaHRNYXRjaGVzOihCT09MKXNob3VsZEhpZ2hsaWdodE1hdGNoZXM7CiAK IC0gKGlkKWN1cnJlbnRTZWxlY3Rpb247CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9QbHVnaW5zL1BERi9QREZQbHVnaW4uaAppbmRleCA2ZWNjNjc4Li5kNWVkNjNjIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5oCisr KyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2luLmgKQEAg LTYzLDYgKzYzLDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0QWN0aXZlQW5ub3RhdGlvbihQREZB bm5vdGF0aW9uICopOwogICAgIAogICAgIHVzaW5nIFNjcm9sbGFibGVBcmVhOjpub3RpZnlTY3Jv bGxQb3NpdGlvbkNoYW5nZWQ7CisgICAgdm9pZCBub3RpZnlDb250ZW50U2NhbGVGYWN0b3JDaGFu Z2VkKENHRmxvYXQgc2NhbGVGYWN0b3IpOwogCiAgICAgdm9pZCBjbGlja2VkTGluayhOU1VSTCAq KTsKIApAQCAtODEsNiArODIsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgUGxhdGZvcm1MYXll ciogcGx1Z2luTGF5ZXIoKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgZ2VvbWV0cnlEaWRD aGFuZ2UoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgcGx1Z2luU2l6ZSwgY29uc3QgV2ViQ29yZTo6 SW50UmVjdCYgY2xpcFJlY3QsIGNvbnN0IFdlYkNvcmU6OkFmZmluZVRyYW5zZm9ybSYgcGx1Z2lu VG9Sb290Vmlld1RyYW5zZm9ybSkgT1ZFUlJJREU7CiAgICAgdmlydHVhbCBib29sIGhhbmRsZU1v dXNlRXZlbnQoY29uc3QgV2ViTW91c2VFdmVudCYpIE9WRVJSSURFOworICAgIHZpcnR1YWwgYm9v bCBoYW5kbGVDb250ZXh0TWVudUV2ZW50KGNvbnN0IFdlYk1vdXNlRXZlbnQmKSBPVkVSUklERTsK ICAgICB2aXJ0dWFsIGJvb2wgaGFuZGxlS2V5Ym9hcmRFdmVudChjb25zdCBXZWJLZXlib2FyZEV2 ZW50JikgT1ZFUlJJREU7CiAgICAgdmlydHVhbCBib29sIGhhbmRsZUVkaXRpbmdDb21tYW5kKGNv bnN0IFN0cmluZyYgY29tbWFuZE5hbWUsIGNvbnN0IFN0cmluZyYgYXJndW1lbnQpIE9WRVJSSURF OwogICAgIHZpcnR1YWwgYm9vbCBpc0VkaXRpbmdDb21tYW5kRW5hYmxlZChjb25zdCBTdHJpbmcm KSBPVkVSUklERTsKQEAgLTkwLDcgKzkyLDkgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQg c2V0U2Nyb2xsT2Zmc2V0KGNvbnN0IFdlYkNvcmU6OkludFBvaW50JikgT1ZFUlJJREU7CiAgICAg dmlydHVhbCB2b2lkIGludmFsaWRhdGVTY3JvbGxiYXJSZWN0KFdlYkNvcmU6OlNjcm9sbGJhcios IGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgaW52 YWxpZGF0ZVNjcm9sbENvcm5lclJlY3QoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYpIE9WRVJSSURF OwotCisgICAgCisgICAgTlNFdmVudCAqbnNFdmVudEZvcldlYk1vdXNlRXZlbnQoY29uc3QgV2Vi TW91c2VFdmVudCYgZXZlbnQpOworICAgIAogICAgIGJvb2wgc3VwcG9ydHNGb3JtcygpOwogCiAg ICAgUmV0YWluUHRyPENBTGF5ZXI+IG1fY29udGFpbmVyTGF5ZXI7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5tbSBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2luLm1tCmluZGV4IDljMmNiMDQu LmRiMmI2M2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9Q REYvUERGUGx1Z2luLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9Q REYvUERGUGx1Z2luLm1tCkBAIC01OSw2ICs1OSw3IEBACiAjaW1wb3J0IDxXZWJDb3JlL1JlbmRl ckJveE1vZGVsT2JqZWN0Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL1Njcm9sbEFuaW1hdG9yLmg+CiAj aW1wb3J0IDxXZWJDb3JlL1Njcm9sbGJhclRoZW1lLmg+CisjaW1wb3J0IDxXZWJLaXRTeXN0ZW1J bnRlcmZhY2UuaD4KIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKQEAgLTE4OSw2ICsxOTAs MTEgQEAgc3RhdGljIGNvbnN0IGNoYXIqIGFubm90YXRpb25TdHlsZSA9CiAgICAgX3BkZlBsdWdp bi0+c2V0QWN0aXZlQW5ub3RhdGlvbihhbm5vdGF0aW9uKTsKIH0KIAorLSAodm9pZClwZGZMYXll ckNvbnRyb2xsZXI6KFBERkxheWVyQ29udHJvbGxlciAqKXBkZkxheWVyQ29udHJvbGxlciBkaWRD aGFuZ2VDb250ZW50U2NhbGVGYWN0b3I6KENHRmxvYXQpc2NhbGVGYWN0b3IKK3sKKyAgICBfcGRm UGx1Z2luLT5ub3RpZnlDb250ZW50U2NhbGVGYWN0b3JDaGFuZ2VkKHNjYWxlRmFjdG9yKTsKK30K KwogQGVuZAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKQEAgLTI5NCw3ICszMDAsNyBAQCB2b2lkIFBE RlBsdWdpbjo6cGRmRG9jdW1lbnREaWRMb2FkKCkKICAgICBtX3BkZkxheWVyQ29udHJvbGxlci5n ZXQoKS5kb2N1bWVudCA9IGRvY3VtZW50LmdldCgpOwogICAgIAogICAgIGlmIChoYW5kbGVzUGFn ZVNjYWxlRmFjdG9yKCkpCi0gICAgICAgIHBsdWdpblZpZXcoKS0+c2V0UGFnZVNjYWxlRmFjdG9y KFttX3BkZkxheWVyQ29udHJvbGxlci5nZXQoKSB0aWxlU2NhbGVGYWN0b3JdLCBJbnRQb2ludCgp KTsKKyAgICAgICAgcGx1Z2luVmlldygpLT5zZXRQYWdlU2NhbGVGYWN0b3IoW21fcGRmTGF5ZXJD b250cm9sbGVyLmdldCgpIGNvbnRlbnRTY2FsZUZhY3Rvcl0sIEludFBvaW50KCkpOwogCiAgICAg bm90aWZ5U2Nyb2xsUG9zaXRpb25DaGFuZ2VkKEludFBvaW50KFttX3BkZkxheWVyQ29udHJvbGxl ci5nZXQoKSBzY3JvbGxQb3NpdGlvbl0pKTsKIApAQCAtMzE3LDcgKzMyMyw3IEBAIHZvaWQgUERG UGx1Z2luOjpjYWxjdWxhdGVTaXplcygpCiB2b2lkIFBERlBsdWdpbjo6ZGVzdHJveSgpCiB7CiAg ICAgbV9wZGZMYXllckNvbnRyb2xsZXIuZ2V0KCkuZGVsZWdhdGUgPSAwOwotICAgIAorCiAgICAg aWYgKHdlYkZyYW1lKCkpIHsKICAgICAgICAgaWYgKEZyYW1lVmlldyogZnJhbWVWaWV3ID0gd2Vi RnJhbWUoKS0+Y29yZUZyYW1lKCktPnZpZXcoKSkKICAgICAgICAgICAgIGZyYW1lVmlldy0+cmVt b3ZlU2Nyb2xsYWJsZUFyZWEodGhpcyk7CkBAIC0zOTEsNyArMzk3LDcgQEAgUGxhdGZvcm1MYXll ciogUERGUGx1Z2luOjpwbHVnaW5MYXllcigpCiAKIHZvaWQgUERGUGx1Z2luOjpnZW9tZXRyeURp ZENoYW5nZShjb25zdCBJbnRTaXplJiBwbHVnaW5TaXplLCBjb25zdCBJbnRSZWN0JiwgY29uc3Qg QWZmaW5lVHJhbnNmb3JtJiBwbHVnaW5Ub1Jvb3RWaWV3VHJhbnNmb3JtKQogewotICAgIGlmIChz aXplKCkgPT0gcGx1Z2luU2l6ZSAmJiBwbHVnaW5WaWV3KCktPnBhZ2VTY2FsZUZhY3RvcigpID09 IFttX3BkZkxheWVyQ29udHJvbGxlci5nZXQoKSB0aWxlU2NhbGVGYWN0b3JdKQorICAgIGlmIChz aXplKCkgPT0gcGx1Z2luU2l6ZSAmJiBwbHVnaW5WaWV3KCktPnBhZ2VTY2FsZUZhY3RvcigpID09 IFttX3BkZkxheWVyQ29udHJvbGxlci5nZXQoKSBjb250ZW50U2NhbGVGYWN0b3JdKQogICAgICAg ICByZXR1cm47CiAKICAgICBzZXRTaXplKHBsdWdpblNpemUpOwpAQCAtNDA0LDcgKzQxMCw3IEBA IHZvaWQgUERGUGx1Z2luOjpnZW9tZXRyeURpZENoYW5nZShjb25zdCBJbnRTaXplJiBwbHVnaW5T aXplLCBjb25zdCBJbnRSZWN0JiwgY29uCiAgICAgdHJhbnNmb3JtID0gQ0FUcmFuc2Zvcm0zRFRy YW5zbGF0ZSh0cmFuc2Zvcm0sIDAsIC1wbHVnaW5TaXplLmhlaWdodCgpLCAwKTsKICAgICAKICAg ICBpZiAoaGFuZGxlc1BhZ2VTY2FsZUZhY3RvcigpKSB7Ci0gICAgICAgIENHRmxvYXQgbWFnbmlm aWNhdGlvbiA9IHBsdWdpblZpZXcoKS0+cGFnZVNjYWxlRmFjdG9yKCkgLSBbbV9wZGZMYXllckNv bnRyb2xsZXIuZ2V0KCkgdGlsZVNjYWxlRmFjdG9yXTsKKyAgICAgICAgQ0dGbG9hdCBtYWduaWZp Y2F0aW9uID0gcGx1Z2luVmlldygpLT5wYWdlU2NhbGVGYWN0b3IoKSAtIFttX3BkZkxheWVyQ29u dHJvbGxlci5nZXQoKSBjb250ZW50U2NhbGVGYWN0b3JdOwogCiAgICAgICAgIC8vIEZJWE1FOiBJ bnN0ZWFkIG9mIG1fbGFzdE1vdXNlUG9pbnQsIHdlIHNob3VsZCB1c2UgdGhlIHpvb20gb3JpZ2lu IGZyb20gUGx1Z2luVmlldzo6c2V0UGFnZVNjYWxlRmFjdG9yLgogICAgICAgICBpZiAobWFnbmlm aWNhdGlvbikKQEAgLTQyOSw3ICs0MzUsNyBAQCBzdGF0aWMgTlNVSW50ZWdlciBtb2RpZmllckZs YWdzRnJvbVdlYkV2ZW50KGNvbnN0IFdlYkV2ZW50JiBldmVudCkKICAgICAgICAgfCAoZXZlbnQu bWV0YUtleSgpID8gTlNDb21tYW5kS2V5TWFzayA6IDApOwogfQogICAgIAotc3RhdGljIE5TRXZl bnRUeXBlIGV2ZW50VHlwZUZyb21XZWJFdmVudChjb25zdCBXZWJFdmVudCYgZXZlbnQsIGJvb2wg bW91c2VCdXR0b25Jc0Rvd24pCitzdGF0aWMgTlNFdmVudFR5cGUgZXZlbnRUeXBlRnJvbVdlYkV2 ZW50KGNvbnN0IFdlYkV2ZW50JiBldmVudCkKIHsKICAgICBzd2l0Y2ggKGV2ZW50LnR5cGUoKSkg ewogICAgIGNhc2UgV2ViRXZlbnQ6OktleURvd246CkBAIC00NTgsODIgKzQ2NCwxMTggQEAgc3Rh dGljIE5TRXZlbnRUeXBlIGV2ZW50VHlwZUZyb21XZWJFdmVudChjb25zdCBXZWJFdmVudCYgZXZl bnQsIGJvb2wgbW91c2VCdXR0b24KICAgICAgICAgfQogICAgICAgICBicmVhazsKICAgICBjYXNl IFdlYkV2ZW50OjpNb3VzZU1vdmU6Ci0gICAgICAgIGlmIChtb3VzZUJ1dHRvbklzRG93bikgewot ICAgICAgICAgICAgc3dpdGNoIChzdGF0aWNfY2FzdDxjb25zdCBXZWJNb3VzZUV2ZW50Jj4oZXZl bnQpLmJ1dHRvbigpKSB7Ci0gICAgICAgICAgICBjYXNlIFdlYk1vdXNlRXZlbnQ6OkxlZnRCdXR0 b246Ci0gICAgICAgICAgICAgICAgcmV0dXJuIE5TTGVmdE1vdXNlRHJhZ2dlZDsKLSAgICAgICAg ICAgIGNhc2UgV2ViTW91c2VFdmVudDo6UmlnaHRCdXR0b246Ci0gICAgICAgICAgICAgICAgcmV0 dXJuIE5TUmlnaHRNb3VzZURyYWdnZWQ7Ci0gICAgICAgICAgICBkZWZhdWx0OgotICAgICAgICAg ICAgICAgIHJldHVybiAwOwotICAgICAgICAgICAgfQotICAgICAgICB9IGVsc2UKKyAgICAgICAg c3dpdGNoIChzdGF0aWNfY2FzdDxjb25zdCBXZWJNb3VzZUV2ZW50Jj4oZXZlbnQpLmJ1dHRvbigp KSB7CisgICAgICAgIGNhc2UgV2ViTW91c2VFdmVudDo6TGVmdEJ1dHRvbjoKKyAgICAgICAgICAg IHJldHVybiBOU0xlZnRNb3VzZURyYWdnZWQ7CisgICAgICAgIGNhc2UgV2ViTW91c2VFdmVudDo6 UmlnaHRCdXR0b246CisgICAgICAgICAgICByZXR1cm4gTlNSaWdodE1vdXNlRHJhZ2dlZDsKKyAg ICAgICAgY2FzZSBXZWJNb3VzZUV2ZW50OjpOb0J1dHRvbjoKICAgICAgICAgICAgIHJldHVybiBO U01vdXNlTW92ZWQ7CisgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICByZXR1cm4gMDsKKyAg ICAgICAgfQogICAgICAgICBicmVhazsKIAogICAgIGRlZmF1bHQ6CiAgICAgICAgIHJldHVybiAw OwogICAgIH0KIH0KLQotYm9vbCBQREZQbHVnaW46OmhhbmRsZU1vdXNlRXZlbnQoY29uc3QgV2Vi TW91c2VFdmVudCYgZXZlbnQpCisgICAgCitOU0V2ZW50ICpQREZQbHVnaW46Om5zRXZlbnRGb3JX ZWJNb3VzZUV2ZW50KGNvbnN0IFdlYk1vdXNlRXZlbnQmIGV2ZW50KQogewotICAgIHN0YXRpYyBi b29sIG1vdXNlQnV0dG9uSXNEb3duOwotCi0gICAgbV9sYXN0TW91c2VFdmVudCA9IGV2ZW50Owot CiAgICAgSW50UG9pbnQgbW91c2VQb3NpdGlvbiA9IGV2ZW50LnBvc2l0aW9uKCk7CiAKLSAgICAv LyBGSVhNRTogRm9yd2FyZCBtb3VzZSBldmVudHMgdG8gdGhlIGFwcHJvcHJpYXRlIHNjcm9sbGJh ci4KLSAgICBpZiAoSW50UmVjdChtX3ZlcnRpY2FsU2Nyb2xsYmFyTGF5ZXIuZ2V0KCkuZnJhbWUp LmNvbnRhaW5zKG1vdXNlUG9zaXRpb24pCi0gICAgICAgIHx8IEludFJlY3QobV9ob3Jpem9udGFs U2Nyb2xsYmFyTGF5ZXIuZ2V0KCkuZnJhbWUpLmNvbnRhaW5zKG1vdXNlUG9zaXRpb24pCi0gICAg ICAgIHx8IEludFJlY3QobV9zY3JvbGxDb3JuZXJMYXllci5nZXQoKS5mcmFtZSkuY29udGFpbnMo bW91c2VQb3NpdGlvbikpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQogICAgIEludFBvaW50IHBv c2l0aW9uSW5QREZWaWV3KG1vdXNlUG9zaXRpb24pOwogICAgIHBvc2l0aW9uSW5QREZWaWV3ID0g bV9yb290Vmlld1RvUGx1Z2luVHJhbnNmb3JtLm1hcFBvaW50KHBvc2l0aW9uSW5QREZWaWV3KTsK ICAgICBwb3NpdGlvbkluUERGVmlldy5zZXRZKHNpemUoKS5oZWlnaHQoKSAtIHBvc2l0aW9uSW5Q REZWaWV3LnkoKSk7Ci0gICAgCisKICAgICBtX2xhc3RNb3VzZVBvaW50ID0gcG9zaXRpb25JblBE RlZpZXc7CiAKLSAgICBOU0V2ZW50VHlwZSBldmVudFR5cGUgPSBldmVudFR5cGVGcm9tV2ViRXZl bnQoZXZlbnQsIG1vdXNlQnV0dG9uSXNEb3duKTsKKyAgICBOU0V2ZW50VHlwZSBldmVudFR5cGUg PSBldmVudFR5cGVGcm9tV2ViRXZlbnQoZXZlbnQpOwogCiAgICAgaWYgKCFldmVudFR5cGUpCi0g ICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgcmV0dXJuIDA7CiAKICAgICBOU1VJbnRlZ2Vy IG1vZGlmaWVyRmxhZ3MgPSBtb2RpZmllckZsYWdzRnJvbVdlYkV2ZW50KGV2ZW50KTsKIAotICAg IE5TRXZlbnQgKmZha2VFdmVudCA9IFtOU0V2ZW50IG1vdXNlRXZlbnRXaXRoVHlwZTpldmVudFR5 cGUgbG9jYXRpb246cG9zaXRpb25JblBERlZpZXcgbW9kaWZpZXJGbGFnczptb2RpZmllckZsYWdz IHRpbWVzdGFtcDowIHdpbmRvd051bWJlcjowIGNvbnRleHQ6bmlsIGV2ZW50TnVtYmVyOjAgY2xp Y2tDb3VudDpldmVudC5jbGlja0NvdW50KCkgcHJlc3N1cmU6MF07CisgICAgcmV0dXJuIFtOU0V2 ZW50IG1vdXNlRXZlbnRXaXRoVHlwZTpldmVudFR5cGUgbG9jYXRpb246cG9zaXRpb25JblBERlZp ZXcgbW9kaWZpZXJGbGFnczptb2RpZmllckZsYWdzIHRpbWVzdGFtcDowIHdpbmRvd051bWJlcjow IGNvbnRleHQ6bmlsIGV2ZW50TnVtYmVyOjAgY2xpY2tDb3VudDpldmVudC5jbGlja0NvdW50KCkg cHJlc3N1cmU6MF07Cit9CisKK2Jvb2wgUERGUGx1Z2luOjpoYW5kbGVNb3VzZUV2ZW50KGNvbnN0 IFdlYk1vdXNlRXZlbnQmIGV2ZW50KQoreworICAgIG1fbGFzdE1vdXNlRXZlbnQgPSBldmVudDsK KworICAgIEludFBvaW50IG1vdXNlUG9zaXRpb24gPSBldmVudC5wb3NpdGlvbigpOworCisgICAg Ly8gRklYTUU6IEZvcndhcmQgbW91c2UgZXZlbnRzIHRvIHRoZSBhcHByb3ByaWF0ZSBzY3JvbGxi YXIuCisgICAgaWYgKEludFJlY3QobV92ZXJ0aWNhbFNjcm9sbGJhckxheWVyLmdldCgpLmZyYW1l KS5jb250YWlucyhtb3VzZVBvc2l0aW9uKQorICAgICAgICB8fCBJbnRSZWN0KG1faG9yaXpvbnRh bFNjcm9sbGJhckxheWVyLmdldCgpLmZyYW1lKS5jb250YWlucyhtb3VzZVBvc2l0aW9uKQorICAg ICAgICB8fCBJbnRSZWN0KG1fc2Nyb2xsQ29ybmVyTGF5ZXIuZ2V0KCkuZnJhbWUpLmNvbnRhaW5z KG1vdXNlUG9zaXRpb24pKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBOU0V2ZW50ICpu c0V2ZW50ID0gbnNFdmVudEZvcldlYk1vdXNlRXZlbnQoZXZlbnQpOwogCiAgICAgc3dpdGNoIChl dmVudC50eXBlKCkpIHsKICAgICBjYXNlIFdlYkV2ZW50OjpNb3VzZU1vdmU6Ci0gICAgICAgIGlm IChtb3VzZUJ1dHRvbklzRG93bikKLSAgICAgICAgICAgIFttX3BkZkxheWVyQ29udHJvbGxlci5n ZXQoKSBtb3VzZURyYWdnZWQ6ZmFrZUV2ZW50XTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAg W21fcGRmTGF5ZXJDb250cm9sbGVyLmdldCgpIG1vdXNlTW92ZWQ6ZmFrZUV2ZW50XTsKICAgICAg ICAgbW91c2VNb3ZlZEluQ29udGVudEFyZWEoKTsKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAg Y2FzZSBXZWJFdmVudDo6TW91c2VEb3duOiB7Ci0gICAgICAgIG1vdXNlQnV0dG9uSXNEb3duID0g dHJ1ZTsKLSAgICAgICAgW21fcGRmTGF5ZXJDb250cm9sbGVyLmdldCgpIG1vdXNlRG93bjpmYWtl RXZlbnRdOwotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9Ci0gICAgY2FzZSBXZWJFdmVudDo6 TW91c2VVcDogewotICAgICAgICBbbV9wZGZMYXllckNvbnRyb2xsZXIuZ2V0KCkgbW91c2VVcDpm YWtlRXZlbnRdOwotICAgICAgICBtb3VzZUJ1dHRvbklzRG93biA9IGZhbHNlOwotICAgICAgICBQ bGF0Zm9ybU1vdXNlRXZlbnQgcGxhdGZvcm1FdmVudCA9IHBsYXRmb3JtKGV2ZW50KTsKLSAgICAg ICAgcmV0dXJuIHRydWU7Ci0gICAgfQorCisgICAgICAgIHN3aXRjaCAoZXZlbnQuYnV0dG9uKCkp IHsKKyAgICAgICAgY2FzZSBXZWJNb3VzZUV2ZW50OjpMZWZ0QnV0dG9uOgorICAgICAgICAgICAg W21fcGRmTGF5ZXJDb250cm9sbGVyLmdldCgpIG1vdXNlRHJhZ2dlZDpuc0V2ZW50XTsKKyAgICAg ICAgICAgIHJldHVybiB0cnVlOworICAgICAgICBjYXNlIFdlYk1vdXNlRXZlbnQ6OlJpZ2h0QnV0 dG9uOgorICAgICAgICBjYXNlIFdlYk1vdXNlRXZlbnQ6Ok1pZGRsZUJ1dHRvbjoKKyAgICAgICAg ICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgY2FzZSBXZWJNb3VzZUV2ZW50OjpOb0J1dHRvbjoK KyAgICAgICAgICAgIFttX3BkZkxheWVyQ29udHJvbGxlci5nZXQoKSBtb3VzZU1vdmVkOm5zRXZl bnRdOworICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIH0KKyAgICBjYXNlIFdlYkV2 ZW50OjpNb3VzZURvd246CisgICAgICAgIHN3aXRjaCAoZXZlbnQuYnV0dG9uKCkpIHsKKyAgICAg ICAgY2FzZSBXZWJNb3VzZUV2ZW50OjpMZWZ0QnV0dG9uOgorICAgICAgICAgICAgW21fcGRmTGF5 ZXJDb250cm9sbGVyLmdldCgpIG1vdXNlRG93bjpuc0V2ZW50XTsKKyAgICAgICAgICAgIHJldHVy biB0cnVlOworICAgICAgICBjYXNlIFdlYk1vdXNlRXZlbnQ6OlJpZ2h0QnV0dG9uOgorICAgICAg ICAgICAgW21fcGRmTGF5ZXJDb250cm9sbGVyLmdldCgpIHJpZ2h0TW91c2VEb3duOm5zRXZlbnRd OworICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIGNhc2UgV2ViTW91c2VFdmVudDo6 TWlkZGxlQnV0dG9uOgorICAgICAgICBjYXNlIFdlYk1vdXNlRXZlbnQ6Ok5vQnV0dG9uOgorICAg ICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICB9CisgICAgY2FzZSBXZWJFdmVudDo6TW91 c2VVcDoKKyAgICAgICAgc3dpdGNoIChldmVudC5idXR0b24oKSkgeworICAgICAgICBjYXNlIFdl Yk1vdXNlRXZlbnQ6OkxlZnRCdXR0b246CisgICAgICAgICAgICBbbV9wZGZMYXllckNvbnRyb2xs ZXIuZ2V0KCkgbW91c2VVcDpuc0V2ZW50XTsKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAg ICAgICBjYXNlIFdlYk1vdXNlRXZlbnQ6OlJpZ2h0QnV0dG9uOgorICAgICAgICBjYXNlIFdlYk1v dXNlRXZlbnQ6Ok1pZGRsZUJ1dHRvbjoKKyAgICAgICAgY2FzZSBXZWJNb3VzZUV2ZW50OjpOb0J1 dHRvbjoKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfQogICAgIGRlZmF1bHQ6 CiAgICAgICAgIGJyZWFrOwogICAgIH0KLSAgICAgICAgCisKKyAgICByZXR1cm4gZmFsc2U7Cit9 CisgICAgCitib29sIFBERlBsdWdpbjo6aGFuZGxlQ29udGV4dE1lbnVFdmVudChjb25zdCBXZWJN b3VzZUV2ZW50JiBldmVudCkKK3sKKyAgICBOU01lbnUgKm5zTWVudSA9IFttX3BkZkxheWVyQ29u dHJvbGxlci5nZXQoKSBtZW51Rm9yRXZlbnQ6bnNFdmVudEZvcldlYk1vdXNlRXZlbnQoZXZlbnQp XTsKKworICAgIEZyYW1lVmlldyogZnJhbWVWaWV3ID0gd2ViRnJhbWUoKS0+Y29yZUZyYW1lKCkt PnZpZXcoKTsKKyAgICBJbnRQb2ludCBwb2ludCA9IGZyYW1lVmlldy0+Y29udGVudHNUb1NjcmVl bihJbnRSZWN0KGV2ZW50LnBvc2l0aW9uKCksIEludFNpemUoKSkpLmxvY2F0aW9uKCk7CisgICAg aWYgKG5zTWVudSkgeworICAgICAgICBXS1BvcHVwQ29udGV4dE1lbnUobnNNZW51LCBwb2ludCk7 CisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKyAgICAKICAgICByZXR1cm4gZmFsc2U7CiB9 CiAKIGJvb2wgUERGUGx1Z2luOjpoYW5kbGVLZXlib2FyZEV2ZW50KGNvbnN0IFdlYktleWJvYXJk RXZlbnQmIGV2ZW50KQogewotICAgIE5TRXZlbnRUeXBlIGV2ZW50VHlwZSA9IGV2ZW50VHlwZUZy b21XZWJFdmVudChldmVudCwgZmFsc2UpOworICAgIE5TRXZlbnRUeXBlIGV2ZW50VHlwZSA9IGV2 ZW50VHlwZUZyb21XZWJFdmVudChldmVudCk7CiAgICAgTlNVSW50ZWdlciBtb2RpZmllckZsYWdz ID0gbW9kaWZpZXJGbGFnc0Zyb21XZWJFdmVudChldmVudCk7CiAgICAgCiAgICAgTlNFdmVudCAq ZmFrZUV2ZW50ID0gW05TRXZlbnQga2V5RXZlbnRXaXRoVHlwZTpldmVudFR5cGUgbG9jYXRpb246 TlNaZXJvUG9pbnQgbW9kaWZpZXJGbGFnczptb2RpZmllckZsYWdzIHRpbWVzdGFtcDowIHdpbmRv d051bWJlcjowIGNvbnRleHQ6MCBjaGFyYWN0ZXJzOmV2ZW50LnRleHQoKSBjaGFyYWN0ZXJzSWdu b3JpbmdNb2RpZmllcnM6ZXZlbnQudW5tb2RpZmllZFRleHQoKSBpc0FSZXBlYXQ6ZXZlbnQuaXNB dXRvUmVwZWF0KCkga2V5Q29kZTpldmVudC5uYXRpdmVWaXJ0dWFsS2V5Q29kZSgpXTsKQEAgLTU3 MSw3ICs2MTMsNyBAQCBib29sIFBERlBsdWdpbjo6aXNFZGl0aW5nQ29tbWFuZEVuYWJsZWQoY29u c3QgU3RyaW5nJiBjb21tYW5kTmFtZSkKIAogdm9pZCBQREZQbHVnaW46OnNldFNjcm9sbE9mZnNl dChjb25zdCBJbnRQb2ludCYgb2Zmc2V0KQogewotICAgIFNpbXBsZVBERlBsdWdpbjo6c2V0U2Ny b2xsT2Zmc2V0KG9mZnNldCk7CisgICAgbV9zY3JvbGxPZmZzZXQgPSBJbnRTaXplKG9mZnNldC54 KCksIG9mZnNldC55KCkpOwogCiAgICAgW0NBVHJhbnNhY3Rpb24gYmVnaW5dOwogICAgIFttX3Bk ZkxheWVyQ29udHJvbGxlci5nZXQoKSBzZXRTY3JvbGxQb3NpdGlvbjpvZmZzZXRdOwpAQCAtNjMy LDYgKzY3NCwxNSBAQCBib29sIFBERlBsdWdpbjo6c3VwcG9ydHNGb3JtcygpCiAgICAgcmV0dXJu IHdlYkZyYW1lKCktPmlzTWFpbkZyYW1lKCk7CiB9CiAKK3ZvaWQgUERGUGx1Z2luOjpub3RpZnlD b250ZW50U2NhbGVGYWN0b3JDaGFuZ2VkKENHRmxvYXQgc2NhbGVGYWN0b3IpCit7CisgICAgaWYg KGhhbmRsZXNQYWdlU2NhbGVGYWN0b3IoKSkKKyAgICAgICAgcGx1Z2luVmlldygpLT5zZXRQYWdl U2NhbGVGYWN0b3Ioc2NhbGVGYWN0b3IsIEludFBvaW50KCkpOworCisgICAgY2FsY3VsYXRlU2l6 ZXMoKTsKKyAgICB1cGRhdGVTY3JvbGxiYXJzKCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktp dAogCiAjZW5kaWYgLy8gRU5BQkxFKFBERktJVF9QTFVHSU4pCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbkNob2ljZUFubm90YXRpb24u bW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbkNob2lj ZUFubm90YXRpb24ubW0KaW5kZXggZmU5OTY5NjcuLmMzNjdlZmYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2luQ2hvaWNlQW5ub3RhdGlv bi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdp bkNob2ljZUFubm90YXRpb24ubW0KQEAgLTU2LDcgKzU2LDcgQEAgdm9pZCBQREZQbHVnaW5DaG9p Y2VBbm5vdGF0aW9uOjp1cGRhdGVHZW9tZXRyeSgpCiAgICAgUERGUGx1Z2luQW5ub3RhdGlvbjo6 dXBkYXRlR2VvbWV0cnkoKTsKIAogICAgIFN0eWxlZEVsZW1lbnQqIHN0eWxlZEVsZW1lbnQgPSBz dGF0aWNfY2FzdDxTdHlsZWRFbGVtZW50Kj4oZWxlbWVudCgpKTsKLSAgICBzdHlsZWRFbGVtZW50 LT5zZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFNpemUsIGNob2ljZUFubm90 YXRpb24oKS5mb250LnBvaW50U2l6ZSAqIHBkZkxheWVyQ29udHJvbGxlcigpLnRpbGVTY2FsZUZh Y3RvciwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19QWCk7CisgICAgc3R5bGVkRWxlbWVudC0+c2V0 SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRTaXplLCBjaG9pY2VBbm5vdGF0aW9u KCkuZm9udC5wb2ludFNpemUgKiBwZGZMYXllckNvbnRyb2xsZXIoKS5jb250ZW50U2NhbGVGYWN0 b3IsIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfUFgpOwogfQogCiB2b2lkIFBERlBsdWdpbkNob2lj ZUFubm90YXRpb246OmNvbW1pdCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpblRleHRBbm5vdGF0aW9uLm1tIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW5UZXh0QW5ub3RhdGlvbi5tbQppbmRl eCBjOTRlYTE1Li5iNWRmMzczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1BsdWdpbnMvUERGL1BERlBsdWdpblRleHRBbm5vdGF0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2luVGV4dEFubm90YXRpb24ubW0KQEAg LTEwNyw3ICsxMDcsNyBAQCB2b2lkIFBERlBsdWdpblRleHRBbm5vdGF0aW9uOjp1cGRhdGVHZW9t ZXRyeSgpCiAgICAgUERGUGx1Z2luQW5ub3RhdGlvbjo6dXBkYXRlR2VvbWV0cnkoKTsKIAogICAg IFN0eWxlZEVsZW1lbnQqIHN0eWxlZEVsZW1lbnQgPSBzdGF0aWNfY2FzdDxTdHlsZWRFbGVtZW50 Kj4oZWxlbWVudCgpKTsKLSAgICBzdHlsZWRFbGVtZW50LT5zZXRJbmxpbmVTdHlsZVByb3BlcnR5 KENTU1Byb3BlcnR5Rm9udFNpemUsIHRleHRBbm5vdGF0aW9uKCkuZm9udC5wb2ludFNpemUgKiBw ZGZMYXllckNvbnRyb2xsZXIoKS50aWxlU2NhbGVGYWN0b3IsIENTU1ByaW1pdGl2ZVZhbHVlOjpD U1NfUFgpOworICAgIHN0eWxlZEVsZW1lbnQtPnNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJv cGVydHlGb250U2l6ZSwgdGV4dEFubm90YXRpb24oKS5mb250LnBvaW50U2l6ZSAqIHBkZkxheWVy Q29udHJvbGxlcigpLmNvbnRlbnRTY2FsZUZhY3RvciwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19Q WCk7CiB9CiAKIHZvaWQgUERGUGx1Z2luVGV4dEFubm90YXRpb246OmNvbW1pdCgpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1NpbXBsZVBERlBsdWdp bi5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9TaW1wbGVQREZQbHVn aW4uaAppbmRleCA3OThmMGI3Li5jNWM3YWEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1BsdWdpbnMvUERGL1NpbXBsZVBERlBsdWdpbi5oCisrKyBiL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvU2ltcGxlUERGUGx1Z2luLmgKQEAgLTE3MSw2ICsx NzEsOCBAQCBwcm90ZWN0ZWQ6CiAKICAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkQWxsb3dTY3JpcHRp bmcoKSBPVkVSUklERSB7IHJldHVybiBmYWxzZTsgfQogCisgICAgV2ViQ29yZTo6SW50U2l6ZSBt X3Njcm9sbE9mZnNldDsKKwogcHJpdmF0ZToKIAogICAgIEpTT2JqZWN0UmVmIG1ha2VKU1BERkRv YyhKU0NvbnRleHRSZWYpOwpAQCAtMTkxLDggKzE5Myw2IEBAIHByaXZhdGU6CiAgICAgUmVmUHRy PFdlYkNvcmU6OlNjcm9sbGJhcj4gbV92ZXJ0aWNhbFNjcm9sbGJhcjsKIAogICAgIFdlYkZyYW1l KiBtX2ZyYW1lOwotCi0gICAgV2ViQ29yZTo6SW50U2l6ZSBtX3Njcm9sbE9mZnNldDsKIH07CiAK IH0gLy8gbmFtZXNwYWNlIFdlYktpdAo=