87259 2012-05-23 06:29:44 -0700 CSSParser: Simplify StylePropertySet creation. 2012-05-23 07:08:08 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling koivisto macpherson menard webkit.review.bot oldest_to_newest 631597 0 kling 2012-05-23 06:29:44 -0700 Returning a Vector<CSSProperty> from filteredProperties() hurts my soul. Let's do something clever-er. 631598 1 143557 kling 2012-05-23 06:30:22 -0700 Created attachment 143557 Patch 631637 2 143557 kling 2012-05-23 07:08:00 -0700 Comment on attachment 143557 Patch Clearing flags on attachment: 143557 Committed r118176: <http://trac.webkit.org/changeset/118176> 631638 3 kling 2012-05-23 07:08:08 -0700 All reviewed patches have been landed. Closing bug. 143557 2012-05-23 06:30:22 -0700 2012-05-23 07:08:00 -0700 Patch bug-87259.diff text/plain 10083 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0ZDc3NWFlLi43YjE0N2IyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDAg QEAKIDIwMTItMDUtMjMgIEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQub3JnPgogCisgICAg ICAgIENTU1BhcnNlcjogU2ltcGxpZnkgU3R5bGVQcm9wZXJ0eVNldCBjcmVhdGlvbi4KKyAgICAg ICAgPGh0dHA6Ly93ZWJraXQub3JnL2IvODcyNTk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVHVybiBDU1NQYXJzZXIncyBmaWx0ZXJlZFByb3BlcnRp ZXMoKSBpbnRvIGNyZWF0ZVN0eWxlUHJvcGVydHlTZXQoKSB3aGljaCBmaWx0ZXJzIHRoZSBwYXJz ZWQKKyAgICAgICAgcHJvcGVydGllcyBhbmQgY3JlYXRlcyBhIG5ldyBTdHlsZVByb3BlcnR5U2V0 LCBhZG9wdGluZyB0aGUgdmVjdG9yIHRvIGF2b2lkIHRoZSBWZWN0b3IgY29weSB3ZQorICAgICAg ICB3ZXJlIHByZXZpb3VzbHkgaW5jdXJyaW5nLgorCisgICAgICAgIEFkZGVkIGEgU3R5bGVQcm9w ZXJ0eVZlY3RvciB0eXBlZGVmIGZvciBWZWN0b3I8Q1NTUHJvcGVydHksIDQ+IHNpbmNlIHdlIG5l ZWQgdG8gcGFzcyB0aGlzIHR5cGUKKyAgICAgICAgdG8gdGhlIGNvbnN0cnVjdG9yIGZvciBWZWN0 b3I6OnN3YXAoKSB0byB3b3JrLgorCisgICAgICAgIEFuZCB0aHVzIFN0eWxlUHJvcGVydHlTZXQ6 OmNyZWF0ZShjb25zdCBWZWN0b3I8Q1NTUHJvcGVydHk+JiwgQ1NTUGFyc2VyTW9kZSkgYmVjYW1l CisgICAgICAgIFN0eWxlUHJvcGVydHlTZXQ6OmFkb3B0KFN0eWxlUHJvcGVydHlWZWN0b3ImLCBD U1NQYXJzZXJNb2RlKS4KKworICAgICAgICAqIGNzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRp b24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uOjpj b3B5UHJvcGVydGllc0luU2V0KToKKyAgICAgICAgKiBjc3MvQ1NTUGFyc2VyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkNTU1BhcnNlcjo6Y3JlYXRlU3R5bGVQcm9wZXJ0eVNldCk6CisgICAgICAg IChXZWJDb3JlOjpDU1NQYXJzZXI6OmNyZWF0ZVN0eWxlUnVsZSk6CisgICAgICAgIChXZWJDb3Jl OjpDU1NQYXJzZXI6OmNyZWF0ZUZvbnRGYWNlUnVsZSk6CisgICAgICAgIChXZWJDb3JlOjpDU1NQ YXJzZXI6OmNyZWF0ZVBhZ2VSdWxlKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1BhcnNlcjo6Y3Jl YXRlS2V5ZnJhbWUpOgorICAgICAgICAqIGNzcy9DU1NQYXJzZXIuaDoKKyAgICAgICAgKiBjc3Mv U3R5bGVQcm9wZXJ0eVNldC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVByb3BlcnR5U2V0 OjpTdHlsZVByb3BlcnR5U2V0KToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUHJvcGVydHlTZXQ6 OnJlbW92ZVByb3BlcnRpZXNJblNldCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVByb3BlcnR5 U2V0Ojpjb3B5UHJvcGVydGllc0luU2V0KToKKyAgICAgICAgKFNhbWVTaXplQXNTdHlsZVByb3Bl cnR5U2V0KToKKyAgICAgICAgKiBjc3MvU3R5bGVQcm9wZXJ0eVNldC5oOgorICAgICAgICAoV2Vi Q29yZTo6U3R5bGVQcm9wZXJ0eVNldDo6YWRvcHQpOgorICAgICAgICAoU3R5bGVQcm9wZXJ0eVNl dCk6CisKKzIwMTItMDUtMjMgIEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQub3JnPgorCiAg ICAgICAgIEtpbGwgc29tZSBmcml2b2xvdXMgbnVsbC1jaGVja2luZyBvZiBFbGVtZW50OjptX2F0 dHJpYnV0ZURhdGEuCiAgICAgICAgIDxodHRwOi8vd2Via2l0Lm9yZy9iLzg3MjQ4PgogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCmlu ZGV4IGRhODYzNDkuLmIxNzc1NjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1ND b21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1ND b21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCkBAIC0yNjE1LDE0ICsyNjE1LDE0IEBAIFBhc3NS ZWZQdHI8Q1NTVmFsdWVMaXN0PiBDU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb246OmdldENTU1By b3BlcnR5VmFsdWVzRm9yU2lkCiAKIFBhc3NSZWZQdHI8U3R5bGVQcm9wZXJ0eVNldD4gQ1NTQ29t cHV0ZWRTdHlsZURlY2xhcmF0aW9uOjpjb3B5UHJvcGVydGllc0luU2V0KGNvbnN0IENTU1Byb3Bl cnR5SUQqIHNldCwgdW5zaWduZWQgbGVuZ3RoKSBjb25zdAogewotICAgIFZlY3RvcjxDU1NQcm9w ZXJ0eT4gbGlzdDsKKyAgICBTdHlsZVByb3BlcnR5VmVjdG9yIGxpc3Q7CiAgICAgbGlzdC5yZXNl cnZlSW5pdGlhbENhcGFjaXR5KGxlbmd0aCk7CiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8 IGxlbmd0aDsgKytpKSB7CiAgICAgICAgIFJlZlB0cjxDU1NWYWx1ZT4gdmFsdWUgPSBnZXRQcm9w ZXJ0eUNTU1ZhbHVlKHNldFtpXSk7CiAgICAgICAgIGlmICh2YWx1ZSkKICAgICAgICAgICAgIGxp c3QuYXBwZW5kKENTU1Byb3BlcnR5KHNldFtpXSwgdmFsdWUucmVsZWFzZSgpLCBmYWxzZSkpOwog ICAgIH0KLSAgICByZXR1cm4gU3R5bGVQcm9wZXJ0eVNldDo6Y3JlYXRlKGxpc3QpOworICAgIHJl dHVybiBTdHlsZVByb3BlcnR5U2V0OjphZG9wdChsaXN0KTsKIH0KIAogQ1NTUnVsZSogQ1NTQ29t cHV0ZWRTdHlsZURlY2xhcmF0aW9uOjpwYXJlbnRSdWxlKCkgY29uc3QKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Bh cnNlci5jcHAKaW5kZXggOWUyODEyZC4uN2RmY2JkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvY3NzL0NTU1BhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5j cHAKQEAgLTExNTcsMTIgKzExNTcsMTIgQEAgUGFzc093blB0cjxNZWRpYVF1ZXJ5PiBDU1NQYXJz ZXI6OnBhcnNlTWVkaWFRdWVyeShjb25zdCBTdHJpbmcmIHN0cmluZykKICAgICByZXR1cm4gbV9t ZWRpYVF1ZXJ5LnJlbGVhc2UoKTsKIH0KIAotVmVjdG9yPENTU1Byb3BlcnR5PiBDU1NQYXJzZXI6 OmZpbHRlcmVkUHJvcGVydGllcygpIGNvbnN0CitQYXNzUmVmUHRyPFN0eWxlUHJvcGVydHlTZXQ+ IENTU1BhcnNlcjo6Y3JlYXRlU3R5bGVQcm9wZXJ0eVNldCgpCiB7CiAgICAgQml0QXJyYXk8bnVt Q1NTUHJvcGVydGllcz4gc2VlblByb3BlcnRpZXM7CiAgICAgQml0QXJyYXk8bnVtQ1NTUHJvcGVy dGllcz4gc2VlbkltcG9ydGFudFByb3BlcnRpZXM7CiAKLSAgICBWZWN0b3I8Q1NTUHJvcGVydHk+ IHJlc3VsdHM7CisgICAgU3R5bGVQcm9wZXJ0eVZlY3RvciByZXN1bHRzOwogICAgIHJlc3VsdHMu cmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShtX3BhcnNlZFByb3BlcnRpZXMuc2l6ZSgpKTsKIAogICAg IGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBtX3BhcnNlZFByb3BlcnRpZXMuc2l6ZSgpOyArK2kp IHsKQEAgLTExODcsMTAgKzExODcsMTAgQEAgVmVjdG9yPENTU1Byb3BlcnR5PiBDU1NQYXJzZXI6 OmZpbHRlcmVkUHJvcGVydGllcygpIGNvbnN0CiAgICAgICAgICAgICBzZWVuSW1wb3J0YW50UHJv cGVydGllcy5zZXQocHJvcGVydHlJREluZGV4KTsKICAgICAgICAgc2VlblByb3BlcnRpZXMuc2V0 KHByb3BlcnR5SURJbmRleCk7CiAKLSAgICAgICAgcmVzdWx0cy5hcHBlbmQocHJvcGVydHkpOwor ICAgICAgICByZXN1bHRzLnVuY2hlY2tlZEFwcGVuZChwcm9wZXJ0eSk7CiAgICAgfQogCi0gICAg cmV0dXJuIHJlc3VsdHM7CisgICAgcmV0dXJuIFN0eWxlUHJvcGVydHlTZXQ6OmFkb3B0KHJlc3Vs dHMsIG1fY29udGV4dC5tb2RlKTsKIH0KIAogdm9pZCBDU1NQYXJzZXI6OmFkZFByb3BlcnR5KENT U1Byb3BlcnR5SUQgcHJvcElkLCBQYXNzUmVmUHRyPENTU1ZhbHVlPiB2YWx1ZSwgYm9vbCBpbXBv cnRhbnQsIGJvb2wgaW1wbGljaXQpCkBAIC05MDkwLDcgKzkwOTAsNyBAQCBTdHlsZVJ1bGVCYXNl KiBDU1NQYXJzZXI6OmNyZWF0ZVN0eWxlUnVsZShWZWN0b3I8T3duUHRyPENTU1BhcnNlclNlbGVj dG9yPiA+KiBzZQogICAgICAgICBydWxlLT5wYXJzZXJBZG9wdFNlbGVjdG9yVmVjdG9yKCpzZWxl Y3RvcnMpOwogICAgICAgICBpZiAobV9oYXNGb250RmFjZU9ubHlWYWx1ZXMpCiAgICAgICAgICAg ICBkZWxldGVGb250RmFjZU9ubHlWYWx1ZXMoKTsKLSAgICAgICAgcnVsZS0+c2V0UHJvcGVydGll cyhTdHlsZVByb3BlcnR5U2V0OjpjcmVhdGUoZmlsdGVyZWRQcm9wZXJ0aWVzKCksIG1fY29udGV4 dC5tb2RlKSk7CisgICAgICAgIHJ1bGUtPnNldFByb3BlcnRpZXMoY3JlYXRlU3R5bGVQcm9wZXJ0 eVNldCgpKTsKICAgICAgICAgcmVzdWx0ID0gcnVsZS5nZXQoKTsKICAgICAgICAgbV9wYXJzZWRS dWxlcy5hcHBlbmQocnVsZS5yZWxlYXNlKCkpOwogICAgICAgICBpZiAobV9ydWxlUmFuZ2VNYXAp IHsKQEAgLTkxMjYsNyArOTEyNiw3IEBAIFN0eWxlUnVsZUJhc2UqIENTU1BhcnNlcjo6Y3JlYXRl Rm9udEZhY2VSdWxlKCkKICAgICAgICAgfQogICAgIH0KICAgICBSZWZQdHI8U3R5bGVSdWxlRm9u dEZhY2U+IHJ1bGUgPSBTdHlsZVJ1bGVGb250RmFjZTo6Y3JlYXRlKCk7Ci0gICAgcnVsZS0+c2V0 UHJvcGVydGllcyhTdHlsZVByb3BlcnR5U2V0OjpjcmVhdGUoZmlsdGVyZWRQcm9wZXJ0aWVzKCks IG1fY29udGV4dC5tb2RlKSk7CisgICAgcnVsZS0+c2V0UHJvcGVydGllcyhjcmVhdGVTdHlsZVBy b3BlcnR5U2V0KCkpOwogICAgIGNsZWFyUHJvcGVydGllcygpOwogICAgIFN0eWxlUnVsZUZvbnRG YWNlKiByZXN1bHQgPSBydWxlLmdldCgpOwogICAgIG1fcGFyc2VkUnVsZXMuYXBwZW5kKHJ1bGUu cmVsZWFzZSgpKTsKQEAgLTkxOTksNyArOTE5OSw3IEBAIFN0eWxlUnVsZUJhc2UqIENTU1BhcnNl cjo6Y3JlYXRlUGFnZVJ1bGUoUGFzc093blB0cjxDU1NQYXJzZXJTZWxlY3Rvcj4gcGFnZVNlbGVj CiAgICAgICAgIFZlY3RvcjxPd25QdHI8Q1NTUGFyc2VyU2VsZWN0b3I+ID4gc2VsZWN0b3JWZWN0 b3I7CiAgICAgICAgIHNlbGVjdG9yVmVjdG9yLmFwcGVuZChwYWdlU2VsZWN0b3IpOwogICAgICAg ICBydWxlLT5wYXJzZXJBZG9wdFNlbGVjdG9yVmVjdG9yKHNlbGVjdG9yVmVjdG9yKTsKLSAgICAg ICAgcnVsZS0+c2V0UHJvcGVydGllcyhTdHlsZVByb3BlcnR5U2V0OjpjcmVhdGUoZmlsdGVyZWRQ cm9wZXJ0aWVzKCksIG1fY29udGV4dC5tb2RlKSk7CisgICAgICAgIHJ1bGUtPnNldFByb3BlcnRp ZXMoY3JlYXRlU3R5bGVQcm9wZXJ0eVNldCgpKTsKICAgICAgICAgcGFnZVJ1bGUgPSBydWxlLmdl dCgpOwogICAgICAgICBtX3BhcnNlZFJ1bGVzLmFwcGVuZChydWxlLnJlbGVhc2UoKSk7CiAgICAg fQpAQCAtOTI3Nyw3ICs5Mjc3LDcgQEAgU3R5bGVLZXlmcmFtZSogQ1NTUGFyc2VyOjpjcmVhdGVL ZXlmcmFtZShDU1NQYXJzZXJWYWx1ZUxpc3QqIGtleXMpCiAKICAgICBSZWZQdHI8U3R5bGVLZXlm cmFtZT4ga2V5ZnJhbWUgPSBTdHlsZUtleWZyYW1lOjpjcmVhdGUoKTsKICAgICBrZXlmcmFtZS0+ c2V0S2V5VGV4dChrZXlTdHJpbmcpOwotICAgIGtleWZyYW1lLT5zZXRQcm9wZXJ0aWVzKFN0eWxl UHJvcGVydHlTZXQ6OmNyZWF0ZShmaWx0ZXJlZFByb3BlcnRpZXMoKSwgbV9jb250ZXh0Lm1vZGUp KTsKKyAgICBrZXlmcmFtZS0+c2V0UHJvcGVydGllcyhjcmVhdGVTdHlsZVByb3BlcnR5U2V0KCkp OwogCiAgICAgY2xlYXJQcm9wZXJ0aWVzKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NQYXJzZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuaAppbmRleCBk OGRkYmI2Li5iYTJiNTNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2Vy LmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5oCkBAIC0yODIsNyArMjgyLDcg QEAgcHVibGljOgogCiAgICAgdm9pZCBjbGVhclByb3BlcnRpZXMoKTsKIAotICAgIFZlY3RvcjxD U1NQcm9wZXJ0eT4gZmlsdGVyZWRQcm9wZXJ0aWVzKCkgY29uc3Q7CisgICAgUGFzc1JlZlB0cjxT dHlsZVByb3BlcnR5U2V0PiBjcmVhdGVTdHlsZVByb3BlcnR5U2V0KCk7CiAKICAgICBDU1NQYXJz ZXJDb250ZXh0IG1fY29udGV4dDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0 eWxlUHJvcGVydHlTZXQuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJvcGVydHlTZXQu Y3BwCmluZGV4IDU1MWRmYTcuLmI1ODEyMTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nz cy9TdHlsZVByb3BlcnR5U2V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVQcm9w ZXJ0eVNldC5jcHAKQEAgLTU2LDExICs1NiwxMyBAQCBTdHlsZVByb3BlcnR5U2V0OjpTdHlsZVBy b3BlcnR5U2V0KENTU1BhcnNlck1vZGUgY3NzUGFyc2VyTW9kZSkKIHsKIH0KIAotU3R5bGVQcm9w ZXJ0eVNldDo6U3R5bGVQcm9wZXJ0eVNldChjb25zdCBWZWN0b3I8Q1NTUHJvcGVydHk+JiBwcm9w ZXJ0aWVzLCBDU1NQYXJzZXJNb2RlIGNzc1BhcnNlck1vZGUpCi0gICAgOiBtX3Byb3BlcnRpZXMo cHJvcGVydGllcykKLSAgICAsIG1fY3NzUGFyc2VyTW9kZShjc3NQYXJzZXJNb2RlKQorU3R5bGVQ cm9wZXJ0eVNldDo6U3R5bGVQcm9wZXJ0eVNldChTdHlsZVByb3BlcnR5VmVjdG9yJiBwcm9wZXJ0 aWVzLCBDU1NQYXJzZXJNb2RlIGNzc1BhcnNlck1vZGUpCisgICAgOiBtX2Nzc1BhcnNlck1vZGUo Y3NzUGFyc2VyTW9kZSkKICAgICAsIG1fb3duc0NTU09NV3JhcHBlcihmYWxzZSkKIHsKKyAgICBt X3Byb3BlcnRpZXMuc3dhcChwcm9wZXJ0aWVzKTsKKworICAgIC8vIFRoaXMgc2hyaW5rVG9GaXQo KSB3aWxsIGJlIGEgbm8tb3AgaW4gdGhlIHR5cGljYWwgY2FzZSAobm8gZHVwbGljYXRlIHByb3Bl cnRpZXMgd2VyZSBlbGltaW5hdGVkIGFmdGVyIHBhcnNpbmcuKQogICAgIG1fcHJvcGVydGllcy5z aHJpbmtUb0ZpdCgpOwogfQogCkBAIC04NzAsNyArODcyLDcgQEAgYm9vbCBTdHlsZVByb3BlcnR5 U2V0OjpyZW1vdmVQcm9wZXJ0aWVzSW5TZXQoY29uc3QgQ1NTUHJvcGVydHlJRCogc2V0LCB1bnNp Z25lZAogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBsZW5ndGg7ICsraSkKICAgICAgICAg dG9SZW1vdmUuYWRkKHNldFtpXSk7CiAKLSAgICBWZWN0b3I8Q1NTUHJvcGVydHksIDQ+IG5ld1By b3BlcnRpZXM7CisgICAgU3R5bGVQcm9wZXJ0eVZlY3RvciBuZXdQcm9wZXJ0aWVzOwogICAgIG5l d1Byb3BlcnRpZXMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShtX3Byb3BlcnRpZXMuc2l6ZSgpKTsK IAogICAgIHVuc2lnbmVkIHNpemUgPSBtX3Byb3BlcnRpZXMuc2l6ZSgpOwpAQCAtOTQ4LDE0ICs5 NTAsMTQgQEAgUGFzc1JlZlB0cjxTdHlsZVByb3BlcnR5U2V0PiBTdHlsZVByb3BlcnR5U2V0Ojpj b3B5KCkgY29uc3QKIAogUGFzc1JlZlB0cjxTdHlsZVByb3BlcnR5U2V0PiBTdHlsZVByb3BlcnR5 U2V0Ojpjb3B5UHJvcGVydGllc0luU2V0KGNvbnN0IENTU1Byb3BlcnR5SUQqIHNldCwgdW5zaWdu ZWQgbGVuZ3RoKSBjb25zdAogewotICAgIFZlY3RvcjxDU1NQcm9wZXJ0eT4gbGlzdDsKKyAgICBT dHlsZVByb3BlcnR5VmVjdG9yIGxpc3Q7CiAgICAgbGlzdC5yZXNlcnZlSW5pdGlhbENhcGFjaXR5 KGxlbmd0aCk7CiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGxlbmd0aDsgKytpKSB7CiAg ICAgICAgIFJlZlB0cjxDU1NWYWx1ZT4gdmFsdWUgPSBnZXRQcm9wZXJ0eUNTU1ZhbHVlKHNldFtp XSk7CiAgICAgICAgIGlmICh2YWx1ZSkKICAgICAgICAgICAgIGxpc3QuYXBwZW5kKENTU1Byb3Bl cnR5KHNldFtpXSwgdmFsdWUucmVsZWFzZSgpLCBmYWxzZSkpOwogICAgIH0KLSAgICByZXR1cm4g U3R5bGVQcm9wZXJ0eVNldDo6Y3JlYXRlKGxpc3QpOworICAgIHJldHVybiBTdHlsZVByb3BlcnR5 U2V0OjphZG9wdChsaXN0KTsKIH0KIAogQ1NTU3R5bGVEZWNsYXJhdGlvbiogU3R5bGVQcm9wZXJ0 eVNldDo6ZW5zdXJlQ1NTU3R5bGVEZWNsYXJhdGlvbigpIGNvbnN0CkBAIC05OTksNyArMTAwMSw3 IEBAIHVuc2lnbmVkIFN0eWxlUHJvcGVydHlTZXQ6OmF2ZXJhZ2VTaXplSW5CeXRlcygpCiAKIC8v IFNlZSB0aGUgZnVuY3Rpb24gYWJvdmUgaWYgeW91IG5lZWQgdG8gdXBkYXRlIHRoaXMuCiBjbGFz cyBTYW1lU2l6ZUFzU3R5bGVQcm9wZXJ0eVNldCA6IHB1YmxpYyBSZWZDb3VudGVkPFNhbWVTaXpl QXNTdHlsZVByb3BlcnR5U2V0PiB7Ci0gICAgVmVjdG9yPENTU1Byb3BlcnR5LCA0PiBwcm9wZXJ0 aWVzOworICAgIFN0eWxlUHJvcGVydHlWZWN0b3IgcHJvcGVydGllczsKICAgICB1bnNpZ25lZCBi aXRmaWVsZDsKIH07CiBDT01QSUxFX0FTU0VSVChzaXplb2YoU3R5bGVQcm9wZXJ0eVNldCkgPT0g c2l6ZW9mKFNhbWVTaXplQXNTdHlsZVByb3BlcnR5U2V0KSwgc3R5bGVfcHJvcGVydHlfc2V0X3No b3VsZF9zdGF5X3NtYWxsKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVBy b3BlcnR5U2V0LmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVQcm9wZXJ0eVNldC5oCmluZGV4 IDE0OGQxZTguLjIxZGUwMzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVBy b3BlcnR5U2V0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJvcGVydHlTZXQuaApA QCAtMzksNiArMzksOCBAQCBjbGFzcyBTdHlsZWRFbGVtZW50OwogY2xhc3MgU3R5bGVQcm9wZXJ0 eVNob3J0aGFuZDsKIGNsYXNzIFN0eWxlU2hlZXRJbnRlcm5hbDsKIAordHlwZWRlZiBWZWN0b3I8 Q1NTUHJvcGVydHksIDQ+IFN0eWxlUHJvcGVydHlWZWN0b3I7CisKIGNsYXNzIFN0eWxlUHJvcGVy dHlTZXQgOiBwdWJsaWMgUmVmQ291bnRlZDxTdHlsZVByb3BlcnR5U2V0PiB7CiBwdWJsaWM6CiAg ICAgflN0eWxlUHJvcGVydHlTZXQoKTsKQEAgLTQ3LDcgKzQ5LDcgQEAgcHVibGljOgogICAgIHsK ICAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBTdHlsZVByb3BlcnR5U2V0KGNzc1BhcnNlck1v ZGUpKTsKICAgICB9Ci0gICAgc3RhdGljIFBhc3NSZWZQdHI8U3R5bGVQcm9wZXJ0eVNldD4gY3Jl YXRlKGNvbnN0IFZlY3RvcjxDU1NQcm9wZXJ0eT4mIHByb3BlcnRpZXMsIENTU1BhcnNlck1vZGUg Y3NzUGFyc2VyTW9kZSA9IENTU1N0cmljdE1vZGUpCisgICAgc3RhdGljIFBhc3NSZWZQdHI8U3R5 bGVQcm9wZXJ0eVNldD4gYWRvcHQoU3R5bGVQcm9wZXJ0eVZlY3RvciYgcHJvcGVydGllcywgQ1NT UGFyc2VyTW9kZSBjc3NQYXJzZXJNb2RlID0gQ1NTU3RyaWN0TW9kZSkKICAgICB7CiAgICAgICAg IHJldHVybiBhZG9wdFJlZihuZXcgU3R5bGVQcm9wZXJ0eVNldChwcm9wZXJ0aWVzLCBjc3NQYXJz ZXJNb2RlKSk7CiAgICAgfQpAQCAtMTE3LDcgKzExOSw3IEBAIHB1YmxpYzoKICAgICAKIHByaXZh dGU6CiAgICAgU3R5bGVQcm9wZXJ0eVNldChDU1NQYXJzZXJNb2RlKTsKLSAgICBTdHlsZVByb3Bl cnR5U2V0KGNvbnN0IFZlY3RvcjxDU1NQcm9wZXJ0eT4mLCBDU1NQYXJzZXJNb2RlKTsKKyAgICBT dHlsZVByb3BlcnR5U2V0KFN0eWxlUHJvcGVydHlWZWN0b3ImLCBDU1NQYXJzZXJNb2RlKTsKICAg ICBTdHlsZVByb3BlcnR5U2V0KGNvbnN0IFN0eWxlUHJvcGVydHlTZXQmKTsKIAogICAgIHZvaWQg c2V0TmVlZHNTdHlsZVJlY2FsYygpOwpAQCAtMTM4LDcgKzE0MCw3IEBAIHByaXZhdGU6CiAgICAg Y29uc3QgQ1NTUHJvcGVydHkqIGZpbmRQcm9wZXJ0eVdpdGhJZChDU1NQcm9wZXJ0eUlEKSBjb25z dDsKICAgICBDU1NQcm9wZXJ0eSogZmluZFByb3BlcnR5V2l0aElkKENTU1Byb3BlcnR5SUQpOwog Ci0gICAgVmVjdG9yPENTU1Byb3BlcnR5LCA0PiBtX3Byb3BlcnRpZXM7CisgICAgU3R5bGVQcm9w ZXJ0eVZlY3RvciBtX3Byb3BlcnRpZXM7CiAKICAgICB1bnNpZ25lZCBtX2Nzc1BhcnNlck1vZGUg OiAyOwogICAgIG11dGFibGUgdW5zaWduZWQgbV9vd25zQ1NTT01XcmFwcGVyIDogMTsK