103085 2012-11-22 11:50:14 -0800 Get rid of HTMLCollectionCacheBase 2012-11-23 06:57:48 -0800 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 78909 1 rniwa rniwa andersca darin eric koivisto ojan webkit.review.bot oldest_to_newest 774047 0 rniwa 2012-11-22 11:50:14 -0800 HTMLCollectionCacheBase was introduced in http://trac.webkit.org/changeset/121580 in order to share more code between HTMLCollection and DynamicNodeList implementations. Now that we've merged two classes, this class is nothing but a hallow shell. Merge it into HTMLCollection. 774054 1 175698 rniwa 2012-11-22 12:00:10 -0800 Created attachment 175698 cleanup 774056 2 175698 rniwa 2012-11-22 12:04:11 -0800 Comment on attachment 175698 cleanup Thanks fort the timely review! 774057 3 175698 eflews.bot 2012-11-22 12:06:06 -0800 Comment on attachment 175698 cleanup Attachment 175698 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/14966446 774058 4 rniwa 2012-11-22 12:07:01 -0800 Committed r135534: <http://trac.webkit.org/changeset/135534> 774069 5 rniwa 2012-11-22 12:20:13 -0800 Build fix landed in http://trac.webkit.org/changeset/135535. 774523 6 eric 2012-11-23 06:57:48 -0800 Thanks! 175698 2012-11-22 12:00:10 -0800 2012-11-22 12:06:06 -0800 cleanup bug-103085-20121122115755.patch text/plain 10828 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzNTUzMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBACisyMDEyLTExLTIyICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEdldCByaWQgb2YgSFRNTENvbGxl Y3Rpb25DYWNoZUJhc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEwMzA4NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIE1lcmdlZCBIVE1MQ29sbGVjdGlvbkNhY2hlQmFzZSBpbnRvIEhUTUxDb2xsZWN0aW9u IG5vdyB0aGF0IER5bmFtaWNOb2RlTGlzdCBhbmQgSFRNTENvbGxlY3Rpb24KKyAgICAgICAgc2hh cmUgb25lIGltcGxlbWVudGF0aW9uLgorCisgICAgICAgICogZG9tL0R5bmFtaWNOb2RlTGlzdC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpEeW5hbWljTm9kZUxpc3RDYWNoZUJhc2U6OnJvb3ROb2Rl KTogTWVyZ2VkIG93bmVyTm9kZUhhc0l0ZW1SZWZBdHRyaWJ1dGUgc2luY2UgdGhpcyB3YXMKKyAg ICAgICAgdGhlIG9ubHkgY2FsbGVyIG9mIHRoaXMgZnVuY3Rpb24sIGFuZCB0aGUgZnVuY3Rpb24g bmFtZSBkaWRuJ3QgbWF0Y2ggd2hhdCBpdCB3YXMgY2hlY2tpbmcuCisgICAgICAgIChXZWJDb3Jl OjpEeW5hbWljTm9kZUxpc3RDYWNoZUJhc2U6OmludmFsaWRhdGVDYWNoZSk6CisgICAgICAgIChX ZWJDb3JlOjpEeW5hbWljTm9kZUxpc3RDYWNoZUJhc2U6OmludmFsaWRhdGVJZE5hbWVDYWNoZU1h cHMpOgorICAgICAgICAqIGRvbS9EeW5hbWljTm9kZUxpc3QuaDoKKyAgICAgICAgKFdlYkNvcmUp OgorICAgICAgICAoV2ViQ29yZTo6RHluYW1pY05vZGVMaXN0Q2FjaGVCYXNlOjpjYWNoZWRJdGVt T2Zmc2V0KToKKyAgICAgICAgKER5bmFtaWNOb2RlTGlzdENhY2hlQmFzZSk6CisgICAgICAgICog aHRtbC9IVE1MQ29sbGVjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MQ29sbGVjdGlv bjo6SFRNTENvbGxlY3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6RHluYW1pY05vZGVMaXN0Q2Fj aGVCYXNlOjpzZXRJdGVtQ2FjaGUpOgorICAgICAgICAoV2ViQ29yZTo6RHluYW1pY05vZGVMaXN0 Q2FjaGVCYXNlOjppdGVtQmVmb3JlT3JBZnRlckNhY2hlZEl0ZW0pOiBNZXJnZWQgY2FjaGVkRWxl bWVudHNBcnJheU9mZnNldCgpCisgICAgICAgIG5vdyB0aGF0IHRoaXMgaXMgdGhlIG9ubHkgY2Fs bGVyLgorICAgICAgICAoV2ViQ29yZTo6SFRNTENvbGxlY3Rpb246OmFwcGVuZCk6CisgICAgICAg ICogaHRtbC9IVE1MQ29sbGVjdGlvbi5oOgorICAgICAgICAoSFRNTENvbGxlY3Rpb24pOgorICAg ICAgICAoV2ViQ29yZTo6SFRNTENvbGxlY3Rpb246OmlkQ2FjaGUpOiBNb3ZlZCBmcm9tIEhUTUxD b2xsZWN0aW9uQ2FjaGVCYXNlLgorICAgICAgICAoV2ViQ29yZTo6SFRNTENvbGxlY3Rpb246Om5h bWVDYWNoZSk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6SFRNTENvbGxlY3Rpb246OmFwcGVu ZElkQ2FjaGUpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxDb2xsZWN0aW9uOjphcHBl bmROYW1lQ2FjaGUpOiBEaXR0by4KKwogMjAxMi0xMS0yMiAgQW50dGkgS29pdmlzdG8gIDxhbnR0 aUBhcHBsZS5jb20+CiAKICAgICAgICAgTWVyZ2UgRWRpdGluZ1RleHQgaW50byBUZXh0CkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9kb20vRHluYW1pY05vZGVMaXN0LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9kb20vRHluYW1pY05vZGVMaXN0LmNwcAkocmV2aXNpb24gMTM1NTMxKQor KysgU291cmNlL1dlYkNvcmUvZG9tL0R5bmFtaWNOb2RlTGlzdC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTM3LDcgKzM3LDggQEAgTm9kZSogRHluYW1pY05vZGVMaXN0Q2FjaGVCYXNlOjpyb290Tm9k ZQogICAgIGlmIChpc1Jvb3RlZEF0RG9jdW1lbnQoKSAmJiBtX293bmVyTm9kZS0+aW5Eb2N1bWVu dCgpKQogICAgICAgICByZXR1cm4gbV9vd25lck5vZGUtPmRvY3VtZW50KCk7CiAKLSAgICBpZiAo b3duZXJOb2RlSGFzSXRlbVJlZkF0dHJpYnV0ZSgpKSB7CisjaWYgRU5BQkxFKE1JQ1JPREFUQSkK KyAgICBpZiAobV9yb290VHlwZSA9PSBOb2RlTGlzdElzUm9vdGVkQXREb2N1bWVudElmT3duZXJI YXNJdGVtcmVmQXR0ciAmJiB0b0VsZW1lbnQob3duZXJOb2RlKCkpLT5mYXN0SGFzQXR0cmlidXRl KEhUTUxOYW1lczo6aXRlbXJlZkF0dHIpKSB7CiAgICAgICAgIGlmIChtX293bmVyTm9kZS0+aW5E b2N1bWVudCgpKQogICAgICAgICAgICAgcmV0dXJuIG1fb3duZXJOb2RlLT5kb2N1bWVudCgpOwog CkBAIC00Niw2ICs0Nyw3IEBAIE5vZGUqIER5bmFtaWNOb2RlTGlzdENhY2hlQmFzZTo6cm9vdE5v ZGUKICAgICAgICAgICAgIHJvb3QgPSBwYXJlbnQ7CiAgICAgICAgIHJldHVybiByb290OwogICAg IH0KKyNlbmRpZgogCiAgICAgcmV0dXJuIG1fb3duZXJOb2RlLmdldCgpOwogfQpAQCAtNjAsNyAr NjIsNyBAQCB2b2lkIER5bmFtaWNOb2RlTGlzdENhY2hlQmFzZTo6aW52YWxpZGF0CiAgICAgaWYg KGlzTm9kZUxpc3QodHlwZSgpKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgY29uc3QgSFRNTENv bGxlY3Rpb25DYWNoZUJhc2UqIGNhY2hlQmFzZSA9IHN0YXRpY19jYXN0PGNvbnN0IEhUTUxDb2xs ZWN0aW9uQ2FjaGVCYXNlKj4odGhpcyk7CisgICAgY29uc3QgSFRNTENvbGxlY3Rpb24qIGNhY2hl QmFzZSA9IHN0YXRpY19jYXN0PGNvbnN0IEhUTUxDb2xsZWN0aW9uKj4odGhpcyk7CiAgICAgY2Fj aGVCYXNlLT5tX2lkQ2FjaGUuY2xlYXIoKTsKICAgICBjYWNoZUJhc2UtPm1fbmFtZUNhY2hlLmNs ZWFyKCk7CiAgICAgY2FjaGVCYXNlLT5tX2NhY2hlZEVsZW1lbnRzQXJyYXlPZmZzZXQgPSAwOwpA QCAtNzUsNyArNzcsNyBAQCB2b2lkIER5bmFtaWNOb2RlTGlzdENhY2hlQmFzZTo6aW52YWxpZGF0 CiB2b2lkIER5bmFtaWNOb2RlTGlzdENhY2hlQmFzZTo6aW52YWxpZGF0ZUlkTmFtZUNhY2hlTWFw cygpIGNvbnN0CiB7CiAgICAgQVNTRVJUKGhhc0lkTmFtZUNhY2hlKCkpOwotICAgIGNvbnN0IEhU TUxDb2xsZWN0aW9uQ2FjaGVCYXNlKiBjYWNoZUJhc2UgPSBzdGF0aWNfY2FzdDxjb25zdCBIVE1M Q29sbGVjdGlvbkNhY2hlQmFzZSo+KHRoaXMpOworICAgIGNvbnN0IEhUTUxDb2xsZWN0aW9uKiBj YWNoZUJhc2UgPSBzdGF0aWNfY2FzdDxjb25zdCBIVE1MQ29sbGVjdGlvbio+KHRoaXMpOwogICAg IGNhY2hlQmFzZS0+bV9pZENhY2hlLmNsZWFyKCk7CiAgICAgY2FjaGVCYXNlLT5tX25hbWVDYWNo ZS5jbGVhcigpOwogfQpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL0R5bmFtaWNOb2RlTGlzdC5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9EeW5hbWljTm9kZUxpc3QuaAkocmV2 aXNpb24gMTM1NTMxKQorKysgU291cmNlL1dlYkNvcmUvZG9tL0R5bmFtaWNOb2RlTGlzdC5oCSh3 b3JraW5nIGNvcHkpCkBAIC0yNiw3ICsyNiw2IEBACiAKICNpbmNsdWRlICJDb2xsZWN0aW9uVHlw ZS5oIgogI2luY2x1ZGUgIkRvY3VtZW50LmgiCi0jaW5jbHVkZSAiRWxlbWVudC5oIgogI2luY2x1 ZGUgIkhUTUxOYW1lcy5oIgogI2luY2x1ZGUgIk5vZGVMaXN0LmgiCiAjaW5jbHVkZSA8d3RmL0Zv cndhcmQuaD4KQEAgLTM0LDYgKzMzLDggQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitjbGFz cyBFbGVtZW50OworCiBlbnVtIE5vZGVMaXN0Um9vdFR5cGUgewogICAgIE5vZGVMaXN0SXNSb290 ZWRBdE5vZGUsCiAgICAgTm9kZUxpc3RJc1Jvb3RlZEF0RG9jdW1lbnQsCkBAIC05Nyw3ICs5OCw2 IEBAIHByb3RlY3RlZDoKICAgICBBTFdBWVNfSU5MSU5FIGJvb2wgaXNJdGVtQ2FjaGVWYWxpZCgp IGNvbnN0IHsgcmV0dXJuIG1faXNJdGVtQ2FjaGVWYWxpZDsgfQogICAgIEFMV0FZU19JTkxJTkUg Tm9kZSogY2FjaGVkSXRlbSgpIGNvbnN0IHsgcmV0dXJuIG1fY2FjaGVkSXRlbTsgfQogICAgIEFM V0FZU19JTkxJTkUgdW5zaWduZWQgY2FjaGVkSXRlbU9mZnNldCgpIGNvbnN0IHsgcmV0dXJuIG1f Y2FjaGVkSXRlbU9mZnNldDsgfQotICAgIHVuc2lnbmVkIGNhY2hlZEVsZW1lbnRzQXJyYXlPZmZz ZXQoKSBjb25zdDsKIAogICAgIEFMV0FZU19JTkxJTkUgYm9vbCBpc0xlbmd0aENhY2hlVmFsaWQo KSBjb25zdCB7IHJldHVybiBtX2lzTGVuZ3RoQ2FjaGVWYWxpZDsgfQogICAgIEFMV0FZU19JTkxJ TkUgdW5zaWduZWQgY2FjaGVkTGVuZ3RoKCkgY29uc3QgeyByZXR1cm4gbV9jYWNoZWRMZW5ndGg7 IH0KQEAgLTEzNSw3ICsxMzUsNiBAQCBwcml2YXRlOgogICAgIHRlbXBsYXRlIDxib29sIGZvcndh cmQ+IE5vZGUqIGl0ZXJhdGVGb3JOZXh0Tm9kZShOb2RlKiBjdXJyZW50KSBjb25zdDsKICAgICB0 ZW1wbGF0ZTxib29sIGZvcndhcmQ+IE5vZGUqIGl0ZW1CZWZvcmVPckFmdGVyKE5vZGUqIHByZXZp b3VzSXRlbSkgY29uc3Q7ICAgIAogICAgIE5vZGUqIGl0ZW1CZWZvcmUoTm9kZSogcHJldmlvdXNJ dGVtKSBjb25zdDsKLSAgICBib29sIG93bmVyTm9kZUhhc0l0ZW1SZWZBdHRyaWJ1dGUoKSBjb25z dDsKIAogICAgIFJlZlB0cjxOb2RlPiBtX293bmVyTm9kZTsKICAgICBtdXRhYmxlIE5vZGUqIG1f Y2FjaGVkSXRlbTsKQEAgLTE4MywxNiArMTgyLDYgQEAgQUxXQVlTX0lOTElORSBib29sIER5bmFt aWNOb2RlTGlzdENhY2hlQgogICAgIHJldHVybiBmYWxzZTsKIH0KIAotQUxXQVlTX0lOTElORSBi b29sIER5bmFtaWNOb2RlTGlzdENhY2hlQmFzZTo6b3duZXJOb2RlSGFzSXRlbVJlZkF0dHJpYnV0 ZSgpIGNvbnN0Ci17Ci0jaWYgRU5BQkxFKE1JQ1JPREFUQSkKLSAgICBpZiAobV9yb290VHlwZSA9 PSBOb2RlTGlzdElzUm9vdGVkQXREb2N1bWVudElmT3duZXJIYXNJdGVtcmVmQXR0cikKLSAgICAg ICAgcmV0dXJuIHRvRWxlbWVudChvd25lck5vZGUoKSktPmZhc3RIYXNBdHRyaWJ1dGUoSFRNTE5h bWVzOjppdGVtcmVmQXR0cik7Ci0jZW5kaWYKLQotICAgIHJldHVybiBmYWxzZTsKLX0KLQogY2xh c3MgRHluYW1pY05vZGVMaXN0IDogcHVibGljIE5vZGVMaXN0LCBwdWJsaWMgRHluYW1pY05vZGVM aXN0Q2FjaGVCYXNlIHsKIHB1YmxpYzoKICAgICBEeW5hbWljTm9kZUxpc3QoUGFzc1JlZlB0cjxO b2RlPiBvd25lck5vZGUsIENvbGxlY3Rpb25UeXBlIGNvbGxlY3Rpb25UeXBlLCBOb2RlTGlzdFJv b3RUeXBlIHJvb3RUeXBlLCBOb2RlTGlzdEludmFsaWRhdGlvblR5cGUgaW52YWxpZGF0aW9uVHlw ZSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTENvbGxlY3Rpb24uY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTENvbGxlY3Rpb24uY3BwCShyZXZpc2lvbiAx MzU1MzEpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDb2xsZWN0aW9uLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTc2LDcgKzE3Niw3IEBAIHN0YXRpYyBOb2RlTGlzdEludmFsaWRhdGlvblR5 cGUgaW52YWxpZGEKICAgICAKIAogSFRNTENvbGxlY3Rpb246OkhUTUxDb2xsZWN0aW9uKE5vZGUq IG93bmVyTm9kZSwgQ29sbGVjdGlvblR5cGUgdHlwZSwgSXRlbUFmdGVyT3ZlcnJpZGVUeXBlIGl0 ZW1BZnRlck92ZXJyaWRlVHlwZSkKLSAgICA6IEhUTUxDb2xsZWN0aW9uQ2FjaGVCYXNlKG93bmVy Tm9kZSwgcm9vdFR5cGVGcm9tQ29sbGVjdGlvblR5cGUodHlwZSksIGludmFsaWRhdGlvblR5cGVF eGNsdWRpbmdJZEFuZE5hbWVBdHRyaWJ1dGVzKHR5cGUpLAorICAgIDogRHluYW1pY05vZGVMaXN0 Q2FjaGVCYXNlKG93bmVyTm9kZSwgcm9vdFR5cGVGcm9tQ29sbGVjdGlvblR5cGUodHlwZSksIGlu dmFsaWRhdGlvblR5cGVFeGNsdWRpbmdJZEFuZE5hbWVBdHRyaWJ1dGVzKHR5cGUpLAogICAgICAg ICBXZWJDb3JlOjpzaG91bGRPbmx5SW5jbHVkZURpcmVjdENoaWxkcmVuKHR5cGUpLCB0eXBlLCBp dGVtQWZ0ZXJPdmVycmlkZVR5cGUpCiB7CiAgICAgZG9jdW1lbnQoKS0+cmVnaXN0ZXJOb2RlTGlz dENhY2hlKHRoaXMpOwpAQCAtMzY0LDE2ICszNjQsMTEgQEAgQUxXQVlTX0lOTElORSB2b2lkIER5 bmFtaWNOb2RlTGlzdENhY2hlQgogICAgIHNldEl0ZW1DYWNoZShpdGVtLCBvZmZzZXQpOwogICAg IGlmIChvdmVycmlkZXNJdGVtQWZ0ZXIoKSkgewogICAgICAgICBBU1NFUlQoaXRlbS0+aXNFbGVt ZW50Tm9kZSgpKTsKLSAgICAgICAgc3RhdGljX2Nhc3Q8Y29uc3QgSFRNTENvbGxlY3Rpb25DYWNo ZUJhc2UqPih0aGlzKS0+bV9jYWNoZWRFbGVtZW50c0FycmF5T2Zmc2V0ID0gZWxlbWVudHNBcnJh eU9mZnNldDsKKyAgICAgICAgc3RhdGljX2Nhc3Q8Y29uc3QgSFRNTENvbGxlY3Rpb24qPih0aGlz KS0+bV9jYWNoZWRFbGVtZW50c0FycmF5T2Zmc2V0ID0gZWxlbWVudHNBcnJheU9mZnNldDsKICAg ICB9IGVsc2UKICAgICAgICAgQVNTRVJUKCFlbGVtZW50c0FycmF5T2Zmc2V0KTsKIH0KIAotQUxX QVlTX0lOTElORSB1bnNpZ25lZCBEeW5hbWljTm9kZUxpc3RDYWNoZUJhc2U6OmNhY2hlZEVsZW1l bnRzQXJyYXlPZmZzZXQoKSBjb25zdAotewotICAgIHJldHVybiBvdmVycmlkZXNJdGVtQWZ0ZXIo KSA/IHN0YXRpY19jYXN0PGNvbnN0IEhUTUxDb2xsZWN0aW9uQ2FjaGVCYXNlKj4odGhpcyktPm1f Y2FjaGVkRWxlbWVudHNBcnJheU9mZnNldCA6IDA7Ci19Ci0KIHVuc2lnbmVkIER5bmFtaWNOb2Rl TGlzdENhY2hlQmFzZTo6bGVuZ3RoQ29tbW9uKCkgY29uc3QKIHsKICAgICBpZiAoaXNMZW5ndGhD YWNoZVZhbGlkKCkpCkBAIC00NDEsNyArNDM2LDcgQEAgTm9kZSogRHluYW1pY05vZGVMaXN0Q2Fj aGVCYXNlOjppdGVtQmVmbwogICAgICAgICByZXR1cm4gMDsKICAgICB9CiAKLSAgICB1bnNpZ25l ZCBvZmZzZXRJbkFycmF5ID0gY2FjaGVkRWxlbWVudHNBcnJheU9mZnNldCgpOworICAgIHVuc2ln bmVkIG9mZnNldEluQXJyYXkgPSBvdmVycmlkZXNJdGVtQWZ0ZXIoKSA/IHN0YXRpY19jYXN0PGNv bnN0IEhUTUxDb2xsZWN0aW9uKj4odGhpcyktPm1fY2FjaGVkRWxlbWVudHNBcnJheU9mZnNldCA6 IDA7CiAgICAgd2hpbGUgKChjdXJyZW50SXRlbSA9IGl0ZW1BZnRlcihvZmZzZXRJbkFycmF5LCBj dXJyZW50SXRlbSkpKSB7CiAgICAgICAgIGN1cnJlbnRPZmZzZXQrKzsKICAgICAgICAgaWYgKGN1 cnJlbnRPZmZzZXQgPT0gb2Zmc2V0KSB7CkBAIC01ODQsNyArNTc5LDcgQEAgUGFzc1JlZlB0cjxO b2RlTGlzdD4gSFRNTENvbGxlY3Rpb246OnRhZwogICAgIHJldHVybiBvd25lck5vZGUoKS0+Z2V0 RWxlbWVudHNCeVRhZ05hbWUobmFtZSk7CiB9CiAKLXZvaWQgSFRNTENvbGxlY3Rpb25DYWNoZUJh c2U6OmFwcGVuZChOb2RlQ2FjaGVNYXAmIG1hcCwgY29uc3QgQXRvbWljU3RyaW5nJiBrZXksIEVs ZW1lbnQqIGVsZW1lbnQpCit2b2lkIEhUTUxDb2xsZWN0aW9uOjphcHBlbmQoTm9kZUNhY2hlTWFw JiBtYXAsIGNvbnN0IEF0b21pY1N0cmluZyYga2V5LCBFbGVtZW50KiBlbGVtZW50KQogewogICAg IE93blB0cjxWZWN0b3I8RWxlbWVudCo+ID4mIHZlY3RvciA9IG1hcC5hZGQoa2V5LmltcGwoKSwg bnVsbHB0cikuaXRlcmF0b3ItPnZhbHVlOwogICAgIGlmICghdmVjdG9yKQpJbmRleDogU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MQ29sbGVjdGlvbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTENvbGxlY3Rpb24uaAkocmV2aXNpb24gMTM1NTMxKQorKysgU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MQ29sbGVjdGlvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMywzOSArMzMs NyBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLWNsYXNzIERvY3VtZW50OwotY2xhc3MgRWxl bWVudDsKLWNsYXNzIE5vZGU7Ci1jbGFzcyBOb2RlTGlzdDsKLQotY2xhc3MgSFRNTENvbGxlY3Rp b25DYWNoZUJhc2UgOiBwdWJsaWMgRHluYW1pY05vZGVMaXN0Q2FjaGVCYXNlIHsKLXB1YmxpYzoK LSAgICBIVE1MQ29sbGVjdGlvbkNhY2hlQmFzZShOb2RlKiBvd25lck5vZGUsIE5vZGVMaXN0Um9v dFR5cGUgcm9vdFR5cGUsIE5vZGVMaXN0SW52YWxpZGF0aW9uVHlwZSBpbnZhbGlkYXRpb25UeXBl LAotICAgICAgICBib29sIHNob3VsZE9ubHlJbmNsdWRlRGlyZWN0Q2hpbGRyZW4sIENvbGxlY3Rp b25UeXBlIGNvbGxlY3Rpb25UeXBlLCBJdGVtQWZ0ZXJPdmVycmlkZVR5cGUgaXRlbUFmdGVyT3Zl cnJpZGVUeXBlKQotICAgICAgICA6IER5bmFtaWNOb2RlTGlzdENhY2hlQmFzZShvd25lck5vZGUs IHJvb3RUeXBlLCBpbnZhbGlkYXRpb25UeXBlLCBzaG91bGRPbmx5SW5jbHVkZURpcmVjdENoaWxk cmVuLCBjb2xsZWN0aW9uVHlwZSwgaXRlbUFmdGVyT3ZlcnJpZGVUeXBlKQotICAgIHsKLSAgICB9 Ci0KLXByb3RlY3RlZDoKLSAgICB0eXBlZGVmIEhhc2hNYXA8QXRvbWljU3RyaW5nSW1wbCosIE93 blB0cjxWZWN0b3I8RWxlbWVudCo+ID4gPiBOb2RlQ2FjaGVNYXA7Ci0gICAgVmVjdG9yPEVsZW1l bnQqPiogaWRDYWNoZShjb25zdCBBdG9taWNTdHJpbmcmIG5hbWUpIGNvbnN0IHsgcmV0dXJuIG1f aWRDYWNoZS5nZXQobmFtZS5pbXBsKCkpOyB9Ci0gICAgVmVjdG9yPEVsZW1lbnQqPiogbmFtZUNh Y2hlKGNvbnN0IEF0b21pY1N0cmluZyYgbmFtZSkgY29uc3QgeyByZXR1cm4gbV9uYW1lQ2FjaGUu Z2V0KG5hbWUuaW1wbCgpKTsgfQotICAgIHZvaWQgYXBwZW5kSWRDYWNoZShjb25zdCBBdG9taWNT dHJpbmcmIG5hbWUsIEVsZW1lbnQqIGVsZW1lbnQpIGNvbnN0IHsgYXBwZW5kKG1faWRDYWNoZSwg bmFtZSwgZWxlbWVudCk7IH0KLSAgICB2b2lkIGFwcGVuZE5hbWVDYWNoZShjb25zdCBBdG9taWNT dHJpbmcmIG5hbWUsIEVsZW1lbnQqIGVsZW1lbnQpIGNvbnN0IHsgYXBwZW5kKG1fbmFtZUNhY2hl LCBuYW1lLCBlbGVtZW50KTsgfQotCi0gICAgc3RhdGljIHZvaWQgYXBwZW5kKE5vZGVDYWNoZU1h cCYsIGNvbnN0IEF0b21pY1N0cmluZyYsIEVsZW1lbnQqKTsKLQotcHJpdmF0ZToKLSAgICB1c2lu ZyBEeW5hbWljTm9kZUxpc3RDYWNoZUJhc2U6OmlzUm9vdGVkQXREb2N1bWVudDsKLQotICAgIG11 dGFibGUgTm9kZUNhY2hlTWFwIG1faWRDYWNoZTsKLSAgICBtdXRhYmxlIE5vZGVDYWNoZU1hcCBt X25hbWVDYWNoZTsKLSAgICBtdXRhYmxlIHVuc2lnbmVkIG1fY2FjaGVkRWxlbWVudHNBcnJheU9m ZnNldDsKLQotICAgIGZyaWVuZCBjbGFzcyBEeW5hbWljTm9kZUxpc3RDYWNoZUJhc2U7Ci19Owot Ci1jbGFzcyBIVE1MQ29sbGVjdGlvbiA6IHB1YmxpYyBTY3JpcHRXcmFwcGFibGUsIHB1YmxpYyBS ZWZDb3VudGVkPEhUTUxDb2xsZWN0aW9uPiwgcHVibGljIEhUTUxDb2xsZWN0aW9uQ2FjaGVCYXNl IHsKK2NsYXNzIEhUTUxDb2xsZWN0aW9uIDogcHVibGljIFNjcmlwdFdyYXBwYWJsZSwgcHVibGlj IFJlZkNvdW50ZWQ8SFRNTENvbGxlY3Rpb24+LCBwdWJsaWMgRHluYW1pY05vZGVMaXN0Q2FjaGVC YXNlIHsKIHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxIVE1MQ29sbGVjdGlvbj4gY3Jl YXRlKE5vZGUqIGJhc2UsIENvbGxlY3Rpb25UeXBlKTsKICAgICB2aXJ0dWFsIH5IVE1MQ29sbGVj dGlvbigpOwpAQCAtMTA0LDggKzcyLDIyIEBAIHByb3RlY3RlZDoKIAogICAgIHZpcnR1YWwgdm9p ZCB1cGRhdGVOYW1lQ2FjaGUoKSBjb25zdDsKIAorICAgIHR5cGVkZWYgSGFzaE1hcDxBdG9taWNT dHJpbmdJbXBsKiwgT3duUHRyPFZlY3RvcjxFbGVtZW50Kj4gPiA+IE5vZGVDYWNoZU1hcDsKKyAg ICBWZWN0b3I8RWxlbWVudCo+KiBpZENhY2hlKGNvbnN0IEF0b21pY1N0cmluZyYgbmFtZSkgY29u c3QgeyByZXR1cm4gbV9pZENhY2hlLmdldChuYW1lLmltcGwoKSk7IH0KKyAgICBWZWN0b3I8RWxl bWVudCo+KiBuYW1lQ2FjaGUoY29uc3QgQXRvbWljU3RyaW5nJiBuYW1lKSBjb25zdCB7IHJldHVy biBtX25hbWVDYWNoZS5nZXQobmFtZS5pbXBsKCkpOyB9CisgICAgdm9pZCBhcHBlbmRJZENhY2hl KGNvbnN0IEF0b21pY1N0cmluZyYgbmFtZSwgRWxlbWVudCogZWxlbWVudCkgY29uc3QgeyBhcHBl bmQobV9pZENhY2hlLCBuYW1lLCBlbGVtZW50KTsgfQorICAgIHZvaWQgYXBwZW5kTmFtZUNhY2hl KGNvbnN0IEF0b21pY1N0cmluZyYgbmFtZSwgRWxlbWVudCogZWxlbWVudCkgY29uc3QgeyBhcHBl bmQobV9uYW1lQ2FjaGUsIG5hbWUsIGVsZW1lbnQpOyB9CisKIHByaXZhdGU6CiAgICAgYm9vbCBj aGVja0Zvck5hbWVNYXRjaChFbGVtZW50KiwgYm9vbCBjaGVja05hbWUsIGNvbnN0IEF0b21pY1N0 cmluZyYgbmFtZSkgY29uc3Q7CisKKyAgICBzdGF0aWMgdm9pZCBhcHBlbmQoTm9kZUNhY2hlTWFw JiwgY29uc3QgQXRvbWljU3RyaW5nJiwgRWxlbWVudCopOworCisgICAgbXV0YWJsZSBOb2RlQ2Fj aGVNYXAgbV9pZENhY2hlOworICAgIG11dGFibGUgTm9kZUNhY2hlTWFwIG1fbmFtZUNhY2hlOwor ICAgIG11dGFibGUgdW5zaWduZWQgbV9jYWNoZWRFbGVtZW50c0FycmF5T2Zmc2V0OworCisgICAg ZnJpZW5kIER5bmFtaWNOb2RlTGlzdENhY2hlQmFzZTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlCg==