132111 2014-04-24 00:19:11 -0700 Text caret disappears in Mail after returning from another application 2014-04-24 13:24:48 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rniwa rniwa ap commit-queue darin enrica mitz oldest_to_newest 1003568 0 rniwa 2014-04-24 00:19:11 -0700 Reproduction steps: 1. Run Mail. 2. Create a new blank message 3. Type something into the message 4. Click in Finder. 5. Select Finder>Hide Others (Mail disappears) 6. Click on Mail in the Dock (Mail reappears) Expected result: The text caret blinks Actual result: The text caret is never rendered :( <rdar://problem/12328567> 1003572 1 230059 rniwa 2014-04-24 00:47:54 -0700 Created attachment 230059 Fixes the bug 1003630 2 230059 darin 2014-04-24 07:57:04 -0700 Comment on attachment 230059 Fixes the bug View in context: https://bugs.webkit.org/attachment.cgi?id=230059&action=review I’m saying review+ but I am not sure about a few aspects of the patch. > Source/WebKit/mac/WebView/WebView.mm:5227 > + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowKeyStateChanged:) > + name:NSWindowDidBecomeKeyNotification object:nil]; > + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowKeyStateChanged:) > + name:NSWindowDidResignKeyNotification object:nil]; This says we want a notification any time *any* window in this app becomes or resigns key, since we pass an object of nil. Is that really what we want? I think we want to pass object:window here, but then we’ll have to retest to be sure this actually fixes the bug. > Source/WebKit/mac/WebView/WebView.mm:-5335 > -- (void)_windowChangedKeyState I’m not sure exactly why I overrode this internal AppKit method in 2007 rather than using the notifications. I am concerned that this might have significantly different behavior from the old code in ways that go beyond fixing this bug. I think that in 2007 this exactly matched how AppKit itself kept controls up to date, so maybe that’s why I did it that way. > Source/WebKit/mac/WebView/WebView.mm:5342 > +- (void)_windowKeyStateChanged:(NSNotification *)notification I know WebKit does this all over the place, but it’s dangerous to use an underscore prefix because this could easily conflict with a same-named method inside a future version of AppKit. Given that names without prefixes and names with an underscore prefix are both fair game for both AppKit and for apps who might subclass WebView, we should probably use some kind of crazy wk_ prefix on our internal methods. Sorry, not really specific to this patch, and really ugly so maybe others on the project won’t agree. 1003738 3 rniwa 2014-04-24 12:45:42 -0700 (In reply to comment #2) > (From update of attachment 230059 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=230059&action=review > > I’m saying review+ but I am not sure about a few aspects of the patch. > > > Source/WebKit/mac/WebView/WebView.mm:5227 > > + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowKeyStateChanged:) > > + name:NSWindowDidBecomeKeyNotification object:nil]; > > + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowKeyStateChanged:) > > + name:NSWindowDidResignKeyNotification object:nil]; > > This says we want a notification any time *any* window in this app becomes or resigns key, since we pass an object of nil. Is that really what we want? I think we want to pass object:window here, but then we’ll have to retest to be sure this actually fixes the bug. Oops, fixed that. > > Source/WebKit/mac/WebView/WebView.mm:-5335 > > -- (void)_windowChangedKeyState > > I’m not sure exactly why I overrode this internal AppKit method in 2007 rather than using the notifications. I am concerned that this might have significantly different behavior from the old code in ways that go beyond fixing this bug. > > I think that in 2007 this exactly matched how AppKit itself kept controls up to date, so maybe that’s why I did it that way. We can make a more conservative change to observe these two notification as well as overriding _windowChangedKeyState. But given WebKit2 only uses the notifications, I'd rather stick to the standardized API surface. We can always add the code back. > > Source/WebKit/mac/WebView/WebView.mm:5342 > > +- (void)_windowKeyStateChanged:(NSNotification *)notification > > I know WebKit does this all over the place, but it’s dangerous to use an underscore prefix because this could easily conflict with a same-named method inside a future version of AppKit. Given that names without prefixes and names with an underscore prefix are both fair game for both AppKit and for apps who might subclass WebView, we should probably use some kind of crazy wk_ prefix on our internal methods. Sorry, not really specific to this patch, and really ugly so maybe others on the project won’t agree. Removed the leading _. 1003739 4 230098 rniwa 2014-04-24 12:46:00 -0700 Created attachment 230098 Patch for landing 1003747 5 230098 commit-queue 2014-04-24 13:24:44 -0700 Comment on attachment 230098 Patch for landing Clearing flags on attachment: 230098 Committed r167770: <http://trac.webkit.org/changeset/167770> 1003748 6 commit-queue 2014-04-24 13:24:48 -0700 All reviewed patches have been landed. Closing bug. 230059 2014-04-24 00:47:54 -0700 2014-04-24 12:45:57 -0700 Fixes the bug bug-132111-20140424004732.patch text/plain 3584 rniwa SW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2Nzc1MikKKysrIFNvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE0LTA0LTI0 ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFRleHQgY2FyZXQg ZGlzYXBwZWFycyBpbiBNYWlsIGFmdGVyIHJldHVybmluZyBmcm9tIGFub3RoZXIgYXBwbGljYXRp b24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjEx MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBi dWcgd2FzIGNhdXNlZCBieSBvdXIgU1BJIF93aW5kb3dDaGFuZ2VkS2V5U3RhdGUgbm90IGdldHRp bmcgY2FsbGVkIHVwb24gZGVtaW5pYXR1cml6YXRpb24uCisKKyAgICAgICAgRml4ZWQgdGhlIGJ1 ZyBieSB1c2luZyB0aGUgc3RhbmRhcmQgTlNXaW5kb3dEaWRCZWNvbWVLZXlOb3RpZmljYXRpb24g YW5kIE5TV2luZG93RGlkUmVzaWduS2V5Tm90aWZpY2F0aW9uCisgICAgICAgIG5vdGlmaWNhdGlv bnMgYXMgZG9uZSBpbiBXZWJLaXQyIHNpbmNlIHRoZXkgRE8gZ2V0IGNhbGxlZCB1cG9uIGRlbWlu aWF0dXJpemF0aW9uLgorCisgICAgICAgICogV2ViVmlldy9XZWJWaWV3Lm1tOgorICAgICAgICAo LVtXZWJWaWV3IGFkZFdpbmRvd09ic2VydmVyc0ZvcldpbmRvdzpdKToKKyAgICAgICAgKC1bV2Vi VmlldyByZW1vdmVXaW5kb3dPYnNlcnZlcnNdKToKKyAgICAgICAgKC1bV2ViVmlldyBfd2luZG93 S2V5U3RhdGVDaGFuZ2VkOl0pOgorICAgICAgICAoLVtXZWJWaWV3IF93aW5kb3dDaGFuZ2VkS2V5 U3RhdGVdKTogRGVsZXRlZC4KKwogMjAxNC0wNC0yMyAgQW5kcmVhcyBLbGluZyAgPGFrbGluZ0Bh cHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIEFwcGxlIERpY3Rpb25hcnkgd29ya2Fyb3VuZCBp biBXZWJGcmFtZUxvYWRlckNsaWVudC4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcv V2ViVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZp ZXcubW0JKHJldmlzaW9uIDE2NzczOCkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2Vi Vmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAtMjkxLDcgKzI5MSw2IEBAIEBpbnRlcmZhY2UgTlNW aWV3IChXZWJOU1ZpZXdEZXRhaWxzKQogLSAoTlNWaWV3ICopX2hpdFRlc3Q6KE5TUG9pbnQgKilh UG9pbnQgZHJhZ1R5cGVzOihOU1NldCAqKXR5cGVzOwogLSAodm9pZClfYXV0b3Njcm9sbEZvckRy YWdnaW5nSW5mbzooaWQpZHJhZ0luZm8gdGltZURlbHRhOihOU1RpbWVJbnRlcnZhbClyZXBlYXRE ZWx0YTsKIC0gKEJPT0wpX3Nob3VsZEF1dG9zY3JvbGxGb3JEcmFnZ2luZ0luZm86KGlkKWRyYWdJ bmZvOwotLSAodm9pZClfd2luZG93Q2hhbmdlZEtleVN0YXRlOwogQGVuZAogCiBAaW50ZXJmYWNl IE5TV2luZG93IChXZWJOU1dpbmRvd0RldGFpbHMpCkBAIC01MjIyLDYgKzUyMjEsMTAgQEAgc3Rh dGljIE5TU3RyaW5nICogY29uc3QgYmFja2luZ1Byb3BlcnR5TwogLSAodm9pZClhZGRXaW5kb3dP YnNlcnZlcnNGb3JXaW5kb3c6KE5TV2luZG93ICopd2luZG93CiB7CiAgICAgaWYgKHdpbmRvdykg eworICAgICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIGFkZE9ic2Vy dmVyOnNlbGYgc2VsZWN0b3I6QHNlbGVjdG9yKF93aW5kb3dLZXlTdGF0ZUNoYW5nZWQ6KQorICAg ICAgICAgICAgbmFtZTpOU1dpbmRvd0RpZEJlY29tZUtleU5vdGlmaWNhdGlvbiBvYmplY3Q6bmls XTsKKyAgICAgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSBhZGRPYnNl cnZlcjpzZWxmIHNlbGVjdG9yOkBzZWxlY3Rvcihfd2luZG93S2V5U3RhdGVDaGFuZ2VkOikKKyAg ICAgICAgICAgIG5hbWU6TlNXaW5kb3dEaWRSZXNpZ25LZXlOb3RpZmljYXRpb24gb2JqZWN0Om5p bF07CiAgICAgICAgIFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gYWRkT2Jz ZXJ2ZXI6c2VsZiBzZWxlY3RvcjpAc2VsZWN0b3IoX3dpbmRvd1dpbGxPcmRlck9uU2NyZWVuOikK ICAgICAgICAgICAgIG5hbWU6V0tXaW5kb3dXaWxsT3JkZXJPblNjcmVlbk5vdGlmaWNhdGlvbigp IG9iamVjdDp3aW5kb3ddOwogICAgICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRD ZW50ZXJdIGFkZE9ic2VydmVyOnNlbGYgc2VsZWN0b3I6QHNlbGVjdG9yKF93aW5kb3dXaWxsT3Jk ZXJPZmZTY3JlZW46KQpAQCAtNTI0Niw2ICs1MjQ5LDEwIEBAIC0gKHZvaWQpcmVtb3ZlV2luZG93 T2JzZXJ2ZXJzCiAgICAgTlNXaW5kb3cgKndpbmRvdyA9IFtzZWxmIHdpbmRvd107CiAgICAgaWYg KHdpbmRvdykgewogICAgICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJd IHJlbW92ZU9ic2VydmVyOnNlbGYKKyAgICAgICAgICAgIG5hbWU6TlNXaW5kb3dEaWRCZWNvbWVL ZXlOb3RpZmljYXRpb24gb2JqZWN0Om5pbF07CisgICAgICAgIFtbTlNOb3RpZmljYXRpb25DZW50 ZXIgZGVmYXVsdENlbnRlcl0gcmVtb3ZlT2JzZXJ2ZXI6c2VsZgorICAgICAgICAgICAgbmFtZTpO U1dpbmRvd0RpZFJlc2lnbktleU5vdGlmaWNhdGlvbiBvYmplY3Q6bmlsXTsKKyAgICAgICAgW1tO U05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSByZW1vdmVPYnNlcnZlcjpzZWxmCiAg ICAgICAgICAgICBuYW1lOldLV2luZG93V2lsbE9yZGVyT25TY3JlZW5Ob3RpZmljYXRpb24oKSBv YmplY3Q6d2luZG93XTsKICAgICAgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2Vu dGVyXSByZW1vdmVPYnNlcnZlcjpzZWxmCiAgICAgICAgICAgICBuYW1lOldLV2luZG93V2lsbE9y ZGVyT2ZmU2NyZWVuTm90aWZpY2F0aW9uKCkgb2JqZWN0OndpbmRvd107CkBAIC01MzMyLDExICs1 MzM5LDkgQEAgLSAodm9pZClkb1dpbmRvd0RpZENoYW5nZVNjcmVlbgogICAgICAgICBfcHJpdmF0 ZS0+cGFnZS0+Y2hyb21lKCkud2luZG93U2NyZWVuRGlkQ2hhbmdlKChQbGF0Zm9ybURpc3BsYXlJ RClbW1tbW3NlbGYgd2luZG93XSBzY3JlZW5dIGRldmljZURlc2NyaXB0aW9uXSBvYmplY3RGb3JL ZXk6QCJOU1NjcmVlbk51bWJlciJdIGludFZhbHVlXSk7CiB9CiAKLS0gKHZvaWQpX3dpbmRvd0No YW5nZWRLZXlTdGF0ZQorLSAodm9pZClfd2luZG93S2V5U3RhdGVDaGFuZ2VkOihOU05vdGlmaWNh dGlvbiAqKW5vdGlmaWNhdGlvbgogewogICAgIFtzZWxmIF91cGRhdGVBY3RpdmVTdGF0ZV07Ci0K LSAgICBbc3VwZXIgX3dpbmRvd0NoYW5nZWRLZXlTdGF0ZV07CiB9CiAKIC0gKHZvaWQpX3dpbmRv d1dpbGxPcmRlck9uU2NyZWVuOihOU05vdGlmaWNhdGlvbiAqKW5vdGlmaWNhdGlvbgo= 230098 2014-04-24 12:46:00 -0700 2014-04-24 13:24:44 -0700 Patch for landing bug-132111-20140424124538.patch text/plain 3590 rniwa SW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2Nzc1MikKKysrIFNvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE0LTA0LTI0 ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFRleHQgY2FyZXQg ZGlzYXBwZWFycyBpbiBNYWlsIGFmdGVyIHJldHVybmluZyBmcm9tIGFub3RoZXIgYXBwbGljYXRp b24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjEx MQorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgIFRoZSBidWcg d2FzIGNhdXNlZCBieSBvdXIgU1BJIF93aW5kb3dDaGFuZ2VkS2V5U3RhdGUgbm90IGdldHRpbmcg Y2FsbGVkIHVwb24gZGVtaW5pYXR1cml6YXRpb24uCisKKyAgICAgICAgRml4ZWQgdGhlIGJ1ZyBi eSB1c2luZyB0aGUgc3RhbmRhcmQgTlNXaW5kb3dEaWRCZWNvbWVLZXlOb3RpZmljYXRpb24gYW5k IE5TV2luZG93RGlkUmVzaWduS2V5Tm90aWZpY2F0aW9uCisgICAgICAgIG5vdGlmaWNhdGlvbnMg YXMgZG9uZSBpbiBXZWJLaXQyIHNpbmNlIHRoZXkgRE8gZ2V0IGNhbGxlZCB1cG9uIGRlbWluaWF0 dXJpemF0aW9uLgorCisgICAgICAgICogV2ViVmlldy9XZWJWaWV3Lm1tOgorICAgICAgICAoLVtX ZWJWaWV3IGFkZFdpbmRvd09ic2VydmVyc0ZvcldpbmRvdzpdKToKKyAgICAgICAgKC1bV2ViVmll dyByZW1vdmVXaW5kb3dPYnNlcnZlcnNdKToKKyAgICAgICAgKC1bV2ViVmlldyBfd2luZG93S2V5 U3RhdGVDaGFuZ2VkOl0pOgorICAgICAgICAoLVtXZWJWaWV3IF93aW5kb3dDaGFuZ2VkS2V5U3Rh dGVdKTogRGVsZXRlZC4KKwogMjAxNC0wNC0yMyAgQW5kcmVhcyBLbGluZyAgPGFrbGluZ0BhcHBs ZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIEFwcGxlIERpY3Rpb25hcnkgd29ya2Fyb3VuZCBpbiBX ZWJGcmFtZUxvYWRlckNsaWVudC4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2Vi Vmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcu bW0JKHJldmlzaW9uIDE2NzczOCkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmll dy5tbQkod29ya2luZyBjb3B5KQpAQCAtMjkxLDcgKzI5MSw2IEBAIEBpbnRlcmZhY2UgTlNWaWV3 IChXZWJOU1ZpZXdEZXRhaWxzKQogLSAoTlNWaWV3ICopX2hpdFRlc3Q6KE5TUG9pbnQgKilhUG9p bnQgZHJhZ1R5cGVzOihOU1NldCAqKXR5cGVzOwogLSAodm9pZClfYXV0b3Njcm9sbEZvckRyYWdn aW5nSW5mbzooaWQpZHJhZ0luZm8gdGltZURlbHRhOihOU1RpbWVJbnRlcnZhbClyZXBlYXREZWx0 YTsKIC0gKEJPT0wpX3Nob3VsZEF1dG9zY3JvbGxGb3JEcmFnZ2luZ0luZm86KGlkKWRyYWdJbmZv OwotLSAodm9pZClfd2luZG93Q2hhbmdlZEtleVN0YXRlOwogQGVuZAogCiBAaW50ZXJmYWNlIE5T V2luZG93IChXZWJOU1dpbmRvd0RldGFpbHMpCkBAIC01MjIyLDYgKzUyMjEsMTAgQEAgc3RhdGlj IE5TU3RyaW5nICogY29uc3QgYmFja2luZ1Byb3BlcnR5TwogLSAodm9pZClhZGRXaW5kb3dPYnNl cnZlcnNGb3JXaW5kb3c6KE5TV2luZG93ICopd2luZG93CiB7CiAgICAgaWYgKHdpbmRvdykgewor ICAgICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIGFkZE9ic2VydmVy OnNlbGYgc2VsZWN0b3I6QHNlbGVjdG9yKHdpbmRvd0tleVN0YXRlQ2hhbmdlZDopCisgICAgICAg ICAgICBuYW1lOk5TV2luZG93RGlkQmVjb21lS2V5Tm90aWZpY2F0aW9uIG9iamVjdDp3aW5kb3dd OworICAgICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIGFkZE9ic2Vy dmVyOnNlbGYgc2VsZWN0b3I6QHNlbGVjdG9yKHdpbmRvd0tleVN0YXRlQ2hhbmdlZDopCisgICAg ICAgICAgICBuYW1lOk5TV2luZG93RGlkUmVzaWduS2V5Tm90aWZpY2F0aW9uIG9iamVjdDp3aW5k b3ddOwogICAgICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIGFkZE9i c2VydmVyOnNlbGYgc2VsZWN0b3I6QHNlbGVjdG9yKF93aW5kb3dXaWxsT3JkZXJPblNjcmVlbjop CiAgICAgICAgICAgICBuYW1lOldLV2luZG93V2lsbE9yZGVyT25TY3JlZW5Ob3RpZmljYXRpb24o KSBvYmplY3Q6d2luZG93XTsKICAgICAgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0 Q2VudGVyXSBhZGRPYnNlcnZlcjpzZWxmIHNlbGVjdG9yOkBzZWxlY3Rvcihfd2luZG93V2lsbE9y ZGVyT2ZmU2NyZWVuOikKQEAgLTUyNDYsNiArNTI0OSwxMCBAQCAtICh2b2lkKXJlbW92ZVdpbmRv d09ic2VydmVycwogICAgIE5TV2luZG93ICp3aW5kb3cgPSBbc2VsZiB3aW5kb3ddOwogICAgIGlm ICh3aW5kb3cpIHsKICAgICAgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVy XSByZW1vdmVPYnNlcnZlcjpzZWxmCisgICAgICAgICAgICBuYW1lOk5TV2luZG93RGlkQmVjb21l S2V5Tm90aWZpY2F0aW9uIG9iamVjdDp3aW5kb3ddOworICAgICAgICBbW05TTm90aWZpY2F0aW9u Q2VudGVyIGRlZmF1bHRDZW50ZXJdIHJlbW92ZU9ic2VydmVyOnNlbGYKKyAgICAgICAgICAgIG5h bWU6TlNXaW5kb3dEaWRSZXNpZ25LZXlOb3RpZmljYXRpb24gb2JqZWN0OndpbmRvd107CisgICAg ICAgIFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gcmVtb3ZlT2JzZXJ2ZXI6 c2VsZgogICAgICAgICAgICAgbmFtZTpXS1dpbmRvd1dpbGxPcmRlck9uU2NyZWVuTm90aWZpY2F0 aW9uKCkgb2JqZWN0OndpbmRvd107CiAgICAgICAgIFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVm YXVsdENlbnRlcl0gcmVtb3ZlT2JzZXJ2ZXI6c2VsZgogICAgICAgICAgICAgbmFtZTpXS1dpbmRv d1dpbGxPcmRlck9mZlNjcmVlbk5vdGlmaWNhdGlvbigpIG9iamVjdDp3aW5kb3ddOwpAQCAtNTMz MiwxMSArNTMzOSw5IEBAIC0gKHZvaWQpZG9XaW5kb3dEaWRDaGFuZ2VTY3JlZW4KICAgICAgICAg X3ByaXZhdGUtPnBhZ2UtPmNocm9tZSgpLndpbmRvd1NjcmVlbkRpZENoYW5nZSgoUGxhdGZvcm1E aXNwbGF5SUQpW1tbW1tzZWxmIHdpbmRvd10gc2NyZWVuXSBkZXZpY2VEZXNjcmlwdGlvbl0gb2Jq ZWN0Rm9yS2V5OkAiTlNTY3JlZW5OdW1iZXIiXSBpbnRWYWx1ZV0pOwogfQogCi0tICh2b2lkKV93 aW5kb3dDaGFuZ2VkS2V5U3RhdGUKKy0gKHZvaWQpd2luZG93S2V5U3RhdGVDaGFuZ2VkOihOU05v dGlmaWNhdGlvbiAqKW5vdGlmaWNhdGlvbgogewogICAgIFtzZWxmIF91cGRhdGVBY3RpdmVTdGF0 ZV07Ci0KLSAgICBbc3VwZXIgX3dpbmRvd0NoYW5nZWRLZXlTdGF0ZV07CiB9CiAKIC0gKHZvaWQp X3dpbmRvd1dpbGxPcmRlck9uU2NyZWVuOihOU05vdGlmaWNhdGlvbiAqKW5vdGlmaWNhdGlvbgo=