30780 2009-10-26 10:06:29 -0700 [v8] Make Chromium survive http://trac.webkit.org/changeset/50037 2009-10-26 10:35:35 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 antonm webkit-unassigned commit-queue dglazkov sam tony oldest_to_newest 157807 0 antonm 2009-10-26 10:06:29 -0700 http://trac.webkit.org/changeset/50037 make two method HTMLOptionsCollection custom thus making Chromium failing to build. 157809 1 41874 antonm 2009-10-26 10:10:42 -0700 Created attachment 41874 First take 157812 2 41874 dglazkov 2009-10-26 10:25:40 -0700 Comment on attachment 41874 First take r=me. Thanks for working on this! The gardeners thank you. 157813 3 tony 2009-10-26 10:26:40 -0700 Thanks! I was just starting to implement these. 157820 4 41874 commit-queue 2009-10-26 10:35:28 -0700 Comment on attachment 41874 First take Clearing flags on attachment: 41874 Committed r50073: <http://trac.webkit.org/changeset/50073> 157821 5 commit-queue 2009-10-26 10:35:35 -0700 All reviewed patches have been landed. Closing bug. 41874 2009-10-26 10:10:42 -0700 2009-10-26 10:35:27 -0700 First take WebCore.patch text/plain 11085 antonm SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MDA3MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjUgQEAKKzIwMDktMTAtMjYgIEFudG9uIE11aGluICA8YW50b25tQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBV bmJyZWFrIENocm9taXVtIGJ1aWxkOiB0aGF0IHJlcXVpcmVzIGFkZGluZyBjdXN0b20gaW1wbGVt ZW50YXRpb25zCisgICAgICAgIGZvciBIVE1MT3B0aW9uc0NvbGxlY3Rpb24ncyBpdGVtIGFuZCBu YW1lZEl0ZW0uICBLZWVwIHY4IGJpbmRpbmcKKyAgICAgICAgY2xvc2UgdG8gSlNDIGJpbmRpbmdz IGFzIHdlbGwuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0zMDc4MAorCisgICAgICAgICogYmluZGluZ3MvdjgvVjhDb2xsZWN0aW9uLmg6CisgICAgICAg IChXZWJDb3JlOjpnZXROYW1lZEl0ZW1zRnJvbUNvbGxlY3Rpb24pOgorICAgICAgICAoV2ViQ29y ZTo6Z2V0SXRlbUZyb21Db2xsZWN0aW9uKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9jdXN0b20v VjhDdXN0b21CaW5kaW5nLmg6CisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTEFs bENvbGxlY3Rpb25DdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TkFNRURfUFJPUEVSVFlf R0VUVEVSKToKKyAgICAgICAgKFdlYkNvcmU6OkNBTExCQUNLX0ZVTkNfREVDTCk6CisgICAgICAg ICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTENvbGxlY3Rpb25DdXN0b20uY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TkFNRURfUFJPUEVSVFlfR0VUVEVSKToKKyAgICAgICAgKFdlYkNvcmU6OkNB TExCQUNLX0ZVTkNfREVDTCk6CisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTE9w dGlvbnNDb2xsZWN0aW9uQ3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNBTExCQUNLX0ZV TkNfREVDTCk6CisKIDIwMDktMTAtMjYgIEtlbGx5IE5vcnRvbiAgPGtub3J0b25AZ29vZ2xlLmNv bT4KIAogICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpJbmRleDogV2ViQ29yZS9i aW5kaW5ncy92OC9WOENvbGxlY3Rpb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdz L3Y4L1Y4Q29sbGVjdGlvbi5oCShyZXZpc2lvbiA1MDAyNykKKysrIFdlYkNvcmUvYmluZGluZ3Mv djgvVjhDb2xsZWN0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTM0LDYgKzM0LDcgQEAKICNpbmNs dWRlICJIVE1MRm9ybUVsZW1lbnQuaCIKICNpbmNsdWRlICJIVE1MU2VsZWN0RWxlbWVudC5oIgog I2luY2x1ZGUgIlY4QmluZGluZy5oIgorI2luY2x1ZGUgIlY4TmFtZWROb2Rlc0NvbGxlY3Rpb24u aCIKICNpbmNsdWRlICJWOFByb3h5LmgiCiAjaW5jbHVkZSA8djguaD4KIApAQCAtMjEwLDYgKzIx MSwzOCBAQAogCiAgICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHRvT3B0aW9uc0NvbGxlY3Rpb25T ZXR0ZXIodWludDMyX3QgaW5kZXgsIHY4OjpIYW5kbGU8djg6OlZhbHVlPiwgSFRNTFNlbGVjdEVs ZW1lbnQqKTsKIAorICAgIHRlbXBsYXRlPGNsYXNzIENvbGxlY3Rpb24+CisgICAgdjg6OkhhbmRs ZTx2ODo6VmFsdWU+IGdldE5hbWVkSXRlbXNGcm9tQ29sbGVjdGlvbihDb2xsZWN0aW9uKiBjb2xs ZWN0aW9uLCBBdG9taWNTdHJpbmcgbmFtZSkKKyAgICB7CisgICAgICAgIFZlY3RvcjxSZWZQdHI8 Tm9kZT4gPiBuYW1lZEl0ZW1zOworICAgICAgICBjb2xsZWN0aW9uLT5uYW1lZEl0ZW1zKG5hbWUs IG5hbWVkSXRlbXMpOworCisgICAgICAgIGlmICghbmFtZWRJdGVtcy5zaXplKCkpCisgICAgICAg ICAgICByZXR1cm4gdjg6OkhhbmRsZTx2ODo6VmFsdWU+KCk7CisKKyAgICAgICAgaWYgKG5hbWVk SXRlbXMuc2l6ZSgpID09IDEpCisgICAgICAgICAgICByZXR1cm4gVjhET01XcmFwcGVyOjpjb252 ZXJ0Tm9kZVRvVjhPYmplY3QobmFtZWRJdGVtcy5hdCgwKS5yZWxlYXNlKCkpOworCisgICAgICAg IE5vZGVMaXN0KiBsaXN0ID0gbmV3IFY4TmFtZWROb2Rlc0NvbGxlY3Rpb24obmFtZWRJdGVtcyk7 CisgICAgICAgIHJldHVybiBWOERPTVdyYXBwZXI6OmNvbnZlcnRUb1Y4T2JqZWN0KFY4Q2xhc3NJ bmRleDo6Tk9ERUxJU1QsIGxpc3QpOworICAgIH0KKworICAgIHRlbXBsYXRlPGNsYXNzIENvbGxl Y3Rpb24+CisgICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGdldEl0ZW1Gcm9tQ29sbGVjdGlvbihD b2xsZWN0aW9uKiBjb2xsZWN0aW9uLCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gYXJndW1lbnQpCisg ICAgeworICAgICAgICB2ODo6TG9jYWw8djg6OlVpbnQzMj4gaW5kZXggPSBhcmd1bWVudC0+VG9B cnJheUluZGV4KCk7CisgICAgICAgIGlmIChpbmRleC5Jc0VtcHR5KCkpIHsKKyAgICAgICAgICAg IHY4OjpIYW5kbGU8djg6OlZhbHVlPiByZXN1bHQgPSBnZXROYW1lZEl0ZW1zRnJvbUNvbGxlY3Rp b24oY29sbGVjdGlvbiwgdG9XZWJDb3JlU3RyaW5nKGFyZ3VtZW50LT5Ub1N0cmluZygpKSk7CisK KyAgICAgICAgICAgIGlmIChyZXN1bHQuSXNFbXB0eSgpKQorICAgICAgICAgICAgICAgIHJldHVy biB2ODo6VW5kZWZpbmVkKCk7CisKKyAgICAgICAgICAgIHJldHVybiByZXN1bHQ7CisgICAgICAg IH0KKworICAgICAgICBSZWZQdHI8Tm9kZT4gcmVzdWx0ID0gY29sbGVjdGlvbi0+aXRlbShpbmRl eC0+VWludDMyVmFsdWUoKSk7CisgICAgICAgIHJldHVybiBWOERPTVdyYXBwZXI6OmNvbnZlcnRO b2RlVG9WOE9iamVjdChyZXN1bHQucmVsZWFzZSgpKTsKKyAgICB9CiB9IC8vIG5hbWVzcGFjZSBX ZWJDb3JlCiAKICNlbmRpZiAvLyBWOENvbGxlY3Rpb25faApJbmRleDogV2ViQ29yZS9iaW5kaW5n cy92OC9jdXN0b20vVjhIVE1MQWxsQ29sbGVjdGlvbkN1c3RvbS5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhIVE1MQWxsQ29sbGVjdGlvbkN1c3RvbS5jcHAJ KHJldmlzaW9uIDUwMDI3KQorKysgV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhIVE1MQWxs Q29sbGVjdGlvbkN1c3RvbS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMyLDQzICszMiwxMiBAQAog I2luY2x1ZGUgIkhUTUxBbGxDb2xsZWN0aW9uLmgiCiAKICNpbmNsdWRlICJWOEJpbmRpbmcuaCIK KyNpbmNsdWRlICJWOENvbGxlY3Rpb24uaCIKICNpbmNsdWRlICJWOEN1c3RvbUJpbmRpbmcuaCIK LSNpbmNsdWRlICJWOE5hbWVkTm9kZXNDb2xsZWN0aW9uLmgiCiAjaW5jbHVkZSAiVjhQcm94eS5o IgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLXN0YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4g Z2V0TmFtZWRJdGVtcyhIVE1MQWxsQ29sbGVjdGlvbiogY29sbGVjdGlvbiwgQXRvbWljU3RyaW5n IG5hbWUpCi17Ci0gICAgVmVjdG9yPFJlZlB0cjxOb2RlPiA+IG5hbWVkSXRlbXM7Ci0gICAgY29s bGVjdGlvbi0+bmFtZWRJdGVtcyhuYW1lLCBuYW1lZEl0ZW1zKTsKLQotICAgIGlmICghbmFtZWRJ dGVtcy5zaXplKCkpCi0gICAgICAgIHJldHVybiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4oKTsKLQot ICAgIGlmIChuYW1lZEl0ZW1zLnNpemUoKSA9PSAxKQotICAgICAgICByZXR1cm4gVjhET01XcmFw cGVyOjpjb252ZXJ0Tm9kZVRvVjhPYmplY3QobmFtZWRJdGVtcy5hdCgwKS5yZWxlYXNlKCkpOwot Ci0gICAgTm9kZUxpc3QqIGxpc3QgPSBuZXcgVjhOYW1lZE5vZGVzQ29sbGVjdGlvbihuYW1lZEl0 ZW1zKTsKLSAgICByZXR1cm4gVjhET01XcmFwcGVyOjpjb252ZXJ0VG9WOE9iamVjdChWOENsYXNz SW5kZXg6Ok5PREVMSVNULCBsaXN0KTsKLX0KLQotc3RhdGljIHY4OjpIYW5kbGU8djg6OlZhbHVl PiBnZXRJdGVtKEhUTUxBbGxDb2xsZWN0aW9uKiBjb2xsZWN0aW9uLCB2ODo6SGFuZGxlPHY4OjpW YWx1ZT4gYXJndW1lbnQpCi17Ci0gICAgdjg6OkxvY2FsPHY4OjpVaW50MzI+IGluZGV4ID0gYXJn dW1lbnQtPlRvQXJyYXlJbmRleCgpOwotICAgIGlmIChpbmRleC5Jc0VtcHR5KCkpIHsKLSAgICAg ICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHJlc3VsdCA9IGdldE5hbWVkSXRlbXMoY29sbGVjdGlv biwgdG9XZWJDb3JlU3RyaW5nKGFyZ3VtZW50LT5Ub1N0cmluZygpKSk7Ci0KLSAgICAgICAgaWYg KHJlc3VsdC5Jc0VtcHR5KCkpCi0gICAgICAgICAgICByZXR1cm4gdjg6OlVuZGVmaW5lZCgpOwot Ci0gICAgICAgIHJldHVybiByZXN1bHQ7Ci0gICAgfQotCi0gICAgUmVmUHRyPE5vZGU+IHJlc3Vs dCA9IGNvbGxlY3Rpb24tPml0ZW0oaW5kZXgtPlVpbnQzMlZhbHVlKCkpOwotICAgIHJldHVybiBW OERPTVdyYXBwZXI6OmNvbnZlcnROb2RlVG9WOE9iamVjdChyZXN1bHQucmVsZWFzZSgpKTsKLX0K LQogTkFNRURfUFJPUEVSVFlfR0VUVEVSKEhUTUxBbGxDb2xsZWN0aW9uKQogewogICAgIElOQ19T VEFUUygiRE9NLkhUTUxBbGxDb2xsZWN0aW9uLk5hbWVkUHJvcGVydHlHZXR0ZXIiKTsKQEAgLTg1 LDIxICs1NCwyMSBAQAogCiAgICAgLy8gRmluYWxseSwgc2VhcmNoIHRoZSBET00gc3RydWN0dXJl LgogICAgIEhUTUxBbGxDb2xsZWN0aW9uKiBpbXAgPSBWOERPTVdyYXBwZXI6OmNvbnZlcnRUb05h dGl2ZU9iamVjdDxIVE1MQWxsQ29sbGVjdGlvbj4oVjhDbGFzc0luZGV4OjpIVE1MQUxMQ09MTEVD VElPTiwgaW5mby5Ib2xkZXIoKSk7Ci0gICAgcmV0dXJuIGdldE5hbWVkSXRlbXMoaW1wLCB2OFN0 cmluZ1RvQXRvbWljV2ViQ29yZVN0cmluZyhuYW1lKSk7CisgICAgcmV0dXJuIGdldE5hbWVkSXRl bXNGcm9tQ29sbGVjdGlvbihpbXAsIHY4U3RyaW5nVG9BdG9taWNXZWJDb3JlU3RyaW5nKG5hbWUp KTsKIH0KIAogQ0FMTEJBQ0tfRlVOQ19ERUNMKEhUTUxBbGxDb2xsZWN0aW9uSXRlbSkKIHsKICAg ICBJTkNfU1RBVFMoIkRPTS5IVE1MQWxsQ29sbGVjdGlvbi5pdGVtKCkiKTsKICAgICBIVE1MQWxs Q29sbGVjdGlvbiogaW1wID0gVjhET01XcmFwcGVyOjpjb252ZXJ0VG9OYXRpdmVPYmplY3Q8SFRN TEFsbENvbGxlY3Rpb24+KFY4Q2xhc3NJbmRleDo6SFRNTEFMTENPTExFQ1RJT04sIGFyZ3MuSG9s ZGVyKCkpOwotICAgIHJldHVybiBnZXRJdGVtKGltcCwgYXJnc1swXSk7CisgICAgcmV0dXJuIGdl dEl0ZW1Gcm9tQ29sbGVjdGlvbihpbXAsIGFyZ3NbMF0pOwogfQogCiBDQUxMQkFDS19GVU5DX0RF Q0woSFRNTEFsbENvbGxlY3Rpb25OYW1lZEl0ZW0pCiB7CiAgICAgSU5DX1NUQVRTKCJET00uSFRN TEFsbENvbGxlY3Rpb24ubmFtZWRJdGVtKCkiKTsKICAgICBIVE1MQWxsQ29sbGVjdGlvbiogaW1w ID0gVjhET01XcmFwcGVyOjpjb252ZXJ0VG9OYXRpdmVPYmplY3Q8SFRNTEFsbENvbGxlY3Rpb24+ KFY4Q2xhc3NJbmRleDo6SFRNTEFMTENPTExFQ1RJT04sIGFyZ3MuSG9sZGVyKCkpOwotICAgIHY4 OjpIYW5kbGU8djg6OlZhbHVlPiByZXN1bHQgPSBnZXROYW1lZEl0ZW1zKGltcCwgdG9XZWJDb3Jl U3RyaW5nKGFyZ3NbMF0pKTsKKyAgICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gcmVzdWx0ID0gZ2V0 TmFtZWRJdGVtc0Zyb21Db2xsZWN0aW9uKGltcCwgdG9XZWJDb3JlU3RyaW5nKGFyZ3NbMF0pKTsK IAogICAgIGlmIChyZXN1bHQuSXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gdjg6OlVuZGVmaW5l ZCgpOwpAQCAtMTE2LDcgKzg1LDcgQEAKICAgICBIVE1MQWxsQ29sbGVjdGlvbiogaW1wID0gVjhE T01XcmFwcGVyOjpjb252ZXJ0VG9OYXRpdmVPYmplY3Q8SFRNTEFsbENvbGxlY3Rpb24+KFY4Q2xh c3NJbmRleDo6SFRNTEFMTENPTExFQ1RJT04sIGFyZ3MuSG9sZGVyKCkpOwogCiAgICAgaWYgKGFy Z3MuTGVuZ3RoKCkgPT0gMSkKLSAgICAgICAgcmV0dXJuIGdldEl0ZW0oaW1wLCBhcmdzWzBdKTsK KyAgICAgICAgcmV0dXJuIGdldEl0ZW1Gcm9tQ29sbGVjdGlvbihpbXAsIGFyZ3NbMF0pOwogCiAg ICAgLy8gSWYgdGhlcmUgaXMgYSBzZWNvbmQgYXJndW1lbnQgaXQgaXMgdGhlIGluZGV4IG9mIHRo ZSBpdGVtIHdlIHdhbnQuCiAgICAgU3RyaW5nIG5hbWUgPSB0b1dlYkNvcmVTdHJpbmcoYXJnc1sw XSk7CkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxDb2xsZWN0aW9uQ3Vz dG9tLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxD b2xsZWN0aW9uQ3VzdG9tLmNwcAkocmV2aXNpb24gNTAwMjcpCisrKyBXZWJDb3JlL2JpbmRpbmdz L3Y4L2N1c3RvbS9WOEhUTUxDb2xsZWN0aW9uQ3VzdG9tLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MzIsNDMgKzMyLDEyIEBACiAjaW5jbHVkZSAiSFRNTENvbGxlY3Rpb24uaCIKIAogI2luY2x1ZGUg IlY4QmluZGluZy5oIgorI2luY2x1ZGUgIlY4Q29sbGVjdGlvbi5oIgogI2luY2x1ZGUgIlY4Q3Vz dG9tQmluZGluZy5oIgotI2luY2x1ZGUgIlY4TmFtZWROb2Rlc0NvbGxlY3Rpb24uaCIKICNpbmNs dWRlICJWOFByb3h5LmgiCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotc3RhdGljIHY4OjpIYW5k bGU8djg6OlZhbHVlPiBnZXROYW1lZEl0ZW1zKEhUTUxDb2xsZWN0aW9uKiBjb2xsZWN0aW9uLCBB dG9taWNTdHJpbmcgbmFtZSkKLXsKLSAgICBWZWN0b3I8UmVmUHRyPE5vZGU+ID4gbmFtZWRJdGVt czsKLSAgICBjb2xsZWN0aW9uLT5uYW1lZEl0ZW1zKG5hbWUsIG5hbWVkSXRlbXMpOwotCi0gICAg aWYgKCFuYW1lZEl0ZW1zLnNpemUoKSkKLSAgICAgICAgcmV0dXJuIHY4OjpIYW5kbGU8djg6OlZh bHVlPigpOwotCi0gICAgaWYgKG5hbWVkSXRlbXMuc2l6ZSgpID09IDEpCi0gICAgICAgIHJldHVy biBWOERPTVdyYXBwZXI6OmNvbnZlcnROb2RlVG9WOE9iamVjdChuYW1lZEl0ZW1zLmF0KDApLnJl bGVhc2UoKSk7Ci0KLSAgICBOb2RlTGlzdCogbGlzdCA9IG5ldyBWOE5hbWVkTm9kZXNDb2xsZWN0 aW9uKG5hbWVkSXRlbXMpOwotICAgIHJldHVybiBWOERPTVdyYXBwZXI6OmNvbnZlcnRUb1Y4T2Jq ZWN0KFY4Q2xhc3NJbmRleDo6Tk9ERUxJU1QsIGxpc3QpOwotfQotCi1zdGF0aWMgdjg6OkhhbmRs ZTx2ODo6VmFsdWU+IGdldEl0ZW0oSFRNTENvbGxlY3Rpb24qIGNvbGxlY3Rpb24sIHY4OjpIYW5k bGU8djg6OlZhbHVlPiBhcmd1bWVudCkKLXsKLSAgICB2ODo6TG9jYWw8djg6OlVpbnQzMj4gaW5k ZXggPSBhcmd1bWVudC0+VG9BcnJheUluZGV4KCk7Ci0gICAgaWYgKGluZGV4LklzRW1wdHkoKSkg ewotICAgICAgICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gcmVzdWx0ID0gZ2V0TmFtZWRJdGVtcyhj b2xsZWN0aW9uLCB0b1dlYkNvcmVTdHJpbmcoYXJndW1lbnQtPlRvU3RyaW5nKCkpKTsKLQotICAg ICAgICBpZiAocmVzdWx0LklzRW1wdHkoKSkKLSAgICAgICAgICAgIHJldHVybiB2ODo6VW5kZWZp bmVkKCk7Ci0KLSAgICAgICAgcmV0dXJuIHJlc3VsdDsKLSAgICB9Ci0KLSAgICBSZWZQdHI8Tm9k ZT4gcmVzdWx0ID0gY29sbGVjdGlvbi0+aXRlbShpbmRleC0+VWludDMyVmFsdWUoKSk7Ci0gICAg cmV0dXJuIFY4RE9NV3JhcHBlcjo6Y29udmVydE5vZGVUb1Y4T2JqZWN0KHJlc3VsdC5yZWxlYXNl KCkpOwotfQotCiBOQU1FRF9QUk9QRVJUWV9HRVRURVIoSFRNTENvbGxlY3Rpb24pCiB7CiAgICAg SU5DX1NUQVRTKCJET00uSFRNTENvbGxlY3Rpb24uTmFtZWRQcm9wZXJ0eUdldHRlciIpOwpAQCAt ODUsMjEgKzU0LDIxIEBACiAKICAgICAvLyBGaW5hbGx5LCBzZWFyY2ggdGhlIERPTSBzdHJ1Y3R1 cmUuCiAgICAgSFRNTENvbGxlY3Rpb24qIGltcCA9IFY4RE9NV3JhcHBlcjo6Y29udmVydFRvTmF0 aXZlT2JqZWN0PEhUTUxDb2xsZWN0aW9uPihWOENsYXNzSW5kZXg6OkhUTUxDT0xMRUNUSU9OLCBp bmZvLkhvbGRlcigpKTsKLSAgICByZXR1cm4gZ2V0TmFtZWRJdGVtcyhpbXAsIHY4U3RyaW5nVG9B dG9taWNXZWJDb3JlU3RyaW5nKG5hbWUpKTsKKyAgICByZXR1cm4gZ2V0TmFtZWRJdGVtc0Zyb21D b2xsZWN0aW9uKGltcCwgdjhTdHJpbmdUb0F0b21pY1dlYkNvcmVTdHJpbmcobmFtZSkpOwogfQog CiBDQUxMQkFDS19GVU5DX0RFQ0woSFRNTENvbGxlY3Rpb25JdGVtKQogewogICAgIElOQ19TVEFU UygiRE9NLkhUTUxDb2xsZWN0aW9uLml0ZW0oKSIpOwogICAgIEhUTUxDb2xsZWN0aW9uKiBpbXAg PSBWOERPTVdyYXBwZXI6OmNvbnZlcnRUb05hdGl2ZU9iamVjdDxIVE1MQ29sbGVjdGlvbj4oVjhD bGFzc0luZGV4OjpIVE1MQ09MTEVDVElPTiwgYXJncy5Ib2xkZXIoKSk7Ci0gICAgcmV0dXJuIGdl dEl0ZW0oaW1wLCBhcmdzWzBdKTsKKyAgICByZXR1cm4gZ2V0SXRlbUZyb21Db2xsZWN0aW9uKGlt cCwgYXJnc1swXSk7CiB9CiAKIENBTExCQUNLX0ZVTkNfREVDTChIVE1MQ29sbGVjdGlvbk5hbWVk SXRlbSkKIHsKICAgICBJTkNfU1RBVFMoIkRPTS5IVE1MQ29sbGVjdGlvbi5uYW1lZEl0ZW0oKSIp OwogICAgIEhUTUxDb2xsZWN0aW9uKiBpbXAgPSBWOERPTVdyYXBwZXI6OmNvbnZlcnRUb05hdGl2 ZU9iamVjdDxIVE1MQ29sbGVjdGlvbj4oVjhDbGFzc0luZGV4OjpIVE1MQ09MTEVDVElPTiwgYXJn cy5Ib2xkZXIoKSk7Ci0gICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHJlc3VsdCA9IGdldE5hbWVk SXRlbXMoaW1wLCB0b1dlYkNvcmVTdHJpbmcoYXJnc1swXSkpOworICAgIHY4OjpIYW5kbGU8djg6 OlZhbHVlPiByZXN1bHQgPSBnZXROYW1lZEl0ZW1zRnJvbUNvbGxlY3Rpb24oaW1wLCB0b1dlYkNv cmVTdHJpbmcoYXJnc1swXSkpOwogCiAgICAgaWYgKHJlc3VsdC5Jc0VtcHR5KCkpCiAgICAgICAg IHJldHVybiB2ODo6VW5kZWZpbmVkKCk7CkBAIC0xMTYsNyArODUsNyBAQAogICAgIEhUTUxDb2xs ZWN0aW9uKiBpbXAgPSBWOERPTVdyYXBwZXI6OmNvbnZlcnRUb05hdGl2ZU9iamVjdDxIVE1MQ29s bGVjdGlvbj4oVjhDbGFzc0luZGV4OjpIVE1MQ09MTEVDVElPTiwgYXJncy5Ib2xkZXIoKSk7CiAK ICAgICBpZiAoYXJncy5MZW5ndGgoKSA9PSAxKQotICAgICAgICByZXR1cm4gZ2V0SXRlbShpbXAs IGFyZ3NbMF0pOworICAgICAgICByZXR1cm4gZ2V0SXRlbUZyb21Db2xsZWN0aW9uKGltcCwgYXJn c1swXSk7CiAKICAgICAvLyBJZiB0aGVyZSBpcyBhIHNlY29uZCBhcmd1bWVudCBpdCBpcyB0aGUg aW5kZXggb2YgdGhlIGl0ZW0gd2Ugd2FudC4KICAgICBTdHJpbmcgbmFtZSA9IHRvV2ViQ29yZVN0 cmluZyhhcmdzWzBdKTsKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Q3VzdG9t QmluZGluZy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Q3Vz dG9tQmluZGluZy5oCShyZXZpc2lvbiA1MDAyNykKKysrIFdlYkNvcmUvYmluZGluZ3MvdjgvY3Vz dG9tL1Y4Q3VzdG9tQmluZGluZy5oCSh3b3JraW5nIGNvcHkpCkBAIC0yODAsNiArMjgwLDggQEAK IAogICAgICAgICBERUNMQVJFX1BST1BFUlRZX0FDQ0VTU09SX1NFVFRFUihBdHRyVmFsdWUpOwog CisgICAgICAgIERFQ0xBUkVfQ0FMTEJBQ0soSFRNTE9wdGlvbnNDb2xsZWN0aW9uSXRlbSk7Cisg ICAgICAgIERFQ0xBUkVfQ0FMTEJBQ0soSFRNTE9wdGlvbnNDb2xsZWN0aW9uTmFtZWRJdGVtKTsK ICAgICAgICAgREVDTEFSRV9QUk9QRVJUWV9BQ0NFU1NPUihIVE1MT3B0aW9uc0NvbGxlY3Rpb25M ZW5ndGgpOwogCiAgICAgICAgIERFQ0xBUkVfQ0FMTEJBQ0soSFRNTElucHV0RWxlbWVudFNldFNl bGVjdGlvblJhbmdlKTsKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTE9w dGlvbnNDb2xsZWN0aW9uQ3VzdG9tLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdz L3Y4L2N1c3RvbS9WOEhUTUxPcHRpb25zQ29sbGVjdGlvbkN1c3RvbS5jcHAJKHJldmlzaW9uIDUw MDI3KQorKysgV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhIVE1MT3B0aW9uc0NvbGxlY3Rp b25DdXN0b20uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzMsNCArMTMzLDIzIEBACiAgICAgcmV0 dXJuIHRvT3B0aW9uc0NvbGxlY3Rpb25TZXR0ZXIoaW5kZXgsIHZhbHVlLCBiYXNlKTsKIH0KIAor Q0FMTEJBQ0tfRlVOQ19ERUNMKEhUTUxPcHRpb25zQ29sbGVjdGlvbkl0ZW0pCit7CisgICAgSU5D X1NUQVRTKCJET00uSFRNTE9wdGlvbnNDb2xsZWN0aW9uLml0ZW0oKSIpOworICAgIEhUTUxPcHRp b25zQ29sbGVjdGlvbiogaW1wID0gVjhET01XcmFwcGVyOjpjb252ZXJ0VG9OYXRpdmVPYmplY3Q8 SFRNTE9wdGlvbnNDb2xsZWN0aW9uPihWOENsYXNzSW5kZXg6OkhUTUxPUFRJT05TQ09MTEVDVElP TiwgYXJncy5Ib2xkZXIoKSk7CisgICAgcmV0dXJuIGdldEl0ZW1Gcm9tQ29sbGVjdGlvbihpbXAs IGFyZ3NbMF0pOworfQorCitDQUxMQkFDS19GVU5DX0RFQ0woSFRNTE9wdGlvbnNDb2xsZWN0aW9u TmFtZWRJdGVtKQoreworICAgIElOQ19TVEFUUygiRE9NLkhUTUxPcHRpb25zQ29sbGVjdGlvbi5u YW1lZEl0ZW0oKSIpOworICAgIEhUTUxPcHRpb25zQ29sbGVjdGlvbiogaW1wID0gVjhET01XcmFw cGVyOjpjb252ZXJ0VG9OYXRpdmVPYmplY3Q8SFRNTE9wdGlvbnNDb2xsZWN0aW9uPihWOENsYXNz SW5kZXg6OkhUTUxPUFRJT05TQ09MTEVDVElPTiwgYXJncy5Ib2xkZXIoKSk7CisgICAgdjg6Okhh bmRsZTx2ODo6VmFsdWU+IHJlc3VsdCA9IGdldE5hbWVkSXRlbXNGcm9tQ29sbGVjdGlvbihpbXAs IHRvV2ViQ29yZVN0cmluZyhhcmdzWzBdKSk7CisKKyAgICBpZiAocmVzdWx0LklzRW1wdHkoKSkK KyAgICAgICAgcmV0dXJuIHY4OjpVbmRlZmluZWQoKTsKKworICAgIHJldHVybiByZXN1bHQ7Cit9 CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK