204300 2019-11-18 09:46:18 -0800 [Cocoa] Add WKUIDelegate SPI to inform clients when a _WKInspector attaches to a WKWebView 2022-03-01 02:27:20 -0800 1 1 1 Unclassified WebKit WebKit API WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bburg bburg achristensen bburg hi joepeck thorton timothy webkit-bug-importer oldest_to_newest 1591091 0 bburg 2019-11-18 09:46:18 -0800 , 1591093 1 bburg 2019-11-18 09:47:50 -0800 <rdar://problem/57136993> 1591299 2 383799 bburg 2019-11-18 16:07:24 -0800 Created attachment 383799 Patch 1591334 3 383799 hi 2019-11-18 17:10:36 -0800 Comment on attachment 383799 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=383799&action=review r=me > Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h:240 > +- (void)_webView:(WKWebView *)webView didAttachInspector:(_WKInspector *)inspector WK_API_AVAILABLE(macos(WK_MAC_TBA)); > +#endif // !TARGET_OS_IPHONE Wouldn't it be more accurate to have this be in its own `#if TARGET_OS_MAC`? 1591358 4 joepeck 2019-11-18 17:32:08 -0800 (In reply to Devin Rousso from comment #3) > Comment on attachment 383799 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=383799&action=review > > r=me > > > Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h:240 > > +- (void)_webView:(WKWebView *)webView didAttachInspector:(_WKInspector *)inspector WK_API_AVAILABLE(macos(WK_MAC_TBA)); > > +#endif // !TARGET_OS_IPHONE > > Wouldn't it be more accurate to have this be in its own `#if TARGET_OS_MAC`? • TARGET_OS_MAC is more like DARWIN, it includes "everything" macOS, iOS, tvOS, watchOS etc • TARGET_OS_IPHONE is more like IOS_FAMILY or EMBEDDED for us. It includes iOS, tvOS, watchOS, etc. TARGET_OS_OSX is the thing that only targets directly macOS, however we don't use that anywhere in WebKit yet (I assume for compatibility when building on older OSes). The norm in WebKit is to use !TARGET_OS_IPHONE right now. 1591562 5 bburg 2019-11-19 09:11:56 -0800 Committed r252634: <https://trac.webkit.org/changeset/252634> 383799 2019-11-18 16:07:24 -0800 2022-03-01 02:27:20 -0800 Patch bug-204300-20191118160724.patch text/plain 12204 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyNjAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGU0ZDhlNGEwNWQ0N2YwY2U0 NWZkZDczZjFmOTBkYWVhYWExNWE4NWQuLmU1YTdiMTI3OTE3NDU0ZjczN2IwMjIwMDY0MTYxNzhj MTBlYjlmOGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTktMTEtMTggIEJyaWFuIEJ1 cmcgIDxiYnVyZ0BhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBBZGQgV0tVSURlbGVnYXRl IFNQSSB0byBpbmZvcm0gY2xpZW50cyB3aGVuIGEgX1dLSW5zcGVjdG9yIGF0dGFjaGVzIHRvIGEg V0tXZWJWaWV3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMDQzMDAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU3MTM2OTkzPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIG5ldyBVSSBkZWxlZ2F0 ZSBtZXRob2QgdG8gbm90aWZ5IGNsaWVudHMgd2hlbiBsb2NhbCBXZWIgSW5zcGVjdG9yIGlzIGFi b3V0IHRvIGJlIGxvYWRlZC4KKyAgICAgICAgVGhpcyBjYW4gYmUgdHJpZ2dlcmVkIGJ5IC1bX1dL SW5zcGVjdG9yIHNob3ddIGluIHRoZSBDb2NvYSBBUEksIG9yIHZpYSB0aGUgV2ViQ29yZS1jb250 cm9sbGVkIAorICAgICAgICBJbnNwZWN0IGNvbnRleHQgbWVudSBpdGVtLgorCisgICAgICAgIFRo ZSBjbGllbnQgY2FuIHRoZW4gY29uZmlndXJlIFdlYiBJbnNwZWN0b3IgdXNpbmcgZGVsZWdhdGVz IG9yIGJ5IHNldHRpbmcgX1dLSW5zcGVjdG9yIHByb3BlcnRpZXMuCisKKyAgICAgICAgQ292ZXJl ZCBieSBuZXcgQVBJIHRlc3QgV2ViS2l0LkRpZE5vdGlmeVdoZW5JbnNwZWN0b3JBdHRhY2hlZC4K KworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQVBJVUlDbGllbnQuaDoKKyAgICAgICAgKEFQSTo6 VUlDbGllbnQ6OmRpZEF0dGFjaEluc3BlY3Rvcik6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1VJRGVsZWdhdGVQcml2YXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1VJ RGVsZWdhdGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5tbToKKyAg ICAgICAgKFdlYktpdDo6VUlEZWxlZ2F0ZTo6c2V0RGVsZWdhdGUpOgorICAgICAgICAoV2ViS2l0 OjpVSURlbGVnYXRlOjpVSUNsaWVudDo6ZGlkQXR0YWNoSW5zcGVjdG9yKToKKyAgICAgICAgKiBV SVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNw ZWN0b3JQcm94eTo6b3BlbkxvY2FsSW5zcGVjdG9yRnJvbnRlbmQpOgorCiAyMDE5LTExLTE4ICBB bGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVXNl IFNlY1RydXN0RXZhbHVhdGVXaXRoRXJyb3IgaW5zdGVhZCBvZiBTZWNUcnVzdEV2YWx1YXRlIHdo ZXJlIGF2YWlsYWJsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQ SVVJQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJVUlDbGllbnQuaApp bmRleCBkOTIyYmUwYjFmN2UzY2ZhNTYyY2NmOWQ0Mjg4ZDY0MmY5ZTVjZmZhLi41NDUxMzAzNWIy NjFiZmQ1ZTE4N2VjOTQ1Nzk2MTk4ZWQwOWQ4OGIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQVBJVUlDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQVBJVUlDbGllbnQuaApAQCAtMTk5LDYgKzE5OSw4IEBAIHB1YmxpYzoKICNpZiBFTkFC TEUoV0VCX0FVVEhOKQogICAgIHZpcnR1YWwgdm9pZCBydW5XZWJBdXRoZW50aWNhdGlvblBhbmVs KFdlYktpdDo6V2ViUGFnZVByb3h5JiwgV2ViQXV0aGVudGljYXRpb25QYW5lbCYsIFdlYktpdDo6 V2ViRnJhbWVQcm94eSYsIFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSYmLCBDb21wbGV0aW9u SGFuZGxlcjx2b2lkKFdlYktpdDo6V2ViQXV0aGVudGljYXRpb25QYW5lbFJlc3VsdCk+JiYgY29t cGxldGlvbkhhbmRsZXIpIHsgY29tcGxldGlvbkhhbmRsZXIoV2ViS2l0OjpXZWJBdXRoZW50aWNh dGlvblBhbmVsUmVzdWx0OjpVbmF2YWlsYWJsZSk7IH0KICNlbmRpZgorCisgICAgdmlydHVhbCB2 b2lkIGRpZEF0dGFjaEluc3BlY3RvcihXZWJLaXQ6OldlYlBhZ2VQcm94eSYsIFdlYktpdDo6V2Vi SW5zcGVjdG9yUHJveHkmKSB7IH0KIH07CiAKIH0gLy8gbmFtZXNwYWNlIEFQSQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLVUlEZWxlZ2F0ZVByaXZhdGUu aCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1VJRGVsZWdhdGVQcml2YXRl LmgKaW5kZXggNDgxMzlhZWQ5NjgyNzJjYWRkMzQxNDU3MzM2ZTM0YzQ3NTAzZTlmYi4uNTM2MmIx OGU4NTNmYTU0ODMxNjllZjRlMjIxZWUxOWYyOGM0OGViMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLVUlEZWxlZ2F0ZVByaXZhdGUuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVSURlbGVnYXRlUHJpdmF0ZS5oCkBAIC0y MDMsNyArMjAzLDcgQEAgc3RydWN0IFVJRWRnZUluc2V0czsKICAqLwogLSAodm9pZClfd2ViVmll dzooV0tXZWJWaWV3ICopd2ViVmlldyBzaG91bGRBbGxvd0RldmljZU9yaWVudGF0aW9uQW5kTW90 aW9uQWNjZXNzUmVxdWVzdGVkQnlGcmFtZTooV0tGcmFtZUluZm8gKilyZXF1ZXN0aW5nRnJhbWUg ZGVjaXNpb25IYW5kbGVyOih2b2lkICheKShCT09MKSlkZWNpc2lvbkhhbmRsZXIgV0tfQVBJX0FW QUlMQUJMRShpb3MoMTMuMCkpOwogCi0jZWxzZSAvLyBUQVJHRVRfT1NfSVBIT05FCisjZWxzZSAv LyAhVEFSR0VUX09TX0lQSE9ORQogLSAodm9pZClfcHJlcGFyZUZvckltbWVkaWF0ZUFjdGlvbkFu aW1hdGlvbkZvcldlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgV0tfQVBJX0FWQUlMQUJMRSht YWNvcygxMC4xMy40KSk7CiAtICh2b2lkKV9jYW5jZWxJbW1lZGlhdGVBY3Rpb25BbmltYXRpb25G b3JXZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoMTAu MTMuNCkpOwogLSAodm9pZClfY29tcGxldGVJbW1lZGlhdGVBY3Rpb25BbmltYXRpb25Gb3JXZWJW aWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoMTAuMTMuNCkp OwpAQCAtMjMyLDYgKzIzMiwxMSBAQCBzdHJ1Y3QgVUlFZGdlSW5zZXRzOwogLSAoTlNNZW51ICop X3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgY29udGV4dE1lbnU6KE5TTWVudSAqKW1lbnUg Zm9yRWxlbWVudDooX1dLQ29udGV4dE1lbnVFbGVtZW50SW5mbyAqKWVsZW1lbnQgdXNlckluZm86 KGlkIDxOU1NlY3VyZUNvZGluZz4pdXNlckluZm8gV0tfQVBJX0RFUFJFQ0FURURfV0lUSF9SRVBM QUNFTUVOVCgiX3dlYlZpZXc6Z2V0Q29udGV4dE1lbnVGcm9tUHJvcG9zZWRNZW51OmZvckVsZW1l bnQ6dXNlckluZm86Y29tcGxldGlvbkhhbmRsZXI6IiwgbWFjb3MoMTAuMTIsIDEwLjE0LjQpKTsK IC0gKHZvaWQpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZ2V0Q29udGV4dE1lbnVGcm9t UHJvcG9zZWRNZW51OihOU01lbnUgKiltZW51IGZvckVsZW1lbnQ6KF9XS0NvbnRleHRNZW51RWxl bWVudEluZm8gKillbGVtZW50IHVzZXJJbmZvOihpZCA8TlNTZWN1cmVDb2Rpbmc+KXVzZXJJbmZv IGNvbXBsZXRpb25IYW5kbGVyOih2b2lkICheKShOU01lbnUgKikpY29tcGxldGlvbkhhbmRsZXIg V0tfQVBJX0FWQUlMQUJMRShtYWNvcygxMC4xNCkpOwogLSAodm9pZClfd2ViVmlldzooV0tXZWJW aWV3ICopd2ViVmlldyBkaWRQZXJmb3JtRHJhZ09wZXJhdGlvbjooQk9PTCloYW5kbGVkIFdLX0FQ SV9BVkFJTEFCTEUobWFjb3MoMTAuMTQuNCkpOwotI2VuZGlmIC8vIFRBUkdFVF9PU19JUEhPTkUK KworLyohIEBhYnN0cmFjdCBDYWxsZWQgd2hlbiBhIFdlYiBJbnNwZWN0b3IgaW5zdGFuY2UgaXMg YXR0YWNoZWQgdG8gdGhpcyBXS1dlYlZpZXcuIFRoaXMgaXMgbm90IGNhbGxlZCBpbiB0aGUgY2Fz ZSBvZiByZW1vdGUgaW5zcGVjdGlvbi4KKyAgICBAcGFyYW0gaW5zcGVjdG9yIFRoZSBXZWIgSW5z cGVjdG9yIGluc3RhbmNlIGF0dGFjaGVkIHRvIHRoaXMgV0tXZWJWaWV3LgorKi8KKy0gKHZvaWQp X3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZGlkQXR0YWNoSW5zcGVjdG9yOihfV0tJbnNw ZWN0b3IgKilpbnNwZWN0b3IgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJBKSk7Cisj ZW5kaWYgLy8gIVRBUkdFVF9PU19JUEhPTkUKIAogQGVuZApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQ29jb2EvVUlEZWxlZ2F0ZS5oCmluZGV4IDMzYmMxNWJiZDk0NDk3YjUyODFjYzQ0YjYwYzYz OTBmNWViMDhkYjMuLmM5NDk4Zjk5MTA3ZjVkNDE2ZjM0OTUwOWE2YmZiNmMyMzEwYmQ5MzggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1VJRGVsZWdhdGUuaAorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLmgKQEAgLTEyNCw2ICsx MjQsNyBAQCBwcml2YXRlOgogICAgICAgICBib29sIHJ1bk9wZW5QYW5lbChXZWJQYWdlUHJveHkm LCBXZWJGcmFtZVByb3h5KiwgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiYsIEFQSTo6T3Bl blBhbmVsUGFyYW1ldGVycyosIFdlYk9wZW5QYW5lbFJlc3VsdExpc3RlbmVyUHJveHkqKSBmaW5h bDsKICAgICAgICAgdm9pZCBkaWRFeGNlZWRCYWNrZ3JvdW5kUmVzb3VyY2VMaW1pdFdoaWxlSW5G b3JlZ3JvdW5kKFdlYlBhZ2VQcm94eSYsIFdLUmVzb3VyY2VMaW1pdCkgZmluYWw7CiAgICAgICAg IHZvaWQgc2F2ZURhdGFUb0ZpbGVJbkRvd25sb2Fkc0ZvbGRlcihXZWJQYWdlUHJveHkqLCBjb25z dCBXVEY6OlN0cmluZyYsIGNvbnN0IFdURjo6U3RyaW5nJiwgY29uc3QgVVJMJiwgQVBJOjpEYXRh JikgZmluYWw7CisgICAgICAgIHZvaWQgZGlkQXR0YWNoSW5zcGVjdG9yKFdlYlBhZ2VQcm94eSYs IFdlYkluc3BlY3RvclByb3h5JikgZmluYWw7CiAjZW5kaWYKICNpZiBFTkFCTEUoREVWSUNFX09S SUVOVEFUSU9OKQogICAgICAgICB2b2lkIHNob3VsZEFsbG93RGV2aWNlT3JpZW50YXRpb25BbmRN b3Rpb25BY2Nlc3MoV2ViS2l0OjpXZWJQYWdlUHJveHkmLCBXZWJGcmFtZVByb3h5JiwgV2ViQ29y ZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiYsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoYm9vbCk+JiYp IGZpbmFsOwpAQCAtMTk4LDYgKzE5OSw3IEBAIHByaXZhdGU6CiAgICAgICAgIGJvb2wgd2ViVmll d1NhdmVEYXRhVG9GaWxlU3VnZ2VzdGVkRmlsZW5hbWVNaW1lVHlwZU9yaWdpbmF0aW5nVVJMIDog MTsKICAgICAgICAgYm9vbCB3ZWJWaWV3UnVuT3BlblBhbmVsV2l0aFBhcmFtZXRlcnNJbml0aWF0 ZWRCeUZyYW1lQ29tcGxldGlvbkhhbmRsZXIgOiAxOwogICAgICAgICBib29sIHdlYlZpZXdSZXF1 ZXN0Tm90aWZpY2F0aW9uUGVybWlzc2lvbkZvclNlY3VyaXR5T3JpZ2luRGVjaXNpb25IYW5kbGVy IDogMTsKKyAgICAgICAgYm9vbCB3ZWJWaWV3RGlkQXR0YWNoSW5zcGVjdG9yIDogMTsKICNlbmRp ZgogI2lmIEVOQUJMRShERVZJQ0VfT1JJRU5UQVRJT04pCiAgICAgICAgIGJvb2wgd2ViVmlld1No b3VsZEFsbG93RGV2aWNlT3JpZW50YXRpb25BbmRNb3Rpb25BY2Nlc3NSZXF1ZXN0ZWRCeUZyYW1l RGVjaXNpb25IYW5kbGVyIDogMTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0NvY29hL1VJRGVsZWdhdGUubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9VSURl bGVnYXRlLm1tCmluZGV4IDkyZWE3M2I2Y2Y1NTBhZjM0MDgxYWM3NGUwZDllOGIzY2NmY2MwNTUu LjgzOTkwZDllODFlNzk3ZTY4NzI3YWFlOGJhNTYyZWNmZWEzZTZhYTQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1VJRGVsZWdhdGUubW0KKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5tbQpAQCAtNDcsMTEgKzQ3LDEzIEBACiAj aW1wb3J0ICJXS1dlYlZpZXdJbnRlcm5hbC5oIgogI2ltcG9ydCAiV0tXaW5kb3dGZWF0dXJlc0lu dGVybmFsLmgiCiAjaW1wb3J0ICJXZWJFdmVudEZhY3RvcnkuaCIKKyNpbXBvcnQgIldlYkluc3Bl Y3RvclByb3h5LmgiCiAjaW1wb3J0ICJXZWJPcGVuUGFuZWxSZXN1bHRMaXN0ZW5lclByb3h5Lmgi CiAjaW1wb3J0ICJXZWJQcm9jZXNzUHJveHkuaCIKICNpbXBvcnQgIl9XS0NvbnRleHRNZW51RWxl bWVudEluZm8uaCIKICNpbXBvcnQgIl9XS0ZyYW1lSGFuZGxlSW50ZXJuYWwuaCIKICNpbXBvcnQg Il9XS0hpdFRlc3RSZXN1bHRJbnRlcm5hbC5oIgorI2ltcG9ydCAiX1dLSW5zcGVjdG9ySW50ZXJu YWwuaCIKICNpbXBvcnQgIl9XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWxJbnRlcm5hbC5oIgogI2lt cG9ydCA8V2ViQ29yZS9Gb250QXR0cmlidXRlcy5oPgogI2ltcG9ydCA8V2ViQ29yZS9TZWN1cml0 eU9yaWdpbkRhdGEuaD4KQEAgLTEzMSw2ICsxMzMsNyBAQCB2b2lkIFVJRGVsZWdhdGU6OnNldERl bGVnYXRlKGlkIDxXS1VJRGVsZWdhdGU+IGRlbGVnYXRlKQogICAgIG1fZGVsZWdhdGVNZXRob2Rz LndlYlZpZXdTYXZlRGF0YVRvRmlsZVN1Z2dlc3RlZEZpbGVuYW1lTWltZVR5cGVPcmlnaW5hdGlu Z1VSTCA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3OnNh dmVEYXRhVG9GaWxlOnN1Z2dlc3RlZEZpbGVuYW1lOm1pbWVUeXBlOm9yaWdpbmF0aW5nVVJMOild OwogICAgIG1fZGVsZWdhdGVNZXRob2RzLndlYlZpZXdSdW5PcGVuUGFuZWxXaXRoUGFyYW1ldGVy c0luaXRpYXRlZEJ5RnJhbWVDb21wbGV0aW9uSGFuZGxlciA9IFtkZWxlZ2F0ZSByZXNwb25kc1Rv U2VsZWN0b3I6QHNlbGVjdG9yKHdlYlZpZXc6cnVuT3BlblBhbmVsV2l0aFBhcmFtZXRlcnM6aW5p dGlhdGVkQnlGcmFtZTpjb21wbGV0aW9uSGFuZGxlcjopXTsKICAgICBtX2RlbGVnYXRlTWV0aG9k cy53ZWJWaWV3UmVxdWVzdE5vdGlmaWNhdGlvblBlcm1pc3Npb25Gb3JTZWN1cml0eU9yaWdpbkRl Y2lzaW9uSGFuZGxlciA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93 ZWJWaWV3OnJlcXVlc3ROb3RpZmljYXRpb25QZXJtaXNzaW9uRm9yU2VjdXJpdHlPcmlnaW46ZGVj aXNpb25IYW5kbGVyOildOworICAgIG1fZGVsZWdhdGVNZXRob2RzLndlYlZpZXdEaWRBdHRhY2hJ bnNwZWN0b3IgPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfd2ViVmll dzpkaWRBdHRhY2hJbnNwZWN0b3I6KV07CiAjZW5kaWYKICNpZiBFTkFCTEUoREVWSUNFX09SSUVO VEFUSU9OKQogICAgIG1fZGVsZWdhdGVNZXRob2RzLndlYlZpZXdTaG91bGRBbGxvd0RldmljZU9y aWVudGF0aW9uQW5kTW90aW9uQWNjZXNzUmVxdWVzdGVkQnlGcmFtZURlY2lzaW9uSGFuZGxlciA9 IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3OnNob3VsZEFs bG93RGV2aWNlT3JpZW50YXRpb25BbmRNb3Rpb25BY2Nlc3NSZXF1ZXN0ZWRCeUZyYW1lOmRlY2lz aW9uSGFuZGxlcjopXTsKQEAgLTg0NSw2ICs4NDgsMTggQEAgYm9vbCBVSURlbGVnYXRlOjpVSUNs aWVudDo6cnVuT3BlblBhbmVsKFdlYlBhZ2VQcm94eSYsIFdlYkZyYW1lUHJveHkqIHdlYkZyYW1l UHIKIAogICAgIHJldHVybiB0cnVlOwogfQorCit2b2lkIFVJRGVsZWdhdGU6OlVJQ2xpZW50Ojpk aWRBdHRhY2hJbnNwZWN0b3IoV2ViS2l0OjpXZWJQYWdlUHJveHkmLCBXZWJLaXQ6OldlYkluc3Bl Y3RvclByb3h5JiBpbnNwZWN0b3IpCit7CisgICAgaWYgKCFtX3VpRGVsZWdhdGUubV9kZWxlZ2F0 ZU1ldGhvZHMud2ViVmlld0RpZEF0dGFjaEluc3BlY3RvcikKKyAgICAgICAgcmV0dXJuOworCisg ICAgYXV0byBkZWxlZ2F0ZSA9IG1fdWlEZWxlZ2F0ZS5tX2RlbGVnYXRlLmdldCgpOworICAgIGlm ICghZGVsZWdhdGUpCisgICAgICAgIHJldHVybjsKKworICAgIFsoaWQgPFdLVUlEZWxlZ2F0ZVBy aXZhdGU+KWRlbGVnYXRlIF93ZWJWaWV3Om1fdWlEZWxlZ2F0ZS5tX3dlYlZpZXcgZGlkQXR0YWNo SW5zcGVjdG9yOndyYXBwZXIoaW5zcGVjdG9yKV07Cit9CiAjZW5kaWYKIAogI2lmIEVOQUJMRShE RVZJQ0VfT1JJRU5UQVRJT04pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJJbnNwZWN0b3JQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJJbnNwZWN0 b3JQcm94eS5jcHAKaW5kZXggNWNmMjdhMGMyYzgxYTIwNmRhZDUzNWFiMTNhYmNjNTYxODBiNGY2 Yy4uNTc0YmZjMmFhN2IwMTQ3YTMyMWRhMDk5MDRjNmI5OWNjMDkzNTcxMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkluc3BlY3RvclByb3h5LmNwcApAQCAtMjksNiArMjksNyBA QAogCiAjaW5jbHVkZSAiQVBJTmF2aWdhdGlvbi5oIgogI2luY2x1ZGUgIkFQSVByb2Nlc3NQb29s Q29uZmlndXJhdGlvbi5oIgorI2luY2x1ZGUgIkFQSVVJQ2xpZW50LmgiCiAjaW5jbHVkZSAiV2Vi QXV0b21hdGlvblNlc3Npb24uaCIKICNpbmNsdWRlICJXZWJGcmFtZVByb3h5LmgiCiAjaW5jbHVk ZSAiV2ViSW5zcGVjdG9ySW50ZXJydXB0RGlzcGF0Y2hlck1lc3NhZ2VzLmgiCkBAIC00NDQsNiAr NDQ1LDEzIEBAIHZvaWQgV2ViSW5zcGVjdG9yUHJveHk6Om9wZW5Mb2NhbEluc3BlY3RvckZyb250 ZW5kKGJvb2wgY2FuQXR0YWNoLCBib29sIHVuZGVyVGVzCiAgICAgICAgIG1faW5zcGVjdG9yUGFn ZS0+cHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OldlYkluc3BlY3RvclVJOjpTZXREb2NraW5nVW5h dmFpbGFibGUoIW1fY2FuQXR0YWNoKSwgbV9pbnNwZWN0b3JQYWdlLT53ZWJQYWdlSUQoKSk7CiAg ICAgfQogCisgICAgLy8gTm90aWZ5IFdlYktpdCBjbGllbnQgd2hlbiBhIGxvY2FsIGluc3BlY3Rv ciBhdHRhY2hlcyBzbyB0aGF0IGl0IG1heSBpbnN0YWxsIGRlbGVnYXRlcyBwcmlvciB0byB0aGUg X1dLSW5zcGVjdG9yIGxvYWRpbmcgaXRzIGZyb250ZW5kLgorICAgIG1faW5zcGVjdGVkUGFnZS0+ dWlDbGllbnQoKS5kaWRBdHRhY2hJbnNwZWN0b3IoKm1faW5zcGVjdGVkUGFnZSwgKnRoaXMpOwor CisgICAgLy8gQmFpbCBvdXQgaWYgdGhlIGNsaWVudCBjbG9zZWQgdGhlIGluc3BlY3RvciBmcm9t IHRoZSBkZWxlZ2F0ZSBtZXRob2QuCisgICAgaWYgKCFtX2luc3BlY3RvclBhZ2UpCisgICAgICAg IHJldHVybjsKKwogICAgIG1faW5zcGVjdG9yUGFnZS0+bG9hZFJlcXVlc3QoVVJMKFVSTCgpLCBt X3VuZGVyVGVzdCA/IFdlYkluc3BlY3RvclByb3h5OjppbnNwZWN0b3JUZXN0UGFnZVVSTCgpIDog V2ViSW5zcGVjdG9yUHJveHk6Omluc3BlY3RvclBhZ2VVUkwoKSkpOwogfQogCmRpZmYgLS1naXQg YS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNjcwYWMwZmI0YmI3ZWI3 ZDkxYWNmMGY3YWIzMWI5NDQyZDU5YzU2Ni4uOTBjYWZiNzc3OGFjMTFkNWY4NGM4NzM2MTFhMmVl ZjEwMDEwOWNiMSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE5LTExLTE4ICBCcmlhbiBCdXJnICA8YmJ1cmdAYXBw bGUuY29tPgorCisgICAgICAgIFtDb2NvYV0gQWRkIFdLVUlEZWxlZ2F0ZSBTUEkgdG8gaW5mb3Jt IGNsaWVudHMgd2hlbiBhIF9XS0luc3BlY3RvciBhdHRhY2hlcyB0byBhIFdLV2ViVmlldworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA0MzAwCisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS81NzEzNjk5Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev VUlEZWxlZ2F0ZS5tbToKKyAgICAgICAgKC1bSW5zcGVjdG9yRGVsZWdhdGUgX3dlYlZpZXc6ZGlk QXR0YWNoSW5zcGVjdG9yOl0pOgorICAgICAgICAoVEVTVCk6IEFkZCBuZXcgdGVzdCB0byBlbnN1 cmUgdGhlIGRlbGVnYXRlIGlzIGNhbGxlZCBhcyBleHBlY3RlZC4KKwogMjAxOS0xMS0xOCAgQ2hy aXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFRlc3RXZWJLaXRBUEkuUHJv Y2Vzc1N3YXAuUXVpY2tCYWNrRm9yd2FyZE5hdmlnYXRpb25XaXRoUFNPTiBpcyBhIGZsYWt5IGNy YXNoCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1VJ RGVsZWdhdGUubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1VJRGVs ZWdhdGUubW0KaW5kZXggNjJiNWZjMWMzNjU4MGMxNTNiNjY4MTQ5MjI3YWM4Yzc1YTM3ZmRmOS4u NzkxN2I4ZjlkMmY2NzlhMTE5OTgyYjhlNTAxMjJjYWVlMTJkZjNlYyAxMDA2NDQKLS0tIGEvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9VSURlbGVnYXRlLm1tCisrKyBiL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvVUlEZWxlZ2F0ZS5tbQpAQCAtMzgs NiArMzgsNyBAQAogI2ltcG9ydCA8V2ViS2l0L1dLVUlEZWxlZ2F0ZVByaXZhdGUuaD4KICNpbXBv cnQgPFdlYktpdC9XS1dlYlZpZXdQcml2YXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQvX1dLSGl0VGVz dFJlc3VsdC5oPgorI2ltcG9ydCA8V2ViS2l0L19XS0luc3BlY3Rvci5oPgogI2ltcG9ydCA8d3Rm L1JldGFpblB0ci5oPgogI2ltcG9ydCA8d3RmL1ZlY3Rvci5oPgogCkBAIC04OTksNCArOTAwLDM0 IEBAIFRFU1QoV2ViS2l0LCBEaWROb3RIYW5kbGVXaGVlbEV2ZW50KQogCiAjZW5kaWYgLy8gUkVM SUFCTEVfRElEX05PVF9IQU5ETEVfV0hFRUxfRVZFTlQKIAorQGludGVyZmFjZSBJbnNwZWN0b3JE ZWxlZ2F0ZSA6IE5TT2JqZWN0IDxXS1VJRGVsZWdhdGVQcml2YXRlPgorQGVuZAorCitAaW1wbGVt ZW50YXRpb24gSW5zcGVjdG9yRGVsZWdhdGUKKworLSAodm9pZClfd2ViVmlldzooV0tXZWJWaWV3 ICopd2ViVmlldyBkaWRBdHRhY2hJbnNwZWN0b3I6KF9XS0luc3BlY3RvciAqKWluc3BlY3Rvcgor eworICAgIEVYUEVDVF9FUSh3ZWJWaWV3Ll9pbnNwZWN0b3IsIGluc3BlY3Rvcik7CisgICAgRVhQ RUNUX1RSVUUod2ViVmlldy5faGFzSW5zcGVjdG9yRnJvbnRlbmQpOworICAgIFtpbnNwZWN0b3Ig Y2xvc2VdOworICAgIGRvbmUgPSB0cnVlOworfQorCitAZW5kCisKK1RFU1QoV2ViS2l0LCBEaWRO b3RpZnlXaGVuSW5zcGVjdG9yQXR0YWNoZWQpCit7CisgICAgYXV0byB3ZWJWaWV3Q29uZmlndXJh dGlvbiA9IGFkb3B0TlMoW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gbmV3XSk7CisgICAgd2ViVmll d0NvbmZpZ3VyYXRpb24uZ2V0KCkucHJlZmVyZW5jZXMuX2RldmVsb3BlckV4dHJhc0VuYWJsZWQg PSBZRVM7CisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5p dFdpdGhGcmFtZTpDR1JlY3RNYWtlKDAsIDAsIDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOndlYlZp ZXdDb25maWd1cmF0aW9uLmdldCgpXSk7CisgICAgYXV0byBkZWxlZ2F0ZSA9IGFkb3B0TlMoW0lu c3BlY3RvckRlbGVnYXRlIG5ld10pOworICAgIFt3ZWJWaWV3IHNldFVJRGVsZWdhdGU6ZGVsZWdh dGUuZ2V0KCldOworICAgIFt3ZWJWaWV3IGxvYWRIVE1MU3RyaW5nOkAiPGhlYWQ+PHRpdGxlPlRl c3QgcGFnZSB0byBiZSBpbnNwZWN0ZWQ8L3RpdGxlPjwvaGVhZD48Ym9keT48cD5GaWxsZXIgY29u dGVudDwvcD48L2JvZHk+IiBiYXNlVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAiaHR0cDovL2V4 YW1wbGUuY29tLyJdXTsKKworICAgIEVYUEVDVF9GQUxTRSh3ZWJWaWV3LmdldCgpLl9oYXNJbnNw ZWN0b3JGcm9udGVuZCk7CisKKyAgICBbW3dlYlZpZXcgX2luc3BlY3Rvcl0gc2hvd107CisgICAg VGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKK30KKwogI2VuZGlmIC8vIFBMQVRGT1JN KE1BQykK