39367 2010-05-19 10:39:47 -0700 Move member variables from NamedMappedAttrMap to its base class NamedNodeMap 2010-05-19 11:04:00 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 andersca webkit-unassigned oldest_to_newest 227881 0 andersca 2010-05-19 10:39:47 -0700 Move member variables from NamedMappedAttrMap to its base class NamedNodeMap 227882 1 andersca 2010-05-19 10:40:14 -0700 <rdar://problem/8003304> 227884 2 56501 andersca 2010-05-19 10:44:56 -0700 Created attachment 56501 Patch 227896 3 andersca 2010-05-19 11:04:00 -0700 Committed r59776: <http://trac.webkit.org/changeset/59776> 56501 2010-05-19 10:44:56 -0700 2010-05-19 10:50:41 -0700 Patch bug-39367-20100519104455.patch text/plain 8665 andersca SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1OTc3MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzEgQEAKKzIwMTAtMDUtMTkgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBNb3ZlIG1lbWJlciB2YXJpYWJsZXMgZnJvbSBOYW1lZE1hcHBlZEF0dHJNYXAgdG8gaXRzIGJh c2UgY2xhc3MgTmFtZWROb2RlTWFwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0zOTM2NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vODAwMzMwND4KKwor ICAgICAgICBUaGlzIGxldHMgdXMgZ2V0IHJpZCBvZiB0aGUgdnRhYmxlIHBvaW50ZXIgaW4gTmFt ZWROb2RlTWFwIHdoaWNoIHNhdmVzIDggYnl0ZXMsIGFuZCBhbHNvIGFsbG93cyB1cyB0bworICAg ICAgICBmaXQgdGhlIG1fbWFwcGVkQXR0cmlidXRlQ291bnQgdW5zaWduZWQgaW50IGluIHRoZSBS ZWZDb3VudGVkIHBhZGRpbmcgKGluIDY0LWJpdCkuCisgICAgICAgIAorICAgICAgICBUaGUgbmV0 IHJlc3VsdCBpcyB0aGF0IHdlIHNocmluayB0aGUgTmFtZWRNYXBwZWRBdHRyTWFwIHNpemUgYnkg MTYgYnl0ZXMsIHdoaWxlIGtlZXBpbmcgdGhlIHNpemUgb2YgTmFtZWROb2RlTWFwIHRoZSBzYW1l LgorCisgICAgICAgICogZG9tL0VsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVu dDo6Y3JlYXRlQXR0cmlidXRlTWFwKToKKyAgICAgICAgKiBkb20vRWxlbWVudC5oOgorICAgICAg ICAqIGRvbS9OYW1lZE1hcHBlZEF0dHJNYXAuY3BwOgorICAgICAgICAqIGRvbS9OYW1lZE1hcHBl ZEF0dHJNYXAuaDoKKyAgICAgICAgKFdlYkNvcmU6Ok5hbWVkTWFwcGVkQXR0ck1hcDo6TmFtZWRN YXBwZWRBdHRyTWFwKToKKyAgICAgICAgKiBkb20vTmFtZWROb2RlTWFwLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6Ok5hbWVkTm9kZU1hcDo6Y2xlYXJBdHRyaWJ1dGVzKToKKyAgICAgICAgKiBkb20v TmFtZWROb2RlTWFwLmg6CisgICAgICAgIChXZWJDb3JlOjpOYW1lZE5vZGVNYXA6Ok5hbWVkTm9k ZU1hcCk6CisgICAgICAgICogZG9tL05vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Tm9kZTo6 ZHVtcFN0YXRpc3RpY3MpOgorICAgICAgICAqIGRvbS9TdHlsZWRFbGVtZW50LmNwcDoKKyAgICAg ICAgKiBkb20vU3R5bGVkRWxlbWVudC5oOgorCiAyMDEwLTA1LTE5ICBNYXJjdXMgQnVsYWNoICA8 YnVsYWNoQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBTdGV2ZSBCbG9jay4K SW5kZXg6IFdlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZG9t L0VsZW1lbnQuY3BwCShyZXZpc2lvbiA1OTc3MCkKKysrIFdlYkNvcmUvZG9tL0VsZW1lbnQuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC03NTgsNyArNzU4LDcgQEAgS1VSTCBFbGVtZW50OjpiYXNlVVJJ KCkgY29uc3QKIAogdm9pZCBFbGVtZW50OjpjcmVhdGVBdHRyaWJ1dGVNYXAoKSBjb25zdAogewot ICAgIG5hbWVkQXR0ck1hcCA9IE5hbWVkTm9kZU1hcDo6Y3JlYXRlKGNvbnN0X2Nhc3Q8RWxlbWVu dCo+KHRoaXMpKTsKKyAgICBuYW1lZEF0dHJNYXAgPSBOYW1lZE1hcHBlZEF0dHJNYXA6OmNyZWF0 ZShjb25zdF9jYXN0PEVsZW1lbnQqPih0aGlzKSk7CiB9CiAKIGJvb2wgRWxlbWVudDo6aXNVUkxB dHRyaWJ1dGUoQXR0cmlidXRlKikgY29uc3QKSW5kZXg6IFdlYkNvcmUvZG9tL0VsZW1lbnQuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL2RvbS9FbGVtZW50LmgJKHJldmlzaW9uIDU5NzcwKQorKysg V2ViQ29yZS9kb20vRWxlbWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMTIsNyArMzEyLDcgQEAg cHJpdmF0ZToKIAogICAgIGJvb2wgcHNldWRvU3R5bGVDYWNoZUlzSW52YWxpZChjb25zdCBSZW5k ZXJTdHlsZSogY3VycmVudFN0eWxlLCBSZW5kZXJTdHlsZSogbmV3U3R5bGUpOwogCi0gICAgdmly dHVhbCB2b2lkIGNyZWF0ZUF0dHJpYnV0ZU1hcCgpIGNvbnN0OworICAgIHZvaWQgY3JlYXRlQXR0 cmlidXRlTWFwKCkgY29uc3Q7CiAKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlU3R5bGVBdHRyaWJ1 dGUoKSBjb25zdCB7IH0KIApJbmRleDogV2ViQ29yZS9kb20vTmFtZWRNYXBwZWRBdHRyTWFwLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2RvbS9OYW1lZE1hcHBlZEF0dHJNYXAuY3BwCShyZXZp c2lvbiA1OTc3MCkKKysrIFdlYkNvcmUvZG9tL05hbWVkTWFwcGVkQXR0ck1hcC5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTMxLDE4ICszMSw2IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotdm9p ZCBOYW1lZE1hcHBlZEF0dHJNYXA6OmNsZWFyQXR0cmlidXRlcygpCi17Ci0gICAgbV9jbGFzc05h bWVzLmNsZWFyKCk7Ci0gICAgbV9tYXBwZWRBdHRyaWJ1dGVDb3VudCA9IDA7Ci0gICAgTmFtZWRO b2RlTWFwOjpjbGVhckF0dHJpYnV0ZXMoKTsKLX0KLQotYm9vbCBOYW1lZE1hcHBlZEF0dHJNYXA6 OmlzTWFwcGVkQXR0cmlidXRlTWFwKCkgY29uc3QKLXsKLSAgICByZXR1cm4gdHJ1ZTsKLX0KLQog aW50IE5hbWVkTWFwcGVkQXR0ck1hcDo6ZGVjbENvdW50KCkgY29uc3QKIHsKICAgICBpbnQgcmVz dWx0ID0gMDsKSW5kZXg6IFdlYkNvcmUvZG9tL05hbWVkTWFwcGVkQXR0ck1hcC5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvZG9tL05hbWVkTWFwcGVkQXR0ck1hcC5oCShyZXZpc2lvbiA1OTc3MCkK KysrIFdlYkNvcmUvZG9tL05hbWVkTWFwcGVkQXR0ck1hcC5oCSh3b3JraW5nIGNvcHkpCkBAIC0y Nyw3ICsyNyw2IEBACiAjZGVmaW5lIE5hbWVkTWFwcGVkQXR0ck1hcF9oCiAKICNpbmNsdWRlICJO YW1lZE5vZGVNYXAuaCIKLSNpbmNsdWRlICJTcGFjZVNwbGl0U3RyaW5nLmgiCiAKIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIApAQCAtNDYsMTUgKzQ1LDkgQEAgcHVibGljOgogICAgIGJvb2wgbWFwc0Vx dWl2YWxlbnQoY29uc3QgTmFtZWRNYXBwZWRBdHRyTWFwKikgY29uc3Q7CiAKIHByaXZhdGU6Ci0g ICAgTmFtZWRNYXBwZWRBdHRyTWFwKEVsZW1lbnQqIGVsZW1lbnQpIDogTmFtZWROb2RlTWFwKGVs ZW1lbnQpLCBtX21hcHBlZEF0dHJpYnV0ZUNvdW50KDApIHsgfQotCi0gICAgdmlydHVhbCB2b2lk IGNsZWFyQXR0cmlidXRlcygpOwotICAgIHZpcnR1YWwgYm9vbCBpc01hcHBlZEF0dHJpYnV0ZU1h cCgpIGNvbnN0OworICAgIE5hbWVkTWFwcGVkQXR0ck1hcChFbGVtZW50KiBlbGVtZW50KSA6IE5h bWVkTm9kZU1hcChlbGVtZW50KSB7IH0KIAogICAgIGludCBkZWNsQ291bnQoKSBjb25zdDsKLQot ICAgIFNwYWNlU3BsaXRTdHJpbmcgbV9jbGFzc05hbWVzOwotICAgIGludCBtX21hcHBlZEF0dHJp YnV0ZUNvdW50OwogfTsKIAogfSAvL25hbWVzcGFjZQpJbmRleDogV2ViQ29yZS9kb20vTmFtZWRO b2RlTWFwLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2RvbS9OYW1lZE5vZGVNYXAuY3BwCShy ZXZpc2lvbiA1OTc3MCkKKysrIFdlYkNvcmUvZG9tL05hbWVkTm9kZU1hcC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTU0LDExICs1NCw2IEBAIE5hbWVkTm9kZU1hcDo6fk5hbWVkTm9kZU1hcCgpCiAg ICAgZGV0YWNoQXR0cmlidXRlc0Zyb21FbGVtZW50KCk7CiB9CiAKLWJvb2wgTmFtZWROb2RlTWFw Ojppc01hcHBlZEF0dHJpYnV0ZU1hcCgpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIGZhbHNlOwotfQot CiBQYXNzUmVmUHRyPE5vZGU+IE5hbWVkTm9kZU1hcDo6Z2V0TmFtZWRJdGVtKGNvbnN0IFN0cmlu ZyYgbmFtZSkgY29uc3QKIHsKICAgICBBdHRyaWJ1dGUqIGEgPSBnZXRBdHRyaWJ1dGVJdGVtKG5h bWUsIHNob3VsZElnbm9yZUF0dHJpYnV0ZUNhc2UobV9lbGVtZW50KSk7CkBAIC0yMDUsNiArMjAw LDkgQEAgQXR0cmlidXRlKiBOYW1lZE5vZGVNYXA6OmdldEF0dHJpYnV0ZUl0ZQogCiB2b2lkIE5h bWVkTm9kZU1hcDo6Y2xlYXJBdHRyaWJ1dGVzKCkKIHsKKyAgICBtX2NsYXNzTmFtZXMuY2xlYXIo KTsKKyAgICBtX21hcHBlZEF0dHJpYnV0ZUNvdW50ID0gMDsKKwogICAgIGRldGFjaEF0dHJpYnV0 ZXNGcm9tRWxlbWVudCgpOwogICAgIG1fYXR0cmlidXRlcy5jbGVhcigpOwogfQpJbmRleDogV2Vi Q29yZS9kb20vTmFtZWROb2RlTWFwLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9kb20vTmFtZWRO b2RlTWFwLmgJKHJldmlzaW9uIDU5NzcwKQorKysgV2ViQ29yZS9kb20vTmFtZWROb2RlTWFwLmgJ KHdvcmtpbmcgY29weSkKQEAgLTI2LDYgKzI2LDcgQEAKICNkZWZpbmUgTmFtZWROb2RlTWFwX2gK IAogI2luY2x1ZGUgIkF0dHJpYnV0ZS5oIgorI2luY2x1ZGUgIlNwYWNlU3BsaXRTdHJpbmcuaCIK IAogI2lmZGVmIF9fT0JKQ19fCiAjZGVmaW5lIGlkIGlkX0FWT0lEX0tFWVdPUkQKQEAgLTQxLDEy ICs0MiwxNiBAQCBjbGFzcyBOYW1lZE5vZGVNYXAgOiBwdWJsaWMgUmVmQ291bnRlZDxOCiAgICAg ZnJpZW5kIGNsYXNzIEVsZW1lbnQ7CiAKIHByb3RlY3RlZDoKLSAgICBOYW1lZE5vZGVNYXAoRWxl bWVudCogZWxlbWVudCkgOiBtX2VsZW1lbnQoZWxlbWVudCkgeyB9CisgICAgTmFtZWROb2RlTWFw KEVsZW1lbnQqIGVsZW1lbnQpIAorICAgICAgICA6IG1fbWFwcGVkQXR0cmlidXRlQ291bnQoMCkK KyAgICAgICAgLCBtX2VsZW1lbnQoZWxlbWVudCkKKyAgICB7CisgICAgfQogCiBwdWJsaWM6CiAg ICAgc3RhdGljIFBhc3NSZWZQdHI8TmFtZWROb2RlTWFwPiBjcmVhdGUoRWxlbWVudCogZWxlbWVu dCkgeyByZXR1cm4gYWRvcHRSZWYobmV3IE5hbWVkTm9kZU1hcChlbGVtZW50KSk7IH0KIAotICAg IHZpcnR1YWwgfk5hbWVkTm9kZU1hcCgpOworICAgIH5OYW1lZE5vZGVNYXAoKTsKIAogICAgIC8v IFB1YmxpYyBET00gaW50ZXJmYWNlLgogCkBAIC04NSw4ICs5MCw2IEBAIHB1YmxpYzoKICAgICAg ICAgICAgIGFkZEF0dHJpYnV0ZShuZXdBdHRyaWJ1dGUpOwogICAgIH0KIAotICAgIHZpcnR1YWwg Ym9vbCBpc01hcHBlZEF0dHJpYnV0ZU1hcCgpIGNvbnN0OwotCiAgICAgY29uc3QgQXRvbWljU3Ry aW5nJiBpZCgpIGNvbnN0IHsgcmV0dXJuIG1faWQ7IH0KICAgICB2b2lkIHNldElEKGNvbnN0IEF0 b21pY1N0cmluZyYgbmV3SWQpIHsgbV9pZCA9IG5ld0lkOyB9CiAKQEAgLTk5LDE0ICsxMDIsMTYg QEAgcHVibGljOgogICAgIEVsZW1lbnQqIGVsZW1lbnQoKSBjb25zdCB7IHJldHVybiBtX2VsZW1l bnQ7IH0KIAogcHJvdGVjdGVkOgotICAgIHZpcnR1YWwgdm9pZCBjbGVhckF0dHJpYnV0ZXMoKTsK KyAgICBpbnQgbV9tYXBwZWRBdHRyaWJ1dGVDb3VudDsKKyAgICBTcGFjZVNwbGl0U3RyaW5nIG1f Y2xhc3NOYW1lczsKIAogcHJpdmF0ZToKICAgICB2b2lkIGRldGFjaEF0dHJpYnV0ZXNGcm9tRWxl bWVudCgpOwogICAgIHZvaWQgZGV0YWNoRnJvbUVsZW1lbnQoKTsKICAgICBBdHRyaWJ1dGUqIGdl dEF0dHJpYnV0ZUl0ZW0oY29uc3QgU3RyaW5nJiBuYW1lLCBib29sIHNob3VsZElnbm9yZUF0dHJp YnV0ZUNhc2UpIGNvbnN0OwogICAgIEF0dHJpYnV0ZSogZ2V0QXR0cmlidXRlSXRlbVNsb3dDYXNl KGNvbnN0IFN0cmluZyYgbmFtZSwgYm9vbCBzaG91bGRJZ25vcmVBdHRyaWJ1dGVDYXNlKSBjb25z dDsKLQorICAgIHZvaWQgY2xlYXJBdHRyaWJ1dGVzKCk7CisgICAgCiAgICAgRWxlbWVudCogbV9l bGVtZW50OwogICAgIFZlY3RvcjxSZWZQdHI8QXR0cmlidXRlPiA+IG1fYXR0cmlidXRlczsKICAg ICBBdG9taWNTdHJpbmcgbV9pZDsKSW5kZXg6IFdlYkNvcmUvZG9tL05vZGUuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvZG9tL05vZGUuY3BwCShyZXZpc2lvbiA1OTc3MCkKKysrIFdlYkNvcmUv ZG9tL05vZGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDcsNyArMTQ3LDYgQEAgdm9pZCBOb2Rl OjpkdW1wU3RhdGlzdGljcygpCiAgICAgc2l6ZV90IG1hcHBlZEF0dHJpYnV0ZXNXaXRoU3R5bGVE ZWNsID0gMDsKICAgICBzaXplX3QgYXR0cmlidXRlc1dpdGhBdHRyID0gMDsKICAgICBzaXplX3Qg YXR0ck1hcHMgPSAwOwotICAgIHNpemVfdCBtYXBwZWRBdHRyTWFwcyA9IDA7CiAKICAgICBmb3Ig KEhhc2hTZXQ8Tm9kZSo+OjppdGVyYXRvciBpdCA9IGxpdmVOb2RlU2V0LmJlZ2luKCk7IGl0ICE9 IGxpdmVOb2RlU2V0LmVuZCgpOyArK2l0KSB7CiAgICAgICAgIE5vZGUqIG5vZGUgPSAqaXQ7CkBA IC0xNjksOCArMTY4LDYgQEAgdm9pZCBOb2RlOjpkdW1wU3RhdGlzdGljcygpCiAgICAgICAgICAg ICAgICAgaWYgKE5hbWVkTm9kZU1hcCogYXR0ck1hcCA9IGVsZW1lbnQtPmF0dHJpYnV0ZXModHJ1 ZSkpIHsKICAgICAgICAgICAgICAgICAgICAgYXR0cmlidXRlcyArPSBhdHRyTWFwLT5sZW5ndGgo KTsKICAgICAgICAgICAgICAgICAgICAgKythdHRyTWFwczsKLSAgICAgICAgICAgICAgICAgICAg aWYgKGF0dHJNYXAtPmlzTWFwcGVkQXR0cmlidXRlTWFwKCkpCi0gICAgICAgICAgICAgICAgICAg ICAgICArK21hcHBlZEF0dHJNYXBzOwogICAgICAgICAgICAgICAgICAgICBmb3IgKHVuc2lnbmVk IGkgPSAwOyBpIDwgYXR0ck1hcC0+bGVuZ3RoKCk7ICsraSkgewogICAgICAgICAgICAgICAgICAg ICAgICAgQXR0cmlidXRlKiBhdHRyID0gYXR0ck1hcC0+YXR0cmlidXRlSXRlbShpKTsKICAgICAg ICAgICAgICAgICAgICAgICAgIGlmIChhdHRyLT5hdHRyKCkpCkBAIC0yNjMsOCArMjYwLDcgQEAg dm9pZCBOb2RlOjpkdW1wU3RhdGlzdGljcygpCiAgICAgcHJpbnRmKCIgIE51bWJlciBvZiBNYXBw ZWRBdHRyaWJ1dGVzOiAlenUgWyV6dV1cbiIsIG1hcHBlZEF0dHJpYnV0ZXMsIHNpemVvZihNYXBw ZWRBdHRyaWJ1dGUpKTsKICAgICBwcmludGYoIiAgTnVtYmVyIG9mIE1hcHBlZEF0dHJpYnV0ZXMg d2l0aCBhIFN0eWxlRGVjbGFyYXRpb246ICV6dVxuIiwgbWFwcGVkQXR0cmlidXRlc1dpdGhTdHls ZURlY2wpOwogICAgIHByaW50ZigiICBOdW1iZXIgb2YgQXR0cmlidXRlcyB3aXRoIGFuIEF0dHI6 ICV6dVxuIiwgYXR0cmlidXRlc1dpdGhBdHRyKTsKLSAgICBwcmludGYoIiAgTnVtYmVyIG9mIE5h bWVkTm9kZU1hcHM6ICV6dVxuIiwgYXR0ck1hcHMpOwotICAgIHByaW50ZigiICBOdW1iZXIgb2Yg TmFtZWRNYXBwZWRBdHRyTWFwOiAlenVcbiIsIG1hcHBlZEF0dHJNYXBzKTsKKyAgICBwcmludGYo IiAgTnVtYmVyIG9mIE5hbWVkTm9kZU1hcHM6ICV6dSBbJXp1XVxuIiwgYXR0ck1hcHMsIHNpemVv ZihOYW1lZE5vZGVNYXApKTsKICNlbmRpZgogfQogCkluZGV4OiBXZWJDb3JlL2RvbS9TdHlsZWRF bGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2RvbS9TdHlsZWRFbGVtZW50LmNwcAko cmV2aXNpb24gNTk3NzApCisrKyBXZWJDb3JlL2RvbS9TdHlsZWRFbGVtZW50LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMjUzLDExICsyNTMsNiBAQCB2b2lkIFN0eWxlZEVsZW1lbnQ6OnBhcnNlTWFw cGVkQXR0cmlidXRlCiAgICAgfQogfQogCi12b2lkIFN0eWxlZEVsZW1lbnQ6OmNyZWF0ZUF0dHJp YnV0ZU1hcCgpIGNvbnN0Ci17Ci0gICAgbmFtZWRBdHRyTWFwID0gTmFtZWRNYXBwZWRBdHRyTWFw OjpjcmVhdGUoY29uc3RfY2FzdDxTdHlsZWRFbGVtZW50Kj4odGhpcykpOwotfQotCiBDU1NNdXRh YmxlU3R5bGVEZWNsYXJhdGlvbiogU3R5bGVkRWxlbWVudDo6Z2V0SW5saW5lU3R5bGVEZWNsKCkK IHsKICAgICBpZiAoIW1faW5saW5lU3R5bGVEZWNsKQpJbmRleDogV2ViQ29yZS9kb20vU3R5bGVk RWxlbWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZG9tL1N0eWxlZEVsZW1lbnQuaAkocmV2 aXNpb24gNTk3NzApCisrKyBXZWJDb3JlL2RvbS9TdHlsZWRFbGVtZW50LmgJKHdvcmtpbmcgY29w eSkKQEAgLTk4LDggKzk4LDYgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRlc3Ryb3lJbmxpbmVTdHls ZURlY2woKTsKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlU3R5bGVBdHRyaWJ1dGUoKSBjb25zdDsK IAotICAgIHZpcnR1YWwgdm9pZCBjcmVhdGVBdHRyaWJ1dGVNYXAoKSBjb25zdDsKLQogICAgIFJl ZlB0cjxDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbj4gbV9pbmxpbmVTdHlsZURlY2w7CiB9Owog Cg==