118016 2013-06-25 20:08:01 -0700 Remove unused attachChildrenLazily method and make attach/detachChildren private 2013-06-28 17:02:20 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED BlinkMergeCandidate P2 Normal --- 1 rniwa rniwa benjamin cmarcelo commit-queue esprehn+autocc esprehn hyatt kangil.han kling koivisto simon.fraser oldest_to_newest 903501 0 rniwa 2013-06-25 20:08:01 -0700 Merge https://chromium.googlesource.com/chromium/blink/+/009520dc31c9458e0cf71cf212fa5688c4ca68b0 No one should be manually trying to attach or detach all their children so there's no reason for these methods to be public. In doing this I realized that attachChildrenLazily is not used and can be removed. I also realized that we were detaching all our children before the ShadowRoots which is sad since the InsertionPoints will call detach() on them as well, and then when we call ContainerNode::detach at the end of Element::detach we'll go detach them again! This patch makes it so we only go through and detach them twice instead of three times. In the future we should figure out a way to only do this once. 903502 1 205440 rniwa 2013-06-25 20:08:48 -0700 Created attachment 205440 Merges the patch 904809 2 205440 commit-queue 2013-06-28 17:02:16 -0700 Comment on attachment 205440 Merges the patch Clearing flags on attachment: 205440 Committed r152197: <http://trac.webkit.org/changeset/152197> 904810 3 commit-queue 2013-06-28 17:02:20 -0700 All reviewed patches have been landed. Closing bug. 205440 2013-06-25 20:08:48 -0700 2013-06-28 17:02:15 -0700 Merges the patch bug-118016-20130625200652.patch text/plain 4118 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MTk3NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDEzLTA2LTI1ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFJlbW92ZSB1bnVzZWQgYXR0YWNo Q2hpbGRyZW5MYXppbHkgbWV0aG9kIGFuZCBtYWtlIGF0dGFjaC9kZXRhY2hDaGlsZHJlbiBwcml2 YXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTgw MTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNZXJn ZSBodHRwczovL2Nocm9taXVtLmdvb2dsZXNvdXJjZS5jb20vY2hyb21pdW0vYmxpbmsvKy8wMDk1 MjBkYzMxYzk0NThlMGNmNzFjZjIxMmZhNTY4OGM0Y2E2OGIwCisKKyAgICAgICAgTm8gb25lIHNo b3VsZCBiZSBtYW51YWxseSB0cnlpbmcgdG8gYXR0YWNoIG9yIGRldGFjaCBhbGwgdGhlaXIgY2hp bGRyZW4gc28gdGhlcmUncworICAgICAgICBubyByZWFzb24gZm9yIHRoZXNlIG1ldGhvZHMgdG8g YmUgcHVibGljLgorICAgICAgICAKKyAgICAgICAgSW4gZG9pbmcgdGhpcyBJIHJlYWxpemVkIHRo YXQgYXR0YWNoQ2hpbGRyZW5MYXppbHkgaXMgbm90IHVzZWQgYW5kIGNhbiBiZSByZW1vdmVkLgor ICAgICAgICAKKyAgICAgICAgSSBhbHNvIHJlYWxpemVkIHRoYXQgd2Ugd2VyZSBkZXRhY2hpbmcg YWxsIG91ciBjaGlsZHJlbiBiZWZvcmUgdGhlIFNoYWRvd1Jvb3RzIHdoaWNoCisgICAgICAgIGlz IHNhZCBzaW5jZSB0aGUgSW5zZXJ0aW9uUG9pbnRzIHdpbGwgY2FsbCBkZXRhY2goKSBvbiB0aGVt IGFzIHdlbGwsIGFuZCB0aGVuIHdoZW4gd2UKKyAgICAgICAgY2FsbCBDb250YWluZXJOb2RlOjpk ZXRhY2ggYXQgdGhlIGVuZCBvZiBFbGVtZW50OjpkZXRhY2ggd2UnbGwgZ28gZGV0YWNoIHRoZW0g YWdhaW4hCisgICAgICAgIFRoaXMgcGF0Y2ggbWFrZXMgaXQgc28gd2Ugb25seSBnbyB0aHJvdWdo IGFuZCBkZXRhY2ggdGhlbSB0d2ljZSBpbnN0ZWFkIG9mIHRocmVlIHRpbWVzLgorICAgICAgICBJ biB0aGUgZnV0dXJlIHdlIHNob3VsZCBmaWd1cmUgb3V0IGEgd2F5IHRvIG9ubHkgZG8gdGhpcyBv bmNlLgorCisgICAgICAgICogZG9tL0NvbnRhaW5lck5vZGUuaDoKKyAgICAgICAgKiBkb20vRWxl bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50OjpkZXRhY2gpOgorCiAyMDEzLTA2 LTI1ICBLYW5naWwgSGFuICA8a2FuZ2lsLmhhbkBzYW1zdW5nLmNvbT4KIAogICAgICAgICBBZG9w dCBpcy90b0hUTUxBbmNob3JFbGVtZW50IGZvciBjb2RlIGNsZWFudXAKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2RvbS9Db250YWluZXJOb2RlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv ZG9tL0NvbnRhaW5lck5vZGUuaAkocmV2aXNpb24gMTUxOTcwKQorKysgU291cmNlL1dlYkNvcmUv ZG9tL0NvbnRhaW5lck5vZGUuaAkod29ya2luZyBjb3B5KQpAQCAtMTE4LDExICsxMTgsNiBAQCBw dWJsaWM6CiAgICAgLy8gbm9kZSB0aGF0IGlzIG9mIHRoZSB0eXBlIENEQVRBX1NFQ1RJT05fTk9E RSwgVEVYVF9OT0RFIG9yIENPTU1FTlRfTk9ERSBoYXMgY2hhbmdlZCBpdHMgdmFsdWUuCiAgICAg dmlydHVhbCB2b2lkIGNoaWxkcmVuQ2hhbmdlZChib29sIGNyZWF0ZWRCeVBhcnNlciA9IGZhbHNl LCBOb2RlKiBiZWZvcmVDaGFuZ2UgPSAwLCBOb2RlKiBhZnRlckNoYW5nZSA9IDAsIGludCBjaGls ZENvdW50RGVsdGEgPSAwKTsKIAotICAgIHZvaWQgYXR0YWNoQ2hpbGRyZW4oY29uc3QgQXR0YWNo Q29udGV4dCYgPSBBdHRhY2hDb250ZXh0KCkpOwotICAgIHZvaWQgYXR0YWNoQ2hpbGRyZW5MYXpp bHkoKTsKLSAgICB2b2lkIGRldGFjaENoaWxkcmVuKGNvbnN0IEF0dGFjaENvbnRleHQmID0gQXR0 YWNoQ29udGV4dCgpKTsKLSAgICB2b2lkIGRldGFjaENoaWxkcmVuSWZOZWVkZWQoY29uc3QgQXR0 YWNoQ29udGV4dCYgPSBBdHRhY2hDb250ZXh0KCkpOwotCiAgICAgdm9pZCBkaXNjb25uZWN0RGVz Y2VuZGFudEZyYW1lcygpOwogCiAgICAgdmlydHVhbCBib29sIGNoaWxkU2hvdWxkQ3JlYXRlUmVu ZGVyZXIoY29uc3QgTm9kZVJlbmRlcmluZ0NvbnRleHQmKSBjb25zdCB7IHJldHVybiB0cnVlOyB9 CkBAIC0xNDcsNiArMTQyLDkgQEAgcHJpdmF0ZToKICAgICB2b2lkIHJlbW92ZUJldHdlZW4oTm9k ZSogcHJldmlvdXNDaGlsZCwgTm9kZSogbmV4dENoaWxkLCBOb2RlKiBvbGRDaGlsZCk7CiAgICAg dm9pZCBpbnNlcnRCZWZvcmVDb21tb24oTm9kZSogbmV4dENoaWxkLCBOb2RlKiBvbGRDaGlsZCk7 CiAKKyAgICB2b2lkIGF0dGFjaENoaWxkcmVuKGNvbnN0IEF0dGFjaENvbnRleHQmID0gQXR0YWNo Q29udGV4dCgpKTsKKyAgICB2b2lkIGRldGFjaENoaWxkcmVuKGNvbnN0IEF0dGFjaENvbnRleHQm ID0gQXR0YWNoQ29udGV4dCgpKTsKKwogICAgIHN0YXRpYyB2b2lkIGRpc3BhdGNoUG9zdEF0dGFj aENhbGxiYWNrcygpOwogICAgIHZvaWQgc3VzcGVuZFBvc3RBdHRhY2hDYWxsYmFja3MoKTsKICAg ICB2b2lkIHJlc3VtZVBvc3RBdHRhY2hDYWxsYmFja3MoKTsKQEAgLTE5NiwyNCArMTk0LDYgQEAg aW5saW5lIHZvaWQgQ29udGFpbmVyTm9kZTo6YXR0YWNoQ2hpbGRyZQogICAgIH0KIH0KIAotaW5s aW5lIHZvaWQgQ29udGFpbmVyTm9kZTo6YXR0YWNoQ2hpbGRyZW5MYXppbHkoKQotewotICAgIGZv ciAoTm9kZSogY2hpbGQgPSBmaXJzdENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT5uZXh0 U2libGluZygpKQotICAgICAgICBpZiAoIWNoaWxkLT5hdHRhY2hlZCgpKQotICAgICAgICAgICAg Y2hpbGQtPmxhenlBdHRhY2goKTsKLX0KLQotaW5saW5lIHZvaWQgQ29udGFpbmVyTm9kZTo6ZGV0 YWNoQ2hpbGRyZW5JZk5lZWRlZChjb25zdCBBdHRhY2hDb250ZXh0JiBjb250ZXh0KQotewotICAg IEF0dGFjaENvbnRleHQgY2hpbGRyZW5Db250ZXh0KGNvbnRleHQpOwotICAgIGNoaWxkcmVuQ29u dGV4dC5yZXNvbHZlZFN0eWxlID0gMDsKLQotICAgIGZvciAoTm9kZSogY2hpbGQgPSBmaXJzdENo aWxkKCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT5uZXh0U2libGluZygpKSB7Ci0gICAgICAgIGlm IChjaGlsZC0+YXR0YWNoZWQoKSkKLSAgICAgICAgICAgIGNoaWxkLT5kZXRhY2goY2hpbGRyZW5D b250ZXh0KTsKLSAgICB9Ci19Ci0KIGlubGluZSB2b2lkIENvbnRhaW5lck5vZGU6OmRldGFjaENo aWxkcmVuKGNvbnN0IEF0dGFjaENvbnRleHQmIGNvbnRleHQpCiB7CiAgICAgQXR0YWNoQ29udGV4 dCBjaGlsZHJlbkNvbnRleHQoY29udGV4dCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vRWxl bWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCShy ZXZpc2lvbiAxNTE5NzApCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTE0NzgsMTAgKzE0NzgsOCBAQCB2b2lkIEVsZW1lbnQ6OmRldGFjaChjb25z dCBBdHRhY2hDb250ZXh0CiAgICAgICAgIGRhdGEtPnJlc2V0RHluYW1pY1Jlc3R5bGVPYnNlcnZh dGlvbnMoKTsKICAgICB9CiAKLSAgICBpZiAoRWxlbWVudFNoYWRvdyogc2hhZG93ID0gdGhpcy0+ c2hhZG93KCkpIHsKLSAgICAgICAgZGV0YWNoQ2hpbGRyZW5JZk5lZWRlZChjb250ZXh0KTsKKyAg ICBpZiAoRWxlbWVudFNoYWRvdyogc2hhZG93ID0gdGhpcy0+c2hhZG93KCkpCiAgICAgICAgIHNo YWRvdy0+ZGV0YWNoKGNvbnRleHQpOwotICAgIH0KIAogICAgIC8vIERvIG5vdCByZW1vdmUgdGhl IGVsZW1lbnQncyBob3ZlcmVkIGFuZCBhY3RpdmUgc3RhdHVzCiAgICAgLy8gaWYgcGVyZm9ybWlu ZyBhIHJlYXR0YWNoLgo=