168368 2017-02-15 07:31:37 -0800 Remove WebIOSEvent interface 2017-02-15 10:15:05 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 aakash_jain aakash_jain aakash_jain achristensen ap commit-queue enrica mitz simon.fraser thorton oldest_to_newest 1277182 0 aakash_jain 2017-02-15 07:31:37 -0800 WebIOSEvent interface in WebCore/platform/ios/WebEvent.h is just a wrapper on top of WebEvent. This interface doesn't declare anything new and doesn't even have an implementation. We should use WebEvent directly. 1277183 1 301618 aakash_jain 2017-02-15 07:45:15 -0800 Created attachment 301618 Proposed patch 1277184 2 commit-queue 2017-02-15 07:46:26 -0800 Attachment 301618 did not pass style-queue: ERROR: Source/WebKit2/Shared/ios/WebIOSEventFactory.h:36: The parameter name "event" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 1 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 1277214 3 301618 achristensen 2017-02-15 09:10:53 -0800 Comment on attachment 301618 Proposed patch What's with all the ::? I thought ObjC classes don't have namespaces. Is there something else named WebEvent? 1277223 4 ap 2017-02-15 09:33:52 -0800 The immediate problem with WebIOSEvent is that it has no implementation, and thus breaks InstallAPI. That could be addressed by adding an implementation. But both Aakash and I think that subclassing shouldn't be used just to disambiguate names. Thoughts? 1277225 5 ap 2017-02-15 09:36:43 -0800 And yes, this is to disambiguate with WebEvent class in WebKit2. The modified files are all Objective-C++. 1277249 6 301618 commit-queue 2017-02-15 10:14:59 -0800 Comment on attachment 301618 Proposed patch Clearing flags on attachment: 301618 Committed r212376: <http://trac.webkit.org/changeset/212376> 1277250 7 commit-queue 2017-02-15 10:15:05 -0800 All reviewed patches have been landed. Closing bug. 301618 2017-02-15 07:45:15 -0800 2017-02-15 10:14:59 -0800 Proposed patch patch_WebIOSEvent text/plain 10276 aakash_jain SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxMjM2MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDE3LTAyLTE1ICBBYWthc2gg SmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgV2ViSU9TRXZl bnQgaW50ZXJmYWNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNjgzNjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIHBsYXRmb3JtL2lvcy9XZWJFdmVudC5oOiBSZW1vdmVkIFdlYklPU0V2ZW50LgorCiAy MDE3LTAyLTE1ICBYYWJpZXIgUm9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxpYS5jb20+ CiAKICAgICAgICAgW0dTdHJlYW1lcl1bTVNFXVtFTUVdIEhhbmRsZSBwcm90ZWN0aW9uIGV2ZW50 IGFsc28gYXQgZGVjcnlwdG9yIGxldmVsCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9p b3MvV2ViRXZlbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3Mv V2ViRXZlbnQuaAkocmV2aXNpb24gMjEyMzYwKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v aW9zL1dlYkV2ZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTE4NSw4ICsxODUsNSBAQCBXRUJDT1JF X0VYUE9SVCBAaW50ZXJmYWNlIFdlYkV2ZW50IDogTlNPCiAKIEBlbmQKIAotQGludGVyZmFjZSBX ZWJJT1NFdmVudCA6IFdlYkV2ZW50Ci1AZW5kCi0KICNlbmRpZiAvLyBUQVJHRVRfT1NfSVBIT05F CiAjZW5kaWYgLy8gV2ViRXZlbnRJT1NfaApJbmRleDogU291cmNlL1dlYktpdDIvQ2hhbmdlTG9n Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkocmV2aXNpb24gMjEyMzQ0 KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEs MTggQEAKKzIwMTctMDItMTUgIEFha2FzaCBKYWluICA8YWFrYXNoX2phaW5AYXBwbGUuY29tPgor CisgICAgICAgIFJlbW92ZSBXZWJJT1NFdmVudCBpbnRlcmZhY2UKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2ODM2OAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2hhcmVkL05hdGl2ZVdlYktleWJvYXJk RXZlbnQuaDogVXNpbmcgV2ViRXZlbnQgZnJvbSBXZWJDb3JlIGluc3RlYWQgb2YgV2ViSU9TRXZl bnQuCisgICAgICAgICogU2hhcmVkL2lvcy9OYXRpdmVXZWJLZXlib2FyZEV2ZW50SU9TLm1tOiBE aXR0by4KKyAgICAgICAgKiBTaGFyZWQvaW9zL1dlYklPU0V2ZW50RmFjdG9yeS5oOiBEaXR0by4K KyAgICAgICAgKiBTaGFyZWQvaW9zL1dlYklPU0V2ZW50RmFjdG9yeS5tbTogRGl0dG8uCisgICAg ICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaDogRGl0dG8uCisg ICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06IERpdHRv LgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwOiBVc2luZyBXZWJFdmVudCBm cm9tIFdlYktpdC4KKwogMjAxNy0wMi0xNCAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFw cGxlLmNvbT4KIAogICAgICAgICBbV0syXSBTdXBwb3J0IGRhdGEgaW50ZXJhY3Rpb24gb24gbGlu a3MKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9OYXRpdmVXZWJLZXlib2FyZEV2ZW50LmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL05hdGl2ZVdlYktleWJvYXJkRXZl bnQuaAkocmV2aXNpb24gMjEyMzQ0KQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL05hdGl2ZVdl YktleWJvYXJkRXZlbnQuaAkod29ya2luZyBjb3B5KQpAQCAtNTIsNyArNTIsNyBAQCB0eXBlZGVm IHVuaW9uIF9HZGtFdmVudCBHZGtFdmVudDsKIAogI2lmIFBMQVRGT1JNKElPUykKICNpbmNsdWRl IDx3dGYvUmV0YWluUHRyLmg+Ci1PQkpDX0NMQVNTIFdlYklPU0V2ZW50OworT0JKQ19DTEFTUyBX ZWJFdmVudDsKICNlbmRpZgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKQEAgLTY4LDcgKzY4LDcgQEAg cHVibGljOgogICAgIE5hdGl2ZVdlYktleWJvYXJkRXZlbnQoY29uc3QgRXZhc19FdmVudF9LZXlf RG93biosIGJvb2wpOwogICAgIE5hdGl2ZVdlYktleWJvYXJkRXZlbnQoY29uc3QgRXZhc19FdmVu dF9LZXlfVXAqKTsKICNlbGlmIFBMQVRGT1JNKElPUykKLSAgICBOYXRpdmVXZWJLZXlib2FyZEV2 ZW50KFdlYklPU0V2ZW50ICopOworICAgIE5hdGl2ZVdlYktleWJvYXJkRXZlbnQoOjpXZWJFdmVu dCAqKTsKICNlbmRpZgogCiAjaWYgVVNFKEFQUEtJVCkKQEAgLTgxLDcgKzgxLDcgQEAgcHVibGlj OgogICAgIGNvbnN0IHZvaWQqIG5hdGl2ZUV2ZW50KCkgY29uc3QgeyByZXR1cm4gbV9uYXRpdmVF dmVudDsgfQogICAgIGJvb2wgaXNGaWx0ZXJlZCgpIGNvbnN0IHsgcmV0dXJuIG1faXNGaWx0ZXJl ZDsgfQogI2VsaWYgUExBVEZPUk0oSU9TKQotICAgIFdlYklPU0V2ZW50KiBuYXRpdmVFdmVudCgp IGNvbnN0IHsgcmV0dXJuIG1fbmF0aXZlRXZlbnQuZ2V0KCk7IH0KKyAgICA6OldlYkV2ZW50KiBu YXRpdmVFdmVudCgpIGNvbnN0IHsgcmV0dXJuIG1fbmF0aXZlRXZlbnQuZ2V0KCk7IH0KICNlbmRp ZgogCiBwcml2YXRlOgpAQCAtOTUsNyArOTUsNyBAQCBwcml2YXRlOgogICAgIGNvbnN0IHZvaWQq IG1fbmF0aXZlRXZlbnQ7CiAgICAgYm9vbCBtX2lzRmlsdGVyZWQ7CiAjZWxpZiBQTEFURk9STShJ T1MpCi0gICAgUmV0YWluUHRyPFdlYklPU0V2ZW50PiBtX25hdGl2ZUV2ZW50OworICAgIFJldGFp blB0cjw6OldlYkV2ZW50PiBtX25hdGl2ZUV2ZW50OwogI2VuZGlmCiB9OwogCkluZGV4OiBTb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvaW9zL05hdGl2ZVdlYktleWJvYXJkRXZlbnRJT1MubW0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL2lvcy9OYXRpdmVXZWJLZXlib2FyZEV2ZW50 SU9TLm1tCShyZXZpc2lvbiAyMTIzNDQpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvaW9zL05h dGl2ZVdlYktleWJvYXJkRXZlbnRJT1MubW0JKHdvcmtpbmcgY29weSkKQEAgLTMyLDcgKzMyLDcg QEAKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLU5hdGl2ZVdlYktleWJvYXJkRXZlbnQ6Ok5hdGl2 ZVdlYktleWJvYXJkRXZlbnQoV2ViSU9TRXZlbnQgKmV2ZW50KQorTmF0aXZlV2ViS2V5Ym9hcmRF dmVudDo6TmF0aXZlV2ViS2V5Ym9hcmRFdmVudCg6OldlYkV2ZW50ICpldmVudCkKICAgICA6IFdl YktleWJvYXJkRXZlbnQoV2ViSU9TRXZlbnRGYWN0b3J5OjpjcmVhdGVXZWJLZXlib2FyZEV2ZW50 KGV2ZW50KSkKICAgICAsIG1fbmF0aXZlRXZlbnQoZXZlbnQpCiB7CkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9TaGFyZWQvaW9zL1dlYklPU0V2ZW50RmFjdG9yeS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1NoYXJlZC9pb3MvV2ViSU9TRXZlbnRGYWN0b3J5LmgJKHJldmlzaW9uIDIxMjM0 NCkKKysrIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9pb3MvV2ViSU9TRXZlbnRGYWN0b3J5LmgJKHdv cmtpbmcgY29weSkKQEAgLTMzLDcgKzMzLDcgQEAKIAogY2xhc3MgV2ViSU9TRXZlbnRGYWN0b3J5 IHsKIHB1YmxpYzoKLSAgICBzdGF0aWMgV2ViS2l0OjpXZWJLZXlib2FyZEV2ZW50IGNyZWF0ZVdl YktleWJvYXJkRXZlbnQoV2ViSU9TRXZlbnQgKmV2ZW50KTsKKyAgICBzdGF0aWMgV2ViS2l0OjpX ZWJLZXlib2FyZEV2ZW50IGNyZWF0ZVdlYktleWJvYXJkRXZlbnQoOjpXZWJFdmVudCAqZXZlbnQp OwogfTsKIAogI2VuZGlmIC8vIFBMQVRGT1JNKElPUykKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1No YXJlZC9pb3MvV2ViSU9TRXZlbnRGYWN0b3J5Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQyL1NoYXJlZC9pb3MvV2ViSU9TRXZlbnRGYWN0b3J5Lm1tCShyZXZpc2lvbiAyMTIzNDQpCisr KyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvaW9zL1dlYklPU0V2ZW50RmFjdG9yeS5tbQkod29ya2lu ZyBjb3B5KQpAQCAtMzEsNyArMzEsNyBAQAogI2ltcG9ydCA8V2ViQ29yZS9LZXlFdmVudENvZGVz SU9TLmg+CiAjaW1wb3J0IDxXZWJDb3JlL1BsYXRmb3JtRXZlbnRGYWN0b3J5SU9TLmg+CiAKLXN0 YXRpYyBXZWJLaXQ6OldlYkV2ZW50OjpNb2RpZmllcnMgbW9kaWZpZXJzRm9yRXZlbnQoV2ViSU9T RXZlbnQgKmV2ZW50KQorc3RhdGljIFdlYktpdDo6V2ViRXZlbnQ6Ok1vZGlmaWVycyBtb2RpZmll cnNGb3JFdmVudCg6OldlYkV2ZW50ICpldmVudCkKIHsKICAgICB1bnNpZ25lZCBtb2RpZmllcnMg PSAwOwogICAgIFdlYkV2ZW50RmxhZ3MgZXZlbnRNb2RpZmllckZsYWdzID0gZXZlbnQubW9kaWZp ZXJGbGFnczsKQEAgLTUwLDcgKzUwLDcgQEAgc3RhdGljIFdlYktpdDo6V2ViRXZlbnQ6Ok1vZGlm aWVycyBtb2RpZgogICAgIHJldHVybiBzdGF0aWNfY2FzdDxXZWJLaXQ6OldlYkV2ZW50OjpNb2Rp ZmllcnM+KG1vZGlmaWVycyk7CiB9CiAKLVdlYktpdDo6V2ViS2V5Ym9hcmRFdmVudCBXZWJJT1NF dmVudEZhY3Rvcnk6OmNyZWF0ZVdlYktleWJvYXJkRXZlbnQoV2ViSU9TRXZlbnQgKmV2ZW50KQor V2ViS2l0OjpXZWJLZXlib2FyZEV2ZW50IFdlYklPU0V2ZW50RmFjdG9yeTo6Y3JlYXRlV2ViS2V5 Ym9hcmRFdmVudCg6OldlYkV2ZW50ICpldmVudCkKIHsKICAgICBXZWJLaXQ6OldlYkV2ZW50OjpU eXBlIHR5cGUgPSAoZXZlbnQudHlwZSA9PSBXZWJFdmVudEtleVVwKSA/IFdlYktpdDo6V2ViRXZl bnQ6OktleVVwIDogV2ViS2l0OjpXZWJFdmVudDo6S2V5RG93bjsKICAgICBTdHJpbmcgdGV4dCA9 IGV2ZW50LmNoYXJhY3RlcnM7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Mv V0tQYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Mv V0tQYWdlLmNwcAkocmV2aXNpb24gMjEyMzQ0KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9DL1dLUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE5MDAsNyArMTkwMCw3IEBAIHZv aWQgV0tQYWdlU2V0UGFnZVVJQ2xpZW50KFdLUGFnZVJlZiBwYWcKICAgICAgICAgICAgIG1fY2xp ZW50LnNldFN0YXR1c1RleHQodG9BUEkocGFnZSksIHRvQVBJKHRleHQuaW1wbCgpKSwgbV9jbGll bnQuYmFzZS5jbGllbnRJbmZvKTsKICAgICAgICAgfQogCi0gICAgICAgIHZvaWQgbW91c2VEaWRN b3ZlT3ZlckVsZW1lbnQoV2ViUGFnZVByb3h5KiBwYWdlLCBjb25zdCBXZWJIaXRUZXN0UmVzdWx0 RGF0YSYgZGF0YSwgV2ViRXZlbnQ6Ok1vZGlmaWVycyBtb2RpZmllcnMsIEFQSTo6T2JqZWN0KiB1 c2VyRGF0YSkgb3ZlcnJpZGUKKyAgICAgICAgdm9pZCBtb3VzZURpZE1vdmVPdmVyRWxlbWVudChX ZWJQYWdlUHJveHkqIHBhZ2UsIGNvbnN0IFdlYkhpdFRlc3RSZXN1bHREYXRhJiBkYXRhLCBXZWJL aXQ6OldlYkV2ZW50OjpNb2RpZmllcnMgbW9kaWZpZXJzLCBBUEk6Ok9iamVjdCogdXNlckRhdGEp IG92ZXJyaWRlCiAgICAgICAgIHsKICAgICAgICAgICAgIGlmICghbV9jbGllbnQubW91c2VEaWRN b3ZlT3ZlckVsZW1lbnQgJiYgIW1fY2xpZW50Lm1vdXNlRGlkTW92ZU92ZXJFbGVtZW50X2RlcHJl Y2F0ZWRGb3JVc2VXaXRoVjApCiAgICAgICAgICAgICAgICAgcmV0dXJuOwpJbmRleDogU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFj dGlvbi5oCShyZXZpc2lvbiAyMTIzNDQpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9z L1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC02OSw3ICs2OSw3 IEBAIGNsYXNzIFdlYlBhZ2VQcm94eTsKIEBjbGFzcyBXS0FjdGlvblNoZWV0QXNzaXN0YW50Owog QGNsYXNzIFdLRm9ybUlucHV0U2Vzc2lvbjsKIEBjbGFzcyBXS0luc3BlY3Rvck5vZGVTZWFyY2hH ZXN0dXJlUmVjb2duaXplcjsKLUBjbGFzcyBXZWJJT1NFdmVudDsKK0BjbGFzcyBXZWJFdmVudDsK IEBjbGFzcyBfVUlIaWdobGlnaHRWaWV3OwogQGNsYXNzIF9VSVdlYkhpZ2hsaWdodExvbmdQcmVz c0dlc3R1cmVSZWNvZ25pemVyOwogCkBAIC03OCw3ICs3OCw3IEBAIHR5cGVkZWYgdm9pZCAoXlVJ V0tBdXRvY29ycmVjdGlvbkNvbnRleHQKIHR5cGVkZWYgdm9pZCAoXlVJV0tEaWN0YXRpb25Db250 ZXh0SGFuZGxlcikoTlNTdHJpbmcgKnNlbGVjdGVkVGV4dCwgTlNTdHJpbmcgKmJlZm9yZVRleHQs IE5TU3RyaW5nICphZnRlclRleHQpOwogdHlwZWRlZiB2b2lkICheVUlXS1NlbGVjdGlvbkNvbXBs ZXRpb25IYW5kbGVyKSh2b2lkKTsKIHR5cGVkZWYgdm9pZCAoXlVJV0tTZWxlY3Rpb25XaXRoRGly ZWN0aW9uQ29tcGxldGlvbkhhbmRsZXIpKEJPT0wgc2VsZWN0aW9uRW5kSXNNb3ZpbmcpOwotdHlw ZWRlZiB2b2lkICheVUlXS0tleVdlYkV2ZW50Q29tcGxldGlvbkhhbmRsZXIpKFdlYklPU0V2ZW50 ICp0aGVFdmVudCwgQk9PTCB3YXNIYW5kbGVkKTsKK3R5cGVkZWYgdm9pZCAoXlVJV0tLZXlXZWJF dmVudENvbXBsZXRpb25IYW5kbGVyKSg6OldlYkV2ZW50ICp0aGVFdmVudCwgQk9PTCB3YXNIYW5k bGVkKTsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKQEAgLTI0Myw3ICsyNDMsNyBAQCBzdHJ1Y3Qg V0tBdXRvQ29ycmVjdGlvbkRhdGEgewogLSAodm9pZClfc3RvcEFzc2lzdGluZ05vZGU7CiAtICh2 b2lkKV9zZWxlY3Rpb25DaGFuZ2VkOwogLSAodm9pZClfdXBkYXRlQ2hhbmdlZFNlbGVjdGlvbjsK LS0gKEJPT0wpX2ludGVycHJldEtleUV2ZW50OihXZWJJT1NFdmVudCAqKXRoZUV2ZW50IGlzQ2hh ckV2ZW50OihCT09MKWlzQ2hhckV2ZW50OworLSAoQk9PTClfaW50ZXJwcmV0S2V5RXZlbnQ6KDo6 V2ViRXZlbnQgKil0aGVFdmVudCBpc0NoYXJFdmVudDooQk9PTClpc0NoYXJFdmVudDsKIC0gKHZv aWQpX3Bvc2l0aW9uSW5mb3JtYXRpb25EaWRDaGFuZ2U6KGNvbnN0IFdlYktpdDo6SW50ZXJhY3Rp b25JbmZvcm1hdGlvbkF0UG9zaXRpb24mKWluZm87CiAtICh2b2lkKV9hdHRlbXB0Q2xpY2tBdExv Y2F0aW9uOihDR1BvaW50KWxvY2F0aW9uOwogLSAodm9pZClfd2lsbFN0YXJ0U2Nyb2xsaW5nT3Ja b29taW5nOwpAQCAtMjU1LDcgKzI1NSw3IEBAIHN0cnVjdCBXS0F1dG9Db3JyZWN0aW9uRGF0YSB7 CiAtICh2b2lkKV9zaG93UGxheWJhY2tUYXJnZXRQaWNrZXI6KEJPT0wpaGFzVmlkZW8gZnJvbVJl Y3Q6KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKWVsZW1lbnRSZWN0OwogLSAodm9pZClfc2hvd1J1 bk9wZW5QYW5lbDooQVBJOjpPcGVuUGFuZWxQYXJhbWV0ZXJzKilwYXJhbWV0ZXJzIHJlc3VsdExp c3RlbmVyOihXZWJLaXQ6OldlYk9wZW5QYW5lbFJlc3VsdExpc3RlbmVyUHJveHkqKWxpc3RlbmVy OwogLSAodm9pZClhY2Nlc3NvcnlEb25lOwotLSAodm9pZClfZGlkSGFuZGxlS2V5RXZlbnQ6KFdl YklPU0V2ZW50ICopZXZlbnQgZXZlbnRXYXNIYW5kbGVkOihCT09MKWV2ZW50V2FzSGFuZGxlZDsK Ky0gKHZvaWQpX2RpZEhhbmRsZUtleUV2ZW50Oig6OldlYkV2ZW50ICopZXZlbnQgZXZlbnRXYXNI YW5kbGVkOihCT09MKWV2ZW50V2FzSGFuZGxlZDsKIC0gKFZlY3RvcjxXZWJLaXQ6Ok9wdGlvbkl0 ZW0+JikgYXNzaXN0ZWROb2RlU2VsZWN0T3B0aW9uczsKIC0gKHZvaWQpX2VuYWJsZUluc3BlY3Rv ck5vZGVTZWFyY2g7CiAtICh2b2lkKV9kaXNhYmxlSW5zcGVjdG9yTm9kZVNlYXJjaDsKSW5kZXg6 IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1t Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmll d0ludGVyYWN0aW9uLm1tCShyZXZpc2lvbiAyMTIzNDQpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQkod29ya2luZyBjb3B5KQpAQCAt MzM0MCwxOCArMzM0MCwxOCBAQCAtICh2b2lkKWhhbmRsZUtleUV2ZW50Oig6OlVJRXZlbnQgKill dmVuCiAgICAgW3NlbGYgaGFuZGxlS2V5V2ViRXZlbnQ6d2ViRXZlbnRdOyAgICAKIH0KIAotLSAo dm9pZCloYW5kbGVLZXlXZWJFdmVudDooV2ViSU9TRXZlbnQgKil0aGVFdmVudAorLSAodm9pZClo YW5kbGVLZXlXZWJFdmVudDooOjpXZWJFdmVudCAqKXRoZUV2ZW50CiB7CiAgICAgX3BhZ2UtPmhh bmRsZUtleWJvYXJkRXZlbnQoTmF0aXZlV2ViS2V5Ym9hcmRFdmVudCh0aGVFdmVudCkpOwogfQog Ci0tICh2b2lkKWhhbmRsZUtleVdlYkV2ZW50OihXZWJJT1NFdmVudCAqKXRoZUV2ZW50IHdpdGhD b21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXikoV2ViSU9TRXZlbnQgKnRoZUV2ZW50LCBCT09MIHdh c0hhbmRsZWQpKWNvbXBsZXRpb25IYW5kbGVyCistICh2b2lkKWhhbmRsZUtleVdlYkV2ZW50Oig6 OldlYkV2ZW50ICopdGhlRXZlbnQgd2l0aENvbXBsZXRpb25IYW5kbGVyOih2b2lkICheKSg6Oldl YkV2ZW50ICp0aGVFdmVudCwgQk9PTCB3YXNIYW5kbGVkKSljb21wbGV0aW9uSGFuZGxlcgogewog ICAgIF9rZXlXZWJFdmVudEhhbmRsZXIgPSBbY29tcGxldGlvbkhhbmRsZXIgY29weV07CiAgICAg X3BhZ2UtPmhhbmRsZUtleWJvYXJkRXZlbnQoTmF0aXZlV2ViS2V5Ym9hcmRFdmVudCh0aGVFdmVu dCkpOwogfQogCi0tICh2b2lkKV9kaWRIYW5kbGVLZXlFdmVudDooV2ViSU9TRXZlbnQgKilldmVu dCBldmVudFdhc0hhbmRsZWQ6KEJPT0wpZXZlbnRXYXNIYW5kbGVkCistICh2b2lkKV9kaWRIYW5k bGVLZXlFdmVudDooOjpXZWJFdmVudCAqKWV2ZW50IGV2ZW50V2FzSGFuZGxlZDooQk9PTClldmVu dFdhc0hhbmRsZWQKIHsKICAgICBpZiAoX2tleVdlYkV2ZW50SGFuZGxlcikgewogICAgICAgICBf a2V5V2ViRXZlbnRIYW5kbGVyKGV2ZW50LCBldmVudFdhc0hhbmRsZWQpOwpAQCAtMzM4MCw3ICsz MzgwLDcgQEAgLSAodm9pZClfZGlkSGFuZGxlS2V5RXZlbnQ6KFdlYklPU0V2ZW50IAogICAgIF91 aUV2ZW50QmVpbmdSZXNlbnQgPSBuaWw7CiB9CiAKLS0gKHN0ZDo6b3B0aW9uYWw8RmxvYXRQb2lu dD4pX3Njcm9sbE9mZnNldEZvckV2ZW50OihXZWJJT1NFdmVudCAqKWV2ZW50CistIChzdGQ6Om9w dGlvbmFsPEZsb2F0UG9pbnQ+KV9zY3JvbGxPZmZzZXRGb3JFdmVudDooOjpXZWJFdmVudCAqKWV2 ZW50CiB7CiAgICAgc3RhdGljIGNvbnN0IHVuc2lnbmVkIGtXZWJTcGFjZUtleSA9IDB4MjA7CiAK QEAgLTM0NDQsNyArMzQ0NCw3IEBAIC0gKHN0ZDo6b3B0aW9uYWw8RmxvYXRQb2ludD4pX3Njcm9s bE9mZnMKICAgICByZXR1cm4gc3RkOjpudWxsb3B0OwogfQogCi0tIChCT09MKV9pbnRlcnByZXRL ZXlFdmVudDooV2ViSU9TRXZlbnQgKilldmVudCBpc0NoYXJFdmVudDooQk9PTClpc0NoYXJFdmVu dAorLSAoQk9PTClfaW50ZXJwcmV0S2V5RXZlbnQ6KDo6V2ViRXZlbnQgKilldmVudCBpc0NoYXJF dmVudDooQk9PTClpc0NoYXJFdmVudAogewogICAgIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBrV2Vi RW50ZXJLZXkgPSAweDAwMDM7CiAgICAgc3RhdGljIGNvbnN0IHVuc2lnbmVkIGtXZWJCYWNrc3Bh Y2VLZXkgPSAweDAwMDg7Cg==