79854 2012-02-28 18:04:27 -0800 [Refactoring] Shadow related attach paths should be in ShadowTree. 2012-02-29 00:11:38 -0800 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 77503 1 morrita morrita shinyak oldest_to_newest 567294 0 morrita 2012-02-28 18:04:27 -0800 Some shadow related code is remaining in Element.cpp, which better live in ShadowTree. 567403 1 129395 morrita 2012-02-28 23:00:39 -0800 Created attachment 129395 Patch 567411 2 129395 rniwa 2012-02-28 23:14:51 -0800 Comment on attachment 129395 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=129395&action=review r=me provided comments below are addressed. > Source/WebCore/ChangeLog:13 > + Even after this change, there are some storange looking parts in ShadowTree attachment. Nit: s/storange/strange/. But what is "strange" about them? Could you be more explicit? > Source/WebCore/dom/ContainerNode.cpp:770 > + attachAsNode(); I don't think this is a good change. Node::attach() is much clearer. > Source/WebCore/dom/ContainerNode.cpp:779 > - Node::detach(); > + detachAsNode(); Ditto. 567435 3 morrita 2012-02-28 23:48:30 -0800 Considering code is polished enough, I expect next round will fine final ;-) 567450 4 129395 shinyak 2012-02-29 00:09:44 -0800 Comment on attachment 129395 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=129395&action=review > Source/WebCore/dom/ContainerNode.cpp:777 > + detachChildren(); This means detaching children twice? We should remove for-loop? 567451 5 morrita 2012-02-29 00:09:57 -0800 Committed r109203: <http://trac.webkit.org/changeset/109203> 567452 6 129395 shinyak 2012-02-29 00:11:38 -0800 Comment on attachment 129395 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=129395&action=review > Source/WebCore/dom/ShadowTree.cpp:176 > + this empty line is not necessary. 129395 2012-02-28 23:00:39 -0800 2012-02-29 00:11:38 -0800 Patch bug-79854-20120229160037.patch text/plain 9737 morrita U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5MTgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWEzOGQzODk2ODgwYjJj ODA2Nzc0NzkxM2NmODk0ODg0ZTAwNmMxMS4uNmQyZjllZmFmMmE2YjMxZDVmMTAwZGY5M2QxMmEx OTJjMWIwYTYzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDEyLTAyLTI4ICBNT1JJ VEEgSGFqaW1lICA8bW9ycml0YUBnb29nbGUuY29tPgorCisgICAgICAgIFtSZWZhY3RvcmluZ10g U2hhZG93IHJlbGF0ZWQgYXR0YWNoIHBhdGhzIHNob3VsZCBiZSBpbiBTaGFkb3dUcmVlLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzk4NTQKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMu IE5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICBUaGlzIGNoYW5nZSBpbnRyb2R1Y2VzIFNo YWRvd1RyZWU6OmF0dGFjaEhvc3QoKSBhbmQgU2hhZG93VHJlZTo6ZGV0YWNoSG9zdCgpCisgICAg ICAgIGFuZCBtb3ZlcyBzaGFkb3ctZW5hYmxlZCBhdHRhY2htZW50IGNvZGUgZnJvbSBFbGVtZW50 IHRvIFNoYWRvd1Jvb3QuCisgICAgICAgIFRoaXMgYWxzbyBmYWN0b3JlZCBvdXQgc21hbGwgQ29u dGFpbmVyTm9kZSBtZXRob2QgdG8gdXNlIGl0IGZyb20gU2hhZG93VHJlZS4KKyAgICAgICAgRXZl biBhZnRlciB0aGlzIGNoYW5nZSwgdGhlcmUgYXJlIHNvbWUgc3RvcmFuZ2UgbG9va2luZyBwYXJ0 cyBpbiBTaGFkb3dUcmVlIGF0dGFjaG1lbnQuCisgICAgICAgIEZpeGVzIGZvciB0aGVzZSBzdHJh bmdlbmVzcyB3aWxsIGNvbWUgYXMgc2VwYXJhdGUgY2hhbmdlcy4KKyAgICAgICAgVGhpcyBjaGFu Z2UgaXMgYWltZWQgdG8gYmUgcHVyZWx5IHRleHR1cmFsLgorCisgICAgICAgICogZG9tL0NvbnRh aW5lck5vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGFpbmVyTm9kZTo6YXR0YWNoKToK KyAgICAgICAgKFdlYkNvcmU6OkNvbnRhaW5lck5vZGU6OmRldGFjaCk6CisgICAgICAgICogZG9t L0NvbnRhaW5lck5vZGUuaDoKKyAgICAgICAgKENvbnRhaW5lck5vZGUpOgorICAgICAgICAoV2Vi Q29yZTo6Q29udGFpbmVyTm9kZTo6YXR0YWNoQXNOb2RlKTogQWRkZWQuCisgICAgICAgIChXZWJD b3JlOjpDb250YWluZXJOb2RlOjphdHRhY2hDaGlsZHJlbik6IEFkZGVkLgorICAgICAgICAoV2Vi Q29yZTo6Q29udGFpbmVyTm9kZTo6YXR0YWNoQ2hpbGRyZW5JZk5lZWRlZCk6IEFkZGVkLgorICAg ICAgICAoV2ViQ29yZTo6Q29udGFpbmVyTm9kZTo6YXR0YWNoQ2hpbGRyZW5MYXppbHkpOiBBZGRl ZC4KKyAgICAgICAgKFdlYkNvcmU6OkNvbnRhaW5lck5vZGU6OmRldGFjaEFzTm9kZSk6IEFkZGVk LgorICAgICAgICAoV2ViQ29yZTo6Q29udGFpbmVyTm9kZTo6ZGV0YWNoQ2hpbGRyZW5JZk5lZWRl ZCk6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6Q29udGFpbmVyTm9kZTo6ZGV0YWNoQ2hpbGRy ZW4pOiBBZGRlZC4KKyAgICAgICAgKiBkb20vRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpFbGVtZW50OjphdHRhY2gpOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6ZGV0YWNoKToK KyAgICAgICAgKiBkb20vU2hhZG93VHJlZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTaGFkb3dU cmVlOjphZGRTaGFkb3dSb290KToKKyAgICAgICAgKFdlYkNvcmU6OlNoYWRvd1RyZWU6OnJlbW92 ZUFsbFNoYWRvd1Jvb3RzKToKKyAgICAgICAgKFdlYkNvcmU6OlNoYWRvd1RyZWU6OmRldGFjaEhv c3QpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpTaGFkb3dUcmVlOjph dHRhY2hIb3N0KToKKyAgICAgICAgKFdlYkNvcmU6OlNoYWRvd1RyZWU6OnJlYXR0YWNoSG9zdENo aWxkcmVuQW5kU2hhZG93KToKKyAgICAgICAgKiBkb20vU2hhZG93VHJlZS5oOgorICAgICAgICAo U2hhZG93VHJlZSk6CisKIDIwMTItMDItMjcgIE1PUklUQSBIYWppbWUgIDxtb3JyaXRhQGdvb2ds ZS5jb20+CiAKICAgICAgICAgPGNvbnRlbnQ+IGVsZW1lbnQgc2hvdWxkIGJlaGF2ZSBhcyBIVE1M VW5rbm93bkVsZW1lbnQgb3V0c2lkZSBvZiBhIHNoYWRvdyBET00gc3VidHJlZQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvZG9tL0NvbnRhaW5lck5vZGUuY3BwIGIvU291cmNlL1dlYkNvcmUv ZG9tL0NvbnRhaW5lck5vZGUuY3BwCmluZGV4IGNhZWNlNjg3MzBkODAzZWI2Y2VkYzM4N2YwZDI4 N2E3OTNhOTNmOWMuLjU3ZDVjOWYxNTVhZDRhMWQ1NzY3ZGFiZWZiNDgxZjNlMmI3Nzk5YTcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Db250YWluZXJOb2RlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9kb20vQ29udGFpbmVyTm9kZS5jcHAKQEAgLTc2NiwxNyArNzY2LDE3IEBAIHZv aWQgQ29udGFpbmVyTm9kZTo6c2NoZWR1bGVTZXROZWVkc1N0eWxlUmVjYWxjKFN0eWxlQ2hhbmdl VHlwZSBjaGFuZ2VUeXBlKQogCiB2b2lkIENvbnRhaW5lck5vZGU6OmF0dGFjaCgpCiB7Ci0gICAg Zm9yIChOb2RlKiBjaGlsZCA9IG1fZmlyc3RDaGlsZDsgY2hpbGQ7IGNoaWxkID0gY2hpbGQtPm5l eHRTaWJsaW5nKCkpCi0gICAgICAgIGNoaWxkLT5hdHRhY2goKTsKLSAgICBOb2RlOjphdHRhY2go KTsKKyAgICBhdHRhY2hDaGlsZHJlbigpOworICAgIGF0dGFjaEFzTm9kZSgpOwogfQogCiB2b2lk IENvbnRhaW5lck5vZGU6OmRldGFjaCgpCiB7CiAgICAgZm9yIChOb2RlKiBjaGlsZCA9IG1fZmly c3RDaGlsZDsgY2hpbGQ7IGNoaWxkID0gY2hpbGQtPm5leHRTaWJsaW5nKCkpCiAgICAgICAgIGNo aWxkLT5kZXRhY2goKTsKKyAgICBkZXRhY2hDaGlsZHJlbigpOwogICAgIGNsZWFyQ2hpbGROZWVk c1N0eWxlUmVjYWxjKCk7Ci0gICAgTm9kZTo6ZGV0YWNoKCk7CisgICAgZGV0YWNoQXNOb2RlKCk7 CiB9CiAKIHZvaWQgQ29udGFpbmVyTm9kZTo6aW5zZXJ0ZWRJbnRvRG9jdW1lbnQoKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0NvbnRhaW5lck5vZGUuaCBiL1NvdXJjZS9XZWJDb3Jl L2RvbS9Db250YWluZXJOb2RlLmgKaW5kZXggMzc5MDhjZTQ4ODc0ODk5MjUyYjE3MGIzN2E3ODE1 MzAzOWE1ZTE5Yy4uMjVjZGE5NDYwOWY3MDBmN2MxOGRkYjg4ZDI3ZDE5Njc0ZTFkMTZiYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0NvbnRhaW5lck5vZGUuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9kb20vQ29udGFpbmVyTm9kZS5oCkBAIC05NCw2ICs5NCwxNCBAQCBwdWJsaWM6CiAg ICAgLy8gbm9kZSB0aGF0IGlzIG9mIHRoZSB0eXBlIENEQVRBX1NFQ1RJT05fTk9ERSwgVEVYVF9O T0RFIG9yIENPTU1FTlRfTk9ERSBoYXMgY2hhbmdlZCBpdHMgdmFsdWUuCiAgICAgdmlydHVhbCB2 b2lkIGNoaWxkcmVuQ2hhbmdlZChib29sIGNyZWF0ZWRCeVBhcnNlciA9IGZhbHNlLCBOb2RlKiBi ZWZvcmVDaGFuZ2UgPSAwLCBOb2RlKiBhZnRlckNoYW5nZSA9IDAsIGludCBjaGlsZENvdW50RGVs dGEgPSAwKTsKIAorICAgIHZvaWQgYXR0YWNoQXNOb2RlKCk7CisgICAgdm9pZCBhdHRhY2hDaGls ZHJlbigpOworICAgIHZvaWQgYXR0YWNoQ2hpbGRyZW5JZk5lZWRlZCgpOworICAgIHZvaWQgYXR0 YWNoQ2hpbGRyZW5MYXppbHkoKTsKKyAgICB2b2lkIGRldGFjaEFzTm9kZSgpOworICAgIHZvaWQg ZGV0YWNoQ2hpbGRyZW4oKTsKKyAgICB2b2lkIGRldGFjaENoaWxkcmVuSWZOZWVkZWQoKTsKKwog cHJvdGVjdGVkOgogICAgIENvbnRhaW5lck5vZGUoRG9jdW1lbnQqLCBDb25zdHJ1Y3Rpb25UeXBl ID0gQ3JlYXRlQ29udGFpbmVyKTsKIApAQCAtMTQ2LDYgKzE1NCw1MCBAQCBpbmxpbmUgQ29udGFp bmVyTm9kZTo6Q29udGFpbmVyTm9kZShEb2N1bWVudCogZG9jdW1lbnQsIENvbnN0cnVjdGlvblR5 cGUgdHlwZSkKIHsKIH0KIAoraW5saW5lIHZvaWQgQ29udGFpbmVyTm9kZTo6YXR0YWNoQXNOb2Rl KCkKK3sKKyAgICBOb2RlOjphdHRhY2goKTsKK30KKworaW5saW5lIHZvaWQgQ29udGFpbmVyTm9k ZTo6YXR0YWNoQ2hpbGRyZW4oKQoreworICAgIGZvciAoTm9kZSogY2hpbGQgPSBmaXJzdENoaWxk KCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT5uZXh0U2libGluZygpKQorICAgICAgICBjaGlsZC0+ YXR0YWNoKCk7Cit9CisKK2lubGluZSB2b2lkIENvbnRhaW5lck5vZGU6OmF0dGFjaENoaWxkcmVu SWZOZWVkZWQoKQoreworICAgIGZvciAoTm9kZSogY2hpbGQgPSBmaXJzdENoaWxkKCk7IGNoaWxk OyBjaGlsZCA9IGNoaWxkLT5uZXh0U2libGluZygpKSB7CisgICAgICAgIGlmICghY2hpbGQtPmF0 dGFjaGVkKCkpCisgICAgICAgICAgICBjaGlsZC0+YXR0YWNoKCk7CisgICAgfQorfQorCitpbmxp bmUgdm9pZCBDb250YWluZXJOb2RlOjphdHRhY2hDaGlsZHJlbkxhemlseSgpCit7CisgICAgZm9y IChOb2RlKiBjaGlsZCA9IGZpcnN0Q2hpbGQoKTsgY2hpbGQ7IGNoaWxkID0gY2hpbGQtPm5leHRT aWJsaW5nKCkpCisgICAgICAgIGNoaWxkLT5sYXp5QXR0YWNoKCk7Cit9CisKK2lubGluZSB2b2lk IENvbnRhaW5lck5vZGU6OmRldGFjaEFzTm9kZSgpCit7CisgICAgTm9kZTo6ZGV0YWNoKCk7Cit9 CisKK2lubGluZSB2b2lkIENvbnRhaW5lck5vZGU6OmRldGFjaENoaWxkcmVuSWZOZWVkZWQoKQor eworICAgIGZvciAoTm9kZSogY2hpbGQgPSBmaXJzdENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9IGNo aWxkLT5uZXh0U2libGluZygpKSB7CisgICAgICAgIGlmIChjaGlsZC0+YXR0YWNoZWQoKSkKKyAg ICAgICAgICAgIGNoaWxkLT5kZXRhY2goKTsKKyAgICB9Cit9CisKK2lubGluZSB2b2lkIENvbnRh aW5lck5vZGU6OmRldGFjaENoaWxkcmVuKCkKK3sKKyAgICBmb3IgKE5vZGUqIGNoaWxkID0gZmly c3RDaGlsZCgpOyBjaGlsZDsgY2hpbGQgPSBjaGlsZC0+bmV4dFNpYmxpbmcoKSkKKyAgICAgICAg Y2hpbGQtPmRldGFjaCgpOworfQorCiBpbmxpbmUgdW5zaWduZWQgTm9kZTo6Y2hpbGROb2RlQ291 bnQoKSBjb25zdAogewogICAgIGlmICghaXNDb250YWluZXJOb2RlKCkpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVu dC5jcHAKaW5kZXggODVlNWM5YjdkZWY0MTQ5ZGQ2ZGUwYzYxOTU3MDkxOWIyYzE0MzdhMy4uOThj MjkzMTg0NmM0MmMxZWE5ODRiZTY2YjIyZDdkMjJhNWI0ODIyYSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50 LmNwcApAQCAtOTI4LDE4ICs5MjgsOSBAQCB2b2lkIEVsZW1lbnQ6OmF0dGFjaCgpCiAgICAgU3R5 bGVTZWxlY3RvclBhcmVudFB1c2hlciBwYXJlbnRQdXNoZXIodGhpcyk7CiAKICAgICAvLyBXaGVu IGEgc2hhZG93IHJvb3QgZXhpc3RzLCBpdCBkb2VzIHRoZSB3b3JrIG9mIGF0dGFjaGluZyB0aGUg Y2hpbGRyZW4uCi0gICAgaWYgKGhhc1NoYWRvd1Jvb3QoKSkgeworICAgIGlmIChTaGFkb3dUcmVl KiB0cmVlID0gc2hhZG93VHJlZSgpKSB7CiAgICAgICAgIHBhcmVudFB1c2hlci5wdXNoKCk7Ci0g ICAgICAgIHNoYWRvd1RyZWUoKS0+YXR0YWNoKCk7Ci0KLSAgICAgICAgLy8gSW4gYSBzaGFkb3cg dHJlZSwgc29tZSBvZiBsaWdodCBjaGlsZHJlbiBtYXkgYmUgYXR0YWNoZWQgYnkgPGNvbnRlbnQ+ IG9yIDxzaGFkb3c+LgotICAgICAgICAvLyBIb3dldmVyLCB3aGVuIHRoZXJlIGlzIG5vIGNvbnRl bnQgZWxlbWVudCBvciBjb250ZW50IGVsZW1lbnQgZG9lcyBub3Qgc2VsZWN0Ci0gICAgICAgIC8v IGFsbCBsaWdodCBjaGlsZHJlbiwgd2UgaGF2ZSB0byBhdHRhY2ggdGhlIHJlc3Qgb2YgbGlnaHQg Y2hpbGRyZW4gaGVyZS4KLSAgICAgICAgZm9yIChOb2RlKiBjaGlsZCA9IGZpcnN0Q2hpbGQoKTsg Y2hpbGQ7IGNoaWxkID0gY2hpbGQtPm5leHRTaWJsaW5nKCkpIHsKLSAgICAgICAgICAgIGlmICgh Y2hpbGQtPmF0dGFjaGVkKCkpCi0gICAgICAgICAgICAgICAgY2hpbGQtPmF0dGFjaCgpOwotICAg ICAgICB9Ci0gICAgICAgIE5vZGU6OmF0dGFjaCgpOworICAgICAgICB0cmVlLT5hdHRhY2hIb3N0 KHRoaXMpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIGlmIChmaXJzdENoaWxkKCkpCiAgICAgICAg ICAgICBwYXJlbnRQdXNoZXIucHVzaCgpOwpAQCAtOTY3LDE4ICs5NTgsMTEgQEAgdm9pZCBFbGVt ZW50OjpkZXRhY2goKQogICAgIGlmIChoYXNSYXJlRGF0YSgpKQogICAgICAgICByYXJlRGF0YSgp LT5yZXNldENvbXB1dGVkU3R5bGUoKTsKIAotICAgIGlmIChoYXNTaGFkb3dSb290KCkpIHsKLSAg ICAgICAgZm9yIChOb2RlKiBjaGlsZCA9IGZpcnN0Q2hpbGQoKTsgY2hpbGQ7IGNoaWxkID0gY2hp bGQtPm5leHRTaWJsaW5nKCkpIHsKLSAgICAgICAgICAgIGlmIChjaGlsZC0+YXR0YWNoZWQoKSkK LSAgICAgICAgICAgICAgICBjaGlsZC0+ZGV0YWNoKCk7Ci0gICAgICAgIH0KLQotICAgICAgICBz aGFkb3dUcmVlKCktPmRldGFjaCgpOwotICAgICAgICBOb2RlOjpkZXRhY2goKTsKLSAgICB9IGVs c2UKKyAgICBpZiAoU2hhZG93VHJlZSogdHJlZSA9IHNoYWRvd1RyZWUoKSkKKyAgICAgICAgdHJl ZS0+ZGV0YWNoSG9zdCh0aGlzKTsKKyAgICBlbHNlCiAgICAgICAgIENvbnRhaW5lck5vZGU6OmRl dGFjaCgpOwogCi0KICAgICBSZW5kZXJXaWRnZXQ6OnJlc3VtZVdpZGdldEhpZXJhcmNoeVVwZGF0 ZXMoKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL1NoYWRvd1RyZWUuY3Bw IGIvU291cmNlL1dlYkNvcmUvZG9tL1NoYWRvd1RyZWUuY3BwCmluZGV4IGIyOGRmMDUyM2EwZmM5 ZDA3MDA3NDk1M2UwZWI3MWQ5NDhlODg0N2EuLmEwYjkxM2Q4Nzg5YThlODkwOTM1ZTdlNzczOWIw MzVmZTMxNTMyMjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TaGFkb3dUcmVlLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vU2hhZG93VHJlZS5jcHAKQEAgLTg2LDggKzg2LDcg QEAgdm9pZCBTaGFkb3dUcmVlOjphZGRTaGFkb3dSb290KEVsZW1lbnQqIHNoYWRvd0hvc3QsIFBh c3NSZWZQdHI8U2hhZG93Um9vdD4gc2hhZG8KICAgICBpZiAoc2hhZG93SG9zdC0+YXR0YWNoZWQo KSkgewogICAgICAgICBzaGFkb3dSb290LT5sYXp5QXR0YWNoKCk7CiAgICAgICAgIGRldGFjaCgp OwotICAgICAgICBmb3IgKE5vZGUqIGNoaWxkID0gc2hhZG93SG9zdC0+Zmlyc3RDaGlsZCgpOyBj aGlsZDsgY2hpbGQgPSBjaGlsZC0+bmV4dFNpYmxpbmcoKSkKLSAgICAgICAgICAgIGNoaWxkLT5k ZXRhY2goKTsKKyAgICAgICAgc2hhZG93SG9zdC0+ZGV0YWNoQ2hpbGRyZW4oKTsKICAgICB9CiAK ICAgICBtX3NoYWRvd1Jvb3RzLnB1c2goc2hhZG93Um9vdC5nZXQoKSk7CkBAIC0xMTgsMTIgKzEx Nyw4IEBAIHZvaWQgU2hhZG93VHJlZTo6cmVtb3ZlQWxsU2hhZG93Um9vdHMoKQogICAgICAgICAg ICAgb2xkUm9vdC0+cmVtb3ZlZEZyb21UcmVlKHRydWUpOwogICAgIH0KIAotICAgIGlmIChzaGFk b3dIb3N0LT5hdHRhY2hlZCgpKSB7Ci0gICAgICAgIGZvciAoTm9kZSogY2hpbGQgPSBzaGFkb3dI b3N0LT5maXJzdENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT5uZXh0U2libGluZygpKSB7 Ci0gICAgICAgICAgICBpZiAoIWNoaWxkLT5hdHRhY2hlZCgpKQotICAgICAgICAgICAgICAgIGNo aWxkLT5sYXp5QXR0YWNoKCk7Ci0gICAgICAgIH0KLSAgICB9CisgICAgaWYgKHNoYWRvd0hvc3Qt PmF0dGFjaGVkKCkpCisgICAgICAgIHNoYWRvd0hvc3QtPmF0dGFjaENoaWxkcmVuTGF6aWx5KCk7 CiB9CiAKIHZvaWQgU2hhZG93VHJlZTo6aW5zZXJ0ZWRJbnRvRG9jdW1lbnQoKQpAQCAtMTcxLDYg KzE2NiwxNCBAQCB2b2lkIFNoYWRvd1RyZWU6OmF0dGFjaCgpCiAgICAgICAgIGNvbnRlbnRTZWxl Y3Rvci0+ZGlkU2VsZWN0KCk7CiB9CiAKK3ZvaWQgU2hhZG93VHJlZTo6ZGV0YWNoSG9zdChFbGVt ZW50KiBob3N0KQoreworICAgIGF0dGFjaCgpOworICAgIGhvc3QtPmF0dGFjaENoaWxkcmVuSWZO ZWVkZWQoKTsKKyAgICBob3N0LT5hdHRhY2hBc05vZGUoKTsKK30KKworCiB2b2lkIFNoYWRvd1Ry ZWU6OmRldGFjaCgpCiB7CiAgICAgZm9yIChTaGFkb3dSb290KiByb290ID0geW91bmdlc3RTaGFk b3dSb290KCk7IHJvb3Q7IHJvb3QgPSByb290LT5vbGRlclNoYWRvd1Jvb3QoKSkgewpAQCAtMTc5 LDYgKzE4MiwxMyBAQCB2b2lkIFNoYWRvd1RyZWU6OmRldGFjaCgpCiAgICAgfQogfQogCit2b2lk IFNoYWRvd1RyZWU6OmF0dGFjaEhvc3QoRWxlbWVudCogaG9zdCkKK3sKKyAgICBob3N0LT5kZXRh Y2hDaGlsZHJlbklmTmVlZGVkKCk7CisgICAgZGV0YWNoKCk7CisgICAgaG9zdC0+ZGV0YWNoQXNO b2RlKCk7Cit9CisKIEluc2VydGlvblBvaW50KiBTaGFkb3dUcmVlOjppbnNlcnRpb25Qb2ludEZv cihOb2RlKiBub2RlKSBjb25zdAogewogICAgIGlmICghbV9zZWxlY3RvcikKQEAgLTI2OSwyMSAr Mjc5LDEwIEBAIHZvaWQgU2hhZG93VHJlZTo6cmVhdHRhY2hIb3N0Q2hpbGRyZW5BbmRTaGFkb3co KQogewogICAgIEFTU0VSVCh5b3VuZ2VzdFNoYWRvd1Jvb3QoKSk7CiAKLSAgICBOb2RlKiBob3N0 Tm9kZSA9IHlvdW5nZXN0U2hhZG93Um9vdCgpLT5ob3N0KCk7Ci0gICAgaWYgKCFob3N0Tm9kZSkK LSAgICAgICAgcmV0dXJuOwotCi0gICAgZm9yIChOb2RlKiBjaGlsZCA9IGhvc3ROb2RlLT5maXJz dENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT5uZXh0U2libGluZygpKSB7Ci0gICAgICAg IGlmIChjaGlsZC0+YXR0YWNoZWQoKSkKLSAgICAgICAgICAgIGNoaWxkLT5kZXRhY2goKTsKLSAg ICB9Ci0KKyAgICBFbGVtZW50KiBob3N0Tm9kZSA9IHlvdW5nZXN0U2hhZG93Um9vdCgpLT5ob3N0 KCk7CisgICAgaG9zdE5vZGUtPmRldGFjaENoaWxkcmVuSWZOZWVkZWQoKTsKICAgICByZWF0dGFj aCgpOwotCi0gICAgZm9yIChOb2RlKiBjaGlsZCA9IGhvc3ROb2RlLT5maXJzdENoaWxkKCk7IGNo aWxkOyBjaGlsZCA9IGNoaWxkLT5uZXh0U2libGluZygpKSB7Ci0gICAgICAgIGlmICghY2hpbGQt PmF0dGFjaGVkKCkpCi0gICAgICAgICAgICBjaGlsZC0+YXR0YWNoKCk7Ci0gICAgfQorICAgIGhv c3ROb2RlLT5hdHRhY2hDaGlsZHJlbklmTmVlZGVkKCk7CiB9CiAKIEhUTUxDb250ZW50U2VsZWN0 b3IqIFNoYWRvd1RyZWU6OmVuc3VyZVNlbGVjdG9yKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2RvbS9TaGFkb3dUcmVlLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vU2hhZG93VHJlZS5oCmlu ZGV4IDkyZTliMTNkOGQ3NzQxZWU1Y2I0MmY3MTQwYTdlZDFhYzYyNGEwNGEuLmJlMjcwMGMxNTU5 YTBhYTE0OTBjZjI2NzA5MWE3OTFiMzUyYTc5M2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9TaGFkb3dUcmVlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1NoYWRvd1RyZWUuaApA QCAtNjIsNiArNjIsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBhdHRhY2goKTsKICAgICB2b2lkIGRl dGFjaCgpOwogICAgIHZvaWQgcmVhdHRhY2goKTsKKyAgICB2b2lkIGF0dGFjaEhvc3QoRWxlbWVu dCopOworICAgIHZvaWQgZGV0YWNoSG9zdChFbGVtZW50Kik7CiAKICAgICBib29sIGNoaWxkTmVl ZHNTdHlsZVJlY2FsYygpOwogICAgIGJvb2wgbmVlZHNTdHlsZVJlY2FsYygpOwo=