182540 2018-02-06 10:35:25 -0800 Add WKNavigationDelegate SPI to tell the client when an insecure plug-in is blocked 2018-02-06 14:45:29 -0800 1 1 1 Unclassified WebKit WebKit API WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jeffm jeffm achristensen jeffm webkit-bug-importer oldest_to_newest 1396829 0 jeffm 2018-02-06 10:35:25 -0800 Add WKNavigationDelegate SPI to tell the client when an insecure plug-in is blocked to match existing functionality in WKPageLoaderClient. WKPageLoaderClient has a pluginDidFail callback that's invoked when a plug-in fails to initialize and when an insecure plug-in is blocked, but WKNavigationDelegate only defines a -_webView:didFailToInitializePlugInWithInfo: method for the former case. 1396830 1 webkit-bug-importer 2018-02-06 10:37:47 -0800 <rdar://problem/37279560> 1396921 2 333209 jeffm 2018-02-06 13:39:53 -0800 Created attachment 333209 Patch 1396955 3 jeffm 2018-02-06 14:45:29 -0800 Committed r228194: <https://trac.webkit.org/changeset/228194> 333209 2018-02-06 13:39:53 -0800 2018-02-06 13:45:14 -0800 Patch bug-182540-20180206133952.patch text/plain 12869 jeffm U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4MTU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQzYjI2ZjNiMTFkN2YzYzlh M2E4ZTM3YjU4OThhZjU3YmJkYmFiYTUuLjM1MjBhOGFiNDAyODk5MWI5NWQ3ZWNjYjBmNGZiOTk4 NmM1NDA5NjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDAgQEAKKzIwMTgtMDItMDYgIEplZmYgTWls bGVyICA8amVmZm1AYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBXS05hdmlnYXRpb25EZWxlZ2F0 ZSBTUEkgdG8gdGVsbCB0aGUgY2xpZW50IHdoZW4gYW4gaW5zZWN1cmUgcGx1Zy1pbiBpcyBibG9j a2VkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODI1 NDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvQVBJTG9hZGVyQ2xpZW50Lmg6CisgICAgICAgIChBUEk6OkxvYWRlckNsaWVu dDo6ZGlkQmxvY2tJbnNlY3VyZVBsdWdpblZlcnNpb24pOgorICAgICAgICBDaGFuZ2VkIHRvIHRh a2UgYSBkaWN0aW9uYXJ5IHJlZmVyZW5jZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQVBJ TmF2aWdhdGlvbkNsaWVudC5oOgorICAgICAgICAoQVBJOjpOYXZpZ2F0aW9uQ2xpZW50OjpkaWRC bG9ja0luc2VjdXJlUGx1Z2luVmVyc2lvbik6CisgICAgICAgIEFkZGVkLgorCisgICAgICAgICog VUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHA6CisgICAgICAgIChXS1BhZ2VTZXRQYWdlTG9hZGVy Q2xpZW50KToKKyAgICAgICAgQ2hhbmdlZCBkaWRCbG9ja0luc2VjdXJlUGx1Z2luVmVyc2lvbigp IHRvIHRha2UgYSBkaWN0aW9uYXJ5IHJlZmVyZW5jZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvQ29jb2EvV0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRlLmg6CisgICAgICAgIEFkZGVkIC1f d2ViVmlldzpkaWRCbG9ja0luc2VjdXJlUGx1Z2luVmVyc2lvbldpdGhJbmZvOi4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUuaDoKKyAgICAgICAgKiBVSVByb2Nl c3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLm1tOgorICAgICAgICAoV2ViS2l0OjpOYXZpZ2F0aW9u U3RhdGU6OnNldE5hdmlnYXRpb25EZWxlZ2F0ZSk6CisgICAgICAgIEluaXRpYWxpemUgd2ViVmll d0RpZEJsb2NrSW5zZWN1cmVQbHVnaW5WZXJzaW9uV2l0aEluZm8uCisKKyAgICAgICAgKFdlYktp dDo6TmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjpkaWRCbG9ja0luc2VjdXJlUGx1 Z2luVmVyc2lvbik6CisgICAgICAgIEFkZGVkLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkQmxvY2tJbnNl Y3VyZVBsdWdpblZlcnNpb24pOgorICAgICAgICBSZW1vdmUgY2hlY2sgZm9yIFBMQVRGT1JNKENP Q09BKSAod2UgZG9uJ3QgY2hlY2sgZm9yIHRoaXMgaW4gZGlkRmFpbFRvSW5pdGlhbGl6ZVBsdWdp bigpIHdoZXJlIHdlCisgICAgICAgIGFsc28gdXNlIGNyZWF0ZVBsdWdpbkluZm9ybWF0aW9uRGlj dGlvbmFyeSgpKSBhbmQgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpICh3ZSdyZSBhbHJlYWR5 IGluc2lkZQorICAgICAgICBhbiAjaWYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkgYmxvY2sp IGFuZCB1c2UgYXV0byBmb3IgcGx1Z2luSW5mb3JtYXRpb24uIEF0dGVtcHQgdG8gdXNlIHRoZQor ICAgICAgICBuYXZpZ2F0aW9uIGNsaWVudCBiZWZvcmUgdGhlIGxvYWRlciBjbGllbnQuCisKIDIw MTgtMDItMDYgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0BpZ2FsaWEuY29tPgogCiAg ICAgICAgIFVucmV2aWV3ZWQsIGZpeCBmb3JtYXQgc3BlY2lmaWVycyBhZGRlZCBpbiByMjI4MTE2 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJTG9hZGVyQ2xpZW50 LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJTG9hZGVyQ2xpZW50LmgKaW5kZXgg ZDJkNDFkMDc2ZDA1Zjk4MDFjZWIzOTEzNDNkMzQwYWM2YWY4NGJkNy4uMzg0MTBkYTAyNWRjYjY3 MWZiMGM4OTEwNWYyYWFhMzk0NjUyZmY1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0FQSUxvYWRlckNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9BUElMb2FkZXJDbGllbnQuaApAQCAtMTA1LDcgKzEwNSw3IEBAIHB1YmxpYzoKICNpZiBF TkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkKICAgICB2aXJ0dWFsIFdlYktpdDo6UGx1Z2luTW9k dWxlTG9hZFBvbGljeSBwbHVnaW5Mb2FkUG9saWN5KFdlYktpdDo6V2ViUGFnZVByb3h5JiwgV2Vi S2l0OjpQbHVnaW5Nb2R1bGVMb2FkUG9saWN5IGN1cnJlbnRQbHVnaW5Mb2FkUG9saWN5LCBBUEk6 OkRpY3Rpb25hcnkmLCBXVEY6OlN0cmluZyYgLyogdW5hdmFpbGFiaWxpdHlEZXNjcmlwdGlvbiAq LykgeyByZXR1cm4gY3VycmVudFBsdWdpbkxvYWRQb2xpY3k7IH0KICAgICB2aXJ0dWFsIHZvaWQg ZGlkRmFpbFRvSW5pdGlhbGl6ZVBsdWdpbihXZWJLaXQ6OldlYlBhZ2VQcm94eSYsIEFQSTo6RGlj dGlvbmFyeSYpIHsgfQotICAgIHZpcnR1YWwgdm9pZCBkaWRCbG9ja0luc2VjdXJlUGx1Z2luVmVy c2lvbihXZWJLaXQ6OldlYlBhZ2VQcm94eSYsIEFQSTo6RGljdGlvbmFyeSopIHsgfQorICAgIHZp cnR1YWwgdm9pZCBkaWRCbG9ja0luc2VjdXJlUGx1Z2luVmVyc2lvbihXZWJLaXQ6OldlYlBhZ2VQ cm94eSYsIEFQSTo6RGljdGlvbmFyeSYpIHsgfQogI2VuZGlmIC8vIEVOQUJMRShORVRTQ0FQRV9Q TFVHSU5fQVBJKQogCiAjaWYgRU5BQkxFKFdFQkdMKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL0FQSU5hdmlnYXRpb25DbGllbnQuaCBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9BUElOYXZpZ2F0aW9uQ2xpZW50LmgKaW5kZXggZDFjZGU5YmFmZGQ5YThiMmNj MTY4NWUxYmU1ZmRhM2FkNzAxNGIxNS4uNTViZDM0ZDYxY2I5YzdkYmVmNTZhN2VkYWMzN2VmMWNi YzkxMWZhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSU5hdmln YXRpb25DbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJTmF2aWdh dGlvbkNsaWVudC5oCkBAIC0xMTMsNiArMTEzLDcgQEAgcHVibGljOgogICAgIAogI2lmIEVOQUJM RShORVRTQ0FQRV9QTFVHSU5fQVBJKQogICAgIHZpcnR1YWwgYm9vbCBkaWRGYWlsVG9Jbml0aWFs aXplUGx1Z0luKFdlYktpdDo6V2ViUGFnZVByb3h5JiwgQVBJOjpEaWN0aW9uYXJ5JikgeyByZXR1 cm4gZmFsc2U7IH0KKyAgICB2aXJ0dWFsIGJvb2wgZGlkQmxvY2tJbnNlY3VyZVBsdWdpblZlcnNp b24oV2ViS2l0OjpXZWJQYWdlUHJveHkmLCBBUEk6OkRpY3Rpb25hcnkmKSB7IHJldHVybiBmYWxz ZTsgfQogICAgIHZpcnR1YWwgV2ViS2l0OjpQbHVnaW5Nb2R1bGVMb2FkUG9saWN5IGRlY2lkZVBv bGljeUZvclBsdWdpbkxvYWQoV2ViS2l0OjpXZWJQYWdlUHJveHkmLCBXZWJLaXQ6OlBsdWdpbk1v ZHVsZUxvYWRQb2xpY3kgY3VycmVudFBsdWdpbkxvYWRQb2xpY3ksIERpY3Rpb25hcnkmLCBXVEY6 OlN0cmluZyYpCiAgICAgewogICAgICAgICByZXR1cm4gY3VycmVudFBsdWdpbkxvYWRQb2xpY3k7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAppbmRleCA0OTNjZGMwNDZh MDQ0MWEzMWNiMGQwNDdjMjdjNTVkMGQ2MzdmZDNiLi5lODkxYzc2ZjA5YWM5NGQ4NzFiNDI5Mjkx NTBkZTQxYjY0ZGNmZjQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv Qy9XS1BhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5j cHAKQEAgLTEyNjgsMTMgKzEyNjgsMTMgQEAgdm9pZCBXS1BhZ2VTZXRQYWdlTG9hZGVyQ2xpZW50 KFdLUGFnZVJlZiBwYWdlUmVmLCBjb25zdCBXS1BhZ2VMb2FkZXJDbGllbnRCYXNlKgogICAgICAg ICAgICAgICAgIG1fY2xpZW50LnBsdWdpbkRpZEZhaWwodG9BUEkoJnBhZ2UpLCBrV0tFcnJvckNv ZGVDYW5ub3RMb2FkUGx1Z0luLCB0b0FQSSgmcGx1Z2luSW5mb3JtYXRpb24pLCBtX2NsaWVudC5i YXNlLmNsaWVudEluZm8pOwogICAgICAgICB9CiAKLSAgICAgICAgdm9pZCBkaWRCbG9ja0luc2Vj dXJlUGx1Z2luVmVyc2lvbihXZWJQYWdlUHJveHkmIHBhZ2UsIEFQSTo6RGljdGlvbmFyeSogcGx1 Z2luSW5mb3JtYXRpb24pIG92ZXJyaWRlCisgICAgICAgIHZvaWQgZGlkQmxvY2tJbnNlY3VyZVBs dWdpblZlcnNpb24oV2ViUGFnZVByb3h5JiBwYWdlLCBBUEk6OkRpY3Rpb25hcnkmIHBsdWdpbklu Zm9ybWF0aW9uKSBvdmVycmlkZQogICAgICAgICB7CiAgICAgICAgICAgICBpZiAobV9jbGllbnQu cGx1Z2luRGlkRmFpbF9kZXByZWNhdGVkRm9yVXNlV2l0aFYxKQotICAgICAgICAgICAgICAgIG1f Y2xpZW50LnBsdWdpbkRpZEZhaWxfZGVwcmVjYXRlZEZvclVzZVdpdGhWMSh0b0FQSSgmcGFnZSks IGtXS0Vycm9yQ29kZUluc2VjdXJlUGx1Z0luVmVyc2lvbiwgdG9BUEkocGx1Z2luSW5mb3JtYXRp b24tPmdldDxBUEk6OlN0cmluZz4ocGx1Z2luSW5mb3JtYXRpb25NSU1FVHlwZUtleSgpKSksIHRv QVBJKHBsdWdpbkluZm9ybWF0aW9uLT5nZXQ8QVBJOjpTdHJpbmc+KHBsdWdpbkluZm9ybWF0aW9u QnVuZGxlSWRlbnRpZmllcktleSgpKSksIHRvQVBJKHBsdWdpbkluZm9ybWF0aW9uLT5nZXQ8QVBJ OjpTdHJpbmc+KHBsdWdpbkluZm9ybWF0aW9uQnVuZGxlVmVyc2lvbktleSgpKSksIG1fY2xpZW50 LmJhc2UuY2xpZW50SW5mbyk7CisgICAgICAgICAgICAgICAgbV9jbGllbnQucGx1Z2luRGlkRmFp bF9kZXByZWNhdGVkRm9yVXNlV2l0aFYxKHRvQVBJKCZwYWdlKSwga1dLRXJyb3JDb2RlSW5zZWN1 cmVQbHVnSW5WZXJzaW9uLCB0b0FQSShwbHVnaW5JbmZvcm1hdGlvbi5nZXQ8QVBJOjpTdHJpbmc+ KHBsdWdpbkluZm9ybWF0aW9uTUlNRVR5cGVLZXkoKSkpLCB0b0FQSShwbHVnaW5JbmZvcm1hdGlv bi5nZXQ8QVBJOjpTdHJpbmc+KHBsdWdpbkluZm9ybWF0aW9uQnVuZGxlSWRlbnRpZmllcktleSgp KSksIHRvQVBJKHBsdWdpbkluZm9ybWF0aW9uLmdldDxBUEk6OlN0cmluZz4ocGx1Z2luSW5mb3Jt YXRpb25CdW5kbGVWZXJzaW9uS2V5KCkpKSwgbV9jbGllbnQuYmFzZS5jbGllbnRJbmZvKTsKIAog ICAgICAgICAgICAgaWYgKG1fY2xpZW50LnBsdWdpbkRpZEZhaWwpCi0gICAgICAgICAgICAgICAg bV9jbGllbnQucGx1Z2luRGlkRmFpbCh0b0FQSSgmcGFnZSksIGtXS0Vycm9yQ29kZUluc2VjdXJl UGx1Z0luVmVyc2lvbiwgdG9BUEkocGx1Z2luSW5mb3JtYXRpb24pLCBtX2NsaWVudC5iYXNlLmNs aWVudEluZm8pOworICAgICAgICAgICAgICAgIG1fY2xpZW50LnBsdWdpbkRpZEZhaWwodG9BUEko JnBhZ2UpLCBrV0tFcnJvckNvZGVJbnNlY3VyZVBsdWdJblZlcnNpb24sIHRvQVBJKCZwbHVnaW5J bmZvcm1hdGlvbiksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7CiAgICAgICAgIH0KIAogICAg ICAgICBQbHVnaW5Nb2R1bGVMb2FkUG9saWN5IHBsdWdpbkxvYWRQb2xpY3koV2ViUGFnZVByb3h5 JiBwYWdlLCBQbHVnaW5Nb2R1bGVMb2FkUG9saWN5IGN1cnJlbnRQbHVnaW5Mb2FkUG9saWN5LCBB UEk6OkRpY3Rpb25hcnkmIHBsdWdpbkluZm9ybWF0aW9uLCBTdHJpbmcmIHVuYXZhaWxhYmlsaXR5 RGVzY3JpcHRpb24pIG92ZXJyaWRlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRlLmgKaW5kZXgg NGI5ZmY4M2NhMmFkZmU0YTVhOGZlOWM0NGFmZjEzNTVlOWM4MzFkZS4uYWFkZWY2ZjczZWQ5NDNj NTM3NjAyOGM2MDQ4MGQ3ZWIxNTViMmI5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0NvY29hL1dLTmF2aWdhdGlvbkRlbGVnYXRlUHJpdmF0ZS5oCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS05hdmlnYXRpb25EZWxlZ2F0ZVByaXZhdGUu aApAQCAtMTA3LDYgKzEwNyw3IEBAIHN0YXRpYyBjb25zdCBXS05hdmlnYXRpb25SZXNwb25zZVBv bGljeSBfV0tOYXZpZ2F0aW9uUmVzcG9uc2VQb2xpY3lCZWNvbWVEb3dubG9hCiAtICh2b2lkKV93 ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IHJlc29sdmVXZWJHTExvYWRQb2xpY3lGb3JVUkw6 KE5TVVJMICopdXJsIGRlY2lzaW9uSGFuZGxlcjoodm9pZCAoXikoX1dLV2ViR0xMb2FkUG9saWN5 KSlkZWNpc2lvbkhhbmRsZXIgV0tfQVBJX0FWQUlMQUJMRShtYWNvc3goV0tfTUFDX1RCQSkpOwog LSAodm9pZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyB3aWxsR29Ub0JhY2tGb3J3YXJk TGlzdEl0ZW06KFdLQmFja0ZvcndhcmRMaXN0SXRlbSAqKWl0ZW0gaW5QYWdlQ2FjaGU6KEJPT0wp aW5QYWdlQ2FjaGUgV0tfQVBJX0FWQUlMQUJMRShtYWNvc3goV0tfTUFDX1RCQSkpOwogLSAodm9p ZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBkaWRGYWlsVG9Jbml0aWFsaXplUGx1Z0lu V2l0aEluZm86KE5TRGljdGlvbmFyeSAqKWluZm8gV0tfQVBJX0FWQUlMQUJMRShtYWNvc3goV0tf TUFDX1RCQSkpOworLSAodm9pZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBkaWRCbG9j a0luc2VjdXJlUGx1Z2luVmVyc2lvbldpdGhJbmZvOihOU0RpY3Rpb25hcnkgKilpbmZvIFdLX0FQ SV9BVkFJTEFCTEUobWFjb3N4KFdLX01BQ19UQkEpKTsKIC0gKF9XS1BsdWdpbk1vZHVsZUxvYWRQ b2xpY3kpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZGVjaWRlUG9saWN5Rm9yUGx1Z2lu TG9hZFdpdGhDdXJyZW50UG9saWN5OihfV0tQbHVnaW5Nb2R1bGVMb2FkUG9saWN5KXBvbGljeSBw bHVnaW5JbmZvOihOU0RpY3Rpb25hcnkgKilpbmZvIHVuYXZhaWxhYmlsaXR5RGVzY3JpcHRpb246 KE5TU3RyaW5nICopdW5hdmFpbGFiaWxpdHlEZXNjcmlwdGlvbiBXS19BUElfQVZBSUxBQkxFKG1h Y29zeChXS19NQUNfVEJBKSk7CiAtICh2b2lkKV93ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3 IGJhY2tGb3J3YXJkTGlzdEl0ZW1BZGRlZDooV0tCYWNrRm9yd2FyZExpc3RJdGVtICopaXRlbUFk ZGVkIHJlbW92ZWQ6KE5TQXJyYXk8V0tCYWNrRm9yd2FyZExpc3RJdGVtICo+ICopaXRlbXNSZW1v dmVkIFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KFdLX01BQ19UQkEpKTsKICNlbmRpZgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLmggYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUuaAppbmRleCBlM2Q1 NjM1NTZlZTdmMGI1Y2Y2MGY3MTU4ZjcxNTg1ZTkzMTZkNGExLi5iYjg2ZDYxOWUxZGI4ZmZkZjY0 MWFlNDljZjkyNTQ2YjNhMWUzZjhmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9D b2NvYS9OYXZpZ2F0aW9uU3RhdGUuaApAQCAtMTIxLDYgKzEyMSw3IEBAIHByaXZhdGU6CiAgICAg ICAgIHZvaWQgcmVzb2x2ZVdlYkdMTG9hZFBvbGljeShXZWJQYWdlUHJveHkmLCBjb25zdCBXZWJD b3JlOjpVUkwmLCBXVEY6OkZ1bmN0aW9uPHZvaWQoV2ViQ29yZTo6V2ViR0xMb2FkUG9saWN5KT4m JiBjb21wbGV0aW9uSGFuZGxlcikgY29uc3QgZmluYWw7CiAgICAgICAgIGJvb2wgd2lsbEdvVG9C YWNrRm9yd2FyZExpc3RJdGVtKFdlYlBhZ2VQcm94eSYsIFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0m LCBib29sIGluUGFnZUNhY2hlLCBBUEk6Ok9iamVjdCopIGZpbmFsOwogICAgICAgICBib29sIGRp ZEZhaWxUb0luaXRpYWxpemVQbHVnSW4oV2ViUGFnZVByb3h5JiwgQVBJOjpEaWN0aW9uYXJ5Jikg ZmluYWw7CisgICAgICAgIGJvb2wgZGlkQmxvY2tJbnNlY3VyZVBsdWdpblZlcnNpb24oV2ViUGFn ZVByb3h5JiwgQVBJOjpEaWN0aW9uYXJ5JikgZmluYWw7CiAgICAgICAgIFdlYktpdDo6UGx1Z2lu TW9kdWxlTG9hZFBvbGljeSBkZWNpZGVQb2xpY3lGb3JQbHVnaW5Mb2FkKFdlYktpdDo6V2ViUGFn ZVByb3h5JiwgV2ViS2l0OjpQbHVnaW5Nb2R1bGVMb2FkUG9saWN5LCBBUEk6OkRpY3Rpb25hcnkm LCBXVEY6OlN0cmluZyYpIGZpbmFsOwogICAgICAgICBib29sIGRpZENoYW5nZUJhY2tGb3J3YXJk TGlzdChXZWJQYWdlUHJveHkmLCBXZWJCYWNrRm9yd2FyZExpc3RJdGVtKiwgY29uc3QgVmVjdG9y PFJlZjxXZWJCYWNrRm9yd2FyZExpc3RJdGVtPj4mKSBmaW5hbDsKICNlbmRpZgpAQCAtMjIyLDYg KzIyMyw3IEBAIHByaXZhdGU6CiAgICAgICAgIGJvb2wgd2ViVmlld1Jlc29sdmVXZWJHTExvYWRQ b2xpY3lGb3JVUkwgOiAxOwogICAgICAgICBib29sIHdlYlZpZXdCYWNrRm9yd2FyZExpc3RJdGVt QWRkZWRSZW1vdmVkIDogMTsKICAgICAgICAgYm9vbCB3ZWJWaWV3RGlkRmFpbFRvSW5pdGlhbGl6 ZVBsdWdJbldpdGhJbmZvIDogMTsKKyAgICAgICAgYm9vbCB3ZWJWaWV3RGlkQmxvY2tJbnNlY3Vy ZVBsdWdpblZlcnNpb25XaXRoSW5mbyA6IDE7CiAgICAgICAgIGJvb2wgd2ViVmlld1dpbGxHb1Rv QmFja0ZvcndhcmRMaXN0SXRlbUluUGFnZUNhY2hlIDogMTsKICAgICAgICAgYm9vbCB3ZWJWaWV3 RGVjaWRlUG9saWN5Rm9yUGx1Z2luTG9hZFdpdGhDdXJyZW50UG9saWN5UGx1Z2luSW5mb1VuYXZh aWxhYmlsaXR5RGVzY3JpcHRpb24gOiAxOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0gYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0KaW5kZXggYzQyNjUzNWNhZTVkMjRlODJk ZWQ3MDYwMDIzNDEzNjQ0MTEzZmM0Mi4uM2VlZTdkMTQ1ZDdlMzY5ZmFjYTI4MzFhZDMyZGJjNjVk Y2JmYTYxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvTmF2aWdh dGlvblN0YXRlLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRp b25TdGF0ZS5tbQpAQCAtMTg1LDYgKzE4NSw3IEBAIHZvaWQgTmF2aWdhdGlvblN0YXRlOjpzZXRO YXZpZ2F0aW9uRGVsZWdhdGUoaWQgPFdLTmF2aWdhdGlvbkRlbGVnYXRlPiBkZWxlZ2F0ZSkKICAg ICBtX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld1Jlc29sdmVXZWJHTExvYWRQb2xp Y3lGb3JVUkwgPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfd2ViVmll dzpyZXNvbHZlV2ViR0xMb2FkUG9saWN5Rm9yVVJMOmRlY2lzaW9uSGFuZGxlcjopXTsKICAgICBt X25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld1dpbGxHb1RvQmFja0ZvcndhcmRMaXN0 SXRlbUluUGFnZUNhY2hlID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Io X3dlYlZpZXc6d2lsbEdvVG9CYWNrRm9yd2FyZExpc3RJdGVtOmluUGFnZUNhY2hlOildOwogICAg IG1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3RGlkRmFpbFRvSW5pdGlhbGl6ZVBs dWdJbldpdGhJbmZvID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3dl YlZpZXc6ZGlkRmFpbFRvSW5pdGlhbGl6ZVBsdWdJbldpdGhJbmZvOildOworICAgIG1fbmF2aWdh dGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3RGlkQmxvY2tJbnNlY3VyZVBsdWdpblZlcnNpb25X aXRoSW5mbyA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3 OmRpZEJsb2NrSW5zZWN1cmVQbHVnaW5WZXJzaW9uV2l0aEluZm86KV07CiAgICAgbV9uYXZpZ2F0 aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdCYWNrRm9yd2FyZExpc3RJdGVtQWRkZWRSZW1vdmVk ID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3dlYlZpZXc6YmFja0Zv cndhcmRMaXN0SXRlbUFkZGVkOnJlbW92ZWQ6KV07CiAgICAgbV9uYXZpZ2F0aW9uRGVsZWdhdGVN ZXRob2RzLndlYlZpZXdEZWNpZGVQb2xpY3lGb3JQbHVnaW5Mb2FkV2l0aEN1cnJlbnRQb2xpY3lQ bHVnaW5JbmZvVW5hdmFpbGFiaWxpdHlEZXNjcmlwdGlvbiA9IFtkZWxlZ2F0ZSByZXNwb25kc1Rv U2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3OmRlY2lkZVBvbGljeUZvclBsdWdpbkxvYWRXaXRo Q3VycmVudFBvbGljeTpwbHVnaW5JbmZvOnVuYXZhaWxhYmlsaXR5RGVzY3JpcHRpb246KV07CiAj ZW5kaWYKQEAgLTMxNCw2ICszMTUsMTkgQEAgYm9vbCBOYXZpZ2F0aW9uU3RhdGU6Ok5hdmlnYXRp b25DbGllbnQ6OmRpZEZhaWxUb0luaXRpYWxpemVQbHVnSW4oV2ViUGFnZVByb3h5JiwKICAgICBy ZXR1cm4gdHJ1ZTsKIH0KIAorYm9vbCBOYXZpZ2F0aW9uU3RhdGU6Ok5hdmlnYXRpb25DbGllbnQ6 OmRpZEJsb2NrSW5zZWN1cmVQbHVnaW5WZXJzaW9uKFdlYlBhZ2VQcm94eSYsIEFQSTo6RGljdGlv bmFyeSYgaW5mbykKK3sKKyAgICBpZiAoIW1fbmF2aWdhdGlvblN0YXRlLm1fbmF2aWdhdGlvbkRl bGVnYXRlTWV0aG9kcy53ZWJWaWV3RGlkQmxvY2tJbnNlY3VyZVBsdWdpblZlcnNpb25XaXRoSW5m bykKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgYXV0byBuYXZpZ2F0aW9uRGVsZWdhdGUg PSBtX25hdmlnYXRpb25TdGF0ZS5tX25hdmlnYXRpb25EZWxlZ2F0ZS5nZXQoKTsKKyAgICBpZiAo IW5hdmlnYXRpb25EZWxlZ2F0ZSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgWyhpZCA8 V0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRlPiluYXZpZ2F0aW9uRGVsZWdhdGUgX3dlYlZpZXc6 bV9uYXZpZ2F0aW9uU3RhdGUubV93ZWJWaWV3IGRpZEJsb2NrSW5zZWN1cmVQbHVnaW5WZXJzaW9u V2l0aEluZm86d3JhcHBlcihpbmZvKV07CisgICAgcmV0dXJuIHRydWU7Cit9CisKIHN0YXRpYyBX ZWJLaXQ6OlBsdWdpbk1vZHVsZUxvYWRQb2xpY3kgcGx1Z2luTW9kdWxlTG9hZFBvbGljeShfV0tQ bHVnaW5Nb2R1bGVMb2FkUG9saWN5IHBvbGljeSkKIHsKICAgICBzd2l0Y2ggKHBvbGljeSkgewpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggNDgxNzZjOTdhOTFi NGZmMDUwYzgzMzQ5ZWMxNzk5NjJiMDBkZjU1Yy4uMGFkYjI4NTZmNDU1Yjk5MWE1NjQzZGQyNGI3 YzlkMThjYzY5YTA5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw CkBAIC02MTU2LDIwICs2MTU2LDEyIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRGYWlsVG9Jbml0 aWFsaXplUGx1Z2luKGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGNvbnN0IFN0cmluCiAKIHZvaWQg V2ViUGFnZVByb3h5OjpkaWRCbG9ja0luc2VjdXJlUGx1Z2luVmVyc2lvbihjb25zdCBTdHJpbmcm IG1pbWVUeXBlLCBjb25zdCBTdHJpbmcmIHBsdWdpblVSTFN0cmluZywgY29uc3QgU3RyaW5nJiBm cmFtZVVSTFN0cmluZywgY29uc3QgU3RyaW5nJiBwYWdlVVJMU3RyaW5nLCBib29sIHJlcGxhY2Vt ZW50T2JzY3VyZWQpCiB7Ci0gICAgUmVmUHRyPEFQSTo6RGljdGlvbmFyeT4gcGx1Z2luSW5mb3Jt YXRpb247Ci0KLSNpZiBQTEFURk9STShDT0NPQSkgJiYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9B UEkpCiAgICAgU3RyaW5nIG5ld01pbWVUeXBlID0gbWltZVR5cGU7CiAgICAgUGx1Z2luTW9kdWxl SW5mbyBwbHVnaW4gPSBtX3Byb2Nlc3MtPnByb2Nlc3NQb29sKCkucGx1Z2luSW5mb1N0b3JlKCku ZmluZFBsdWdpbihuZXdNaW1lVHlwZSwgVVJMKFVSTCgpLCBwbHVnaW5VUkxTdHJpbmcpKTsKLSAg ICBwbHVnaW5JbmZvcm1hdGlvbiA9IGNyZWF0ZVBsdWdpbkluZm9ybWF0aW9uRGljdGlvbmFyeShw bHVnaW4sIGZyYW1lVVJMU3RyaW5nLCBtaW1lVHlwZSwgcGFnZVVSTFN0cmluZywgU3RyaW5nKCks IFN0cmluZygpLCByZXBsYWNlbWVudE9ic2N1cmVkKTsKLSNlbHNlCi0gICAgVU5VU0VEX1BBUkFN KG1pbWVUeXBlKTsKLSAgICBVTlVTRURfUEFSQU0ocGx1Z2luVVJMU3RyaW5nKTsKLSAgICBVTlVT RURfUEFSQU0oZnJhbWVVUkxTdHJpbmcpOwotICAgIFVOVVNFRF9QQVJBTShwYWdlVVJMU3RyaW5n KTsKLSAgICBVTlVTRURfUEFSQU0ocmVwbGFjZW1lbnRPYnNjdXJlZCk7Ci0jZW5kaWYKKyAgICBh dXRvIHBsdWdpbkluZm9ybWF0aW9uID0gY3JlYXRlUGx1Z2luSW5mb3JtYXRpb25EaWN0aW9uYXJ5 KHBsdWdpbiwgZnJhbWVVUkxTdHJpbmcsIG1pbWVUeXBlLCBwYWdlVVJMU3RyaW5nLCBTdHJpbmco KSwgU3RyaW5nKCksIHJlcGxhY2VtZW50T2JzY3VyZWQpOwogCisgICAgaWYgKG1fbmF2aWdhdGlv bkNsaWVudC0+ZGlkQmxvY2tJbnNlY3VyZVBsdWdpblZlcnNpb24oKnRoaXMsIHBsdWdpbkluZm9y bWF0aW9uLmdldCgpKSkKKyAgICAgICAgcmV0dXJuOwogICAgIG1fbG9hZGVyQ2xpZW50LT5kaWRC bG9ja0luc2VjdXJlUGx1Z2luVmVyc2lvbigqdGhpcywgcGx1Z2luSW5mb3JtYXRpb24uZ2V0KCkp OwogfQogI2VuZGlmIC8vIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQo=