25163 2009-04-13 15:30:50 -0700 Upstream fix for releasing v8 objects on worker thread termination in Chromium. 2009-04-14 11:17:14 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dimich webkit-unassigned dglazkov jianli oldest_to_newest 117360 0 dimich 2009-04-13 15:30:50 -0700 Get rid of using currentThread() in thread-specific destructors. Also, remove dom objects before detachThread() so they don't trip over currentThread() issue. 117363 1 29441 dimich 2009-04-13 15:38:12 -0700 Created attachment 29441 Proposed patch 117390 2 dimich 2009-04-13 17:41:19 -0700 Chromium side of CR, for more info: http://codereview.chromium.org/67061 117495 3 dimich 2009-04-14 11:17:14 -0700 Landed: http://trac.webkit.org/changeset/42504 29441 2009-04-13 15:38:12 -0700 2009-04-13 20:30:16 -0700 Proposed patch patch.txt text/plain 9082 dimich ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZGMwMzYwMC4uZjlmMjBhNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAwOS0wNC0xMyAgRG1pdHJ5IFRpdG92 ICA8ZGltaWNoQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjUxNjMKKyAgICAgICAgVXBzdHJlYW0gZml4IGZvciByZWxlYXNpbmcgdjggb2JqZWN0cyBvbiB3 b3JrZXIgdGhyZWFkIHRlcm1pbmF0aW9uIGluIENocm9taXVtLgorCisgICAgICAgICogYmluZGlu Z3MvdjgvVjhET01NYXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6ZG9tRGF0YUxpc3QpOiBOb3cg dXNlcyBWZWN0b3IgaW5zdGVhZCBvZiBIYXNoTWFwLgorICAgICAgICAoV2ViQ29yZTo6ZG9tRGF0 YUxpc3RNdXRleCk6CisgICAgICAgIChXZWJDb3JlOjpUaHJlYWRTcGVjaWZpY0RPTURhdGE6OlRo cmVhZFNwZWNpZmljRE9NRGF0YSk6ICByZW1vdmUgdXNhZ2Ugb2YgY3VycmVudFRocmVhZCgpOwor ICAgICAgICAoV2ViQ29yZTo6VGhyZWFkU3BlY2lmaWNET01EYXRhOjp+VGhyZWFkU3BlY2lmaWNE T01EYXRhKTogZGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpOb25NYWluVGhyZWFkU3BlY2lmaWNE T01EYXRhOjp+Tm9uTWFpblRocmVhZFNwZWNpZmljRE9NRGF0YSk6IG1vdmVkIGNhbGwgdG8gcmVt b3ZlQWxsRE9NT2JqZWN0c0luQ3VycmVudFRocmVhZCgpIHRvIH5Xb3JrZXJTY3JpcHRDb250cm9s bGVyLgorICAgICAgICAoV2ViQ29yZTo6aGFuZGxlV2Vha09iamVjdEluT3duaW5nVGhyZWFkKToK KyAgICAgICAgKFdlYkNvcmU6OmRlcmVmRGVsYXllZE9iamVjdHMpOgorICAgICAgICAoV2ViQ29y ZTo6cmVtb3ZlQWxsRE9NT2JqZWN0c0luQ3VycmVudFRocmVhZCk6IG5vdCBzdGF0aWMgYW55bW9y ZS4KKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOERPTU1hcC5oOgorICAgICAgICAqIGJpbmRpbmdz L3Y4L1dvcmtlckNvbnRleHRFeGVjdXRpb25Qcm94eS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpX b3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHk6OmRpc3Bvc2UpOiByZW1vdmVkIGNvZGUgdGhhdCBh dm9pZGVkIGR1YWwtZGVyZWZlcmVuY2Ugb2YgV29ya2VyQ29udGV4dC4KKyAgICAgICAgKFdlYkNv cmU6OldvcmtlckNvbnRleHRFeGVjdXRpb25Qcm94eTo6aW5pdENvbnRleHRJZk5lZWRlZCk6IHRo aXMgcmVmKCkgaXMgY291bnRlcmVkIGluIHJlbW92ZUFsbERPTU9iamVjdHNJbkN1cnJlbnRUaHJl YWQoKSwgd2hlbiB0aGUgV29ya2VyQ29udGV4dCBpcyByZW1vdmVkIGZyb20gdGhlIHY4IG1hcC4K KyAgICAgICAgKiBiaW5kaW5ncy92OC9Xb3JrZXJTY3JpcHRDb250cm9sbGVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OldvcmtlclNjcmlwdENvbnRyb2xsZXI6On5Xb3JrZXJTY3JpcHRDb250cm9s bGVyKToKKwogMjAwOS0wNC0xMyAgUGFtZWxhIEdyZWVuZSAgPHBhbUBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gRmlzaGVyLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9i aW5kaW5ncy92OC9WOERPTU1hcC5jcHAgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9NTWFwLmNw cAppbmRleCA3NTk1MjRiLi42MGNlMzJiIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L1Y4RE9NTWFwLmNwcAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9NTWFwLmNwcApAQCAt NDAsNiArNDAsNyBAQAogI2luY2x1ZGUgPHd0Zi9TdGRMaWJFeHRyYXMuaD4KICNpbmNsdWRlIDx3 dGYvVGhyZWFkaW5nLmg+CiAjaW5jbHVkZSA8d3RmL1RocmVhZFNwZWNpZmljLmg+CisjaW5jbHVk ZSA8d3RmL1ZlY3Rvci5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTEwMywyMyArMTA0 LDIxIEBAIHN0YXRpYyB2b2lkIHdlYWtTVkdPYmplY3RXaXRoQ29udGV4dENhbGxiYWNrKHY4OjpQ ZXJzaXN0ZW50PHY4OjpWYWx1ZT4gdjhPYmplY3QsCiAvLyBUaGUgaGVscGVyIGZ1bmN0aW9uIHdp bGwgYmUgc2NoZWR1bGVkIGJ5IHRoZSBHQyB0aHJlYWQgdG8gZ2V0IGNhbGxlZCBmcm9tIHRoZSBv d25pbmcgdGhyZWFkLgogc3RhdGljIHZvaWQgZGVyZWZEZWxheWVkT2JqZWN0c0luQ3VycmVudFRo cmVhZCh2b2lkKik7CiAKLS8vIFRoaXMgc2hvdWxkIGJlIGNhbGxlZCB0byByZW1vdmUgYWxsIERP TSBvYmplY3RzIGFzc29jaWF0ZWQgd2l0aCB0aGUgY3VycmVudCB0aHJlYWQgd2hlbiBpdCBpcyB0 ZWFyaW5nIGRvd24uCi1zdGF0aWMgdm9pZCByZW1vdmVBbGxET01PYmplY3RzSW5DdXJyZW50VGhy ZWFkKCk7Ci0KLS8vIEEgbWFwIGZyb20gYSB0aHJlYWQgSUQgdG8gdGhyZWFkJ3Mgc3BlY2lmaWMg ZGF0YS4KKy8vIEEgbGlzdCBvZiBhbGwgVGhyZWFkU3BlY2lmaWMgRE9NIERhdGEgb2JqZWN0cy4g VHJhdmVyc2VkIGR1cmluZyBHQyB0byBmaW5kIGEgdGhyZWFkLXNwZWNpZmljIG1hcCB0aGF0Cisv LyBjb250YWlucyB0aGUgb2JqZWN0IC0gc28gd2UgY2FuIHNjaGVkdWxlIHRoZSBvYmplY3QgdG8g YmUgZGVsZXRlZCBvbiB0aGUgdGhyZWFkIHdoaWNoIGNyZWF0ZWQgaXQuCiBjbGFzcyBUaHJlYWRT cGVjaWZpY0RPTURhdGE7Ci10eXBlZGVmIFdURjo6SGFzaE1hcDxXVEY6OlRocmVhZElkZW50aWZp ZXIsIFRocmVhZFNwZWNpZmljRE9NRGF0YSo+IERPTVRocmVhZE1hcDsKLXN0YXRpYyBET01UaHJl YWRNYXAmIGRvbVRocmVhZE1hcCgpCit0eXBlZGVmIFdURjo6VmVjdG9yPFRocmVhZFNwZWNpZmlj RE9NRGF0YSo+IERPTURhdGFMaXN0Oworc3RhdGljIERPTURhdGFMaXN0JiBkb21EYXRhTGlzdCgp CiB7Ci0gICAgREVGSU5FX1NUQVRJQ19MT0NBTChET01UaHJlYWRNYXAsIHN0YXRpY0RPTVRocmVh ZE1hcCwgKCkpOwotICAgIHJldHVybiBzdGF0aWNET01UaHJlYWRNYXA7CisgICAgREVGSU5FX1NU QVRJQ19MT0NBTChET01EYXRhTGlzdCwgc3RhdGljRE9NRGF0YUxpc3QsICgpKTsKKyAgICByZXR1 cm4gc3RhdGljRE9NRGF0YUxpc3Q7CiB9CiAKLS8vIE11dGV4IHRvIHByb3RlY3QgYWdhaW5zdCBj b25jdXJyZW50IGFjY2VzcyBvZiBkb21UaHJlYWRNYXAuCi1zdGF0aWMgV1RGOjpNdXRleCYgZG9t VGhyZWFkTWFwTXV0ZXgoKQorLy8gTXV0ZXggdG8gcHJvdGVjdCBhZ2FpbnN0IGNvbmN1cnJlbnQg YWNjZXNzIG9mIERPTURhdGFMaXN0Lgorc3RhdGljIFdURjo6TXV0ZXgmIGRvbURhdGFMaXN0TXV0 ZXgoKQogewotICAgIERFRklORV9TVEFUSUNfTE9DQUwoV1RGOjpNdXRleCwgc3RhdGljRE9NVGhy ZWFkTWFwTXV0ZXgsICgpKTsKLSAgICByZXR1cm4gc3RhdGljRE9NVGhyZWFkTWFwTXV0ZXg7Cisg ICAgREVGSU5FX1NUQVRJQ19MT0NBTChXVEY6Ok11dGV4LCBzdGF0aWNET01EYXRhTGlzdE11dGV4 LCAoKSk7CisgICAgcmV0dXJuIHN0YXRpY0RPTURhdGFMaXN0TXV0ZXg7CiB9CiAKIGNsYXNzIFRo cmVhZFNwZWNpZmljRE9NRGF0YSA6IE5vbmNvcHlhYmxlIHsKQEAgLTE2MSwxNCArMTYwLDE0IEBA IHB1YmxpYzoKICAgICAgICAgLCBtX2RlbGF5ZWRQcm9jZXNzaW5nU2NoZWR1bGVkKGZhbHNlKQog ICAgICAgICAsIG1faXNNYWluVGhyZWFkKFdURjo6aXNNYWluVGhyZWFkKCkpCiAgICAgewotICAg ICAgICBXVEY6Ok11dGV4TG9ja2VyIGxvY2tlcihkb21UaHJlYWRNYXBNdXRleCgpKTsKLSAgICAg ICAgZG9tVGhyZWFkTWFwKCkuc2V0KFdURjo6Y3VycmVudFRocmVhZCgpLCB0aGlzKTsKKyAgICAg ICAgV1RGOjpNdXRleExvY2tlciBsb2NrZXIoZG9tRGF0YUxpc3RNdXRleCgpKTsKKyAgICAgICAg ZG9tRGF0YUxpc3QoKS5hcHBlbmQodGhpcyk7CiAgICAgfQogCiAgICAgdmlydHVhbCB+VGhyZWFk U3BlY2lmaWNET01EYXRhKCkKICAgICB7Ci0gICAgICAgIFdURjo6TXV0ZXhMb2NrZXIgbG9ja2Vy KGRvbVRocmVhZE1hcE11dGV4KCkpOwotICAgICAgICBkb21UaHJlYWRNYXAoKS5yZW1vdmUoV1RG OjpjdXJyZW50VGhyZWFkKCkpOworICAgICAgICBXVEY6Ok11dGV4TG9ja2VyIGxvY2tlcihkb21E YXRhTGlzdE11dGV4KCkpOworICAgICAgICBkb21EYXRhTGlzdCgpLnJlbW92ZShkb21EYXRhTGlz dCgpLmZpbmQodGhpcykpOwogICAgIH0KIAogICAgIHZvaWQqIGdldERPTVdyYXBwZXJNYXAoRE9N V3JhcHBlck1hcFR5cGUgdHlwZSkKQEAgLTI0MSw4ICsyNDAsNiBAQCBwdWJsaWM6CiAgICAgLy8g V2UgYXNzdW1lIHRoYXQgYWxsIGNoaWxkIHRocmVhZHMgcnVubmluZyBWOCBpbnN0YW5jZXMgYXJl IGNyZWF0ZWQgYnkgV1RGLgogICAgIHZpcnR1YWwgfk5vbk1haW5UaHJlYWRTcGVjaWZpY0RPTURh dGEoKQogICAgIHsKLSAgICAgICAgcmVtb3ZlQWxsRE9NT2JqZWN0c0luQ3VycmVudFRocmVhZCgp OwotCiAgICAgICAgIGRlbGV0ZSBtX2RvbU5vZGVNYXA7CiAgICAgICAgIGRlbGV0ZSBtX2RvbU9i amVjdE1hcDsKICAgICAgICAgZGVsZXRlIG1fYWN0aXZlRG9tT2JqZWN0TWFwOwpAQCAtMzg1LDE2 ICszODIsMTAgQEAgc3RhdGljIHZvaWQgd2Vha1NWR09iamVjdFdpdGhDb250ZXh0Q2FsbGJhY2so djg6OlBlcnNpc3RlbnQ8djg6OlZhbHVlPiB2OE9iamVjdCwKIHRlbXBsYXRlPHR5cGVuYW1lIFQ+ CiBzdGF0aWMgdm9pZCBoYW5kbGVXZWFrT2JqZWN0SW5Pd25pbmdUaHJlYWQoVGhyZWFkU3BlY2lm aWNET01EYXRhOjpET01XcmFwcGVyTWFwVHlwZSBtYXBUeXBlLCBWOENsYXNzSW5kZXg6OlY4V3Jh cHBlclR5cGUgb2JqZWN0VHlwZSwgVCogb2JqZWN0KQogewotICAgIFdURjo6TXV0ZXhMb2NrZXIg bG9ja2VyKGRvbVRocmVhZE1hcE11dGV4KCkpOwotICAgIGZvciAodHlwZW5hbWUgRE9NVGhyZWFk TWFwOjppdGVyYXRvciBpdGVyKGRvbVRocmVhZE1hcCgpLmJlZ2luKCkpOyBpdGVyICE9IGRvbVRo cmVhZE1hcCgpLmVuZCgpOyArK2l0ZXIpIHsKLSAgICAgICAgV1RGOjpUaHJlYWRJZGVudGlmaWVy IHRocmVhZElEID0gaXRlci0+Zmlyc3Q7Ci0gICAgICAgIFRocmVhZFNwZWNpZmljRE9NRGF0YSog dGhyZWFkRGF0YSA9IGl0ZXItPnNlY29uZDsKLQotICAgICAgICAvLyBTa2lwIHRoZSBjdXJyZW50 IHRocmVhZCB0aGF0IGlzIEdDIHRocmVhZC4KLSAgICAgICAgaWYgKHRocmVhZElEID09IFdURjo6 Y3VycmVudFRocmVhZCgpKSB7Ci0gICAgICAgICAgICBBU1NFUlQoIXN0YXRpY19jYXN0PERPTVdy YXBwZXJNYXA8VD4qPih0aHJlYWREYXRhLT5nZXRET01XcmFwcGVyTWFwKG1hcFR5cGUpKS0+Y29u dGFpbnMob2JqZWN0KSk7Ci0gICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgfQorICAgIFdU Rjo6TXV0ZXhMb2NrZXIgbG9ja2VyKGRvbURhdGFMaXN0TXV0ZXgoKSk7CisgICAgRE9NRGF0YUxp c3QmIGxpc3QgPSBkb21EYXRhTGlzdCgpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbGlz dC5zaXplKCk7ICsraSkgeworICAgICAgICBUaHJlYWRTcGVjaWZpY0RPTURhdGEqIHRocmVhZERh dGEgPSBsaXN0W2ldOwogCiAgICAgICAgIFRocmVhZFNwZWNpZmljRE9NRGF0YTo6SW50ZXJuYWxE T01XcmFwcGVyTWFwPFQ+KiBkb21NYXAgPSBzdGF0aWNfY2FzdDxUaHJlYWRTcGVjaWZpY0RPTURh dGE6OkludGVybmFsRE9NV3JhcHBlck1hcDxUPio+KHRocmVhZERhdGEtPmdldERPTVdyYXBwZXJN YXAobWFwVHlwZSkpOwogICAgICAgICBpZiAoZG9tTWFwLT5jb250YWlucyhvYmplY3QpKSB7CkBA IC01MTQsNyArNTA1LDcgQEAgc3RhdGljIHZvaWQgZGVyZWZPYmplY3QoVjhDbGFzc0luZGV4OjpW OFdyYXBwZXJUeXBlIHR5cGUsIHZvaWQqIGRvbU9iamVjdCkKIAogc3RhdGljIHZvaWQgZGVyZWZE ZWxheWVkT2JqZWN0cygpCiB7Ci0gICAgV1RGOjpNdXRleExvY2tlciBsb2NrZXIoZG9tVGhyZWFk TWFwTXV0ZXgoKSk7CisgICAgV1RGOjpNdXRleExvY2tlciBsb2NrZXIoZG9tRGF0YUxpc3RNdXRl eCgpKTsKIAogICAgIGdldFRocmVhZFNwZWNpZmljRE9NRGF0YSgpLnNldERlbGF5ZWRQcm9jZXNz aW5nU2NoZWR1bGVkKGZhbHNlKTsKIApAQCAtNTczLDcgKzU2NCw3IEBAIHN0YXRpYyB2b2lkIHJl bW92ZUFsbERPTU9iamVjdHNJbkN1cnJlbnRUaHJlYWRIZWxwZXIoKQogI2VuZGlmCiB9CiAKLXN0 YXRpYyB2b2lkIHJlbW92ZUFsbERPTU9iamVjdHNJbkN1cnJlbnRUaHJlYWQoKQordm9pZCByZW1v dmVBbGxET01PYmplY3RzSW5DdXJyZW50VGhyZWFkKCkKIHsKICAgICAvLyBVc2UgdGhlIGxvY2tl ciBvbmx5IGlmIGl0IGhhcyBhbHJlYWR5IGJlZW4gaW52b2tlZCBiZWZvcmUsIGFzIGJ5IHdvcmtl ciB0aHJlYWQuCiAgICAgaWYgKHY4OjpMb2NrZXI6OklzQWN0aXZlKCkpIHsKZGlmZiAtLWdpdCBh L1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01NYXAuaCBiL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhE T01NYXAuaAppbmRleCA5MDlmYmNkLi4xYTMzMTg4IDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRp bmdzL3Y4L1Y4RE9NTWFwLmgKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTU1hcC5oCkBA IC01Myw2ICs1Myw5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAvLyBBIG1hcCBmcm9tIGEg RE9NIG9iamVjdCB0byBpdHMgSlMgd3JhcHBlciBmb3IgRE9NIG9iamVjdHMgd2hpY2ggY2FuIGhh dmUgcGVuZGluZyBhY3Rpdml0eS4KICAgICBET01XcmFwcGVyTWFwPHZvaWQ+JiBnZXRBY3RpdmVE T01PYmplY3RNYXAoKTsKIAorICAgIC8vIFRoaXMgc2hvdWxkIGJlIGNhbGxlZCB0byByZW1vdmUg YWxsIERPTSBvYmplY3RzIGFzc29jaWF0ZWQgd2l0aCB0aGUgY3VycmVudCB0aHJlYWQgd2hlbiBp dCBpcyB0ZWFyaW5nIGRvd24uCisgICAgdm9pZCByZW1vdmVBbGxET01PYmplY3RzSW5DdXJyZW50 VGhyZWFkKCk7CisKICNpZiBFTkFCTEUoU1ZHKQogICAgIC8vIEEgbWFwIGZvciBTVkdFbGVtZW50 SW5zdGFuY2VzIHRvIGl0cyBKUyB3cmFwcGVyLgogICAgIERPTVdyYXBwZXJNYXA8U1ZHRWxlbWVu dEluc3RhbmNlPiYgZ2V0RE9NU1ZHRWxlbWVudEluc3RhbmNlTWFwKCk7CmRpZmYgLS1naXQgYS9X ZWJDb3JlL2JpbmRpbmdzL3Y4L1dvcmtlckNvbnRleHRFeGVjdXRpb25Qcm94eS5jcHAgYi9XZWJD b3JlL2JpbmRpbmdzL3Y4L1dvcmtlckNvbnRleHRFeGVjdXRpb25Qcm94eS5jcHAKaW5kZXggNmFk ZmRiZi4uNjY0NTQzNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy92OC9Xb3JrZXJDb250 ZXh0RXhlY3V0aW9uUHJveHkuY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvdjgvV29ya2VyQ29u dGV4dEV4ZWN1dGlvblByb3h5LmNwcApAQCAtOTgsMTcgKzk4LDYgQEAgdm9pZCBXb3JrZXJDb250 ZXh0RXhlY3V0aW9uUHJveHk6OmRpc3Bvc2UoKQogICAgICAgICBtX2NvbnRleHQuRGlzcG9zZSgp OwogICAgICAgICBtX2NvbnRleHQuQ2xlYXIoKTsKICAgICB9Ci0KLSAgICAvLyBSZW1vdmUgdGhl IHdyYXBwaW5nIGJldHdlZW4gSlMgb2JqZWN0IGFuZCBET00gb2JqZWN0LiBUaGlzIGlzIGJlY2F1 c2UKLSAgICAvLyB0aGUgd29ya2VyIGNvbnRleHQgb2JqZWN0IGlzIGdvaW5nIHRvIGJlIGRpc3Bv c2VkIGltbWVkaWF0ZWx5IHdoZW4gYQotICAgIC8vIHdvcmtlciB0aHJlYWQgaXMgdGVhcmluZyBk b3duLiBXZSBkbyBub3Qgd2FudCB0byByZS1kZWxldGUgdGhlIHJlYWwgb2JqZWN0Ci0gICAgLy8g d2hlbiBKUyBvYmplY3QgaXMgZ2FyYmFnZSBjb2xsZWN0ZWQuCi0gICAgdjg6OkxvY2tlciBsb2Nr ZXI7Ci0gICAgdjg6OkhhbmRsZVNjb3BlIHNjb3BlOwotICAgIHY4OjpQZXJzaXN0ZW50PHY4OjpP YmplY3Q+IHdyYXBwZXIgPSBkb21PYmplY3RNYXAoKS5nZXQobV93b3JrZXJDb250ZXh0KTsKLSAg ICBpZiAoIXdyYXBwZXIuSXNFbXB0eSgpKQotICAgICAgICBWOFByb3h5OjpTZXRET01XcmFwcGVy KHdyYXBwZXIsIFY4Q2xhc3NJbmRleDo6SU5WQUxJRF9DTEFTU19JTkRFWCwgMCk7Ci0gICAgZG9t T2JqZWN0TWFwKCkuZm9yZ2V0KG1fd29ya2VyQ29udGV4dCk7CiB9CiAKIFdvcmtlckNvbnRleHRF eGVjdXRpb25Qcm94eSogV29ya2VyQ29udGV4dEV4ZWN1dGlvblByb3h5OjpyZXRyaWV2ZSgpCkBA IC0xNTMsNiArMTQyLDcgQEAgdm9pZCBXb3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHk6OmluaXRD b250ZXh0SWZOZWVkZWQoKQogICAgIFY4UHJveHk6OlNldERPTVdyYXBwZXIoanNXb3JrZXJDb250 ZXh0LCBWOENsYXNzSW5kZXg6OlRvSW50KFY4Q2xhc3NJbmRleDo6V09SS0VSQ09OVEVYVCksIG1f d29ya2VyQ29udGV4dCk7CiAKICAgICBWOFByb3h5OjpTZXRKU1dyYXBwZXJGb3JET01PYmplY3Qo bV93b3JrZXJDb250ZXh0LCB2ODo6UGVyc2lzdGVudDx2ODo6T2JqZWN0Pjo6TmV3KGpzV29ya2Vy Q29udGV4dCkpOworCW1fd29ya2VyQ29udGV4dC0+cmVmKCk7CiAKICAgICAvLyBJbnNlcnQgdGhl IG9iamVjdCBpbnN0YW5jZSBhcyB0aGUgcHJvdG90eXBlIG9mIHRoZSBzaGFkb3cgb2JqZWN0Lgog ICAgIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gZ2xvYmFsT2JqZWN0ID0gbV9jb250ZXh0LT5HbG9i YWwoKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvdjgvV29ya2VyU2NyaXB0Q29udHJv bGxlci5jcHAgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1dvcmtlclNjcmlwdENvbnRyb2xsZXIuY3Bw CmluZGV4IDg1YmVlMGEuLjc5MzIyYjcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3Mvdjgv V29ya2VyU2NyaXB0Q29udHJvbGxlci5jcHAKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9Xb3Jr ZXJTY3JpcHRDb250cm9sbGVyLmNwcApAQCAtNTUsNiArNTUsNyBAQCBXb3JrZXJTY3JpcHRDb250 cm9sbGVyOjpXb3JrZXJTY3JpcHRDb250cm9sbGVyKFdvcmtlckNvbnRleHQqIHdvcmtlckNvbnRl eHQpCiAKIFdvcmtlclNjcmlwdENvbnRyb2xsZXI6On5Xb3JrZXJTY3JpcHRDb250cm9sbGVyKCkK IHsKKyAgICByZW1vdmVBbGxET01PYmplY3RzSW5DdXJyZW50VGhyZWFkKCk7CiB9CiAKIFNjcmlw dFZhbHVlIFdvcmtlclNjcmlwdENvbnRyb2xsZXI6OmV2YWx1YXRlKGNvbnN0IFNjcmlwdFNvdXJj ZUNvZGUmIHNvdXJjZUNvZGUpCg==