91286 2012-07-13 14:46:30 -0700 Remove an always-failing table-wrapping check in RenderObject::addChild 2012-07-13 16:34:17 -0700 1 1 1 Unclassified WebKit Tables 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 jchaffraix jchaffraix darin eric webkit.review.bot oldest_to_newest 669441 0 jchaffraix 2012-07-13 14:46:30 -0700 The table wrapping checks in RenderObject::addChild ends with the following snippet: else if (newChild->isTableCell()) { needsTable = !isTableRow(); // I'm not 100% sure this is the best way to fix this, but without this // change we recurse infinitely when trying to render the CSS2 test page: // http://www.bath.ac.uk/%7Epy8ieh/internet/eviltests/htmlbodyheadrendering2.html. // See Radar 2925291. if (needsTable && isTableCell() && !children->firstChild() && !newChild->isTableCell()) needsTable = false; } As we only get into the branch if newChild->isTableCell() so the nested check is always false. The inner check was added in r1147 by Darin and was made obsolete by bug 12066 (circa 2005). 669456 1 152342 jchaffraix 2012-07-13 14:55:55 -0700 Created attachment 152342 Proposed removal 1. 669459 2 152342 eric 2012-07-13 14:58:46 -0700 Comment on attachment 152342 Proposed removal 1. LGTM. 669574 3 152342 webkit.review.bot 2012-07-13 16:34:12 -0700 Comment on attachment 152342 Proposed removal 1. Clearing flags on attachment: 152342 Committed r122642: <http://trac.webkit.org/changeset/122642> 669575 4 webkit.review.bot 2012-07-13 16:34:17 -0700 All reviewed patches have been landed. Closing bug. 152342 2012-07-13 14:55:55 -0700 2012-07-13 16:34:12 -0700 Proposed removal 1. bug-91286-20120713145555.patch text/plain 2771 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyNjE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzU2YzIxY2MyNmI5OTg5 ZTA4NmUxZTlmY2I4ZDY4OWNmNTNjN2ZjZi4uOGMyMjVkOTYzYmZhYmQzYjQ2MDExNGJjOGE2NzNm ZTcwYWNlZWM0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA3LTEzICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgorCisgICAgICAgIFJlbW92ZSBh biBhbHdheXMtZmFpbGluZyB0YWJsZS13cmFwcGluZyBjaGVjayBpbiBSZW5kZXJPYmplY3Q6OmFk ZENoaWxkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05 MTI4NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIER1 ZSB0byB0aGUgc3RydWN0dXJlIG9mIHRoZSBjb2RlLCB0aGlzIHRlc3QgaXMgYWx3YXlzIGZhaWxp bmcgKG5ld0NoaWxkLT5pc1RhYmxlQ2VsbCgpCisgICAgICAgIGlzIHRydWUgdG8gZ2V0IGluIHRo ZSBicmFuY2gpLgorCisgICAgICAgIFRoZSBjaGFuZ2VzZXQgYWRkaW5nIHRoZSBjb2RlIGRpZG4n dCBhZGQgdGVzdGluZyBzbyBJIHBvdW5kZXJlZCBhZGRpbmcgdGhlIG1lbnRpb25lZCB0ZXN0LAor ICAgICAgICB3aGljaCBpcyBwYXNzaW5nLiBIb3dldmVyIHRoZSB0ZXN0IHdvdWxkIG5lZWQgdG8g YmUgYmxpbmRseSBjaGFuZ2VkIHRvIGJlIGluY2x1ZGVkIGluIG91cgorICAgICAgICB0ZXN0IGhh cm5lc3MuIEkgd291bGQgYWxzbyBleHBlY3QgdGhpcyBjb2RlIHRvIGJlIGV4ZXJjaXNlZCBieSBv dGhlciB0YWJsZSB0ZXN0cyBhbnl3YXkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyT2Jq ZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6YWRkQ2hpbGQpOgorICAg ICAgICBSZW1vdmVkIG5ldmVyLXJlYWNoZWQgYnJhbmNoLiBXaGlsZSBhdCBpdCwgcmVtb3ZlZCBh ICd3aGF0JyBjb21tZW50IGluIHRoZSBzYW1lIGZpbGUuCisKIDIwMTItMDctMTMgIFBoaWxpcCBS b2dlcnMgIDxwZHJAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZW1vdmUgYXNzZXJ0IGluIGxvY2Fs Q29vcmRpbmF0ZVNwYWNlVHJhbnNmb3JtKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ck9iamVjdC5jcHAKaW5kZXggZGViNjYwNzljN2Y5ZTk5MDkwYjBlZmRkNjA1MjQ0Y2EyNzJjNDA1 Yy4uMDRmMjdlNjUyYmYzYTdjYTMwNWRiY2FmMTUxZjRiN2M2MTIxYWViOCAxMDA3NTUKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKQEAgLTI4MiwxNSArMjgyLDggQEAgdm9p ZCBSZW5kZXJPYmplY3Q6OmFkZENoaWxkKFJlbmRlck9iamVjdCogbmV3Q2hpbGQsIFJlbmRlck9i amVjdCogYmVmb3JlQ2hpbGQpCiAgICAgICAgIG5lZWRzVGFibGUgPSAhaXNUYWJsZSgpOwogICAg IGVsc2UgaWYgKG5ld0NoaWxkLT5pc1RhYmxlUm93KCkpCiAgICAgICAgIG5lZWRzVGFibGUgPSAh aXNUYWJsZVNlY3Rpb24oKTsKLSAgICBlbHNlIGlmIChuZXdDaGlsZC0+aXNUYWJsZUNlbGwoKSkg eworICAgIGVsc2UgaWYgKG5ld0NoaWxkLT5pc1RhYmxlQ2VsbCgpKQogICAgICAgICBuZWVkc1Rh YmxlID0gIWlzVGFibGVSb3coKTsKLSAgICAgICAgLy8gSSdtIG5vdCAxMDAlIHN1cmUgdGhpcyBp cyB0aGUgYmVzdCB3YXkgdG8gZml4IHRoaXMsIGJ1dCB3aXRob3V0IHRoaXMKLSAgICAgICAgLy8g Y2hhbmdlIHdlIHJlY3Vyc2UgaW5maW5pdGVseSB3aGVuIHRyeWluZyB0byByZW5kZXIgdGhlIENT UzIgdGVzdCBwYWdlOgotICAgICAgICAvLyBodHRwOi8vd3d3LmJhdGguYWMudWsvJTdFcHk4aWVo L2ludGVybmV0L2V2aWx0ZXN0cy9odG1sYm9keWhlYWRyZW5kZXJpbmcyLmh0bWwuCi0gICAgICAg IC8vIFNlZSBSYWRhciAyOTI1MjkxLgotICAgICAgICBpZiAobmVlZHNUYWJsZSAmJiBpc1RhYmxl Q2VsbCgpICYmICFjaGlsZHJlbi0+Zmlyc3RDaGlsZCgpICYmICFuZXdDaGlsZC0+aXNUYWJsZUNl bGwoKSkKLSAgICAgICAgICAgIG5lZWRzVGFibGUgPSBmYWxzZTsKLSAgICB9CiAKICAgICBpZiAo bmVlZHNUYWJsZSkgewogICAgICAgICBSZW5kZXJUYWJsZSogdGFibGU7CkBAIC0zMDIsMTAgKzI5 NSw4IEBAIHZvaWQgUmVuZGVyT2JqZWN0OjphZGRDaGlsZChSZW5kZXJPYmplY3QqIG5ld0NoaWxk LCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkKQogICAgICAgICAgICAgYWRkQ2hpbGQodGFibGUs IGJlZm9yZUNoaWxkKTsKICAgICAgICAgfQogICAgICAgICB0YWJsZS0+YWRkQ2hpbGQobmV3Q2hp bGQpOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIC8vIEp1c3QgYWRkIGl0Li4uCisgICAgfSBlbHNl CiAgICAgICAgIGNoaWxkcmVuLT5pbnNlcnRDaGlsZE5vZGUodGhpcywgbmV3Q2hpbGQsIGJlZm9y ZUNoaWxkKTsKLSAgICB9CiAKICAgICBpZiAobmV3Q2hpbGQtPmlzVGV4dCgpICYmIG5ld0NoaWxk LT5zdHlsZSgpLT50ZXh0VHJhbnNmb3JtKCkgPT0gQ0FQSVRBTElaRSkKICAgICAgICAgdG9SZW5k ZXJUZXh0KG5ld0NoaWxkKS0+dHJhbnNmb3JtVGV4dCgpOwo=