59280 2011-04-23 12:39:52 -0700 [Refactoring] NodeRenderParentDetector should be NodeRenderFactory 2011-04-23 17:52:03 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 59157 1 morrita morrita dglazkov oldest_to_newest 391470 0 morrita 2011-04-23 12:39:52 -0700 NodeRenderParentDetector is now in Node.cpp but it should have its own cpp/h. 391486 1 morrita 2011-04-23 15:18:02 -0700 The role of this class is not clear yet. So i postpone to make a separate file and do a refactoring first. 391488 2 90861 morrita 2011-04-23 15:35:32 -0700 Created attachment 90861 Patch 391499 3 90861 dglazkov 2011-04-23 16:38:54 -0700 Comment on attachment 90861 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=90861&action=review ok with nits. > Source/WebCore/ChangeLog:5 > + [Refactoring] NodeRenderParentDetector should have its own file Need to change the title here too. > Source/WebCore/dom/Node.cpp:1614 > + return NodeRendererFactory(const_cast<Node*>(this)).parentNodeForRenderingAndStyle(); Should we just remove the const modifier on the calling method? 391506 4 morrita 2011-04-23 17:52:03 -0700 Committed r84747: <http://trac.webkit.org/changeset/84747> 90861 2011-04-23 15:35:32 -0700 2011-04-23 16:38:54 -0700 Patch bug-59280-20110423153530.patch text/plain 7170 morrita U3VidmVyc2lvbiBSZXZpc2lvbjogODQ3NDIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1YzJmNWEyZDYxN2U2ZmM1 MGU0NDAzODk5MGI2ZmVlYjg4ZjY4NDAwLi5kMWQxYjYxMTJmZWU2NGYzOGE1NTc5ZjkyNzJjMGFi MTdkOWYzYjA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTEtMDQtMjMgIE1PUklU QSBIYWppbWUgIDxtb3JyaXRhQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgW1JlZmFjdG9yaW5nXSBOb2RlUmVuZGVyUGFyZW50RGV0 ZWN0b3Igc2hvdWxkIGhhdmUgaXRzIG93biBmaWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTI4MAorICAgICAgICAKKyAgICAgICAgLSBSZW5hbWUg Tm9kZVJlbmRlclBhcmVudERldGVjdG9yIHRvIE5vZGVSZW5kZXJlckZhY3RvcnkKKyAgICAgICAg LSBtb3ZlIGNyZWF0ZVJlbmRlcmVyQW5kU3R5bGUoKSBhbmQgY3JlYXRlUmVuZGVyZXJJZk5lZWRl ZCB0bworICAgICAgICAgIE5vZGVSZW5kZXJlckZhY3RvcnkKKworICAgICAgICBObyBuZXcgdGVz dCwgbm8gYmVoYXZpb3JhbCBjaGFuZ2UuCisgICAgICAgIAorICAgICAgICAqIGRvbS9Ob2RlLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGVSZW5kZXJlckZhY3Rvcnk6Ok5vZGVSZW5kZXJlckZh Y3RvcnkpOgorICAgICAgICAoV2ViQ29yZTo6Tm9kZVJlbmRlcmVyRmFjdG9yeTo6ZG9jdW1lbnQp OgorICAgICAgICAoV2ViQ29yZTo6Tm9kZVJlbmRlcmVyRmFjdG9yeTo6bmV4dFJlbmRlcmVyKToK KyAgICAgICAgKFdlYkNvcmU6Ok5vZGVSZW5kZXJlckZhY3Rvcnk6OmZpbmRWaXN1YWxQYXJlbnQp OgorICAgICAgICAoV2ViQ29yZTo6Tm9kZVJlbmRlcmVyRmFjdG9yeTo6c2hvdWxkQ3JlYXRlUmVu ZGVyZXIpOgorICAgICAgICAoV2ViQ29yZTo6Tm9kZVJlbmRlcmVyRmFjdG9yeTo6Y3JlYXRlUmVu ZGVyZXJBbmRTdHlsZSk6CisgICAgICAgIChXZWJDb3JlOjpOb2RlUmVuZGVyZXJGYWN0b3J5Ojpj cmVhdGVSZW5kZXJlcklmTmVlZGVkKToKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGU6OnBhcmVudE5v ZGVGb3JSZW5kZXJpbmdBbmRTdHlsZSk6CisgICAgICAgIChXZWJDb3JlOjpOb2RlOjpjcmVhdGVS ZW5kZXJlcklmTmVlZGVkKToKKyAgICAgICAgKiBkb20vTm9kZS5oOgorCiAyMDExLTA0LTIzICBB bGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IE1hY2llaiBTdGFjaG93aWFrLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL05vZGUu Y3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwCmluZGV4IDg5YjY5MDU0YjExN2I5NjYx ZmY0ODQxMjQwZTQ2ODM1NTRjNWIzMGUuLjkxYTI0NzA2ZWYxZTY3YTM4MzUzOTIxY2IzZDZiMWYy YTA0YThlNzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9kb20vTm9kZS5jcHAKQEAgLTE0NjQsNyArMTQ2NCw3IEBAIE5vZGUgKk5v ZGU6Om5leHRMZWFmTm9kZSgpIGNvbnN0CiB9CiAKIAotY2xhc3MgTm9kZVJlbmRlclBhcmVudERl dGVjdG9yIHsKK2NsYXNzIE5vZGVSZW5kZXJlckZhY3RvcnkgewogcHVibGljOgogICAgIGVudW0g VHlwZSB7CiAgICAgICAgIE5vdEZvdW5kLApAQCAtMTQ3Myw3ICsxNDczLDcgQEAgcHVibGljOgog ICAgICAgICBBc0NvbnRlbnRDaGlsZAogICAgIH07CiAKLSAgICBOb2RlUmVuZGVyUGFyZW50RGV0 ZWN0b3IoTm9kZSogbm9kZSkKKyAgICBOb2RlUmVuZGVyZXJGYWN0b3J5KE5vZGUqIG5vZGUpCiAg ICAgICAgIDogbV90eXBlKE5vdEZvdW5kKQogICAgICAgICAsIG1fbm9kZShub2RlKQogICAgICAg ICAsIG1fdmlzdWFsUGFyZW50U2hhZG93Um9vdCgwKQpAQCAtMTQ4MiwxMCArMTQ4MiwxNCBAQCBw dWJsaWM6CiAgICAgfQogICAKICAgICBDb250YWluZXJOb2RlKiBwYXJlbnROb2RlRm9yUmVuZGVy aW5nQW5kU3R5bGUoKSBjb25zdCB7IHJldHVybiBtX3BhcmVudE5vZGVGb3JSZW5kZXJpbmdBbmRT dHlsZTsgfQotICAgIGJvb2wgc2hvdWxkQ3JlYXRlUmVuZGVyZXIoKSBjb25zdDsKKyAgICB2b2lk IGNyZWF0ZVJlbmRlcmVySWZOZWVkZWQoKTsKIAogcHJpdmF0ZToKKyAgICBEb2N1bWVudCogZG9j dW1lbnQoKSB7IHJldHVybiBtX25vZGUtPmRvY3VtZW50KCk7IH0KICAgICBDb250YWluZXJOb2Rl KiBmaW5kVmlzdWFsUGFyZW50KCk7CisgICAgUmVuZGVyT2JqZWN0KiBuZXh0UmVuZGVyZXIoKSBj b25zdCB7IHJldHVybiBtX25vZGUtPm5leHRSZW5kZXJlcigpOyB9CisgICAgUmVuZGVyT2JqZWN0 KiBjcmVhdGVSZW5kZXJlckFuZFN0eWxlKCk7CisgICAgYm9vbCBzaG91bGRDcmVhdGVSZW5kZXJl cigpIGNvbnN0OwogCiAgICAgVHlwZSBtX3R5cGU7CiAgICAgTm9kZSogbV9ub2RlOwpAQCAtMTQ5 Myw3ICsxNDk3LDcgQEAgcHJpdmF0ZToKICAgICBTaGFkb3dSb290KiBtX3Zpc3VhbFBhcmVudFNo YWRvd1Jvb3Q7CiB9OwogCi1Db250YWluZXJOb2RlKiBOb2RlUmVuZGVyUGFyZW50RGV0ZWN0b3I6 OmZpbmRWaXN1YWxQYXJlbnQoKQorQ29udGFpbmVyTm9kZSogTm9kZVJlbmRlcmVyRmFjdG9yeTo6 ZmluZFZpc3VhbFBhcmVudCgpCiB7CiAgICAgQ29udGFpbmVyTm9kZSogcGFyZW50ID0gbV9ub2Rl LT5wYXJlbnRPckhvc3ROb2RlKCk7CiAgICAgaWYgKCFwYXJlbnQpCkBAIC0xNTA5LDcgKzE1MTMs NyBAQCBDb250YWluZXJOb2RlKiBOb2RlUmVuZGVyUGFyZW50RGV0ZWN0b3I6OmZpbmRWaXN1YWxQ YXJlbnQoKQogICAgICAgICBpZiAobV92aXN1YWxQYXJlbnRTaGFkb3dSb290KSB7CiAgICAgICAg ICAgICBpZiAoQ29udGFpbmVyTm9kZSogY29udGVudENvbnRhaW5lciA9IG1fdmlzdWFsUGFyZW50 U2hhZG93Um9vdC0+Y29udGVudENvbnRhaW5lckZvcihtX25vZGUpKSB7CiAgICAgICAgICAgICAg ICAgbV90eXBlID0gQXNDb250ZW50Q2hpbGQ7Ci0gICAgICAgICAgICAgICAgcmV0dXJuIE5vZGVS ZW5kZXJQYXJlbnREZXRlY3Rvcihjb250ZW50Q29udGFpbmVyKS5wYXJlbnROb2RlRm9yUmVuZGVy aW5nQW5kU3R5bGUoKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gTm9kZVJlbmRlcmVyRmFjdG9y eShjb250ZW50Q29udGFpbmVyKS5wYXJlbnROb2RlRm9yUmVuZGVyaW5nQW5kU3R5bGUoKTsKICAg ICAgICAgICAgIH0KIAogICAgICAgICAgICAgLy8gRklYTUU6IHNob3VsZCBiZSBub3QgZm91bmQg b25jZSBsaWdodC9zaGFkb3cgaXMgbXV0dWFsIGV4Y2x1c2l2ZS4KQEAgLTE1MjAsNyArMTUyNCw3 IEBAIENvbnRhaW5lck5vZGUqIE5vZGVSZW5kZXJQYXJlbnREZXRlY3Rvcjo6ZmluZFZpc3VhbFBh cmVudCgpCiAgICAgcmV0dXJuIHBhcmVudDsKIH0KIAotYm9vbCBOb2RlUmVuZGVyUGFyZW50RGV0 ZWN0b3I6OnNob3VsZENyZWF0ZVJlbmRlcmVyKCkgY29uc3QKK2Jvb2wgTm9kZVJlbmRlcmVyRmFj dG9yeTo6c2hvdWxkQ3JlYXRlUmVuZGVyZXIoKSBjb25zdAogewogICAgIEFTU0VSVChtX3BhcmVu dE5vZGVGb3JSZW5kZXJpbmdBbmRTdHlsZSk7CiAKQEAgLTE1NDQsMzQgKzE1NDgsMjggQEAgYm9v bCBOb2RlUmVuZGVyUGFyZW50RGV0ZWN0b3I6OnNob3VsZENyZWF0ZVJlbmRlcmVyKCkgY29uc3QK ICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotCi1Db250YWluZXJOb2RlKiBOb2RlOjpwYXJlbnROb2Rl Rm9yUmVuZGVyaW5nQW5kU3R5bGUoKSBjb25zdAorUmVuZGVyT2JqZWN0KiBOb2RlUmVuZGVyZXJG YWN0b3J5OjpjcmVhdGVSZW5kZXJlckFuZFN0eWxlKCkKIHsKLSAgICByZXR1cm4gTm9kZVJlbmRl clBhcmVudERldGVjdG9yKGNvbnN0X2Nhc3Q8Tm9kZSo+KHRoaXMpKS5wYXJlbnROb2RlRm9yUmVu ZGVyaW5nQW5kU3R5bGUoKTsKLX0KLQotUmVuZGVyT2JqZWN0KiBOb2RlOjpjcmVhdGVSZW5kZXJl ckFuZFN0eWxlKCkKLXsKLSAgICBBU1NFUlQoIXJlbmRlcmVyKCkpOworICAgIEFTU0VSVCghbV9u b2RlLT5yZW5kZXJlcigpKTsKICAgICBBU1NFUlQoZG9jdW1lbnQoKS0+c2hvdWxkQ3JlYXRlUmVu ZGVyZXJzKCkpOwogCi0gICAgTm9kZVJlbmRlclBhcmVudERldGVjdG9yIHBhcmVudERldGVjdG9y KHRoaXMpOwotICAgIGlmICghcGFyZW50RGV0ZWN0b3Iuc2hvdWxkQ3JlYXRlUmVuZGVyZXIoKSkK KyAgICBpZiAoIXNob3VsZENyZWF0ZVJlbmRlcmVyKCkpCiAgICAgICAgIHJldHVybiAwOwogCi0g ICAgUmVmUHRyPFJlbmRlclN0eWxlPiBzdHlsZSA9IHN0eWxlRm9yUmVuZGVyZXIoKTsKLSAgICBp ZiAoIXJlbmRlcmVySXNOZWVkZWQoc3R5bGUuZ2V0KCkpKQorICAgIFJlZlB0cjxSZW5kZXJTdHls ZT4gc3R5bGUgPSBtX25vZGUtPnN0eWxlRm9yUmVuZGVyZXIoKTsKKyAgICBpZiAoIW1fbm9kZS0+ cmVuZGVyZXJJc05lZWRlZChzdHlsZS5nZXQoKSkpCiAgICAgICAgIHJldHVybiAwOwogCi0gICAg UmVuZGVyT2JqZWN0KiBuZXdSZW5kZXJlciA9IGNyZWF0ZVJlbmRlcmVyKGRvY3VtZW50KCktPnJl bmRlckFyZW5hKCksIHN0eWxlLmdldCgpKTsKKyAgICBSZW5kZXJPYmplY3QqIG5ld1JlbmRlcmVy ID0gbV9ub2RlLT5jcmVhdGVSZW5kZXJlcihkb2N1bWVudCgpLT5yZW5kZXJBcmVuYSgpLCBzdHls ZS5nZXQoKSk7CiAgICAgaWYgKCFuZXdSZW5kZXJlcikKICAgICAgICAgcmV0dXJuIDA7CiAKLSAg ICBpZiAoIXBhcmVudERldGVjdG9yLnBhcmVudE5vZGVGb3JSZW5kZXJpbmdBbmRTdHlsZSgpLT5y ZW5kZXJlcigpLT5pc0NoaWxkQWxsb3dlZChuZXdSZW5kZXJlciwgc3R5bGUuZ2V0KCkpKSB7Cisg ICAgaWYgKCFtX3BhcmVudE5vZGVGb3JSZW5kZXJpbmdBbmRTdHlsZS0+cmVuZGVyZXIoKS0+aXND aGlsZEFsbG93ZWQobmV3UmVuZGVyZXIsIHN0eWxlLmdldCgpKSkgewogICAgICAgICBuZXdSZW5k ZXJlci0+ZGVzdHJveSgpOwogICAgICAgICByZXR1cm4gMDsKICAgICB9Ci0gICAgc2V0UmVuZGVy ZXIobmV3UmVuZGVyZXIpOworCisgICAgbV9ub2RlLT5zZXRSZW5kZXJlcihuZXdSZW5kZXJlcik7 CiAgICAgbmV3UmVuZGVyZXItPnNldEFuaW1hdGFibGVTdHlsZShzdHlsZS5yZWxlYXNlKCkpOyAv LyBzZXRBbmltYXRhYmxlU3R5bGUoKSBjYW4gZGVwZW5kIG9uIHJlbmRlcmVyKCkgYWxyZWFkeSBi ZWluZyBzZXQuCiAgICAgcmV0dXJuIG5ld1JlbmRlcmVyOwogfQpAQCAtMTU5MCwxNyArMTU4OCwx NyBAQCBzdGF0aWMgUmVuZGVyRnVsbFNjcmVlbiogd3JhcFdpdGhSZW5kZXJGdWxsU2NyZWVuKFJl bmRlck9iamVjdCogb2JqZWN0LCBEb2N1bWVudAogfQogI2VuZGlmCiAKLXZvaWQgTm9kZTo6Y3Jl YXRlUmVuZGVyZXJJZk5lZWRlZCgpCit2b2lkIE5vZGVSZW5kZXJlckZhY3Rvcnk6OmNyZWF0ZVJl bmRlcmVySWZOZWVkZWQoKQogewogICAgIGlmICghZG9jdW1lbnQoKS0+c2hvdWxkQ3JlYXRlUmVu ZGVyZXJzKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIEFTU0VSVCghcmVuZGVyZXIoKSk7Cisg ICAgQVNTRVJUKCFtX25vZGUtPnJlbmRlcmVyKCkpOwogCiAgICAgUmVuZGVyT2JqZWN0KiBuZXdS ZW5kZXJlciA9IGNyZWF0ZVJlbmRlcmVyQW5kU3R5bGUoKTsKIAogI2lmIEVOQUJMRShGVUxMU0NS RUVOX0FQSSkKLSAgICBpZiAoZG9jdW1lbnQoKS0+d2Via2l0SXNGdWxsU2NyZWVuKCkgJiYgZG9j dW1lbnQoKS0+d2Via2l0Q3VycmVudEZ1bGxTY3JlZW5FbGVtZW50KCkgPT0gdGhpcykKKyAgICBp ZiAoZG9jdW1lbnQoKS0+d2Via2l0SXNGdWxsU2NyZWVuKCkgJiYgZG9jdW1lbnQoKS0+d2Via2l0 Q3VycmVudEZ1bGxTY3JlZW5FbGVtZW50KCkgPT0gbV9ub2RlKQogICAgICAgICBuZXdSZW5kZXJl ciA9IHdyYXBXaXRoUmVuZGVyRnVsbFNjcmVlbihuZXdSZW5kZXJlciwgZG9jdW1lbnQoKSk7CiAj ZW5kaWYKIApAQCAtMTYwOCw3ICsxNjA2LDE3IEBAIHZvaWQgTm9kZTo6Y3JlYXRlUmVuZGVyZXJJ Zk5lZWRlZCgpCiAgICAgICAgIHJldHVybjsKIAogICAgIC8vIE5vdGU6IEFkZGluZyBuZXdSZW5k ZXJlciBpbnN0ZWFkIG9mIHJlbmRlcmVyKCkuIHJlbmRlcmVyKCkgbWF5IGJlIGEgY2hpbGQgb2Yg bmV3UmVuZGVyZXIuCi0gICAgcGFyZW50Tm9kZUZvclJlbmRlcmluZ0FuZFN0eWxlKCktPnJlbmRl cmVyKCktPmFkZENoaWxkKG5ld1JlbmRlcmVyLCBuZXh0UmVuZGVyZXIoKSk7CisgICAgbV9wYXJl bnROb2RlRm9yUmVuZGVyaW5nQW5kU3R5bGUtPnJlbmRlcmVyKCktPmFkZENoaWxkKG5ld1JlbmRl cmVyLCBuZXh0UmVuZGVyZXIoKSk7Cit9CisKK0NvbnRhaW5lck5vZGUqIE5vZGU6OnBhcmVudE5v ZGVGb3JSZW5kZXJpbmdBbmRTdHlsZSgpIGNvbnN0Cit7CisgICAgcmV0dXJuIE5vZGVSZW5kZXJl ckZhY3RvcnkoY29uc3RfY2FzdDxOb2RlKj4odGhpcykpLnBhcmVudE5vZGVGb3JSZW5kZXJpbmdB bmRTdHlsZSgpOworfQorCit2b2lkIE5vZGU6OmNyZWF0ZVJlbmRlcmVySWZOZWVkZWQoKQorewor ICAgIE5vZGVSZW5kZXJlckZhY3RvcnkodGhpcykuY3JlYXRlUmVuZGVyZXJJZk5lZWRlZCgpOwog fQogCiBQYXNzUmVmUHRyPFJlbmRlclN0eWxlPiBOb2RlOjpzdHlsZUZvclJlbmRlcmVyKCkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20v Tm9kZS5oCmluZGV4IDkzNTkwZjc4ODU0ZTI3MTRjZGYzNTQ1NzgwOWYwNmQ1NjIxYmMwY2QuLmEy YTc1MGMzNjM2MTJlM2YyMGE0NTYxZGJiYzljYTNmOTZkYTBkOGEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2RvbS9Ob2RlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuaApAQCAt NjYzLDggKzY2Myw2IEBAIHByaXZhdGU6CiAgICAgLy8gVXNlZCB0byBzaGFyZSBjb2RlIGJldHdl ZW4gbGF6eUF0dGFjaCBhbmQgc2V0TmVlZHNTdHlsZVJlY2FsYy4KICAgICB2b2lkIG1hcmtBbmNl c3RvcnNXaXRoQ2hpbGROZWVkc1N0eWxlUmVjYWxjKCk7CiAKLSAgICBSZW5kZXJPYmplY3QqIGNy ZWF0ZVJlbmRlcmVyQW5kU3R5bGUoKTsKLQogICAgIHZpcnR1YWwgdm9pZCByZWZFdmVudFRhcmdl dCgpOwogICAgIHZpcnR1YWwgdm9pZCBkZXJlZkV2ZW50VGFyZ2V0KCk7CiAK