145942 2015-06-12 15:00:36 -0700 Be more defensive at renderer type checking when initializing flow segments. 2015-06-12 20:25:41 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan commit-queue ddkilzer esprehn+autocc glenn koivisto kondapallykalyan oldest_to_newest 1101709 0 zalan 2015-06-12 15:00:36 -0700 If we miss invalidating simple line layout path properly, we could end up in FlowContents->initializeSegments with a renderer that we don't support yet. 1101717 1 254824 zalan 2015-06-12 15:25:17 -0700 Created attachment 254824 Patch 1101718 2 zalan 2015-06-12 15:25:48 -0700 It results in broken rendering (missing pieces) vs. crash. 1101730 3 254824 koivisto 2015-06-12 15:52:07 -0700 Comment on attachment 254824 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=254824&action=review > Source/WebCore/rendering/SimpleLineLayoutFlowContents.cpp:50 > continue; > - } > - ASSERT(is<RenderText>(child)); > - const auto& textChild = downcast<RenderText>(child); > - unsigned textLength = textChild.text()->length(); > - segments.append(FlowContents::Segment { startPosition, startPosition + textLength, textChild.text(), textChild }); > - startPosition += textLength; > + } else if (is<RenderText>(child)) { No need to say 'else' after 'continue'. 1101732 4 254824 koivisto 2015-06-12 15:55:06 -0700 Comment on attachment 254824 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=254824&action=review > Source/WebCore/rendering/SimpleLineLayoutFlowContents.cpp:56 > + startPosition += textLength; > + } else > + ASSERT_NOT_REACHED(); This too could do continue without else. 1101777 5 254846 zalan 2015-06-12 19:00:52 -0700 Created attachment 254846 Patch 1101787 6 254846 commit-queue 2015-06-12 20:25:36 -0700 Comment on attachment 254846 Patch Clearing flags on attachment: 254846 Committed r185531: <http://trac.webkit.org/changeset/185531> 1101788 7 commit-queue 2015-06-12 20:25:41 -0700 All reviewed patches have been landed. Closing bug. 254824 2015-06-12 15:25:17 -0700 2015-06-12 19:00:46 -0700 Patch bug-145942-20150612152447.patch text/plain 2730 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1NDg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGNlMmZmNTVmMmVjOTk1 OWE4MjQ5ODUwZWNhMzVkM2JmY2I0NGQ3Ny4uMGNkZDg5ZGQ2MjM0MmNhNjFjZWI3NjAwNGIwOTNk ZTJlM2U0OWFmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE1LTA2LTEyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgQmUgbW9yZSBkZWZlbnNpdmUg YXQgcmVuZGVyZXIgdHlwZSBjaGVja2luZyB3aGVuIGluaXRpYWxpemluZyBmbG93IHNlZ21lbnRz LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1OTQy CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRmxvd0Nv bnRlbnRzOjppbml0aWFsaXplU2VnbWVudHMgc2hvdWxkIGlnbm9yZSB1bnN1cHBvcnRlZCByZW5k ZXJlcnMgc28gdGhhdCB3aGVuIHdlIG1pc3MKKyAgICAgICAgYSBzaW1wbGUgbGluZSBsYXlvdXQg cGF0aCBpbnZhbGlkYXRpb24sIHdlIGRvbid0IGRvd25jYXN0IHRoZSB1bnN1cHBvcnRlZCByZW5k ZXJlciB0byBSZW5kZXJUZXh0LgorCisgICAgICAgIEkgaGF2ZSBub3QgcmVwcm9kdWNlZCB0aGlz IGlzc3VlIChidXQgcmVsYXRlZCB0byByZGFyOi8vcHJvYmxlbS8yMTMxMjQ1MikKKworICAgICAg ICAqIHJlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0Rmxvd0NvbnRlbnRzLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OmluaXRpYWxpemVTZWdtZW50cyk6CisKIDIwMTUt MDYtMTEgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBEbyBub3Qg Y3Jhc2ggd2hlbiB0aGUgZGVzY2VuZGFudCBmcmFtZSB0cmVlIGlzIGRlc3Ryb3llZCBkdXJpbmcg bGF5b3V0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVM YXlvdXRGbG93Q29udGVudHMuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxp bmVMYXlvdXRGbG93Q29udGVudHMuY3BwCmluZGV4IGRiMGE4OWI2M2E1MGQ0Y2Q1MDQ5MGVkZTM3 MDQwNDc4ZTQ2NWFiYjIuLjk4YThmNWIyYTNjNzg5YWY4OGJhOGRiMmRlYmY1NTYxMjkzZTUyMTkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0Rmxv d0NvbnRlbnRzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxh eW91dEZsb3dDb250ZW50cy5jcHAKQEAgLTM2LDcgKzM2LDYgQEAgbmFtZXNwYWNlIFNpbXBsZUxp bmVMYXlvdXQgewogCiBzdGF0aWMgVmVjdG9yPEZsb3dDb250ZW50czo6U2VnbWVudD4gaW5pdGlh bGl6ZVNlZ21lbnRzKGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgZmxvdykKIHsKLQogICAgIHVuc2ln bmVkIG51bWJlck9mQ2hpbGRyZW4gPSAwOwogICAgIGF1dG8gY2hpbGRyZW4gPSBjaGlsZHJlbk9m VHlwZTxSZW5kZXJPYmplY3Q+KGZsb3cpOwogICAgIGZvciAoYXV0byBpdCA9IGNoaWxkcmVuLmJl Z2luKCksIGVuZCA9IGNoaWxkcmVuLmVuZCgpOyBpdCAhPSBlbmQ7ICsraXQpCkBAIC00OCwxMiAr NDcsMTMgQEAgc3RhdGljIFZlY3RvcjxGbG93Q29udGVudHM6OlNlZ21lbnQ+IGluaXRpYWxpemVT ZWdtZW50cyhjb25zdCBSZW5kZXJCbG9ja0Zsb3cmIGYKICAgICAgICAgaWYgKGlzPFJlbmRlckxp bmVCcmVhaz4oY2hpbGQpKSB7CiAgICAgICAgICAgICBzZWdtZW50cy5hcHBlbmQoRmxvd0NvbnRl bnRzOjpTZWdtZW50IHsgc3RhcnRQb3NpdGlvbiwgc3RhcnRQb3NpdGlvbiwgU3RyaW5nKCksIGNo aWxkIH0pOwogICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgIH0KLSAgICAgICAgQVNTRVJU KGlzPFJlbmRlclRleHQ+KGNoaWxkKSk7Ci0gICAgICAgIGNvbnN0IGF1dG8mIHRleHRDaGlsZCA9 IGRvd25jYXN0PFJlbmRlclRleHQ+KGNoaWxkKTsKLSAgICAgICAgdW5zaWduZWQgdGV4dExlbmd0 aCA9IHRleHRDaGlsZC50ZXh0KCktPmxlbmd0aCgpOwotICAgICAgICBzZWdtZW50cy5hcHBlbmQo Rmxvd0NvbnRlbnRzOjpTZWdtZW50IHsgc3RhcnRQb3NpdGlvbiwgc3RhcnRQb3NpdGlvbiArIHRl eHRMZW5ndGgsIHRleHRDaGlsZC50ZXh0KCksIHRleHRDaGlsZCB9KTsKLSAgICAgICAgc3RhcnRQ b3NpdGlvbiArPSB0ZXh0TGVuZ3RoOworICAgICAgICB9IGVsc2UgaWYgKGlzPFJlbmRlclRleHQ+ KGNoaWxkKSkgeworICAgICAgICAgICAgY29uc3QgYXV0byYgdGV4dENoaWxkID0gZG93bmNhc3Q8 UmVuZGVyVGV4dD4oY2hpbGQpOworICAgICAgICAgICAgdW5zaWduZWQgdGV4dExlbmd0aCA9IHRl eHRDaGlsZC50ZXh0KCktPmxlbmd0aCgpOworICAgICAgICAgICAgc2VnbWVudHMuYXBwZW5kKEZs b3dDb250ZW50czo6U2VnbWVudCB7IHN0YXJ0UG9zaXRpb24sIHN0YXJ0UG9zaXRpb24gKyB0ZXh0 TGVuZ3RoLCB0ZXh0Q2hpbGQudGV4dCgpLCB0ZXh0Q2hpbGQgfSk7CisgICAgICAgICAgICBzdGFy dFBvc2l0aW9uICs9IHRleHRMZW5ndGg7CisgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgQVNT RVJUX05PVF9SRUFDSEVEKCk7CiAgICAgfQogICAgIHJldHVybiBzZWdtZW50czsKIH0K 254846 2015-06-12 19:00:52 -0700 2015-06-12 20:25:36 -0700 Patch bug-145942-20150612190021.patch text/plain 2889 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1NTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGEwMTRhYTg5MjE0NWY2 MTg0ZTI4OWFjZDc3ZWJlZjUxYWE5MjllZS4uZTBlNWQ3ZWJhYWNjZTAxOGI4NjU2NTMwMmM3ZDUz ZTYyMWI0MGY2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE1LTA2LTEyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgQmUgbW9yZSBkZWZlbnNpdmUg YXQgcmVuZGVyZXIgdHlwZSBjaGVja2luZyB3aGVuIGluaXRpYWxpemluZyBmbG93IHNlZ21lbnRz LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1OTQy CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgIEZsb3dDb250 ZW50czo6aW5pdGlhbGl6ZVNlZ21lbnRzIHNob3VsZCBpZ25vcmUgdW5zdXBwb3J0ZWQgcmVuZGVy ZXJzIHNvIHRoYXQgd2hlbiB3ZSBtaXNzCisgICAgICAgIGEgc2ltcGxlIGxpbmUgbGF5b3V0IHBh dGggaW52YWxpZGF0aW9uLCB3ZSBkb24ndCBkb3duY2FzdCB0aGUgdW5zdXBwb3J0ZWQgcmVuZGVy ZXIgdG8gUmVuZGVyVGV4dC4KKworICAgICAgICBJIGhhdmUgbm90IHJlcHJvZHVjZWQgdGhpcyBp c3N1ZSAoYnV0IHJlbGF0ZWQgdG8gcmRhcjovL3Byb2JsZW0vMjEzMTI0NTIpCisKKyAgICAgICAg KiByZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZsb3dDb250ZW50cy5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0Ojppbml0aWFsaXplU2VnbWVudHMpOgorCiAyMDE1LTA2 LTEyICBNYW51ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgogCiAgICAgICAg IFtDU1MgR3JpZCBMYXlvdXRdIEZpeCBncmlkLXRlbXBsYXRlLWFyZWFzIHBhcnNpbmcgdG8gYXZv aWQgc3BhY2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGlu ZUxheW91dEZsb3dDb250ZW50cy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxl TGluZUxheW91dEZsb3dDb250ZW50cy5jcHAKaW5kZXggZGIwYTg5YjYzYTUwZDRjZDUwNDkwZWRl MzcwNDA0NzhlNDY1YWJiMi4uZDhhMmQ2ZjNlOWI5YzA2NDAxMmJmNGQ5NjYwOWJjYWYxMjRiODc4 ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRG bG93Q29udGVudHMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5l TGF5b3V0Rmxvd0NvbnRlbnRzLmNwcApAQCAtMzYsNyArMzYsNiBAQCBuYW1lc3BhY2UgU2ltcGxl TGluZUxheW91dCB7CiAKIHN0YXRpYyBWZWN0b3I8Rmxvd0NvbnRlbnRzOjpTZWdtZW50PiBpbml0 aWFsaXplU2VnbWVudHMoY29uc3QgUmVuZGVyQmxvY2tGbG93JiBmbG93KQogewotCiAgICAgdW5z aWduZWQgbnVtYmVyT2ZDaGlsZHJlbiA9IDA7CiAgICAgYXV0byBjaGlsZHJlbiA9IGNoaWxkcmVu T2ZUeXBlPFJlbmRlck9iamVjdD4oZmxvdyk7CiAgICAgZm9yIChhdXRvIGl0ID0gY2hpbGRyZW4u YmVnaW4oKSwgZW5kID0gY2hpbGRyZW4uZW5kKCk7IGl0ICE9IGVuZDsgKytpdCkKQEAgLTQ1LDE1 ICs0NCwxOCBAQCBzdGF0aWMgVmVjdG9yPEZsb3dDb250ZW50czo6U2VnbWVudD4gaW5pdGlhbGl6 ZVNlZ21lbnRzKGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgZgogICAgIHNlZ21lbnRzLnJlc2VydmVD YXBhY2l0eShudW1iZXJPZkNoaWxkcmVuKTsKICAgICB1bnNpZ25lZCBzdGFydFBvc2l0aW9uID0g MDsKICAgICBmb3IgKGNvbnN0IGF1dG8mIGNoaWxkIDogY2hpbGRyZW5PZlR5cGU8UmVuZGVyT2Jq ZWN0PihmbG93KSkgeworICAgICAgICBpZiAoaXM8UmVuZGVyVGV4dD4oY2hpbGQpKSB7CisgICAg ICAgICAgICBjb25zdCBhdXRvJiB0ZXh0Q2hpbGQgPSBkb3duY2FzdDxSZW5kZXJUZXh0PihjaGls ZCk7CisgICAgICAgICAgICB1bnNpZ25lZCB0ZXh0TGVuZ3RoID0gdGV4dENoaWxkLnRleHQoKS0+ bGVuZ3RoKCk7CisgICAgICAgICAgICBzZWdtZW50cy5hcHBlbmQoRmxvd0NvbnRlbnRzOjpTZWdt ZW50IHsgc3RhcnRQb3NpdGlvbiwgc3RhcnRQb3NpdGlvbiArIHRleHRMZW5ndGgsIHRleHRDaGls ZC50ZXh0KCksIHRleHRDaGlsZCB9KTsKKyAgICAgICAgICAgIHN0YXJ0UG9zaXRpb24gKz0gdGV4 dExlbmd0aDsKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CiAgICAgICAgIGlmIChp czxSZW5kZXJMaW5lQnJlYWs+KGNoaWxkKSkgewogICAgICAgICAgICAgc2VnbWVudHMuYXBwZW5k KEZsb3dDb250ZW50czo6U2VnbWVudCB7IHN0YXJ0UG9zaXRpb24sIHN0YXJ0UG9zaXRpb24sIFN0 cmluZygpLCBjaGlsZCB9KTsKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9Ci0gICAg ICAgIEFTU0VSVChpczxSZW5kZXJUZXh0PihjaGlsZCkpOwotICAgICAgICBjb25zdCBhdXRvJiB0 ZXh0Q2hpbGQgPSBkb3duY2FzdDxSZW5kZXJUZXh0PihjaGlsZCk7Ci0gICAgICAgIHVuc2lnbmVk IHRleHRMZW5ndGggPSB0ZXh0Q2hpbGQudGV4dCgpLT5sZW5ndGgoKTsKLSAgICAgICAgc2VnbWVu dHMuYXBwZW5kKEZsb3dDb250ZW50czo6U2VnbWVudCB7IHN0YXJ0UG9zaXRpb24sIHN0YXJ0UG9z aXRpb24gKyB0ZXh0TGVuZ3RoLCB0ZXh0Q2hpbGQudGV4dCgpLCB0ZXh0Q2hpbGQgfSk7Ci0gICAg ICAgIHN0YXJ0UG9zaXRpb24gKz0gdGV4dExlbmd0aDsKKyAgICAgICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7CiAgICAgfQogICAgIHJldHVybiBzZWdtZW50czsKIH0K