212939 2020-06-08 16:27:17 -0700 Swift Overlay API refinements 2020-06-10 12:26:19 -0700 1 1 1 Unclassified WebKit WebKit API WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 james.savage james.savage beidson darin webkit-bug-importer oldest_to_newest 1660480 0 james.savage 2020-06-08 16:27:17 -0700 * JavaScript completion handlers should be Optional. * Standardize use of `completionHandler` as argument label. * Fix missing imports in Umbrella Header, this isn't part of the overlay, but prevents use of WKScriptMessageHandlerWithReply from Swift code. 1660481 1 webkit-bug-importer 2020-06-08 16:27:42 -0700 <rdar://problem/64140013> 1660495 2 401400 james.savage 2020-06-08 16:50:27 -0700 Created attachment 401400 Patch 1660501 3 401400 darin 2020-06-08 17:04:59 -0700 Comment on attachment 401400 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=401400&action=review > Source/WebKit/Shared/API/Cocoa/WebKit.h:52 > #import <WebKit/WKScriptMessageHandler.h> > +#import <WebKit/WKScriptMessageHandlerWithReply.h> Doubt we need both of these. Could remove the other one. 1660512 4 401401 james.savage 2020-06-08 17:15:19 -0700 Created attachment 401401 Patch 1660515 5 401400 james.savage 2020-06-08 17:17:42 -0700 Comment on attachment 401400 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=401400&action=review >> Source/WebKit/Shared/API/Cocoa/WebKit.h:52 >> +#import <WebKit/WKScriptMessageHandlerWithReply.h> > > Doubt we need both of these. Could remove the other one. We could move the definition of WKScriptMessageHandlerWithReply to WKScriptMessageHandler.h, but the umbrella header must import every .h in the WebKit.framework/Headers directory, otherwise it cause issues for modular imports (which are the only type available to Swift, or @import WebKit in Objective-C). 1660758 6 darin 2020-06-09 11:28:17 -0700 (In reply to James Savage from comment #5) > the umbrella header must import every .h in > the WebKit.framework/Headers directory Directly, not indirectly? OK. Understood, I guess. 1661031 7 james.savage 2020-06-09 17:39:20 -0700 Yeah, there is technically another way to achieve this. I could instead modify the WebKit.modulemap file to include an explicit "header" directive for any headers not included in the umbrella, but that is not a standard practice. The documentation around this is at http://clang.llvm.org/docs/Modules.html#header-declaration. In either case transitive imports are a problem, it just moves around where the explicit declaration goes, and keeping everything in the umbrella header is much more straightforward. If we did anything I'd suggest defining both protocols in the same WKScriptMessageHandler.h, but the two protocols don't inherit from each other, and it appears that WebKit generally avoids declaring multiple protocol or class types in the same API header. 1661286 8 ews-feeder 2020-06-10 12:26:19 -0700 Committed r262849: <https://trac.webkit.org/changeset/262849> All reviewed patches have been landed. Closing bug and clearing flags on attachment 401401. 401400 2020-06-08 16:50:27 -0700 2020-06-08 17:15:18 -0700 Patch bug-212939-20200608165026.patch text/plain 4703 james.savage U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNzUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDk4MGVmMjA5YmJmZGE2YjFi YjJiYTU5MGRiMmJmMjU1ZWY0NjNjZTIuLmNiODFiZWU4NmQyM2RkMTZiMTY2MTI5MmVkNGY1ZTRl MTE2NTFiMmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMjAtMDYtMDggIEphbWVzIFNh dmFnZSAgPGphbWVzLnNhdmFnZUBhcHBsZS5jb20+CisKKyAgICAgICAgU3dpZnQgT3ZlcmxheSBB UEkgcmVmaW5lbWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIxMjkzOQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjQxNDAwMTM+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBjbGVh bnMgdXAgc29tZSBpbmNvbnNpc3RlbmNpZXMgaW4gdGhlIHZhcmlvdXMgU3dpZnQgcHJvamVjdGlv bnMsCisgICAgICAgIGFuZCBtb2RpZmllcyBKYXZhU2NyaXB0IGV2YWx1YXRpb24gY2FsbGJhY2tz IHRvIGJlIG9wdGlvbmFsIHRvIGFjY291bnQgZm9yCisgICAgICAgIHNjcmlwdHMgd2hpY2ggbWF5 IG5vdCBldmFsdWF0ZSB0byBhIHVzZWZ1bCByZXN1bHQgKHN1Y2ggYXMgb25lcyB0aGF0IHNpbXBs eQorICAgICAgICBtb2RpZnkgdGhlIERPTSB3aXRob3V0IHJlcG9ydGluZyBhIHN0YXR1cykuIEl0 IGFsc28gc3RhbmRhcmRpemVzIG9uIHVzaW5nCisgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyIGFz IGFuIGFyZ3VtZW50IGxhYmVsIHRvIG1hdGNoIHRoZSByZXN0IG9mIFdlYktpdCBBUEksIGFuZAor ICAgICAgICB0aGUgbWFqb3JpdHkgb2YgdGhlIFN3aWZ0IEFQSSByZWZpbmVtZW50cy4KKyAgICAg ICAgCisgICAgICAgIEl0IGFsc28gZml4ZXMgYSBtb2R1bGUgaXNzdWUgd2hlcmUgdGhlIFdlYktp dC5oIHVtYnJlbGxhIHdhcyBtaXNzaW5nIGFuCisgICAgICAgIGltcG9ydCBvZiBXS1NjcmlwdFJl cGx5V2l0aE1lc3NhZ2VIYW5kbGVyLmgsIG1ha2luZyB0aGUgdHlwZSB1bnVzYWJsZSBmcm9tCisg ICAgICAgIFN3aWZ0IHNvdXJjZSBmaWxlcy8KKworICAgICAgICAqIFNoYXJlZC9BUEkvQ29jb2Ev V2ViS2l0Lmg6IEFkZCBtaXNzaW5nIGhlYWRlci4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0Nv Y29hL1dlYktpdFN3aWZ0T3ZlcmxheS5zd2lmdDoKKyAgICAgICAgKGNhbGxBc3luY0phdmFTY3Jp cHQoXzphcmd1bWVudHM6aW46Y29tcGxldGlvbkhhbmRsZXI6KSk6IFJlbmFtZSBjb21wbGV0aW9u CisgICAgICAgICAgICBhcmd1bWVudCwgYW5kIG1ha2Ugb3B0aW9uYWwuIE5vdGU6IE9wdGlvbmFs IGNsb3N1cmVzIGFyZSBpbXBsaWNpdGx5CisgICAgICAgICAgICBAZXNjYXBpbmcsIG1ha2luZyB0 aGUgYW5ub3RhdGlvbiByZWR1bmRhbnQgYW5kIGluY29tcGF0aWJsZSwgc28gaXQgbXVzdAorICAg ICAgICAgICAgYmUgcmVtb3ZlZC4gSW4gU3dpZnQsIE9wdGlvbmFsLm1hcCgpJ3MgY2xvc3VyZSBp cyBpbnZva2VkIGlmZiB0aGUgT3B0aW9uYWwKKyAgICAgICAgICAgIGNvbnRhaW5zIHNvbWUgdmFs dWUsIGFuZCB0aGUgcmVzdWx0IG9mIHRoYXQgdHJhbnNmb3JtIGlzIHJldHVybmVkLCBlbHNlCisg ICAgICAgICAgICBuaWwgaXMgcHJvcGFnYXRlZC4gVGhpcyBhbGxvd3MgdXMgdG8gYXBwbHkgdGhl IGNsb3N1cmUgdHJhbnNmb3JtIGlmIHRoZQorICAgICAgICAgICAgY2xpZW50IHZhbHVlIGlzIG5v bi1uaWwsIHdpdGhvdXQgdXNpbmcgaW50ZXJtZWRpYXJ5IHZhcmlhYmxlcyBvciBpZi9sZXQuCisg ICAgICAgIChldmFsdWF0ZUphdmFTY3JpcHQoXzppbjpjb21wbGV0aW9uSGFuZGxlcjopKTogRGl0 dG8uCisKIDIwMjAtMDYtMDggIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAg ICAgICBUdXJuIHNvbWUgV2ViUGFnZVByb3h5IGxvZ2dpbmcgaW50byBlcnJvciBsb2dnaW5nCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9BUEkvQ29jb2EvV2ViS2l0LmggYi9Tb3Vy Y2UvV2ViS2l0L1NoYXJlZC9BUEkvQ29jb2EvV2ViS2l0LmgKaW5kZXggYjk3ZDBjYTdkN2Y1OTM0 MTY4NmVkMzRmYmRjNzljMmVjMzZiOTVjOS4uZTJjMjg4MmQwMWUzZjczNWRlN2RhNTVmZDNiMmEw ZDAxOWM2ODUzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvQVBJL0NvY29hL1dl YktpdC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0FQSS9Db2NvYS9XZWJLaXQuaApAQCAt NDksNiArNDksNyBAQAogI2ltcG9ydCA8V2ViS2l0L1dLUHJvY2Vzc1Bvb2wuaD4KICNpbXBvcnQg PFdlYktpdC9XS1NjcmlwdE1lc3NhZ2UuaD4KICNpbXBvcnQgPFdlYktpdC9XS1NjcmlwdE1lc3Nh Z2VIYW5kbGVyLmg+CisjaW1wb3J0IDxXZWJLaXQvV0tTY3JpcHRNZXNzYWdlSGFuZGxlcldpdGhS ZXBseS5oPgogI2ltcG9ydCA8V2ViS2l0L1dLU2VjdXJpdHlPcmlnaW4uaD4KICNpbXBvcnQgPFdl YktpdC9XS1NuYXBzaG90Q29uZmlndXJhdGlvbi5oPgogI2ltcG9ydCA8V2ViS2l0L1dLVUlEZWxl Z2F0ZS5oPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dl YktpdFN3aWZ0T3ZlcmxheS5zd2lmdCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XZWJLaXRTd2lmdE92ZXJsYXkuc3dpZnQKaW5kZXggODA1NzY4ZDcwYWNjODNjM2RlYzkyOTgy ZTg3OWM2NDk4MWZmOGE1NS4uNDIwODJjNWQ4OTRmNmY0MjhmMjJlODFlZWIxZTcyYTQwZTMzZTY2 MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dlYktpdFN3 aWZ0T3ZlcmxheS5zd2lmdAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V2ViS2l0U3dpZnRPdmVybGF5LnN3aWZ0CkBAIC0zNSw4ICszNSw4IEBAIGV4dGVuc2lvbiBXS1BE RkNvbmZpZ3VyYXRpb24gewogCiBAYXZhaWxhYmxlKGlPUyAxNC4wLCBtYWNPUyAxMC4xNiwgKikK IGV4dGVuc2lvbiBXS1dlYlZpZXcgewotICAgIHB1YmxpYyBmdW5jIGNhbGxBc3luY0phdmFTY3Jp cHQoXyBmdW5jdGlvbkJvZHk6IFN0cmluZywgYXJndW1lbnRzOiBbU3RyaW5nOkFueV0gPSBbOl0s IGluIGNvbnRlbnRXb3JsZDogV0tDb250ZW50V29ybGQsIGNvbXBsZXRpb246IEBlc2NhcGluZyhS ZXN1bHQ8QW55LCBFcnJvcj4pIC0+IFZvaWQpIHsKLSAgICAgICAgX19jYWxsQXN5bmNKYXZhU2Ny aXB0KGZ1bmN0aW9uQm9keSwgYXJndW1lbnRzOiBhcmd1bWVudHMsIGluOiBjb250ZW50V29ybGQs IGNvbXBsZXRpb25IYW5kbGVyOiBtYWtlUmVzdWx0SGFuZGxlcihjb21wbGV0aW9uKSkKKyAgICBw dWJsaWMgZnVuYyBjYWxsQXN5bmNKYXZhU2NyaXB0KF8gZnVuY3Rpb25Cb2R5OiBTdHJpbmcsIGFy Z3VtZW50czogW1N0cmluZzpBbnldID0gWzpdLCBpbiBjb250ZW50V29ybGQ6IFdLQ29udGVudFdv cmxkLCBjb21wbGV0aW9uSGFuZGxlcjogKChSZXN1bHQ8QW55LCBFcnJvcj4pIC0+IFZvaWQpPyA9 IG5pbCkgeworICAgICAgICBfX2NhbGxBc3luY0phdmFTY3JpcHQoZnVuY3Rpb25Cb2R5LCBhcmd1 bWVudHM6IGFyZ3VtZW50cywgaW46IGNvbnRlbnRXb3JsZCwgY29tcGxldGlvbkhhbmRsZXI6IGNv bXBsZXRpb25IYW5kbGVyLm1hcChtYWtlUmVzdWx0SGFuZGxlcikpCiAgICAgfQogCiAgICAgcHVi bGljIGZ1bmMgY3JlYXRlUERGKGNvbmZpZ3VyYXRpb246IFdLUERGQ29uZmlndXJhdGlvbiA9IC5p bml0KCksIGNvbXBsZXRpb25IYW5kbGVyOiBAZXNjYXBpbmcgKFJlc3VsdDxEYXRhLCBFcnJvcj4p IC0+IFZvaWQpIHsKQEAgLTQ3LDggKzQ3LDggQEAgZXh0ZW5zaW9uIFdLV2ViVmlldyB7CiAgICAg ICAgIF9fY3JlYXRlV2ViQXJjaGl2ZURhdGEoY29tcGxldGlvbkhhbmRsZXI6IG1ha2VSZXN1bHRI YW5kbGVyKGNvbXBsZXRpb25IYW5kbGVyKSkKICAgICB9CiAKLSAgICBwdWJsaWMgZnVuYyBldmFs dWF0ZUphdmFTY3JpcHQoXyBqYXZhU2NyaXB0OiBTdHJpbmcsIGluIGNvbnRlbnRXb3JsZDogV0tD b250ZW50V29ybGQsIGNvbXBsZXRpb246IEBlc2NhcGluZyAoUmVzdWx0PEFueSwgRXJyb3I+KSAt PiBWb2lkKSB7Ci0gICAgICAgIF9fZXZhbHVhdGVKYXZhU2NyaXB0KGphdmFTY3JpcHQsIGluOiBj b250ZW50V29ybGQsIGNvbXBsZXRpb25IYW5kbGVyOiBtYWtlUmVzdWx0SGFuZGxlcihjb21wbGV0 aW9uKSkKKyAgICBwdWJsaWMgZnVuYyBldmFsdWF0ZUphdmFTY3JpcHQoXyBqYXZhU2NyaXB0OiBT dHJpbmcsIGluIGNvbnRlbnRXb3JsZDogV0tDb250ZW50V29ybGQsIGNvbXBsZXRpb25IYW5kbGVy OiAoKFJlc3VsdDxBbnksIEVycm9yPikgLT4gVm9pZCk/ID0gbmlsKSB7CisgICAgICAgIF9fZXZh bHVhdGVKYXZhU2NyaXB0KGphdmFTY3JpcHQsIGluOiBjb250ZW50V29ybGQsIGNvbXBsZXRpb25I YW5kbGVyOiBjb21wbGV0aW9uSGFuZGxlci5tYXAobWFrZVJlc3VsdEhhbmRsZXIpKQogICAgIH0K IAogICAgIHB1YmxpYyBmdW5jIGZpbmQoXyBzdHJpbmc6IFN0cmluZywgY29uZmlndXJhdGlvbjog V0tGaW5kQ29uZmlndXJhdGlvbiA9IC5pbml0KCksIGNvbXBsZXRpb25IYW5kbGVyOiBAZXNjYXBp bmcgKFdLRmluZFJlc3VsdCkgLT4gVm9pZCkgewo= 401401 2020-06-08 17:15:19 -0700 2020-06-10 12:26:19 -0700 Patch bug-212939-20200608171519.patch text/plain 8486 james.savage U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNzUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDk4MGVmMjA5YmJmZGE2YjFi YjJiYTU5MGRiMmJmMjU1ZWY0NjNjZTIuLmIzZjU1MGRiNjZjNDA5ZDkzY2U0MzVmOGU1ZWU1ZGY0 MDk0MTE2MDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDAgQEAKKzIwMjAtMDYtMDggIEphbWVzIFNh dmFnZSAgPGphbWVzLnNhdmFnZUBhcHBsZS5jb20+CisKKyAgICAgICAgU3dpZnQgT3ZlcmxheSBB UEkgcmVmaW5lbWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIxMjkzOQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjQxNDAwMTM+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBjbGVh bnMgdXAgc29tZSBpbmNvbnNpc3RlbmNpZXMgaW4gdGhlIHZhcmlvdXMgU3dpZnQgcHJvamVjdGlv bnMsCisgICAgICAgIGFuZCBtb2RpZmllcyBKYXZhU2NyaXB0IGV2YWx1YXRpb24gY2FsbGJhY2tz IHRvIGJlIG9wdGlvbmFsIHRvIGFjY291bnQgZm9yCisgICAgICAgIHNjcmlwdHMgd2hpY2ggbWF5 IG5vdCBldmFsdWF0ZSB0byBhIHVzZWZ1bCByZXN1bHQgKHN1Y2ggYXMgb25lcyB0aGF0IHNpbXBs eQorICAgICAgICBtb2RpZnkgdGhlIERPTSB3aXRob3V0IHJlcG9ydGluZyBhIHN0YXR1cykuIEl0 IGFsc28gc3RhbmRhcmRpemVzIG9uIHVzaW5nCisgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyIGFz IGFuIGFyZ3VtZW50IGxhYmVsIHRvIG1hdGNoIHRoZSByZXN0IG9mIFdlYktpdCBBUEksIGFuZAor ICAgICAgICB0aGUgbWFqb3JpdHkgb2YgdGhlIFN3aWZ0IEFQSSByZWZpbmVtZW50cy4KKyAgICAg ICAgCisgICAgICAgIEl0IGFsc28gZml4ZXMgYSBtb2R1bGUgaXNzdWUgd2hlcmUgdGhlIFdlYktp dC5oIHVtYnJlbGxhIHdhcyBtaXNzaW5nIGFuCisgICAgICAgIGltcG9ydCBvZiBXS1NjcmlwdFJl cGx5V2l0aE1lc3NhZ2VIYW5kbGVyLmgsIG1ha2luZyB0aGUgdHlwZSB1bnVzYWJsZSBmcm9tCisg ICAgICAgIFN3aWZ0IHNvdXJjZSBmaWxlcy8KKworICAgICAgICAqIFNoYXJlZC9BUEkvQ29jb2Ev V2ViS2l0Lmg6IEFkZCBtaXNzaW5nIGhlYWRlci4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0Nv Y29hL1dlYktpdFN3aWZ0T3ZlcmxheS5zd2lmdDoKKyAgICAgICAgKGNhbGxBc3luY0phdmFTY3Jp cHQoXzphcmd1bWVudHM6aW46Y29tcGxldGlvbkhhbmRsZXI6KSk6IFJlbmFtZSBjb21wbGV0aW9u CisgICAgICAgICAgICBhcmd1bWVudCwgYW5kIG1ha2Ugb3B0aW9uYWwuIE5vdGU6IE9wdGlvbmFs IGNsb3N1cmVzIGFyZSBpbXBsaWNpdGx5CisgICAgICAgICAgICBAZXNjYXBpbmcsIG1ha2luZyB0 aGUgYW5ub3RhdGlvbiByZWR1bmRhbnQgYW5kIGluY29tcGF0aWJsZSwgc28gaXQgbXVzdAorICAg ICAgICAgICAgYmUgcmVtb3ZlZC4gSW4gU3dpZnQsIE9wdGlvbmFsLm1hcCgpJ3MgY2xvc3VyZSBp cyBpbnZva2VkIGlmZiB0aGUgT3B0aW9uYWwKKyAgICAgICAgICAgIGNvbnRhaW5zIHNvbWUgdmFs dWUsIGFuZCB0aGUgcmVzdWx0IG9mIHRoYXQgdHJhbnNmb3JtIGlzIHJldHVybmVkLCBlbHNlCisg ICAgICAgICAgICBuaWwgaXMgcHJvcGFnYXRlZC4gVGhpcyBhbGxvd3MgdXMgdG8gYXBwbHkgdGhl IGNsb3N1cmUgdHJhbnNmb3JtIGlmIHRoZQorICAgICAgICAgICAgY2xpZW50IHZhbHVlIGlzIG5v bi1uaWwsIHdpdGhvdXQgdXNpbmcgaW50ZXJtZWRpYXJ5IHZhcmlhYmxlcyBvciBpZi9sZXQuCisg ICAgICAgIChldmFsdWF0ZUphdmFTY3JpcHQoXzppbjpjb21wbGV0aW9uSGFuZGxlcjopKTogRGl0 dG8uCisgICAgICAgICogU3dpZnRPdmVybGF5L1Rlc3RzL1dlYktpdFRlc3RzLnN3aWZ0OgorICAg ICAgICAoV2ViS2l0VGVzdHMudGVzdEFQSSk6IFVwZGF0ZSBuYW1lcyB0byByZWZsZWN0IGNoYW5n ZXMuCisgICAgICAgICogU3dpZnRPdmVybGF5L1dlYktpdFN3aWZ0T3ZlcmxheS54Y29kZXByb2ov eGNzaGFyZWRkYXRhL3hjc2NoZW1lcy9FdmVyeXRoaW5nIChDYXRhbHlzdCkueGNzY2hlbWU6Cisg ICAgICAgICAgICBFbnN1cmUgdGhhdCB0aGUgdW5pdCB0ZXN0IGZpbGVzIGdldCBidWlsdCBhcyBw YXJ0IG9mIEJ1aWxkICYgUnVuLCBzbyB0aGF0CisgICAgICAgICAgICBhbnkgY2hhbmdlcyB0byBu YW1lcyBnZXQgZmxhZ2dlZCB3aXRob3V0IGV2ZW4gcnVubmluZyB0aGUgdGVzdHMuCisgICAgICAg ICogU3dpZnRPdmVybGF5L1dlYktpdFN3aWZ0T3ZlcmxheS54Y29kZXByb2oveGNzaGFyZWRkYXRh L3hjc2NoZW1lcy9FdmVyeXRoaW5nLnhjc2NoZW1lOgorICAgICAgICAgICAgRGl0dG8uCisKIDIw MjAtMDYtMDggIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBUdXJu IHNvbWUgV2ViUGFnZVByb3h5IGxvZ2dpbmcgaW50byBlcnJvciBsb2dnaW5nCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9BUEkvQ29jb2EvV2ViS2l0LmggYi9Tb3VyY2UvV2ViS2l0 L1NoYXJlZC9BUEkvQ29jb2EvV2ViS2l0LmgKaW5kZXggYjk3ZDBjYTdkN2Y1OTM0MTY4NmVkMzRm YmRjNzljMmVjMzZiOTVjOS4uZTJjMjg4MmQwMWUzZjczNWRlN2RhNTVmZDNiMmEwZDAxOWM2ODUz YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvQVBJL0NvY29hL1dlYktpdC5oCisr KyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0FQSS9Db2NvYS9XZWJLaXQuaApAQCAtNDksNiArNDks NyBAQAogI2ltcG9ydCA8V2ViS2l0L1dLUHJvY2Vzc1Bvb2wuaD4KICNpbXBvcnQgPFdlYktpdC9X S1NjcmlwdE1lc3NhZ2UuaD4KICNpbXBvcnQgPFdlYktpdC9XS1NjcmlwdE1lc3NhZ2VIYW5kbGVy Lmg+CisjaW1wb3J0IDxXZWJLaXQvV0tTY3JpcHRNZXNzYWdlSGFuZGxlcldpdGhSZXBseS5oPgog I2ltcG9ydCA8V2ViS2l0L1dLU2VjdXJpdHlPcmlnaW4uaD4KICNpbXBvcnQgPFdlYktpdC9XS1Nu YXBzaG90Q29uZmlndXJhdGlvbi5oPgogI2ltcG9ydCA8V2ViS2l0L1dLVUlEZWxlZ2F0ZS5oPgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9Td2lmdE92ZXJsYXkvVGVzdHMvV2ViS2l0VGVzdHMu c3dpZnQgYi9Tb3VyY2UvV2ViS2l0L1N3aWZ0T3ZlcmxheS9UZXN0cy9XZWJLaXRUZXN0cy5zd2lm dAppbmRleCA3NzdiYmIyYzE2NDU2ZjgzYjQ3OTg0MTQ2OWRkNjMxZTk2ZDFiZDEwLi44NGIzMDYw ZDFiZDk4ZTFjZWJjYmExYjAyMmNlNGYwYmQ3ZWRkNWRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1N3aWZ0T3ZlcmxheS9UZXN0cy9XZWJLaXRUZXN0cy5zd2lmdAorKysgYi9Tb3VyY2UvV2Vi S2l0L1N3aWZ0T3ZlcmxheS9UZXN0cy9XZWJLaXRUZXN0cy5zd2lmdApAQCAtMzAsMTAgKzMwLDEw IEBAIGNsYXNzIFdlYktpdFRlc3RzOiBYQ1Rlc3RDYXNlIHsKICAgICAvLy8gVGhpcyBpcyBhIGNv bXBpbGUtdGltZSB0ZXN0IHRoYXQgZW5zdXJlcyB0aGUgZnVuY3Rpb24gbmFtZXMgYXJlIHdoYXQg d2UgZXhwZWN0LgogICAgIGZ1bmMgdGVzdEFQSSgpIHsKICAgICAgICAgXyA9IFdLQ29udGVudFdv cmxkLndvcmxkKG5hbWU6KQotICAgICAgICBfID0gV0tXZWJWaWV3LmNhbGxBc3luY0phdmFTY3Jp cHQoXzphcmd1bWVudHM6aW46Y29tcGxldGlvbjopCisgICAgICAgIF8gPSBXS1dlYlZpZXcuY2Fs bEFzeW5jSmF2YVNjcmlwdChfOmFyZ3VtZW50czppbjpjb21wbGV0aW9uSGFuZGxlcjopCiAgICAg ICAgIF8gPSBXS1dlYlZpZXcuY3JlYXRlUERGKGNvbmZpZ3VyYXRpb246Y29tcGxldGlvbkhhbmRs ZXI6KQogICAgICAgICBfID0gV0tXZWJWaWV3LmNyZWF0ZVdlYkFyY2hpdmVEYXRhKGNvbXBsZXRp b25IYW5kbGVyOikKLSAgICAgICAgXyA9IFdLV2ViVmlldy5ldmFsdWF0ZUphdmFTY3JpcHQoXzpp bjpjb21wbGV0aW9uOikKKyAgICAgICAgXyA9IFdLV2ViVmlldy5ldmFsdWF0ZUphdmFTY3JpcHQo Xzppbjpjb21wbGV0aW9uSGFuZGxlcjopCiAgICAgICAgIF8gPSBXS1dlYlZpZXcuZmluZChfOmNv bmZpZ3VyYXRpb246Y29tcGxldGlvbkhhbmRsZXI6KQogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9Td2lmdE92ZXJsYXkvV2ViS2l0U3dpZnRPdmVybGF5Lnhjb2RlcHJvai94Y3No YXJlZGRhdGEveGNzY2hlbWVzL0V2ZXJ5dGhpbmcgKENhdGFseXN0KS54Y3NjaGVtZSBiL1NvdXJj ZS9XZWJLaXQvU3dpZnRPdmVybGF5L1dlYktpdFN3aWZ0T3ZlcmxheS54Y29kZXByb2oveGNzaGFy ZWRkYXRhL3hjc2NoZW1lcy9FdmVyeXRoaW5nIChDYXRhbHlzdCkueGNzY2hlbWUKaW5kZXggMTU1 MzkzZmU3NWI4MDdkOWQ2YmNlYjg1YzVjNGM4MjllM2Y2YmNjMS4uMjZhMDc4YzllZDA1M2M1OWVk ZjU2ZDMxMWYyN2E5ZTc4OWI2ZTJiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9Td2lmdE92 ZXJsYXkvV2ViS2l0U3dpZnRPdmVybGF5Lnhjb2RlcHJvai94Y3NoYXJlZGRhdGEveGNzY2hlbWVz L0V2ZXJ5dGhpbmcgKENhdGFseXN0KS54Y3NjaGVtZQkKKysrIGIvU291cmNlL1dlYktpdC9Td2lm dE92ZXJsYXkvV2ViS2l0U3dpZnRPdmVybGF5Lnhjb2RlcHJvai94Y3NoYXJlZGRhdGEveGNzY2hl bWVzL0V2ZXJ5dGhpbmcgKENhdGFseXN0KS54Y3NjaGVtZQkKQEAgLTIwLDYgKzIwLDIwIEBACiAg ICAgICAgICAgICAgICBSZWZlcmVuY2VkQ29udGFpbmVyID0gImNvbnRhaW5lcjpXZWJLaXRTd2lm dE92ZXJsYXkueGNvZGVwcm9qIj4KICAgICAgICAgICAgIDwvQnVpbGRhYmxlUmVmZXJlbmNlPgog ICAgICAgICAgPC9CdWlsZEFjdGlvbkVudHJ5PgorICAgICAgICAgPEJ1aWxkQWN0aW9uRW50cnkK KyAgICAgICAgICAgIGJ1aWxkRm9yVGVzdGluZyA9ICJZRVMiCisgICAgICAgICAgICBidWlsZEZv clJ1bm5pbmcgPSAiWUVTIgorICAgICAgICAgICAgYnVpbGRGb3JQcm9maWxpbmcgPSAiTk8iCisg ICAgICAgICAgICBidWlsZEZvckFyY2hpdmluZyA9ICJOTyIKKyAgICAgICAgICAgIGJ1aWxkRm9y QW5hbHl6aW5nID0gIk5PIj4KKyAgICAgICAgICAgIDxCdWlsZGFibGVSZWZlcmVuY2UKKyAgICAg ICAgICAgICAgIEJ1aWxkYWJsZUlkZW50aWZpZXIgPSAicHJpbWFyeSIKKyAgICAgICAgICAgICAg IEJsdWVwcmludElkZW50aWZpZXIgPSAiN0QyMDA3MTUyMkY0RUNDQTAwOERGNjQwIgorICAgICAg ICAgICAgICAgQnVpbGRhYmxlTmFtZSA9ICJXZWJLaXRTd2lmdE92ZXJsYXlUZXN0cy1tYWNjYXRh bHlzdC54Y3Rlc3QiCisgICAgICAgICAgICAgICBCbHVlcHJpbnROYW1lID0gIldlYktpdFN3aWZ0 T3ZlcmxheVRlc3RzLW1hY2NhdGFseXN0IgorICAgICAgICAgICAgICAgUmVmZXJlbmNlZENvbnRh aW5lciA9ICJjb250YWluZXI6V2ViS2l0U3dpZnRPdmVybGF5Lnhjb2RlcHJvaiI+CisgICAgICAg ICAgICA8L0J1aWxkYWJsZVJlZmVyZW5jZT4KKyAgICAgICAgIDwvQnVpbGRBY3Rpb25FbnRyeT4K ICAgICAgIDwvQnVpbGRBY3Rpb25FbnRyaWVzPgogICAgPC9CdWlsZEFjdGlvbj4KICAgIDxUZXN0 QWN0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1N3aWZ0T3ZlcmxheS9XZWJLaXRTd2lm dE92ZXJsYXkueGNvZGVwcm9qL3hjc2hhcmVkZGF0YS94Y3NjaGVtZXMvRXZlcnl0aGluZy54Y3Nj aGVtZSBiL1NvdXJjZS9XZWJLaXQvU3dpZnRPdmVybGF5L1dlYktpdFN3aWZ0T3ZlcmxheS54Y29k ZXByb2oveGNzaGFyZWRkYXRhL3hjc2NoZW1lcy9FdmVyeXRoaW5nLnhjc2NoZW1lCmluZGV4IGVl MmM5OTNkMmY1NWYyNWM2OTllNjRkZDQ5MDgyOTdjMTc3ZGJiN2IuLmQ0OWUyYjVjOWYzOTFiOTA1 NjJiYTBlYzlhY2M1Nzc5ZDc3YzcxZGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU3dpZnRP dmVybGF5L1dlYktpdFN3aWZ0T3ZlcmxheS54Y29kZXByb2oveGNzaGFyZWRkYXRhL3hjc2NoZW1l cy9FdmVyeXRoaW5nLnhjc2NoZW1lCisrKyBiL1NvdXJjZS9XZWJLaXQvU3dpZnRPdmVybGF5L1dl YktpdFN3aWZ0T3ZlcmxheS54Y29kZXByb2oveGNzaGFyZWRkYXRhL3hjc2NoZW1lcy9FdmVyeXRo aW5nLnhjc2NoZW1lCkBAIC0yMiw3ICsyMiw3IEBACiAgICAgICAgICA8L0J1aWxkQWN0aW9uRW50 cnk+CiAgICAgICAgICA8QnVpbGRBY3Rpb25FbnRyeQogICAgICAgICAgICAgYnVpbGRGb3JUZXN0 aW5nID0gIllFUyIKLSAgICAgICAgICAgIGJ1aWxkRm9yUnVubmluZyA9ICJOTyIKKyAgICAgICAg ICAgIGJ1aWxkRm9yUnVubmluZyA9ICJZRVMiCiAgICAgICAgICAgICBidWlsZEZvclByb2ZpbGlu ZyA9ICJOTyIKICAgICAgICAgICAgIGJ1aWxkRm9yQXJjaGl2aW5nID0gIk5PIgogICAgICAgICAg ICAgYnVpbGRGb3JBbmFseXppbmcgPSAiTk8iPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0NvY29hL1dlYktpdFN3aWZ0T3ZlcmxheS5zd2lmdCBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XZWJLaXRTd2lmdE92ZXJsYXkuc3dpZnQKaW5kZXggODA1 NzY4ZDcwYWNjODNjM2RlYzkyOTgyZTg3OWM2NDk4MWZmOGE1NS4uNDIwODJjNWQ4OTRmNmY0Mjhm MjJlODFlZWIxZTcyYTQwZTMzZTY2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0NvY29hL1dlYktpdFN3aWZ0T3ZlcmxheS5zd2lmdAorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV2ViS2l0U3dpZnRPdmVybGF5LnN3aWZ0CkBAIC0zNSw4ICsz NSw4IEBAIGV4dGVuc2lvbiBXS1BERkNvbmZpZ3VyYXRpb24gewogCiBAYXZhaWxhYmxlKGlPUyAx NC4wLCBtYWNPUyAxMC4xNiwgKikKIGV4dGVuc2lvbiBXS1dlYlZpZXcgewotICAgIHB1YmxpYyBm dW5jIGNhbGxBc3luY0phdmFTY3JpcHQoXyBmdW5jdGlvbkJvZHk6IFN0cmluZywgYXJndW1lbnRz OiBbU3RyaW5nOkFueV0gPSBbOl0sIGluIGNvbnRlbnRXb3JsZDogV0tDb250ZW50V29ybGQsIGNv bXBsZXRpb246IEBlc2NhcGluZyhSZXN1bHQ8QW55LCBFcnJvcj4pIC0+IFZvaWQpIHsKLSAgICAg ICAgX19jYWxsQXN5bmNKYXZhU2NyaXB0KGZ1bmN0aW9uQm9keSwgYXJndW1lbnRzOiBhcmd1bWVu dHMsIGluOiBjb250ZW50V29ybGQsIGNvbXBsZXRpb25IYW5kbGVyOiBtYWtlUmVzdWx0SGFuZGxl cihjb21wbGV0aW9uKSkKKyAgICBwdWJsaWMgZnVuYyBjYWxsQXN5bmNKYXZhU2NyaXB0KF8gZnVu Y3Rpb25Cb2R5OiBTdHJpbmcsIGFyZ3VtZW50czogW1N0cmluZzpBbnldID0gWzpdLCBpbiBjb250 ZW50V29ybGQ6IFdLQ29udGVudFdvcmxkLCBjb21wbGV0aW9uSGFuZGxlcjogKChSZXN1bHQ8QW55 LCBFcnJvcj4pIC0+IFZvaWQpPyA9IG5pbCkgeworICAgICAgICBfX2NhbGxBc3luY0phdmFTY3Jp cHQoZnVuY3Rpb25Cb2R5LCBhcmd1bWVudHM6IGFyZ3VtZW50cywgaW46IGNvbnRlbnRXb3JsZCwg Y29tcGxldGlvbkhhbmRsZXI6IGNvbXBsZXRpb25IYW5kbGVyLm1hcChtYWtlUmVzdWx0SGFuZGxl cikpCiAgICAgfQogCiAgICAgcHVibGljIGZ1bmMgY3JlYXRlUERGKGNvbmZpZ3VyYXRpb246IFdL UERGQ29uZmlndXJhdGlvbiA9IC5pbml0KCksIGNvbXBsZXRpb25IYW5kbGVyOiBAZXNjYXBpbmcg KFJlc3VsdDxEYXRhLCBFcnJvcj4pIC0+IFZvaWQpIHsKQEAgLTQ3LDggKzQ3LDggQEAgZXh0ZW5z aW9uIFdLV2ViVmlldyB7CiAgICAgICAgIF9fY3JlYXRlV2ViQXJjaGl2ZURhdGEoY29tcGxldGlv bkhhbmRsZXI6IG1ha2VSZXN1bHRIYW5kbGVyKGNvbXBsZXRpb25IYW5kbGVyKSkKICAgICB9CiAK LSAgICBwdWJsaWMgZnVuYyBldmFsdWF0ZUphdmFTY3JpcHQoXyBqYXZhU2NyaXB0OiBTdHJpbmcs IGluIGNvbnRlbnRXb3JsZDogV0tDb250ZW50V29ybGQsIGNvbXBsZXRpb246IEBlc2NhcGluZyAo UmVzdWx0PEFueSwgRXJyb3I+KSAtPiBWb2lkKSB7Ci0gICAgICAgIF9fZXZhbHVhdGVKYXZhU2Ny aXB0KGphdmFTY3JpcHQsIGluOiBjb250ZW50V29ybGQsIGNvbXBsZXRpb25IYW5kbGVyOiBtYWtl UmVzdWx0SGFuZGxlcihjb21wbGV0aW9uKSkKKyAgICBwdWJsaWMgZnVuYyBldmFsdWF0ZUphdmFT Y3JpcHQoXyBqYXZhU2NyaXB0OiBTdHJpbmcsIGluIGNvbnRlbnRXb3JsZDogV0tDb250ZW50V29y bGQsIGNvbXBsZXRpb25IYW5kbGVyOiAoKFJlc3VsdDxBbnksIEVycm9yPikgLT4gVm9pZCk/ID0g bmlsKSB7CisgICAgICAgIF9fZXZhbHVhdGVKYXZhU2NyaXB0KGphdmFTY3JpcHQsIGluOiBjb250 ZW50V29ybGQsIGNvbXBsZXRpb25IYW5kbGVyOiBjb21wbGV0aW9uSGFuZGxlci5tYXAobWFrZVJl c3VsdEhhbmRsZXIpKQogICAgIH0KIAogICAgIHB1YmxpYyBmdW5jIGZpbmQoXyBzdHJpbmc6IFN0 cmluZywgY29uZmlndXJhdGlvbjogV0tGaW5kQ29uZmlndXJhdGlvbiA9IC5pbml0KCksIGNvbXBs ZXRpb25IYW5kbGVyOiBAZXNjYXBpbmcgKFdLRmluZFJlc3VsdCkgLT4gVm9pZCkgewo=