177787 2017-10-02 15:14:47 -0700 Add ObjC equivalent of WKPageLoaderClient.pluginDidFail 2017-10-03 12:24:58 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen thorton webkit-bug-importer oldest_to_newest 1355554 0 achristensen 2017-10-02 15:14:47 -0700 Add ObjC equivalent of WKPageLoaderClient.pluginDidFail 1355555 1 322454 achristensen 2017-10-02 15:15:17 -0700 Created attachment 322454 Patch 1355940 2 322557 achristensen 2017-10-03 12:04:14 -0700 Created attachment 322557 Patch 1355967 3 achristensen 2017-10-03 12:24:12 -0700 https://trac.webkit.org/changeset/222802/webkit 1355969 4 webkit-bug-importer 2017-10-03 12:24:58 -0700 <rdar://problem/34796244> 322454 2017-10-02 15:15:17 -0700 2017-10-03 12:04:11 -0700 Patch bug-177787-20171002151516.patch text/plain 10545 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMjI3NTEpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE3LTEwLTAyICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIE9iakMgZXF1 aXZhbGVudCBvZiBXS1BhZ2VMb2FkZXJDbGllbnQucGx1Z2luRGlkRmFpbAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc3Nzg3CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS8yMjM4NzYzMz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQVBJTG9hZGVyQ2xpZW50Lmg6CisgICAgICAg IChBUEk6OkxvYWRlckNsaWVudDo6ZGlkRmFpbFRvSW5pdGlhbGl6ZVBsdWdpbik6CisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9BUElOYXZpZ2F0aW9uQ2xpZW50Lmg6CisgICAgICAgIChBUEk6Ok5h dmlnYXRpb25DbGllbnQ6OmNhbkhhbmRsZURpZEZhaWxUb0luaXRpYWxpemVQbHVnSW4gY29uc3Qp OgorICAgICAgICAoQVBJOjpOYXZpZ2F0aW9uQ2xpZW50OjpkaWRGYWlsVG9Jbml0aWFsaXplUGx1 Z0luKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcDoKKyAgICAgICAgKFdL UGFnZVNldFBhZ2VMb2FkZXJDbGllbnQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0NvY29h L05hdmlnYXRpb25TdGF0ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9u U3RhdGUubW06CisgICAgICAgIChXZWJLaXQ6Ok5hdmlnYXRpb25TdGF0ZTo6c2V0TmF2aWdhdGlv bkRlbGVnYXRlKToKKyAgICAgICAgKFdlYktpdDo6TmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9u Q2xpZW50OjpjYW5IYW5kbGVEaWRGYWlsVG9Jbml0aWFsaXplUGx1Z0luIGNvbnN0KToKKyAgICAg ICAgKFdlYktpdDo6TmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjpkaWRGYWlsVG9J bml0aWFsaXplUGx1Z0luKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRGYWlsVG9Jbml0aWFsaXplUGx1Z2lu KToKKwogMjAxNy0xMC0wMiAgQWRyaWFuIFBlcmV6IGRlIENhc3RybyAgPGFwZXJlekBpZ2FsaWEu Y29tPgogCiAgICAgICAgIFtHVEtdIERvIG5vdCBoYXJkY29kZSBmb250IGZhbWlseSBpbiBzZXJ2 ZWQgcmVtb3RlIGluc3BlY3RvciBIVE1MIHNuaXBwZXRzCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9uIDIyMjcxNCkKKysrIFNvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTYwNTAsNyAr NjA1MCwxMCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cGFnZUV4dGVuZGVkQmFja2dyb3VuCiAjaWYg RU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmFpbFRv SW5pdGlhbGl6ZVBsdWdpbihjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBTdHJpbmcmIGZy YW1lVVJMU3RyaW5nLCBjb25zdCBTdHJpbmcmIHBhZ2VVUkxTdHJpbmcpCiB7Ci0gICAgbV9sb2Fk ZXJDbGllbnQtPmRpZEZhaWxUb0luaXRpYWxpemVQbHVnaW4oKnRoaXMsIGNyZWF0ZVBsdWdpbklu Zm9ybWF0aW9uRGljdGlvbmFyeShtaW1lVHlwZSwgZnJhbWVVUkxTdHJpbmcsIHBhZ2VVUkxTdHJp bmcpLnB0cigpKTsKKyAgICBpZiAobV9uYXZpZ2F0aW9uQ2xpZW50LT5jYW5IYW5kbGVEaWRGYWls VG9Jbml0aWFsaXplUGx1Z0luKCkpCisgICAgICAgIG1fbmF2aWdhdGlvbkNsaWVudC0+ZGlkRmFp bFRvSW5pdGlhbGl6ZVBsdWdJbigqdGhpcywgY3JlYXRlUGx1Z2luSW5mb3JtYXRpb25EaWN0aW9u YXJ5KG1pbWVUeXBlLCBmcmFtZVVSTFN0cmluZywgcGFnZVVSTFN0cmluZykuZ2V0KCkpOworICAg IGVsc2UKKyAgICAgICAgbV9sb2FkZXJDbGllbnQtPmRpZEZhaWxUb0luaXRpYWxpemVQbHVnaW4o KnRoaXMsIGNyZWF0ZVBsdWdpbkluZm9ybWF0aW9uRGljdGlvbmFyeShtaW1lVHlwZSwgZnJhbWVV UkxTdHJpbmcsIHBhZ2VVUkxTdHJpbmcpLmdldCgpKTsKIH0KIAogdm9pZCBXZWJQYWdlUHJveHk6 OmRpZEJsb2NrSW5zZWN1cmVQbHVnaW5WZXJzaW9uKGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGNv bnN0IFN0cmluZyYgcGx1Z2luVVJMU3RyaW5nLCBjb25zdCBTdHJpbmcmIGZyYW1lVVJMU3RyaW5n LCBjb25zdCBTdHJpbmcmIHBhZ2VVUkxTdHJpbmcsIGJvb2wgcmVwbGFjZW1lbnRPYnNjdXJlZCkK SW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElMb2FkZXJDbGllbnQuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJTG9hZGVyQ2xpZW50LmgJ KHJldmlzaW9uIDIyMjcwOCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElMb2Fk ZXJDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMTA0LDcgKzEwNCw3IEBAIHB1YmxpYzoKIAog I2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQogICAgIHZpcnR1YWwgV2ViS2l0OjpQbHVn aW5Nb2R1bGVMb2FkUG9saWN5IHBsdWdpbkxvYWRQb2xpY3koV2ViS2l0OjpXZWJQYWdlUHJveHkm LCBXZWJLaXQ6OlBsdWdpbk1vZHVsZUxvYWRQb2xpY3kgY3VycmVudFBsdWdpbkxvYWRQb2xpY3ks IEFQSTo6RGljdGlvbmFyeSosIFdURjo6U3RyaW5nJiAvKiB1bmF2YWlsYWJpbGl0eURlc2NyaXB0 aW9uICovKSB7IHJldHVybiBjdXJyZW50UGx1Z2luTG9hZFBvbGljeTsgfQotICAgIHZpcnR1YWwg dm9pZCBkaWRGYWlsVG9Jbml0aWFsaXplUGx1Z2luKFdlYktpdDo6V2ViUGFnZVByb3h5JiwgQVBJ OjpEaWN0aW9uYXJ5KikgeyB9CisgICAgdmlydHVhbCB2b2lkIGRpZEZhaWxUb0luaXRpYWxpemVQ bHVnaW4oV2ViS2l0OjpXZWJQYWdlUHJveHkmLCBBUEk6OkRpY3Rpb25hcnkmKSB7IH0KICAgICB2 aXJ0dWFsIHZvaWQgZGlkQmxvY2tJbnNlY3VyZVBsdWdpblZlcnNpb24oV2ViS2l0OjpXZWJQYWdl UHJveHkmLCBBUEk6OkRpY3Rpb25hcnkqKSB7IH0KICNlbmRpZiAvLyBFTkFCTEUoTkVUU0NBUEVf UExVR0lOX0FQSSkKIApJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSU5hdmln YXRpb25DbGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv QVBJTmF2aWdhdGlvbkNsaWVudC5oCShyZXZpc2lvbiAyMjI3MDgpCisrKyBTb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQVBJTmF2aWdhdGlvbkNsaWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0x MDksNiArMTA5LDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBjb250ZW50UnVsZUxpc3RO b3RpZmljYXRpb24oV2ViS2l0OjpXZWJQYWdlUHJveHkmLCBXZWJDb3JlOjpVUkwmJiwgVmVjdG9y PFdURjo6U3RyaW5nPiYmLCBWZWN0b3I8V1RGOjpTdHJpbmc+JiYpIHsgfTsKICAgICAKICNpZiBF TkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkKKyAgICB2aXJ0dWFsIGJvb2wgY2FuSGFuZGxlRGlk RmFpbFRvSW5pdGlhbGl6ZVBsdWdJbigpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CisgICAgdmly dHVhbCB2b2lkIGRpZEZhaWxUb0luaXRpYWxpemVQbHVnSW4oV2ViS2l0OjpXZWJQYWdlUHJveHkm LCBBUEk6OkRpY3Rpb25hcnkmKSB7IH0KICAgICB2aXJ0dWFsIFdlYktpdDo6UGx1Z2luTW9kdWxl TG9hZFBvbGljeSBkZWNpZGVQb2xpY3lGb3JQbHVnaW5Mb2FkKFdlYktpdDo6V2ViUGFnZVByb3h5 JiwgV2ViS2l0OjpQbHVnaW5Nb2R1bGVMb2FkUG9saWN5IGN1cnJlbnRQbHVnaW5Mb2FkUG9saWN5 LCBEaWN0aW9uYXJ5KiwgV1RGOjpTdHJpbmcmKQogICAgIHsKICAgICAgICAgcmV0dXJuIGN1cnJl bnRQbHVnaW5Mb2FkUG9saWN5OwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Mv V0tQYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9X S1BhZ2UuY3BwCShyZXZpc2lvbiAyMjI3MzYpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQy9XS1BhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjU1LDE2ICsxMjU1LDE2IEBAIHZv aWQgV0tQYWdlU2V0UGFnZUxvYWRlckNsaWVudChXS1BhZ2VSZWYKICAgICAgICAgfQogCiAjaWYg RU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCi0gICAgICAgIHZvaWQgZGlkRmFpbFRvSW5pdGlh bGl6ZVBsdWdpbihXZWJQYWdlUHJveHkmIHBhZ2UsIEFQSTo6RGljdGlvbmFyeSogcGx1Z2luSW5m b3JtYXRpb24pIG92ZXJyaWRlCisgICAgICAgIHZvaWQgZGlkRmFpbFRvSW5pdGlhbGl6ZVBsdWdp bihXZWJQYWdlUHJveHkmIHBhZ2UsIEFQSTo6RGljdGlvbmFyeSYgcGx1Z2luSW5mb3JtYXRpb24p IGZpbmFsCiAgICAgICAgIHsKICAgICAgICAgICAgIGlmIChtX2NsaWVudC5kaWRGYWlsVG9Jbml0 aWFsaXplUGx1Z2luX2RlcHJlY2F0ZWRGb3JVc2VXaXRoVjApCi0gICAgICAgICAgICAgICAgbV9j bGllbnQuZGlkRmFpbFRvSW5pdGlhbGl6ZVBsdWdpbl9kZXByZWNhdGVkRm9yVXNlV2l0aFYwKHRv QVBJKCZwYWdlKSwgdG9BUEkocGx1Z2luSW5mb3JtYXRpb24tPmdldDxBUEk6OlN0cmluZz4ocGx1 Z2luSW5mb3JtYXRpb25NSU1FVHlwZUtleSgpKSksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7 CisgICAgICAgICAgICAgICAgbV9jbGllbnQuZGlkRmFpbFRvSW5pdGlhbGl6ZVBsdWdpbl9kZXBy ZWNhdGVkRm9yVXNlV2l0aFYwKHRvQVBJKCZwYWdlKSwgdG9BUEkocGx1Z2luSW5mb3JtYXRpb24u Z2V0PEFQSTo6U3RyaW5nPihwbHVnaW5JbmZvcm1hdGlvbk1JTUVUeXBlS2V5KCkpKSwgbV9jbGll bnQuYmFzZS5jbGllbnRJbmZvKTsKIAogICAgICAgICAgICAgaWYgKG1fY2xpZW50LnBsdWdpbkRp ZEZhaWxfZGVwcmVjYXRlZEZvclVzZVdpdGhWMSkKLSAgICAgICAgICAgICAgICBtX2NsaWVudC5w bHVnaW5EaWRGYWlsX2RlcHJlY2F0ZWRGb3JVc2VXaXRoVjEodG9BUEkoJnBhZ2UpLCBrV0tFcnJv ckNvZGVDYW5ub3RMb2FkUGx1Z0luLCB0b0FQSShwbHVnaW5JbmZvcm1hdGlvbi0+Z2V0PEFQSTo6 U3RyaW5nPihwbHVnaW5JbmZvcm1hdGlvbk1JTUVUeXBlS2V5KCkpKSwgMCwgMCwgbV9jbGllbnQu YmFzZS5jbGllbnRJbmZvKTsKKyAgICAgICAgICAgICAgICBtX2NsaWVudC5wbHVnaW5EaWRGYWls X2RlcHJlY2F0ZWRGb3JVc2VXaXRoVjEodG9BUEkoJnBhZ2UpLCBrV0tFcnJvckNvZGVDYW5ub3RM b2FkUGx1Z0luLCB0b0FQSShwbHVnaW5JbmZvcm1hdGlvbi5nZXQ8QVBJOjpTdHJpbmc+KHBsdWdp bkluZm9ybWF0aW9uTUlNRVR5cGVLZXkoKSkpLCAwLCAwLCBtX2NsaWVudC5iYXNlLmNsaWVudElu Zm8pOwogCiAgICAgICAgICAgICBpZiAobV9jbGllbnQucGx1Z2luRGlkRmFpbCkKLSAgICAgICAg ICAgICAgICBtX2NsaWVudC5wbHVnaW5EaWRGYWlsKHRvQVBJKCZwYWdlKSwga1dLRXJyb3JDb2Rl Q2Fubm90TG9hZFBsdWdJbiwgdG9BUEkocGx1Z2luSW5mb3JtYXRpb24pLCBtX2NsaWVudC5iYXNl LmNsaWVudEluZm8pOworICAgICAgICAgICAgICAgIG1fY2xpZW50LnBsdWdpbkRpZEZhaWwodG9B UEkoJnBhZ2UpLCBrV0tFcnJvckNvZGVDYW5ub3RMb2FkUGx1Z0luLCB0b0FQSSgmcGx1Z2luSW5m b3JtYXRpb24pLCBtX2NsaWVudC5iYXNlLmNsaWVudEluZm8pOwogICAgICAgICB9CiAKICAgICAg ICAgdm9pZCBkaWRCbG9ja0luc2VjdXJlUGx1Z2luVmVyc2lvbihXZWJQYWdlUHJveHkmIHBhZ2Us IEFQSTo6RGljdGlvbmFyeSogcGx1Z2luSW5mb3JtYXRpb24pIG92ZXJyaWRlCkluZGV4OiBTb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRl LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLTmF2 aWdhdGlvbkRlbGVnYXRlUHJpdmF0ZS5oCShyZXZpc2lvbiAyMjI3MDgpCisrKyBTb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRlLmgJKHdv cmtpbmcgY29weSkKQEAgLTg3LDYgKzg3LDcgQEAgc3RhdGljIGNvbnN0IFdLTmF2aWdhdGlvblJl c3BvbnNlUG9saWN5IAogI2Vsc2UKIC0gKHZvaWQpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZp ZXcgd2ViR0xMb2FkUG9saWN5Rm9yVVJMOihOU1VSTCAqKXVybCBkZWNpc2lvbkhhbmRsZXI6KHZv aWQgKF4pKF9XS1dlYkdMTG9hZFBvbGljeSkpZGVjaXNpb25IYW5kbGVyIFdLX0FQSV9BVkFJTEFC TEUobWFjb3N4KFdLX01BQ19UQkEpKTsKIC0gKHZvaWQpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdl YlZpZXcgcmVzb2x2ZVdlYkdMTG9hZFBvbGljeUZvclVSTDooTlNVUkwgKil1cmwgZGVjaXNpb25I YW5kbGVyOih2b2lkICheKShfV0tXZWJHTExvYWRQb2xpY3kpKWRlY2lzaW9uSGFuZGxlciBXS19B UElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNfVEJBKSk7CistICh2b2lkKV93ZWJWaWV3OihXS1dl YlZpZXcgKil3ZWJWaWV3IGRpZEZhaWxUb0luaXRpYWxpemVQbHVnSW5XaXRoSW5mbzooTlNEaWN0 aW9uYXJ5ICopaW5mbyBXS19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNfVEJBKSk7CiAjZW5k aWYKIAogQGVuZApJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlv blN0YXRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvTmF2 aWdhdGlvblN0YXRlLmgJKHJldmlzaW9uIDIyMjcwOCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMTYsNiArMTE2 LDExIEBAIHByaXZhdGU6CiAgICAgICAgIHZvaWQgZGlkRmluaXNoTG9hZEZvclF1aWNrTG9va0Rv Y3VtZW50SW5NYWluRnJhbWUoY29uc3QgUXVpY2tMb29rRG9jdW1lbnREYXRhJikgb3ZlcnJpZGU7 CiAjZW5kaWYKIAorI2lmIFBMQVRGT1JNKE1BQykKKyAgICAgICAgYm9vbCBjYW5IYW5kbGVEaWRG YWlsVG9Jbml0aWFsaXplUGx1Z0luKCkgY29uc3QgZmluYWw7CisgICAgICAgIHZvaWQgZGlkRmFp bFRvSW5pdGlhbGl6ZVBsdWdJbihXZWJLaXQ6OldlYlBhZ2VQcm94eSYsIEFQSTo6RGljdGlvbmFy eSYpIGZpbmFsOworI2VuZGlmCisgICAgICAgIAogI2lmIEVOQUJMRShXRUJHTCkgJiYgUExBVEZP Uk0oTUFDKQogICAgICAgICB2b2lkIHdlYkdMTG9hZFBvbGljeShXZWJQYWdlUHJveHkmLCBjb25z dCBXZWJDb3JlOjpVUkwmLCBXVEY6OkZ1bmN0aW9uPHZvaWQoV2ViQ29yZTo6V2ViR0xMb2FkUG9s aWN5KT4mJiBjb21wbGV0aW9uSGFuZGxlcikgY29uc3QgZmluYWw7CiAgICAgICAgIHZvaWQgcmVz b2x2ZVdlYkdMTG9hZFBvbGljeShXZWJQYWdlUHJveHkmLCBjb25zdCBXZWJDb3JlOjpVUkwmLCBX VEY6OkZ1bmN0aW9uPHZvaWQoV2ViQ29yZTo6V2ViR0xMb2FkUG9saWN5KT4mJiBjb21wbGV0aW9u SGFuZGxlcikgY29uc3QgZmluYWw7CkBAIC0yMTMsNiArMjE4LDkgQEAgcHJpdmF0ZToKICAgICAg ICAgYm9vbCB3ZWJWaWV3V2ViR0xMb2FkUG9saWN5Rm9yVVJMIDogMTsKICAgICAgICAgYm9vbCB3 ZWJWaWV3UmVzb2x2ZVdlYkdMTG9hZFBvbGljeUZvclVSTCA6IDE7CiAjZW5kaWYKKyNpZiBQTEFU Rk9STShNQUMpCisgICAgICAgIGJvb2wgd2ViVmlld0RpZEZhaWxUb0luaXRpYWxpemVQbHVnSW5X aXRoSW5mbyA6IDE7CisjZW5kaWYKICAgICB9IG1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kczsK IAogICAgIFdlYWtPYmpDUHRyPGlkIDxXS0hpc3RvcnlEZWxlZ2F0ZVByaXZhdGU+ID4gbV9oaXN0 b3J5RGVsZWdhdGU7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0 aW9uU3RhdGUubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2Ev TmF2aWdhdGlvblN0YXRlLm1tCShyZXZpc2lvbiAyMjI3MDgpCisrKyBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0JKHdvcmtpbmcgY29weSkKQEAgLTQyLDYg KzQyLDcgQEAKICNpbXBvcnQgIldLQmFja0ZvcndhcmRMaXN0SXRlbUludGVybmFsLmgiCiAjaW1w b3J0ICJXS0ZyYW1lSW5mb0ludGVybmFsLmgiCiAjaW1wb3J0ICJXS0hpc3RvcnlEZWxlZ2F0ZVBy aXZhdGUuaCIKKyNpbXBvcnQgIldLTlNEaWN0aW9uYXJ5LmgiCiAjaW1wb3J0ICJXS05TVVJMQXV0 aGVudGljYXRpb25DaGFsbGVuZ2UuaCIKICNpbXBvcnQgIldLTlNVUkxFeHRyYXMuaCIKICNpbXBv cnQgIldLTlNVUkxSZXF1ZXN0LmgiCkBAIC0xNzgsNiArMTc5LDkgQEAgdm9pZCBOYXZpZ2F0aW9u U3RhdGU6OnNldE5hdmlnYXRpb25EZWxlZwogICAgIG1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9k cy53ZWJWaWV3V2ViR0xMb2FkUG9saWN5Rm9yVVJMID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxl Y3RvcjpAc2VsZWN0b3IoX3dlYlZpZXc6d2ViR0xMb2FkUG9saWN5Rm9yVVJMOmRlY2lzaW9uSGFu ZGxlcjopXTsKICAgICBtX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld1Jlc29sdmVX ZWJHTExvYWRQb2xpY3lGb3JVUkwgPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxl Y3Rvcihfd2ViVmlldzpyZXNvbHZlV2ViR0xMb2FkUG9saWN5Rm9yVVJMOmRlY2lzaW9uSGFuZGxl cjopXTsKICNlbmRpZgorI2lmIFBMQVRGT1JNKE1BQykKKyAgICBtX25hdmlnYXRpb25EZWxlZ2F0 ZU1ldGhvZHMud2ViVmlld0RpZEZhaWxUb0luaXRpYWxpemVQbHVnSW5XaXRoSW5mbyA9IFtkZWxl Z2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3OmRpZEZhaWxUb0luaXRp YWxpemVQbHVnSW5XaXRoSW5mbzopXTsKKyNlbmRpZgogfQogCiBSZXRhaW5QdHI8aWQgPFdLSGlz dG9yeURlbGVnYXRlUHJpdmF0ZT4gPiBOYXZpZ2F0aW9uU3RhdGU6Omhpc3RvcnlEZWxlZ2F0ZSgp CkBAIC0yOTEsNiArMjk1LDIzIEBAIE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6 fk5hdmkKIH0KIAogI2lmIFBMQVRGT1JNKE1BQykKK2Jvb2wgTmF2aWdhdGlvblN0YXRlOjpOYXZp Z2F0aW9uQ2xpZW50OjpjYW5IYW5kbGVEaWRGYWlsVG9Jbml0aWFsaXplUGx1Z0luKCkgY29uc3QK K3sKKyAgICByZXR1cm4gbV9uYXZpZ2F0aW9uU3RhdGUubV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRo b2RzLndlYlZpZXdEaWRGYWlsVG9Jbml0aWFsaXplUGx1Z0luV2l0aEluZm87Cit9CisgICAgCit2 b2lkIE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6ZGlkRmFpbFRvSW5pdGlhbGl6 ZVBsdWdJbihXZWJLaXQ6OldlYlBhZ2VQcm94eSYsIEFQSTo6RGljdGlvbmFyeSYgaW5mbykKK3sK KyAgICBpZiAoIW1fbmF2aWdhdGlvblN0YXRlLm1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53 ZWJWaWV3RGlkRmFpbFRvSW5pdGlhbGl6ZVBsdWdJbldpdGhJbmZvKQorICAgICAgICByZXR1cm47 CisgICAgCisgICAgYXV0byBuYXZpZ2F0aW9uRGVsZWdhdGUgPSBtX25hdmlnYXRpb25TdGF0ZS5t X25hdmlnYXRpb25EZWxlZ2F0ZS5nZXQoKTsKKyAgICBpZiAoIW5hdmlnYXRpb25EZWxlZ2F0ZSkK KyAgICAgICAgcmV0dXJuOworICAgIAorICAgIFsoaWQgPFdLTmF2aWdhdGlvbkRlbGVnYXRlUHJp dmF0ZT4pbmF2aWdhdGlvbkRlbGVnYXRlIF93ZWJWaWV3Om1fbmF2aWdhdGlvblN0YXRlLm1fd2Vi VmlldyBkaWRGYWlsVG9Jbml0aWFsaXplUGx1Z0luV2l0aEluZm86d3JhcHBlcihpbmZvKV07Cit9 CisKIGlubGluZSBXZWJDb3JlOjpXZWJHTExvYWRQb2xpY3kgdG9XZWJDb3JlV2ViR0xMb2FkUG9s aWN5KF9XS1dlYkdMTG9hZFBvbGljeSBwb2xpY3kpCiB7CiAgICAgc3dpdGNoIChwb2xpY3kpIHsK 322557 2017-10-03 12:04:14 -0700 2017-10-03 12:05:11 -0700 Patch bug-177787-20171003120412.patch text/plain 10457 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMjI3OTQpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE3LTEwLTAzICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIE9iakMgZXF1 aXZhbGVudCBvZiBXS1BhZ2VMb2FkZXJDbGllbnQucGx1Z2luRGlkRmFpbAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc3Nzg3CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS8yMjM4NzYzMz4KKworICAgICAgICBSZXZpZXdlZCBieSBUaW0gSG9ydG9uLgor CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9BUElMb2FkZXJDbGllbnQuaDoKKyAgICAgICAgKEFQ STo6TG9hZGVyQ2xpZW50OjpkaWRGYWlsVG9Jbml0aWFsaXplUGx1Z2luKToKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL0FQSU5hdmlnYXRpb25DbGllbnQuaDoKKyAgICAgICAgKEFQSTo6TmF2aWdh dGlvbkNsaWVudDo6Y2FuSGFuZGxlRGlkRmFpbFRvSW5pdGlhbGl6ZVBsdWdJbiBjb25zdCk6Cisg ICAgICAgIChBUEk6Ok5hdmlnYXRpb25DbGllbnQ6OmRpZEZhaWxUb0luaXRpYWxpemVQbHVnSW4p OgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwOgorICAgICAgICAoV0tQYWdl U2V0UGFnZUxvYWRlckNsaWVudCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS05h dmlnYXRpb25EZWxlZ2F0ZVByaXZhdGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvTmF2 aWdhdGlvblN0YXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0 ZS5tbToKKyAgICAgICAgKFdlYktpdDo6TmF2aWdhdGlvblN0YXRlOjpzZXROYXZpZ2F0aW9uRGVs ZWdhdGUpOgorICAgICAgICAoV2ViS2l0OjpOYXZpZ2F0aW9uU3RhdGU6Ok5hdmlnYXRpb25DbGll bnQ6OmNhbkhhbmRsZURpZEZhaWxUb0luaXRpYWxpemVQbHVnSW4gY29uc3QpOgorICAgICAgICAo V2ViS2l0OjpOYXZpZ2F0aW9uU3RhdGU6Ok5hdmlnYXRpb25DbGllbnQ6OmRpZEZhaWxUb0luaXRp YWxpemVQbHVnSW4pOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZEZhaWxUb0luaXRpYWxpemVQbHVnaW4pOgor CiAyMDE3LTEwLTAzICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+ CiAKICAgICAgICAgQWRkIE9iakMgU1BJIGVxdWl2YWxlbnQgdG8gV0tQYWdlTG9hZGVyQ2xpZW50 LndpbGxHb1RvQmFja0ZvcndhcmRMaXN0SXRlbQpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuY3BwCShyZXZpc2lvbiAyMjI3OTQpCisrKyBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02MDUzLDcgKzYwNTMs OSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cGFnZUV4dGVuZGVkQmFja2dyb3VuCiAjaWYgRU5BQkxF KE5FVFNDQVBFX1BMVUdJTl9BUEkpCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmFpbFRvSW5pdGlh bGl6ZVBsdWdpbihjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBTdHJpbmcmIGZyYW1lVVJM U3RyaW5nLCBjb25zdCBTdHJpbmcmIHBhZ2VVUkxTdHJpbmcpCiB7Ci0gICAgbV9sb2FkZXJDbGll bnQtPmRpZEZhaWxUb0luaXRpYWxpemVQbHVnaW4oKnRoaXMsIGNyZWF0ZVBsdWdpbkluZm9ybWF0 aW9uRGljdGlvbmFyeShtaW1lVHlwZSwgZnJhbWVVUkxTdHJpbmcsIHBhZ2VVUkxTdHJpbmcpLnB0 cigpKTsKKyAgICBpZiAobV9uYXZpZ2F0aW9uQ2xpZW50LT5kaWRGYWlsVG9Jbml0aWFsaXplUGx1 Z0luKCp0aGlzLCBjcmVhdGVQbHVnaW5JbmZvcm1hdGlvbkRpY3Rpb25hcnkobWltZVR5cGUsIGZy YW1lVVJMU3RyaW5nLCBwYWdlVVJMU3RyaW5nKS5nZXQoKSkpCisgICAgICAgIHJldHVybjsKKyAg ICBtX2xvYWRlckNsaWVudC0+ZGlkRmFpbFRvSW5pdGlhbGl6ZVBsdWdpbigqdGhpcywgY3JlYXRl UGx1Z2luSW5mb3JtYXRpb25EaWN0aW9uYXJ5KG1pbWVUeXBlLCBmcmFtZVVSTFN0cmluZywgcGFn ZVVSTFN0cmluZykuZ2V0KCkpOwogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQmxvY2tJbnNl Y3VyZVBsdWdpblZlcnNpb24oY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgY29uc3QgU3RyaW5nJiBw bHVnaW5VUkxTdHJpbmcsIGNvbnN0IFN0cmluZyYgZnJhbWVVUkxTdHJpbmcsIGNvbnN0IFN0cmlu ZyYgcGFnZVVSTFN0cmluZywgYm9vbCByZXBsYWNlbWVudE9ic2N1cmVkKQpJbmRleDogU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSUxvYWRlckNsaWVudC5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElMb2FkZXJDbGllbnQuaAkocmV2aXNpb24gMjIy Nzk0KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSUxvYWRlckNsaWVudC5oCSh3 b3JraW5nIGNvcHkpCkBAIC0xMDQsNyArMTA0LDcgQEAgcHVibGljOgogCiAjaWYgRU5BQkxFKE5F VFNDQVBFX1BMVUdJTl9BUEkpCiAgICAgdmlydHVhbCBXZWJLaXQ6OlBsdWdpbk1vZHVsZUxvYWRQ b2xpY3kgcGx1Z2luTG9hZFBvbGljeShXZWJLaXQ6OldlYlBhZ2VQcm94eSYsIFdlYktpdDo6UGx1 Z2luTW9kdWxlTG9hZFBvbGljeSBjdXJyZW50UGx1Z2luTG9hZFBvbGljeSwgQVBJOjpEaWN0aW9u YXJ5KiwgV1RGOjpTdHJpbmcmIC8qIHVuYXZhaWxhYmlsaXR5RGVzY3JpcHRpb24gKi8pIHsgcmV0 dXJuIGN1cnJlbnRQbHVnaW5Mb2FkUG9saWN5OyB9Ci0gICAgdmlydHVhbCB2b2lkIGRpZEZhaWxU b0luaXRpYWxpemVQbHVnaW4oV2ViS2l0OjpXZWJQYWdlUHJveHkmLCBBUEk6OkRpY3Rpb25hcnkq KSB7IH0KKyAgICB2aXJ0dWFsIHZvaWQgZGlkRmFpbFRvSW5pdGlhbGl6ZVBsdWdpbihXZWJLaXQ6 OldlYlBhZ2VQcm94eSYsIEFQSTo6RGljdGlvbmFyeSYpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBk aWRCbG9ja0luc2VjdXJlUGx1Z2luVmVyc2lvbihXZWJLaXQ6OldlYlBhZ2VQcm94eSYsIEFQSTo6 RGljdGlvbmFyeSopIHsgfQogI2VuZGlmIC8vIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQog CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJTmF2aWdhdGlvbkNsaWVudC5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElOYXZpZ2F0aW9u Q2xpZW50LmgJKHJldmlzaW9uIDIyMjc5NCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9BUElOYXZpZ2F0aW9uQ2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTEwOSw2ICsxMDksNyBA QCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGNvbnRlbnRSdWxlTGlzdE5vdGlmaWNhdGlvbihX ZWJLaXQ6OldlYlBhZ2VQcm94eSYsIFdlYkNvcmU6OlVSTCYmLCBWZWN0b3I8V1RGOjpTdHJpbmc+ JiYsIFZlY3RvcjxXVEY6OlN0cmluZz4mJikgeyB9OwogICAgIAogI2lmIEVOQUJMRShORVRTQ0FQ RV9QTFVHSU5fQVBJKQorICAgIHZpcnR1YWwgYm9vbCBkaWRGYWlsVG9Jbml0aWFsaXplUGx1Z0lu KFdlYktpdDo6V2ViUGFnZVByb3h5JiwgQVBJOjpEaWN0aW9uYXJ5JikgeyByZXR1cm4gZmFsc2U7 IH0KICAgICB2aXJ0dWFsIFdlYktpdDo6UGx1Z2luTW9kdWxlTG9hZFBvbGljeSBkZWNpZGVQb2xp Y3lGb3JQbHVnaW5Mb2FkKFdlYktpdDo6V2ViUGFnZVByb3h5JiwgV2ViS2l0OjpQbHVnaW5Nb2R1 bGVMb2FkUG9saWN5IGN1cnJlbnRQbHVnaW5Mb2FkUG9saWN5LCBEaWN0aW9uYXJ5KiwgV1RGOjpT dHJpbmcmKQogICAgIHsKICAgICAgICAgcmV0dXJuIGN1cnJlbnRQbHVnaW5Mb2FkUG9saWN5OwpJ bmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCShyZXZpc2lvbiAy MjI3OTQpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0xMjU1LDE2ICsxMjU1LDE2IEBAIHZvaWQgV0tQYWdlU2V0UGFnZUxvYWRl ckNsaWVudChXS1BhZ2VSZWYKICAgICAgICAgfQogCiAjaWYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJ Tl9BUEkpCi0gICAgICAgIHZvaWQgZGlkRmFpbFRvSW5pdGlhbGl6ZVBsdWdpbihXZWJQYWdlUHJv eHkmIHBhZ2UsIEFQSTo6RGljdGlvbmFyeSogcGx1Z2luSW5mb3JtYXRpb24pIG92ZXJyaWRlCisg ICAgICAgIHZvaWQgZGlkRmFpbFRvSW5pdGlhbGl6ZVBsdWdpbihXZWJQYWdlUHJveHkmIHBhZ2Us IEFQSTo6RGljdGlvbmFyeSYgcGx1Z2luSW5mb3JtYXRpb24pIGZpbmFsCiAgICAgICAgIHsKICAg ICAgICAgICAgIGlmIChtX2NsaWVudC5kaWRGYWlsVG9Jbml0aWFsaXplUGx1Z2luX2RlcHJlY2F0 ZWRGb3JVc2VXaXRoVjApCi0gICAgICAgICAgICAgICAgbV9jbGllbnQuZGlkRmFpbFRvSW5pdGlh bGl6ZVBsdWdpbl9kZXByZWNhdGVkRm9yVXNlV2l0aFYwKHRvQVBJKCZwYWdlKSwgdG9BUEkocGx1 Z2luSW5mb3JtYXRpb24tPmdldDxBUEk6OlN0cmluZz4ocGx1Z2luSW5mb3JtYXRpb25NSU1FVHlw ZUtleSgpKSksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7CisgICAgICAgICAgICAgICAgbV9j bGllbnQuZGlkRmFpbFRvSW5pdGlhbGl6ZVBsdWdpbl9kZXByZWNhdGVkRm9yVXNlV2l0aFYwKHRv QVBJKCZwYWdlKSwgdG9BUEkocGx1Z2luSW5mb3JtYXRpb24uZ2V0PEFQSTo6U3RyaW5nPihwbHVn aW5JbmZvcm1hdGlvbk1JTUVUeXBlS2V5KCkpKSwgbV9jbGllbnQuYmFzZS5jbGllbnRJbmZvKTsK IAogICAgICAgICAgICAgaWYgKG1fY2xpZW50LnBsdWdpbkRpZEZhaWxfZGVwcmVjYXRlZEZvclVz ZVdpdGhWMSkKLSAgICAgICAgICAgICAgICBtX2NsaWVudC5wbHVnaW5EaWRGYWlsX2RlcHJlY2F0 ZWRGb3JVc2VXaXRoVjEodG9BUEkoJnBhZ2UpLCBrV0tFcnJvckNvZGVDYW5ub3RMb2FkUGx1Z0lu LCB0b0FQSShwbHVnaW5JbmZvcm1hdGlvbi0+Z2V0PEFQSTo6U3RyaW5nPihwbHVnaW5JbmZvcm1h dGlvbk1JTUVUeXBlS2V5KCkpKSwgMCwgMCwgbV9jbGllbnQuYmFzZS5jbGllbnRJbmZvKTsKKyAg ICAgICAgICAgICAgICBtX2NsaWVudC5wbHVnaW5EaWRGYWlsX2RlcHJlY2F0ZWRGb3JVc2VXaXRo VjEodG9BUEkoJnBhZ2UpLCBrV0tFcnJvckNvZGVDYW5ub3RMb2FkUGx1Z0luLCB0b0FQSShwbHVn aW5JbmZvcm1hdGlvbi5nZXQ8QVBJOjpTdHJpbmc+KHBsdWdpbkluZm9ybWF0aW9uTUlNRVR5cGVL ZXkoKSkpLCAwLCAwLCBtX2NsaWVudC5iYXNlLmNsaWVudEluZm8pOwogCiAgICAgICAgICAgICBp ZiAobV9jbGllbnQucGx1Z2luRGlkRmFpbCkKLSAgICAgICAgICAgICAgICBtX2NsaWVudC5wbHVn aW5EaWRGYWlsKHRvQVBJKCZwYWdlKSwga1dLRXJyb3JDb2RlQ2Fubm90TG9hZFBsdWdJbiwgdG9B UEkocGx1Z2luSW5mb3JtYXRpb24pLCBtX2NsaWVudC5iYXNlLmNsaWVudEluZm8pOworICAgICAg ICAgICAgICAgIG1fY2xpZW50LnBsdWdpbkRpZEZhaWwodG9BUEkoJnBhZ2UpLCBrV0tFcnJvckNv ZGVDYW5ub3RMb2FkUGx1Z0luLCB0b0FQSSgmcGx1Z2luSW5mb3JtYXRpb24pLCBtX2NsaWVudC5i YXNlLmNsaWVudEluZm8pOwogICAgICAgICB9CiAKICAgICAgICAgdm9pZCBkaWRCbG9ja0luc2Vj dXJlUGx1Z2luVmVyc2lvbihXZWJQYWdlUHJveHkmIHBhZ2UsIEFQSTo6RGljdGlvbmFyeSogcGx1 Z2luSW5mb3JtYXRpb24pIG92ZXJyaWRlCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQ29jb2EvV0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRlLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLTmF2aWdhdGlvbkRlbGVnYXRlUHJpdmF0 ZS5oCShyZXZpc2lvbiAyMjI3OTQpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTg4LDYg Kzg4LDcgQEAgc3RhdGljIGNvbnN0IFdLTmF2aWdhdGlvblJlc3BvbnNlUG9saWN5IAogLSAodm9p ZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyB3ZWJHTExvYWRQb2xpY3lGb3JVUkw6KE5T VVJMICopdXJsIGRlY2lzaW9uSGFuZGxlcjoodm9pZCAoXikoX1dLV2ViR0xMb2FkUG9saWN5KSlk ZWNpc2lvbkhhbmRsZXIgV0tfQVBJX0FWQUlMQUJMRShtYWNvc3goV0tfTUFDX1RCQSkpOwogLSAo dm9pZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyByZXNvbHZlV2ViR0xMb2FkUG9saWN5 Rm9yVVJMOihOU1VSTCAqKXVybCBkZWNpc2lvbkhhbmRsZXI6KHZvaWQgKF4pKF9XS1dlYkdMTG9h ZFBvbGljeSkpZGVjaXNpb25IYW5kbGVyIFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KFdLX01BQ19U QkEpKTsKIC0gKHZvaWQpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgd2lsbEdvVG9CYWNr Rm9yd2FyZExpc3RJdGVtOihXS0JhY2tGb3J3YXJkTGlzdEl0ZW0gKilpdGVtIGluUGFnZUNhY2hl OihCT09MKWluUGFnZUNhY2hlIFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KFdLX01BQ19UQkEpKTsK Ky0gKHZvaWQpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZGlkRmFpbFRvSW5pdGlhbGl6 ZVBsdWdJbldpdGhJbmZvOihOU0RpY3Rpb25hcnkgKilpbmZvIFdLX0FQSV9BVkFJTEFCTEUobWFj b3N4KFdLX01BQ19UQkEpKTsKICNlbmRpZgogCiBAZW5kCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUuaAkocmV2aXNpb24gMjIyNzk0KQor KysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLmgJKHdvcmtp bmcgY29weSkKQEAgLTEyMCw2ICsxMjAsNyBAQCBwcml2YXRlOgogICAgICAgICB2b2lkIHdlYkdM TG9hZFBvbGljeShXZWJQYWdlUHJveHkmLCBjb25zdCBXZWJDb3JlOjpVUkwmLCBXVEY6OkZ1bmN0 aW9uPHZvaWQoV2ViQ29yZTo6V2ViR0xMb2FkUG9saWN5KT4mJiBjb21wbGV0aW9uSGFuZGxlcikg Y29uc3QgZmluYWw7CiAgICAgICAgIHZvaWQgcmVzb2x2ZVdlYkdMTG9hZFBvbGljeShXZWJQYWdl UHJveHkmLCBjb25zdCBXZWJDb3JlOjpVUkwmLCBXVEY6OkZ1bmN0aW9uPHZvaWQoV2ViQ29yZTo6 V2ViR0xMb2FkUG9saWN5KT4mJiBjb21wbGV0aW9uSGFuZGxlcikgY29uc3QgZmluYWw7CiAgICAg ICAgIGJvb2wgd2lsbEdvVG9CYWNrRm9yd2FyZExpc3RJdGVtKFdlYlBhZ2VQcm94eSYsIFdlYkJh Y2tGb3J3YXJkTGlzdEl0ZW0mLCBib29sIGluUGFnZUNhY2hlLCBBUEk6Ok9iamVjdCopIGZpbmFs OworICAgICAgICBib29sIGRpZEZhaWxUb0luaXRpYWxpemVQbHVnSW4oV2ViS2l0OjpXZWJQYWdl UHJveHkmLCBBUEk6OkRpY3Rpb25hcnkmKSBmaW5hbDsKICNlbmRpZgogCiAgICAgICAgIHZvaWQg Y29udGVudFJ1bGVMaXN0Tm90aWZpY2F0aW9uKFdlYlBhZ2VQcm94eSYsIFdlYkNvcmU6OlVSTCYm LCBWZWN0b3I8U3RyaW5nPiYmLCBWZWN0b3I8U3RyaW5nPiYmKSBmaW5hbDsKQEAgLTIxMyw2ICsy MTQsNyBAQCBwcml2YXRlOgogI2lmIFBMQVRGT1JNKE1BQykKICAgICAgICAgYm9vbCB3ZWJWaWV3 V2ViR0xMb2FkUG9saWN5Rm9yVVJMIDogMTsKICAgICAgICAgYm9vbCB3ZWJWaWV3UmVzb2x2ZVdl YkdMTG9hZFBvbGljeUZvclVSTCA6IDE7CisgICAgICAgIGJvb2wgd2ViVmlld0RpZEZhaWxUb0lu aXRpYWxpemVQbHVnSW5XaXRoSW5mbyA6IDE7CiAgICAgICAgIGJvb2wgd2ViVmlld1dpbGxHb1Rv QmFja0ZvcndhcmRMaXN0SXRlbUluUGFnZUNhY2hlIDogMTsKICNlbmRpZgogICAgIH0gbV9uYXZp Z2F0aW9uRGVsZWdhdGVNZXRob2RzOwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29j b2EvTmF2aWdhdGlvblN0YXRlLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbQkocmV2aXNpb24gMjIyNzk0KQorKysgU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLm1tCSh3b3JraW5nIGNvcHkp CkBAIC00Miw2ICs0Miw3IEBACiAjaW1wb3J0ICJXS0JhY2tGb3J3YXJkTGlzdEl0ZW1JbnRlcm5h bC5oIgogI2ltcG9ydCAiV0tGcmFtZUluZm9JbnRlcm5hbC5oIgogI2ltcG9ydCAiV0tIaXN0b3J5 RGVsZWdhdGVQcml2YXRlLmgiCisjaW1wb3J0ICJXS05TRGljdGlvbmFyeS5oIgogI2ltcG9ydCAi V0tOU1VSTEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlLmgiCiAjaW1wb3J0ICJXS05TVVJMRXh0cmFz LmgiCiAjaW1wb3J0ICJXS05TVVJMUmVxdWVzdC5oIgpAQCAtMTc4LDYgKzE3OSw3IEBAIHZvaWQg TmF2aWdhdGlvblN0YXRlOjpzZXROYXZpZ2F0aW9uRGVsZWcKICAgICBtX25hdmlnYXRpb25EZWxl Z2F0ZU1ldGhvZHMud2ViVmlld1dlYkdMTG9hZFBvbGljeUZvclVSTCA9IFtkZWxlZ2F0ZSByZXNw b25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3OndlYkdMTG9hZFBvbGljeUZvclVSTDpk ZWNpc2lvbkhhbmRsZXI6KV07CiAgICAgbV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZp ZXdSZXNvbHZlV2ViR0xMb2FkUG9saWN5Rm9yVVJMID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxl Y3RvcjpAc2VsZWN0b3IoX3dlYlZpZXc6cmVzb2x2ZVdlYkdMTG9hZFBvbGljeUZvclVSTDpkZWNp c2lvbkhhbmRsZXI6KV07CiAgICAgbV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdX aWxsR29Ub0JhY2tGb3J3YXJkTGlzdEl0ZW1JblBhZ2VDYWNoZSA9IFtkZWxlZ2F0ZSByZXNwb25k c1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3OndpbGxHb1RvQmFja0ZvcndhcmRMaXN0SXRl bTppblBhZ2VDYWNoZTopXTsKKyAgICBtX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmll d0RpZEZhaWxUb0luaXRpYWxpemVQbHVnSW5XaXRoSW5mbyA9IFtkZWxlZ2F0ZSByZXNwb25kc1Rv U2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3OmRpZEZhaWxUb0luaXRpYWxpemVQbHVnSW5XaXRo SW5mbzopXTsKICNlbmRpZgogfQogCkBAIC0yOTIsNiArMjk0LDE5IEBAIE5hdmlnYXRpb25TdGF0 ZTo6TmF2aWdhdGlvbkNsaWVudDo6fk5hdmkKIH0KIAogI2lmIFBMQVRGT1JNKE1BQykKK2Jvb2wg TmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjpkaWRGYWlsVG9Jbml0aWFsaXplUGx1 Z0luKFdlYktpdDo6V2ViUGFnZVByb3h5JiwgQVBJOjpEaWN0aW9uYXJ5JiBpbmZvKQoreworICAg IGlmICghbV9uYXZpZ2F0aW9uU3RhdGUubV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZp ZXdEaWRGYWlsVG9Jbml0aWFsaXplUGx1Z0luV2l0aEluZm8pCisgICAgICAgIHJldHVybiBmYWxz ZTsKKyAgICAKKyAgICBhdXRvIG5hdmlnYXRpb25EZWxlZ2F0ZSA9IG1fbmF2aWdhdGlvblN0YXRl Lm1fbmF2aWdhdGlvbkRlbGVnYXRlLmdldCgpOworICAgIGlmICghbmF2aWdhdGlvbkRlbGVnYXRl KQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgCisgICAgWyhpZCA8V0tOYXZpZ2F0aW9uRGVs ZWdhdGVQcml2YXRlPiluYXZpZ2F0aW9uRGVsZWdhdGUgX3dlYlZpZXc6bV9uYXZpZ2F0aW9uU3Rh dGUubV93ZWJWaWV3IGRpZEZhaWxUb0luaXRpYWxpemVQbHVnSW5XaXRoSW5mbzp3cmFwcGVyKGlu Zm8pXTsKKyAgICByZXR1cm4gdHJ1ZTsKK30KKwogaW5saW5lIFdlYkNvcmU6OldlYkdMTG9hZFBv bGljeSB0b1dlYkNvcmVXZWJHTExvYWRQb2xpY3koX1dLV2ViR0xMb2FkUG9saWN5IHBvbGljeSkK IHsKICAgICBzd2l0Y2ggKHBvbGljeSkgewo=