116454 2013-05-20 11:58:49 -0700 Simplify Shadow DOM distribution code 2020-08-18 10:41:39 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED CONFIGURATION CHANGED P2 Normal --- 1 koivisto webkit-unassigned andersca commit-queue esprehn+autocc kling rniwa oldest_to_newest 891282 0 koivisto 2013-05-20 11:58:49 -0700 Remove code supporting nested insertion points and distributing to multiple insertion points 891284 1 202299 koivisto 2013-05-20 12:01:19 -0700 Created attachment 202299 patch 1681120 2 rniwa 2020-08-18 10:41:32 -0700 We've removed this code. 202299 2013-05-20 12:01:19 -0700 2020-08-18 10:41:39 -0700 patch remove-complex-insertion.patch text/plain 7959 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MDM3NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDEzLTA1LTIwICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBTaW1wbGlmeSBTaGFkb3cgRE9N IGRpc3RyaWJ1dGlvbiBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMTY0NTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KyAgICAgICAgCisgICAgICAgIFJlbW92ZSBjb2RlIHN1cHBvcnRpbmcgbmVzdGVkIGluc2VydGlv biBwb2ludHMgYW5kIGRpc3RyaWJ1dGluZyB0byBtdWx0aXBsZSBpbnNlcnRpb24gcG9pbnRzLgor ICAgIAorICAgICAgICAqIGh0bWwvSFRNTERldGFpbHNFbGVtZW50LmNwcDoKKyAgICAgICAgKERl dGFpbHNDb250ZW50RWxlbWVudCk6CisgICAgICAgIAorICAgICAgICAgICAgTWFrZSBkaXN0cmli dXRpb24gdG8gPGRldGFpbHM+IGFuZCA8c3VtbWFyeT4gbXV0dWFsbHkgZXhjbHVzaXZlLgorCisg ICAgICAgICogaHRtbC9zaGFkb3cvQ29udGVudERpc3RyaWJ1dG9yLmNwcDoKKyAgICAgICAgKFdl YkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudERpc3RyaWJ1dG9yOjpkaXN0cmlidXRl KToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnREaXN0cmlidXRvcjo6aW52YWxpZGF0ZSk6Cisg ICAgICAgIChXZWJDb3JlOjpDb250ZW50RGlzdHJpYnV0b3I6OmRpc3RyaWJ1dGVTZWxlY3Rpb25z VG8pOgorICAgICAgICAqIGh0bWwvc2hhZG93L0NvbnRlbnREaXN0cmlidXRvci5oOgorICAgICAg ICAqIGh0bWwvc2hhZG93L0luc2VydGlvblBvaW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnJl c29sdmVSZXByb2plY3Rpb24pOgorCiAyMDEzLTA1LTIwICBEYXJpbiBBZGxlciAgPGRhcmluQGFw cGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgY3VzdG9tIGJpbmRpbmcgZm9yIHRoZSBDbGlwYm9h cmQgY2xlYXJEYXRhIGZ1bmN0aW9uCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxEZXRh aWxzRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRGV0 YWlsc0VsZW1lbnQuY3BwCShyZXZpc2lvbiAxNTAzNjMpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxEZXRhaWxzRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUxLDYgKzUxLDEzIEBA IHByaXZhdGU6CiAgICAgICAgIDogSFRNTENvbnRlbnRFbGVtZW50KEhUTUxOYW1lczo6d2Via2l0 U2hhZG93Q29udGVudFRhZywgZG9jdW1lbnQpCiAgICAgewogICAgIH0KKworICAgIHZpcnR1YWwg TWF0Y2hUeXBlIG1hdGNoVHlwZUZvcihOb2RlKiBub2RlKSBPVkVSUklERQorICAgIHsKKyAgICAg ICAgaWYgKG5vZGUtPmlzRWxlbWVudE5vZGUoKSAmJiBub2RlID09IG5vZGUtPnBhcmVudE5vZGUo KS0+cXVlcnlTZWxlY3RvcihzdW1tYXJ5UXVlcnlTZWxlY3RvcigpLCBBU1NFUlRfTk9fRVhDRVBU SU9OKSkKKyAgICAgICAgICAgIHJldHVybiBOZXZlck1hdGNoZXM7CisgICAgICAgIHJldHVybiBB bHdheXNNYXRjaGVzOworICAgIH0KIH07CiAKIFBhc3NSZWZQdHI8RGV0YWlsc0NvbnRlbnRFbGVt ZW50PiBEZXRhaWxzQ29udGVudEVsZW1lbnQ6OmNyZWF0ZShEb2N1bWVudCogZG9jdW1lbnQpCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9Db250ZW50RGlzdHJpYnV0b3IuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0NvbnRlbnREaXN0cmlidXRv ci5jcHAJKHJldmlzaW9uIDE1MDM2MykKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0Nv bnRlbnREaXN0cmlidXRvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyNSwyMyArMTI1LDYgQEAg SW5zZXJ0aW9uUG9pbnQqIENvbnRlbnREaXN0cmlidXRvcjo6ZmluZAogICAgIHJldHVybiBtX25v ZGVUb0luc2VydGlvblBvaW50LmdldChrZXkpOwogfQogCi12b2lkIENvbnRlbnREaXN0cmlidXRv cjo6cG9wdWxhdGUoTm9kZSogbm9kZSwgQ29udGVudERpc3RyaWJ1dGlvbiYgcG9vbCkKLXsKLSAg ICBpZiAoIWlzQWN0aXZlSW5zZXJ0aW9uUG9pbnQobm9kZSkpIHsKLSAgICAgICAgcG9vbC5hcHBl bmQobm9kZSk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICBJbnNlcnRpb25Qb2ludCog aW5zZXJ0aW9uUG9pbnQgPSB0b0luc2VydGlvblBvaW50KG5vZGUpOwotICAgIGlmIChpbnNlcnRp b25Qb2ludC0+aGFzRGlzdHJpYnV0aW9uKCkpIHsKLSAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7 IGkgPCBpbnNlcnRpb25Qb2ludC0+c2l6ZSgpOyArK2kpCi0gICAgICAgICAgICBwb3B1bGF0ZShp bnNlcnRpb25Qb2ludC0+YXQoaSksIHBvb2wpOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIGZvciAo Tm9kZSogZmFsbGJhY2tOb2RlID0gaW5zZXJ0aW9uUG9pbnQtPmZpcnN0Q2hpbGQoKTsgZmFsbGJh Y2tOb2RlOyBmYWxsYmFja05vZGUgPSBmYWxsYmFja05vZGUtPm5leHRTaWJsaW5nKCkpCi0gICAg ICAgICAgICBwb29sLmFwcGVuZChmYWxsYmFja05vZGUpOwotICAgIH0KLX0KLQogdm9pZCBDb250 ZW50RGlzdHJpYnV0b3I6OmRpc3RyaWJ1dGUoRWxlbWVudCogaG9zdCkKIHsKICAgICBBU1NFUlQo bmVlZHNEaXN0cmlidXRpb24oKSk7CkBAIC0xNTAsMTMgKzEzMyw2IEBAIHZvaWQgQ29udGVudERp c3RyaWJ1dG9yOjpkaXN0cmlidXRlKEVsZW0KIAogICAgIG1fdmFsaWRpdHkgPSBWYWxpZDsKIAot ICAgIENvbnRlbnREaXN0cmlidXRpb24gcG9vbDsKLSAgICBmb3IgKE5vZGUqIG5vZGUgPSBob3N0 LT5maXJzdENoaWxkKCk7IG5vZGU7IG5vZGUgPSBub2RlLT5uZXh0U2libGluZygpKQotICAgICAg ICBwb3B1bGF0ZShub2RlLCBwb29sKTsKLQotICAgIFZlY3Rvcjxib29sPiBkaXN0cmlidXRlZChw b29sLnNpemUoKSk7Ci0gICAgZGlzdHJpYnV0ZWQuZmlsbChmYWxzZSk7Ci0KICAgICBpZiAoU2hh ZG93Um9vdCogcm9vdCA9IGhvc3QtPnNoYWRvd1Jvb3QoKSkgewogICAgICAgICBpZiAoU2NvcGVD b250ZW50RGlzdHJpYnV0aW9uKiBzY29wZSA9IHJvb3QtPnNjb3BlRGlzdHJpYnV0aW9uKCkpIHsK ICAgICAgICAgICAgIGNvbnN0IFZlY3RvcjxSZWZQdHI8SW5zZXJ0aW9uUG9pbnQ+ID4mIGluc2Vy dGlvblBvaW50cyA9IHNjb3BlLT5lbnN1cmVJbnNlcnRpb25Qb2ludExpc3Qocm9vdCk7CkBAIC0x NjUsOSArMTQxLDcgQEAgdm9pZCBDb250ZW50RGlzdHJpYnV0b3I6OmRpc3RyaWJ1dGUoRWxlbQog ICAgICAgICAgICAgICAgIGlmICghcG9pbnQtPmlzQWN0aXZlKCkpCiAgICAgICAgICAgICAgICAg ICAgIGNvbnRpbnVlOwogCi0gICAgICAgICAgICAgICAgZGlzdHJpYnV0ZVNlbGVjdGlvbnNUbyhw b2ludCwgcG9vbCwgZGlzdHJpYnV0ZWQpOwotICAgICAgICAgICAgICAgIGlmIChFbGVtZW50U2hh ZG93KiBzaGFkb3cgPSBwb2ludC0+cGFyZW50Tm9kZSgpLT5pc0VsZW1lbnROb2RlKCkgPyB0b0Vs ZW1lbnQocG9pbnQtPnBhcmVudE5vZGUoKSktPnNoYWRvdygpIDogMCkKLSAgICAgICAgICAgICAg ICAgICAgc2hhZG93LT5pbnZhbGlkYXRlRGlzdHJpYnV0aW9uKCk7CisgICAgICAgICAgICAgICAg ZGlzdHJpYnV0ZVNlbGVjdGlvbnNUbyhwb2ludCwgaG9zdCk7CiAgICAgICAgICAgICB9CiAgICAg ICAgIH0KICAgICB9CkBAIC0xODQsMTUgKzE1OCw2IEBAIGJvb2wgQ29udGVudERpc3RyaWJ1dG9y OjppbnZhbGlkYXRlKEVsZW0KICAgICAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgaW5z ZXJ0aW9uUG9pbnRzLnNpemUoKTsgKytpKSB7CiAgICAgICAgICAgICAgICAgbmVlZHNSZWF0dGFj aCA9IG5lZWRzUmVhdHRhY2ggfHwgdHJ1ZTsKICAgICAgICAgICAgICAgICBpbnNlcnRpb25Qb2lu dHNbaV0tPmNsZWFyRGlzdHJpYnV0aW9uKCk7Ci0KLSAgICAgICAgICAgICAgICAvLyBBZnRlciBp bnNlcnRpb25Qb2ludCdzIGRpc3RyaWJ1dGlvbiBpcyBpbnZhbGlkYXRlZCwgaXRzIHJlcHJvamVj dGlvbiBzaG91bGQgYWxzbyBiZSBpbnZhbGlkYXRlZC4KLSAgICAgICAgICAgICAgICBpZiAoIWlu c2VydGlvblBvaW50c1tpXS0+aXNBY3RpdmUoKSkKLSAgICAgICAgICAgICAgICAgICAgY29udGlu dWU7Ci0KLSAgICAgICAgICAgICAgICBpZiAoRWxlbWVudCogcGFyZW50ID0gaW5zZXJ0aW9uUG9p bnRzW2ldLT5wYXJlbnRFbGVtZW50KCkpIHsKLSAgICAgICAgICAgICAgICAgICAgaWYgKEVsZW1l bnRTaGFkb3cqIHNoYWRvdyA9IHBhcmVudC0+c2hhZG93KCkpCi0gICAgICAgICAgICAgICAgICAg ICAgICBzaGFkb3ctPmludmFsaWRhdGVEaXN0cmlidXRpb24oKTsKLSAgICAgICAgICAgICAgICB9 CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CkBAIC0yMDIsMjEgKzE2NywxOCBAQCBi b29sIENvbnRlbnREaXN0cmlidXRvcjo6aW52YWxpZGF0ZShFbGVtCiAgICAgcmV0dXJuIG5lZWRz UmVhdHRhY2g7CiB9CiAKLXZvaWQgQ29udGVudERpc3RyaWJ1dG9yOjpkaXN0cmlidXRlU2VsZWN0 aW9uc1RvKEluc2VydGlvblBvaW50KiBpbnNlcnRpb25Qb2ludCwgY29uc3QgQ29udGVudERpc3Ry aWJ1dGlvbiYgcG9vbCwgVmVjdG9yPGJvb2w+JiBkaXN0cmlidXRlZCkKK3ZvaWQgQ29udGVudERp c3RyaWJ1dG9yOjpkaXN0cmlidXRlU2VsZWN0aW9uc1RvKEluc2VydGlvblBvaW50KiBpbnNlcnRp b25Qb2ludCwgRWxlbWVudCogaG9zdCkKIHsKICAgICBDb250ZW50RGlzdHJpYnV0aW9uIGRpc3Ry aWJ1dGlvbjsKIAotICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgcG9vbC5zaXplKCk7ICsraSkg ewotICAgICAgICBpZiAoZGlzdHJpYnV0ZWRbaV0pCi0gICAgICAgICAgICBjb250aW51ZTsKKyAg ICBmb3IgKE5vZGUqIGNoaWxkID0gaG9zdC0+Zmlyc3RDaGlsZCgpOyBjaGlsZDsgY2hpbGQgPSBj aGlsZC0+bmV4dFNpYmxpbmcoKSkgeworICAgICAgICBBU1NFUlQoIWNoaWxkLT5pc0luc2VydGlv blBvaW50KCkpOwogCi0gICAgICAgIGlmIChpbnNlcnRpb25Qb2ludC0+bWF0Y2hUeXBlRm9yKHBv b2wubm9kZXMoKS5hdChpKS5nZXQoKSkgIT0gSW5zZXJ0aW9uUG9pbnQ6OkFsd2F5c01hdGNoZXMp CisgICAgICAgIGlmIChpbnNlcnRpb25Qb2ludC0+bWF0Y2hUeXBlRm9yKGNoaWxkKSAhPSBJbnNl cnRpb25Qb2ludDo6QWx3YXlzTWF0Y2hlcykKICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAg ICAgIE5vZGUqIGNoaWxkID0gcG9vbC5hdChpKS5nZXQoKTsKICAgICAgICAgZGlzdHJpYnV0aW9u LmFwcGVuZChjaGlsZCk7CiAgICAgICAgIG1fbm9kZVRvSW5zZXJ0aW9uUG9pbnQuYWRkKGNoaWxk LCBpbnNlcnRpb25Qb2ludCk7Ci0gICAgICAgIGRpc3RyaWJ1dGVkW2ldID0gdHJ1ZTsKICAgICB9 CiAKICAgICBpbnNlcnRpb25Qb2ludC0+c2V0RGlzdHJpYnV0aW9uKGRpc3RyaWJ1dGlvbik7Cklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9Db250ZW50RGlzdHJpYnV0b3IuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9Db250ZW50RGlzdHJpYnV0b3Iu aAkocmV2aXNpb24gMTUwMzYzKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvQ29udGVu dERpc3RyaWJ1dG9yLmgJKHdvcmtpbmcgY29weSkKQEAgLTEwMCw3ICsxMDAsNyBAQCBwdWJsaWM6 CiAKICAgICBJbnNlcnRpb25Qb2ludCogZmluZEluc2VydGlvblBvaW50Rm9yKGNvbnN0IE5vZGUq IGtleSkgY29uc3Q7CiAKLSAgICB2b2lkIGRpc3RyaWJ1dGVTZWxlY3Rpb25zVG8oSW5zZXJ0aW9u UG9pbnQqLCBjb25zdCBDb250ZW50RGlzdHJpYnV0aW9uJiBwb29sLCBWZWN0b3I8Ym9vbD4mIGRp c3RyaWJ1dGVkKTsKKyAgICB2b2lkIGRpc3RyaWJ1dGVTZWxlY3Rpb25zVG8oSW5zZXJ0aW9uUG9p bnQqLCBFbGVtZW50KiBob3N0KTsKIAogICAgIHZvaWQgaW52YWxpZGF0ZURpc3RyaWJ1dGlvbihF bGVtZW50KiBob3N0KTsKICAgICB2b2lkIGRpZFNoYWRvd0JvdW5kYXJ5Q2hhbmdlKEVsZW1lbnQq IGhvc3QpOwpAQCAtMTEwLDcgKzExMCw2IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgdm9pZCBk aXN0cmlidXRlKEVsZW1lbnQqIGhvc3QpOwogICAgIGJvb2wgaW52YWxpZGF0ZShFbGVtZW50KiBo b3N0KTsKLSAgICB2b2lkIHBvcHVsYXRlKE5vZGUqLCBDb250ZW50RGlzdHJpYnV0aW9uJik7CiAK ICAgICB2b2lkIHNldFZhbGlkaXR5KFZhbGlkaXR5IHZhbGlkaXR5KSB7IG1fdmFsaWRpdHkgPSB2 YWxpZGl0eTsgfQogICAgIGJvb2wgaXNWYWxpZCgpIGNvbnN0IHsgcmV0dXJuIG1fdmFsaWRpdHkg PT0gVmFsaWQ7IH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0luc2VydGlvblBv aW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9JbnNlcnRp b25Qb2ludC5jcHAJKHJldmlzaW9uIDE1MDM2MykKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvc2hh ZG93L0luc2VydGlvblBvaW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTk3LDIzICsxOTcsMTIg QEAgY29uc3QgQ1NTU2VsZWN0b3JMaXN0JiBJbnNlcnRpb25Qb2ludDo6ZQogCiBJbnNlcnRpb25Q b2ludCogcmVzb2x2ZVJlcHJvamVjdGlvbihjb25zdCBOb2RlKiBwcm9qZWN0ZWROb2RlKQogewot ICAgIEluc2VydGlvblBvaW50KiBpbnNlcnRpb25Qb2ludCA9IDA7Ci0gICAgY29uc3QgTm9kZSog Y3VycmVudCA9IHByb2plY3RlZE5vZGU7Ci0KLSAgICB3aGlsZSAoY3VycmVudCkgewotICAgICAg ICBpZiAoRWxlbWVudFNoYWRvdyogc2hhZG93ID0gc2hhZG93T2ZQYXJlbnRGb3JEaXN0cmlidXRp b24oY3VycmVudCkpIHsKLSAgICAgICAgICAgIGlmIChTaGFkb3dSb290KiByb290ID0gY3VycmVu dC0+Y29udGFpbmluZ1NoYWRvd1Jvb3QoKSkKLSAgICAgICAgICAgICAgICBDb250ZW50RGlzdHJp YnV0b3I6OmVuc3VyZURpc3RyaWJ1dGlvbihyb290KTsKLSAgICAgICAgICAgIGlmIChJbnNlcnRp b25Qb2ludCogaW5zZXJ0ZWRUbyA9IHNoYWRvdy0+ZGlzdHJpYnV0b3IoKS5maW5kSW5zZXJ0aW9u UG9pbnRGb3IocHJvamVjdGVkTm9kZSkpIHsKLSAgICAgICAgICAgICAgICBjdXJyZW50ID0gaW5z ZXJ0ZWRUbzsKLSAgICAgICAgICAgICAgICBpbnNlcnRpb25Qb2ludCA9IGluc2VydGVkVG87Ci0g ICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0KLSAgICAg ICAgYnJlYWs7CisgICAgaWYgKEVsZW1lbnRTaGFkb3cqIHNoYWRvdyA9IHNoYWRvd09mUGFyZW50 Rm9yRGlzdHJpYnV0aW9uKHByb2plY3RlZE5vZGUpKSB7CisgICAgICAgIGlmIChTaGFkb3dSb290 KiByb290ID0gcHJvamVjdGVkTm9kZS0+Y29udGFpbmluZ1NoYWRvd1Jvb3QoKSkKKyAgICAgICAg ICAgIENvbnRlbnREaXN0cmlidXRvcjo6ZW5zdXJlRGlzdHJpYnV0aW9uKHJvb3QpOworICAgICAg ICByZXR1cm4gc2hhZG93LT5kaXN0cmlidXRvcigpLmZpbmRJbnNlcnRpb25Qb2ludEZvcihwcm9q ZWN0ZWROb2RlKTsKICAgICB9Ci0KLSAgICByZXR1cm4gaW5zZXJ0aW9uUG9pbnQ7CisgICAgcmV0 dXJuIDA7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK