80169 2012-03-02 10:12:10 -0800 Create a method in Element to compare attributes with other Element 2012-03-07 19:57:26 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 75069 1 cmarcelo cmarcelo darin kling koivisto pnormand rniwa oldest_to_newest 569733 0 cmarcelo 2012-03-02 10:12:10 -0800 Create a method in Element to compare attributes with other Element 569739 1 129918 cmarcelo 2012-03-02 10:18:19 -0800 Created attachment 129918 Patch 569744 2 129918 rniwa 2012-03-02 10:26:19 -0800 Comment on attachment 129918 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=129918&action=review > Source/WebCore/dom/Node.cpp:1775 > + if (isElementNode() && !toElement(this)->hasEquivalentAttributes(toElement(other))) Maybe we should an inline helper that takes Node* and returns false when its' not an element? That'll avoid having to cast nodes. > Source/WebCore/editing/htmlediting.cpp:1161 > + if (!firstElement->tagQName().matches(secondElement->tagQName())) Can't we do firstElement->hasTagQName(secondElement->tagQName()) ? Maybe this is slower? 569746 3 rniwa 2012-03-02 10:26:40 -0800 This is a very nice refactoring! 569772 4 cmarcelo 2012-03-02 11:02:23 -0800 Committed r109585: <http://trac.webkit.org/changeset/109585> 569792 5 pnormand 2012-03-02 11:33:02 -0800 (In reply to comment #4) > Committed r109585: <http://trac.webkit.org/changeset/109585> Broke the GTK build :( 569798 6 pnormand 2012-03-02 11:37:48 -0800 (In reply to comment #5) > (In reply to comment #4) > > Committed r109585: <http://trac.webkit.org/changeset/109585> > > Broke the GTK build :( Sorry it seems to be a false alarm, the 64-bit Release bot looks hosed, let's try a full clean build. 129918 2012-03-02 10:18:19 -0800 2012-03-02 10:26:19 -0800 Patch bug-80169-20120302151817.patch text/plain 7863 cmarcelo U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5NTgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWE0NTRiYjQ5NzYyMjZk NTU4MTM1YWU1NDg4ZmFjZDFjNWJiNTUwMy4uYjdiNDYzMDRkOGJlZGRhMDdiZDQ0NmJkYjY2MmFk ZDliZWRmZWYzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEyLTAzLTAyICBDYWlv IE1hcmNlbG8gZGUgT2xpdmVpcmEgRmlsaG8gIDxjYWlvLm9saXZlaXJhQG9wZW5ib3NzYS5vcmc+ CisKKyAgICAgICAgQ3JlYXRlIGEgbWV0aG9kIGluIEVsZW1lbnQgdG8gY29tcGFyZSBhdHRyaWJ1 dGVzIHdpdGggb3RoZXIgRWxlbWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9ODAxNjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBBdm9pZCBtYW51YWxseSBwZWVraW5nIGF0IGF0dHJpYnV0ZSBzdG9yYWdl IHRvIGdldCB0aGlzIGluZm9ybWF0aW9uLiBUaGlzCisgICAgICAgIHNpbXBsaWZ5IHRoZSBjYWxs c2l0ZXMuIFRoZSBhY3R1YWwgaW1wbGVtZW50YXRpb24gb2YgY29tcGFyaXNvbiB3YXMgbW92ZWQg dG8KKyAgICAgICAgRWxlbWVudEF0dHJpYnV0ZURhdGEuIFRoZSBtYXBzRXF1aXZhbGVudCgpIGZ1 bmN0aW9uIHN0aWxsIGV4aXN0cyBmb3IgdGhlIHNha2UKKyAgICAgICAgb2YgRG9jdW1lbnRUeXBl IG5vZGVzLgorCisgICAgICAgICogZG9tL0VsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RWxlbWVudDo6aGFzRXF1aXZhbGVudEF0dHJpYnV0ZXMpOgorICAgICAgICAoV2ViQ29yZSk6Cisg ICAgICAgICogZG9tL0VsZW1lbnQuaDoKKyAgICAgICAgKEVsZW1lbnQpOgorICAgICAgICAqIGRv bS9FbGVtZW50QXR0cmlidXRlRGF0YS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50QXR0 cmlidXRlRGF0YTo6aXNFcXVpdmFsZW50KToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAq IGRvbS9FbGVtZW50QXR0cmlidXRlRGF0YS5oOgorICAgICAgICAoRWxlbWVudEF0dHJpYnV0ZURh dGEpOgorICAgICAgICAqIGRvbS9OYW1lZE5vZGVNYXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 TmFtZWROb2RlTWFwOjptYXBzRXF1aXZhbGVudCk6CisgICAgICAgICogZG9tL05vZGUuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Tm9kZTo6aXNFcXVhbE5vZGUpOgorICAgICAgICAqIGVkaXRpbmcv aHRtbGVkaXRpbmcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6YXJlSWRlbnRpY2FsRWxlbWVudHMp OgorCiAyMDEyLTAzLTAyICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K IAogICAgICAgICBbR1N0cmVhbWVyXSBtZWRpYS9tZWRpYS1jYW4tcGxheS1mbGFjLWF1ZGlvLmh0 bWwgZmFpbHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAppbmRleCBkNzk4YWYxMGFmZTBjN2MyMWU1Yjhm ZTQ0NWYxMWRjYWI3YTAxYTA3Li5hZGQ2ZjQ2YjdiZjZhMzRmNzhjMTNhN2ZlODc3NWQ4MTQ4MTll NmNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCkBAIC03NzUsNiArNzc1LDE3IEBAIGJvb2wgRWxl bWVudDo6aGFzQXR0cmlidXRlcygpIGNvbnN0CiAgICAgcmV0dXJuIG1fYXR0cmlidXRlTWFwICYm IG1fYXR0cmlidXRlTWFwLT5sZW5ndGgoKTsKIH0KIAorYm9vbCBFbGVtZW50OjpoYXNFcXVpdmFs ZW50QXR0cmlidXRlcyhjb25zdCBFbGVtZW50KiBvdGhlcikgY29uc3QKK3sKKyAgICBFbGVtZW50 QXR0cmlidXRlRGF0YSogYXR0cmlidXRlRGF0YSA9IHVwZGF0ZWRBdHRyaWJ1dGVEYXRhKCk7Cisg ICAgRWxlbWVudEF0dHJpYnV0ZURhdGEqIG90aGVyQXR0cmlidXRlRGF0YSA9IG90aGVyLT51cGRh dGVkQXR0cmlidXRlRGF0YSgpOworICAgIGlmIChhdHRyaWJ1dGVEYXRhKQorICAgICAgICByZXR1 cm4gYXR0cmlidXRlRGF0YS0+aXNFcXVpdmFsZW50KG90aGVyQXR0cmlidXRlRGF0YSk7CisgICAg aWYgKG90aGVyQXR0cmlidXRlRGF0YSkKKyAgICAgICAgcmV0dXJuIG90aGVyQXR0cmlidXRlRGF0 YS0+aXNFcXVpdmFsZW50KGF0dHJpYnV0ZURhdGEpOworICAgIHJldHVybiB0cnVlOworfQorCiBT dHJpbmcgRWxlbWVudDo6bm9kZU5hbWUoKSBjb25zdAogewogICAgIHJldHVybiBtX3RhZ05hbWUu dG9TdHJpbmcoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmggYi9T b3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5oCmluZGV4IDk4NTM3NmM3MzljYjU3NWNlYTUyNDQz OTExZjU4OGQ4N2IxYWNmZjEuLjlkMjRiOTg5ZTUzM2ExZjA3YWJiNDU4MDQ2ZDMyNjQ3NWQwMjFi ZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmgKKysrIGIvU291cmNl L1dlYkNvcmUvZG9tL0VsZW1lbnQuaApAQCAtMjQ1LDYgKzI0NSw3IEBAIHB1YmxpYzoKICAgICBF bGVtZW50QXR0cmlidXRlRGF0YSogZW5zdXJlVXBkYXRlZEF0dHJpYnV0ZURhdGEoKSBjb25zdDsK IAogICAgIHZvaWQgc2V0QXR0cmlidXRlc0Zyb21FbGVtZW50KGNvbnN0IEVsZW1lbnQmKTsKKyAg ICBib29sIGhhc0VxdWl2YWxlbnRBdHRyaWJ1dGVzKGNvbnN0IEVsZW1lbnQqIG90aGVyKSBjb25z dDsKIAogICAgIHZpcnR1YWwgdm9pZCBjb3B5Tm9uQXR0cmlidXRlUHJvcGVydGllcyhjb25zdCBF bGVtZW50KiBzb3VyY2UpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVu dEF0dHJpYnV0ZURhdGEuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnRBdHRyaWJ1dGVE YXRhLmNwcAppbmRleCA3NjlmZWI0MWU5YWNmZWJiNTMwNjNiMDFjNDA1ZjUxMDI1NDQ4NzY0Li42 N2UyNmI0MTcxZWFlNWNlZWM0OTg4NDY4YzY5YzMwMTkwNWIyYzg1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9kb20vRWxlbWVudEF0dHJpYnV0ZURhdGEuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2RvbS9FbGVtZW50QXR0cmlidXRlRGF0YS5jcHAKQEAgLTEwMyw2ICsxMDMsMjUgQEAgdm9p ZCBFbGVtZW50QXR0cmlidXRlRGF0YTo6cmVtb3ZlQXR0cmlidXRlKHNpemVfdCBpbmRleCwgRWxl bWVudCogZWxlbWVudCkKICAgICAgICAgZWxlbWVudC0+ZGlkUmVtb3ZlQXR0cmlidXRlKGF0dHJp YnV0ZS5nZXQoKSk7CiB9CiAKK2Jvb2wgRWxlbWVudEF0dHJpYnV0ZURhdGE6OmlzRXF1aXZhbGVu dChjb25zdCBFbGVtZW50QXR0cmlidXRlRGF0YSogb3RoZXIpIGNvbnN0Cit7CisgICAgaWYgKCFv dGhlcikKKyAgICAgICAgcmV0dXJuIGlzRW1wdHkoKTsKKworICAgIHVuc2lnbmVkIGxlbiA9IGxl bmd0aCgpOworICAgIGlmIChsZW4gIT0gb3RoZXItPmxlbmd0aCgpKQorICAgICAgICByZXR1cm4g ZmFsc2U7CisKKyAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbGVuOyBpKyspIHsKKyAgICAg ICAgQXR0cmlidXRlKiBhdHRyID0gYXR0cmlidXRlSXRlbShpKTsKKyAgICAgICAgQXR0cmlidXRl KiBvdGhlckF0dHIgPSBvdGhlci0+Z2V0QXR0cmlidXRlSXRlbShhdHRyLT5uYW1lKCkpOworICAg ICAgICBpZiAoIW90aGVyQXR0ciB8fCBhdHRyLT52YWx1ZSgpICE9IG90aGVyQXR0ci0+dmFsdWUo KSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKKyAgICByZXR1cm4gdHJ1ZTsK K30KKwogdm9pZCBFbGVtZW50QXR0cmlidXRlRGF0YTo6ZGV0YWNoQXR0cmlidXRlc0Zyb21FbGVt ZW50KCkKIHsKICAgICBzaXplX3Qgc2l6ZSA9IG1fYXR0cmlidXRlcy5zaXplKCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudEF0dHJpYnV0ZURhdGEuaCBiL1NvdXJjZS9X ZWJDb3JlL2RvbS9FbGVtZW50QXR0cmlidXRlRGF0YS5oCmluZGV4IDNkOTk3NjFjMWM2ZWRmMjFm ZWRkYzAwYjMzNzE5ZjY2YzdhODQ3NTguLjZiYmNkNWVlYzRhNTk5NmZhZmJmOTg2YTBkNmY0NTg4 NWE2YTMzYjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50QXR0cmlidXRl RGF0YS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50QXR0cmlidXRlRGF0YS5oCkBA IC0xMTMsNiArMTEzLDggQEAgcHVibGljOgogICAgIGJvb2wgaGFzSUQoKSBjb25zdCB7IHJldHVy biAhbV9pZEZvclN0eWxlUmVzb2x1dGlvbi5pc051bGwoKTsgfQogICAgIGJvb2wgaGFzQ2xhc3Mo KSBjb25zdCB7IHJldHVybiAhbV9jbGFzc05hbWVzLmlzTnVsbCgpOyB9CiAKKyAgICBib29sIGlz RXF1aXZhbGVudChjb25zdCBFbGVtZW50QXR0cmlidXRlRGF0YSogb3RoZXIpIGNvbnN0OworCiBw cml2YXRlOgogICAgIGZyaWVuZCBjbGFzcyBFbGVtZW50OwogICAgIGZyaWVuZCBjbGFzcyBOYW1l ZE5vZGVNYXA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vTmFtZWROb2RlTWFwLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9OYW1lZE5vZGVNYXAuY3BwCmluZGV4IDg2MDUwNGU5NTUz OTE2NDJmNTMyN2Q2MTI1ZGU3NTc3YjBjOGU2YzMuLmM3YTgzZTVhMjBhOTRjOGU1M2EyZGEwNGNk N2JmYWEwMmUzODBmZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9OYW1lZE5vZGVN YXAuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9OYW1lZE5vZGVNYXAuY3BwCkBAIC0xNzIs MjAgKzE3Miw3IEBAIGJvb2wgTmFtZWROb2RlTWFwOjptYXBzRXF1aXZhbGVudChjb25zdCBOYW1l ZE5vZGVNYXAqIG90aGVyTWFwKSBjb25zdAogewogICAgIGlmICghb3RoZXJNYXApCiAgICAgICAg IHJldHVybiBtX2F0dHJpYnV0ZURhdGEuaXNFbXB0eSgpOwotICAgIAotICAgIHVuc2lnbmVkIGxl biA9IGxlbmd0aCgpOwotICAgIGlmIChsZW4gIT0gb3RoZXJNYXAtPmxlbmd0aCgpKQotICAgICAg ICByZXR1cm4gZmFsc2U7Ci0gICAgCi0gICAgY29uc3QgRWxlbWVudEF0dHJpYnV0ZURhdGEmIG90 aGVyQXR0cmlidXRlRGF0YSA9IG90aGVyTWFwLT5tX2F0dHJpYnV0ZURhdGE7Ci0gICAgZm9yICh1 bnNpZ25lZCBpID0gMDsgaSA8IGxlbjsgaSsrKSB7Ci0gICAgICAgIEF0dHJpYnV0ZSogYXR0ciA9 IG1fYXR0cmlidXRlRGF0YS5hdHRyaWJ1dGVJdGVtKGkpOwotICAgICAgICBBdHRyaWJ1dGUqIG90 aGVyQXR0ciA9IG90aGVyQXR0cmlidXRlRGF0YS5nZXRBdHRyaWJ1dGVJdGVtKGF0dHItPm5hbWUo KSk7Ci0gICAgICAgIGlmICghb3RoZXJBdHRyIHx8IGF0dHItPnZhbHVlKCkgIT0gb3RoZXJBdHRy LT52YWx1ZSgpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIH0KLSAgICAKLSAgICBy ZXR1cm4gdHJ1ZTsKKyAgICByZXR1cm4gbV9hdHRyaWJ1dGVEYXRhLmlzRXF1aXZhbGVudChvdGhl ck1hcC0+YXR0cmlidXRlRGF0YSgpKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9t L05vZGUuY3BwCmluZGV4IGY1YWFjOGE5ZTkwZDIxZjEzM2I0YzI5MTdkNzk1ODEyOWIzMGE2Zjcu LmI1NmNmMTYwZDQ3ZjcyYWRjNDEyNjY3Zjc0MTg1M2RmNDlkMDMxNGYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5j cHAKQEAgLTE3NzIsMTggKzE3NzIsOCBAQCBib29sIE5vZGU6OmlzRXF1YWxOb2RlKE5vZGUqIG90 aGVyKSBjb25zdAogICAgIGlmIChub2RlVmFsdWUoKSAhPSBvdGhlci0+bm9kZVZhbHVlKCkpCiAg ICAgICAgIHJldHVybiBmYWxzZTsKICAgICAKLSAgICBpZiAoaXNFbGVtZW50Tm9kZSgpKSB7Ci0g ICAgICAgIE5hbWVkTm9kZU1hcCogYXR0cmlidXRlcyA9IHRvRWxlbWVudCh0aGlzKS0+dXBkYXRl ZEF0dHJpYnV0ZXMoKTsKLSAgICAgICAgTmFtZWROb2RlTWFwKiBvdGhlckF0dHJpYnV0ZXMgPSB0 b0VsZW1lbnQob3RoZXIpLT51cGRhdGVkQXR0cmlidXRlcygpOwotCi0gICAgICAgIGlmIChhdHRy aWJ1dGVzKSB7Ci0gICAgICAgICAgICBpZiAoIWF0dHJpYnV0ZXMtPm1hcHNFcXVpdmFsZW50KG90 aGVyQXR0cmlidXRlcykpCi0gICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICB9 IGVsc2UgaWYgKG90aGVyQXR0cmlidXRlcykgewotICAgICAgICAgICAgaWYgKCFvdGhlckF0dHJp YnV0ZXMtPm1hcHNFcXVpdmFsZW50KGF0dHJpYnV0ZXMpKQotICAgICAgICAgICAgICAgIHJldHVy biBmYWxzZTsKLSAgICAgICAgfQotICAgIH0KKyAgICBpZiAoaXNFbGVtZW50Tm9kZSgpICYmICF0 b0VsZW1lbnQodGhpcyktPmhhc0VxdWl2YWxlbnRBdHRyaWJ1dGVzKHRvRWxlbWVudChvdGhlcikp KQorICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgCiAgICAgTm9kZSogY2hpbGQgPSBmaXJzdENo aWxkKCk7CiAgICAgTm9kZSogb3RoZXJDaGlsZCA9IG90aGVyLT5maXJzdENoaWxkKCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2h0bWxlZGl0aW5nLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvaHRtbGVkaXRpbmcuY3BwCmluZGV4IGI2ZDMwYTE4Yjk4NWIxNDU1NzFl M2ZhOTE2YTcwYTVjNTY2YWM5MTEuLmJmZTI2Y2NhYmI3NTA3MTk0ZjdkNGM2YzZiYzk1ODE1YmEw MTAxM2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvaHRtbGVkaXRpbmcuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvaHRtbGVkaXRpbmcuY3BwCkBAIC0xMTUzLDIy ICsxMTUzLDE1IEBAIGJvb2wgaXNSZW5kZXJlZEFzTm9uSW5saW5lVGFibGVJbWFnZU9ySFIoY29u c3QgTm9kZSogbm9kZSkKIAogYm9vbCBhcmVJZGVudGljYWxFbGVtZW50cyhjb25zdCBOb2RlKiBm aXJzdCwgY29uc3QgTm9kZSogc2Vjb25kKQogewotICAgIC8vIGNoZWNrIHRoYXQgdGFnIG5hbWUg YW5kIGFsbCBhdHRyaWJ1dGUgbmFtZXMgYW5kIHZhbHVlcyBhcmUgaWRlbnRpY2FsCi0KICAgICBp ZiAoIWZpcnN0LT5pc0VsZW1lbnROb2RlKCkgfHwgIXNlY29uZC0+aXNFbGVtZW50Tm9kZSgpKQog ICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAoIXRvRWxlbWVudChmaXJzdCktPnRhZ1FO YW1lKCkubWF0Y2hlcyh0b0VsZW1lbnQoc2Vjb25kKS0+dGFnUU5hbWUoKSkpCisgICAgY29uc3Qg RWxlbWVudCogZmlyc3RFbGVtZW50ID0gdG9FbGVtZW50KGZpcnN0KTsKKyAgICBjb25zdCBFbGVt ZW50KiBzZWNvbmRFbGVtZW50ID0gdG9FbGVtZW50KHNlY29uZCk7CisgICAgaWYgKCFmaXJzdEVs ZW1lbnQtPnRhZ1FOYW1lKCkubWF0Y2hlcyhzZWNvbmRFbGVtZW50LT50YWdRTmFtZSgpKSkKICAg ICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgTmFtZWROb2RlTWFwKiBmaXJzdE1hcCA9IHRvRWxl bWVudChmaXJzdCktPnVwZGF0ZWRBdHRyaWJ1dGVzKCk7Ci0gICAgTmFtZWROb2RlTWFwKiBzZWNv bmRNYXAgPSB0b0VsZW1lbnQoc2Vjb25kKS0+dXBkYXRlZEF0dHJpYnV0ZXMoKTsKLQotICAgIGlm IChmaXJzdE1hcCkKLSAgICAgICAgcmV0dXJuIGZpcnN0TWFwLT5tYXBzRXF1aXZhbGVudChzZWNv bmRNYXApOwotICAgIGlmIChzZWNvbmRNYXApCi0gICAgICAgIHJldHVybiBzZWNvbmRNYXAtPm1h cHNFcXVpdmFsZW50KGZpcnN0TWFwKTsKLSAgICByZXR1cm4gdHJ1ZTsKKyAgICByZXR1cm4gZmly c3RFbGVtZW50LT5oYXNFcXVpdmFsZW50QXR0cmlidXRlcyhzZWNvbmRFbGVtZW50KTsKIH0KIAog Ym9vbCBpc05vblRhYmxlQ2VsbEhUTUxCbG9ja0VsZW1lbnQoY29uc3QgTm9kZSogbm9kZSkK