127965 2014-01-30 15:46:21 -0800 Add a webView:didStartProvisionalNavigation: delegate method 2014-01-30 16:18:42 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 974070 0 andersca 2014-01-30 15:46:21 -0800 Add a webView:didStartProvisionalNavigation: delegate method 974071 1 222753 andersca 2014-01-30 15:47:14 -0800 Created attachment 222753 Patch 974078 2 222753 mitz 2014-01-30 16:14:39 -0800 Comment on attachment 222753 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=222753&action=review > Source/WebKit2/UIProcess/Cocoa/NavigationState.mm:183 > + // FIXME: We should assert that navigationID is not null here, but navigation is currently null for navigations that s/null/zero/ 974081 3 andersca 2014-01-30 16:18:42 -0800 Committed r163132: <http://trac.webkit.org/changeset/163132> 222753 2014-01-30 15:47:14 -0800 2014-01-30 16:14:39 -0800 Patch bug-127965-20140130154714.patch text/plain 18230 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzMTI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMWNiMDliMzUzMjNmMzBm ZmZkYmZjNTZmN2IwYzkyNmYxNGY5OTQyMy4uNTNkNmEyOTQxZDNlYTMzMjJmODcwOTBmMWQyMzZi MDA4YmM3ZjE4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM0IEBACiAyMDE0LTAxLTMwICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQWRkIGEgd2ViVmll dzpkaWRTdGFydFByb3Zpc2lvbmFsTmF2aWdhdGlvbjogZGVsZWdhdGUgbWV0aG9kCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjc5NjUKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv QVBJTG9hZGVyQ2xpZW50Lmg6CisgICAgICAgIChBUEk6OkxvYWRlckNsaWVudDo6ZGlkU3RhcnRQ cm92aXNpb25hbExvYWRGb3JGcmFtZSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUGFn ZS5jcHA6CisgICAgICAgIChXS1BhZ2VTZXRQYWdlTG9hZGVyQ2xpZW50KToKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL0NvY29hL1dLTmF2aWdhdGlvbkRlbGVnYXRlLmg6CisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW06CisgICAgICAgICgtW1dLV2ViVmlldyBpbml0 V2l0aEZyYW1lOmNvbmZpZ3VyYXRpb246XSk6CisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL05h dmlnYXRpb25TdGF0ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3Rh dGUubW06CisgICAgICAgIChXZWJLaXQ6Ok5hdmlnYXRpb25TdGF0ZTo6Y3JlYXRlTG9hZGVyQ2xp ZW50KToKKyAgICAgICAgKFdlYktpdDo6TmF2aWdhdGlvblN0YXRlOjpjcmVhdGVQb2xpY3lDbGll bnQpOgorICAgICAgICAoV2ViS2l0OjpOYXZpZ2F0aW9uU3RhdGU6OnNldE5hdmlnYXRpb25EZWxl Z2F0ZSk6CisgICAgICAgIChXZWJLaXQ6Ok5hdmlnYXRpb25TdGF0ZTo6TG9hZGVyQ2xpZW50OjpM b2FkZXJDbGllbnQpOgorICAgICAgICAoV2ViS2l0OjpOYXZpZ2F0aW9uU3RhdGU6OkxvYWRlckNs aWVudDo6fkxvYWRlckNsaWVudCk6CisgICAgICAgIChXZWJLaXQ6Ok5hdmlnYXRpb25TdGF0ZTo6 TG9hZGVyQ2xpZW50OjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKToKKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVBy b3h5OjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKToKKyAgICAgICAgKiBVSVByb2Nl c3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNz YWdlcy5pbjoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9h ZGVyQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRp c3BhdGNoRGlkU3RhcnRQcm92aXNpb25hbExvYWQpOgorCisyMDE0LTAxLTMwICBBbmRlcnMgQ2Fy bHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgSW1wbGVtZW50IE5hdmlnYXRp b25TdGF0ZTo6UG9saWN5Q2xpZW50OjpkZWNpZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rpb24KICAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNzk2MgogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0FQSUxvYWRlckNsaWVudC5o IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9BUElMb2FkZXJDbGllbnQuaAppbmRleCBm N2Q2OGIxZmI4NzZhMGIxNmU5MjkzZjU5OTViNTBlMDg5MzY1MWQ1Li43YjU5ZGRmMWVhYWI2MWEy ZjJkN2RhNWEyNWQyMGM5MjViZDg3YWRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0FQSUxvYWRlckNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQVBJTG9hZGVyQ2xpZW50LmgKQEAgLTUzLDcgKzUzLDcgQEAgY2xhc3MgTG9hZGVyQ2xp ZW50IHsKIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5Mb2FkZXJDbGllbnQoKSB7IH0KIAotICAgIHZp cnR1YWwgdm9pZCBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKFdlYktpdDo6V2ViUGFn ZVByb3h5KiwgV2ViS2l0OjpXZWJGcmFtZVByb3h5KiwgQVBJOjpPYmplY3QqKSB7IH0KKyAgICB2 aXJ0dWFsIHZvaWQgZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZShXZWJLaXQ6OldlYlBh Z2VQcm94eSosIFdlYktpdDo6V2ViRnJhbWVQcm94eSosIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwg QVBJOjpPYmplY3QqKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgZGlkUmVjZWl2ZVNlcnZlclJlZGly ZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUoV2ViS2l0OjpXZWJQYWdlUHJveHkqLCBXZWJL aXQ6OldlYkZyYW1lUHJveHkqLCBBUEk6Ok9iamVjdCopIHsgfQogICAgIHZpcnR1YWwgdm9pZCBk aWRGYWlsUHJvdmlzaW9uYWxMb2FkV2l0aEVycm9yRm9yRnJhbWUoV2ViS2l0OjpXZWJQYWdlUHJv eHkqLCBXZWJLaXQ6OldlYkZyYW1lUHJveHkqLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9y JiwgQVBJOjpPYmplY3QqKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgZGlkQ29tbWl0TG9hZEZvckZy YW1lKFdlYktpdDo6V2ViUGFnZVByb3h5KiwgV2ViS2l0OjpXZWJGcmFtZVByb3h5KiwgQVBJOjpP YmplY3QqKSB7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9X S1BhZ2UuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAKaW5k ZXggNWNmMTM1MWRjZTYyOWUxZDgxODA1ODI2ODhhZWUwOWI1MDFhOTE3Ny4uOTYzOGM1YmYwM2Qz OTg1YTdhZDc5ODY5ODE4ZjNkNWVkYzk1MDliOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9DL1dLUGFnZS5jcHAKQEAgLTY5Miw3ICs2OTIsNyBAQCB2b2lkIFdLUGFnZVNldFBhZ2VM b2FkZXJDbGllbnQoV0tQYWdlUmVmIHBhZ2VSZWYsIGNvbnN0IFdLUGFnZUxvYWRlckNsaWVudEJh c2UqCiAgICAgICAgIH0KIAogICAgIHByaXZhdGU6Ci0gICAgICAgIHZpcnR1YWwgdm9pZCBkaWRT dGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKFdlYlBhZ2VQcm94eSogcGFnZSwgV2ViRnJhbWVQ cm94eSogZnJhbWUsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSkgb3ZlcnJpZGUKKyAgICAgICAgdmly dHVhbCB2b2lkIGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUoV2ViUGFnZVByb3h5KiBw YWdlLCBXZWJGcmFtZVByb3h5KiBmcmFtZSwgdWludDY0X3QgbmF2aWdhdGlvbklELCBBUEk6Ok9i amVjdCogdXNlckRhdGEpIG92ZXJyaWRlCiAgICAgICAgIHsKICAgICAgICAgICAgIGlmICghbV9j bGllbnQuZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSkKICAgICAgICAgICAgICAgICBy ZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dL TmF2aWdhdGlvbkRlbGVnYXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29h L1dLTmF2aWdhdGlvbkRlbGVnYXRlLmgKaW5kZXggZDE2ZmQ4YjJlMzYwNDJjZGZlODFkNjg3NjJl ZDU4MmUxYWViMmFkNi4uMGZkNzBlMWZhYmI3YWRmYzMzNDM4NWQ2NTQxOGNhNGUyNTk3ODUwOCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS05hdmlnYXRp b25EZWxlZ2F0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tO YXZpZ2F0aW9uRGVsZWdhdGUuaApAQCAtNTEsNiArNTEsOCBAQCB0eXBlZGVmIE5TX0VOVU0oTlNJ bnRlZ2VyLCBXS05hdmlnYXRpb25SZXNwb25zZVBvbGljeURlY2lzaW9uKSB7CiAtICh2b2lkKXdl YlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlv bjooV0tOYXZpZ2F0aW9uQWN0aW9uICopbmF2aWdhdGlvbkFjdGlvbiBkZWNpc2lvbkhhbmRsZXI6 KHZvaWQgKF4pKFdLTmF2aWdhdGlvblBvbGljeURlY2lzaW9uKSlkZWNpc2lvbkhhbmRsZXI7CiAt ICh2b2lkKXdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZGVjaWRlUG9saWN5Rm9yTmF2aWdh dGlvblJlc3BvbnNlOihXS05hdmlnYXRpb25SZXNwb25zZSAqKW5hdmlnYXRpb25SZXNwb25zZSBk ZWNpc2lvbkhhbmRsZXI6KHZvaWQgKF4pKFdLTmF2aWdhdGlvblJlc3BvbnNlUG9saWN5RGVjaXNp b24pKWRlY2lzaW9uSGFuZGxlcjsKIAorLSAodm9pZCl3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJW aWV3IGRpZFN0YXJ0UHJvdmlzaW9uYWxOYXZpZ2F0aW9uOihXS05hdmlnYXRpb24gKiluYXZpZ2F0 aW9uOworCiBAZW5kCiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L0NvY29hL1dLV2ViVmlldy5tbQppbmRleCBmMzkxMmViNTllNjBhMTk2OGJjNzU3Y2UzNThhZjI4 NTYyYWFmNDVkLi44MTNiOTNiMDRhOTFlNzcyNDM3NDJmN2Y0MjEyY2ZhMTQxNTZjZGI4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQpAQCAt MTIwLDYgKzEyMCw3IEBAIHN0YXRpYyBfVUlXZWJWaWV3cG9ydENvbmZpZ3VyYXRpb24gc3RhbmRh cmRWaWV3cG9ydENvbmZpZ3VyYXRpb24gPSB7IHsgVUlXZWJWaWV3CiAjZW5kaWYKIAogICAgIF9w YWdlLT5zZXRQb2xpY3lDbGllbnQoX25hdmlnYXRpb25TdGF0ZS0+Y3JlYXRlUG9saWN5Q2xpZW50 KCkpOworICAgIF9wYWdlLT5zZXRMb2FkZXJDbGllbnQoX25hdmlnYXRpb25TdGF0ZS0+Y3JlYXRl TG9hZGVyQ2xpZW50KCkpOwogCiAgICAgcmV0dXJuIHNlbGY7CiB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLmggYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLmgKaW5kZXggYWEzNDEzYzg5MmI1 ZDc0MGNjYWNjNmNmNzU0ZGFjOTlhMTlkMjE2ZC4uODMwOTA3N2IxNDljMzBlOTM4ODU3MTljZTJm NmYwMzBjOTYzMmY0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29h L05hdmlnYXRpb25TdGF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9O YXZpZ2F0aW9uU3RhdGUuaApAQCAtMzIsNiArMzIsNyBAQAogCiAjaW1wb3J0IDx3dGYvSGFzaE1h cC5oPgogI2ltcG9ydCA8d3RmL1JldGFpblB0ci5oPgorI2ltcG9ydCAiQVBJTG9hZGVyQ2xpZW50 LmgiCiAjaW1wb3J0ICJBUElQb2xpY3lDbGllbnQuaCIKICNpbXBvcnQgIldlYWtPYmpDUHRyLmgi CiAKQEAgLTQ3LDYgKzQ4LDcgQEAgcHVibGljOgogICAgIH5OYXZpZ2F0aW9uU3RhdGUoKTsKIAog ICAgIHN0ZDo6dW5pcXVlX3B0cjxBUEk6OlBvbGljeUNsaWVudD4gY3JlYXRlUG9saWN5Q2xpZW50 KCk7CisgICAgc3RkOjp1bmlxdWVfcHRyPEFQSTo6TG9hZGVyQ2xpZW50PiBjcmVhdGVMb2FkZXJD bGllbnQoKTsKIAogICAgIFJldGFpblB0cjxpZCA8V0tOYXZpZ2F0aW9uRGVsZWdhdGU+ID4gbmF2 aWdhdGlvbkRlbGVnYXRlKCk7CiAgICAgdm9pZCBzZXROYXZpZ2F0aW9uRGVsZWdhdGUoaWQgPFdL TmF2aWdhdGlvbkRlbGVnYXRlPik7CkBAIC02OCw5ICs3MCwyMiBAQCBwcml2YXRlOgogICAgICAg ICBOYXZpZ2F0aW9uU3RhdGUmIG1fbmF2aWdhdGlvblN0YXRlOwogICAgIH07CiAKKyAgICBjbGFz cyBMb2FkZXJDbGllbnQgOiBwdWJsaWMgQVBJOjpMb2FkZXJDbGllbnQgeworICAgIHB1YmxpYzoK KyAgICAgICAgZXhwbGljaXQgTG9hZGVyQ2xpZW50KE5hdmlnYXRpb25TdGF0ZSYpOworICAgICAg ICB+TG9hZGVyQ2xpZW50KCk7CisKKyAgICBwcml2YXRlOgorICAgICAgICB2aXJ0dWFsIHZvaWQg ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZShXZWJQYWdlUHJveHkqLCBXZWJGcmFtZVBy b3h5KiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBBUEk6Ok9iamVjdCopIG92ZXJyaWRlOworCisg ICAgICAgIE5hdmlnYXRpb25TdGF0ZSYgbV9uYXZpZ2F0aW9uU3RhdGU7CisgICAgfTsKKwogICAg IHN0cnVjdCB7CiAgICAgICAgIGJvb2wgd2ViVmlld0RlY2lkZVBvbGljeUZvck5hdmlnYXRpb25B Y3Rpb25EZWNpc2lvbkhhbmRsZXIgOiAxOwogICAgICAgICBib29sIHdlYlZpZXdEZWNpZGVQb2xp Y3lGb3JOYXZpZ2F0aW9uUmVzcG9uc2VEZWNpc2lvbkhhbmRsZXIgOiAxOworCisgICAgICAgIGJv b2wgd2ViVmlld0RpZFN0YXJ0UHJvdmlzaW9uYWxOYXZpZ2F0aW9uIDogMTsKICAgICB9IG1fbmF2 aWdhdGlvbkRlbGVnYXRlTWV0aG9kczsKIAogICAgIFdLV2ViVmlldyAqbV93ZWJWaWV3OwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5t bSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0KaW5k ZXggN2VmNmZhZGM2MmUyOGNiNTU5YjEwYWEyNWM2NTdkODFlMzA1OTlhMS4uOWQwMGQ5YWI3MmI4 ZmI0NzdkNTBiNjQyODFhZDI2YmE2NmRkMmNhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLm1tCkBAIC0zMCw2ICszMCw3IEBACiAKICNp bXBvcnQgIldLTmF2aWdhdGlvbkRlbGVnYXRlLmgiCiAjaW1wb3J0ICJXS05hdmlnYXRpb25JbnRl cm5hbC5oIgorI2ltcG9ydCAiV2ViRnJhbWVQcm94eS5oIgogCiBuYW1lc3BhY2UgV2ViS2l0IHsK IApAQCAtNDIsNiArNDMsMTYgQEAgTmF2aWdhdGlvblN0YXRlOjp+TmF2aWdhdGlvblN0YXRlKCkK IHsKIH0KIAorc3RkOjp1bmlxdWVfcHRyPEFQSTo6TG9hZGVyQ2xpZW50PiBOYXZpZ2F0aW9uU3Rh dGU6OmNyZWF0ZUxvYWRlckNsaWVudCgpCit7CisgICAgcmV0dXJuIHN0ZDo6bWFrZV91bmlxdWU8 TG9hZGVyQ2xpZW50PigqdGhpcyk7Cit9CisKK3N0ZDo6dW5pcXVlX3B0cjxBUEk6OlBvbGljeUNs aWVudD4gTmF2aWdhdGlvblN0YXRlOjpjcmVhdGVQb2xpY3lDbGllbnQoKQoreworICAgIHJldHVy biBzdGQ6Om1ha2VfdW5pcXVlPFBvbGljeUNsaWVudD4oKnRoaXMpOworfQorCiBSZXRhaW5QdHI8 aWQgPFdLTmF2aWdhdGlvbkRlbGVnYXRlPiA+IE5hdmlnYXRpb25TdGF0ZTo6bmF2aWdhdGlvbkRl bGVnYXRlKCkKIHsKICAgICByZXR1cm4gbV9uYXZpZ2F0aW9uRGVsZWdhdGUuZ2V0KCk7CkBAIC01 Myw2ICs2NCw4IEBAIHZvaWQgTmF2aWdhdGlvblN0YXRlOjpzZXROYXZpZ2F0aW9uRGVsZWdhdGUo aWQgPFdLTmF2aWdhdGlvbkRlbGVnYXRlPiBkZWxlZ2F0ZSkKIAogICAgIG1fbmF2aWdhdGlvbkRl bGVnYXRlTWV0aG9kcy53ZWJWaWV3RGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbkRlY2lz aW9uSGFuZGxlciA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHdlYlZp ZXc6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbjpkZWNpc2lvbkhhbmRsZXI6KV07CiAg ICAgbV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdEZWNpZGVQb2xpY3lGb3JOYXZp Z2F0aW9uUmVzcG9uc2VEZWNpc2lvbkhhbmRsZXIgPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVj dG9yOkBzZWxlY3Rvcih3ZWJWaWV3OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25SZXNwb25zZTpk ZWNpc2lvbkhhbmRsZXI6KV07CisKKyAgICBtX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2Vi Vmlld0RpZFN0YXJ0UHJvdmlzaW9uYWxOYXZpZ2F0aW9uID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9T ZWxlY3RvcjpAc2VsZWN0b3Iod2ViVmlldzpkaWRTdGFydFByb3Zpc2lvbmFsTmF2aWdhdGlvbjop XTsKIH0KIAogUmV0YWluUHRyPFdLTmF2aWdhdGlvbj4gTmF2aWdhdGlvblN0YXRlOjpjcmVhdGVM b2FkUmVxdWVzdE5hdmlnYXRpb24odWludDY0X3QgbmF2aWdhdGlvbklELCBOU1VSTFJlcXVlc3Qg KnJlcXVlc3QpCkBAIC02OCwxMSArODEsNiBAQCBSZXRhaW5QdHI8V0tOYXZpZ2F0aW9uPiBOYXZp Z2F0aW9uU3RhdGU6OmNyZWF0ZUxvYWRSZXF1ZXN0TmF2aWdhdGlvbih1aW50NjRfdCBuYQogICAg IHJldHVybiBuYXZpZ2F0aW9uOwogfQogCi1zdGQ6OnVuaXF1ZV9wdHI8QVBJOjpQb2xpY3lDbGll bnQ+IE5hdmlnYXRpb25TdGF0ZTo6Y3JlYXRlUG9saWN5Q2xpZW50KCkKLXsKLSAgICByZXR1cm4g c3RkOjptYWtlX3VuaXF1ZTxQb2xpY3lDbGllbnQ+KCp0aGlzKTsKLX0KLQogTmF2aWdhdGlvblN0 YXRlOjpQb2xpY3lDbGllbnQ6OlBvbGljeUNsaWVudChOYXZpZ2F0aW9uU3RhdGUmIG5hdmlnYXRp b25TdGF0ZSkKICAgICA6IG1fbmF2aWdhdGlvblN0YXRlKG5hdmlnYXRpb25TdGF0ZSkKIHsKQEAg LTE1MSw2ICsxNTksMzYgQEAgdm9pZCBOYXZpZ2F0aW9uU3RhdGU6OlBvbGljeUNsaWVudDo6ZGVj aWRlUG9saWN5Rm9yUmVzcG9uc2UoV2ViUGFnZVByb3h5KiwgV2ViRnIKICAgICB9XTsKIH0KIAor TmF2aWdhdGlvblN0YXRlOjpMb2FkZXJDbGllbnQ6OkxvYWRlckNsaWVudChOYXZpZ2F0aW9uU3Rh dGUmIG5hdmlnYXRpb25TdGF0ZSkKKyAgICA6IG1fbmF2aWdhdGlvblN0YXRlKG5hdmlnYXRpb25T dGF0ZSkKK3sKK30KKworTmF2aWdhdGlvblN0YXRlOjpMb2FkZXJDbGllbnQ6On5Mb2FkZXJDbGll bnQoKQoreworfQorCit2b2lkIE5hdmlnYXRpb25TdGF0ZTo6TG9hZGVyQ2xpZW50OjpkaWRTdGFy dFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKFdlYlBhZ2VQcm94eSosIFdlYkZyYW1lUHJveHkqIHdl YkZyYW1lUHJveHksIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgQVBJOjpPYmplY3QqKQoreworICAg IGlmICghd2ViRnJhbWVQcm94eS0+aXNNYWluRnJhbWUoKSkKKyAgICAgICAgcmV0dXJuOworCisg ICAgaWYgKCFtX25hdmlnYXRpb25TdGF0ZS5tX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2Vi Vmlld0RpZFN0YXJ0UHJvdmlzaW9uYWxOYXZpZ2F0aW9uKQorICAgICAgICByZXR1cm47CisKKyAg ICBhdXRvIG5hdmlnYXRpb25EZWxlZ2F0ZSA9IG1fbmF2aWdhdGlvblN0YXRlLm1fbmF2aWdhdGlv bkRlbGVnYXRlLmdldCgpOworICAgIGlmICghbmF2aWdhdGlvbkRlbGVnYXRlKQorICAgICAgICBy ZXR1cm47CisKKyAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGFzc2VydCB0aGF0IG5hdmlnYXRpb25J RCBpcyBub3QgbnVsbCBoZXJlLCBidXQgbmF2aWdhdGlvbiBpcyBjdXJyZW50bHkgbnVsbCBmb3Ig bmF2aWdhdGlvbnMgdGhhdAorICAgIC8vIG9yaWdpbmF0ZWQgZnJvbSB0aGUgd2ViIHByb2Nlc3Mu CisgICAgV0tOYXZpZ2F0aW9uICpuYXZpZ2F0aW9uID0gbmlsOworICAgIGlmIChuYXZpZ2F0aW9u SUQpCisgICAgICAgIG5hdmlnYXRpb24gPSBtX25hdmlnYXRpb25TdGF0ZS5tX25hdmlnYXRpb25z LmdldChuYXZpZ2F0aW9uSUQpLmdldCgpOworCisgICAgW25hdmlnYXRpb25EZWxlZ2F0ZS5nZXQo KSB3ZWJWaWV3Om1fbmF2aWdhdGlvblN0YXRlLm1fd2ViVmlldyBkaWRTdGFydFByb3Zpc2lvbmFs TmF2aWdhdGlvbjpuYXZpZ2F0aW9uXTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKICNl bmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCA1YmEw Nzc1OTUwOGYxNWZjNWYwNDVmMTU2MzZhNTM1OTIyODM3ZjQwLi5lMjBmOTdlNWY2MWI2Njg0ZTA3 MTE1ZTBlNWI2Y2NiNTdiZjEzNWQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmNwcApAQCAtMjA5Nyw3ICsyMDk3LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZEZp bmlzaFByb2dyZXNzKCkKICAgICBtX2xvYWRlckNsaWVudC0+ZGlkRmluaXNoUHJvZ3Jlc3ModGhp cyk7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZy YW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIHVu cmVhY2hhYmxlVVJMLCBJUEM6Ok1lc3NhZ2VEZWNvZGVyJiBkZWNvZGVyKQordm9pZCBXZWJQYWdl UHJveHk6OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwg dWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiB1 bnJlYWNoYWJsZVVSTCwgSVBDOjpNZXNzYWdlRGVjb2RlciYgZGVjb2RlcikKIHsKICAgICBhdXRv IHRyYW5zYWN0aW9uID0gbV9wYWdlTG9hZFN0YXRlLnRyYW5zYWN0aW9uKCk7CiAKQEAgLTIxMjEs NyArMjEyMSw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZv ckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFN0cmluCiAgICAgZnJhbWUtPmRpZFN0YXJ0 UHJvdmlzaW9uYWxMb2FkKHVybCk7CiAKICAgICBtX3BhZ2VMb2FkU3RhdGUuY29tbWl0Q2hhbmdl cygpOwotICAgIG1fbG9hZGVyQ2xpZW50LT5kaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1l KHRoaXMsIGZyYW1lLCB1c2VyRGF0YS5nZXQoKSk7CisgICAgbV9sb2FkZXJDbGllbnQtPmRpZFN0 YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodGhpcywgZnJhbWUsIG5hdmlnYXRpb25JRCwgdXNl ckRhdGEuZ2V0KCkpOwogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkUmVjZWl2ZVNlcnZlclJl ZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3Qg U3RyaW5nJiB1cmwsIElQQzo6TWVzc2FnZURlY29kZXImIGRlY29kZXIpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKaW5kZXggMTI3MGM0ZjEzODRlZWYzZWE4NDE5NmQ4MWM5 MzVjODFiMjA1ZmZhYi4uODYwYzllMjcwYjVhZWI5MzI1M2MwMWM5MjhiNGQ4ODY4Yzc4YmVjNyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtODk3LDcgKzg5Nyw3 IEBAIHByaXZhdGU6CiAgICAgdm9pZCBkaWRDcmVhdGVNYWluRnJhbWUodWludDY0X3QgZnJhbWVJ RCk7CiAgICAgdm9pZCBkaWRDcmVhdGVTdWJmcmFtZSh1aW50NjRfdCBmcmFtZUlEKTsKIAotICAg IHZvaWQgZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBj b25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiB1bnJlYWNoYWJsZVVSTCwgSVBDOjpNZXNz YWdlRGVjb2RlciYpOworICAgIHZvaWQgZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1 aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgdXJs LCBjb25zdCBTdHJpbmcmIHVucmVhY2hhYmxlVVJMLCBJUEM6Ok1lc3NhZ2VEZWNvZGVyJik7CiAg ICAgdm9pZCBkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFt ZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBTdHJpbmcmLCBJUEM6Ok1lc3NhZ2VEZWNvZGVyJik7 CiAgICAgdm9pZCBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJ RCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIElQQzo6TWVzc2FnZURlY29kZXImKTsK ICAgICB2b2lkIGRpZENvbW1pdExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBT dHJpbmcmIG1pbWVUeXBlLCB1aW50MzJfdCBmcmFtZUxvYWRUeXBlLCBjb25zdCBXZWJDb3JlOjpD ZXJ0aWZpY2F0ZUluZm8mLCBJUEM6Ok1lc3NhZ2VEZWNvZGVyJik7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgppbmRleCAyYzBlMWFiZTA4 YTk3YWU5N2ZkMWVlYjg2ZjZmOWIxODBlMjEwNmYyLi4zNWM4OGQxZGZlNzhhMzM1MGMwYzdjNGU1 NDRjZTAzNTk5MDY1NGQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5Lm1lc3NhZ2VzLmluCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkubWVzc2FnZXMuaW4KQEAgLTEzMCw3ICsxMzAsNyBAQCBtZXNzYWdlcyAtPiBXZWJQ YWdlUHJveHkgewogICAgIERpZExheW91dCh1aW50MzJfdCB0eXBlLCBXZWJLaXQ6OkluamVjdGVk QnVuZGxlVXNlck1lc3NhZ2VFbmNvZGVyIHVzZXJEYXRhKSBWYXJpYWRpYwogICAgIERpZFJlY2Vp dmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1l SUQsIFN0cmluZyB1cmwsIFdlYktpdDo6SW5qZWN0ZWRCdW5kbGVVc2VyTWVzc2FnZUVuY29kZXIg dXNlckRhdGEpIFZhcmlhZGljCiAgICAgRGlkUmVtb3ZlRnJhbWVGcm9tSGllcmFyY2h5KHVpbnQ2 NF90IGZyYW1lSUQsIFdlYktpdDo6SW5qZWN0ZWRCdW5kbGVVc2VyTWVzc2FnZUVuY29kZXIgdXNl ckRhdGEpIFZhcmlhZGljCi0gICAgRGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50 NjRfdCBmcmFtZUlELCBTdHJpbmcgdXJsLCBTdHJpbmcgdW5yZWFjaGFibGVVUkwsIFdlYktpdDo6 SW5qZWN0ZWRCdW5kbGVVc2VyTWVzc2FnZUVuY29kZXIgdXNlckRhdGEpIFZhcmlhZGljCisgICAg RGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRf dCBuYXZpZ2F0aW9uSUQsIFN0cmluZyB1cmwsIFN0cmluZyB1bnJlYWNoYWJsZVVSTCwgV2ViS2l0 OjpJbmplY3RlZEJ1bmRsZVVzZXJNZXNzYWdlRW5jb2RlciB1c2VyRGF0YSkgVmFyaWFkaWMKICAg ICBEaWRSZWNlaXZlVGl0bGVGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBTdHJpbmcgdGl0bGUs IFdlYktpdDo6SW5qZWN0ZWRCdW5kbGVVc2VyTWVzc2FnZUVuY29kZXIgdXNlckRhdGEpIFZhcmlh ZGljCiAgICAgRGlkRGlzcGxheUluc2VjdXJlQ29udGVudEZvckZyYW1lKHVpbnQ2NF90IGZyYW1l SUQsIFdlYktpdDo6SW5qZWN0ZWRCdW5kbGVVc2VyTWVzc2FnZUVuY29kZXIgdXNlckRhdGEpIFZh cmlhZGljCiAgICAgRGlkUnVuSW5zZWN1cmVDb250ZW50Rm9yRnJhbWUodWludDY0X3QgZnJhbWVJ RCwgV2ViS2l0OjpJbmplY3RlZEJ1bmRsZVVzZXJNZXNzYWdlRW5jb2RlciB1c2VyRGF0YSkgVmFy aWFkaWMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBv cnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKaW5kZXggZTQxOTNkMjZjN2Mx NGI0MzFhYWExN2Y1NzVkZWRiMmM3ZTkwNTg4ZC4uZjQzNzQ3MTc2OGQ4YTlkNGU1NzIzYTEwMDQ3 N2NlZWU4OTBjMzNmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJD b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKQEAgLTM4 LDYgKzM4LDcgQEAKICNpbmNsdWRlICJXZWJCYWNrRm9yd2FyZExpc3RQcm94eS5oIgogI2luY2x1 ZGUgIldlYkNvbnRleHRNZXNzYWdlcy5oIgogI2luY2x1ZGUgIldlYkNvcmVBcmd1bWVudENvZGVy cy5oIgorI2luY2x1ZGUgIldlYkRvY3VtZW50TG9hZGVyLmgiCiAjaW5jbHVkZSAiV2ViRXJyb3Jz LmgiCiAjaW5jbHVkZSAiV2ViRXZlbnQuaCIKICNpbmNsdWRlICJXZWJGcmFtZS5oIgpAQCAtMzk0 LDE3ICszOTUsMTcgQEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRTdGFy dFByb3Zpc2lvbmFsTG9hZCgpCiAgICAgd2ViUGFnZS0+ZmluZENvbnRyb2xsZXIoKS5oaWRlRmlu ZFVJKCk7CiAgICAgd2ViUGFnZS0+c2FuZGJveEV4dGVuc2lvblRyYWNrZXIoKS5kaWRTdGFydFBy b3Zpc2lvbmFsTG9hZChtX2ZyYW1lKTsKIAotICAgIERvY3VtZW50TG9hZGVyKiBwcm92aXNpb25h bExvYWRlciA9IG1fZnJhbWUtPmNvcmVGcmFtZSgpLT5sb2FkZXIoKS5wcm92aXNpb25hbERvY3Vt ZW50TG9hZGVyKCk7Ci0gICAgY29uc3QgU3RyaW5nJiB1cmwgPSBwcm92aXNpb25hbExvYWRlci0+ dXJsKCkuc3RyaW5nKCk7CisgICAgV2ViRG9jdW1lbnRMb2FkZXImIHByb3Zpc2lvbmFsTG9hZGVy ID0gc3RhdGljX2Nhc3Q8V2ViRG9jdW1lbnRMb2FkZXImPigqbV9mcmFtZS0+Y29yZUZyYW1lKCkt PmxvYWRlcigpLnByb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXIoKSk7CisgICAgY29uc3QgU3RyaW5n JiB1cmwgPSBwcm92aXNpb25hbExvYWRlci51cmwoKS5zdHJpbmcoKTsKICAgICBSZWZQdHI8QVBJ OjpPYmplY3Q+IHVzZXJEYXRhOwogCiAgICAgLy8gTm90aWZ5IHRoZSBidW5kbGUgY2xpZW50Lgog ICAgIHdlYlBhZ2UtPmluamVjdGVkQnVuZGxlTG9hZGVyQ2xpZW50KCkuZGlkU3RhcnRQcm92aXNp b25hbExvYWRGb3JGcmFtZSh3ZWJQYWdlLCBtX2ZyYW1lLCB1c2VyRGF0YSk7CiAKLSAgICBTdHJp bmcgdW5yZWFjaGFibGVVUkwgPSBwcm92aXNpb25hbExvYWRlci0+dW5yZWFjaGFibGVVUkwoKS5z dHJpbmcoKTsKKyAgICBTdHJpbmcgdW5yZWFjaGFibGVVUkwgPSBwcm92aXNpb25hbExvYWRlci51 bnJlYWNoYWJsZVVSTCgpLnN0cmluZygpOwogCiAgICAgLy8gTm90aWZ5IHRoZSBVSVByb2Nlc3Mu Ci0gICAgd2ViUGFnZS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRTdGFydFByb3Zp c2lvbmFsTG9hZEZvckZyYW1lKG1fZnJhbWUtPmZyYW1lSUQoKSwgdXJsLCB1bnJlYWNoYWJsZVVS TCwgSW5qZWN0ZWRCdW5kbGVVc2VyTWVzc2FnZUVuY29kZXIodXNlckRhdGEuZ2V0KCkpKSk7Cisg ICAgd2ViUGFnZS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRTdGFydFByb3Zpc2lv bmFsTG9hZEZvckZyYW1lKG1fZnJhbWUtPmZyYW1lSUQoKSwgcHJvdmlzaW9uYWxMb2FkZXIubmF2 aWdhdGlvbklEKCksIHVybCwgdW5yZWFjaGFibGVVUkwsIEluamVjdGVkQnVuZGxlVXNlck1lc3Nh Z2VFbmNvZGVyKHVzZXJEYXRhLmdldCgpKSkpOwogfQogCiB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xp ZW50OjpkaXNwYXRjaERpZFJlY2VpdmVUaXRsZShjb25zdCBTdHJpbmdXaXRoRGlyZWN0aW9uJiB0 aXRsZSkKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRl eCAxMzg1NjRkMzk0NThiYjIzODY0MTMyMjdlOGRlZGY5MzVmN2IxODNlLi45YTc5N2U0MDM1MDQ3 YjhmMGM2NmMzMTY0ZWFiNGUxNzU1ZGI4NmIxIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cK KysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTQtMDEtMzAgIEFuZGVy cyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgYSB3ZWJWaWV3 OmRpZFN0YXJ0UHJvdmlzaW9uYWxOYXZpZ2F0aW9uOiBkZWxlZ2F0ZSBtZXRob2QKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNzk2NQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXQyQ29jb2EvTmF2aWdhdGlvbi5tbToKKyAgICAgICAgKC1bTmF2aWdhdGlvbkRl bGVnYXRlIHdlYlZpZXc6ZGlkU3RhcnRQcm92aXNpb25hbE5hdmlnYXRpb246XSk6CisgICAgICAg IChURVNUKToKKwogMjAxNC0wMS0zMCAgQ2hyaXMgRmxlaXphY2ggIDxjZmxlaXphY2hAYXBwbGUu Y29tPgogCiAgICAgICAgIFdlYktpdFRlc3RSdW5uZXIgZmFpbHMgdG8gbGluayAtIG1pc3Npbmcg cm93SGVhZGVycyBhbmQgY29sdW1uSGVhZGVycwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXQyQ29jb2EvTmF2aWdhdGlvbi5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0MkNvY29hL05hdmlnYXRpb24ubW0KaW5kZXggNDFmODJjMmY5YjI2Y2Nh NmE3YzgyNWI3YTA3NWVmMjE1ZDQxMTYyMi4uMGZjY2Q5Mzg1ZmFmMzBiYzQwMmFlMmUzMDk0YTE4 NjJkNGU4YTliMSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQy Q29jb2EvTmF2aWdhdGlvbi5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dDJDb2NvYS9OYXZpZ2F0aW9uLm1tCkBAIC0yOSw2ICsyOSw3IEBACiAjaW1wb3J0IDxXZWJLaXQy L1dLTmF2aWdhdGlvbkRlbGVnYXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQyL1dLV2ViVmlldy5oPgog I2ltcG9ydCA8d3RmL1JldGFpblB0ci5oPgorI2ltcG9ydCAiUGxhdGZvcm1VdGlsaXRpZXMuaCIK ICNpbXBvcnQgIlRlc3QuaCIKIAogI2lmIFdLX0FQSV9FTkFCTEVECkBAIC0zNiw3ICszNywxOSBA QAogQGludGVyZmFjZSBOYXZpZ2F0aW9uRGVsZWdhdGUgOiBOU09iamVjdCA8V0tOYXZpZ2F0aW9u RGVsZWdhdGU+CiBAZW5kCiAKK3N0YXRpYyBib29sIGlzRG9uZTsKK3N0YXRpYyBSZXRhaW5QdHI8 V0tOYXZpZ2F0aW9uPiBjdXJyZW50TmF2aWdhdGlvbjsKKwogQGltcGxlbWVudGF0aW9uIE5hdmln YXRpb25EZWxlZ2F0ZQorCistICh2b2lkKXdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZGlk U3RhcnRQcm92aXNpb25hbE5hdmlnYXRpb246KFdLTmF2aWdhdGlvbiAqKW5hdmlnYXRpb24KK3sK KyAgICBFWFBFQ1RfRVEoY3VycmVudE5hdmlnYXRpb24sIG5hdmlnYXRpb24pOworICAgIEVYUEVD VF9OT1RfTlVMTChuYXZpZ2F0aW9uLnJlcXVlc3QpOworCisgICAgaXNEb25lID0gdHJ1ZTsKK30K KwogQGVuZAogCiBURVNUKFdLTmF2aWdhdGlvbiwgTmF2aWdhdGlvbkRlbGVnYXRlKQpAQCAtNTgs MTEgKzcxLDE2IEBAIFRFU1QoV0tOYXZpZ2F0aW9uLCBMb2FkUmVxdWVzdCkKIHsKICAgICBSZXRh aW5QdHI8V0tXZWJWaWV3PiB3ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5p dFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKV0pOwogCisgICAgUmV0YWluUHRy PE5hdmlnYXRpb25EZWxlZ2F0ZT4gZGVsZWdhdGUgPSBhZG9wdE5TKFtbTmF2aWdhdGlvbkRlbGVn YXRlIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXcgc2V0TmF2aWdhdGlvbkRlbGVnYXRlOmRl bGVnYXRlLmdldCgpXTsKKwogICAgIE5TVVJMUmVxdWVzdCAqcmVxdWVzdCA9IFtOU1VSTFJlcXVl c3QgcmVxdWVzdFdpdGhVUkw6W1tOU0J1bmRsZSBtYWluQnVuZGxlXSBVUkxGb3JSZXNvdXJjZTpA InNpbXBsZSIgd2l0aEV4dGVuc2lvbjpAImh0bWwiIHN1YmRpcmVjdG9yeTpAIlRlc3RXZWJLaXRB UEkucmVzb3VyY2VzIl1dOwogCi0gICAgV0tOYXZpZ2F0aW9uICpuYXZpZ2F0aW9uID0gW3dlYlZp ZXcgbG9hZFJlcXVlc3Q6cmVxdWVzdF07Ci0gICAgQVNTRVJUX05PVF9OVUxMKG5hdmlnYXRpb24p OwotICAgIEFTU0VSVF9UUlVFKFtuYXZpZ2F0aW9uLnJlcXVlc3QgaXNFcXVhbDpyZXF1ZXN0XSk7 CisgICAgY3VycmVudE5hdmlnYXRpb24gPSBbd2ViVmlldyBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsK KyAgICBBU1NFUlRfTk9UX05VTEwoY3VycmVudE5hdmlnYXRpb24pOworICAgIEFTU0VSVF9UUlVF KFtbY3VycmVudE5hdmlnYXRpb24gcmVxdWVzdF0gaXNFcXVhbDpyZXF1ZXN0XSk7CisKKyAgICBU ZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmlzRG9uZSk7CiB9CiAKICNlbmRpZgo=