130896 2014-03-28 06:16:49 -0700 Remove NodeListRootType flag 2014-03-28 08:37:26 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned commit-queue esprehn+autocc gyuyoung.kim kangil.han oldest_to_newest 995305 0 koivisto 2014-03-28 06:16:49 -0700 We can mostly handle this statically, removing a branch. 995322 1 228050 koivisto 2014-03-28 07:49:53 -0700 Created attachment 228050 patch 995333 2 koivisto 2014-03-28 08:37:26 -0700 https://trac.webkit.org/r166407 228050 2014-03-28 07:49:53 -0700 2014-03-28 08:02:48 -0700 patch livenodelist-root-2.patch text/plain 18250 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NjQwNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDY1IEBACisyMDE0LTAzLTI4ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgTm9kZUxpc3RSb290 VHlwZSBmbGFnCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMzA4OTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBUaGlzIGNhbiBiZSBoYW5kbGVkIHN0YXRpY2FsbHkgKGV4Y2VwdCBmb3IgdGhlIFJhZGlvTm9k ZUxpc3QgY2FzZSkuCisKKyAgICAgICAgKiBkb20vQ2xhc3NOb2RlTGlzdC5oOgorICAgICAgICAq IGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6cmVnaXN0ZXJO b2RlTGlzdEZvckludmFsaWRhdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6dW5y ZWdpc3Rlck5vZGVMaXN0Rm9ySW52YWxpZGF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3Vt ZW50OjpyZWdpc3Rlck5vZGVMaXN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkRvY3Vt ZW50Ojp1bnJlZ2lzdGVyTm9kZUxpc3QpOiBEZWxldGVkLgorICAgICAgICAKKyAgICAgICAgICAg IE1hcmsgZG9jdW1lbnQgaW52YWxpZGF0aW9uIHJlZ2lzdGVyZWQgbGlzdHMgd2l0aCBhIGJpdC4K KyAgICAgICAgICAgIFJlbmFtZWQgZm9yIGNsYXJpdHkuCisKKyAgICAgICAgKiBkb20vRG9jdW1l bnQuaDoKKyAgICAgICAgKiBkb20vTGl2ZU5vZGVMaXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkxpdmVOb2RlTGlzdDo6TGl2ZU5vZGVMaXN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxpdmVOb2Rl TGlzdDo6cm9vdE5vZGUpOgorICAgICAgICAKKyAgICAgICAgICAgIEJhc2UgY2xhc3MgdmVyc2lv biB0aGF0IGludm9rZXMgdmlydHVhbCBpc1Jvb3RlZEF0RG9jdW1lbnQuIEl0IGlzIG5lZWRlZCB0 byBzdXBwb3J0IAorICAgICAgICAgICAgTGl2ZU5vZGVMaXN0OjpuYW1lZEl0ZW0uCisKKyAgICAg ICAgKiBkb20vTGl2ZU5vZGVMaXN0Lmg6CisgICAgICAgIChXZWJDb3JlOjpMaXZlTm9kZUxpc3Q6 OmlzUmVnaXN0ZXJlZEZvckludmFsaWRhdGlvbkF0RG9jdW1lbnQpOgorICAgICAgICAoV2ViQ29y ZTo6TGl2ZU5vZGVMaXN0OjpzZXRSZWdpc3RlcmVkRm9ySW52YWxpZGF0aW9uQXREb2N1bWVudCk6 CisgICAgICAgIChXZWJDb3JlOjpMaXZlTm9kZUxpc3Q6OmRvY3VtZW50KToKKyAgICAgICAgKFdl YkNvcmU6OkNhY2hlZExpdmVOb2RlTGlzdDxOb2RlTGlzdFR5cGU+OjpDYWNoZWRMaXZlTm9kZUxp c3QpOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkTGl2ZU5vZGVMaXN0PE5vZGVMaXN0VHlwZT46 On5DYWNoZWRMaXZlTm9kZUxpc3QpOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkTGl2ZU5vZGVM aXN0PE5vZGVMaXN0VHlwZT46OnJvb3ROb2RlKToKKyAgICAgICAgCisgICAgICAgICAgICBDYWxs IGlzUm9vdGVkQXREb2N1bWVudCBvbiB0aGUgZmluYWwgbGVhZiB0eXBlLiBFeGNlcHQgZm9yIFJh ZGlvTm9kZUxpc3QgdGhpcworICAgICAgICAgICAgcmVzb2x2ZXMgc3RhdGljYWxseS4KKworICAg ICAgICAoV2ViQ29yZTo6Q2FjaGVkTGl2ZU5vZGVMaXN0PE5vZGVMaXN0VHlwZT46OndpbGxWYWxp ZGF0ZUluZGV4Q2FjaGUpOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkTGl2ZU5vZGVMaXN0PE5v ZGVMaXN0VHlwZT46OmludmFsaWRhdGVDYWNoZSk6CisgICAgICAgIChXZWJDb3JlOjpMaXZlTm9k ZUxpc3Q6OmlzUm9vdGVkQXREb2N1bWVudCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpM aXZlTm9kZUxpc3Q6OnJvb3RUeXBlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxpdmVO b2RlTGlzdDo6cm9vdE5vZGUpOiBEZWxldGVkLgorICAgICAgICAqIGRvbS9OYW1lTm9kZUxpc3Qu aDoKKyAgICAgICAgKiBkb20vTm9kZVJhcmVEYXRhLmg6CisgICAgICAgIChXZWJDb3JlOjpOb2Rl TGlzdHNOb2RlRGF0YTo6YWRvcHREb2N1bWVudCk6CisgICAgICAgICogZG9tL1RhZ05vZGVMaXN0 Lmg6CisgICAgICAgICogaHRtbC9IVE1MQ29sbGVjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3Jl Ojpyb290VHlwZUZyb21Db2xsZWN0aW9uVHlwZSk6CisgICAgICAgICogaHRtbC9IVE1MQ29sbGVj dGlvbi5oOgorICAgICAgICAoV2ViQ29yZTo6SFRNTENvbGxlY3Rpb246OmlzUm9vdGVkQXREb2N1 bWVudCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MQ29sbGVjdGlvbjo6cm9vdFR5cGUpOgorICAg ICAgICAKKyAgICAgICAgICAgIEhUTUxDb2xsZWN0aW9ucyBzdGlsbCBuZWVkcyB0aGUgZmxhZy4K KworICAgICAgICAqIGh0bWwvTGFiZWxzTm9kZUxpc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 TGFiZWxzTm9kZUxpc3Q6OkxhYmVsc05vZGVMaXN0KToKKyAgICAgICAgKiBodG1sL0xhYmVsc05v ZGVMaXN0Lmg6CisgICAgICAgICogaHRtbC9SYWRpb05vZGVMaXN0LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJhZGlvTm9kZUxpc3Q6OlJhZGlvTm9kZUxpc3QpOgorICAgICAgICAqIGh0bWwvUmFk aW9Ob2RlTGlzdC5oOgorCiAyMDE0LTAzLTI4ICBEaWVnbyBQaW5vIEdhcmNpYSAgPGRwaW5vQGln YWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gVG9vIG1hbnkgcmVkaXJlY3RzIHZpc2l0aW5nIHd3 dy5nbG9iYWxmb3Jlc3R3YXRjaC5vcmcKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9DbGFzc05v ZGVMaXN0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0NsYXNzTm9kZUxpc3Qu aAkocmV2aXNpb24gMTY2NDAyKQorKysgU291cmNlL1dlYkNvcmUvZG9tL0NsYXNzTm9kZUxpc3Qu aAkod29ya2luZyBjb3B5KQpAQCAtNDcsNiArNDcsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB+ Q2xhc3NOb2RlTGlzdCgpOwogCiAgICAgdmlydHVhbCBib29sIG5vZGVNYXRjaGVzKEVsZW1lbnQq KSBjb25zdCBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIGJvb2wgaXNSb290ZWRBdERvY3VtZW50KCkg Y29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gZmFsc2U7IH0KIAogcHJpdmF0ZToKICAgICBDbGFzc05v ZGVMaXN0KENvbnRhaW5lck5vZGUmIHJvb3ROb2RlLCBjb25zdCBTdHJpbmcmIGNsYXNzTmFtZXMp OwpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCShyZXZpc2lvbiAxNjY0MDIpCisrKyBTb3Vy Y2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNDUyLDI0ICsz NDUyLDI4IEBAIHZvaWQgRG9jdW1lbnQ6OnNldENTU1RhcmdldChFbGVtZW50KiBuKQogICAgICAg ICBuLT5kaWRBZmZlY3RTZWxlY3RvcihBZmZlY3RlZFNlbGVjdG9yVGFyZ2V0KTsKIH0KIAotdm9p ZCBEb2N1bWVudDo6cmVnaXN0ZXJOb2RlTGlzdChMaXZlTm9kZUxpc3QmIGxpc3QpCit2b2lkIERv Y3VtZW50OjpyZWdpc3Rlck5vZGVMaXN0Rm9ySW52YWxpZGF0aW9uKExpdmVOb2RlTGlzdCYgbGlz dCkKIHsKICAgICBtX25vZGVMaXN0QW5kQ29sbGVjdGlvbkNvdW50c1tsaXN0LmludmFsaWRhdGlv blR5cGUoKV0rKzsKLSAgICBpZiAobGlzdC5pc1Jvb3RlZEF0RG9jdW1lbnQoKSkKLSAgICAgICAg bV9saXN0c0ludmFsaWRhdGVkQXREb2N1bWVudC5hZGQoJmxpc3QpOworICAgIGlmICghbGlzdC5p c1Jvb3RlZEF0RG9jdW1lbnQoKSkKKyAgICAgICAgcmV0dXJuOworICAgIEFTU0VSVCghbGlzdC5p c1JlZ2lzdGVyZWRGb3JJbnZhbGlkYXRpb25BdERvY3VtZW50KCkpOworICAgIGxpc3Quc2V0UmVn aXN0ZXJlZEZvckludmFsaWRhdGlvbkF0RG9jdW1lbnQodHJ1ZSk7CisgICAgbV9saXN0c0ludmFs aWRhdGVkQXREb2N1bWVudC5hZGQoJmxpc3QpOwogfQogCi12b2lkIERvY3VtZW50Ojp1bnJlZ2lz dGVyTm9kZUxpc3QoTGl2ZU5vZGVMaXN0JiBsaXN0KQordm9pZCBEb2N1bWVudDo6dW5yZWdpc3Rl ck5vZGVMaXN0Rm9ySW52YWxpZGF0aW9uKExpdmVOb2RlTGlzdCYgbGlzdCkKIHsKICAgICBtX25v ZGVMaXN0QW5kQ29sbGVjdGlvbkNvdW50c1tsaXN0LmludmFsaWRhdGlvblR5cGUoKV0tLTsKLSAg ICBpZiAobGlzdC5pc1Jvb3RlZEF0RG9jdW1lbnQoKSkgewotICAgICAgICBpZiAoIW1fbGlzdHNJ bnZhbGlkYXRlZEF0RG9jdW1lbnQuc2l6ZSgpKSB7Ci0gICAgICAgICAgICBBU1NFUlQobV9pbklu dmFsaWRhdGVOb2RlTGlzdEFuZENvbGxlY3Rpb25DYWNoZXMpOwotICAgICAgICAgICAgcmV0dXJu OwotICAgICAgICB9Ci0gICAgICAgIEFTU0VSVChtX2xpc3RzSW52YWxpZGF0ZWRBdERvY3VtZW50 LmNvbnRhaW5zKCZsaXN0KSk7Ci0gICAgICAgIG1fbGlzdHNJbnZhbGlkYXRlZEF0RG9jdW1lbnQu cmVtb3ZlKCZsaXN0KTsKKyAgICBpZiAoIWxpc3QuaXNSZWdpc3RlcmVkRm9ySW52YWxpZGF0aW9u QXREb2N1bWVudCgpKQorICAgICAgICByZXR1cm47CisgICAgaWYgKCFtX2xpc3RzSW52YWxpZGF0 ZWRBdERvY3VtZW50LnNpemUoKSkgeworICAgICAgICBBU1NFUlQobV9pbkludmFsaWRhdGVOb2Rl TGlzdEFuZENvbGxlY3Rpb25DYWNoZXMpOworICAgICAgICByZXR1cm47CiAgICAgfQorICAgIEFT U0VSVChtX2xpc3RzSW52YWxpZGF0ZWRBdERvY3VtZW50LmNvbnRhaW5zKCZsaXN0KSk7CisgICAg bV9saXN0c0ludmFsaWRhdGVkQXREb2N1bWVudC5yZW1vdmUoJmxpc3QpOworICAgIGxpc3Quc2V0 UmVnaXN0ZXJlZEZvckludmFsaWRhdGlvbkF0RG9jdW1lbnQoZmFsc2UpOwogfQogCiB2b2lkIERv Y3VtZW50OjpyZWdpc3RlckNvbGxlY3Rpb24oSFRNTENvbGxlY3Rpb24mIGNvbGxlY3Rpb24pCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9kb20vRG9jdW1lbnQuaAkocmV2aXNpb24gMTY2NDAyKQorKysgU291cmNlL1dlYkNv cmUvZG9tL0RvY3VtZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTc2MSw4ICs3NjEsOCBAQCBwdWJs aWM6CiAgICAgdm9pZCBzdHlsZVJlY2FsY1RpbWVyRmlyZWQoVGltZXI8RG9jdW1lbnQ+Jik7CiAg ICAgdm9pZCBvcHRpbWl6ZWRTdHlsZVNoZWV0VXBkYXRlVGltZXJGaXJlZChUaW1lcjxEb2N1bWVu dD4mKTsKIAotICAgIHZvaWQgcmVnaXN0ZXJOb2RlTGlzdChMaXZlTm9kZUxpc3QmKTsKLSAgICB2 b2lkIHVucmVnaXN0ZXJOb2RlTGlzdChMaXZlTm9kZUxpc3QmKTsKKyAgICB2b2lkIHJlZ2lzdGVy Tm9kZUxpc3RGb3JJbnZhbGlkYXRpb24oTGl2ZU5vZGVMaXN0Jik7CisgICAgdm9pZCB1bnJlZ2lz dGVyTm9kZUxpc3RGb3JJbnZhbGlkYXRpb24oTGl2ZU5vZGVMaXN0Jik7CiAgICAgdm9pZCByZWdp c3RlckNvbGxlY3Rpb24oSFRNTENvbGxlY3Rpb24mKTsKICAgICB2b2lkIHVucmVnaXN0ZXJDb2xs ZWN0aW9uKEhUTUxDb2xsZWN0aW9uJik7CiAgICAgdm9pZCBjb2xsZWN0aW9uQ2FjaGVkSWROYW1l TWFwKGNvbnN0IEhUTUxDb2xsZWN0aW9uJik7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vTGl2 ZU5vZGVMaXN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vTGl2ZU5vZGVM aXN0LmNwcAkocmV2aXNpb24gMTY2NDAyKQorKysgU291cmNlL1dlYkNvcmUvZG9tL0xpdmVOb2Rl TGlzdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMxLDEyICszMSwxMSBAQAogCiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKLUxpdmVOb2RlTGlzdDo6TGl2ZU5vZGVMaXN0KENvbnRhaW5lck5vZGUmIG93 bmVyTm9kZSwgTm9kZUxpc3RJbnZhbGlkYXRpb25UeXBlIGludmFsaWRhdGlvblR5cGUsIE5vZGVM aXN0Um9vdFR5cGUgcm9vdFR5cGUpCitMaXZlTm9kZUxpc3Q6OkxpdmVOb2RlTGlzdChDb250YWlu ZXJOb2RlJiBvd25lck5vZGUsIE5vZGVMaXN0SW52YWxpZGF0aW9uVHlwZSBpbnZhbGlkYXRpb25U eXBlKQogICAgIDogbV9vd25lck5vZGUob3duZXJOb2RlKQotICAgICwgbV9yb290VHlwZShyb290 VHlwZSkKICAgICAsIG1faW52YWxpZGF0aW9uVHlwZShpbnZhbGlkYXRpb25UeXBlKQorICAgICwg bV9pc1JlZ2lzdGVyZWRGb3JJbnZhbGlkYXRpb25BdERvY3VtZW50KGZhbHNlKQogewotICAgIEFT U0VSVChtX3Jvb3RUeXBlID09IHN0YXRpY19jYXN0PHVuc2lnbmVkPihyb290VHlwZSkpOwogICAg IEFTU0VSVChtX2ludmFsaWRhdGlvblR5cGUgPT0gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGludmFs aWRhdGlvblR5cGUpKTsKIH0KIApAQCAtNDQsNiArNDMsMTMgQEAgTGl2ZU5vZGVMaXN0Ojp+TGl2 ZU5vZGVMaXN0KCkKIHsKIH0KIAorQ29udGFpbmVyTm9kZSYgTGl2ZU5vZGVMaXN0Ojpyb290Tm9k ZSgpIGNvbnN0Cit7CisgICAgaWYgKGlzUm9vdGVkQXREb2N1bWVudCgpICYmIG93bmVyTm9kZSgp LmluRG9jdW1lbnQoKSkKKyAgICAgICAgcmV0dXJuIG93bmVyTm9kZSgpLmRvY3VtZW50KCk7CisK KyAgICByZXR1cm4gb3duZXJOb2RlKCk7Cit9CiAKIE5vZGUqIExpdmVOb2RlTGlzdDo6bmFtZWRJ dGVtKGNvbnN0IEF0b21pY1N0cmluZyYgZWxlbWVudElkKSBjb25zdAogewpJbmRleDogU291cmNl L1dlYkNvcmUvZG9tL0xpdmVOb2RlTGlzdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L2RvbS9MaXZlTm9kZUxpc3QuaAkocmV2aXNpb24gMTY2NDAyKQorKysgU291cmNlL1dlYkNvcmUv ZG9tL0xpdmVOb2RlTGlzdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNywyMiArMzcsMTggQEAgbmFt ZXNwYWNlIFdlYkNvcmUgewogCiBjbGFzcyBFbGVtZW50OwogCi1lbnVtIE5vZGVMaXN0Um9vdFR5 cGUgewotICAgIE5vZGVMaXN0SXNSb290ZWRBdE5vZGUsCi0gICAgTm9kZUxpc3RJc1Jvb3RlZEF0 RG9jdW1lbnQKLX07Ci0KIHN0YXRpYyBib29sIHNob3VsZEludmFsaWRhdGVUeXBlT25BdHRyaWJ1 dGVDaGFuZ2UoTm9kZUxpc3RJbnZhbGlkYXRpb25UeXBlLCBjb25zdCBRdWFsaWZpZWROYW1lJik7 CiAKIGNsYXNzIExpdmVOb2RlTGlzdCA6IHB1YmxpYyBOb2RlTGlzdCB7CiBwdWJsaWM6Ci0gICAg TGl2ZU5vZGVMaXN0KENvbnRhaW5lck5vZGUmIG93bmVyTm9kZSwgTm9kZUxpc3RJbnZhbGlkYXRp b25UeXBlLCBOb2RlTGlzdFJvb3RUeXBlKTsKKyAgICBMaXZlTm9kZUxpc3QoQ29udGFpbmVyTm9k ZSYgb3duZXJOb2RlLCBOb2RlTGlzdEludmFsaWRhdGlvblR5cGUpOworICAgIHZpcnR1YWwgfkxp dmVOb2RlTGlzdCgpOworCiAgICAgdmlydHVhbCBOb2RlKiBuYW1lZEl0ZW0oY29uc3QgQXRvbWlj U3RyaW5nJikgY29uc3Qgb3ZlcnJpZGUgZmluYWw7Ci0gICAgdmlydHVhbCBib29sIG5vZGVNYXRj aGVzKEVsZW1lbnQqKSBjb25zdCA9IDA7CiAKLSAgICB2aXJ0dWFsIH5MaXZlTm9kZUxpc3QoKTsK KyAgICB2aXJ0dWFsIGJvb2wgbm9kZU1hdGNoZXMoRWxlbWVudCopIGNvbnN0ID0gMDsKKyAgICB2 aXJ0dWFsIGJvb2wgaXNSb290ZWRBdERvY3VtZW50KCkgY29uc3QgPSAwOwogCi0gICAgQUxXQVlT X0lOTElORSBib29sIGlzUm9vdGVkQXREb2N1bWVudCgpIGNvbnN0IHsgcmV0dXJuIG1fcm9vdFR5 cGUgPT0gTm9kZUxpc3RJc1Jvb3RlZEF0RG9jdW1lbnQ7IH0KICAgICBBTFdBWVNfSU5MSU5FIE5v ZGVMaXN0SW52YWxpZGF0aW9uVHlwZSBpbnZhbGlkYXRpb25UeXBlKCkgY29uc3QgeyByZXR1cm4g c3RhdGljX2Nhc3Q8Tm9kZUxpc3RJbnZhbGlkYXRpb25UeXBlPihtX2ludmFsaWRhdGlvblR5cGUp OyB9CiAgICAgQ29udGFpbmVyTm9kZSYgb3duZXJOb2RlKCkgY29uc3QgeyByZXR1cm4gY29uc3Rf Y2FzdDxDb250YWluZXJOb2RlJj4obV9vd25lck5vZGUuZ2V0KCkpOyB9CiAgICAgQUxXQVlTX0lO TElORSB2b2lkIGludmFsaWRhdGVDYWNoZUZvckF0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1l KiBhdHRyTmFtZSkgY29uc3QKQEAgLTYyLDIxICs1OCwyMyBAQCBwdWJsaWM6CiAgICAgfQogICAg IHZpcnR1YWwgdm9pZCBpbnZhbGlkYXRlQ2FjaGUoRG9jdW1lbnQmKSBjb25zdCA9IDA7CiAKKyAg ICBib29sIGlzUmVnaXN0ZXJlZEZvckludmFsaWRhdGlvbkF0RG9jdW1lbnQoKSBjb25zdCB7IHJl dHVybiBtX2lzUmVnaXN0ZXJlZEZvckludmFsaWRhdGlvbkF0RG9jdW1lbnQ7IH0KKyAgICB2b2lk IHNldFJlZ2lzdGVyZWRGb3JJbnZhbGlkYXRpb25BdERvY3VtZW50KGJvb2wgZikgeyBtX2lzUmVn aXN0ZXJlZEZvckludmFsaWRhdGlvbkF0RG9jdW1lbnQgPSBmOyB9CisKIHByb3RlY3RlZDoKICAg ICBEb2N1bWVudCYgZG9jdW1lbnQoKSBjb25zdCB7IHJldHVybiBtX293bmVyTm9kZS0+ZG9jdW1l bnQoKTsgfQotICAgIENvbnRhaW5lck5vZGUmIHJvb3ROb2RlKCkgY29uc3Q7Ci0KLSAgICBBTFdB WVNfSU5MSU5FIE5vZGVMaXN0Um9vdFR5cGUgcm9vdFR5cGUoKSBjb25zdCB7IHJldHVybiBzdGF0 aWNfY2FzdDxOb2RlTGlzdFJvb3RUeXBlPihtX3Jvb3RUeXBlKTsgfQogCiBwcml2YXRlOgotICAg IHZpcnR1YWwgYm9vbCBpc0xpdmVOb2RlTGlzdCgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIHRy dWU7IH0KKyAgICB2aXJ0dWFsIGJvb2wgaXNMaXZlTm9kZUxpc3QoKSBjb25zdCBvdmVycmlkZSBm aW5hbCB7IHJldHVybiB0cnVlOyB9CisKKyAgICBDb250YWluZXJOb2RlJiByb290Tm9kZSgpIGNv bnN0OwogCiAgICAgRWxlbWVudCogaXRlcmF0ZUZvclByZXZpb3VzRWxlbWVudChFbGVtZW50KiBj dXJyZW50KSBjb25zdDsKIAogICAgIFJlZjxDb250YWluZXJOb2RlPiBtX293bmVyTm9kZTsKIAot ICAgIGNvbnN0IHVuc2lnbmVkIG1fcm9vdFR5cGUgOiAxOwotICAgIGNvbnN0IHVuc2lnbmVkIG1f aW52YWxpZGF0aW9uVHlwZSA6IDQ7CisgICAgY29uc3QgdW5zaWduZWQgbV9pbnZhbGlkYXRpb25U eXBlOworICAgIGJvb2wgbV9pc1JlZ2lzdGVyZWRGb3JJbnZhbGlkYXRpb25BdERvY3VtZW50Owog fTsKIAogdGVtcGxhdGUgPGNsYXNzIE5vZGVMaXN0VHlwZT4KQEAgLTk5LDkgKzk3LDExIEBAIHB1 YmxpYzoKICAgICB2aXJ0dWFsIHNpemVfdCBtZW1vcnlDb3N0KCkgY29uc3Qgb3ZlcnJpZGU7CiAK IHByb3RlY3RlZDoKLSAgICBDYWNoZWRMaXZlTm9kZUxpc3QoQ29udGFpbmVyTm9kZSYgcm9vdE5v ZGUsIE5vZGVMaXN0SW52YWxpZGF0aW9uVHlwZSwgTm9kZUxpc3RSb290VHlwZSA9IE5vZGVMaXN0 SXNSb290ZWRBdE5vZGUpOworICAgIENhY2hlZExpdmVOb2RlTGlzdChDb250YWluZXJOb2RlJiBy b290Tm9kZSwgTm9kZUxpc3RJbnZhbGlkYXRpb25UeXBlKTsKIAogcHJpdmF0ZToKKyAgICBDb250 YWluZXJOb2RlJiByb290Tm9kZSgpIGNvbnN0OworCiAgICAgbXV0YWJsZSBDb2xsZWN0aW9uSW5k ZXhDYWNoZTxOb2RlTGlzdFR5cGUsIEVsZW1lbnQ+IG1faW5kZXhDYWNoZTsKIH07CiAKQEAgLTEy OSwyNSArMTI5LDI2IEBAIEFMV0FZU19JTkxJTkUgYm9vbCBzaG91bGRJbnZhbGlkYXRlVHlwZU8K ICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLWlubGluZSBDb250YWluZXJOb2RlJiBMaXZlTm9kZUxp c3Q6OnJvb3ROb2RlKCkgY29uc3QKK3RlbXBsYXRlIDxjbGFzcyBOb2RlTGlzdFR5cGU+CitDYWNo ZWRMaXZlTm9kZUxpc3Q8Tm9kZUxpc3RUeXBlPjo6Q2FjaGVkTGl2ZU5vZGVMaXN0KENvbnRhaW5l ck5vZGUmIG93bmVyTm9kZSwgTm9kZUxpc3RJbnZhbGlkYXRpb25UeXBlIGludmFsaWRhdGlvblR5 cGUpCisgICAgOiBMaXZlTm9kZUxpc3Qob3duZXJOb2RlLCBpbnZhbGlkYXRpb25UeXBlKQogewot ICAgIGlmIChpc1Jvb3RlZEF0RG9jdW1lbnQoKSAmJiBvd25lck5vZGUoKS5pbkRvY3VtZW50KCkp Ci0gICAgICAgIHJldHVybiBvd25lck5vZGUoKS5kb2N1bWVudCgpOwotCi0gICAgcmV0dXJuIG93 bmVyTm9kZSgpOwogfQogCiB0ZW1wbGF0ZSA8Y2xhc3MgTm9kZUxpc3RUeXBlPgotQ2FjaGVkTGl2 ZU5vZGVMaXN0PE5vZGVMaXN0VHlwZT46OkNhY2hlZExpdmVOb2RlTGlzdChDb250YWluZXJOb2Rl JiBvd25lck5vZGUsIE5vZGVMaXN0SW52YWxpZGF0aW9uVHlwZSBpbnZhbGlkYXRpb25UeXBlLCBO b2RlTGlzdFJvb3RUeXBlIHJvb3RUeXBlKQotICAgIDogTGl2ZU5vZGVMaXN0KG93bmVyTm9kZSwg aW52YWxpZGF0aW9uVHlwZSwgcm9vdFR5cGUpCitDYWNoZWRMaXZlTm9kZUxpc3Q8Tm9kZUxpc3RU eXBlPjo6fkNhY2hlZExpdmVOb2RlTGlzdCgpCiB7CisgICAgaWYgKG1faW5kZXhDYWNoZS5oYXNW YWxpZENhY2hlKCkpCisgICAgICAgIGRvY3VtZW50KCkudW5yZWdpc3Rlck5vZGVMaXN0Rm9ySW52 YWxpZGF0aW9uKCp0aGlzKTsKIH0KIAogdGVtcGxhdGUgPGNsYXNzIE5vZGVMaXN0VHlwZT4KLUNh Y2hlZExpdmVOb2RlTGlzdDxOb2RlTGlzdFR5cGU+Ojp+Q2FjaGVkTGl2ZU5vZGVMaXN0KCkKK2lu bGluZSBDb250YWluZXJOb2RlJiBDYWNoZWRMaXZlTm9kZUxpc3Q8Tm9kZUxpc3RUeXBlPjo6cm9v dE5vZGUoKSBjb25zdAogewotICAgIGlmIChtX2luZGV4Q2FjaGUuaGFzVmFsaWRDYWNoZSgpKQot ICAgICAgICBkb2N1bWVudCgpLnVucmVnaXN0ZXJOb2RlTGlzdCgqdGhpcyk7CisgICAgaWYgKHN0 YXRpY19jYXN0PGNvbnN0IE5vZGVMaXN0VHlwZSY+KCp0aGlzKS5pc1Jvb3RlZEF0RG9jdW1lbnQo KSAmJiBvd25lck5vZGUoKS5pbkRvY3VtZW50KCkpCisgICAgICAgIHJldHVybiBvd25lck5vZGUo KS5kb2N1bWVudCgpOworCisgICAgcmV0dXJuIG93bmVyTm9kZSgpOwogfQogCiB0ZW1wbGF0ZSA8 Y2xhc3MgTm9kZUxpc3RUeXBlPgpAQCAtMjE2LDcgKzIxNyw3IEBAIEVsZW1lbnQqIENhY2hlZExp dmVOb2RlTGlzdDxOb2RlTGlzdFR5cGUKIHRlbXBsYXRlIDxjbGFzcyBOb2RlTGlzdFR5cGU+CiB2 b2lkIENhY2hlZExpdmVOb2RlTGlzdDxOb2RlTGlzdFR5cGU+Ojp3aWxsVmFsaWRhdGVJbmRleENh Y2hlKCkgY29uc3QKIHsKLSAgICBkb2N1bWVudCgpLnJlZ2lzdGVyTm9kZUxpc3QoY29uc3RfY2Fz dDxOb2RlTGlzdFR5cGUmPihzdGF0aWNfY2FzdDxjb25zdCBOb2RlTGlzdFR5cGUmPigqdGhpcykp KTsKKyAgICBkb2N1bWVudCgpLnJlZ2lzdGVyTm9kZUxpc3RGb3JJbnZhbGlkYXRpb24oY29uc3Rf Y2FzdDxOb2RlTGlzdFR5cGUmPihzdGF0aWNfY2FzdDxjb25zdCBOb2RlTGlzdFR5cGUmPigqdGhp cykpKTsKIH0KIAogdGVtcGxhdGUgPGNsYXNzIE5vZGVMaXN0VHlwZT4KQEAgLTIyNCw3ICsyMjUs NyBAQCB2b2lkIENhY2hlZExpdmVOb2RlTGlzdDxOb2RlTGlzdFR5cGU+OjppCiB7CiAgICAgaWYg KCFtX2luZGV4Q2FjaGUuaGFzVmFsaWRDYWNoZSgpKQogICAgICAgICByZXR1cm47Ci0gICAgZG9j dW1lbnQudW5yZWdpc3Rlck5vZGVMaXN0KGNvbnN0X2Nhc3Q8Tm9kZUxpc3RUeXBlJj4oc3RhdGlj X2Nhc3Q8Y29uc3QgTm9kZUxpc3RUeXBlJj4oKnRoaXMpKSk7CisgICAgZG9jdW1lbnQudW5yZWdp c3Rlck5vZGVMaXN0Rm9ySW52YWxpZGF0aW9uKGNvbnN0X2Nhc3Q8Tm9kZUxpc3RUeXBlJj4oc3Rh dGljX2Nhc3Q8Y29uc3QgTm9kZUxpc3RUeXBlJj4oKnRoaXMpKSk7CiAgICAgbV9pbmRleENhY2hl LmludmFsaWRhdGUoKTsKIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL05hbWVOb2RlTGlz dC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9OYW1lTm9kZUxpc3QuaAkocmV2 aXNpb24gMTY2NDAyKQorKysgU291cmNlL1dlYkNvcmUvZG9tL05hbWVOb2RlTGlzdC5oCSh3b3Jr aW5nIGNvcHkpCkBAIC00MSw2ICs0MSw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5OYW1lTm9k ZUxpc3QoKTsKIAogICAgIHZpcnR1YWwgYm9vbCBub2RlTWF0Y2hlcyhFbGVtZW50KikgY29uc3Qg b3ZlcnJpZGU7CisgICAgdmlydHVhbCBib29sIGlzUm9vdGVkQXREb2N1bWVudCgpIGNvbnN0IG92 ZXJyaWRlIHsgcmV0dXJuIGZhbHNlOyB9CiAKIHByaXZhdGU6CiAgICAgTmFtZU5vZGVMaXN0KENv bnRhaW5lck5vZGUmIHJvb3ROb2RlLCBjb25zdCBBdG9taWNTdHJpbmcmIG5hbWUpOwpJbmRleDog U291cmNlL1dlYkNvcmUvZG9tL1RhZ05vZGVMaXN0LmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvZG9tL1RhZ05vZGVMaXN0LmgJKHJldmlzaW9uIDE2NjQwMikKKysrIFNvdXJjZS9XZWJD b3JlL2RvbS9UYWdOb2RlTGlzdC5oCSh3b3JraW5nIGNvcHkpCkBAIC00Nyw2ICs0Nyw3IEBAIHB1 YmxpYzoKICAgICB2aXJ0dWFsIH5UYWdOb2RlTGlzdCgpOwogCiAgICAgdmlydHVhbCBib29sIG5v ZGVNYXRjaGVzKEVsZW1lbnQqKSBjb25zdCBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIGJvb2wgaXNS b290ZWRBdERvY3VtZW50KCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gZmFsc2U7IH0KIAogcHJv dGVjdGVkOgogICAgIFRhZ05vZGVMaXN0KENvbnRhaW5lck5vZGUmIHJvb3ROb2RlLCBjb25zdCBB dG9taWNTdHJpbmcmIG5hbWVzcGFjZVVSSSwgY29uc3QgQXRvbWljU3RyaW5nJiBsb2NhbE5hbWUp OwpAQCAtNzQsNiArNzUsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB+SFRNTFRhZ05vZGVMaXN0 KCk7CiAKICAgICB2aXJ0dWFsIGJvb2wgbm9kZU1hdGNoZXMoRWxlbWVudCopIGNvbnN0IG92ZXJy aWRlOworICAgIHZpcnR1YWwgYm9vbCBpc1Jvb3RlZEF0RG9jdW1lbnQoKSBjb25zdCBvdmVycmlk ZSB7IHJldHVybiBmYWxzZTsgfQogCiBwcml2YXRlOgogICAgIEhUTUxUYWdOb2RlTGlzdChDb250 YWluZXJOb2RlJiByb290Tm9kZSwgY29uc3QgQXRvbWljU3RyaW5nJiBsb2NhbE5hbWUpOwpJbmRl eDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ29sbGVjdGlvbi5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ29sbGVjdGlvbi5jcHAJKHJldmlzaW9uIDE2NjQwMikK KysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTENvbGxlY3Rpb24uY3BwCSh3b3JraW5nIGNvcHkp CkBAIC02NSw3ICs2NSw3IEBAIHN0YXRpYyBib29sIHNob3VsZE9ubHlJbmNsdWRlRGlyZWN0Q2hp bGQKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLXN0YXRpYyBOb2RlTGlzdFJvb3RUeXBlIHJvb3RU eXBlRnJvbUNvbGxlY3Rpb25UeXBlKENvbGxlY3Rpb25UeXBlIHR5cGUpCitzdGF0aWMgSFRNTENv bGxlY3Rpb246OlJvb3RUeXBlIHJvb3RUeXBlRnJvbUNvbGxlY3Rpb25UeXBlKENvbGxlY3Rpb25U eXBlIHR5cGUpCiB7CiAgICAgc3dpdGNoICh0eXBlKSB7CiAgICAgY2FzZSBEb2NJbWFnZXM6CkBA IC03OSw3ICs3OSw3IEBAIHN0YXRpYyBOb2RlTGlzdFJvb3RUeXBlIHJvb3RUeXBlRnJvbUNvbGwK ICAgICBjYXNlIFdpbmRvd05hbWVkSXRlbXM6CiAgICAgY2FzZSBEb2N1bWVudE5hbWVkSXRlbXM6 CiAgICAgY2FzZSBGb3JtQ29udHJvbHM6Ci0gICAgICAgIHJldHVybiBOb2RlTGlzdElzUm9vdGVk QXREb2N1bWVudDsKKyAgICAgICAgcmV0dXJuIEhUTUxDb2xsZWN0aW9uOjpJc1Jvb3RlZEF0RG9j dW1lbnQ7CiAgICAgY2FzZSBOb2RlQ2hpbGRyZW46CiAgICAgY2FzZSBUYWJsZVRCb2RpZXM6CiAg ICAgY2FzZSBUU2VjdGlvblJvd3M6CkBAIC04OSwxMCArODksMTAgQEAgc3RhdGljIE5vZGVMaXN0 Um9vdFR5cGUgcm9vdFR5cGVGcm9tQ29sbAogICAgIGNhc2UgU2VsZWN0ZWRPcHRpb25zOgogICAg IGNhc2UgRGF0YUxpc3RPcHRpb25zOgogICAgIGNhc2UgTWFwQXJlYXM6Ci0gICAgICAgIHJldHVy biBOb2RlTGlzdElzUm9vdGVkQXROb2RlOworICAgICAgICByZXR1cm4gSFRNTENvbGxlY3Rpb246 OklzUm9vdGVkQXROb2RlOwogICAgIH0KICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICBy ZXR1cm4gTm9kZUxpc3RJc1Jvb3RlZEF0Tm9kZTsKKyAgICByZXR1cm4gSFRNTENvbGxlY3Rpb246 OklzUm9vdGVkQXROb2RlOwogfQogCiBzdGF0aWMgTm9kZUxpc3RJbnZhbGlkYXRpb25UeXBlIGlu dmFsaWRhdGlvblR5cGVFeGNsdWRpbmdJZEFuZE5hbWVBdHRyaWJ1dGVzKENvbGxlY3Rpb25UeXBl IHR5cGUpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDb2xsZWN0aW9uLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ29sbGVjdGlvbi5oCShyZXZpc2lvbiAx NjY0MDIpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDb2xsZWN0aW9uLmgJKHdvcmtpbmcg Y29weSkKQEAgLTEwMCw3ICsxMDAsMTEgQEAgcHVibGljOgogICAgIHZvaWQgbmFtZWRJdGVtcyhj b25zdCBBdG9taWNTdHJpbmcmIG5hbWUsIFZlY3RvcjxSZWY8RWxlbWVudD4+JikgY29uc3Q7CiAg ICAgc2l6ZV90IG1lbW9yeUNvc3QoKSBjb25zdCB7IHJldHVybiBtX2luZGV4Q2FjaGUubWVtb3J5 Q29zdCgpICsgKG1fbmFtZWRFbGVtZW50Q2FjaGUgPyBtX25hbWVkRWxlbWVudENhY2hlLT5tZW1v cnlDb3N0KCkgOiAwKTsgfQogCi0gICAgYm9vbCBpc1Jvb3RlZEF0RG9jdW1lbnQoKSBjb25zdCB7 IHJldHVybiBtX3Jvb3RUeXBlID09IE5vZGVMaXN0SXNSb290ZWRBdERvY3VtZW50OyB9CisgICAg ZW51bSBSb290VHlwZSB7CisgICAgICAgIElzUm9vdGVkQXROb2RlLAorICAgICAgICBJc1Jvb3Rl ZEF0RG9jdW1lbnQKKyAgICB9OworICAgIGJvb2wgaXNSb290ZWRBdERvY3VtZW50KCkgY29uc3Qg eyByZXR1cm4gbV9yb290VHlwZSA9PSBJc1Jvb3RlZEF0RG9jdW1lbnQ7IH0KICAgICBOb2RlTGlz dEludmFsaWRhdGlvblR5cGUgaW52YWxpZGF0aW9uVHlwZSgpIGNvbnN0IHsgcmV0dXJuIHN0YXRp Y19jYXN0PE5vZGVMaXN0SW52YWxpZGF0aW9uVHlwZT4obV9pbnZhbGlkYXRpb25UeXBlKTsgfQog ICAgIENvbGxlY3Rpb25UeXBlIHR5cGUoKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxDb2xs ZWN0aW9uVHlwZT4obV9jb2xsZWN0aW9uVHlwZSk7IH0KICAgICBDb250YWluZXJOb2RlJiBvd25l ck5vZGUoKSBjb25zdCB7IHJldHVybiBjb25zdF9jYXN0PENvbnRhaW5lck5vZGUmPihtX293bmVy Tm9kZS5nZXQoKSk7IH0KQEAgLTEzMyw3ICsxMzcsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgQ29udGFp bmVyTm9kZSYgcm9vdE5vZGUoKSBjb25zdDsKICAgICBib29sIHVzZXNDdXN0b21Gb3J3YXJkT25s eVRyYXZlcnNhbCgpIGNvbnN0IHsgcmV0dXJuIG1fdXNlc0N1c3RvbUZvcndhcmRPbmx5VHJhdmVy c2FsOyB9CiAKLSAgICBOb2RlTGlzdFJvb3RUeXBlIHJvb3RUeXBlKCkgY29uc3QgeyByZXR1cm4g c3RhdGljX2Nhc3Q8Tm9kZUxpc3RSb290VHlwZT4obV9yb290VHlwZSk7IH0KKyAgICBSb290VHlw ZSByb290VHlwZSgpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PFJvb3RUeXBlPihtX3Jvb3RU eXBlKTsgfQogCiAgICAgQ29sbGVjdGlvbk5hbWVkRWxlbWVudENhY2hlJiBjcmVhdGVOYW1lSXRl bUNhY2hlKCkgY29uc3QKICAgICB7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0xhYmVsc05v ZGVMaXN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0xhYmVsc05vZGVM aXN0LmNwcAkocmV2aXNpb24gMTY2NDAyKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9MYWJlbHNO b2RlTGlzdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM0LDcgKzM0LDcgQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogdXNpbmcgbmFtZXNwYWNlIEhUTUxOYW1lczsKIAogTGFiZWxzTm9kZUxpc3Q6Okxh YmVsc05vZGVMaXN0KExhYmVsYWJsZUVsZW1lbnQmIGZvck5vZGUpCi0gICAgOiBDYWNoZWRMaXZl Tm9kZUxpc3QoZm9yTm9kZSwgSW52YWxpZGF0ZU9uRm9yQXR0ckNoYW5nZSwgTm9kZUxpc3RJc1Jv b3RlZEF0RG9jdW1lbnQpCisgICAgOiBDYWNoZWRMaXZlTm9kZUxpc3QoZm9yTm9kZSwgSW52YWxp ZGF0ZU9uRm9yQXR0ckNoYW5nZSkKIHsKIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9M YWJlbHNOb2RlTGlzdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvTGFiZWxz Tm9kZUxpc3QuaAkocmV2aXNpb24gMTY2NDAyKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9MYWJl bHNOb2RlTGlzdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zOSw2ICszOSw3IEBAIHB1YmxpYzoKICAg ICB+TGFiZWxzTm9kZUxpc3QoKTsKIAogICAgIHZpcnR1YWwgYm9vbCBub2RlTWF0Y2hlcyhFbGVt ZW50KikgY29uc3Qgb3ZlcnJpZGU7CisgICAgdmlydHVhbCBib29sIGlzUm9vdGVkQXREb2N1bWVu dCgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIHRydWU7IH0KIAogcHJpdmF0ZToKICAgICBleHBs aWNpdCBMYWJlbHNOb2RlTGlzdChMYWJlbGFibGVFbGVtZW50JiBmb3JOb2RlKTsKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2h0bWwvUmFkaW9Ob2RlTGlzdC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvaHRtbC9SYWRpb05vZGVMaXN0LmNwcAkocmV2aXNpb24gMTY2NDAyKQorKysgU291 cmNlL1dlYkNvcmUvaHRtbC9SYWRpb05vZGVMaXN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzgs OCArMzgsOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiB1c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVz OwogCiBSYWRpb05vZGVMaXN0OjpSYWRpb05vZGVMaXN0KENvbnRhaW5lck5vZGUmIHJvb3ROb2Rl LCBjb25zdCBBdG9taWNTdHJpbmcmIG5hbWUpCi0gICAgOiBDYWNoZWRMaXZlTm9kZUxpc3Qocm9v dE5vZGUsIEludmFsaWRhdGVGb3JGb3JtQ29udHJvbHMsIGlzSFRNTEZvcm1FbGVtZW50KHJvb3RO b2RlKSA/IE5vZGVMaXN0SXNSb290ZWRBdERvY3VtZW50IDogTm9kZUxpc3RJc1Jvb3RlZEF0Tm9k ZSkKKyAgICA6IENhY2hlZExpdmVOb2RlTGlzdChyb290Tm9kZSwgSW52YWxpZGF0ZUZvckZvcm1D b250cm9scykKICAgICAsIG1fbmFtZShuYW1lKQorICAgICwgbV9pc1Jvb3RlZEF0RG9jdW1lbnQo aXNIVE1MRm9ybUVsZW1lbnQob3duZXJOb2RlKCkpKQogewogfQogCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9odG1sL1JhZGlvTm9kZUxpc3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9o dG1sL1JhZGlvTm9kZUxpc3QuaAkocmV2aXNpb24gMTY2NDAyKQorKysgU291cmNlL1dlYkNvcmUv aHRtbC9SYWRpb05vZGVMaXN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ1LDEyICs0NSwxNCBAQCBw dWJsaWM6CiAgICAgdm9pZCBzZXRWYWx1ZShjb25zdCBTdHJpbmcmKTsKIAogICAgIHZpcnR1YWwg Ym9vbCBub2RlTWF0Y2hlcyhFbGVtZW50KikgY29uc3Qgb3ZlcnJpZGU7CisgICAgdmlydHVhbCBi b29sIGlzUm9vdGVkQXREb2N1bWVudCgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIG1faXNSb290 ZWRBdERvY3VtZW50OyB9CiAKIHByaXZhdGU6CiAgICAgUmFkaW9Ob2RlTGlzdChDb250YWluZXJO b2RlJiwgY29uc3QgQXRvbWljU3RyaW5nJiBuYW1lKTsKICAgICBib29sIGNoZWNrRWxlbWVudE1h dGNoZXNSYWRpb05vZGVMaXN0RmlsdGVyKEVsZW1lbnQqKSBjb25zdDsKIAogICAgIEF0b21pY1N0 cmluZyBtX25hbWU7CisgICAgYm9vbCBtX2lzUm9vdGVkQXREb2N1bWVudDsKIH07CiAKIH0gLy8g bmFtZXBzYWNlCg==