102974 2012-11-21 13:13:21 -0800 Remove unnecessary ternaries in createRendererIfNeeded 2012-11-21 14:22:25 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 esprehn esprehn kling morrita ojan webkit.review.bot oldest_to_newest 773207 0 esprehn 2012-11-21 13:13:21 -0800 Remove unnecessary ternaries in createRendererIfNeeded 773210 1 175506 esprehn 2012-11-21 13:15:50 -0800 Created attachment 175506 Patch 773217 2 175506 ojan 2012-11-21 13:25:13 -0800 Comment on attachment 175506 Patch Is it possible for m_parentFlowRenderer to be set and m_node->renderer() to be non-null? If so, then this code isn't actually equivalent. That said, maybe you can change parentRenderer/etc. to check m_parentFlowRenderer first? 773218 3 esprehn 2012-11-21 13:28:18 -0800 (In reply to comment #2) > (From update of attachment 175506 [details]) > Is it possible for m_parentFlowRenderer to be set and m_node->renderer() to be non-null? If so, then this code isn't actually equivalent. > > That said, maybe you can change parentRenderer/etc. to check m_parentFlowRenderer first? No, because we assert at the top of this method: ASSERT(!m_node->renderer()); Calling createRendererIfNeeded() if you already have a renderer is a bug. 773239 4 175506 ojan 2012-11-21 13:43:50 -0800 Comment on attachment 175506 Patch Might be worth mentioning the asserts in the changelog. 773248 5 175515 esprehn 2012-11-21 13:55:47 -0800 Created attachment 175515 Patch for landing 773286 6 175515 webkit.review.bot 2012-11-21 14:22:22 -0800 Comment on attachment 175515 Patch for landing Clearing flags on attachment: 175515 Committed r135432: <http://trac.webkit.org/changeset/135432> 773288 7 webkit.review.bot 2012-11-21 14:22:25 -0800 All reviewed patches have been landed. Closing bug. 175506 2012-11-21 13:15:50 -0800 2012-11-21 13:55:42 -0800 Patch bug-102974-20121121161337.patch text/plain 1989 esprehn U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1NDIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjE4ZjQ1YjhjODEzYzAy OGI1NTNhZmRjYjA1YTE0OTJmMjM4MzQxZi4uZjdjOWY2OGM3OTUzZWVmODJkMTk3YmYzMDBkNjRl YzA2MGQ4MzY5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTExLTIxICBFbGxp b3R0IFNwcmVobiAgPGVzcHJlaG5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJlbW92ZSB1bm5l Y2Vzc2FyeSB0ZXJuYXJpZXMgaW4gY3JlYXRlUmVuZGVyZXJJZk5lZWRlZAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAyOTc0CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgcGFyZW50UmVuZGVyZXIsIG5leHRS ZW5kZXJlciBhbmQgcHJldmlvdXNSZW5kZXJlciBhbGwgaGFuZGxlIG5hbWVkIGZsb3cKKyAgICAg ICAgdGhyZWFkcyBhdXRvbWF0aWNhbGx5IHNvIHRoZXJlJ3Mgbm8gcmVhc29uIHRvIGR1cGxpY2F0 ZSB0aGUgY2hlY2sgaW4gCisgICAgICAgIGNyZWF0ZVJlbmRlcmVySWZOZWVkZWQuCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzLCBqdXN0IHJlZmFjdG9yaW5nLgorCisgICAgICAgICogZG9tL05vZGVS ZW5kZXJpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGVSZW5kZXJpbmdDb250 ZXh0OjpjcmVhdGVSZW5kZXJlcklmTmVlZGVkKToKKwogMjAxMi0xMS0yMSAgQW5kcmVhcyBLbGlu ZyAgPGFrbGluZ0BhcHBsZS5jb20+CiAKICAgICAgICAgTWFrZSBpdCBwb3NzaWJsZSBmb3IgZWxl bWVudHMgd2l0aCBkaWZmZXJlbnQgdGFnIG5hbWVzIHRvIHNoYXJlIGF0dHJpYnV0ZSBkYXRhLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL05vZGVSZW5kZXJpbmdDb250ZXh0LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlUmVuZGVyaW5nQ29udGV4dC5jcHAKaW5kZXggMDJiMWEz YzI4ZmMwNDMyOTA0YzE1ZTUxNDA5MjRiOTk2YTkwOGYzOC4uOWFlZWFjZmUxMDYwOGQzNjRjZGQ0 OWRjYTdjYWZmOTUwYzFkMjE3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL05vZGVS ZW5kZXJpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZVJlbmRlcmlu Z0NvbnRleHQuY3BwCkBAIC0yMTksMTAgKzIxOSw4IEBAIHZvaWQgTm9kZVJlbmRlcmluZ0NvbnRl eHQ6OmNyZWF0ZVJlbmRlcmVySWZOZWVkZWQoKQogICAgICAgICAgICAgZWxlbWVudC0+c2V0U3R5 bGVBZmZlY3RlZEJ5RW1wdHkoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KLSAgICBSZW5kZXJP YmplY3QqIHBhcmVudFJlbmRlcmVyID0gbV9wYXJlbnRGbG93UmVuZGVyZXIgPyBtX3BhcmVudEZs b3dSZW5kZXJlciA6IHRoaXMtPnBhcmVudFJlbmRlcmVyKCk7Ci0gICAgLy8gRG8gbm90IGNhbGwg bV9jb250ZXh0Lm5leHRSZW5kZXJlcigpIGhlcmUgaW4gdGhlIGZpcnN0IGNsYXVzZSwgYmVjYXVz ZSBpdCBleHBlY3RzIHRvIGhhdmUKLSAgICAvLyB0aGUgcmVuZGVyZXIgYWRkZWQgdG8gaXRzIHBh cmVudCBhbHJlYWR5LgotICAgIFJlbmRlck9iamVjdCogbmV4dFJlbmRlcmVyID0gbV9wYXJlbnRG bG93UmVuZGVyZXIgPyBtX3BhcmVudEZsb3dSZW5kZXJlci0+bmV4dFJlbmRlcmVyRm9yTm9kZSht X25vZGUpIDogdGhpcy0+bmV4dFJlbmRlcmVyKCk7CisgICAgUmVuZGVyT2JqZWN0KiBwYXJlbnRS ZW5kZXJlciA9IHRoaXMtPnBhcmVudFJlbmRlcmVyKCk7CisgICAgUmVuZGVyT2JqZWN0KiBuZXh0 UmVuZGVyZXIgPSB0aGlzLT5uZXh0UmVuZGVyZXIoKTsKIAogI2lmIEVOQUJMRShESUFMT0dfRUxF TUVOVCkKICAgICBpZiAoZWxlbWVudCAmJiBlbGVtZW50LT5pc0luVG9wTGF5ZXIoKSkK 175515 2012-11-21 13:55:47 -0800 2012-11-21 14:22:22 -0800 Patch for landing bug-102974-20121121165333.patch text/plain 2226 esprehn U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1NDI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGZlMWNkOThjNGQyODdi YTM2YTdhNmU2ZTlhMTE2Y2QyY2QxMDkyZi4uN2JhYTJhODNjM2I2ZTI3M2M2ZGNkZjdiZjJlM2Rl N2M2YzQ1Y2MzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTExLTIxICBFbGxp b3R0IFNwcmVobiAgPGVzcHJlaG5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJlbW92ZSB1bm5l Y2Vzc2FyeSB0ZXJuYXJpZXMgaW4gY3JlYXRlUmVuZGVyZXJJZk5lZWRlZAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAyOTc0CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgT2phbiBWYWZhaS4KKworICAgICAgICBwYXJlbnRSZW5kZXJlciwgbmV4dFJlbmRl cmVyIGFuZCBwcmV2aW91c1JlbmRlcmVyIGFsbCBoYW5kbGUgZmxvdworICAgICAgICB0aHJlYWRz IGF1dG9tYXRpY2FsbHkgc28gdGhlcmUncyBubyByZWFzb24gdG8gZHVwbGljYXRlIHRoZSBjaGVj ayBpbiAKKyAgICAgICAgY3JlYXRlUmVuZGVyZXJJZk5lZWRlZC4KKworICAgICAgICBOb3RlIHRo YXQgd2hpbGUgdGhlc2UgbWV0aG9kcyBmaXJzdCBjaGVjayB0aGUgbm9kZSBmb3IgYSByZW5kZXJl ciBhbmQKKyAgICAgICAgdGhlbiBkZWxlZ2F0ZSB0byB0aGUgZmxvdyB0aHJlYWQgdGhlIG5vZGUg bmV2ZXIgaGFzIGEgcmVuZGVyZXIgd2hlbgorICAgICAgICBjYWxsaW5nIGNyZWF0ZVJlbmRlcmVy SWZOZWVkZWQgcGVyIHRoZSBhc3NlcnRpb24gYXQgdGhlIHRvcCBzbyB0aGlzCisgICAgICAgIGNo YW5nZSBpcyBlcXVpdmFsZW50LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywganVzdCByZWZhY3Rv cmluZy4KKworICAgICAgICAqIGRvbS9Ob2RlUmVuZGVyaW5nQ29udGV4dC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpOb2RlUmVuZGVyaW5nQ29udGV4dDo6Y3JlYXRlUmVuZGVyZXJJZk5lZWRlZCk6 CisKIDIwMTItMTEtMjAgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgSFRNTENvbGxlY3Rpb24gc2hvdWxkIHVzZSB0aGUgc2FtZSBzdG9yYWdlIGFzIER5bmFtaWNO b2RlTGlzdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL05vZGVSZW5kZXJpbmdDb250 ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlUmVuZGVyaW5nQ29udGV4dC5jcHAKaW5k ZXggMDJiMWEzYzI4ZmMwNDMyOTA0YzE1ZTUxNDA5MjRiOTk2YTkwOGYzOC4uOWFlZWFjZmUxMDYw OGQzNjRjZGQ0OWRjYTdjYWZmOTUwYzFkMjE3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv ZG9tL05vZGVSZW5kZXJpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9k ZVJlbmRlcmluZ0NvbnRleHQuY3BwCkBAIC0yMTksMTAgKzIxOSw4IEBAIHZvaWQgTm9kZVJlbmRl cmluZ0NvbnRleHQ6OmNyZWF0ZVJlbmRlcmVySWZOZWVkZWQoKQogICAgICAgICAgICAgZWxlbWVu dC0+c2V0U3R5bGVBZmZlY3RlZEJ5RW1wdHkoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KLSAg ICBSZW5kZXJPYmplY3QqIHBhcmVudFJlbmRlcmVyID0gbV9wYXJlbnRGbG93UmVuZGVyZXIgPyBt X3BhcmVudEZsb3dSZW5kZXJlciA6IHRoaXMtPnBhcmVudFJlbmRlcmVyKCk7Ci0gICAgLy8gRG8g bm90IGNhbGwgbV9jb250ZXh0Lm5leHRSZW5kZXJlcigpIGhlcmUgaW4gdGhlIGZpcnN0IGNsYXVz ZSwgYmVjYXVzZSBpdCBleHBlY3RzIHRvIGhhdmUKLSAgICAvLyB0aGUgcmVuZGVyZXIgYWRkZWQg dG8gaXRzIHBhcmVudCBhbHJlYWR5LgotICAgIFJlbmRlck9iamVjdCogbmV4dFJlbmRlcmVyID0g bV9wYXJlbnRGbG93UmVuZGVyZXIgPyBtX3BhcmVudEZsb3dSZW5kZXJlci0+bmV4dFJlbmRlcmVy Rm9yTm9kZShtX25vZGUpIDogdGhpcy0+bmV4dFJlbmRlcmVyKCk7CisgICAgUmVuZGVyT2JqZWN0 KiBwYXJlbnRSZW5kZXJlciA9IHRoaXMtPnBhcmVudFJlbmRlcmVyKCk7CisgICAgUmVuZGVyT2Jq ZWN0KiBuZXh0UmVuZGVyZXIgPSB0aGlzLT5uZXh0UmVuZGVyZXIoKTsKIAogI2lmIEVOQUJMRShE SUFMT0dfRUxFTUVOVCkKICAgICBpZiAoZWxlbWVudCAmJiBlbGVtZW50LT5pc0luVG9wTGF5ZXIo KSkK