38205 2010-04-27 10:49:17 -0700 [V8] Web Inspector: support pause on exceptions in ScriptDebugServer 2010-04-28 04:39:18 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 yurys yurys bweinstein commit-queue joepeck keishi pfeldman pmuellr rik timothy yurys oldest_to_newest 217782 0 yurys 2010-04-27 10:49:17 -0700 Support pause on exceptions in v8 implementation of ScriptDebugServer. 217788 1 54430 yurys 2010-04-27 10:54:59 -0700 Created attachment 54430 patch 218325 2 54430 commit-queue 2010-04-28 04:39:11 -0700 Comment on attachment 54430 patch Clearing flags on attachment: 54430 Committed r58402: <http://trac.webkit.org/changeset/58402> 218326 3 commit-queue 2010-04-28 04:39:18 -0700 All reviewed patches have been landed. Closing bug. 54430 2010-04-27 10:54:59 -0700 2010-04-28 04:39:11 -0700 patch pause-on-exceptions.patch text/plain 13328 yurys ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MTZkNzBiZi4uZDdlZmM2NyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMC0wNC0yNyAgWXVyeSBTZW1pa2hh dHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBTdXBwb3J0IHBhdXNlIG9uIGV4Y2VwdGlvbnMgaW4gdjggaW1w bGVtZW50YXRpb24gb2YgU2NyaXB0RGVidWdTZXJ2ZXIuCisKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM4MjA1ICAgICAgICAKKworICAgICAgICAqIGJp bmRpbmdzL3Y4L1NjcmlwdERlYnVnU2VydmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlw dERlYnVnU2VydmVyOjphZGRMaXN0ZW5lcik6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHREZWJ1 Z1NlcnZlcjo6cGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpTY3Jp cHREZWJ1Z1NlcnZlcjo6c2V0UGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSk6CisgICAgICAgIChXZWJD b3JlOjpTY3JpcHREZWJ1Z1NlcnZlcjo6Y3VycmVudENhbGxGcmFtZSk6CisgICAgICAgIChXZWJD b3JlOjpTY3JpcHREZWJ1Z1NlcnZlcjo6aGFuZGxlVjhEZWJ1Z01lc3NhZ2UpOgorICAgICAgICAo V2ViQ29yZTo6U2NyaXB0RGVidWdTZXJ2ZXI6OmRpc3BhdGNoRGlkUGFyc2VTb3VyY2UpOgorICAg ICAgICAqIGJpbmRpbmdzL3Y4L1NjcmlwdERlYnVnU2VydmVyLmg6CisKIDIwMTAtMDQtMjcgIEpv c2VwaCBQZWNvcmFybyAgPGpvZXBlY2tAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBi eSBEYW4gQmVybnN0ZWluLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRE ZWJ1Z1NlcnZlci5jcHAgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdERlYnVnU2VydmVyLmNw cAppbmRleCA1NGQ3Njk0Li42NDcyMWIyIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L1NjcmlwdERlYnVnU2VydmVyLmNwcAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdERl YnVnU2VydmVyLmNwcApAQCAtODEsMTEgKzgxLDEwIEBAIHZvaWQgU2NyaXB0RGVidWdTZXJ2ZXI6 OmFkZExpc3RlbmVyKFNjcmlwdERlYnVnTGlzdGVuZXIqIGxpc3RlbmVyLCBQYWdlKiBwYWdlKQog ICAgIG1fbGlzdGVuZXJzTWFwLnNldChwYWdlLCBsaXN0ZW5lcik7CiAgICAgVjhQcm94eSogcHJv eHkgPSBWOFByb3h5OjpyZXRyaWV2ZShwYWdlLT5tYWluRnJhbWUoKSk7CiAgICAgdjg6OkxvY2Fs PHY4OjpDb250ZXh0PiBjb250ZXh0ID0gcHJveHktPm1haW5Xb3JsZENvbnRleHQoKTsKLSAgICBT dHJpbmcgY29udGV4dERhdGEgPSB0b1dlYkNvcmVTdHJpbmdXaXRoTnVsbENoZWNrKGNvbnRleHQt PkdldERhdGEoKSk7Ci0gICAgbV9jb250ZXh0RGF0YU1hcC5zZXQobGlzdGVuZXIsIGNvbnRleHRE YXRhKTsKIAogICAgIHY4OjpIYW5kbGU8djg6OkZ1bmN0aW9uPiBnZXRTY3JpcHRzRnVuY3Rpb24g PSB2ODo6TG9jYWw8djg6OkZ1bmN0aW9uPjo6Q2FzdChtX2RlYnVnZ2VyU2NyaXB0LmdldCgpLT5H ZXQodjg6OlN0cmluZzo6TmV3KCJnZXRTY3JpcHRzIikpKTsKLSAgICB2ODo6SGFuZGxlPHY4OjpW YWx1ZT4gdmFsdWUgPSB2ODo6RGVidWc6OkNhbGwoZ2V0U2NyaXB0c0Z1bmN0aW9uKTsKKyAgICB2 ODo6SGFuZGxlPHY4OjpWYWx1ZT4gYXJndltdID0geyBjb250ZXh0LT5HZXREYXRhKCkgfTsKKyAg ICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdmFsdWUgPSBnZXRTY3JpcHRzRnVuY3Rpb24tPkNhbGwo bV9kZWJ1Z2dlclNjcmlwdC5nZXQoKSwgMSwgYXJndik7CiAgICAgaWYgKHZhbHVlLklzRW1wdHko KSkKICAgICAgICAgcmV0dXJuOwogICAgIEFTU0VSVCghdmFsdWUtPklzVW5kZWZpbmVkKCkgJiYg dmFsdWUtPklzQXJyYXkoKSk7CkBAIC0xNzUsNiArMTc0LDM1IEBAIHZvaWQgU2NyaXB0RGVidWdT ZXJ2ZXI6OnNldEJyZWFrcG9pbnRzQWN0aXZhdGVkKGJvb2wgZW5hYmxlZCkKICNlbmRpZgogfQog CitTY3JpcHREZWJ1Z1NlcnZlcjo6UGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSBTY3JpcHREZWJ1Z1Nl cnZlcjo6cGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSgpCit7CisjaWYgRU5BQkxFKFY4X1NDUklQVF9E RUJVR19TRVJWRVIpCisgICAgZW5zdXJlRGVidWdnZXJTY3JpcHRDb21waWxlZCgpOworICAgIHY4 OjpIYW5kbGVTY29wZSBzY29wZTsKKyAgICB2ODo6Q29udGV4dDo6U2NvcGUgY29udGV4dFNjb3Bl KHY4OjpEZWJ1Zzo6R2V0RGVidWdDb250ZXh0KCkpOworCisgICAgdjg6OkhhbmRsZTx2ODo6RnVu Y3Rpb24+IGN1cnJlbnRDYWxsRnJhbWVGdW5jdGlvbiA9IHY4OjpMb2NhbDx2ODo6RnVuY3Rpb24+ OjpDYXN0KG1fZGVidWdnZXJTY3JpcHQuZ2V0KCktPkdldCh2ODo6U3RyaW5nOjpOZXcoInBhdXNl T25FeGNlcHRpb25zU3RhdGUiKSkpOworICAgIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBhcmd2W10g PSB7IHY4OjpIYW5kbGU8djg6OlZhbHVlPigpIH07CisgICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+ IHJlc3VsdCA9IGN1cnJlbnRDYWxsRnJhbWVGdW5jdGlvbi0+Q2FsbChtX2RlYnVnZ2VyU2NyaXB0 LmdldCgpLCAwLCBhcmd2KTsKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8U2NyaXB0RGVidWdTZXJ2 ZXI6OlBhdXNlT25FeGNlcHRpb25zU3RhdGU+KHJlc3VsdC0+SW50MzJWYWx1ZSgpKTsKKyNlbHNl CisgICAgcmV0dXJuIERvbnRQYXVzZU9uRXhjZXB0aW9uczsKKyNlbmRpZgorfQorCit2b2lkIFNj cmlwdERlYnVnU2VydmVyOjpzZXRQYXVzZU9uRXhjZXB0aW9uc1N0YXRlKFBhdXNlT25FeGNlcHRp b25zU3RhdGUgcGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSkKK3sKKyNpZiBFTkFCTEUoVjhfU0NSSVBU X0RFQlVHX1NFUlZFUikKKyAgICBlbnN1cmVEZWJ1Z2dlclNjcmlwdENvbXBpbGVkKCk7CisgICAg djg6OkhhbmRsZVNjb3BlIHNjb3BlOworICAgIHY4OjpDb250ZXh0OjpTY29wZSBjb250ZXh0U2Nv cGUodjg6OkRlYnVnOjpHZXREZWJ1Z0NvbnRleHQoKSk7CisKKyAgICB2ODo6SGFuZGxlPHY4OjpG dW5jdGlvbj4gY3VycmVudENhbGxGcmFtZUZ1bmN0aW9uID0gdjg6OkxvY2FsPHY4OjpGdW5jdGlv bj46OkNhc3QobV9kZWJ1Z2dlclNjcmlwdC5nZXQoKS0+R2V0KHY4OjpTdHJpbmc6Ok5ldygic2V0 UGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSIpKSk7CisgICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGFy Z3ZbXSA9IHsgdjg6OkludDMyOjpOZXcocGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSkgfTsKKyAgICBj dXJyZW50Q2FsbEZyYW1lRnVuY3Rpb24tPkNhbGwobV9kZWJ1Z2dlclNjcmlwdC5nZXQoKSwgMSwg YXJndik7CisjZW5kaWYKK30KKwogdm9pZCBTY3JpcHREZWJ1Z1NlcnZlcjo6Y29udGludWVQcm9n cmFtKCkKIHsKICNpZiBFTkFCTEUoVjhfU0NSSVBUX0RFQlVHX1NFUlZFUikKQEAgLTIxNiwyNiAr MjQ0LDE1IEBAIFNjcmlwdFN0YXRlKiBTY3JpcHREZWJ1Z1NlcnZlcjo6Y3VycmVudENhbGxGcmFt ZVN0YXRlKCkKICAgICByZXR1cm4gbV9jdXJyZW50Q2FsbEZyYW1lU3RhdGU7CiB9CiAKLXY4OjpI YW5kbGU8djg6OlZhbHVlPiBTY3JpcHREZWJ1Z1NlcnZlcjo6Y3VycmVudENhbGxGcmFtZVY4KCkK LXsKLSNpZiBFTkFCTEUoVjhfU0NSSVBUX0RFQlVHX1NFUlZFUikKLSAgICBpZiAoIW1fY3VycmVu dENhbGxGcmFtZS5nZXQoKS5Jc0VtcHR5KCkpCi0gICAgICAgIHJldHVybiBtX2N1cnJlbnRDYWxs RnJhbWUuZ2V0KCk7Ci0KLSAgICAvLyBDaGVjayBvbiBhIGJwLgotICAgIHY4OjpIYW5kbGU8djg6 OkZ1bmN0aW9uPiBjdXJyZW50Q2FsbEZyYW1lRnVuY3Rpb24gPSB2ODo6TG9jYWw8djg6OkZ1bmN0 aW9uPjo6Q2FzdChtX2RlYnVnZ2VyU2NyaXB0LmdldCgpLT5HZXQodjg6OlN0cmluZzo6TmV3KCJj dXJyZW50Q2FsbEZyYW1lIikpKTsKLSAgICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gYXJndltdID0g eyBtX2V4ZWN1dGlvblN0YXRlLmdldCgpIH07Ci0gICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHJl c3VsdCA9IGN1cnJlbnRDYWxsRnJhbWVGdW5jdGlvbi0+Q2FsbChtX2RlYnVnZ2VyU2NyaXB0Lmdl dCgpLCAxLCBhcmd2KTsKLSAgICBtX2N1cnJlbnRDYWxsRnJhbWUuc2V0KHJlc3VsdCk7Ci0gICAg cmV0dXJuIHJlc3VsdDsKLSNlbHNlCi0gICAgcmV0dXJuIHY4OjpIYW5kbGU8djg6OlZhbHVlPigp OwotI2VuZGlmCi19Ci0KIFBhc3NSZWZQdHI8SmF2YVNjcmlwdENhbGxGcmFtZT4gU2NyaXB0RGVi dWdTZXJ2ZXI6OmN1cnJlbnRDYWxsRnJhbWUoKQogewotICAgIHJldHVybiBKYXZhU2NyaXB0Q2Fs bEZyYW1lOjpjcmVhdGUodjg6OkRlYnVnOjpHZXREZWJ1Z0NvbnRleHQoKSwgdjg6OkhhbmRsZTx2 ODo6T2JqZWN0Pjo6Q2FzdChjdXJyZW50Q2FsbEZyYW1lVjgoKSkpOyAKKyAgICBpZiAoIW1fY3Vy cmVudENhbGxGcmFtZSkgeworICAgICAgICB2ODo6SGFuZGxlPHY4OjpGdW5jdGlvbj4gY3VycmVu dENhbGxGcmFtZUZ1bmN0aW9uID0gdjg6OkxvY2FsPHY4OjpGdW5jdGlvbj46OkNhc3QobV9kZWJ1 Z2dlclNjcmlwdC5nZXQoKS0+R2V0KHY4OjpTdHJpbmc6Ok5ldygiY3VycmVudENhbGxGcmFtZSIp KSk7CisgICAgICAgIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBhcmd2W10gPSB7IG1fZXhlY3V0aW9u U3RhdGUuZ2V0KCkgfTsKKyAgICAgICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGN1cnJlbnRDYWxs RnJhbWVWOCA9IGN1cnJlbnRDYWxsRnJhbWVGdW5jdGlvbi0+Q2FsbChtX2RlYnVnZ2VyU2NyaXB0 LmdldCgpLCAxLCBhcmd2KTsKKyAgICAgICAgbV9jdXJyZW50Q2FsbEZyYW1lID0gSmF2YVNjcmlw dENhbGxGcmFtZTo6Y3JlYXRlKHY4OjpEZWJ1Zzo6R2V0RGVidWdDb250ZXh0KCksIHY4OjpIYW5k bGU8djg6Ok9iamVjdD46OkNhc3QoY3VycmVudENhbGxGcmFtZVY4KSk7IAorICAgIH0KKyAgICBy ZXR1cm4gbV9jdXJyZW50Q2FsbEZyYW1lOwogfQogCiB2b2lkIFNjcmlwdERlYnVnU2VydmVyOjpv blY4RGVidWdNZXNzYWdlKGNvbnN0IHY4OjpEZWJ1Zzo6TWVzc2FnZSYgbWVzc2FnZSkKQEAgLTI2 OCw3ICsyODUsNyBAQCB2b2lkIFNjcmlwdERlYnVnU2VydmVyOjpoYW5kbGVWOERlYnVnTWVzc2Fn ZShjb25zdCB2ODo6RGVidWc6Ok1lc3NhZ2UmIG1lc3NhZ2UpCiAgICAgICAgIHJldHVybjsKIAog ICAgIC8vIElnbm9yZSB1bnN1cHBvcnRlZCBldmVudCB0eXBlcy4KLSAgICBpZiAobWVzc2FnZS5H ZXRFdmVudCgpICE9IHY4OjpBZnRlckNvbXBpbGUgJiYgbWVzc2FnZS5HZXRFdmVudCgpICE9IHY4 OjpCcmVhaykKKyAgICBpZiAobWVzc2FnZS5HZXRFdmVudCgpICE9IHY4OjpBZnRlckNvbXBpbGUg JiYgbWVzc2FnZS5HZXRFdmVudCgpICE9IHY4OjpCcmVhayAmJiBtZXNzYWdlLkdldEV2ZW50KCkg IT0gdjg6OkV4Y2VwdGlvbikKICAgICAgICAgcmV0dXJuOwogCiAgICAgdjg6OkhhbmRsZTx2ODo6 Q29udGV4dD4gY29udGV4dCA9IG1lc3NhZ2UuR2V0RXZlbnRDb250ZXh0KCk7CkBAIC0yODYsMTEg KzMwMywxMyBAQCB2b2lkIFNjcmlwdERlYnVnU2VydmVyOjpoYW5kbGVWOERlYnVnTWVzc2FnZShj b25zdCB2ODo6RGVidWc6Ok1lc3NhZ2UmIG1lc3NhZ2UpCiAgICAgaWYgKGdsb2JhbC5Jc0VtcHR5 KCkpCiAgICAgICAgIHJldHVybjsKIAorICAgIGJvb2wgaGFuZGxlZCA9IGZhbHNlOwogICAgIEZy YW1lKiBmcmFtZSA9IFY4UHJveHk6OnJldHJpZXZlRnJhbWUoY29udGV4dCk7CiAgICAgaWYgKGZy YW1lKSB7CiAgICAgICAgIFNjcmlwdERlYnVnTGlzdGVuZXIqIGxpc3RlbmVyID0gbV9saXN0ZW5l cnNNYXAuZ2V0KGZyYW1lLT5wYWdlKCkpOwogICAgICAgICBpZiAobGlzdGVuZXIpIHsKICAgICAg ICAgICAgIGlmIChtZXNzYWdlLkdldEV2ZW50KCkgPT0gdjg6OkFmdGVyQ29tcGlsZSkgeworICAg ICAgICAgICAgICAgIGhhbmRsZWQgPSB0cnVlOwogICAgICAgICAgICAgICAgIHY4OjpDb250ZXh0 OjpTY29wZSBjb250ZXh0U2NvcGUodjg6OkRlYnVnOjpHZXREZWJ1Z0NvbnRleHQoKSk7CiAgICAg ICAgICAgICAgICAgdjg6OkxvY2FsPHY4OjpPYmplY3Q+IGFyZ3MgPSB2ODo6T2JqZWN0OjpOZXco KTsKICAgICAgICAgICAgICAgICBhcmdzLT5TZXQodjg6OlN0cmluZzo6TmV3KCJldmVudERhdGEi KSwgbWVzc2FnZS5HZXRFdmVudERhdGEoKSk7CkBAIC0zMDAsNyArMzE5LDggQEAgdm9pZCBTY3Jp cHREZWJ1Z1NlcnZlcjo6aGFuZGxlVjhEZWJ1Z01lc3NhZ2UoY29uc3Qgdjg6OkRlYnVnOjpNZXNz YWdlJiBtZXNzYWdlKQogICAgICAgICAgICAgICAgIEFTU0VSVCh2YWx1ZS0+SXNPYmplY3QoKSk7 CiAgICAgICAgICAgICAgICAgdjg6OkhhbmRsZTx2ODo6T2JqZWN0PiBvYmplY3QgPSB2ODo6SGFu ZGxlPHY4OjpPYmplY3Q+OjpDYXN0KHZhbHVlKTsKICAgICAgICAgICAgICAgICBkaXNwYXRjaERp ZFBhcnNlU291cmNlKGxpc3RlbmVyLCBvYmplY3QpOwotICAgICAgICAgICAgfSBlbHNlIGlmICht ZXNzYWdlLkdldEV2ZW50KCkgPT0gdjg6OkJyZWFrKSB7CisgICAgICAgICAgICB9IGVsc2UgaWYg KG1lc3NhZ2UuR2V0RXZlbnQoKSA9PSB2ODo6QnJlYWsgfHwgbWVzc2FnZS5HZXRFdmVudCgpID09 IHY4OjpFeGNlcHRpb24pIHsKKyAgICAgICAgICAgICAgICBoYW5kbGVkID0gdHJ1ZTsKICAgICAg ICAgICAgICAgICBtX2V4ZWN1dGlvblN0YXRlLnNldChtZXNzYWdlLkdldEV4ZWN1dGlvblN0YXRl KCkpOwogICAgICAgICAgICAgICAgIG1fY3VycmVudENhbGxGcmFtZVN0YXRlID0gbWFpbldvcmxk U2NyaXB0U3RhdGUoZnJhbWUpOwogICAgICAgICAgICAgICAgIGxpc3RlbmVyLT5kaWRQYXVzZSgp OwpAQCAtMzA4LDE0ICszMjgsMTMgQEAgdm9pZCBTY3JpcHREZWJ1Z1NlcnZlcjo6aGFuZGxlVjhE ZWJ1Z01lc3NhZ2UoY29uc3Qgdjg6OkRlYnVnOjpNZXNzYWdlJiBtZXNzYWdlKQogICAgICAgICAg ICAgfQogICAgICAgICB9CiAgICAgfQorCisgICAgaWYgKCFoYW5kbGVkICYmICFtZXNzYWdlLldp bGxTdGFydFJ1bm5pbmcoKSkKKyAgICAgICAgY29udGludWVQcm9ncmFtKCk7CiB9CiAKIHZvaWQg U2NyaXB0RGVidWdTZXJ2ZXI6OmRpc3BhdGNoRGlkUGFyc2VTb3VyY2UoU2NyaXB0RGVidWdMaXN0 ZW5lciogbGlzdGVuZXIsIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gb2JqZWN0KQogewotICAgIFN0 cmluZyBjb250ZXh0RGF0YSA9IHRvV2ViQ29yZVN0cmluZ1dpdGhOdWxsQ2hlY2sob2JqZWN0LT5H ZXQodjg6OlN0cmluZzo6TmV3KCJjb250ZXh0RGF0YSIpKSk7Ci0gICAgaWYgKGNvbnRleHREYXRh ICE9IG1fY29udGV4dERhdGFNYXAuZ2V0KGxpc3RlbmVyKSkKLSAgICAgICAgcmV0dXJuOwotCiAg ICAgbGlzdGVuZXItPmRpZFBhcnNlU291cmNlKAogICAgICAgICB0b1dlYkNvcmVTdHJpbmdXaXRo TnVsbENoZWNrKG9iamVjdC0+R2V0KHY4OjpTdHJpbmc6Ok5ldygiaWQiKSkpLAogICAgICAgICB0 b1dlYkNvcmVTdHJpbmdXaXRoTnVsbENoZWNrKG9iamVjdC0+R2V0KHY4OjpTdHJpbmc6Ok5ldygi bmFtZSIpKSksCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdERlYnVnU2Vy dmVyLmggYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdERlYnVnU2VydmVyLmgKaW5kZXggMDQ4 NTdlNC4uMzMwZDA3MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHREZWJ1 Z1NlcnZlci5oCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0RGVidWdTZXJ2ZXIuaApA QCAtMzMsNyArMzMsNyBAQAogCiAjaWYgRU5BQkxFKEpBVkFTQ1JJUFRfREVCVUdHRVIpCiAKLSNp bmNsdWRlICJPd25IYW5kbGUuaCIKKyNpbmNsdWRlICJKYXZhU2NyaXB0Q2FsbEZyYW1lLmgiCiAj aW5jbHVkZSAiUGxhdGZvcm1TdHJpbmcuaCIKICNpbmNsdWRlICJTY3JpcHRCcmVha3BvaW50Lmgi CiAjaW5jbHVkZSAiU2NyaXB0U3RhdGUuaCIKQEAgLTQ1LDcgKzQ1LDYgQEAKIAogbmFtZXNwYWNl IFdlYkNvcmUgewogCi1jbGFzcyBKYXZhU2NyaXB0Q2FsbEZyYW1lOwogY2xhc3MgUGFnZTsKIGNs YXNzIFNjcmlwdERlYnVnTGlzdGVuZXI7CiAKQEAgLTc1LDggKzc0LDggQEAgcHVibGljOgogICAg ICAgICBQYXVzZU9uQWxsRXhjZXB0aW9ucywKICAgICAgICAgUGF1c2VPblVuY2F1Z2h0RXhjZXB0 aW9ucwogICAgIH07Ci0gICAgUGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSBwYXVzZU9uRXhjZXB0aW9u c1N0YXRlKCkgY29uc3QgeyByZXR1cm4gbV9wYXVzZU9uRXhjZXB0aW9uc1N0YXRlOyB9Ci0gICAg dm9pZCBzZXRQYXVzZU9uRXhjZXB0aW9uc1N0YXRlKFBhdXNlT25FeGNlcHRpb25zU3RhdGUgcGF1 c2VPbkV4Y2VwdGlvbnNTdGF0ZSkgeyBtX3BhdXNlT25FeGNlcHRpb25zU3RhdGUgPSBwYXVzZU9u RXhjZXB0aW9uc1N0YXRlOyB9CisgICAgUGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSBwYXVzZU9uRXhj ZXB0aW9uc1N0YXRlKCk7CisgICAgdm9pZCBzZXRQYXVzZU9uRXhjZXB0aW9uc1N0YXRlKFBhdXNl T25FeGNlcHRpb25zU3RhdGUgcGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSk7CiAKICAgICB2b2lkIHBh dXNlUHJvZ3JhbSgpIHsgfQogICAgIHZvaWQgY29udGludWVQcm9ncmFtKCk7CkBAIC05Nyw3ICs5 Niw2IEBAIHB1YmxpYzoKICAgICB0eXBlZGVmIHZvaWQgKCpNZXNzYWdlTG9vcERpc3BhdGNoSGFu ZGxlcikoY29uc3QgVmVjdG9yPFdlYkNvcmU6OlBhZ2UqPiYpOwogICAgIHN0YXRpYyB2b2lkIHNl dE1lc3NhZ2VMb29wRGlzcGF0Y2hIYW5kbGVyKE1lc3NhZ2VMb29wRGlzcGF0Y2hIYW5kbGVyIG1l c3NhZ2VMb29wRGlzcGF0Y2hIYW5kbGVyKSB7IHNfbWVzc2FnZUxvb3BEaXNwYXRjaEhhbmRsZXIg PSBtZXNzYWdlTG9vcERpc3BhdGNoSGFuZGxlcjsgfQogCi0gICAgdjg6OkhhbmRsZTx2ODo6VmFs dWU+IGN1cnJlbnRDYWxsRnJhbWVWOCgpOwogICAgIFBhc3NSZWZQdHI8SmF2YVNjcmlwdENhbGxG cmFtZT4gY3VycmVudENhbGxGcmFtZSgpOwogCiBwcml2YXRlOgpAQCAtMTMwLDEzICsxMjgsMTEg QEAgcHJpdmF0ZToKIAogICAgIHR5cGVkZWYgSGFzaE1hcDxQYWdlKiwgU2NyaXB0RGVidWdMaXN0 ZW5lcio+IExpc3RlbmVyc01hcDsKICAgICBMaXN0ZW5lcnNNYXAgbV9saXN0ZW5lcnNNYXA7Ci0g ICAgdHlwZWRlZiBIYXNoTWFwPFNjcmlwdERlYnVnTGlzdGVuZXIqLCBTdHJpbmc+IENvbnRleHRE YXRhTWFwOwotICAgIENvbnRleHREYXRhTWFwIG1fY29udGV4dERhdGFNYXA7CiAgICAgU3RyaW5n IG1fZGVidWdnZXJTY3JpcHRTb3VyY2U7CiAgICAgUGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSBtX3Bh dXNlT25FeGNlcHRpb25zU3RhdGU7CiAgICAgT3duSGFuZGxlPHY4OjpPYmplY3Q+IG1fZGVidWdn ZXJTY3JpcHQ7CiAgICAgU2NyaXB0U3RhdGUqIG1fY3VycmVudENhbGxGcmFtZVN0YXRlOwotICAg IE93bkhhbmRsZTx2ODo6VmFsdWU+IG1fY3VycmVudENhbGxGcmFtZTsKKyAgICBSZWZQdHI8SmF2 YVNjcmlwdENhbGxGcmFtZT4gbV9jdXJyZW50Q2FsbEZyYW1lOwogICAgIE93bkhhbmRsZTx2ODo6 T2JqZWN0PiBtX2V4ZWN1dGlvblN0YXRlOwogCiAgICAgc3RhdGljIE1lc3NhZ2VMb29wRGlzcGF0 Y2hIYW5kbGVyIHNfbWVzc2FnZUxvb3BEaXNwYXRjaEhhbmRsZXI7CmRpZmYgLS1naXQgYS9XZWJL aXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCAy MWI3ODY0Li45ZDQ2YjExIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisr KyBiL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0wNC0y NyAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTdXBwb3J0IHBhdXNlIG9uIGV4Y2Vw dGlvbnMgaW4gdjggaW1wbGVtZW50YXRpb24gb2YgU2NyaXB0RGVidWdTZXJ2ZXIuCisKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM4MjA1ICAgICAgICAK KworICAgICAgICAqIHNyYy9qcy9EZWJ1Z2dlclNjcmlwdC5qczoKKyAgICAgICAgKGRlYnVnZ2Vy U2NyaXB0Q29uc3RydWN0b3IuRGVidWdnZXJTY3JpcHQuZ2V0U2NyaXB0cyk6CisgICAgICAgIChk ZWJ1Z2dlclNjcmlwdENvbnN0cnVjdG9yLkRlYnVnZ2VyU2NyaXB0LnBhdXNlT25FeGNlcHRpb25z U3RhdGUpOgorICAgICAgICAoZGVidWdnZXJTY3JpcHRDb25zdHJ1Y3Rvci5EZWJ1Z2dlclNjcmlw dC5zZXRQYXVzZU9uRXhjZXB0aW9uc1N0YXRlKToKKyAgICAgICAgKGRlYnVnZ2VyU2NyaXB0Q29u c3RydWN0b3IuRGVidWdnZXJTY3JpcHQuX3Y4VG9XZWJraXRMaW5lTnVtYmVyKToKKyAgICAgICAg KGRlYnVnZ2VyU2NyaXB0Q29uc3RydWN0b3IpOgorCiAyMDEwLTA0LTI3ICBBbmRyZXkgS29zeWFr b3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVs ZG1hbi4KZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9zcmMvanMvRGVidWdnZXJTY3JpcHQu anMgYi9XZWJLaXQvY2hyb21pdW0vc3JjL2pzL0RlYnVnZ2VyU2NyaXB0LmpzCmluZGV4IDc1YzU0 NjcuLjdjNGQxMjYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9zcmMvanMvRGVidWdnZXJT Y3JpcHQuanMKKysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9qcy9EZWJ1Z2dlclNjcmlwdC5qcwpA QCAtMzMsMTggKzMzLDI5IEBAIGZ1bmN0aW9uIGRlYnVnZ2VyU2NyaXB0Q29uc3RydWN0b3IoKSB7 CiB2YXIgRGVidWdnZXJTY3JpcHQgPSB7fTsKIERlYnVnZ2VyU2NyaXB0Ll9icmVha3BvaW50cyA9 IHt9OwogCitEZWJ1Z2dlclNjcmlwdC5QYXVzZU9uRXhjZXB0aW9uc1N0YXRlID0geworICAgIERv bnRQYXVzZU9uRXhjZXB0aW9ucyA6IDAsCisgICAgUGF1c2VPbkFsbEV4Y2VwdGlvbnMgOiAxLAor ICAgIFBhdXNlT25VbmNhdWdodEV4Y2VwdGlvbnM6IDIKK307CisKK0RlYnVnZ2VyU2NyaXB0Ll9w YXVzZU9uRXhjZXB0aW9uc1N0YXRlID0gRGVidWdnZXJTY3JpcHQuUGF1c2VPbkV4Y2VwdGlvbnNT dGF0ZS5Eb250UGF1c2VPbkV4Y2VwdGlvbnM7CitEZWJ1Zy5jbGVhckJyZWFrT25FeGNlcHRpb24o KTsKK0RlYnVnLmNsZWFyQnJlYWtPblVuY2F1Z2h0RXhjZXB0aW9uKCk7CiAKIERlYnVnZ2VyU2Ny aXB0LmdldEFmdGVyQ29tcGlsZVNjcmlwdCA9IGZ1bmN0aW9uKGV4ZWNTdGF0ZSwgYXJncykKIHsK ICAgICByZXR1cm4gRGVidWdnZXJTY3JpcHQuX2Zvcm1hdFNjcmlwdChhcmdzLmV2ZW50RGF0YS5z Y3JpcHRfLnNjcmlwdF8pOwogfQogCi1EZWJ1Z2dlclNjcmlwdC5nZXRTY3JpcHRzID0gZnVuY3Rp b24oZXhlY1N0YXRlLCBhcmdzKQorRGVidWdnZXJTY3JpcHQuZ2V0U2NyaXB0cyA9IGZ1bmN0aW9u KGNvbnRleHREYXRhKQogewogICAgIHZhciBzY3JpcHRzID0gRGVidWcuc2NyaXB0cygpOwogICAg IHZhciByZXN1bHQgPSBbXTsKICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHNjcmlwdHMubGVuZ3Ro OyArK2kpIHsKLSAgICAgICAgcmVzdWx0LnB1c2goRGVidWdnZXJTY3JpcHQuX2Zvcm1hdFNjcmlw dChzY3JpcHRzW2ldKSk7CisgICAgICAgIHZhciBzY3JpcHQgPSBzY3JpcHRzW2ldOworICAgICAg ICBpZiAoY29udGV4dERhdGEgPT09IHNjcmlwdC5jb250ZXh0X2RhdGEpCisgICAgICAgICAgICBy ZXN1bHQucHVzaChEZWJ1Z2dlclNjcmlwdC5fZm9ybWF0U2NyaXB0KHNjcmlwdCkpOwogICAgIH0K ICAgICByZXR1cm4gcmVzdWx0OwogfQpAQCAtOTIsNiArMTAzLDI2IEBAIERlYnVnZ2VyU2NyaXB0 LnJlbW92ZUJyZWFrcG9pbnQgPSBmdW5jdGlvbihleGVjU3RhdGUsIGFyZ3MpCiAgICAgZGVsZXRl IERlYnVnZ2VyU2NyaXB0Ll9icmVha3BvaW50c1trZXldOwogfQogCitEZWJ1Z2dlclNjcmlwdC5w YXVzZU9uRXhjZXB0aW9uc1N0YXRlID0gZnVuY3Rpb24oKQoreworICAgIHJldHVybiBEZWJ1Z2dl clNjcmlwdC5fcGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZTsKK30KKworRGVidWdnZXJTY3JpcHQuc2V0 UGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSA9IGZ1bmN0aW9uKG5ld1N0YXRlKQoreworICAgIERlYnVn Z2VyU2NyaXB0Ll9wYXVzZU9uRXhjZXB0aW9uc1N0YXRlID0gbmV3U3RhdGU7CisKKyAgICBpZiAo RGVidWdnZXJTY3JpcHQuUGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZS5QYXVzZU9uQWxsRXhjZXB0aW9u cyA9PT0gbmV3U3RhdGUpCisgICAgICAgIERlYnVnLnNldEJyZWFrT25FeGNlcHRpb24oKTsKKyAg ICBlbHNlCisgICAgICAgIERlYnVnLmNsZWFyQnJlYWtPbkV4Y2VwdGlvbigpOworCisgICAgaWYg KERlYnVnZ2VyU2NyaXB0LlBhdXNlT25FeGNlcHRpb25zU3RhdGUuUGF1c2VPblVuY2F1Z2h0RXhj ZXB0aW9ucyA9PT0gbmV3U3RhdGUpCisgICAgICAgIERlYnVnLnNldEJyZWFrT25VbmNhdWdodEV4 Y2VwdGlvbigpOworICAgIGVsc2UKKyAgICAgICAgRGVidWcuY2xlYXJCcmVha09uVW5jYXVnaHRF eGNlcHRpb24oKTsKK30KKwogRGVidWdnZXJTY3JpcHQuY3VycmVudENhbGxGcmFtZSA9IGZ1bmN0 aW9uKGV4ZWNTdGF0ZSwgYXJncykKIHsKICAgICB2YXIgZnJhbWVDb3VudCA9IGV4ZWNTdGF0ZS5m cmFtZUNvdW50KCk7CkBAIC0xNjAsNyArMTkxLDcgQEAgRGVidWdnZXJTY3JpcHQuX2ZyYW1lTWly cm9yVG9KU0NhbGxGcmFtZSA9IGZ1bmN0aW9uKGZyYW1lTWlycm9yLCBjYWxsZXJGcmFtZSkKICAg ICB2YXIgc291cmNlSUQgPSBzY3JpcHQgJiYgc2NyaXB0LmlkKCk7CiAgICAgCiAgICAgLy8gR2V0 IGxpbmUgbnVtYmVyLgotICAgIHZhciBsaW5lID0gRGVidWdnZXJTY3JpcHQuX3Y4VG9Xd2Via2l0 TGluZU51bWJlcihmcmFtZU1pcnJvci5zb3VyY2VMaW5lKCkpOworICAgIHZhciBsaW5lID0gRGVi dWdnZXJTY3JpcHQuX3Y4VG9XZWJraXRMaW5lTnVtYmVyKGZyYW1lTWlycm9yLnNvdXJjZUxpbmUo KSk7CiAgICAgCiAgICAgLy8gR2V0IHRoaXMgb2JqZWN0LgogICAgIHZhciB0aGlzT2JqZWN0ID0g ZnJhbWVNaXJyb3IuZGV0YWlsc18ucmVjZWl2ZXIoKTsKQEAgLTIwMSw3ICsyMzIsNyBAQCBEZWJ1 Z2dlclNjcmlwdC5fd2Via2l0VG9WOExpbmVOdW1iZXIgPSBmdW5jdGlvbihsaW5lKQogICAgIHJl dHVybiBsaW5lIC0gMTsKIH07CiAKLURlYnVnZ2VyU2NyaXB0Ll92OFRvV3dlYmtpdExpbmVOdW1i ZXIgPSBmdW5jdGlvbihsaW5lKQorRGVidWdnZXJTY3JpcHQuX3Y4VG9XZWJraXRMaW5lTnVtYmVy ID0gZnVuY3Rpb24obGluZSkKIHsKICAgICByZXR1cm4gbGluZSArIDE7CiB9Owo=