189452 2018-09-08 12:34:13 -0700 Clean up code related to Document node removal 2018-09-08 13:21:25 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser cdumez cmarcelo dbates esprehn+autocc ews-watchlist japhet kangil.han n_wang rniwa simon.fraser webkit-bug-importer wenson_hsieh oldest_to_newest 1457909 0 simon.fraser 2018-09-08 12:34:13 -0700 Clean up code related to Document node removal 1457910 1 349258 simon.fraser 2018-09-08 12:35:56 -0700 Created attachment 349258 Patch 1457911 2 349258 wenson_hsieh 2018-09-08 13:15:25 -0700 Comment on attachment 349258 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=349258&action=review > Source/WebCore/dom/Document.h:760 > + enum class NodeRemoval { Node, ChildrenOfNode }; Do we care about shrinking the width of enums that are only passed around as arguments, and not stored anywhere? (If so, this should be 8 bits) 1457912 3 simon.fraser 2018-09-08 13:20:07 -0700 https://trac.webkit.org/r235830 1457913 4 webkit-bug-importer 2018-09-08 13:21:25 -0700 <rdar://problem/44263412> 349258 2018-09-08 12:35:56 -0700 2018-09-08 13:15:25 -0700 Patch bug-189452-20180908123556.patch text/plain 9344 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1ODI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGZmZjQxNzVmOWVmNWNh MzdhMTE0N2Y2MTFkMTI0NGNiNWM4NWE4MC4uN2QwODllYWE5ZWY5ZjhlN2NlNmU1MmZiNjdjNDA4 ZjQ2NGM1ODdlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE4LTA5LTA4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENsZWFuIHVwIGNv ZGUgcmVsYXRlZCB0byBEb2N1bWVudCBub2RlIHJlbW92YWwKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTQ1MgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlcGxhY2UgdGhlICJhbW9uZ0NoaWxkcmVuT25s eSIgYm9vbGVhbiBhcmd1bWVudCB3aXRoIGFuIGVudW0gZm9yIGNsYXJpdHkuCisgICAgICAgIAor ICAgICAgICBSZW5hbWUgdGhlIHJlbW92ZSpPZlN1YnRyZWUgZnVuY3Rpb25zLCBiZWNhdXNlIHRo YXQgbmFtaW5nIGlzIHZlcnkgdW5jbGVhci4KKyAgICAgICAgSW5zdGVhZCwgdXNlIGFkanVzdCpP bk5vZGVSZW1vdmFsIHdoaWNoIGJldHRlciBkZXNjcmliZXMgd2hhdCB0aGUgY29kZSBkb2VzLgor CisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmlzTm9kZUlu U3VidHJlZSk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6YWRqdXN0Rm9jdXNlZE5vZGVP bk5vZGVSZW1vdmFsKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50Ojpub2RlQ2hpbGRyZW5X aWxsQmVSZW1vdmVkKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50Ojpub2RlV2lsbEJlUmVt b3ZlZCk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6YWRqdXN0Rm9jdXNOYXZpZ2F0aW9u Tm9kZU9uTm9kZVJlbW92YWwpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OmFkanVzdEZ1 bGxTY3JlZW5FbGVtZW50T25Ob2RlUmVtb3ZhbCk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVu dDo6cmVtb3ZlRm9jdXNlZE5vZGVPZlN1YnRyZWUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29y ZTo6RG9jdW1lbnQ6OnJlbW92ZUZvY3VzTmF2aWdhdGlvbk5vZGVPZlN1YnRyZWUpOiBEZWxldGVk LgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnJlbW92ZUZ1bGxTY3JlZW5FbGVtZW50T2ZT dWJ0cmVlKTogRGVsZXRlZC4KKyAgICAgICAgKiBkb20vRG9jdW1lbnQuaDoKKyAgICAgICAgKiBk b20vRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50OjpyZW1vdmVTaGFkb3dS b290KToKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6RnJhbWVMb2FkZXI6OmNsZWFyKToKKwogMjAxOC0wOS0wNyAgRnVqaWkgSGlyb25vcmkgIDxI aXJvbm9yaS5GdWppaUBzb255LmNvbT4KIAogICAgICAgICBbV2luXVtDbGFuZ10gZXhjZXB0aW9u U2hvdWxkVGVybWluYXRlUHJvZ3JhbSBvZiBTdHJ1Y3R1cmVkRXhjZXB0aW9uSGFuZGxlclN1cHBy ZXNzb3IuY3BwIHNob3VsZCB0YWtlIERXT1JECmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9k b20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCBh OWFiNDU5ZDQ3MDIzZTA4ZGZkNmFkMWY4MTY5ZjhlZmU5YTVhYjM2Li42MDk4OTJiZGM5NDNlZTVl YWZlZGVkYzM5YjVjZjNkNWFiMzQwYWM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20v RG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTM4 MjQsMTUgKzM4MjQsMTUgQEAgdm9pZCBEb2N1bWVudDo6cGFnZU11dGVkU3RhdGVEaWRDaGFuZ2Uo KQogICAgICAgICBhdWRpb1Byb2R1Y2VyLT5wYWdlTXV0ZWRTdGF0ZURpZENoYW5nZSgpOwogfQog Ci1zdGF0aWMgYm9vbCBpc05vZGVJblN1YnRyZWUoTm9kZSYgbm9kZSwgTm9kZSYgY29udGFpbmVy LCBib29sIGFtb25nQ2hpbGRyZW5Pbmx5KQorc3RhdGljIGJvb2wgaXNOb2RlSW5TdWJ0cmVlKE5v ZGUmIG5vZGUsIE5vZGUmIGNvbnRhaW5lciwgRG9jdW1lbnQ6Ok5vZGVSZW1vdmFsIG5vZGVSZW1v dmFsKQogewotICAgIGlmIChhbW9uZ0NoaWxkcmVuT25seSkKKyAgICBpZiAobm9kZVJlbW92YWwg PT0gRG9jdW1lbnQ6Ok5vZGVSZW1vdmFsOjpDaGlsZHJlbk9mTm9kZSkKICAgICAgICAgcmV0dXJu IG5vZGUuaXNEZXNjZW5kYW50T2YoY29udGFpbmVyKTsKLSAgICBlbHNlCi0gICAgICAgIHJldHVy biAmbm9kZSA9PSAmY29udGFpbmVyIHx8IG5vZGUuaXNEZXNjZW5kYW50T2YoY29udGFpbmVyKTsK KworICAgIHJldHVybiAmbm9kZSA9PSAmY29udGFpbmVyIHx8IG5vZGUuaXNEZXNjZW5kYW50T2Yo Y29udGFpbmVyKTsKIH0KIAotdm9pZCBEb2N1bWVudDo6cmVtb3ZlRm9jdXNlZE5vZGVPZlN1YnRy ZWUoTm9kZSYgbm9kZSwgYm9vbCBhbW9uZ0NoaWxkcmVuT25seSkKK3ZvaWQgRG9jdW1lbnQ6OmFk anVzdEZvY3VzZWROb2RlT25Ob2RlUmVtb3ZhbChOb2RlJiBub2RlLCBOb2RlUmVtb3ZhbCBub2Rl UmVtb3ZhbCkKIHsKICAgICBpZiAoIW1fZm9jdXNlZEVsZW1lbnQgfHwgcGFnZUNhY2hlU3RhdGUo KSAhPSBOb3RJblBhZ2VDYWNoZSkgLy8gSWYgdGhlIGRvY3VtZW50IGlzIGluIHRoZSBwYWdlIGNh Y2hlLCB0aGVuIHdlIGRvbid0IG5lZWQgdG8gY2xlYXIgb3V0IHRoZSBmb2N1c2VkIG5vZGUuCiAg ICAgICAgIHJldHVybjsKQEAgLTM4NDAsOCArMzg0MCw4IEBAIHZvaWQgRG9jdW1lbnQ6OnJlbW92 ZUZvY3VzZWROb2RlT2ZTdWJ0cmVlKE5vZGUmIG5vZGUsIGJvb2wgYW1vbmdDaGlsZHJlbk9ubHkp CiAgICAgRWxlbWVudCogZm9jdXNlZEVsZW1lbnQgPSBub2RlLnRyZWVTY29wZSgpLmZvY3VzZWRF bGVtZW50SW5TY29wZSgpOwogICAgIGlmICghZm9jdXNlZEVsZW1lbnQpCiAgICAgICAgIHJldHVy bjsKLSAgICAKLSAgICBpZiAoaXNOb2RlSW5TdWJ0cmVlKCpmb2N1c2VkRWxlbWVudCwgbm9kZSwg YW1vbmdDaGlsZHJlbk9ubHkpKSB7CisKKyAgICBpZiAoaXNOb2RlSW5TdWJ0cmVlKCpmb2N1c2Vk RWxlbWVudCwgbm9kZSwgbm9kZVJlbW92YWwpKSB7CiAgICAgICAgIC8vIEZJWE1FOiBXZSBzaG91 bGQgYXZvaWQgc3luY2hyb25vdXNseSB1cGRhdGluZyB0aGUgc3R5bGUgaW5zaWRlIHNldEZvY3Vz ZWRFbGVtZW50LgogICAgICAgICAvLyBGSVhNRTogT2JqZWN0IGVsZW1lbnRzIHNob3VsZCBhdm9p ZCBsb2FkaW5nIGEgZnJhbWUgc3luY2hyb25vdXNseSBpbiBhIHBvc3Qgc3R5bGUgcmVjYWxjIGNh bGxiYWNrLgogICAgICAgICBTdWJmcmFtZUxvYWRpbmdEaXNhYmxlciBkaXNhYmxlcihpczxDb250 YWluZXJOb2RlPihub2RlKSA/ICZkb3duY2FzdDxDb250YWluZXJOb2RlPihub2RlKSA6IG51bGxw dHIpOwpAQCAtNDIwMSwxMSArNDIwMSwxMSBAQCB2b2lkIERvY3VtZW50Ojpub2RlQ2hpbGRyZW5X aWxsQmVSZW1vdmVkKENvbnRhaW5lck5vZGUmIGNvbnRhaW5lcikKIHsKICAgICBBU1NFUlQoIVNj cmlwdERpc2FsbG93ZWRTY29wZTo6SW5NYWluVGhyZWFkOjppc1NjcmlwdEFsbG93ZWQoKSk7CiAK LSAgICByZW1vdmVGb2N1c2VkTm9kZU9mU3VidHJlZShjb250YWluZXIsIHRydWUgLyogYW1vbmdD aGlsZHJlbk9ubHkgKi8pOwotICAgIHJlbW92ZUZvY3VzTmF2aWdhdGlvbk5vZGVPZlN1YnRyZWUo Y29udGFpbmVyLCB0cnVlIC8qIGFtb25nQ2hpbGRyZW5Pbmx5ICovKTsKKyAgICBhZGp1c3RGb2N1 c2VkTm9kZU9uTm9kZVJlbW92YWwoY29udGFpbmVyLCBOb2RlUmVtb3ZhbDo6Q2hpbGRyZW5PZk5v ZGUpOworICAgIGFkanVzdEZvY3VzTmF2aWdhdGlvbk5vZGVPbk5vZGVSZW1vdmFsKGNvbnRhaW5l ciwgTm9kZVJlbW92YWw6OkNoaWxkcmVuT2ZOb2RlKTsKIAogI2lmIEVOQUJMRShGVUxMU0NSRUVO X0FQSSkKLSAgICByZW1vdmVGdWxsU2NyZWVuRWxlbWVudE9mU3VidHJlZShjb250YWluZXIsIHRy dWUgLyogYW1vbmdDaGlsZHJlbk9ubHkgKi8pOworICAgIGFkanVzdEZ1bGxTY3JlZW5FbGVtZW50 T25Ob2RlUmVtb3ZhbChjb250YWluZXIsIE5vZGVSZW1vdmFsOjpDaGlsZHJlbk9mTm9kZSk7CiAj ZW5kaWYKIAogICAgIGZvciAoYXV0byogcmFuZ2UgOiBtX3JhbmdlcykKQEAgLTQyMzQsMTEgKzQy MzQsMTEgQEAgdm9pZCBEb2N1bWVudDo6bm9kZVdpbGxCZVJlbW92ZWQoTm9kZSYgbm9kZSkKIHsK ICAgICBBU1NFUlQoIVNjcmlwdERpc2FsbG93ZWRTY29wZTo6SW5NYWluVGhyZWFkOjppc1Njcmlw dEFsbG93ZWQoKSk7CiAKLSAgICByZW1vdmVGb2N1c2VkTm9kZU9mU3VidHJlZShub2RlKTsKLSAg ICByZW1vdmVGb2N1c05hdmlnYXRpb25Ob2RlT2ZTdWJ0cmVlKG5vZGUpOworICAgIGFkanVzdEZv Y3VzZWROb2RlT25Ob2RlUmVtb3ZhbChub2RlKTsKKyAgICBhZGp1c3RGb2N1c05hdmlnYXRpb25O b2RlT25Ob2RlUmVtb3ZhbChub2RlKTsKIAogI2lmIEVOQUJMRShGVUxMU0NSRUVOX0FQSSkKLSAg ICByZW1vdmVGdWxsU2NyZWVuRWxlbWVudE9mU3VidHJlZShub2RlKTsKKyAgICBhZGp1c3RGdWxs U2NyZWVuRWxlbWVudE9uTm9kZVJlbW92YWwobm9kZSk7CiAjZW5kaWYKIAogICAgIGZvciAoYXV0 byogaXQgOiBtX25vZGVJdGVyYXRvcnMpCkBAIC00MjYyLDEzICs0MjYyLDEzIEBAIHN0YXRpYyBO b2RlKiBmYWxsYmFja0ZvY3VzTmF2aWdhdGlvblN0YXJ0aW5nTm9kZUFmdGVyUmVtb3ZhbChOb2Rl JiBub2RlKQogICAgIHJldHVybiBub2RlLnByZXZpb3VzU2libGluZygpID8gbm9kZS5wcmV2aW91 c1NpYmxpbmcoKSA6IG5vZGUucGFyZW50Tm9kZSgpOwogfQogCi12b2lkIERvY3VtZW50OjpyZW1v dmVGb2N1c05hdmlnYXRpb25Ob2RlT2ZTdWJ0cmVlKE5vZGUmIG5vZGUsIGJvb2wgYW1vbmdDaGls ZHJlbk9ubHkpCit2b2lkIERvY3VtZW50OjphZGp1c3RGb2N1c05hdmlnYXRpb25Ob2RlT25Ob2Rl UmVtb3ZhbChOb2RlJiBub2RlLCBOb2RlUmVtb3ZhbCBub2RlUmVtb3ZhbCkKIHsKICAgICBpZiAo IW1fZm9jdXNOYXZpZ2F0aW9uU3RhcnRpbmdOb2RlKQogICAgICAgICByZXR1cm47CiAKLSAgICBp ZiAoaXNOb2RlSW5TdWJ0cmVlKCptX2ZvY3VzTmF2aWdhdGlvblN0YXJ0aW5nTm9kZSwgbm9kZSwg YW1vbmdDaGlsZHJlbk9ubHkpKSB7Ci0gICAgICAgIG1fZm9jdXNOYXZpZ2F0aW9uU3RhcnRpbmdO b2RlID0gYW1vbmdDaGlsZHJlbk9ubHkgPyAmbm9kZSA6IGZhbGxiYWNrRm9jdXNOYXZpZ2F0aW9u U3RhcnRpbmdOb2RlQWZ0ZXJSZW1vdmFsKG5vZGUpOworICAgIGlmIChpc05vZGVJblN1YnRyZWUo Km1fZm9jdXNOYXZpZ2F0aW9uU3RhcnRpbmdOb2RlLCBub2RlLCBub2RlUmVtb3ZhbCkpIHsKKyAg ICAgICAgbV9mb2N1c05hdmlnYXRpb25TdGFydGluZ05vZGUgPSAobm9kZVJlbW92YWwgPT0gTm9k ZVJlbW92YWw6OkNoaWxkcmVuT2ZOb2RlKSA/ICZub2RlIDogZmFsbGJhY2tGb2N1c05hdmlnYXRp b25TdGFydGluZ05vZGVBZnRlclJlbW92YWwobm9kZSk7CiAgICAgICAgIG1fZm9jdXNOYXZpZ2F0 aW9uU3RhcnRpbmdOb2RlSXNSZW1vdmVkID0gdHJ1ZTsKICAgICB9CiB9CkBAIC02NDY2LDEzICs2 NDY2LDEzIEBAIHZvaWQgRG9jdW1lbnQ6OmZ1bGxTY3JlZW5FbGVtZW50UmVtb3ZlZCgpCiAgICAg d2Via2l0Q2FuY2VsRnVsbFNjcmVlbigpOwogfQogCi12b2lkIERvY3VtZW50OjpyZW1vdmVGdWxs U2NyZWVuRWxlbWVudE9mU3VidHJlZShOb2RlJiBub2RlLCBib29sIGFtb25nQ2hpbGRyZW5Pbmx5 KQordm9pZCBEb2N1bWVudDo6YWRqdXN0RnVsbFNjcmVlbkVsZW1lbnRPbk5vZGVSZW1vdmFsKE5v ZGUmIG5vZGUsIE5vZGVSZW1vdmFsIG5vZGVSZW1vdmFsKQogewogICAgIGlmICghbV9mdWxsU2Ny ZWVuRWxlbWVudCkKICAgICAgICAgcmV0dXJuOwogICAgIAogICAgIGJvb2wgZWxlbWVudEluU3Vi dHJlZSA9IGZhbHNlOwotICAgIGlmIChhbW9uZ0NoaWxkcmVuT25seSkKKyAgICBpZiAobm9kZVJl bW92YWwgPT0gTm9kZVJlbW92YWw6OkNoaWxkcmVuT2ZOb2RlKQogICAgICAgICBlbGVtZW50SW5T dWJ0cmVlID0gbV9mdWxsU2NyZWVuRWxlbWVudC0+aXNEZXNjZW5kYW50T2Yobm9kZSk7CiAgICAg ZWxzZQogICAgICAgICBlbGVtZW50SW5TdWJ0cmVlID0gKG1fZnVsbFNjcmVlbkVsZW1lbnQgPT0g Jm5vZGUpIHx8IG1fZnVsbFNjcmVlbkVsZW1lbnQtPmlzRGVzY2VuZGFudE9mKG5vZGUpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9k b20vRG9jdW1lbnQuaAppbmRleCBiNjQ5NzNkM2Q1ZmNiMzA4YmE1YjgxOTM5MzY3ZGI5YjgzNjg5 ODg3Li5jZDFhOTYzMGZjNDk0ZDFjNDQ0MjNlMjM4ZDhlYmU2ODdkYWNmMTVhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20v RG9jdW1lbnQuaApAQCAtNzU3LDcgKzc1NywxMCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRGb2N1 c05hdmlnYXRpb25TdGFydGluZ05vZGUoTm9kZSopOwogICAgIEVsZW1lbnQqIGZvY3VzTmF2aWdh dGlvblN0YXJ0aW5nTm9kZShGb2N1c0RpcmVjdGlvbikgY29uc3Q7CiAKLSAgICB2b2lkIHJlbW92 ZUZvY3VzZWROb2RlT2ZTdWJ0cmVlKE5vZGUmLCBib29sIGFtb25nQ2hpbGRyZW5Pbmx5ID0gZmFs c2UpOworICAgIGVudW0gY2xhc3MgTm9kZVJlbW92YWwgeyBOb2RlLCBDaGlsZHJlbk9mTm9kZSB9 OworICAgIHZvaWQgYWRqdXN0Rm9jdXNlZE5vZGVPbk5vZGVSZW1vdmFsKE5vZGUmLCBOb2RlUmVt b3ZhbCA9IE5vZGVSZW1vdmFsOjpOb2RlKTsKKyAgICB2b2lkIGFkanVzdEZvY3VzTmF2aWdhdGlv bk5vZGVPbk5vZGVSZW1vdmFsKE5vZGUmLCBOb2RlUmVtb3ZhbCA9IE5vZGVSZW1vdmFsOjpOb2Rl KTsKKwogICAgIHZvaWQgaG92ZXJlZEVsZW1lbnREaWREZXRhY2goRWxlbWVudCopOwogICAgIHZv aWQgZWxlbWVudEluQWN0aXZlQ2hhaW5EaWREZXRhY2goRWxlbWVudCopOwogCkBAIC04MDIsNyAr ODA1LDcgQEAgcHVibGljOgogICAgIHZvaWQgbm9kZUNoaWxkcmVuV2lsbEJlUmVtb3ZlZChDb250 YWluZXJOb2RlJik7CiAgICAgLy8gbm9kZVdpbGxCZVJlbW92ZWQgaXMgb25seSBzYWZlIHdoZW4g cmVtb3Zpbmcgb25lIG5vZGUgYXQgYSB0aW1lLgogICAgIHZvaWQgbm9kZVdpbGxCZVJlbW92ZWQo Tm9kZSYpOwotICAgIHZvaWQgcmVtb3ZlRm9jdXNOYXZpZ2F0aW9uTm9kZU9mU3VidHJlZShOb2Rl JiwgYm9vbCBhbW9uZ0NoaWxkcmVuT25seSA9IGZhbHNlKTsKKwogICAgIGVudW0gY2xhc3MgQWNj ZXB0Q2hpbGRPcGVyYXRpb24geyBSZXBsYWNlLCBJbnNlcnRPckFkZCB9OwogICAgIGJvb2wgY2Fu QWNjZXB0Q2hpbGQoY29uc3QgTm9kZSYgbmV3Q2hpbGQsIGNvbnN0IE5vZGUqIHJlZkNoaWxkLCBB Y2NlcHRDaGlsZE9wZXJhdGlvbikgY29uc3Q7CiAKQEAgLTExNzcsNyArMTE4MCw4IEBAIHB1Ymxp YzoKICAgICB2b2lkIGRpc3BhdGNoRnVsbFNjcmVlbkNoYW5nZUV2ZW50cygpOwogICAgIGJvb2wg ZnVsbFNjcmVlbklzQWxsb3dlZEZvckVsZW1lbnQoRWxlbWVudCopIGNvbnN0OwogICAgIHZvaWQg ZnVsbFNjcmVlbkVsZW1lbnRSZW1vdmVkKCk7Ci0gICAgdm9pZCByZW1vdmVGdWxsU2NyZWVuRWxl bWVudE9mU3VidHJlZShOb2RlJiwgYm9vbCBhbW9uZ0NoaWxkcmVuT25seSA9IGZhbHNlKTsKKyAg ICB2b2lkIGFkanVzdEZ1bGxTY3JlZW5FbGVtZW50T25Ob2RlUmVtb3ZhbChOb2RlJiwgTm9kZVJl bW92YWwgPSBOb2RlUmVtb3ZhbDo6Tm9kZSk7CisKICAgICBXRUJDT1JFX0VYUE9SVCBib29sIGlz QW5pbWF0aW5nRnVsbFNjcmVlbigpIGNvbnN0OwogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc2V0 QW5pbWF0aW5nRnVsbFNjcmVlbihib29sKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv ZG9tL0VsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCmluZGV4IDE0 ZTNjMDc2MzkxZTg3NTA0Y2FmMmQ2ZDYxODdlZjRmNjFkMDM3OTcuLmVlZjQ5NzFmMjA4ZTcyZTI3 MTc2MTI2YTI1MmNmYzUxYWYyMjQyNDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9F bGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKQEAgLTIwMTcs NyArMjAxNyw3IEBAIHZvaWQgRWxlbWVudDo6cmVtb3ZlU2hhZG93Um9vdCgpCiAgICAgICAgIHJl dHVybjsKIAogICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbFBvcFNoYWRvd1Jvb3Qo KnRoaXMsICpvbGRSb290KTsKLSAgICBkb2N1bWVudCgpLnJlbW92ZUZvY3VzZWROb2RlT2ZTdWJ0 cmVlKCpvbGRSb290KTsKKyAgICBkb2N1bWVudCgpLmFkanVzdEZvY3VzZWROb2RlT25Ob2RlUmVt b3ZhbCgqb2xkUm9vdCk7CiAKICAgICBBU1NFUlQoIW9sZFJvb3QtPnJlbmRlcmVyKCkpOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAppbmRleCBjODVmY2MxZWJhZmVhMDI2Nzhi MWY2ODQwNzdiZWFmMGIzOGExMGUyLi5kNzMxOGIxMTBmMjJkOTEwNzNkZTAyMjk1MjA2Y2MzMDRj MTk1NjA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKQEAgLTYzMSw3ICs2 MzEsNyBAQCB2b2lkIEZyYW1lTG9hZGVyOjpjbGVhcihEb2N1bWVudCogbmV3RG9jdW1lbnQsIGJv b2wgY2xlYXJXaW5kb3dQcm9wZXJ0aWVzLCBib29sCiAgICAgICAgIGJvb2wgaGFkTGl2aW5nUmVu ZGVyVHJlZSA9IG1fZnJhbWUuZG9jdW1lbnQoKS0+aGFzTGl2aW5nUmVuZGVyVHJlZSgpOwogICAg ICAgICBtX2ZyYW1lLmRvY3VtZW50KCktPnByZXBhcmVGb3JEZXN0cnVjdGlvbigpOwogICAgICAg ICBpZiAoaGFkTGl2aW5nUmVuZGVyVHJlZSkKLSAgICAgICAgICAgIG1fZnJhbWUuZG9jdW1lbnQo KS0+cmVtb3ZlRm9jdXNlZE5vZGVPZlN1YnRyZWUoKm1fZnJhbWUuZG9jdW1lbnQoKSk7CisgICAg ICAgICAgICBtX2ZyYW1lLmRvY3VtZW50KCktPmFkanVzdEZvY3VzZWROb2RlT25Ob2RlUmVtb3Zh bCgqbV9mcmFtZS5kb2N1bWVudCgpKTsKICAgICB9CiAKICAgICAvLyBEbyB0aGlzIGFmdGVyIGRl dGFjaGluZyB0aGUgZG9jdW1lbnQgc28gdGhhdCB0aGUgdW5sb2FkIGV2ZW50IHdvcmtzLgo=