123491 2013-10-29 21:28:09 -0700 Modernize DatasetDOMStringMap and ClassList a bit 2013-10-29 22:13:43 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam cmarcelo commit-queue esprehn+autocc gyuyoung.kim kangil.han oldest_to_newest 944756 0 sam 2013-10-29 21:28:09 -0700 Modernize DatasetDOMStringMap and ClassList a bit 944757 1 215469 sam 2013-10-29 21:29:08 -0700 Created attachment 215469 Patch 944761 2 215469 commit-queue 2013-10-29 22:13:41 -0700 Comment on attachment 215469 Patch Clearing flags on attachment: 215469 Committed r158252: <http://trac.webkit.org/changeset/158252> 944762 3 commit-queue 2013-10-29 22:13:43 -0700 All reviewed patches have been landed. Closing bug. 215469 2013-10-29 21:29:08 -0700 2013-10-29 22:13:41 -0700 Patch bug-123491-20131029212909.patch text/plain 11032 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1ODI1MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDEzLTEwLTI5ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTW9kZXJuaXplIERhdGFzZXRET01TdHJp bmdNYXAgYW5kIENsYXNzTGlzdCBhIGJpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTIzNDkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBkb20vRGF0YXNldERPTVN0cmluZ01hcC5jcHA6CisgICAgICAg ICogZG9tL0RhdGFzZXRET01TdHJpbmdNYXAuaDoKKyAgICAgICAgKiBkb20vRWxlbWVudC5jcHA6 CisgICAgICAgICogZG9tL0VsZW1lbnRSYXJlRGF0YS5oOgorICAgICAgICAqIGh0bWwvQ2xhc3NM aXN0LmNwcDoKKyAgICAgICAgKiBodG1sL0NsYXNzTGlzdC5oOgorICAgICAgICBQYXNzIHRoZSBv d25lciBFbGVtZW50IGJ5IHJlZmVyZW5jZSBhbmQgc3RvcmUgaW4gYSBzdGQ6OnVuaXF1ZV9wdHIu CisKIDIwMTMtMTAtMjkgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCiAgICAg ICAgIEVsZW1lbnREYXRhIGNvbnN0cnVjdGlvbiBoZWxwZXJzIHNob3VsZCByZXR1cm4gUGFzc1Jl Zi4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9EYXRhc2V0RE9NU3RyaW5nTWFwLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vRGF0YXNldERPTVN0cmluZ01hcC5jcHAJKHJl dmlzaW9uIDE1ODI1MCkKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9EYXRhc2V0RE9NU3RyaW5nTWFw LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTI2LDIyICsxMjYsMjIgQEAgc3RhdGljIFN0cmluZyBj b252ZXJ0UHJvcGVydHlOYW1lVG9BdHRyaQogCiB2b2lkIERhdGFzZXRET01TdHJpbmdNYXA6OnJl ZigpCiB7Ci0gICAgbV9lbGVtZW50LT5yZWYoKTsKKyAgICBtX2VsZW1lbnQucmVmKCk7CiB9CiAK IHZvaWQgRGF0YXNldERPTVN0cmluZ01hcDo6ZGVyZWYoKQogewotICAgIG1fZWxlbWVudC0+ZGVy ZWYoKTsKKyAgICBtX2VsZW1lbnQuZGVyZWYoKTsKIH0KIAogdm9pZCBEYXRhc2V0RE9NU3RyaW5n TWFwOjpnZXROYW1lcyhWZWN0b3I8U3RyaW5nPiYgbmFtZXMpCiB7Ci0gICAgaWYgKCFtX2VsZW1l bnQtPmhhc0F0dHJpYnV0ZXMoKSkKKyAgICBpZiAoIW1fZWxlbWVudC5oYXNBdHRyaWJ1dGVzKCkp CiAgICAgICAgIHJldHVybjsKIAotICAgIHVuc2lnbmVkIGxlbmd0aCA9IG1fZWxlbWVudC0+YXR0 cmlidXRlQ291bnQoKTsKKyAgICB1bnNpZ25lZCBsZW5ndGggPSBtX2VsZW1lbnQuYXR0cmlidXRl Q291bnQoKTsKICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbGVuZ3RoOyBpKyspIHsKLSAg ICAgICAgY29uc3QgQXR0cmlidXRlJiBhdHRyaWJ1dGUgPSBtX2VsZW1lbnQtPmF0dHJpYnV0ZUF0 KGkpOworICAgICAgICBjb25zdCBBdHRyaWJ1dGUmIGF0dHJpYnV0ZSA9IG1fZWxlbWVudC5hdHRy aWJ1dGVBdChpKTsKICAgICAgICAgaWYgKGlzVmFsaWRBdHRyaWJ1dGVOYW1lKGF0dHJpYnV0ZS5s b2NhbE5hbWUoKSkpCiAgICAgICAgICAgICBuYW1lcy5hcHBlbmQoY29udmVydEF0dHJpYnV0ZU5h bWVUb1Byb3BlcnR5TmFtZShhdHRyaWJ1dGUubG9jYWxOYW1lKCkpKTsKICAgICB9CkBAIC0xNDks MTIgKzE0OSwxMiBAQCB2b2lkIERhdGFzZXRET01TdHJpbmdNYXA6OmdldE5hbWVzKFZlY3RvCiAK IFN0cmluZyBEYXRhc2V0RE9NU3RyaW5nTWFwOjppdGVtKGNvbnN0IFN0cmluZyYgbmFtZSkKIHsK LSAgICBpZiAoIW1fZWxlbWVudC0+aGFzQXR0cmlidXRlcygpKQorICAgIGlmICghbV9lbGVtZW50 Lmhhc0F0dHJpYnV0ZXMoKSkKICAgICAgICAgcmV0dXJuIFN0cmluZygpOwogCi0gICAgdW5zaWdu ZWQgbGVuZ3RoID0gbV9lbGVtZW50LT5hdHRyaWJ1dGVDb3VudCgpOworICAgIHVuc2lnbmVkIGxl bmd0aCA9IG1fZWxlbWVudC5hdHRyaWJ1dGVDb3VudCgpOwogICAgIGZvciAodW5zaWduZWQgaSA9 IDA7IGkgPCBsZW5ndGg7IGkrKykgewotICAgICAgICBjb25zdCBBdHRyaWJ1dGUmIGF0dHJpYnV0 ZSA9IG1fZWxlbWVudC0+YXR0cmlidXRlQXQoaSk7CisgICAgICAgIGNvbnN0IEF0dHJpYnV0ZSYg YXR0cmlidXRlID0gbV9lbGVtZW50LmF0dHJpYnV0ZUF0KGkpOwogICAgICAgICBpZiAocHJvcGVy dHlOYW1lTWF0Y2hlc0F0dHJpYnV0ZU5hbWUobmFtZSwgYXR0cmlidXRlLmxvY2FsTmFtZSgpKSkK ICAgICAgICAgICAgIHJldHVybiBhdHRyaWJ1dGUudmFsdWUoKTsKICAgICB9CkBAIC0xNjQsMTIg KzE2NCwxMiBAQCBTdHJpbmcgRGF0YXNldERPTVN0cmluZ01hcDo6aXRlbShjb25zdCBTCiAKIGJv b2wgRGF0YXNldERPTVN0cmluZ01hcDo6Y29udGFpbnMoY29uc3QgU3RyaW5nJiBuYW1lKQogewot ICAgIGlmICghbV9lbGVtZW50LT5oYXNBdHRyaWJ1dGVzKCkpCisgICAgaWYgKCFtX2VsZW1lbnQu aGFzQXR0cmlidXRlcygpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICB1bnNpZ25lZCBs ZW5ndGggPSBtX2VsZW1lbnQtPmF0dHJpYnV0ZUNvdW50KCk7CisgICAgdW5zaWduZWQgbGVuZ3Ro ID0gbV9lbGVtZW50LmF0dHJpYnV0ZUNvdW50KCk7CiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsg aSA8IGxlbmd0aDsgaSsrKSB7Ci0gICAgICAgIGNvbnN0IEF0dHJpYnV0ZSYgYXR0cmlidXRlID0g bV9lbGVtZW50LT5hdHRyaWJ1dGVBdChpKTsKKyAgICAgICAgY29uc3QgQXR0cmlidXRlJiBhdHRy aWJ1dGUgPSBtX2VsZW1lbnQuYXR0cmlidXRlQXQoaSk7CiAgICAgICAgIGlmIChwcm9wZXJ0eU5h bWVNYXRjaGVzQXR0cmlidXRlTmFtZShuYW1lLCBhdHRyaWJ1dGUubG9jYWxOYW1lKCkpKQogICAg ICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQpAQCAtMTg0LDcgKzE4NCw3IEBAIHZvaWQgRGF0 YXNldERPTVN0cmluZ01hcDo6c2V0SXRlbShjb25zdCAKICAgICAgICAgcmV0dXJuOwogICAgIH0K IAotICAgIG1fZWxlbWVudC0+c2V0QXR0cmlidXRlKGNvbnZlcnRQcm9wZXJ0eU5hbWVUb0F0dHJp YnV0ZU5hbWUobmFtZSksIHZhbHVlLCBlYyk7CisgICAgbV9lbGVtZW50LnNldEF0dHJpYnV0ZShj b252ZXJ0UHJvcGVydHlOYW1lVG9BdHRyaWJ1dGVOYW1lKG5hbWUpLCB2YWx1ZSwgZWMpOwogfQog CiB2b2lkIERhdGFzZXRET01TdHJpbmdNYXA6OmRlbGV0ZUl0ZW0oY29uc3QgU3RyaW5nJiBuYW1l LCBFeGNlcHRpb25Db2RlJiBlYykKQEAgLTE5NCw3ICsxOTQsNyBAQCB2b2lkIERhdGFzZXRET01T dHJpbmdNYXA6OmRlbGV0ZUl0ZW0oY29uCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBt X2VsZW1lbnQtPnJlbW92ZUF0dHJpYnV0ZShjb252ZXJ0UHJvcGVydHlOYW1lVG9BdHRyaWJ1dGVO YW1lKG5hbWUpKTsKKyAgICBtX2VsZW1lbnQucmVtb3ZlQXR0cmlidXRlKGNvbnZlcnRQcm9wZXJ0 eU5hbWVUb0F0dHJpYnV0ZU5hbWUobmFtZSkpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3Jl CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vRGF0YXNldERPTVN0cmluZ01hcC5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9EYXRhc2V0RE9NU3RyaW5nTWFwLmgJKHJldmlzaW9u IDE1ODI1MCkKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9EYXRhc2V0RE9NU3RyaW5nTWFwLmgJKHdv cmtpbmcgY29weSkKQEAgLTI3LDE3ICsyNywxNiBAQAogI2RlZmluZSBEYXRhc2V0RE9NU3RyaW5n TWFwX2gKIAogI2luY2x1ZGUgIkRPTVN0cmluZ01hcC5oIgotI2luY2x1ZGUgPHd0Zi9QYXNzT3du UHRyLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgRWxlbWVudDsKIAotY2xhc3Mg RGF0YXNldERPTVN0cmluZ01hcCA6IHB1YmxpYyBET01TdHJpbmdNYXAgeworY2xhc3MgRGF0YXNl dERPTVN0cmluZ01hcCBGSU5BTCA6IHB1YmxpYyBET01TdHJpbmdNYXAgewogcHVibGljOgotICAg IHN0YXRpYyBQYXNzT3duUHRyPERhdGFzZXRET01TdHJpbmdNYXA+IGNyZWF0ZShFbGVtZW50KiBl bGVtZW50KQorICAgIGV4cGxpY2l0IERhdGFzZXRET01TdHJpbmdNYXAoRWxlbWVudCYgZWxlbWVu dCkKKyAgICAgICAgOiBtX2VsZW1lbnQoZWxlbWVudCkKICAgICB7Ci0gICAgICAgIHJldHVybiBh ZG9wdFB0cihuZXcgRGF0YXNldERPTVN0cmluZ01hcChlbGVtZW50KSk7CiAgICAgfQogCiAgICAg dmlydHVhbCB2b2lkIHJlZigpIE9WRVJSSURFOwpAQCAtNDksMTUgKzQ4LDEwIEBAIHB1YmxpYzoK ICAgICB2aXJ0dWFsIHZvaWQgc2V0SXRlbShjb25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0IFN0cmlu ZyYgdmFsdWUsIEV4Y2VwdGlvbkNvZGUmKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgZGVs ZXRlSXRlbShjb25zdCBTdHJpbmcmIG5hbWUsIEV4Y2VwdGlvbkNvZGUmKSBPVkVSUklERTsKIAot ICAgIHZpcnR1YWwgRWxlbWVudCogZWxlbWVudCgpIE9WRVJSSURFIHsgcmV0dXJuIG1fZWxlbWVu dDsgfQorICAgIHZpcnR1YWwgRWxlbWVudCogZWxlbWVudCgpIE9WRVJSSURFIHsgcmV0dXJuICZt X2VsZW1lbnQ7IH0KIAogcHJpdmF0ZToKLSAgICBleHBsaWNpdCBEYXRhc2V0RE9NU3RyaW5nTWFw KEVsZW1lbnQqIGVsZW1lbnQpCi0gICAgICAgIDogbV9lbGVtZW50KGVsZW1lbnQpCi0gICAgewot ICAgIH0KLQotICAgIEVsZW1lbnQqIG1fZWxlbWVudDsKKyAgICBFbGVtZW50JiBtX2VsZW1lbnQ7 CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20v RWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3Bw CShyZXZpc2lvbiAxNTgyNTApCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTI1NTAsNyArMjU1MCw3IEBAIERPTVRva2VuTGlzdCogRWxlbWVudDo6 Y2xhc3NMaXN0KCkKIHsKICAgICBFbGVtZW50UmFyZURhdGEmIGRhdGEgPSBlbnN1cmVFbGVtZW50 UmFyZURhdGEoKTsKICAgICBpZiAoIWRhdGEuY2xhc3NMaXN0KCkpCi0gICAgICAgIGRhdGEuc2V0 Q2xhc3NMaXN0KENsYXNzTGlzdDo6Y3JlYXRlKHRoaXMpKTsKKyAgICAgICAgZGF0YS5zZXRDbGFz c0xpc3Qoc3RkOjptYWtlX3VuaXF1ZTxDbGFzc0xpc3Q+KCp0aGlzKSk7CiAgICAgcmV0dXJuIGRh dGEuY2xhc3NMaXN0KCk7CiB9CiAKQEAgLTI1NTgsNyArMjU1OCw3IEBAIERPTVN0cmluZ01hcCog RWxlbWVudDo6ZGF0YXNldCgpCiB7CiAgICAgRWxlbWVudFJhcmVEYXRhJiBkYXRhID0gZW5zdXJl RWxlbWVudFJhcmVEYXRhKCk7CiAgICAgaWYgKCFkYXRhLmRhdGFzZXQoKSkKLSAgICAgICAgZGF0 YS5zZXREYXRhc2V0KERhdGFzZXRET01TdHJpbmdNYXA6OmNyZWF0ZSh0aGlzKSk7CisgICAgICAg IGRhdGEuc2V0RGF0YXNldChzdGQ6Om1ha2VfdW5pcXVlPERhdGFzZXRET01TdHJpbmdNYXA+KCp0 aGlzKSk7CiAgICAgcmV0dXJuIGRhdGEuZGF0YXNldCgpOwogfQogCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9kb20vRWxlbWVudFJhcmVEYXRhLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv ZG9tL0VsZW1lbnRSYXJlRGF0YS5oCShyZXZpc2lvbiAxNTgyNTApCisrKyBTb3VyY2UvV2ViQ29y ZS9kb20vRWxlbWVudFJhcmVEYXRhLmgJKHdvcmtpbmcgY29weSkKQEAgLTEwNSw3ICsxMDUsNyBA QCBwdWJsaWM6CiAgICAgdm9pZCBzZXRDb21wdXRlZFN0eWxlKFBhc3NSZWY8UmVuZGVyU3R5bGU+ IGNvbXB1dGVkU3R5bGUpIHsgbV9jb21wdXRlZFN0eWxlID0gc3RkOjptb3ZlKGNvbXB1dGVkU3R5 bGUpOyB9CiAKICAgICBDbGFzc0xpc3QqIGNsYXNzTGlzdCgpIGNvbnN0IHsgcmV0dXJuIG1fY2xh c3NMaXN0LmdldCgpOyB9Ci0gICAgdm9pZCBzZXRDbGFzc0xpc3QoT3duUHRyPENsYXNzTGlzdD4g Y2xhc3NMaXN0KSB7IG1fY2xhc3NMaXN0ID0gc3RkOjptb3ZlKGNsYXNzTGlzdCk7IH0KKyAgICB2 b2lkIHNldENsYXNzTGlzdChzdGQ6OnVuaXF1ZV9wdHI8Q2xhc3NMaXN0PiBjbGFzc0xpc3QpIHsg bV9jbGFzc0xpc3QgPSBzdGQ6Om1vdmUoY2xhc3NMaXN0KTsgfQogICAgIHZvaWQgY2xlYXJDbGFz c0xpc3RWYWx1ZUZvclF1aXJrc01vZGUoKQogICAgIHsKICAgICAgICAgaWYgKCFtX2NsYXNzTGlz dCkKQEAgLTExNCw3ICsxMTQsNyBAQCBwdWJsaWM6CiAgICAgfQogCiAgICAgRGF0YXNldERPTVN0 cmluZ01hcCogZGF0YXNldCgpIGNvbnN0IHsgcmV0dXJuIG1fZGF0YXNldC5nZXQoKTsgfQotICAg IHZvaWQgc2V0RGF0YXNldChQYXNzT3duUHRyPERhdGFzZXRET01TdHJpbmdNYXA+IGRhdGFzZXQp IHsgbV9kYXRhc2V0ID0gZGF0YXNldDsgfQorICAgIHZvaWQgc2V0RGF0YXNldChzdGQ6OnVuaXF1 ZV9wdHI8RGF0YXNldERPTVN0cmluZ01hcD4gZGF0YXNldCkgeyBtX2RhdGFzZXQgPSBzdGQ6Om1v dmUoZGF0YXNldCk7IH0KIAogICAgIExheW91dFNpemUgbWluaW11bVNpemVGb3JSZXNpemluZygp IGNvbnN0IHsgcmV0dXJuIG1fbWluaW11bVNpemVGb3JSZXNpemluZzsgfQogICAgIHZvaWQgc2V0 TWluaW11bVNpemVGb3JSZXNpemluZyhMYXlvdXRTaXplIHNpemUpIHsgbV9taW5pbXVtU2l6ZUZv clJlc2l6aW5nID0gc2l6ZTsgfQpAQCAtMTU5LDggKzE1OSw4IEBAIHByaXZhdGU6CiAgICAgSW50 U2l6ZSBtX3NhdmVkTGF5ZXJTY3JvbGxPZmZzZXQ7CiAgICAgUmVmUHRyPFJlbmRlclN0eWxlPiBt X2NvbXB1dGVkU3R5bGU7CiAKLSAgICBPd25QdHI8RGF0YXNldERPTVN0cmluZ01hcD4gbV9kYXRh c2V0OwotICAgIE93blB0cjxDbGFzc0xpc3Q+IG1fY2xhc3NMaXN0OworICAgIHN0ZDo6dW5pcXVl X3B0cjxEYXRhc2V0RE9NU3RyaW5nTWFwPiBtX2RhdGFzZXQ7CisgICAgc3RkOjp1bmlxdWVfcHRy PENsYXNzTGlzdD4gbV9jbGFzc0xpc3Q7CiAgICAgUmVmUHRyPFNoYWRvd1Jvb3Q+IG1fc2hhZG93 Um9vdDsKICAgICBPd25QdHI8TmFtZWROb2RlTWFwPiBtX2F0dHJpYnV0ZU1hcDsKIApJbmRleDog U291cmNlL1dlYkNvcmUvaHRtbC9DbGFzc0xpc3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2h0bWwvQ2xhc3NMaXN0LmNwcAkocmV2aXNpb24gMTU4MjUwKQorKysgU291cmNlL1dl YkNvcmUvaHRtbC9DbGFzc0xpc3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMiwyNCArMzIsMTkg QEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1Pd25QdHI8Q2xhc3NMaXN0PiBDbGFzc0xpc3Q6 OmNyZWF0ZShFbGVtZW50KiBlbGVtZW50KQotewotICAgIHJldHVybiBhZG9wdFB0cihuZXcgQ2xh c3NMaXN0KGVsZW1lbnQpKTsKLX0KLQogdm9pZCBDbGFzc0xpc3Q6OnJlZigpCiB7Ci0gICAgbV9l bGVtZW50LT5yZWYoKTsKKyAgICBtX2VsZW1lbnQucmVmKCk7CiB9CiAKIHZvaWQgQ2xhc3NMaXN0 OjpkZXJlZigpCiB7Ci0gICAgbV9lbGVtZW50LT5kZXJlZigpOworICAgIG1fZWxlbWVudC5kZXJl ZigpOwogfQogCiB1bnNpZ25lZCBDbGFzc0xpc3Q6Omxlbmd0aCgpIGNvbnN0CiB7Ci0gICAgcmV0 dXJuIG1fZWxlbWVudC0+aGFzQ2xhc3MoKSA/IGNsYXNzTmFtZXMoKS5zaXplKCkgOiAwOworICAg IHJldHVybiBtX2VsZW1lbnQuaGFzQ2xhc3MoKSA/IGNsYXNzTmFtZXMoKS5zaXplKCkgOiAwOwog fQogCiBjb25zdCBBdG9taWNTdHJpbmcgQ2xhc3NMaXN0OjppdGVtKHVuc2lnbmVkIGluZGV4KSBj b25zdApAQCAtNjEsMzMgKzU2LDMzIEBAIGNvbnN0IEF0b21pY1N0cmluZyBDbGFzc0xpc3Q6Oml0 ZW0odW5zaWcKIAogRWxlbWVudCogQ2xhc3NMaXN0OjplbGVtZW50KCkgY29uc3QKIHsKLSAgICBy ZXR1cm4gbV9lbGVtZW50OworICAgIHJldHVybiAmbV9lbGVtZW50OwogfQogCiBib29sIENsYXNz TGlzdDo6Y29udGFpbnNJbnRlcm5hbChjb25zdCBBdG9taWNTdHJpbmcmIHRva2VuKSBjb25zdAog ewotICAgIHJldHVybiBtX2VsZW1lbnQtPmhhc0NsYXNzKCkgJiYgY2xhc3NOYW1lcygpLmNvbnRh aW5zKHRva2VuKTsKKyAgICByZXR1cm4gbV9lbGVtZW50Lmhhc0NsYXNzKCkgJiYgY2xhc3NOYW1l cygpLmNvbnRhaW5zKHRva2VuKTsKIH0KIAogQXRvbWljU3RyaW5nIENsYXNzTGlzdDo6dmFsdWUo KSBjb25zdAogewotICAgIHJldHVybiBtX2VsZW1lbnQtPmdldEF0dHJpYnV0ZShIVE1MTmFtZXM6 OmNsYXNzQXR0cik7CisgICAgcmV0dXJuIG1fZWxlbWVudC5nZXRBdHRyaWJ1dGUoSFRNTE5hbWVz OjpjbGFzc0F0dHIpOwogfQogCiB2b2lkIENsYXNzTGlzdDo6c2V0VmFsdWUoY29uc3QgQXRvbWlj U3RyaW5nJiB2YWx1ZSkKIHsKLSAgICBtX2VsZW1lbnQtPnNldEF0dHJpYnV0ZShIVE1MTmFtZXM6 OmNsYXNzQXR0ciwgdmFsdWUpOworICAgIG1fZWxlbWVudC5zZXRBdHRyaWJ1dGUoSFRNTE5hbWVz OjpjbGFzc0F0dHIsIHZhbHVlKTsKIH0KIAogY29uc3QgU3BhY2VTcGxpdFN0cmluZyYgQ2xhc3NM aXN0OjpjbGFzc05hbWVzKCkgY29uc3QKIHsKLSAgICBBU1NFUlQobV9lbGVtZW50LT5oYXNDbGFz cygpKTsKLSAgICBpZiAobV9lbGVtZW50LT5kb2N1bWVudCgpLmluUXVpcmtzTW9kZSgpKSB7Cisg ICAgQVNTRVJUKG1fZWxlbWVudC5oYXNDbGFzcygpKTsKKyAgICBpZiAobV9lbGVtZW50LmRvY3Vt ZW50KCkuaW5RdWlya3NNb2RlKCkpIHsKICAgICAgICAgaWYgKG1fY2xhc3NOYW1lc0ZvclF1aXJr c01vZGUuaXNFbXB0eSgpKQogICAgICAgICAgICAgbV9jbGFzc05hbWVzRm9yUXVpcmtzTW9kZS5z ZXQodmFsdWUoKSwgZmFsc2UpOwogICAgICAgICByZXR1cm4gbV9jbGFzc05hbWVzRm9yUXVpcmtz TW9kZTsKICAgICB9Ci0gICAgcmV0dXJuIG1fZWxlbWVudC0+ZWxlbWVudERhdGEoKS0+Y2xhc3NO YW1lcygpOworICAgIHJldHVybiBtX2VsZW1lbnQuZWxlbWVudERhdGEoKS0+Y2xhc3NOYW1lcygp OwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1s L0NsYXNzTGlzdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvQ2xhc3NMaXN0 LmgJKHJldmlzaW9uIDE1ODI1MCkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvQ2xhc3NMaXN0LmgJ KHdvcmtpbmcgY29weSkKQEAgLTMzLDMzICszMywzMSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK IGNsYXNzIEVsZW1lbnQ7CiAKLWNsYXNzIENsYXNzTGlzdCA6IHB1YmxpYyBET01Ub2tlbkxpc3Qg eworY2xhc3MgQ2xhc3NMaXN0IEZJTkFMIDogcHVibGljIERPTVRva2VuTGlzdCB7CiBwdWJsaWM6 Ci0gICAgc3RhdGljIE93blB0cjxDbGFzc0xpc3Q+IGNyZWF0ZShFbGVtZW50Kik7CisgICAgQ2xh c3NMaXN0KEVsZW1lbnQmIGVsZW1lbnQpCisgICAgICAgIDogbV9lbGVtZW50KGVsZW1lbnQpCisg ICAgeworICAgIH0KIAotICAgIHZpcnR1YWwgdm9pZCByZWYoKSBPVkVSUklERSBGSU5BTDsKLSAg ICB2aXJ0dWFsIHZvaWQgZGVyZWYoKSBPVkVSUklERSBGSU5BTDsKKyAgICB2aXJ0dWFsIHZvaWQg cmVmKCkgT1ZFUlJJREU7CisgICAgdmlydHVhbCB2b2lkIGRlcmVmKCkgT1ZFUlJJREU7CiAKLSAg ICB2aXJ0dWFsIHVuc2lnbmVkIGxlbmd0aCgpIGNvbnN0IE9WRVJSSURFIEZJTkFMOwotICAgIHZp cnR1YWwgY29uc3QgQXRvbWljU3RyaW5nIGl0ZW0odW5zaWduZWQgaW5kZXgpIGNvbnN0IE9WRVJS SURFIEZJTkFMOworICAgIHZpcnR1YWwgdW5zaWduZWQgbGVuZ3RoKCkgY29uc3QgT1ZFUlJJREU7 CisgICAgdmlydHVhbCBjb25zdCBBdG9taWNTdHJpbmcgaXRlbSh1bnNpZ25lZCBpbmRleCkgY29u c3QgT1ZFUlJJREU7CiAKLSAgICB2aXJ0dWFsIEVsZW1lbnQqIGVsZW1lbnQoKSBjb25zdCBPVkVS UklERSBGSU5BTDsKKyAgICB2aXJ0dWFsIEVsZW1lbnQqIGVsZW1lbnQoKSBjb25zdCBPVkVSUklE RTsKIAogICAgIHZvaWQgY2xlYXJWYWx1ZUZvclF1aXJrc01vZGUoKSB7IG1fY2xhc3NOYW1lc0Zv clF1aXJrc01vZGUuY2xlYXIoKTsgfQogCiBwcml2YXRlOgotICAgIENsYXNzTGlzdChFbGVtZW50 KiBlbGVtZW50KQotICAgICAgICA6IG1fZWxlbWVudChlbGVtZW50KQotICAgIHsKLSAgICB9Ci0K LSAgICB2aXJ0dWFsIGJvb2wgY29udGFpbnNJbnRlcm5hbChjb25zdCBBdG9taWNTdHJpbmcmKSBj b25zdCBPVkVSUklERSBGSU5BTDsKLSAgICB2aXJ0dWFsIEF0b21pY1N0cmluZyB2YWx1ZSgpIGNv bnN0IE9WRVJSSURFIEZJTkFMOwotICAgIHZpcnR1YWwgdm9pZCBzZXRWYWx1ZShjb25zdCBBdG9t aWNTdHJpbmcmKSBPVkVSUklERSBGSU5BTDsKKyAgICB2aXJ0dWFsIGJvb2wgY29udGFpbnNJbnRl cm5hbChjb25zdCBBdG9taWNTdHJpbmcmKSBjb25zdCBPVkVSUklERTsKKyAgICB2aXJ0dWFsIEF0 b21pY1N0cmluZyB2YWx1ZSgpIGNvbnN0IE9WRVJSSURFOworICAgIHZpcnR1YWwgdm9pZCBzZXRW YWx1ZShjb25zdCBBdG9taWNTdHJpbmcmKSBPVkVSUklERTsKIAogICAgIGNvbnN0IFNwYWNlU3Bs aXRTdHJpbmcmIGNsYXNzTmFtZXMoKSBjb25zdDsKIAotICAgIEVsZW1lbnQqIG1fZWxlbWVudDsK KyAgICBFbGVtZW50JiBtX2VsZW1lbnQ7CiAgICAgbXV0YWJsZSBTcGFjZVNwbGl0U3RyaW5nIG1f Y2xhc3NOYW1lc0ZvclF1aXJrc01vZGU7CiB9OwogCg==