26201 2009-06-04 19:34:54 -0700 Remove superfluous 'if' statements in RenderTable::addChild 2009-06-04 20:46:08 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC All RESOLVED FIXED P5 Enhancement --- 0 rolandsteiner webkit-unassigned oldest_to_newest 124428 0 rolandsteiner 2009-06-04 19:34:54 -0700 [separated out from bug #26198] RenderTable::addChild has a few superfluous 'if' statements (the same condition is queried at the start of the block already) 124429 1 30981 rolandsteiner 2009-06-04 19:56:43 -0700 Created attachment 30981 patch - remove superfluous 'if's 124455 2 30981 eric 2009-06-04 20:27:14 -0700 Comment on attachment 30981 patch - remove superfluous 'if's Would still be preferred to add ASSERTs here and fix the extra { } while where here. 124458 3 30981 eric 2009-06-04 20:45:16 -0700 Comment on attachment 30981 patch - remove superfluous 'if's Looks good. The ASSERT() doens't really buy us much. So much else would break if we changed away from RenderTableSection anyway. 124459 4 eric 2009-06-04 20:46:08 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/rendering/RenderTable.cpp Committed r44450 30981 2009-06-04 19:56:43 -0700 2009-06-04 20:45:16 -0700 patch - remove superfluous 'if's rendering-RenderTable-cpp.patch text/plain 3256 rolandsteiner SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NDQ0MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTQgQEAKKzIwMDktMDYtMDQgIFJvbGFuZCBTdGVpbmVyIDxyb2xhbmRzdGVpbmVy QGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkKKworICAg ICAgICBCdWcgMjYyMDE6IFJlbW92ZSBzdXBlcmZsdW91cyAnaWYnIHN0YXRlbWVudHMgaW4gUmVu ZGVyVGFibGU6OmFkZENoaWxkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yNjIwMQorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRhYmxlLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRhYmxlOjphZGRDaGlsZCk6IHJlbW92ZSBzdXBlcmZs dW91cyAnaWYnIHN0YXRlbWVudHMKKyAgICAgICAKKwogMjAwOS0wNi0wNCAgRGFuIEJlcm5zdGVp biAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAgIC0gcmV0cnkgdG8gZml4IHRoZSBUaWdlciBi dWlsZApJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlLmNwcAkocmV2aXNpb24gNDQ0MTkpCisr KyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEy OCwzNCArMTI4LDI4IEBACiAgICAgfSBlbHNlIGlmIChjaGlsZC0+aXNUYWJsZVNlY3Rpb24oKSkg ewogICAgICAgICBzd2l0Y2ggKGNoaWxkLT5zdHlsZSgpLT5kaXNwbGF5KCkpIHsKICAgICAgICAg ICAgIGNhc2UgVEFCTEVfSEVBREVSX0dST1VQOgotICAgICAgICAgICAgICAgIGlmIChjaGlsZC0+ aXNUYWJsZVNlY3Rpb24oKSkgewotICAgICAgICAgICAgICAgICAgICByZXNldFNlY3Rpb25Qb2lu dGVySWZOb3RCZWZvcmUobV9oZWFkLCBiZWZvcmVDaGlsZCk7Ci0gICAgICAgICAgICAgICAgICAg IGlmICghbV9oZWFkKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBtX2hlYWQgPSBzdGF0aWNf Y2FzdDxSZW5kZXJUYWJsZVNlY3Rpb24qPihjaGlsZCk7Ci0gICAgICAgICAgICAgICAgICAgIH0g ZWxzZSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICByZXNldFNlY3Rpb25Qb2ludGVySWZOb3RC ZWZvcmUobV9maXJzdEJvZHksIGJlZm9yZUNoaWxkKTsKLSAgICAgICAgICAgICAgICAgICAgICAg IGlmICghbV9maXJzdEJvZHkpIAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fZmlyc3RC b2R5ID0gc3RhdGljX2Nhc3Q8UmVuZGVyVGFibGVTZWN0aW9uKj4oY2hpbGQpOwotICAgICAgICAg ICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgcmVzZXRTZWN0aW9uUG9pbnRlcklmTm90QmVm b3JlKG1faGVhZCwgYmVmb3JlQ2hpbGQpOworICAgICAgICAgICAgICAgIGlmICghbV9oZWFkKSB7 CisgICAgICAgICAgICAgICAgICAgIG1faGVhZCA9IHN0YXRpY19jYXN0PFJlbmRlclRhYmxlU2Vj dGlvbio+KGNoaWxkKTsKKyAgICAgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAg ICAgICByZXNldFNlY3Rpb25Qb2ludGVySWZOb3RCZWZvcmUobV9maXJzdEJvZHksIGJlZm9yZUNo aWxkKTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKCFtX2ZpcnN0Qm9keSkgCisgICAgICAgICAg ICAgICAgICAgICAgICBtX2ZpcnN0Qm9keSA9IHN0YXRpY19jYXN0PFJlbmRlclRhYmxlU2VjdGlv bio+KGNoaWxkKTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgd3JhcEluQW5v bnltb3VzU2VjdGlvbiA9IGZhbHNlOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAg ICAgY2FzZSBUQUJMRV9GT09URVJfR1JPVVA6Ci0gICAgICAgICAgICAgICAgaWYgKGNoaWxkLT5p c1RhYmxlU2VjdGlvbigpKSB7Ci0gICAgICAgICAgICAgICAgICAgIHJlc2V0U2VjdGlvblBvaW50 ZXJJZk5vdEJlZm9yZShtX2Zvb3QsIGJlZm9yZUNoaWxkKTsKLSAgICAgICAgICAgICAgICAgICAg aWYgKCFtX2Zvb3QpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIG1fZm9vdCA9IHN0YXRpY19j YXN0PFJlbmRlclRhYmxlU2VjdGlvbio+KGNoaWxkKTsKLSAgICAgICAgICAgICAgICAgICAgICAg IHdyYXBJbkFub255bW91c1NlY3Rpb24gPSBmYWxzZTsKLSAgICAgICAgICAgICAgICAgICAgICAg IGJyZWFrOwotICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgcmVzZXRTZWN0 aW9uUG9pbnRlcklmTm90QmVmb3JlKG1fZm9vdCwgYmVmb3JlQ2hpbGQpOworICAgICAgICAgICAg ICAgIGlmICghbV9mb290KSB7CisgICAgICAgICAgICAgICAgICAgIG1fZm9vdCA9IHN0YXRpY19j YXN0PFJlbmRlclRhYmxlU2VjdGlvbio+KGNoaWxkKTsKKyAgICAgICAgICAgICAgICAgICAgd3Jh cEluQW5vbnltb3VzU2VjdGlvbiA9IGZhbHNlOworICAgICAgICAgICAgICAgICAgICBicmVhazsK ICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgLy8gRmFsbCB0aHJvdWdoLgogICAg ICAgICAgICAgY2FzZSBUQUJMRV9ST1dfR1JPVVA6Ci0gICAgICAgICAgICAgICAgaWYgKGNoaWxk LT5pc1RhYmxlU2VjdGlvbigpKSB7Ci0gICAgICAgICAgICAgICAgICAgIHJlc2V0U2VjdGlvblBv aW50ZXJJZk5vdEJlZm9yZShtX2ZpcnN0Qm9keSwgYmVmb3JlQ2hpbGQpOwotICAgICAgICAgICAg ICAgICAgICBpZiAoIW1fZmlyc3RCb2R5KQotICAgICAgICAgICAgICAgICAgICAgICAgbV9maXJz dEJvZHkgPSBzdGF0aWNfY2FzdDxSZW5kZXJUYWJsZVNlY3Rpb24qPihjaGlsZCk7Ci0gICAgICAg ICAgICAgICAgfQorICAgICAgICAgICAgICAgIHJlc2V0U2VjdGlvblBvaW50ZXJJZk5vdEJlZm9y ZShtX2ZpcnN0Qm9keSwgYmVmb3JlQ2hpbGQpOworICAgICAgICAgICAgICAgIGlmICghbV9maXJz dEJvZHkpCisgICAgICAgICAgICAgICAgICAgIG1fZmlyc3RCb2R5ID0gc3RhdGljX2Nhc3Q8UmVu ZGVyVGFibGVTZWN0aW9uKj4oY2hpbGQpOwogICAgICAgICAgICAgICAgIHdyYXBJbkFub255bW91 c1NlY3Rpb24gPSBmYWxzZTsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIGRl ZmF1bHQ6Cg==