131401 2014-04-08 15:20:34 -0700 Change WebPageProxy::CreateNewPage to take a NavigationActionData object 2014-04-08 15:37:43 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 998818 0 andersca 2014-04-08 15:20:34 -0700 Change WebPageProxy::CreateNewPage to take a NavigationActionData object 998819 1 228899 andersca 2014-04-08 15:21:30 -0700 Created attachment 228899 Patch 998826 2 228899 mitz 2014-04-08 15:32:06 -0700 Comment on attachment 228899 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=228899&action=review > Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm:96 > // FIXME: Set a real navigation type. You can remove this now. 998829 3 andersca 2014-04-08 15:37:43 -0700 Committed r166969: <http://trac.webkit.org/changeset/166969> 228899 2014-04-08 15:21:30 -0700 2014-04-08 15:32:06 -0700 Patch bug-131401-20140408152109.patch text/plain 17570 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2OTYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMDE3ODkxMjA1YzYzZGJj NTBhMTUwZDkwZTgyYzM5MTdhMjVkNzRjYy4uMmQ3NmY4MjJhN2RlMDcyYWI1MGY2NzU5ZjYwZTFi ODU4YjNlMTM1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBACiAyMDE0LTA0LTA4ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQ2hhbmdlIFdlYlBh Z2VQcm94eTo6Q3JlYXRlTmV3UGFnZSB0byB0YWtlIGEgTmF2aWdhdGlvbkFjdGlvbkRhdGEgb2Jq ZWN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzE0 MDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvQVBJVUlDbGllbnQuaDoKKyAgICAgICAgKEFQSTo6VUlDbGllbnQ6OmNyZWF0 ZU5ld1BhZ2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwOgorICAgICAg ICAoV0tQYWdlU2V0UGFnZVVJQ2xpZW50KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29h L1dLTmF2aWdhdGlvbkFjdGlvbi5tbToKKyAgICAgICAgKHRvV0tOYXZpZ2F0aW9uVHlwZSk6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS05hdmlnYXRpb25BY3Rpb25JbnRlcm5hbC5o OgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW06CisgICAgICAg IChXZWJLaXQ6OnRvV0tOYXZpZ2F0aW9uVHlwZSk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9j ZXNzL0NvY29hL1VJRGVsZWdhdGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvVUlEZWxl Z2F0ZS5tbToKKyAgICAgICAgKFdlYktpdDo6VUlEZWxlZ2F0ZTo6VUlDbGllbnQ6OmNyZWF0ZU5l d1BhZ2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlUHJveHk6OmNyZWF0ZU5ld1BhZ2UpOgorICAgICAgICAqIFVJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3Nh Z2VzLmluOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xp ZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQ2hyb21lQ2xpZW50OjpjcmVhdGVXaW5kb3cp OgorCisyMDE0LTA0LTA4ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisK ICAgICAgICAgRml4IGJ1aWxkLgogCiAgICAgICAgICogV2ViS2l0MlByZWZpeC5oOgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9BUElVSUNsaWVudC5oIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9BUElVSUNsaWVudC5oCmluZGV4IDMyOTFmMzRhN2FhZjFl NTVmODY0ZDExYjg5NDNjMjIxOGI5NjJiNTEuLmMzZDVjNzBhYmZkMDNkMGQ4YzRkN2Q0ZDY3YzBj YWZiOGM1YWFiNTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQVBJ VUlDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0FQSVVJQ2xpZW50 LmgKQEAgLTU2LDYgKzU2LDcgQEAgY2xhc3MgV2ViT3BlblBhbmVsUGFyYW1ldGVyczsKIGNsYXNz IFdlYk9wZW5QYW5lbFJlc3VsdExpc3RlbmVyUHJveHk7CiBjbGFzcyBXZWJQYWdlUHJveHk7CiBj bGFzcyBXZWJTZWN1cml0eU9yaWdpbjsKK3N0cnVjdCBOYXZpZ2F0aW9uQWN0aW9uRGF0YTsKIH0K IAogbmFtZXNwYWNlIEFQSSB7CkBAIC02Nyw3ICs2OCw3IEBAIGNsYXNzIFVJQ2xpZW50IHsKIHB1 YmxpYzoKICAgICB2aXJ0dWFsIH5VSUNsaWVudCgpIHsgfQogCi0gICAgdmlydHVhbCBQYXNzUmVm UHRyPFdlYktpdDo6V2ViUGFnZVByb3h5PiBjcmVhdGVOZXdQYWdlKFdlYktpdDo6V2ViUGFnZVBy b3h5KiwgV2ViS2l0OjpXZWJGcmFtZVByb3h5KiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1 ZXN0JiwgY29uc3QgV2ViQ29yZTo6V2luZG93RmVhdHVyZXMmLCBXZWJLaXQ6OldlYkV2ZW50OjpN b2RpZmllcnMsIFdlYktpdDo6V2ViTW91c2VFdmVudDo6QnV0dG9uKSB7IHJldHVybiBudWxscHRy OyB9CisgICAgdmlydHVhbCBQYXNzUmVmUHRyPFdlYktpdDo6V2ViUGFnZVByb3h5PiBjcmVhdGVO ZXdQYWdlKFdlYktpdDo6V2ViUGFnZVByb3h5KiwgV2ViS2l0OjpXZWJGcmFtZVByb3h5KiwgY29u c3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgV2ViQ29yZTo6V2luZG93RmVhdHVy ZXMmLCBjb25zdCBXZWJLaXQ6Ok5hdmlnYXRpb25BY3Rpb25EYXRhJikgeyByZXR1cm4gbnVsbHB0 cjsgfQogICAgIHZpcnR1YWwgdm9pZCBzaG93UGFnZShXZWJLaXQ6OldlYlBhZ2VQcm94eSopIHsg fQogICAgIHZpcnR1YWwgdm9pZCBjbG9zZShXZWJLaXQ6OldlYlBhZ2VQcm94eSopIHsgfQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCmluZGV4IDg3ZmJlYzY1NmVm MjNiNmY0MzRjODdhNDI4MmJlNGI5N2QwMWQ1MGUuLjcxZmE3YmQ1NmYwZDFlZWIxYjAzMjQ3ZjQy YTBlNTI4ZWNhZGY1MTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Qy9XS1BhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2Uu Y3BwCkBAIC0xMTE5LDcgKzExMTksNyBAQCB2b2lkIFdLUGFnZVNldFBhZ2VVSUNsaWVudChXS1Bh Z2VSZWYgcGFnZVJlZiwgY29uc3QgV0tQYWdlVUlDbGllbnRCYXNlKiB3a0NsaWVudAogICAgICAg ICB9CiAKICAgICBwcml2YXRlOgotICAgICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8V2ViUGFnZVBy b3h5PiBjcmVhdGVOZXdQYWdlKFdlYlBhZ2VQcm94eSogcGFnZSwgV2ViRnJhbWVQcm94eSosIGNv bnN0IFJlc291cmNlUmVxdWVzdCYgcmVzb3VyY2VSZXF1ZXN0LCBjb25zdCBXaW5kb3dGZWF0dXJl cyYgd2luZG93RmVhdHVyZXMsIFdlYkV2ZW50OjpNb2RpZmllcnMgbW9kaWZpZXJzLCBXZWJNb3Vz ZUV2ZW50OjpCdXR0b24gYnV0dG9uKSBvdmVycmlkZQorICAgICAgICB2aXJ0dWFsIFBhc3NSZWZQ dHI8V2ViUGFnZVByb3h5PiBjcmVhdGVOZXdQYWdlKFdlYlBhZ2VQcm94eSogcGFnZSwgV2ViRnJh bWVQcm94eSosIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVzb3VyY2VSZXF1ZXN0LCBjb25zdCBX aW5kb3dGZWF0dXJlcyYgd2luZG93RmVhdHVyZXMsIGNvbnN0IE5hdmlnYXRpb25BY3Rpb25EYXRh JiBuYXZpZ2F0aW9uQWN0aW9uRGF0YSkgb3ZlcnJpZGUKICAgICAgICAgewogICAgICAgICAgICAg aWYgKCFtX2NsaWVudC5iYXNlLnZlcnNpb24gJiYgIW1fY2xpZW50LmNyZWF0ZU5ld1BhZ2VfZGVw cmVjYXRlZEZvclVzZVdpdGhWMCkKICAgICAgICAgICAgICAgICByZXR1cm4gMDsKQEAgLTExNDcs MTAgKzExNDcsMTAgQEAgdm9pZCBXS1BhZ2VTZXRQYWdlVUlDbGllbnQoV0tQYWdlUmVmIHBhZ2VS ZWYsIGNvbnN0IFdLUGFnZVVJQ2xpZW50QmFzZSogd2tDbGllbnQKICAgICAgICAgICAgIFJlZlB0 cjxJbW11dGFibGVEaWN0aW9uYXJ5PiBmZWF0dXJlc01hcCA9IEltbXV0YWJsZURpY3Rpb25hcnk6 OmNyZWF0ZShzdGQ6Om1vdmUobWFwKSk7CiAKICAgICAgICAgICAgIGlmICghbV9jbGllbnQuYmFz ZS52ZXJzaW9uKQotICAgICAgICAgICAgICAgIHJldHVybiBhZG9wdFJlZih0b0ltcGwobV9jbGll bnQuY3JlYXRlTmV3UGFnZV9kZXByZWNhdGVkRm9yVXNlV2l0aFYwKHRvQVBJKHBhZ2UpLCB0b0FQ SShmZWF0dXJlc01hcC5nZXQoKSksIHRvQVBJKG1vZGlmaWVycyksIHRvQVBJKGJ1dHRvbiksIG1f Y2xpZW50LmJhc2UuY2xpZW50SW5mbykpKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gYWRvcHRS ZWYodG9JbXBsKG1fY2xpZW50LmNyZWF0ZU5ld1BhZ2VfZGVwcmVjYXRlZEZvclVzZVdpdGhWMCh0 b0FQSShwYWdlKSwgdG9BUEkoZmVhdHVyZXNNYXAuZ2V0KCkpLCB0b0FQSShuYXZpZ2F0aW9uQWN0 aW9uRGF0YS5tb2RpZmllcnMpLCB0b0FQSShuYXZpZ2F0aW9uQWN0aW9uRGF0YS5tb3VzZUJ1dHRv biksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbykpKTsKIAogICAgICAgICAgICAgUmVmUHRyPEFQ STo6VVJMUmVxdWVzdD4gcmVxdWVzdCA9IEFQSTo6VVJMUmVxdWVzdDo6Y3JlYXRlKHJlc291cmNl UmVxdWVzdCk7Ci0gICAgICAgICAgICByZXR1cm4gYWRvcHRSZWYodG9JbXBsKG1fY2xpZW50LmNy ZWF0ZU5ld1BhZ2UodG9BUEkocGFnZSksIHRvQVBJKHJlcXVlc3QuZ2V0KCkpLCB0b0FQSShmZWF0 dXJlc01hcC5nZXQoKSksIHRvQVBJKG1vZGlmaWVycyksIHRvQVBJKGJ1dHRvbiksIG1fY2xpZW50 LmJhc2UuY2xpZW50SW5mbykpKTsKKyAgICAgICAgICAgIHJldHVybiBhZG9wdFJlZih0b0ltcGwo bV9jbGllbnQuY3JlYXRlTmV3UGFnZSh0b0FQSShwYWdlKSwgdG9BUEkocmVxdWVzdC5nZXQoKSks IHRvQVBJKGZlYXR1cmVzTWFwLmdldCgpKSwgdG9BUEkobmF2aWdhdGlvbkFjdGlvbkRhdGEubW9k aWZpZXJzKSwgdG9BUEkobmF2aWdhdGlvbkFjdGlvbkRhdGEubW91c2VCdXR0b24pLCBtX2NsaWVu dC5iYXNlLmNsaWVudEluZm8pKSk7CiAgICAgICAgIH0KIAogICAgICAgICB2aXJ0dWFsIHZvaWQg c2hvd1BhZ2UoV2ViUGFnZVByb3h5KiBwYWdlKSBvdmVycmlkZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS05hdmlnYXRpb25BY3Rpb24ubW0gYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLTmF2aWdhdGlvbkFjdGlvbi5tbQppbmRl eCBjOTFkZTRmMDI5MGQ1YTJmNWExYzkzY2NmODMzZTYwNjFlMDkzYTExLi4yZmIzYWU4YjJjODU5 NjlkOWI4OTNjNDljOWRjOWJkM2ViNjRmMDE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0NvY29hL1dLTmF2aWdhdGlvbkFjdGlvbi5tbQorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLTmF2aWdhdGlvbkFjdGlvbi5tbQpAQCAtODUsNCAr ODUsMjUgQEAKIAogQGVuZAogCitXS05hdmlnYXRpb25UeXBlIHRvV0tOYXZpZ2F0aW9uVHlwZShX ZWJDb3JlOjpOYXZpZ2F0aW9uVHlwZSBuYXZpZ2F0aW9uVHlwZSkKK3sKKyAgICBzd2l0Y2ggKG5h dmlnYXRpb25UeXBlKSB7CisgICAgY2FzZSBXZWJDb3JlOjpOYXZpZ2F0aW9uVHlwZUxpbmtDbGlj a2VkOgorICAgICAgICByZXR1cm4gV0tOYXZpZ2F0aW9uVHlwZUxpbmtBY3RpdmF0ZWQ7CisgICAg Y2FzZSBXZWJDb3JlOjpOYXZpZ2F0aW9uVHlwZUZvcm1TdWJtaXR0ZWQ6CisgICAgICAgIHJldHVy biBXS05hdmlnYXRpb25UeXBlRm9ybVN1Ym1pdHRlZDsKKyAgICBjYXNlIFdlYkNvcmU6Ok5hdmln YXRpb25UeXBlQmFja0ZvcndhcmQ6CisgICAgICAgIHJldHVybiBXS05hdmlnYXRpb25UeXBlQmFj a0ZvcndhcmQ7CisgICAgY2FzZSBXZWJDb3JlOjpOYXZpZ2F0aW9uVHlwZVJlbG9hZDoKKyAgICAg ICAgcmV0dXJuIFdLTmF2aWdhdGlvblR5cGVSZWxvYWQ7CisgICAgY2FzZSBXZWJDb3JlOjpOYXZp Z2F0aW9uVHlwZUZvcm1SZXN1Ym1pdHRlZDoKKyAgICAgICAgcmV0dXJuIFdLTmF2aWdhdGlvblR5 cGVGb3JtUmVzdWJtaXR0ZWQ7CisgICAgY2FzZSBXZWJDb3JlOjpOYXZpZ2F0aW9uVHlwZU90aGVy OgorICAgICAgICByZXR1cm4gV0tOYXZpZ2F0aW9uVHlwZU90aGVyOworICAgIH0KKworICAgIEFT U0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIHJldHVybiBXS05hdmlnYXRpb25UeXBlT3RoZXI7Cit9 CisKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS05hdmlnYXRpb25BY3Rpb25JbnRlcm5hbC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9Db2NvYS9XS05hdmlnYXRpb25BY3Rpb25JbnRlcm5hbC5oCmluZGV4IDZjOGI4YjEyNDUy MGFlM2NhMWVhODA1ZjY0YzhmM2NiYzA2OGZlM2QuLmJiODhjM2JkMTkyMTU5M2QzNjgzY2IyZTU0 MmVhYzU4MjliYzExYTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Q29jb2EvV0tOYXZpZ2F0aW9uQWN0aW9uSW50ZXJuYWwuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0NvY29hL1dLTmF2aWdhdGlvbkFjdGlvbkludGVybmFsLmgKQEAgLTI3LDYg KzI3LDggQEAKIAogI2lmIFdLX0FQSV9FTkFCTEVECiAKKyNpbXBvcnQgPFdlYkNvcmUvRnJhbWVM b2FkZXJUeXBlcy5oPgorCiBAaW50ZXJmYWNlIFdLTmF2aWdhdGlvbkFjdGlvbiAoKQogCiBAcHJv cGVydHkgKG5vbmF0b21pYywgcmVhZHdyaXRlLCBzdHJvbmcpIFdLRnJhbWVJbmZvICpzb3VyY2VG cmFtZTsKQEAgLTM5LDQgKzQxLDYgQEAKIAogQGVuZAogCitXS05hdmlnYXRpb25UeXBlIHRvV0tO YXZpZ2F0aW9uVHlwZShXZWJDb3JlOjpOYXZpZ2F0aW9uVHlwZSk7CisKICNlbmRpZgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbSBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0KaW5kZXgg MWM5Y2YwOTNmMDljMTE3YjA3MzZlNzk5OWQxZTg5MjFlODliYmM1Yi4uNTMxZDAzZmVhNTMzMWJi OWJiODViM2IxZmQ4MGNhNWFjZjhmZTJhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLm1tCkBAIC0yMDksMjcgKzIwOSw2IEBAIE5hdmln YXRpb25TdGF0ZTo6UG9saWN5Q2xpZW50Ojp+UG9saWN5Q2xpZW50KCkKIHsKIH0KIAotc3RhdGlj IFdLTmF2aWdhdGlvblR5cGUgdG9XS05hdmlnYXRpb25UeXBlKFdlYkNvcmU6Ok5hdmlnYXRpb25U eXBlIG5hdmlnYXRpb25UeXBlKQotewotICAgIHN3aXRjaCAobmF2aWdhdGlvblR5cGUpIHsKLSAg ICBjYXNlIFdlYkNvcmU6Ok5hdmlnYXRpb25UeXBlTGlua0NsaWNrZWQ6Ci0gICAgICAgIHJldHVy biBXS05hdmlnYXRpb25UeXBlTGlua0FjdGl2YXRlZDsKLSAgICBjYXNlIFdlYkNvcmU6Ok5hdmln YXRpb25UeXBlRm9ybVN1Ym1pdHRlZDoKLSAgICAgICAgcmV0dXJuIFdLTmF2aWdhdGlvblR5cGVG b3JtU3VibWl0dGVkOwotICAgIGNhc2UgV2ViQ29yZTo6TmF2aWdhdGlvblR5cGVCYWNrRm9yd2Fy ZDoKLSAgICAgICAgcmV0dXJuIFdLTmF2aWdhdGlvblR5cGVCYWNrRm9yd2FyZDsKLSAgICBjYXNl IFdlYkNvcmU6Ok5hdmlnYXRpb25UeXBlUmVsb2FkOgotICAgICAgICByZXR1cm4gV0tOYXZpZ2F0 aW9uVHlwZVJlbG9hZDsKLSAgICBjYXNlIFdlYkNvcmU6Ok5hdmlnYXRpb25UeXBlRm9ybVJlc3Vi bWl0dGVkOgotICAgICAgICByZXR1cm4gV0tOYXZpZ2F0aW9uVHlwZUZvcm1SZXN1Ym1pdHRlZDsK LSAgICBjYXNlIFdlYkNvcmU6Ok5hdmlnYXRpb25UeXBlT3RoZXI6Ci0gICAgICAgIHJldHVybiBX S05hdmlnYXRpb25UeXBlT3RoZXI7Ci0gICAgfQotCi0gICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7 Ci0gICAgcmV0dXJuIFdLTmF2aWdhdGlvblR5cGVPdGhlcjsKLX0KLQogdm9pZCBOYXZpZ2F0aW9u U3RhdGU6OlBvbGljeUNsaWVudDo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbihXZWJQ YWdlUHJveHkqLCBXZWJGcmFtZVByb3h5KiBkZXN0aW5hdGlvbkZyYW1lLCBjb25zdCBOYXZpZ2F0 aW9uQWN0aW9uRGF0YSYgbmF2aWdhdGlvbkFjdGlvbkRhdGEsIFdlYkZyYW1lUHJveHkqIHNvdXJj ZUZyYW1lLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIG9yaWdpbmFsUmVxdWVzdCwg Y29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBSZWZQdHI8V2ViRnJhbWVQ b2xpY3lMaXN0ZW5lclByb3h5PiBsaXN0ZW5lciwgQVBJOjpPYmplY3QqIHVzZXJEYXRhKQogewog ICAgIGlmICghbV9uYXZpZ2F0aW9uU3RhdGUubV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndl YlZpZXdEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uRGVjaXNpb25IYW5kbGVyKSB7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5oIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL1VJRGVsZWdhdGUuaAppbmRleCA0MGIwZmU5 MWI0ZmM0YWEyODM2MWJiNzk4MmQ4MWQyZTk5M2VlOTIxLi5jMTY4Y2JjM2NjOTQwZTJhMmM0ZmFi YTUyZDcxZjgyMjcwMjJlMDZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv Q29jb2EvVUlEZWxlZ2F0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9V SURlbGVnYXRlLmgKQEAgLTU4LDcgKzU4LDcgQEAgcHJpdmF0ZToKIAogICAgIHByaXZhdGU6CiAg ICAgICAgIC8vIEFQSTo6VUlDbGllbnQKLSAgICAgICAgdmlydHVhbCBQYXNzUmVmUHRyPFdlYktp dDo6V2ViUGFnZVByb3h5PiBjcmVhdGVOZXdQYWdlKFdlYktpdDo6V2ViUGFnZVByb3h5KiwgV2Vi S2l0OjpXZWJGcmFtZVByb3h5KiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgY29u c3QgV2ViQ29yZTo6V2luZG93RmVhdHVyZXMmLCBXZWJLaXQ6OldlYkV2ZW50OjpNb2RpZmllcnMs IFdlYktpdDo6V2ViTW91c2VFdmVudDo6QnV0dG9uKSBvdmVycmlkZTsKKyAgICAgICAgdmlydHVh bCBQYXNzUmVmUHRyPFdlYktpdDo6V2ViUGFnZVByb3h5PiBjcmVhdGVOZXdQYWdlKFdlYktpdDo6 V2ViUGFnZVByb3h5KiwgV2ViS2l0OjpXZWJGcmFtZVByb3h5KiwgY29uc3QgV2ViQ29yZTo6UmVz b3VyY2VSZXF1ZXN0JiwgY29uc3QgV2ViQ29yZTo6V2luZG93RmVhdHVyZXMmLCBjb25zdCBXZWJL aXQ6Ok5hdmlnYXRpb25BY3Rpb25EYXRhJikgb3ZlcnJpZGU7CiAgICAgICAgIHZpcnR1YWwgdm9p ZCBydW5KYXZhU2NyaXB0QWxlcnQoV2ViS2l0OjpXZWJQYWdlUHJveHkqLCBjb25zdCBXVEY6OlN0 cmluZyYsIFdlYktpdDo6V2ViRnJhbWVQcm94eSosIHN0ZDo6ZnVuY3Rpb248dm9pZCAoKT4gY29t cGxldGlvbkhhbmRsZXIpIG92ZXJyaWRlOwogICAgICAgICB2aXJ0dWFsIHZvaWQgcnVuSmF2YVNj cmlwdENvbmZpcm0oV2ViS2l0OjpXZWJQYWdlUHJveHkqLCBjb25zdCBXVEY6OlN0cmluZyYsIFdl YktpdDo6V2ViRnJhbWVQcm94eSosIHN0ZDo6ZnVuY3Rpb248dm9pZCAoYm9vbCk+IGNvbXBsZXRp b25IYW5kbGVyKSBvdmVycmlkZTsKICAgICAgICAgdmlydHVhbCB2b2lkIHJ1bkphdmFTY3JpcHRQ cm9tcHQoV2ViS2l0OjpXZWJQYWdlUHJveHkqLCBjb25zdCBXVEY6OlN0cmluZyYsIGNvbnN0IFdU Rjo6U3RyaW5nJiwgV2ViS2l0OjpXZWJGcmFtZVByb3h5Kiwgc3RkOjpmdW5jdGlvbjx2b2lkIChj b25zdCBXVEY6OlN0cmluZyYpPiBjb21wbGV0aW9uSGFuZGxlcikgb3ZlcnJpZGU7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5tbSBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLm1tCmluZGV4IDkwYjE1ZDc5OTBk MjliN2QwYzZkOTVjZjBmNjZiYjRjZmM4MTFhNDAuLjMyZDgwMGI5YzYwMTA1ODhiZTczYjJkOTM1 ZWM2YjY2NWJmNWFmMmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2Nv YS9VSURlbGVnYXRlLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9VSURl bGVnYXRlLm1tCkBAIC0yOCw2ICsyOCw3IEBACiAKICNpZiBXS19BUElfRU5BQkxFRAogCisjaW1w b3J0ICJOYXZpZ2F0aW9uQWN0aW9uRGF0YS5oIgogI2ltcG9ydCAiV0tGcmFtZUluZm9JbnRlcm5h bC5oIgogI2ltcG9ydCAiV0tOYXZpZ2F0aW9uQWN0aW9uSW50ZXJuYWwuaCIKICNpbXBvcnQgIldL V2ViVmlld0NvbmZpZ3VyYXRpb25JbnRlcm5hbC5oIgpAQCAtNzgsNyArNzksNyBAQCBVSURlbGVn YXRlOjpVSUNsaWVudDo6flVJQ2xpZW50KCkKIHsKIH0KIAotUGFzc1JlZlB0cjxXZWJLaXQ6Oldl YlBhZ2VQcm94eT4gVUlEZWxlZ2F0ZTo6VUlDbGllbnQ6OmNyZWF0ZU5ld1BhZ2UoV2ViS2l0OjpX ZWJQYWdlUHJveHkqLCBXZWJLaXQ6OldlYkZyYW1lUHJveHkqIGluaXRpYXRpbmdGcmFtZSwgY29u c3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBXZWJDb3JlOjpXaW5k b3dGZWF0dXJlcyYgd2luZG93RmVhdHVyZXMsIFdlYktpdDo6V2ViRXZlbnQ6Ok1vZGlmaWVycywg V2ViS2l0OjpXZWJNb3VzZUV2ZW50OjpCdXR0b24pCitQYXNzUmVmUHRyPFdlYktpdDo6V2ViUGFn ZVByb3h5PiBVSURlbGVnYXRlOjpVSUNsaWVudDo6Y3JlYXRlTmV3UGFnZShXZWJLaXQ6OldlYlBh Z2VQcm94eSosIFdlYktpdDo6V2ViRnJhbWVQcm94eSogaW5pdGlhdGluZ0ZyYW1lLCBjb25zdCBX ZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFdlYkNvcmU6OldpbmRvd0Zl YXR1cmVzJiB3aW5kb3dGZWF0dXJlcywgY29uc3QgV2ViS2l0OjpOYXZpZ2F0aW9uQWN0aW9uRGF0 YSYgbmF2aWdhdGlvbkFjdGlvbkRhdGEpCiB7CiAgICAgaWYgKCFtX3VpRGVsZWdhdGUubV9kZWxl Z2F0ZU1ldGhvZHMud2ViVmlld0NyZWF0ZVdlYlZpZXdXaXRoQ29uZmlndXJhdGlvbkZvck5hdmln YXRpb25BY3Rpb25XaW5kb3dGZWF0dXJlcykKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CkBAIC05 NCw3ICs5NSw3IEBAIFBhc3NSZWZQdHI8V2ViS2l0OjpXZWJQYWdlUHJveHk+IFVJRGVsZWdhdGU6 OlVJQ2xpZW50OjpjcmVhdGVOZXdQYWdlKFdlYktpdDo6V2ViCiAKICAgICAvLyBGSVhNRTogU2V0 IGEgcmVhbCBuYXZpZ2F0aW9uIHR5cGUuCiAgICAgW25hdmlnYXRpb25BY3Rpb24gc2V0U291cmNl RnJhbWU6YWRvcHROUyhbW1dLRnJhbWVJbmZvIGFsbG9jXSBpbml0V2l0aFdlYkZyYW1lUHJveHk6 KmluaXRpYXRpbmdGcmFtZV0pLmdldCgpXTsKLSAgICBbbmF2aWdhdGlvbkFjdGlvbiBzZXROYXZp Z2F0aW9uVHlwZTpXS05hdmlnYXRpb25UeXBlT3RoZXJdOworICAgIFtuYXZpZ2F0aW9uQWN0aW9u IHNldE5hdmlnYXRpb25UeXBlOnRvV0tOYXZpZ2F0aW9uVHlwZShuYXZpZ2F0aW9uQWN0aW9uRGF0 YS5uYXZpZ2F0aW9uVHlwZSldOwogICAgIFtuYXZpZ2F0aW9uQWN0aW9uIHNldFJlcXVlc3Q6cmVx dWVzdC5uc1VSTFJlcXVlc3QoV2ViQ29yZTo6RG9Ob3RVcGRhdGVIVFRQQm9keSldOwogCiAgICAg UmV0YWluUHRyPFdLV2ViVmlldz4gd2ViVmlldyA9IFtkZWxlZ2F0ZS5nZXQoKSB3ZWJWaWV3Om1f dWlEZWxlZ2F0ZS5tX3dlYlZpZXcgY3JlYXRlV2ViVmlld1dpdGhDb25maWd1cmF0aW9uOmNvbmZp Z3VyYXRpb24uZ2V0KCkgZm9yTmF2aWdhdGlvbkFjdGlvbjpuYXZpZ2F0aW9uQWN0aW9uLmdldCgp IHdpbmRvd0ZlYXR1cmVzOmFkb3B0TlMoW1tXS1dpbmRvd0ZlYXR1cmVzIGFsbG9jXSBfaW5pdFdp dGhXaW5kb3dGZWF0dXJlczp3aW5kb3dGZWF0dXJlc10pLmdldCgpXTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggNjZiZmZkZjgxNTg3YTI4ZjNiOTJlMzQ5 NzZjZDZlOWZmODFmY2Y3NS4uMTZjOGYwYjNiYzYwNGY1MzkwM2Y5MWE4NjI2OTU3YzExZTEyYmVk NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTI2ODIs MTIgKzI2ODIsMTIgQEAgdm9pZCBXZWJQYWdlUHJveHk6OndpbGxTdWJtaXRGb3JtKHVpbnQ2NF90 IGZyYW1lSUQsIHVpbnQ2NF90IHNvdXJjZUZyYW1lSUQsIGNvbnMKIAogLy8gVUlDbGllbnQKIAot dm9pZCBXZWJQYWdlUHJveHk6OmNyZWF0ZU5ld1BhZ2UodWludDY0X3QgZnJhbWVJRCwgY29uc3Qg UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBXaW5kb3dGZWF0dXJlcyYgd2luZG93RmVh dHVyZXMsIHVpbnQzMl90IG9wYXF1ZU1vZGlmaWVycywgaW50MzJfdCBvcGFxdWVNb3VzZUJ1dHRv biwgdWludDY0X3QmIG5ld1BhZ2VJRCwgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyYgbmV3UGFn ZVBhcmFtZXRlcnMpCit2b2lkIFdlYlBhZ2VQcm94eTo6Y3JlYXRlTmV3UGFnZSh1aW50NjRfdCBm cmFtZUlELCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFdpbmRvd0ZlYXR1 cmVzJiB3aW5kb3dGZWF0dXJlcywgY29uc3QgTmF2aWdhdGlvbkFjdGlvbkRhdGEmIG5hdmlnYXRp b25BY3Rpb25EYXRhLCB1aW50NjRfdCYgbmV3UGFnZUlELCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0 ZXJzJiBuZXdQYWdlUGFyYW1ldGVycykKIHsKICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1f cHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7CiAgICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7CiAK LSAgICBSZWZQdHI8V2ViUGFnZVByb3h5PiBuZXdQYWdlID0gbV91aUNsaWVudC0+Y3JlYXRlTmV3 UGFnZSh0aGlzLCBmcmFtZSwgcmVxdWVzdCwgd2luZG93RmVhdHVyZXMsIHN0YXRpY19jYXN0PFdl YkV2ZW50OjpNb2RpZmllcnM+KG9wYXF1ZU1vZGlmaWVycyksIHN0YXRpY19jYXN0PFdlYk1vdXNl RXZlbnQ6OkJ1dHRvbj4ob3BhcXVlTW91c2VCdXR0b24pKTsKKyAgICBSZWZQdHI8V2ViUGFnZVBy b3h5PiBuZXdQYWdlID0gbV91aUNsaWVudC0+Y3JlYXRlTmV3UGFnZSh0aGlzLCBmcmFtZSwgcmVx dWVzdCwgd2luZG93RmVhdHVyZXMsIG5hdmlnYXRpb25BY3Rpb25EYXRhKTsKICAgICBpZiAoIW5l d1BhZ2UpIHsKICAgICAgICAgbmV3UGFnZUlEID0gMDsKICAgICAgICAgcmV0dXJuOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IDVhNzZjZDg4ZWNiYWJkNzVjZGYx ZDU1OGU5OWM0MDc4MjE1ZjhmMmQuLjQ1NDI5ODNkNjEzMDMzNmM1YjU4NWQyYjJjNGNkYjBiNjAw ZjMwZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku aAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTExMTAs NyArMTExMCw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCB3aWxsU3VibWl0Rm9ybSh1aW50NjRfdCBm cmFtZUlELCB1aW50NjRfdCBzb3VyY2VGcmFtZUlELCBjb25zdCBWZWN0b3I8c3RkOjpwYWlyPFN0 cmluZywgU3RyaW5nPj4mIHRleHRGaWVsZFZhbHVlcywgdWludDY0X3QgbGlzdGVuZXJJRCwgSVBD OjpNZXNzYWdlRGVjb2RlciYpOwogCiAgICAgLy8gVUkgY2xpZW50Ci0gICAgdm9pZCBjcmVhdGVO ZXdQYWdlKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYs IGNvbnN0IFdlYkNvcmU6OldpbmRvd0ZlYXR1cmVzJiwgdWludDMyX3QgbW9kaWZpZXJzLCBpbnQz Ml90IG1vdXNlQnV0dG9uLCB1aW50NjRfdCYgbmV3UGFnZUlELCBXZWJQYWdlQ3JlYXRpb25QYXJh bWV0ZXJzJik7CisgICAgdm9pZCBjcmVhdGVOZXdQYWdlKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0 IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIGNvbnN0IFdlYkNvcmU6OldpbmRvd0ZlYXR1cmVz JiwgY29uc3QgTmF2aWdhdGlvbkFjdGlvbkRhdGEmLCB1aW50NjRfdCYgbmV3UGFnZUlELCBXZWJQ YWdlQ3JlYXRpb25QYXJhbWV0ZXJzJik7CiAgICAgdm9pZCBzaG93UGFnZSgpOwogICAgIHZvaWQg Y2xvc2VQYWdlKGJvb2wgc3RvcFJlc3BvbnNpdmVuZXNzVGltZXIpOwogICAgIHZvaWQgcnVuSmF2 YVNjcmlwdEFsZXJ0KHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFN0cmluZyYsIFJlZlB0cjxNZXNz YWdlczo6V2ViUGFnZVByb3h5OjpSdW5KYXZhU2NyaXB0QWxlcnQ6OkRlbGF5ZWRSZXBseT4pOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdl cy5pbiBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4K aW5kZXggYmU4YTVmZjU2YmQ4ODBiYTJlYzRkZTJmZWE0NTM4ZTNlYTdmMDVkMS4uNGE2NzkwYTQ3 OTAzM2QzNTA4ODI5ZjEzMzJkZWIwMzcwZGEwYzgwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCkBAIC0yMiw3ICsyMiw3IEBACiAK IG1lc3NhZ2VzIC0+IFdlYlBhZ2VQcm94eSB7CiAgICAgIyBVSSBtZXNzYWdlcwotICAgIENyZWF0 ZU5ld1BhZ2UodWludDY0X3QgZnJhbWVJRCwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0IHJlcXVl c3QsIFdlYkNvcmU6OldpbmRvd0ZlYXR1cmVzIHdpbmRvd0ZlYXR1cmVzLCB1aW50MzJfdCBtb2Rp ZmllcnMsIGludDMyX3QgbW91c2VCdXR0b24pIC0+ICh1aW50NjRfdCBuZXdQYWdlSUQsIFdlYktp dDo6V2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyBuZXdQYWdlUGFyYW1ldGVycykKKyAgICBDcmVh dGVOZXdQYWdlKHVpbnQ2NF90IGZyYW1lSUQsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCByZXF1 ZXN0LCBXZWJDb3JlOjpXaW5kb3dGZWF0dXJlcyB3aW5kb3dGZWF0dXJlcywgV2ViS2l0OjpOYXZp Z2F0aW9uQWN0aW9uRGF0YSBuYXZpZ2F0aW9uQWN0aW9uRGF0YSkgLT4gKHVpbnQ2NF90IG5ld1Bh Z2VJRCwgV2ViS2l0OjpXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIG5ld1BhZ2VQYXJhbWV0ZXJz KQogICAgIFNob3dQYWdlKCkKICAgICBDbG9zZVBhZ2UoYm9vbCBzdG9wUmVzcG9uc2l2ZW5lc3NU aW1lcikKICAgICBSdW5KYXZhU2NyaXB0QWxlcnQodWludDY0X3QgZnJhbWVJRCwgU3RyaW5nIG1l c3NhZ2UpIC0+ICgpIERlbGF5ZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcAppbmRleCBlN2JiOWU2 ODc5YTczZDRkNzRlNzY4OWYyMzQ1MDE1YmUyMTc3Yjk0Li44MGU2OWUxNmZlYzgxZmRjYjgxZTM3 ZjUwNjQ0ZmYwMjJmYzU3OTlhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCkBAIC0zMSw2ICsz MSw3IEBACiAjaW5jbHVkZSAiSW5qZWN0ZWRCdW5kbGVOYXZpZ2F0aW9uQWN0aW9uLmgiCiAjaW5j bHVkZSAiSW5qZWN0ZWRCdW5kbGVVc2VyTWVzc2FnZUNvZGVycy5oIgogI2luY2x1ZGUgIkxheWVy VHJlZUhvc3QuaCIKKyNpbmNsdWRlICJOYXZpZ2F0aW9uQWN0aW9uRGF0YS5oIgogI2luY2x1ZGUg IlBhZ2VCYW5uZXIuaCIKICNpbmNsdWRlICJXZWJDb2xvckNob29zZXIuaCIKICNpbmNsdWRlICJX ZWJDb3JlQXJndW1lbnRDb2RlcnMuaCIKQEAgLTE5Nyw5ICsxOTgsNiBAQCB2b2lkIFdlYkNocm9t ZUNsaWVudDo6Zm9jdXNlZEZyYW1lQ2hhbmdlZChGcmFtZSogZnJhbWUpCiAKIFBhZ2UqIFdlYkNo cm9tZUNsaWVudDo6Y3JlYXRlV2luZG93KEZyYW1lKiBmcmFtZSwgY29uc3QgRnJhbWVMb2FkUmVx dWVzdCYgcmVxdWVzdCwgY29uc3QgV2luZG93RmVhdHVyZXMmIHdpbmRvd0ZlYXR1cmVzLCBjb25z dCBOYXZpZ2F0aW9uQWN0aW9uJiBuYXZpZ2F0aW9uQWN0aW9uKQogewotICAgIHVpbnQzMl90IG1v ZGlmaWVycyA9IHN0YXRpY19jYXN0PHVpbnQzMl90PihJbmplY3RlZEJ1bmRsZU5hdmlnYXRpb25B Y3Rpb246Om1vZGlmaWVyc0Zvck5hdmlnYXRpb25BY3Rpb24obmF2aWdhdGlvbkFjdGlvbikpOwot ICAgIGludDMyX3QgbW91c2VCdXR0b24gPSBzdGF0aWNfY2FzdDxpbnQzMl90PihJbmplY3RlZEJ1 bmRsZU5hdmlnYXRpb25BY3Rpb246Om1vdXNlQnV0dG9uRm9yTmF2aWdhdGlvbkFjdGlvbihuYXZp Z2F0aW9uQWN0aW9uKSk7Ci0KICNpZiBFTkFCTEUoRlVMTFNDUkVFTl9BUEkpCiAgICAgaWYgKGZy YW1lLT5kb2N1bWVudCgpICYmIGZyYW1lLT5kb2N1bWVudCgpLT53ZWJraXRDdXJyZW50RnVsbFNj cmVlbkVsZW1lbnQoKSkKICAgICAgICAgZnJhbWUtPmRvY3VtZW50KCktPndlYmtpdENhbmNlbEZ1 bGxTY3JlZW4oKTsKQEAgLTIwNyw5ICsyMDUsMTQgQEAgUGFnZSogV2ViQ2hyb21lQ2xpZW50Ojpj cmVhdGVXaW5kb3coRnJhbWUqIGZyYW1lLCBjb25zdCBGcmFtZUxvYWRSZXF1ZXN0JiByZXF1ZXMK IAogICAgIFdlYkZyYW1lKiB3ZWJGcmFtZSA9IFdlYkZyYW1lOjpmcm9tQ29yZUZyYW1lKCpmcmFt ZSk7CiAKKyAgICBOYXZpZ2F0aW9uQWN0aW9uRGF0YSBuYXZpZ2F0aW9uQWN0aW9uRGF0YTsKKyAg ICBuYXZpZ2F0aW9uQWN0aW9uRGF0YS5uYXZpZ2F0aW9uVHlwZSA9IG5hdmlnYXRpb25BY3Rpb24u dHlwZSgpOworICAgIG5hdmlnYXRpb25BY3Rpb25EYXRhLm1vZGlmaWVycyA9IEluamVjdGVkQnVu ZGxlTmF2aWdhdGlvbkFjdGlvbjo6bW9kaWZpZXJzRm9yTmF2aWdhdGlvbkFjdGlvbihuYXZpZ2F0 aW9uQWN0aW9uKTsKKyAgICBuYXZpZ2F0aW9uQWN0aW9uRGF0YS5tb3VzZUJ1dHRvbiA9IEluamVj dGVkQnVuZGxlTmF2aWdhdGlvbkFjdGlvbjo6bW91c2VCdXR0b25Gb3JOYXZpZ2F0aW9uQWN0aW9u KG5hdmlnYXRpb25BY3Rpb24pOworCiAgICAgdWludDY0X3QgbmV3UGFnZUlEID0gMDsKICAgICBX ZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIHBhcmFtZXRlcnM7Ci0gICAgaWYgKCFXZWJQcm9jZXNz OjpzaGFyZWQoKS5wYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kU3luYyhNZXNzYWdlczo6 V2ViUGFnZVByb3h5OjpDcmVhdGVOZXdQYWdlKHdlYkZyYW1lLT5mcmFtZUlEKCksIHJlcXVlc3Qu cmVzb3VyY2VSZXF1ZXN0KCksIHdpbmRvd0ZlYXR1cmVzLCBtb2RpZmllcnMsIG1vdXNlQnV0dG9u KSwgTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6Q3JlYXRlTmV3UGFnZTo6UmVwbHkobmV3UGFnZUlE LCBwYXJhbWV0ZXJzKSwgbV9wYWdlLT5wYWdlSUQoKSkpCisgICAgaWYgKCFXZWJQcm9jZXNzOjpz aGFyZWQoKS5wYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kU3luYyhNZXNzYWdlczo6V2Vi UGFnZVByb3h5OjpDcmVhdGVOZXdQYWdlKHdlYkZyYW1lLT5mcmFtZUlEKCksIHJlcXVlc3QucmVz b3VyY2VSZXF1ZXN0KCksIHdpbmRvd0ZlYXR1cmVzLCBuYXZpZ2F0aW9uQWN0aW9uRGF0YSksIE1l c3NhZ2VzOjpXZWJQYWdlUHJveHk6OkNyZWF0ZU5ld1BhZ2U6OlJlcGx5KG5ld1BhZ2VJRCwgcGFy YW1ldGVycyksIG1fcGFnZS0+cGFnZUlEKCkpKQogICAgICAgICByZXR1cm4gMDsKIAogICAgIGlm ICghbmV3UGFnZUlEKQo=