80373 2012-03-05 20:37:32 -0800 InsertionPoint::attach should be consistent with Element. 2012-03-05 22:59:29 -0800 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 78596 1 shinyak shinyak oldest_to_newest 571429 0 shinyak 2012-03-05 20:37:32 -0800 This bug is preparation for Bug 78596. InsertionPoint::attach will have code for <shadow> element later, but it is a bit messy now. So let's clean up the code. (1) Currently InsertionPoint attaches fallback elements before attaching distributed elements. To be consistent, attaching distributed elements first is better, since Element attaches shadow tree first. (2) Let's extract functions from InsertionPoint::attach() also. 571432 1 130278 shinyak 2012-03-05 20:45:35 -0800 Created attachment 130278 Patch 571440 2 130278 morrita 2012-03-05 21:14:14 -0800 Comment on attachment 130278 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=130278&action=review > Source/WebCore/ChangeLog:3 > + Refactoring: Make InsertionPoint code clean. Could you explain the change more concretely? What the following explanation says isn't cleanup apparently. > Source/WebCore/ChangeLog:10 > + InsertionPoint used to attach fallback element before attaching distributed elements. fallback elements? > Source/WebCore/ChangeLog:11 > + To be consistent with Element::attach behavior, attachign distributed elements first is s/attachign/attaching/ > Source/WebCore/html/shadow/InsertionPoint.cpp:52 > + distributeLightChildren(root->tree()); Could you reconsider the name? There is no term "light children" in the standard. 571444 3 shinyak 2012-03-05 21:34:01 -0800 (In reply to comment #2) > (From update of attachment 130278 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=130278&action=review > > > Source/WebCore/ChangeLog:3 > > + Refactoring: Make InsertionPoint code clean. > > Could you explain the change more concretely? > What the following explanation says isn't cleanup apparently. Done. > > > Source/WebCore/ChangeLog:10 > > + InsertionPoint used to attach fallback element before attaching distributed elements. > > fallback elements? Done. > > > Source/WebCore/ChangeLog:11 > > + To be consistent with Element::attach behavior, attachign distributed elements first is > > s/attachign/attaching/ Done. > > > Source/WebCore/html/shadow/InsertionPoint.cpp:52 > > + distributeLightChildren(root->tree()); > > Could you reconsider the name? There is no term "light children" in the standard. Renamed to distributeHostChildren. 571445 4 130280 shinyak 2012-03-05 21:35:00 -0800 Created attachment 130280 Patch 571483 5 130280 morrita 2012-03-05 22:21:13 -0800 Comment on attachment 130280 Patch looks good. 571517 6 shinyak 2012-03-05 22:59:29 -0800 Committed r109864: <http://trac.webkit.org/changeset/109864> 130278 2012-03-05 20:45:35 -0800 2012-03-05 21:34:53 -0800 Patch bug-80373-20120306134533.patch text/plain 4646 shinyak U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5ODMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2JhYjJkMTE0OWMwMGIy Y2QwNzdhNWJkNjdhMWNlZGQ4NzJiNmU2OS4uNmY3ZWE0Yjg4YzRmZGVhNjY1MWI3NjdiY2Y0YmE0 NmQzYWQ1N2ZiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEyLTAzLTA1ICBTaGlu eWEgS2F3YW5ha2EgIDxzaGlueWFrQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZWZhY3Rvcmlu ZzogTWFrZSBJbnNlcnRpb25Qb2ludCBjb2RlIGNsZWFuLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODAzNzMKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGlzIHByZXBhcmF0aW9uIGZvciBj b21pbmcgPHNoYWRvdz4gcGF0Y2hlcy4KKworICAgICAgICBJbnNlcnRpb25Qb2ludCB1c2VkIHRv IGF0dGFjaCBmYWxsYmFjayBlbGVtZW50IGJlZm9yZSBhdHRhY2hpbmcgZGlzdHJpYnV0ZWQgZWxl bWVudHMuCisgICAgICAgIFRvIGJlIGNvbnNpc3RlbnQgd2l0aCBFbGVtZW50OjphdHRhY2ggYmVo YXZpb3IsIGF0dGFjaGlnbiBkaXN0cmlidXRlZCBlbGVtZW50cyBmaXJzdCBpcworICAgICAgICBu YXR1cmFsLCBiZWNhdXNlIEVsZW1lbnQgYXR0YWNoZXMgYSBzaGFkb3cgdHJlZSBmaXJzdC4KKwor ICAgICAgICBBbHNvLCB0aGlzIHBhdGNoIGV4dHJhY3RzIGEgZmV3IG1ldGhvZHMgZm9ybSBJbnNy ZXRpb25Qb2ludDo6YXR0YWNoKCkgYW5kIGRldGFjaCgpCisgICAgICAgIHRvIGtlZXAgY29kZSBj bGVhbi4gVGhleSB3aWxsIGJlY29tZSBtZXNzeSB3aXRob3V0IHRoaXMgcmVmYWN0b3Jpbmcgd2hl biBhZGRpbmcKKyAgICAgICAgPHNoYWRvdz4gcGF0Y2guCisKKyAgICAgICAgTm8gbmV3IHRlc3Rz LiBTaG91bGQgYmUgY292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIGh0bWwv c2hhZG93L0luc2VydGlvblBvaW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc2VydGlvblBv aW50OjphdHRhY2gpOgorICAgICAgICAoV2ViQ29yZTo6SW5zZXJ0aW9uUG9pbnQ6OmRldGFjaCk6 CisgICAgICAgIChXZWJDb3JlOjpJbnNlcnRpb25Qb2ludDo6ZGlzdHJpYnV0ZUxpZ2h0Q2hpbGRy ZW4pOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNlcnRpb25Qb2lu dDo6Y2xlYXJEaXN0cmlidXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6SW5zZXJ0aW9uUG9pbnQ6 OmF0dGFjaERpc3RyaWJ1dGVkTm9kZSk6CisgICAgICAgICogaHRtbC9zaGFkb3cvSW5zZXJ0aW9u UG9pbnQuaDoKKyAgICAgICAgKEluc2VydGlvblBvaW50KToKKwogMjAxMi0wMy0wNSAgS2VudGFy byBIYXJhICA8aGFyYWtlbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW0pTQ10gQ2FjaGUgdGhl IENTU1Byb3BlcnR5SUQgaW4gSlNDU1NTdHlsZURlY2xhcmF0aW9uCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9odG1sL3NoYWRvdy9JbnNlcnRpb25Qb2ludC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL3NoYWRvdy9JbnNlcnRpb25Qb2ludC5jcHAKaW5kZXggMzY1Njk1ZDFhZDRhYzY5NGU0 ZTg4M2VlOGQxMzRkMDZhZWIzYzJjOS4uN2ZjNDE1ZTc3YWIyODgwMjdkMjUxMzgxNzBiM2UyNmJi OGVkZjM1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvSW5zZXJ0aW9u UG9pbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0luc2VydGlvblBvaW50 LmNwcApAQCAtNDgsMzEgKzQ4LDIzIEBAIEluc2VydGlvblBvaW50Ojp+SW5zZXJ0aW9uUG9pbnQo KQogCiB2b2lkIEluc2VydGlvblBvaW50OjphdHRhY2goKQogewotICAgIFNoYWRvd1Jvb3QqIHJv b3QgPSB0b1NoYWRvd1Jvb3Qoc2hhZG93VHJlZVJvb3ROb2RlKCkpOwotCi0gICAgaWYgKHJvb3Qp IHsKLSAgICAgICAgSFRNTENvbnRlbnRTZWxlY3Rvciogc2VsZWN0b3IgPSByb290LT50cmVlKCkt PmVuc3VyZVNlbGVjdG9yKCk7Ci0gICAgICAgIHNlbGVjdG9yLT51bnNlbGVjdCgmbV9zZWxlY3Rp b25zKTsKLSAgICAgICAgc2VsZWN0b3ItPnNlbGVjdCh0aGlzLCAmbV9zZWxlY3Rpb25zKTsKKyAg ICBpZiAoU2hhZG93Um9vdCogcm9vdCA9IHRvU2hhZG93Um9vdChzaGFkb3dUcmVlUm9vdE5vZGUo KSkpIHsKKyAgICAgICAgZGlzdHJpYnV0ZUxpZ2h0Q2hpbGRyZW4ocm9vdC0+dHJlZSgpKTsKKyAg ICAgICAgYXR0YWNoRGlzdHJpYnV0ZWROb2RlKCk7CiAgICAgfQogCiAgICAgSFRNTEVsZW1lbnQ6 OmF0dGFjaCgpOwotCi0gICAgaWYgKHJvb3QpIHsKLSAgICAgICAgZm9yIChIVE1MQ29udGVudFNl bGVjdGlvbiogc2VsZWN0aW9uID0gbV9zZWxlY3Rpb25zLmZpcnN0KCk7IHNlbGVjdGlvbjsgc2Vs ZWN0aW9uID0gc2VsZWN0aW9uLT5uZXh0KCkpCi0gICAgICAgICAgICBzZWxlY3Rpb24tPm5vZGUo KS0+YXR0YWNoKCk7Ci0gICAgfQogfQogCiB2b2lkIEluc2VydGlvblBvaW50OjpkZXRhY2goKQog ewogICAgIGlmIChTaGFkb3dSb290KiByb290ID0gdG9TaGFkb3dSb290KHNoYWRvd1RyZWVSb290 Tm9kZSgpKSkgewotICAgICAgICBpZiAoSFRNTENvbnRlbnRTZWxlY3Rvciogc2VsZWN0b3IgPSBy b290LT50cmVlKCktPnNlbGVjdG9yKCkpCi0gICAgICAgICAgICBzZWxlY3Rvci0+dW5zZWxlY3Qo Jm1fc2VsZWN0aW9ucyk7CisgICAgICAgIFNoYWRvd1RyZWUqIHRyZWUgPSByb290LT50cmVlKCk7 CisgICAgICAgIGNsZWFyRGlzdHJpYnV0aW9uKHRyZWUpOwogCiAgICAgICAgIC8vIFdoZW4gc2hh ZG93IGVsZW1lbnQgaXMgZGV0YWNoZWQsIHNoYWRvdyB0cmVlIHNob3VsZCBiZSByZWNyZWF0ZWQg dG8gcmUtY2FsY3VsYXRlIHNlbGVjdG9yIGZvcgogICAgICAgICAvLyBvdGhlciBpbnNlcnRpb24g cG9pbnRzLgotICAgICAgICByb290LT50cmVlKCktPnNldE5lZWRzUmVhdHRhY2hIb3N0Q2hpbGRy ZW5BbmRTaGFkb3coKTsKKyAgICAgICAgdHJlZS0+c2V0TmVlZHNSZWF0dGFjaEhvc3RDaGlsZHJl bkFuZFNoYWRvdygpOwogICAgIH0KIAogICAgIEFTU0VSVChtX3NlbGVjdGlvbnMuaXNFbXB0eSgp KTsKQEAgLTkxLDQgKzgzLDIzIEBAIGJvb2wgSW5zZXJ0aW9uUG9pbnQ6OnJlbmRlcmVySXNOZWVk ZWQoY29uc3QgTm9kZVJlbmRlcmluZ0NvbnRleHQmIGNvbnRleHQpCiAgICAgcmV0dXJuICFpc1No YWRvd0JvdW5kYXJ5KCkgJiYgSFRNTEVsZW1lbnQ6OnJlbmRlcmVySXNOZWVkZWQoY29udGV4dCk7 CiB9CiAKK2lubGluZSB2b2lkIEluc2VydGlvblBvaW50OjpkaXN0cmlidXRlTGlnaHRDaGlsZHJl bihTaGFkb3dUcmVlKiB0cmVlKQoreworICAgIEhUTUxDb250ZW50U2VsZWN0b3IqIHNlbGVjdG9y ID0gdHJlZS0+ZW5zdXJlU2VsZWN0b3IoKTsKKyAgICBzZWxlY3Rvci0+dW5zZWxlY3QoJm1fc2Vs ZWN0aW9ucyk7CisgICAgc2VsZWN0b3ItPnNlbGVjdCh0aGlzLCAmbV9zZWxlY3Rpb25zKTsKK30K KworaW5saW5lIHZvaWQgSW5zZXJ0aW9uUG9pbnQ6OmNsZWFyRGlzdHJpYnV0aW9uKFNoYWRvd1Ry ZWUqIHRyZWUpCit7CisgICAgaWYgKEhUTUxDb250ZW50U2VsZWN0b3IqIHNlbGVjdG9yID0gdHJl ZS0+c2VsZWN0b3IoKSkKKyAgICAgICAgc2VsZWN0b3ItPnVuc2VsZWN0KCZtX3NlbGVjdGlvbnMp OworfQorCitpbmxpbmUgdm9pZCBJbnNlcnRpb25Qb2ludDo6YXR0YWNoRGlzdHJpYnV0ZWROb2Rl KCkKK3sKKyAgICBmb3IgKEhUTUxDb250ZW50U2VsZWN0aW9uKiBzZWxlY3Rpb24gPSBtX3NlbGVj dGlvbnMuZmlyc3QoKTsgc2VsZWN0aW9uOyBzZWxlY3Rpb24gPSBzZWxlY3Rpb24tPm5leHQoKSkK KyAgICAgICAgc2VsZWN0aW9uLT5ub2RlKCktPmF0dGFjaCgpOworfQorCiB9IC8vIG5hbWVzcGFj ZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9JbnNlcnRp b25Qb2ludC5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvSW5zZXJ0aW9uUG9pbnQuaApp bmRleCAzMjI4YWRlZjUwNDRjMmQ0YjA2ZDU3NTI0MTc5MjRkODYwM2Q3MGZlLi45NmNlZDE4NmU5 MzE2OWU1MDM0MGYxM2Y4YTZlYjZjMjdiZjIyODYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9odG1sL3NoYWRvdy9JbnNlcnRpb25Qb2ludC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv c2hhZG93L0luc2VydGlvblBvaW50LmgKQEAgLTU0LDYgKzU0LDExIEBAIHByb3RlY3RlZDoKICAg ICBJbnNlcnRpb25Qb2ludChjb25zdCBRdWFsaWZpZWROYW1lJiwgRG9jdW1lbnQqKTsKICAgICB2 aXJ0dWFsIGJvb2wgcmVuZGVyZXJJc05lZWRlZChjb25zdCBOb2RlUmVuZGVyaW5nQ29udGV4dCYp IE9WRVJSSURFOwogCitwcml2YXRlOgorICAgIHZvaWQgZGlzdHJpYnV0ZUxpZ2h0Q2hpbGRyZW4o U2hhZG93VHJlZSopOworICAgIHZvaWQgY2xlYXJEaXN0cmlidXRpb24oU2hhZG93VHJlZSopOwor ICAgIHZvaWQgYXR0YWNoRGlzdHJpYnV0ZWROb2RlKCk7CisKICAgICBIVE1MQ29udGVudFNlbGVj dGlvbkxpc3QgbV9zZWxlY3Rpb25zOwogfTsKIAo= 130280 2012-03-05 21:35:00 -0800 2012-03-05 22:21:13 -0800 Patch bug-80373-20120306143458.patch text/plain 4656 shinyak U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5ODMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2JhYjJkMTE0OWMwMGIy Y2QwNzdhNWJkNjdhMWNlZGQ4NzJiNmU2OS4uZTBmMzczY2E3OTBhMzJmYWNmNTY5YzViMWRjZDJh MTY1ZDgzMmM1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEyLTAzLTA1ICBTaGlu eWEgS2F3YW5ha2EgIDxzaGlueWFrQGNocm9taXVtLm9yZz4KKworICAgICAgICBJbnNlcnRpb25Q b2ludDo6YXR0YWNoIHNob3VsZCBiZSBjb25zaXN0ZW50IHdpdGggRWxlbWVudC4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgwMzczCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBpcyBwcmVw YXJhdGlvbiBmb3IgY29taW5nIDxzaGFkb3c+IHBhdGNoZXMuCisKKyAgICAgICAgSW5zZXJ0aW9u UG9pbnQgdXNlZCB0byBhdHRhY2ggZmFsbGJhY2sgZWxlbWVudHMgYmVmb3JlIGF0dGFjaGluZyBk aXN0cmlidXRlZCBlbGVtZW50cy4KKyAgICAgICAgVG8gYmUgY29uc2lzdGVudCB3aXRoIEVsZW1l bnQ6OmF0dGFjaCBiZWhhdmlvciwgYXR0YWNoaW5nIGRpc3RyaWJ1dGVkIGVsZW1lbnRzIGZpcnN0 IGlzCisgICAgICAgIG5hdHVyYWwsIGJlY2F1c2UgRWxlbWVudCBhdHRhY2hlcyBhIHNoYWRvdyB0 cmVlIGZpcnN0LgorCisgICAgICAgIEFsc28sIHRoaXMgcGF0Y2ggZXh0cmFjdHMgYSBmZXcgbWV0 aG9kcyBmb3JtIEluc3JldGlvblBvaW50OjphdHRhY2goKSBhbmQgZGV0YWNoKCkKKyAgICAgICAg dG8ga2VlcCBjb2RlIGNsZWFuLiBUaGV5IHdpbGwgYmVjb21lIG1lc3N5IHdpdGhvdXQgdGhpcyBy ZWZhY3RvcmluZyB3aGVuIGFkZGluZworICAgICAgICA8c2hhZG93PiBwYXRjaC4KKworICAgICAg ICBObyBuZXcgdGVzdHMuIFNob3VsZCBiZSBjb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisg ICAgICAgICogaHRtbC9zaGFkb3cvSW5zZXJ0aW9uUG9pbnQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SW5zZXJ0aW9uUG9pbnQ6OmF0dGFjaCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNlcnRpb25Q b2ludDo6ZGV0YWNoKToKKyAgICAgICAgKFdlYkNvcmU6Okluc2VydGlvblBvaW50OjpkaXN0cmli dXRlSG9zdENoaWxkcmVuKToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6 SW5zZXJ0aW9uUG9pbnQ6OmNsZWFyRGlzdHJpYnV0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6Oklu c2VydGlvblBvaW50OjphdHRhY2hEaXN0cmlidXRlZE5vZGUpOgorICAgICAgICAqIGh0bWwvc2hh ZG93L0luc2VydGlvblBvaW50Lmg6CisgICAgICAgIChJbnNlcnRpb25Qb2ludCk6CisKIDIwMTIt MDMtMDUgIEtlbnRhcm8gSGFyYSAgPGhhcmFrZW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtK U0NdIENhY2hlIHRoZSBDU1NQcm9wZXJ0eUlEIGluIEpTQ1NTU3R5bGVEZWNsYXJhdGlvbgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvSW5zZXJ0aW9uUG9pbnQuY3BwIGIv U291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvSW5zZXJ0aW9uUG9pbnQuY3BwCmluZGV4IDM2NTY5 NWQxYWQ0YWM2OTRlNGU4ODNlZThkMTM0ZDA2YWViM2MyYzkuLjM5ZmE3MjA0ZDkxM2Q3NzE2NjE2 NDNjYjk3Yjc4MDA3ODg1NDdjZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hh ZG93L0luc2VydGlvblBvaW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9J bnNlcnRpb25Qb2ludC5jcHAKQEAgLTQ4LDMxICs0OCwyMyBAQCBJbnNlcnRpb25Qb2ludDo6fklu c2VydGlvblBvaW50KCkKIAogdm9pZCBJbnNlcnRpb25Qb2ludDo6YXR0YWNoKCkKIHsKLSAgICBT aGFkb3dSb290KiByb290ID0gdG9TaGFkb3dSb290KHNoYWRvd1RyZWVSb290Tm9kZSgpKTsKLQot ICAgIGlmIChyb290KSB7Ci0gICAgICAgIEhUTUxDb250ZW50U2VsZWN0b3IqIHNlbGVjdG9yID0g cm9vdC0+dHJlZSgpLT5lbnN1cmVTZWxlY3RvcigpOwotICAgICAgICBzZWxlY3Rvci0+dW5zZWxl Y3QoJm1fc2VsZWN0aW9ucyk7Ci0gICAgICAgIHNlbGVjdG9yLT5zZWxlY3QodGhpcywgJm1fc2Vs ZWN0aW9ucyk7CisgICAgaWYgKFNoYWRvd1Jvb3QqIHJvb3QgPSB0b1NoYWRvd1Jvb3Qoc2hhZG93 VHJlZVJvb3ROb2RlKCkpKSB7CisgICAgICAgIGRpc3RyaWJ1dGVIb3N0Q2hpbGRyZW4ocm9vdC0+ dHJlZSgpKTsKKyAgICAgICAgYXR0YWNoRGlzdHJpYnV0ZWROb2RlKCk7CiAgICAgfQogCiAgICAg SFRNTEVsZW1lbnQ6OmF0dGFjaCgpOwotCi0gICAgaWYgKHJvb3QpIHsKLSAgICAgICAgZm9yIChI VE1MQ29udGVudFNlbGVjdGlvbiogc2VsZWN0aW9uID0gbV9zZWxlY3Rpb25zLmZpcnN0KCk7IHNl bGVjdGlvbjsgc2VsZWN0aW9uID0gc2VsZWN0aW9uLT5uZXh0KCkpCi0gICAgICAgICAgICBzZWxl Y3Rpb24tPm5vZGUoKS0+YXR0YWNoKCk7Ci0gICAgfQogfQogCiB2b2lkIEluc2VydGlvblBvaW50 OjpkZXRhY2goKQogewogICAgIGlmIChTaGFkb3dSb290KiByb290ID0gdG9TaGFkb3dSb290KHNo YWRvd1RyZWVSb290Tm9kZSgpKSkgewotICAgICAgICBpZiAoSFRNTENvbnRlbnRTZWxlY3Rvciog c2VsZWN0b3IgPSByb290LT50cmVlKCktPnNlbGVjdG9yKCkpCi0gICAgICAgICAgICBzZWxlY3Rv ci0+dW5zZWxlY3QoJm1fc2VsZWN0aW9ucyk7CisgICAgICAgIFNoYWRvd1RyZWUqIHRyZWUgPSBy b290LT50cmVlKCk7CisgICAgICAgIGNsZWFyRGlzdHJpYnV0aW9uKHRyZWUpOwogCiAgICAgICAg IC8vIFdoZW4gc2hhZG93IGVsZW1lbnQgaXMgZGV0YWNoZWQsIHNoYWRvdyB0cmVlIHNob3VsZCBi ZSByZWNyZWF0ZWQgdG8gcmUtY2FsY3VsYXRlIHNlbGVjdG9yIGZvcgogICAgICAgICAvLyBvdGhl ciBpbnNlcnRpb24gcG9pbnRzLgotICAgICAgICByb290LT50cmVlKCktPnNldE5lZWRzUmVhdHRh Y2hIb3N0Q2hpbGRyZW5BbmRTaGFkb3coKTsKKyAgICAgICAgdHJlZS0+c2V0TmVlZHNSZWF0dGFj aEhvc3RDaGlsZHJlbkFuZFNoYWRvdygpOwogICAgIH0KIAogICAgIEFTU0VSVChtX3NlbGVjdGlv bnMuaXNFbXB0eSgpKTsKQEAgLTkxLDQgKzgzLDIzIEBAIGJvb2wgSW5zZXJ0aW9uUG9pbnQ6OnJl bmRlcmVySXNOZWVkZWQoY29uc3QgTm9kZVJlbmRlcmluZ0NvbnRleHQmIGNvbnRleHQpCiAgICAg cmV0dXJuICFpc1NoYWRvd0JvdW5kYXJ5KCkgJiYgSFRNTEVsZW1lbnQ6OnJlbmRlcmVySXNOZWVk ZWQoY29udGV4dCk7CiB9CiAKK2lubGluZSB2b2lkIEluc2VydGlvblBvaW50OjpkaXN0cmlidXRl SG9zdENoaWxkcmVuKFNoYWRvd1RyZWUqIHRyZWUpCit7CisgICAgSFRNTENvbnRlbnRTZWxlY3Rv ciogc2VsZWN0b3IgPSB0cmVlLT5lbnN1cmVTZWxlY3RvcigpOworICAgIHNlbGVjdG9yLT51bnNl bGVjdCgmbV9zZWxlY3Rpb25zKTsKKyAgICBzZWxlY3Rvci0+c2VsZWN0KHRoaXMsICZtX3NlbGVj dGlvbnMpOworfQorCitpbmxpbmUgdm9pZCBJbnNlcnRpb25Qb2ludDo6Y2xlYXJEaXN0cmlidXRp b24oU2hhZG93VHJlZSogdHJlZSkKK3sKKyAgICBpZiAoSFRNTENvbnRlbnRTZWxlY3Rvciogc2Vs ZWN0b3IgPSB0cmVlLT5zZWxlY3RvcigpKQorICAgICAgICBzZWxlY3Rvci0+dW5zZWxlY3QoJm1f c2VsZWN0aW9ucyk7Cit9CisKK2lubGluZSB2b2lkIEluc2VydGlvblBvaW50OjphdHRhY2hEaXN0 cmlidXRlZE5vZGUoKQoreworICAgIGZvciAoSFRNTENvbnRlbnRTZWxlY3Rpb24qIHNlbGVjdGlv biA9IG1fc2VsZWN0aW9ucy5maXJzdCgpOyBzZWxlY3Rpb247IHNlbGVjdGlvbiA9IHNlbGVjdGlv bi0+bmV4dCgpKQorICAgICAgICBzZWxlY3Rpb24tPm5vZGUoKS0+YXR0YWNoKCk7Cit9CisKIH0g Ly8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hh ZG93L0luc2VydGlvblBvaW50LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9JbnNlcnRp b25Qb2ludC5oCmluZGV4IDMyMjhhZGVmNTA0NGMyZDRiMDZkNTc1MjQxNzkyNGQ4NjAzZDcwZmUu LjdlNWFkZTk2YzA5Mzk3MjE1NTc4ZjcxNWU0ZWY3NDliZjhmZjllYjcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0luc2VydGlvblBvaW50LmgKKysrIGIvU291cmNlL1dl YkNvcmUvaHRtbC9zaGFkb3cvSW5zZXJ0aW9uUG9pbnQuaApAQCAtNTQsNiArNTQsMTEgQEAgcHJv dGVjdGVkOgogICAgIEluc2VydGlvblBvaW50KGNvbnN0IFF1YWxpZmllZE5hbWUmLCBEb2N1bWVu dCopOwogICAgIHZpcnR1YWwgYm9vbCByZW5kZXJlcklzTmVlZGVkKGNvbnN0IE5vZGVSZW5kZXJp bmdDb250ZXh0JikgT1ZFUlJJREU7CiAKK3ByaXZhdGU6CisgICAgdm9pZCBkaXN0cmlidXRlSG9z dENoaWxkcmVuKFNoYWRvd1RyZWUqKTsKKyAgICB2b2lkIGNsZWFyRGlzdHJpYnV0aW9uKFNoYWRv d1RyZWUqKTsKKyAgICB2b2lkIGF0dGFjaERpc3RyaWJ1dGVkTm9kZSgpOworCiAgICAgSFRNTENv bnRlbnRTZWxlY3Rpb25MaXN0IG1fc2VsZWN0aW9uczsKIH07CiAK