124531 2013-11-18 12:18:21 -0800 Move m_pendingAPIRequestURL to PageLoadState 2013-11-18 13:00:58 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 951744 0 andersca 2013-11-18 12:18:21 -0800 Move m_pendingAPIRequestURL to PageLoadState 951755 1 217224 andersca 2013-11-18 12:41:19 -0800 Created attachment 217224 Patch 951759 2 217224 thorton 2013-11-18 12:48:07 -0800 Comment on attachment 217224 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=217224&action=review > Source/WebKit2/ChangeLog:7 > + why 951762 3 andersca 2013-11-18 13:00:58 -0800 Committed r159449: <http://trac.webkit.org/changeset/159449> 217224 2013-11-18 12:41:19 -0800 2013-11-18 12:48:07 -0800 Patch bug-124531-20131118124119.patch text/plain 11722 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5NDQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMmEwMjI4OWYzNzY2YjNm MWM5ZDM0OGQ3ZmFjZThlYTBlMmIyMGU2Yi4uZjI5ODFmZjUyZGE5Y2ZiMDgzMTEwMDM2ZTY4YTIw ZGU2NzkzNDJmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM4IEBACiAyMDEzLTExLTE4ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgTW92ZSBtX3BlbmRp bmdBUElSZXF1ZXN0VVJMIHRvIFBhZ2VMb2FkU3RhdGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNDUzMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHA6Cisg ICAgICAgIChXS1BhZ2VDb3B5UGVuZGluZ0FQSVJlcXVlc3RVUkwpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9QYWdlTG9hZFN0YXRlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGFnZUxvYWRTdGF0ZTo6 cGVuZGluZ0FQSVJlcXVlc3RVUkwpOgorICAgICAgICAoV2ViS2l0OjpQYWdlTG9hZFN0YXRlOjpz ZXRQZW5kaW5nQVBJUmVxdWVzdFVSTCk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VMb2FkU3RhdGU6 OmNsZWFyUGVuZGluZ0FQSVJlcXVlc3RVUkwpOgorICAgICAgICAqIFVJUHJvY2Vzcy9QYWdlTG9h ZFN0YXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6bG9hZFVSTCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2VQcm94eTo6bG9hZFVSTFJlcXVlc3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OnJlbG9hZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Z29Gb3J3YXJkKToKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpnb0JhY2spOgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlUHJveHk6OmdvVG9CYWNrRm9yd2FyZEl0ZW0pOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlUHJveHk6OmFjdGl2ZVVSTCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVj ZWl2ZWRQb2xpY3lEZWNpc2lvbik6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZXN0 aW1hdGVkUHJvZ3Jlc3MpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZFN0YXJ0 UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OmRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbik6CisgICAgICAgICog VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OnBhZ2VMb2FkU3RhdGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9jZi9XZWJQYWdlUHJveHlDRi5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6c2Vzc2lvblN0YXRlRGF0YSk6Cisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVzdG9yZUZyb21TZXNzaW9uU3RhdGVEYXRh KToKKworMjAxMy0xMS0xOCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgor CiAgICAgICAgIEFkZCBQYWdlTG9hZFN0YXRlIGNsYXNzCiAgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjQ1MjgKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0MvV0tQYWdlLmNwcAppbmRleCBhN2NjYWYxM2RmM2IwN2ZmNTFhMTNhMDA1ZTQwOTQ3 NTRhMzc1YWY2Li41Nzg4ODhiMWM2NzI3OTg5M2JiZDljMDY3ZjljYzA3ZGM0YWFlZjMzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcApAQCAtNzI0LDkgKzcyNCwx MiBAQCB2b2lkIFdLUGFnZUZvcmNlUmVwYWludChXS1BhZ2VSZWYgcGFnZVJlZiwgdm9pZCogY29u dGV4dCwgV0tQYWdlRm9yY2VSZXBhaW50RnVuYwogCiBXS19FWFBPUlQgV0tVUkxSZWYgV0tQYWdl Q29weVBlbmRpbmdBUElSZXF1ZXN0VVJMKFdLUGFnZVJlZiBwYWdlUmVmKQogewotICAgIGlmICh0 b0ltcGwocGFnZVJlZiktPnBlbmRpbmdBUElSZXF1ZXN0VVJMKCkuaXNOdWxsKCkpCi0gICAgICAg IHJldHVybiAwOwotICAgIHJldHVybiB0b0NvcGllZFVSTEFQSSh0b0ltcGwocGFnZVJlZiktPnBl bmRpbmdBUElSZXF1ZXN0VVJMKCkpOworICAgIGNvbnN0IFN0cmluZyYgcGVuZGluZ0FQSVJlcXVl c3RVUkwgPSB0b0ltcGwocGFnZVJlZiktPnBhZ2VMb2FkU3RhdGUoKS5wZW5kaW5nQVBJUmVxdWVz dFVSTCgpOworCisgICAgaWYgKHBlbmRpbmdBUElSZXF1ZXN0VVJMLmlzTnVsbCgpKQorICAgICAg ICByZXR1cm4gbnVsbHB0cjsKKworICAgIHJldHVybiB0b0NvcGllZFVSTEFQSShwZW5kaW5nQVBJ UmVxdWVzdFVSTCk7CiB9CiAKIFdLVVJMUmVmIFdLUGFnZUNvcHlBY3RpdmVVUkwoV0tQYWdlUmVm IHBhZ2VSZWYpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUxvYWRT dGF0ZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUxvYWRTdGF0ZS5jcHAKaW5k ZXggMmNjMTFlOTg2MWRiNDk2ZTc2OGExNTRjNmI5YmRjMmE3MWQwMDc0ZC4uZGMxMzFjZGE3OWJm OTc5MjdhMWNmMjk3MDAzN2E5ZDNmOWI4YjMxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1BhZ2VMb2FkU3RhdGUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9QYWdlTG9hZFN0YXRlLmNwcApAQCAtMzYsNiArMzYsMjEgQEAgUGFnZUxvYWRTdGF0ZTo6flBh Z2VMb2FkU3RhdGUoKQogewogfQogCitjb25zdCBTdHJpbmcmIFBhZ2VMb2FkU3RhdGU6OnBlbmRp bmdBUElSZXF1ZXN0VVJMKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9wZW5kaW5nQVBJUmVxdWVz dFVSTDsKK30KKwordm9pZCBQYWdlTG9hZFN0YXRlOjpzZXRQZW5kaW5nQVBJUmVxdWVzdFVSTChj b25zdCBTdHJpbmcmIHBlbmRpbmdBUElSZXF1ZXN0VVJMKQoreworICAgIG1fcGVuZGluZ0FQSVJl cXVlc3RVUkwgPSBwZW5kaW5nQVBJUmVxdWVzdFVSTDsKK30KKwordm9pZCBQYWdlTG9hZFN0YXRl OjpjbGVhclBlbmRpbmdBUElSZXF1ZXN0VVJMKCkKK3sKKyAgICBtX3BlbmRpbmdBUElSZXF1ZXN0 VVJMID0gU3RyaW5nKCk7Cit9CisKIHZvaWQgUGFnZUxvYWRTdGF0ZTo6ZGlkU3RhcnRQcm92aXNp b25hbExvYWQoY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgdW5yZWFjaGFibGVVUkwp CiB7CiAgICAgLy8gRklYTUU6IEltcGxlbWVudCB0aGlzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1BhZ2VMb2FkU3RhdGUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9QYWdlTG9hZFN0YXRlLmgKaW5kZXggMTNjMWQ0ZDZjNmM5ZWVkNDU3YTg0M2U3MjA5N2I5OGFj YWQxNjdlNi4uNmQ2OWFjNzBlZjZjNzgwMzBjNjllMzczZTI3ZTBhY2RiYjUxMTk0NCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VMb2FkU3RhdGUuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUxvYWRTdGF0ZS5oCkBAIC0zNSw3ICszNSwxNCBAQCBw dWJsaWM6CiAgICAgUGFnZUxvYWRTdGF0ZSgpOwogICAgIH5QYWdlTG9hZFN0YXRlKCk7CiAKKyAg ICBjb25zdCBTdHJpbmcmIHBlbmRpbmdBUElSZXF1ZXN0VVJMKCkgY29uc3Q7CisgICAgdm9pZCBz ZXRQZW5kaW5nQVBJUmVxdWVzdFVSTChjb25zdCBTdHJpbmcmKTsKKyAgICB2b2lkIGNsZWFyUGVu ZGluZ0FQSVJlcXVlc3RVUkwoKTsKKwogICAgIHZvaWQgZGlkU3RhcnRQcm92aXNpb25hbExvYWQo Y29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgdW5yZWFjaGFibGVVUkwpOworCitwcml2 YXRlOgorICAgIFN0cmluZyBtX3BlbmRpbmdBUElSZXF1ZXN0VVJMOwogfTsKIAogfSAvLyBuYW1l c3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmlu ZGV4IDg0Njg3ZDI5MWJjNzFhYzhhNWE2MGM5OTRmYzY0ODkwOThkMmNmZGEuLmU2NDU3MDlmMWI2 ZWYyYmExMThlODkzNWVlYzFlZTgyOGU3MDU0NjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuY3BwCkBAIC02MDMsNyArNjAzLDcgQEAgYm9vbCBXZWJQYWdlUHJveHk6 Om1heWJlSW5pdGlhbGl6ZVNhbmRib3hFeHRlbnNpb25IYW5kbGUoY29uc3QgVVJMJiB1cmwsIFNh bmRib3gKIAogdm9pZCBXZWJQYWdlUHJveHk6OmxvYWRVUkwoY29uc3QgU3RyaW5nJiB1cmwsIEFQ STo6T2JqZWN0KiB1c2VyRGF0YSkKIHsKLSAgICBzZXRQZW5kaW5nQVBJUmVxdWVzdFVSTCh1cmwp OworICAgIG1fcGFnZUxvYWRTdGF0ZS5zZXRQZW5kaW5nQVBJUmVxdWVzdFVSTCh1cmwpOwogCiAg ICAgaWYgKCFpc1ZhbGlkKCkpCiAgICAgICAgIHJlYXR0YWNoVG9XZWJQcm9jZXNzKCk7CkBAIC02 MTgsNyArNjE4LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmxvYWRVUkwoY29uc3QgU3RyaW5nJiB1 cmwsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSkKIAogdm9pZCBXZWJQYWdlUHJveHk6OmxvYWRVUkxS ZXF1ZXN0KFdlYlVSTFJlcXVlc3QqIHVybFJlcXVlc3QsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSkK IHsKLSAgICBzZXRQZW5kaW5nQVBJUmVxdWVzdFVSTCh1cmxSZXF1ZXN0LT5yZXNvdXJjZVJlcXVl c3QoKS51cmwoKSk7CisgICAgbV9wYWdlTG9hZFN0YXRlLnNldFBlbmRpbmdBUElSZXF1ZXN0VVJM KHVybFJlcXVlc3QtPnJlc291cmNlUmVxdWVzdCgpLnVybCgpKTsKIAogICAgIGlmICghaXNWYWxp ZCgpKQogICAgICAgICByZWF0dGFjaFRvV2ViUHJvY2VzcygpOwpAQCAtNzI0LDcgKzcyNCw3IEBA IHZvaWQgV2ViUGFnZVByb3h5OjpyZWxvYWQoYm9vbCByZWxvYWRGcm9tT3JpZ2luKQogCiAgICAg aWYgKG1fYmFja0ZvcndhcmRMaXN0LT5jdXJyZW50SXRlbSgpKSB7CiAgICAgICAgIFN0cmluZyB1 cmwgPSBtX2JhY2tGb3J3YXJkTGlzdC0+Y3VycmVudEl0ZW0oKS0+dXJsKCk7Ci0gICAgICAgIHNl dFBlbmRpbmdBUElSZXF1ZXN0VVJMKHVybCk7CisgICAgICAgIG1fcGFnZUxvYWRTdGF0ZS5zZXRQ ZW5kaW5nQVBJUmVxdWVzdFVSTCh1cmwpOwogCiAgICAgICAgIC8vIFdlIG1heSBub3QgaGF2ZSBh biBleHRlbnNpb24geWV0IGlmIGJhY2svZm9yd2FyZCBsaXN0IHdhcyByZWluc3RhdGVkIGFmdGVy IGEgV2ViUHJvY2VzcyBjcmFzaCBvciBhIGJyb3dzZXIgcmVsYXVuY2gKICAgICAgICAgYm9vbCBj cmVhdGVkRXh0ZW5zaW9uID0gbWF5YmVJbml0aWFsaXplU2FuZGJveEV4dGVuc2lvbkhhbmRsZShV UkwoVVJMKCksIHVybCksIHNhbmRib3hFeHRlbnNpb25IYW5kbGUpOwpAQCAtNzUwLDcgKzc1MCw3 IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpnb0ZvcndhcmQoKQogICAgIGlmICghZm9yd2FyZEl0ZW0p CiAgICAgICAgIHJldHVybjsKIAotICAgIHNldFBlbmRpbmdBUElSZXF1ZXN0VVJMKGZvcndhcmRJ dGVtLT51cmwoKSk7CisgICAgbV9wYWdlTG9hZFN0YXRlLnNldFBlbmRpbmdBUElSZXF1ZXN0VVJM KGZvcndhcmRJdGVtLT51cmwoKSk7CiAKICAgICBpZiAoIWlzVmFsaWQoKSkgewogICAgICAgICBy ZWF0dGFjaFRvV2ViUHJvY2Vzc1dpdGhJdGVtKGZvcndhcmRJdGVtKTsKQEAgLTc3NSw3ICs3NzUs NyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6Z29CYWNrKCkKICAgICBpZiAoIWJhY2tJdGVtKQogICAg ICAgICByZXR1cm47CiAKLSAgICBzZXRQZW5kaW5nQVBJUmVxdWVzdFVSTChiYWNrSXRlbS0+dXJs KCkpOworICAgIG1fcGFnZUxvYWRTdGF0ZS5zZXRQZW5kaW5nQVBJUmVxdWVzdFVSTChiYWNrSXRl bS0+dXJsKCkpOwogCiAgICAgaWYgKCFpc1ZhbGlkKCkpIHsKICAgICAgICAgcmVhdHRhY2hUb1dl YlByb2Nlc3NXaXRoSXRlbShiYWNrSXRlbSk7CkBAIC03OTgsNyArNzk4LDcgQEAgdm9pZCBXZWJQ YWdlUHJveHk6OmdvVG9CYWNrRm9yd2FyZEl0ZW0oV2ViQmFja0ZvcndhcmRMaXN0SXRlbSogaXRl bSkKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICAKLSAgICBzZXRQZW5kaW5nQVBJUmVxdWVz dFVSTChpdGVtLT51cmwoKSk7CisgICAgbV9wYWdlTG9hZFN0YXRlLnNldFBlbmRpbmdBUElSZXF1 ZXN0VVJMKGl0ZW0tPnVybCgpKTsKIAogICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2Vi UGFnZTo6R29Ub0JhY2tGb3J3YXJkSXRlbShpdGVtLT5pdGVtSUQoKSksIG1fcGFnZUlEKTsKICAg ICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNzVGltZXIoKS0+c3RhcnQoKTsKQEAgLTgzOSw4ICs4 MzksOCBAQCBTdHJpbmcgV2ViUGFnZVByb3h5OjphY3RpdmVVUkwoKSBjb25zdAogICAgIC8vIElm IHRoZXJlIGlzIGEgY3VycmVudGx5IHBlbmRpbmcgdXJsLCBpdCBpcyB0aGUgYWN0aXZlIFVSTCwK ICAgICAvLyBldmVuIHdoZW4gdGhlcmUncyBubyBtYWluIGZyYW1lIHlldCwgYXMgaXQgbWlnaHQg YmUgdGhlCiAgICAgLy8gZmlyc3QgQVBJIHJlcXVlc3QuCi0gICAgaWYgKCFtX3BlbmRpbmdBUElS ZXF1ZXN0VVJMLmlzTnVsbCgpKQotICAgICAgICByZXR1cm4gbV9wZW5kaW5nQVBJUmVxdWVzdFVS TDsKKyAgICBpZiAoIW1fcGFnZUxvYWRTdGF0ZS5wZW5kaW5nQVBJUmVxdWVzdFVSTCgpLmlzTnVs bCgpKQorICAgICAgICByZXR1cm4gbV9wYWdlTG9hZFN0YXRlLnBlbmRpbmdBUElSZXF1ZXN0VVJM KCk7CiAKICAgICBpZiAoIW1fbWFpbkZyYW1lKQogICAgICAgICByZXR1cm4gU3RyaW5nKCk7CkBA IC0xNDU2LDcgKzE0NTYsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cmVjZWl2ZWRQb2xpY3lEZWNp c2lvbihQb2xpY3lBY3Rpb24gYWN0aW9uLCBXZWJGcmFtZVByb3h5KiBmcgogICAgICAgICByZXR1 cm47CiAKICAgICBpZiAoYWN0aW9uID09IFBvbGljeUlnbm9yZSkKLSAgICAgICAgY2xlYXJQZW5k aW5nQVBJUmVxdWVzdFVSTCgpOworICAgICAgICBtX3BhZ2VMb2FkU3RhdGUuY2xlYXJQZW5kaW5n QVBJUmVxdWVzdFVSTCgpOwogCiAgICAgdWludDY0X3QgZG93bmxvYWRJRCA9IDA7CiAgICAgaWYg KGFjdGlvbiA9PSBQb2xpY3lEb3dubG9hZCkgewpAQCAtMjEwNiw4ICsyMTA2LDkgQEAgc3RhdGlj IGNvbnN0IGRvdWJsZSBpbml0aWFsUHJvZ3Jlc3NWYWx1ZSA9IDAuMTsKIAogZG91YmxlIFdlYlBh Z2VQcm94eTo6ZXN0aW1hdGVkUHJvZ3Jlc3MoKSBjb25zdAogewotICAgIGlmICghcGVuZGluZ0FQ SVJlcXVlc3RVUkwoKS5pc051bGwoKSkKKyAgICBpZiAoIW1fcGFnZUxvYWRTdGF0ZS5wZW5kaW5n QVBJUmVxdWVzdFVSTCgpLmlzTnVsbCgpKQogICAgICAgICByZXR1cm4gaW5pdGlhbFByb2dyZXNz VmFsdWU7CisKICAgICByZXR1cm4gbV9lc3RpbWF0ZWRQcm9ncmVzczsgCiB9CiAKQEAgLTIxMzQs NyArMjEzNSw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRGaW5pc2hQcm9ncmVzcygpCiAKIHZv aWQgV2ViUGFnZVByb3h5OjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90 IGZyYW1lSUQsIGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIHVucmVhY2hhYmxlVVJM LCBDb3JlSVBDOjpNZXNzYWdlRGVjb2RlciYgZGVjb2RlcikKIHsKLSAgICBjbGVhclBlbmRpbmdB UElSZXF1ZXN0VVJMKCk7CisgICAgbV9wYWdlTG9hZFN0YXRlLmNsZWFyUGVuZGluZ0FQSVJlcXVl c3RVUkwoKTsKIAogICAgIFJlZlB0cjxBUEk6Ok9iamVjdD4gdXNlckRhdGE7CiAgICAgV2ViQ29u dGV4dFVzZXJNZXNzYWdlRGVjb2RlciBtZXNzYWdlRGVjb2Rlcih1c2VyRGF0YSwgbV9wcm9jZXNz LmdldCgpKTsKQEAgLTIyODYsNyArMjI4Nyw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRTYW1l RG9jdW1lbnROYXZpZ2F0aW9uRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDMyX3QKICAg ICBNRVNTQUdFX0NIRUNLKGZyYW1lKTsKICAgICBNRVNTQUdFX0NIRUNLX1VSTCh1cmwpOwogCi0g ICAgY2xlYXJQZW5kaW5nQVBJUmVxdWVzdFVSTCgpOworICAgIG1fcGFnZUxvYWRTdGF0ZS5jbGVh clBlbmRpbmdBUElSZXF1ZXN0VVJMKCk7CiAgICAgZnJhbWUtPmRpZFNhbWVEb2N1bWVudE5hdmln YXRpb24odXJsKTsKIAogICAgIG1fbG9hZGVyQ2xpZW50LmRpZFNhbWVEb2N1bWVudE5hdmlnYXRp b25Gb3JGcmFtZSh0aGlzLCBmcmFtZSwgc3RhdGljX2Nhc3Q8U2FtZURvY3VtZW50TmF2aWdhdGlv blR5cGU+KG9wYXF1ZVNhbWVEb2N1bWVudE5hdmlnYXRpb25UeXBlKSwgdXNlckRhdGEuZ2V0KCkp OwpAQCAtMjQxMyw4ICsyNDE0LDggQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZv ck5hdmlnYXRpb25BY3Rpb24odWludDY0X3QgZnJhbWVJRCwgdWludDMyX3Qgb3AKICAgICBpZiAo IWRlY29kZXIuZGVjb2RlKG1lc3NhZ2VEZWNvZGVyKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAg aWYgKHJlcXVlc3QudXJsKCkgIT0gcGVuZGluZ0FQSVJlcXVlc3RVUkwoKSkKLSAgICAgICAgY2xl YXJQZW5kaW5nQVBJUmVxdWVzdFVSTCgpOworICAgIGlmIChyZXF1ZXN0LnVybCgpICE9IG1fcGFn ZUxvYWRTdGF0ZS5wZW5kaW5nQVBJUmVxdWVzdFVSTCgpKQorICAgICAgICBtX3BhZ2VMb2FkU3Rh dGUuY2xlYXJQZW5kaW5nQVBJUmVxdWVzdFVSTCgpOwogCiAgICAgV2ViRnJhbWVQcm94eSogZnJh bWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQpOwogICAgIE1FU1NBR0VfQ0hFQ0soZnJh bWUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5o IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IDU0NzUwZmI2 MTI1MmJhNTI3ZGE4ZTZlODg0OWNmNGVhOWNmYzg2ZmUuLmUyNDdiZjdjYzAwOWQzZjFlNzVjNWQ4 ZGU1M2FkMzJkYzJhZDJjNDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmgKQEAgLTY3Miw3ICs2NzIsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBkcmF3UGFnZXNGb3JQcmlu dGluZyhXZWJGcmFtZVByb3h5KiwgY29uc3QgUHJpbnRJbmZvJiwgUGFzc1JlZlB0cjxQcmludEZp bmlzaGVkQ2FsbGJhY2s+KTsKICNlbmRpZgogCi0gICAgY29uc3QgU3RyaW5nJiBwZW5kaW5nQVBJ UmVxdWVzdFVSTCgpIGNvbnN0IHsgcmV0dXJuIG1fcGVuZGluZ0FQSVJlcXVlc3RVUkw7IH0KKyAg ICBQYWdlTG9hZFN0YXRlJiBwYWdlTG9hZFN0YXRlKCkgeyByZXR1cm4gbV9wYWdlTG9hZFN0YXRl OyB9CiAKICNpZiBQTEFURk9STShNQUMpCiAgICAgdm9pZCBoYW5kbGVBbHRlcm5hdGl2ZVRleHRV SVJlc3VsdChjb25zdCBTdHJpbmcmIHJlc3VsdCk7CkBAIC05NzIsOSArOTcyLDYgQEAgcHJpdmF0 ZToKICAgICB2b2lkIHNldFBsdWdpbkNvbXBsZXhUZXh0SW5wdXRTdGF0ZSh1aW50NjRfdCBwbHVn aW5Db21wbGV4VGV4dElucHV0SWRlbnRpZmllciwgdWludDY0X3QgY29tcGxleFRleHRJbnB1dFN0 YXRlKTsKICNlbmRpZgogCi0gICAgdm9pZCBjbGVhclBlbmRpbmdBUElSZXF1ZXN0VVJMKCkgeyBt X3BlbmRpbmdBUElSZXF1ZXN0VVJMID0gU3RyaW5nKCk7IH0KLSAgICB2b2lkIHNldFBlbmRpbmdB UElSZXF1ZXN0VVJMKGNvbnN0IFN0cmluZyYgcGVuZGluZ0FQSVJlcXVlc3RVUkwpIHsgbV9wZW5k aW5nQVBJUmVxdWVzdFVSTCA9IHBlbmRpbmdBUElSZXF1ZXN0VVJMOyB9Ci0KICAgICBib29sIG1h eWJlSW5pdGlhbGl6ZVNhbmRib3hFeHRlbnNpb25IYW5kbGUoY29uc3QgV2ViQ29yZTo6VVJMJiwg U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlJik7CiAKICNpZiBQTEFURk9STShNQUMpCkBAIC0xMTgy LDcgKzExNzksNiBAQCBwcml2YXRlOgogI2VuZGlmCiAKICAgICBQYWdlTG9hZFN0YXRlIG1fcGFn ZUxvYWRTdGF0ZTsKLSAgICBTdHJpbmcgbV9wZW5kaW5nQVBJUmVxdWVzdFVSTDsKIAogICAgIGJv b2wgbV9tYWluRnJhbWVIYXNIb3Jpem9udGFsU2Nyb2xsYmFyOwogICAgIGJvb2wgbV9tYWluRnJh bWVIYXNWZXJ0aWNhbFNjcm9sbGJhcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9jZi9XZWJQYWdlUHJveHlDRi5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvY2Yv V2ViUGFnZVByb3h5Q0YuY3BwCmluZGV4IDBkM2M3N2QyMWFiYzg5MDA1YTNiN2Q3MTBmMjg0Yzk3 OGUxZTJmMTQuLjIyYTQ2MTJhYjhlYjVmOWYzZjcyODliZGJhNzg0Njk5ODcxNjZhZDggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9jZi9XZWJQYWdlUHJveHlDRi5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2NmL1dlYlBhZ2VQcm94eUNGLmNwcApAQCAtNjEs NyArNjEsNyBAQCBQYXNzUmVmUHRyPFdlYkRhdGE+IFdlYlBhZ2VQcm94eTo6c2Vzc2lvblN0YXRl RGF0YShXZWJQYWdlUHJveHlTZXNzaW9uU3RhdGVGaWx0ZQogCiAgICAgUmV0YWluUHRyPENGU3Ry aW5nUmVmPiBwcm92aXNpb25hbFVSTFN0cmluZzsKICAgICBpZiAobV9tYWluRnJhbWUpIHsKLSAg ICAgICAgU3RyaW5nIHByb3Zpc2lvbmFsVVJMID0gcGVuZGluZ0FQSVJlcXVlc3RVUkwoKTsKKyAg ICAgICAgU3RyaW5nIHByb3Zpc2lvbmFsVVJMID0gbV9wYWdlTG9hZFN0YXRlLnBlbmRpbmdBUElS ZXF1ZXN0VVJMKCk7CiAgICAgICAgIGlmIChwcm92aXNpb25hbFVSTC5pc0VtcHR5KCkpCiAgICAg ICAgICAgICBwcm92aXNpb25hbFVSTCA9IG1fbWFpbkZyYW1lLT5wcm92aXNpb25hbFVSTCgpOwog ICAgICAgICBpZiAoIXByb3Zpc2lvbmFsVVJMLmlzRW1wdHkoKSkgewpAQCAtMTY1LDcgKzE2NSw3 IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpyZXN0b3JlRnJvbVNlc3Npb25TdGF0ZURhdGEoV2ViRGF0 YSogd2ViRGF0YSkKICAgICAgICAgICAgICAgICAgICAgcHJvY2VzcygpLT5zZW5kKE1lc3NhZ2Vz OjpXZWJQYWdlOjpSZXN0b3JlU2Vzc2lvbihzdGF0ZSksIG1fcGFnZUlEKTsKICAgICAgICAgICAg ICAgICBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgaWYgKFdlYkJhY2tGb3J3YXJkTGlzdEl0 ZW0qIGl0ZW0gPSBtX2JhY2tGb3J3YXJkTGlzdC0+Y3VycmVudEl0ZW0oKSkKLSAgICAgICAgICAg ICAgICAgICAgICAgIHNldFBlbmRpbmdBUElSZXF1ZXN0VVJMKGl0ZW0tPnVybCgpKTsKKyAgICAg ICAgICAgICAgICAgICAgICAgIG1fcGFnZUxvYWRTdGF0ZS5zZXRQZW5kaW5nQVBJUmVxdWVzdFVS TChpdGVtLT51cmwoKSk7CiAKICAgICAgICAgICAgICAgICAgICAgcHJvY2VzcygpLT5zZW5kKE1l c3NhZ2VzOjpXZWJQYWdlOjpSZXN0b3JlU2Vzc2lvbkFuZE5hdmlnYXRlVG9DdXJyZW50SXRlbShz dGF0ZSksIG1fcGFnZUlEKTsKICAgICAgICAgICAgICAgICB9Cg==