141216 2015-02-03 15:46:58 -0800 [iOS] Add support for deleteFromInputWithFlags 2016-06-02 15:52:23 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=158323 InRadar P2 Normal --- 1 enrica enrica ddkilzer oldest_to_newest 1066616 0 enrica 2015-02-03 15:46:58 -0800 UIKit is adopting a new way to handle delete from input. This bug track the work required in WebKit to adopt the new method. 1066621 1 245981 enrica 2015-02-03 15:51:41 -0800 Created attachment 245981 Patch 1066631 2 245981 benjamin 2015-02-03 16:11:21 -0800 Comment on attachment 245981 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=245981&action=review rs=me > Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm:2420 > + // FIXME: remove deleteFromInput once UIKit adopts deleteFromInputWithFlags > + if ([[UIKeyboardImpl sharedInstance] respondsToSelector:@selector(deleteFromInputWithFlags:)]) > + [[UIKeyboardImpl sharedInstance] deleteFromInputWithFlags:event.keyboardFlags]; > + else > + [[UIKeyboardImpl sharedInstance] deleteFromInput]; Let's store the object from [UIKeyboardImpl sharedInstance] in a temp variable. Is the new call gonna link? > Source/WebKit/ios/WebView/WebUIKitDelegate.h:81 > +// FIXME: to be removed when UIKit implements the new one below. Maybe say "deleteFromInput" is to be removed? Comments tends to move in WebKit :) > Source/WebKit/mac/WebView/WebHTMLView.mm:5827 > + if ([[self _webView] respondsToSelector:@selector(deleteFromInputWithFlags:)]) [self _webView] in a temp? 1066632 3 enrica 2015-02-03 16:13:28 -0800 > Is the new call gonna link? > Yes, I added it at the top of the file for staging. 1198721 4 ddkilzer 2016-06-02 15:51:43 -0700 This landed long ago in r179580: <http://trac.webkit.org/r179580> 1198722 5 ddkilzer 2016-06-02 15:52:23 -0700 <rdar://problem/19130081> 245981 2015-02-03 15:51:41 -0800 2015-02-03 16:11:21 -0800 Patch deleteFromInputWithFlags.txt text/plain 8740 enrica SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3OTU3NCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE1LTAyLTAzICBFbnJpY2Eg Q2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gQWRkIHN1cHBvcnQg Zm9yIGRlbGV0ZUZyb21JbnB1dFdpdGhGbGFncy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MTIxNgorICAgICAgICByZGFyOi8vcHJvYmxlbS8xOTEz MDA4MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFk b3B0cyB0aGUgbmV3IG1ldGhvZCBhcyBzb29uIGFzIGl0IGlzIGF2YWlsYWJsZS4KKyAgICAgICAg VGhlIHBhdGNoIGFsc28gcmVtb3ZlcyBzb21lIG9ic29sZXRlIGNvZGUgdXNlZCBmb3Igc3RhZ2lu Zy4KKworICAgICAgICAqIFBsYXRmb3JtL3NwaS9pb3MvVUlLaXRTUEkuaDoKKyAgICAgICAgKiBV SVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tD b250ZW50VmlldyBfaW50ZXJwcmV0S2V5RXZlbnQ6aXNDaGFyRXZlbnQ6XSk6CisKIDIwMTUtMDIt MDMgIEplcmVteSBKb25lcyAgPGplcmVteWpAYXBwbGUuY29tPgogCiAgICAgICAgIFByZXZlbnQg ZmxpY2tlciB3aGVuIGV4aXRpbmcgZnVsbHNjcmVlbiBieSBzeW5jaHJvbml6aW5nIHRyYW5zYWN0 aW9ucy4KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL3NwaS9pb3MvVUlLaXRTUEkuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmgJ KHJldmlzaW9uIDE3OTU2MikKKysrIFNvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL3NwaS9pb3MvVUlL aXRTUEkuaAkod29ya2luZyBjb3B5KQpAQCAtMTU0LDYgKzE1NCw3IEBAIHR5cGVkZWYgZW51bSB7 CiAtICh2b2lkKWFkZElucHV0U3RyaW5nOihOU1N0cmluZyAqKXN0cmluZyB3aXRoRmxhZ3M6KE5T VUludGVnZXIpZmxhZ3M7CiAtIChCT09MKWF1dG9jb3JyZWN0U3BlbGxpbmdFbmFibGVkOwogLSAo dm9pZClkZWxldGVGcm9tSW5wdXQ7CistICh2b2lkKWRlbGV0ZUZyb21JbnB1dFdpdGhGbGFnczoo TlNVSW50ZWdlcilmbGFnczsKIC0gKHZvaWQpcmVwbGFjZVRleHQ6KGlkKXJlcGxhY2VtZW50Owog QHByb3BlcnR5IChub25hdG9taWMsIHJlYWR3cml0ZSwgcmV0YWluKSBVSVJlc3BvbmRlciA8VUlL ZXlJbnB1dD4gKmRlbGVnYXRlOwogQGVuZApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0JKHJldmlzaW9u IDE3OTU2MikKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0lu dGVyYWN0aW9uLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xMzUsNiArMTM1LDcgQEAgLSAodm9pZClz aG93VGV4dFNlcnZpY2VGb3I6KE5TU3RyaW5nICopcwogCiBAaW50ZXJmYWNlIFVJS2V5Ym9hcmRJ bXBsIChTdGFnaW5nVG9SZW1vdmUpCiAtICh2b2lkKWRpZEhhbmRsZVdlYktleUV2ZW50OworLSAo dm9pZClkZWxldGVGcm9tSW5wdXRXaXRoRmxhZ3M6KE5TVUludGVnZXIpZmxhZ3M7CiBAZW5kCiAK IEBpbnRlcmZhY2UgVUlWaWV3IChVSVZpZXdJbnRlcm5hbEhhY2spCkBAIC0yNDEyLDcgKzI0MTMs MTEgQEAgLSAoQk9PTClfaW50ZXJwcmV0S2V5RXZlbnQ6KFdlYklPU0V2ZW50IAogICAgICAgICBz d2l0Y2ggKFtjaGFyYWN0ZXJzIGNoYXJhY3RlckF0SW5kZXg6MF0pIHsKICAgICAgICAgY2FzZSBr V2ViQmFja3NwYWNlS2V5OgogICAgICAgICBjYXNlIGtXZWJEZWxldGVLZXk6Ci0gICAgICAgICAg ICBbW1VJS2V5Ym9hcmRJbXBsIHNoYXJlZEluc3RhbmNlXSBkZWxldGVGcm9tSW5wdXRdOworICAg ICAgICAgICAgLy8gRklYTUU6IHJlbW92ZSBkZWxldGVGcm9tSW5wdXQgb25jZSBVSUtpdCBhZG9w dHMgZGVsZXRlRnJvbUlucHV0V2l0aEZsYWdzCisgICAgICAgICAgICBpZiAoW1tVSUtleWJvYXJk SW1wbCBzaGFyZWRJbnN0YW5jZV0gcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihkZWxldGVG cm9tSW5wdXRXaXRoRmxhZ3M6KV0pCisgICAgICAgICAgICAgICAgW1tVSUtleWJvYXJkSW1wbCBz aGFyZWRJbnN0YW5jZV0gZGVsZXRlRnJvbUlucHV0V2l0aEZsYWdzOmV2ZW50LmtleWJvYXJkRmxh Z3NdOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIFtbVUlLZXlib2FyZEltcGwg c2hhcmVkSW5zdGFuY2VdIGRlbGV0ZUZyb21JbnB1dF07CiAgICAgICAgICAgICByZXR1cm4gWUVT OwogCiAgICAgICAgIGNhc2Uga1dlYkVudGVyS2V5OgpJbmRleDogU291cmNlL1dlYktpdC9pb3Mv Q2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvaW9zL0NoYW5nZUxvZwkocmV2 aXNpb24gMTc5NTc0KQorKysgU291cmNlL1dlYktpdC9pb3MvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTUtMDItMDMgIEVucmljYSBDYXN1Y2NpICA8ZW5yaWNh QGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBBZGQgc3VwcG9ydCBmb3IgZGVsZXRlRnJvbUlu cHV0V2l0aEZsYWdzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTQxMjE2CisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzE5MTMwMDgxCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRvcHRzIHRoZSBuZXcgbWV0 aG9kIGFzIHNvb24gYXMgaXQgaXMgYXZhaWxhYmxlLgorICAgICAgICBUaGUgcGF0Y2ggYWxzbyBy ZW1vdmVzIHNvbWUgb2Jzb2xldGUgY29kZSB1c2VkIGZvciBzdGFnaW5nLgorCisgICAgICAgICog RGVmYXVsdERlbGVnYXRlcy9XZWJEZWZhdWx0VUlLaXREZWxlZ2F0ZS5tOgorICAgICAgICAoLVtX ZWJEZWZhdWx0VUlLaXREZWxlZ2F0ZSBhZGRJbnB1dFN0cmluZzp3aXRoRmxhZ3M6XSk6CisgICAg ICAgICgtW1dlYkRlZmF1bHRVSUtpdERlbGVnYXRlIGRlbGV0ZUZyb21JbnB1dF0pOgorICAgICAg ICAoLVtXZWJEZWZhdWx0VUlLaXREZWxlZ2F0ZSBkZWxldGVGcm9tSW5wdXR3aXRoRmxhZ3M6XSk6 CisgICAgICAgICgtW1dlYkRlZmF1bHRVSUtpdERlbGVnYXRlIGFkZElucHV0U3RyaW5nOmZyb21W YXJpYW50S2V5Ol0pOiBEZWxldGVkLgorICAgICAgICAqIFdlYlZpZXcvV2ViVUlLaXREZWxlZ2F0 ZS5oOgorCiAyMDE1LTAxLTIyICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KIAog ICAgICAgICBSZW1vdmUgdW51c2VkIGNsYXNzIEVtb2ppRmFsbGJhY2tGb250U2VsZWN0b3IuCklu ZGV4OiBTb3VyY2UvV2ViS2l0L2lvcy9EZWZhdWx0RGVsZWdhdGVzL1dlYkRlZmF1bHRVSUtpdERl bGVnYXRlLm0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9pb3MvRGVmYXVsdERlbGVnYXRl cy9XZWJEZWZhdWx0VUlLaXREZWxlZ2F0ZS5tCShyZXZpc2lvbiAxNzk1NjIpCisrKyBTb3VyY2Uv V2ViS2l0L2lvcy9EZWZhdWx0RGVsZWdhdGVzL1dlYkRlZmF1bHRVSUtpdERlbGVnYXRlLm0JKHdv cmtpbmcgY29weSkKQEAgLTE2MSwxNiArMTYxLDE2IEBAIC0gKHZvaWQpd2ViVmlldzooV2ViVmll dyAqKWFXZWJWaWV3IGRpZFIKIHsKIH0KIAotLy8gRklYTUU6IHRvIGJlIHJlbW92ZWQgd2hlbiBV SUtpdCBpbXBsZW1lbnRzIHRoZSBuZXcgb25lIGJlbG93LgotLSAodm9pZClhZGRJbnB1dFN0cmlu ZzooTlNTdHJpbmcgKilzdHIgZnJvbVZhcmlhbnRLZXk6KEJPT0wpaXNQb3B1cFZhcmlhbnQKKy0g KHZvaWQpYWRkSW5wdXRTdHJpbmc6KE5TU3RyaW5nICopc3RyIHdpdGhGbGFnczooTlNVSW50ZWdl cilmbGFncwogewogfQogCi0tICh2b2lkKWFkZElucHV0U3RyaW5nOihOU1N0cmluZyAqKXN0ciB3 aXRoRmxhZ3M6KE5TVUludGVnZXIpZmxhZ3MKKy8vIEZJWE1FOiB0byBiZSByZW1vdmVkIHdoZW4g VUlLaXQgaW1wbGVtZW50cyB0aGUgbmV3IG9uZSBiZWxvdy4KKy0gKHZvaWQpZGVsZXRlRnJvbUlu cHV0CiB7CiB9CiAKLS0gKHZvaWQpZGVsZXRlRnJvbUlucHV0CistICh2b2lkKWRlbGV0ZUZyb21J bnB1dHdpdGhGbGFnczooTlNVSW50ZWdlcilmbGFncwogewogfQogCkluZGV4OiBTb3VyY2UvV2Vi S2l0L2lvcy9XZWJWaWV3L1dlYlVJS2l0RGVsZWdhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L2lvcy9XZWJWaWV3L1dlYlVJS2l0RGVsZWdhdGUuaAkocmV2aXNpb24gMTc5NTYyKQor KysgU291cmNlL1dlYktpdC9pb3MvV2ViVmlldy9XZWJVSUtpdERlbGVnYXRlLmgJKHdvcmtpbmcg Y29weSkKQEAgLTc3LDEwICs3NywxMCBAQAogLSAodm9pZCl3ZWJWaWV3OihXZWJWaWV3ICopd2Vi VmlldyB3aWxsU2hvd0Z1bGxTY3JlZW5Gb3JQbHVnSW5WaWV3OihpZClwbHVnSW5WaWV3OwogLSAo dm9pZCl3ZWJWaWV3OihXZWJWaWV3ICopd2ViVmlldyBkaWRIaWRlRnVsbFNjcmVlbkZvclBsdWdJ blZpZXc6KGlkKXBsdWdJblZpZXc7CiAtICh2b2lkKXdlYlZpZXc6KFdlYlZpZXcgKilhV2ViVmll dyBkaWRSZWNlaXZlTWVzc2FnZTooTlNEaWN0aW9uYXJ5ICopYU1lc3NhZ2U7Ci0vLyBGSVhNRTog dG8gYmUgcmVtb3ZlZCB3aGVuIFVJS2l0IGltcGxlbWVudHMgdGhlIG5ldyBvbmUuCi0tICh2b2lk KWFkZElucHV0U3RyaW5nOihOU1N0cmluZyAqKXN0ciBmcm9tVmFyaWFudEtleTooQk9PTClpc1Bv cHVwVmFyaWFudDsKIC0gKHZvaWQpYWRkSW5wdXRTdHJpbmc6KE5TU3RyaW5nICopc3RyIHdpdGhG bGFnczooTlNVSW50ZWdlcilmbGFnczsKKy8vIEZJWE1FOiB0byBiZSByZW1vdmVkIHdoZW4gVUlL aXQgaW1wbGVtZW50cyB0aGUgbmV3IG9uZSBiZWxvdy4KIC0gKHZvaWQpZGVsZXRlRnJvbUlucHV0 OworLSAodm9pZClkZWxldGVGcm9tSW5wdXRXaXRoRmxhZ3M6KE5TVUludGVnZXIpZmxhZ3M7CiAK IC8vIEFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nCiAtICh2b2lkKV93ZWJ0aHJlYWRfd2ViVmlldzoo V2ViVmlldyopd2ViVmlldyBhdHRhY2hSb290TGF5ZXI6KGlkKXJvb3RMYXllcjsKSW5kZXg6IFNv dXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3OTU3NCkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE1LTAyLTAzICBFbnJpY2Eg Q2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gQWRkIHN1cHBvcnQg Zm9yIGRlbGV0ZUZyb21JbnB1dFdpdGhGbGFncy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MTIxNgorICAgICAgICByZGFyOi8vcHJvYmxlbS8xOTEz MDA4MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFk b3B0cyB0aGUgbmV3IG1ldGhvZCBhcyBzb29uIGFzIGl0IGlzIGF2YWlsYWJsZS4KKyAgICAgICAg VGhlIHBhdGNoIGFsc28gcmVtb3ZlcyBzb21lIG9ic29sZXRlIGNvZGUgdXNlZCBmb3Igc3RhZ2lu Zy4KKworICAgICAgICAqIFdlYlZpZXcvV2ViSFRNTFZpZXcubW06CisgICAgICAgICgtW1dlYkhU TUxWaWV3IF9oYW5kbGVFZGl0aW5nS2V5RXZlbnQ6XSk6CisKIDIwMTUtMDItMDIgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBBY2Nlc3MgTWVtb3J5Q2FjaGUgc2lu Z2xldG9uIHVzaW5nIE1lbW9yeUNhY2hlOjpzaW5nbGV0b24oKQpJbmRleDogU291cmNlL1dlYktp dC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tCShyZXZpc2lvbiAxNzk1NjIpCisrKyBTb3VyY2Uv V2ViS2l0L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC01ODIz LDE0ICs1ODIzLDE2IEBAIC0gKEJPT0wpX2hhbmRsZUVkaXRpbmdLZXlFdmVudDooS2V5Ym9hcmQK ICAgICAgICAgICAgICAgICBzd2l0Y2ggKFtzIGNoYXJhY3RlckF0SW5kZXg6MF0pIHsKICAgICAg ICAgICAgICAgICAgICAgY2FzZSBrV2ViQmFja3NwYWNlS2V5OgogICAgICAgICAgICAgICAgICAg ICBjYXNlIGtXZWJEZWxldGVLZXk6Ci0gICAgICAgICAgICAgICAgICAgICAgICBbW1tzZWxmIF93 ZWJWaWV3XSBfVUlLaXREZWxlZ2F0ZUZvcndhcmRlcl0gZGVsZXRlRnJvbUlucHV0XTsKKyAgICAg ICAgICAgICAgICAgICAgICAgIC8vIEZJWE1FOiByZW1vdmUgdGhlIGZpcnN0IGNhbGwgd2hlbiBV SUtpdCBpbXBsZW1lbnRzIHRoZSBuZXcgbWV0aG9kLgorICAgICAgICAgICAgICAgICAgICAgICAg aWYgKFtbc2VsZiBfd2ViVmlld10gcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihkZWxldGVG cm9tSW5wdXRXaXRoRmxhZ3M6KV0pCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgW1tbc2Vs ZiBfd2ViVmlld10gX1VJS2l0RGVsZWdhdGVGb3J3YXJkZXJdIGRlbGV0ZUZyb21JbnB1dFdpdGhG bGFnczpldmVudC5rZXlib2FyZEZsYWdzXTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGVsc2UK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICBbW1tzZWxmIF93ZWJWaWV3XSBfVUlLaXREZWxl Z2F0ZUZvcndhcmRlcl0gZGVsZXRlRnJvbUlucHV0XTsKICAgICAgICAgICAgICAgICAgICAgICAg IHJldHVybiBZRVM7CiAgICAgICAgICAgICAgICAgICAgIGNhc2Uga1dlYkVudGVyS2V5OiAgICAg ICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICBjYXNlIGtXZWJSZXR1cm5L ZXk6CiAgICAgICAgICAgICAgICAgICAgICAgICBpZiAocGxhdGZvcm1FdmVudC0+dHlwZSgpID09 IFBsYXRmb3JtS2V5Ym9hcmRFdmVudDo6Q2hhcikgewogICAgICAgICAgICAgICAgICAgICAgICAg ICAgIC8vIE1hcCBcciBmcm9tIEhXIGtleWJvYXJkIHRvIFxuIHRvIG1hdGNoIHRoZSBiZWhhdmlv ciBvZiB0aGUgc29mdCBrZXlib2FyZC4KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBG SVhNRTogcmVtb3ZlIHRoZSBmaXJzdCBjYWxsIHdoZW4gVUlLaXQgaW1wbGVtZW50cyB0aGUgbmV3 IG1ldGhvZC4KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBbW1tzZWxmIF93ZWJWaWV3XSBf VUlLaXREZWxlZ2F0ZUZvcndhcmRlcl0gYWRkSW5wdXRTdHJpbmc6QCJcbiIgZnJvbVZhcmlhbnRL ZXk6Tk9dOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIFtbW3NlbGYgX3dlYlZpZXddIF9V SUtpdERlbGVnYXRlRm9yd2FyZGVyXSBhZGRJbnB1dFN0cmluZzpAIlxuIiB3aXRoRmxhZ3M6MF07 CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIFlFUzsKICAgICAgICAgICAgICAg ICAgICAgICAgIH0KQEAgLTU4NDAsOSArNTg0Miw2IEBAIC0gKEJPT0wpX2hhbmRsZUVkaXRpbmdL ZXlFdmVudDooS2V5Ym9hcmQKICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiBZRVM7CiAg ICAgICAgICAgICAgICAgICAgIGRlZmF1bHQ6IHsgICAgICAgICAgICAgICAgICAgIAogICAgICAg ICAgICAgICAgICAgICAgICAgaWYgKHBsYXRmb3JtRXZlbnQtPnR5cGUoKSA9PSBQbGF0Zm9ybUtl eWJvYXJkRXZlbnQ6OkNoYXIpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAvL05TU3Ry aW5nICpzdHJpbmcgPSBldmVudC5jaGFyYWN0ZXJzOwotICAgICAgICAgICAgICAgICAgICAgICAg ICAgIC8vIEZJWE1FOiByZW1vdmUgdGhlIGZpcnN0IGNhbGwgd2hlbiBVSUtpdCBpbXBsZW1lbnRz IHRoZSBuZXcgbWV0aG9kLgotICAgICAgICAgICAgICAgICAgICAgICAgICAgIFtbW3NlbGYgX3dl YlZpZXddIF9VSUtpdERlbGVnYXRlRm9yd2FyZGVyXSBhZGRJbnB1dFN0cmluZzpldmVudC5jaGFy YWN0ZXJzIGZyb21WYXJpYW50S2V5OmV2ZW50LnBvcHVwVmFyaWFudF07CiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgW1tbc2VsZiBfd2ViVmlld10gX1VJS2l0RGVsZWdhdGVGb3J3YXJkZXJd IGFkZElucHV0U3RyaW5nOmV2ZW50LmNoYXJhY3RlcnMgd2l0aEZsYWdzOmV2ZW50LmtleWJvYXJk RmxhZ3NdOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiBZRVM7CiAgICAgICAg ICAgICAgICAgICAgICAgICB9Cg==