123934 2013-11-06 15:25:00 -0800 [CSS Shapes] Image shape-outside with vertical gaps is handled incorrectly 2013-11-07 19:48:54 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 116348 1 giles_joplin giles_joplin commit-queue esprehn+autocc glenn kling kondapallykalyan oldest_to_newest 947953 0 216233 giles_joplin 2013-11-06 15:25:00 -0800 Created attachment 216233 Test case. When a line overlaps a shape-outside image that contains a vertical gap it's incorrectly laid out as if there's no overlap at all. The attached test case demonstrates this. 947987 1 216242 giles_joplin 2013-11-06 16:51:54 -0800 Created attachment 216242 Patch RasterShapeIntervals::getExcludedIntervals() was returning an empty list when the line overlapped any vertical gap in the image. This short-circuit had been mistakenly copied from getIncludedIntervals(), where it makes sense. 948509 2 216242 kling 2013-11-07 18:31:38 -0800 Comment on attachment 216242 Patch r=me 948525 3 216242 commit-queue 2013-11-07 19:48:53 -0800 Comment on attachment 216242 Patch Clearing flags on attachment: 216242 Committed r158898: <http://trac.webkit.org/changeset/158898> 948526 4 commit-queue 2013-11-07 19:48:54 -0800 All reviewed patches have been landed. Closing bug. 216233 2013-11-06 15:25:00 -0800 2013-11-06 15:25:00 -0800 Test case. shape-outside-bug.html text/html 841 giles_joplin PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8aGVhZD4KPHN0eWxlPgogICAgI2NvbnRlbnQgewogICAg ICAgIGZvbnQtc2l6ZTogMzBweDsKICAgICAgICBjb2xvcjogZ3JlZW47CiAgICB9CgogICAgI2lt YWdlLXNoYXBlIHsKICAgICAgICBmbG9hdDogbGVmdDsKICAgICAgICAtd2Via2l0LXNoYXBlLW91 dHNpZGU6IHVybCgiZGF0YTppbWFnZS9zdmcreG1sO3V0ZjgsPHN2ZyB4bWxucz0naHR0cDovL3d3 dy53My5vcmcvMjAwMC9zdmcnIHdpZHRoPScxMDBweCcgaGVpZ2h0PScxMDBweCc+PHJlY3QgeD0n MCcgeT0nMCcgd2lkdGg9JzEwMCcgaGVpZ2h0PScxMCcgZmlsbD0nYmx1ZScvPjxyZWN0IHg9JzAn IHk9JzkwJyB3aWR0aD0nMTAwJyBoZWlnaHQ9JzEwJyBmaWxsPSdibHVlJy8+PC9zdmc+Iik7CiAg ICB9Cjwvc3R5bGU+CjwvaGVhZD4KPGJvZHk+CiAgPHA+VGhlIGxpbmVzIG9mIHRleHQgYmVsb3cg c2hvdWxkIGFwcGVhciB0byB0aGUgcmlnaHQgb2YgdGhlIHRoaW4gYmx1ZSByZWN0YW5nbGVzLjwv cD4KICA8ZGl2IGlkPSJjb250ZW50Ij4KICAgICAgPElNRyBpZD0iaW1hZ2Utc2hhcGUiIHNyYz0i ZGF0YTppbWFnZS9zdmcreG1sO3V0ZjgsPHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAw MC9zdmcnIHdpZHRoPScxMDBweCcgaGVpZ2h0PScxMDBweCc+PHJlY3QgeD0nMCcgeT0nMCcgd2lk dGg9JzEwMCcgaGVpZ2h0PScxMCcgZmlsbD0nYmx1ZScvPjxyZWN0IHg9JzAnIHk9JzkwJyB3aWR0 aD0nMTAwJyBoZWlnaHQ9JzEwJyBmaWxsPSdibHVlJy8+PC9zdmc+Ij4KICAgICAgT25lPGJyPlR3 bzxicj5GcmVlPGJyPkZvdXIKICA8L2Rpdj4KPC9ib2R5Pgo8L2h0bWw+Cg== 216242 2013-11-06 16:51:54 -0800 2013-11-07 19:48:53 -0800 Patch tmp.patch text/plain 4326 giles_joplin ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBlOTA2MWVmLi5iOGRlODZkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTMtMTEt MDYgIEhhbnMgTXVsbGVyICA8aG11bGxlckBhZG9iZS5jb20+CisKKyAgICAgICAgW0NTUyBTaGFw ZXNdIEltYWdlIHNoYXBlLW91dHNpZGUgd2l0aCB2ZXJ0aWNhbCBnYXBzIGlzIGhhbmRsZWQgaW5j b3JyZWN0bHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEyMzkzNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1mbG9hdHMt aW1hZ2UtdmdhcC1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3NoYXBlcy9z aGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLWZsb2F0cy1pbWFnZS12Z2FwLmh0bWw6 IEFkZGVkLgorCiAyMDEzLTExLTA2ICBPbGl2ZXIgSHVudCAgPG9saXZlckBhcHBsZS5jb20+CiAK ICAgICAgICAgRml4IHRlc3QgY2FzZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9zaGFw ZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1mbG9hdHMtaW1hZ2UtdmdhcC1l eHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9h dHMvc2hhcGUtb3V0c2lkZS1mbG9hdHMtaW1hZ2UtdmdhcC1leHBlY3RlZC5odG1sCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjEwZjkxZmMKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRl LWZsb2F0cy1pbWFnZS12Z2FwLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwyMiBAQAorPCFET0NU WVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHN0eWxlPgorICAgICNjb250ZW50IHsKKyAgICAg ICAgZm9udC1zaXplOiAzMHB4OworICAgICAgICBjb2xvcjogZ3JlZW47CisgICAgfQorCisgICAg I2ltYWdlLXNoYXBlIHsKKyAgICAgICAgZmxvYXQ6IGxlZnQ7CisgICAgfQorPC9zdHlsZT4KKzwv aGVhZD4KKzxib2R5PgorICA8cD5UaGUgbGluZXMgb2YgdGV4dCBiZWxvdyBzaG91bGQgYXBwZWFy IHRvIHRoZSByaWdodCBvZiB0aGUgYmx1ZSByZWN0YW5nbGVzLjwvcD4KKyAgPGRpdiBpZD0iY29u dGVudCI+CisgICAgICA8SU1HIGlkPSJpbWFnZS1zaGFwZSIgc3JjPSJkYXRhOmltYWdlL3N2Zyt4 bWw7dXRmOCw8c3ZnIHhtbG5zPSdodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2Zycgd2lkdGg9JzEw MHB4JyBoZWlnaHQ9JzEwMHB4JyBmaWxsPSdibHVlJz48cmVjdCB3aWR0aD0nMTAwJyBoZWlnaHQ9 JzQwJy8+PHJlY3QgeT0nNjAnIHdpZHRoPScxMDAnIGhlaWdodD0nNDAnLz48L3N2Zz4iPgorICAg ICAgT25lPGJyPlR3bzxicj5GcmVlPGJyPkZvdXIKKyAgPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+ CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0 cy9zaGFwZS1vdXRzaWRlLWZsb2F0cy1pbWFnZS12Z2FwLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0 L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLWZsb2F0cy1pbWFnZS12 Z2FwLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZjk5Y2MwNQotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxv YXRzL3NoYXBlLW91dHNpZGUtZmxvYXRzLWltYWdlLXZnYXAuaHRtbApAQCAtMCwwICsxLDIzIEBA Cis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8c3R5bGU+CisgICAgI2NvbnRlbnQg eworICAgICAgICBmb250LXNpemU6IDMwcHg7CisgICAgICAgIGNvbG9yOiBncmVlbjsKKyAgICB9 CisKKyAgICAjaW1hZ2Utc2hhcGUgeworICAgICAgICBmbG9hdDogbGVmdDsKKyAgICAgICAgLXdl YmtpdC1zaGFwZS1vdXRzaWRlOiB1cmwoImRhdGE6aW1hZ2Uvc3ZnK3htbDt1dGY4LDxzdmcgeG1s bnM9J2h0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnJyB3aWR0aD0nMTAwcHgnIGhlaWdodD0nMTAw cHgnPjxyZWN0IHdpZHRoPScxMDAnIGhlaWdodD0nNDAnLz48cmVjdCB5PSc5MCcgd2lkdGg9JzEw MCcgaGVpZ2h0PSc0MCcvPjwvc3ZnPiIpOworICAgIH0KKzwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9k eT4KKyAgPHA+VGhlIGxpbmVzIG9mIHRleHQgYmVsb3cgc2hvdWxkIGFwcGVhciB0byB0aGUgcmln aHQgb2YgdGhlIGJsdWUgcmVjdGFuZ2xlcy48L3A+CisgIDxkaXYgaWQ9ImNvbnRlbnQiPgorICAg ICAgPElNRyBpZD0iaW1hZ2Utc2hhcGUiIHNyYz0iZGF0YTppbWFnZS9zdmcreG1sO3V0ZjgsPHN2 ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHdpZHRoPScxMDBweCcgaGVpZ2h0 PScxMDBweCcgZmlsbD0nYmx1ZSc+PHJlY3Qgd2lkdGg9JzEwMCcgaGVpZ2h0PSc0MCcvPjxyZWN0 IHk9JzYwJyB3aWR0aD0nMTAwJyBoZWlnaHQ9JzQwJy8+PC9zdmc+Ij4KKyAgICAgIE9uZTxicj5U d288YnI+RnJlZTxicj5Gb3VyCisgIDwvZGl2PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmlu ZGV4IGRiMDg3ZDAuLjQ3NTQyOTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMy0x MS0wNiAgSGFucyBNdWxsZXIgIDxobXVsbGVyQGFkb2JlLmNvbT4KKworICAgICAgICBbQ1NTIFNo YXBlc10gSW1hZ2Ugc2hhcGUtb3V0c2lkZSB3aXRoIHZlcnRpY2FsIGdhcHMgaXMgaGFuZGxlZCBp bmNvcnJlY3RseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTIzOTM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgUmFzdGVyU2hhcGVJbnRlcnZhbHM6OmdldEV4Y2x1ZGVkSW50ZXJ2YWxzKCkgd2FzIHJldHVy bmluZyBhbiBlbXB0eQorICAgICAgICBsaXN0IHdoZW4gdGhlIGxpbmUgb3ZlcmxhcHBlZCBhbnkg dmVydGljYWwgZ2FwIGluIHRoZSBpbWFnZS4gVGhpcyBzaG9ydC1jaXJjdWl0CisgICAgICAgIGhh ZCBiZWVuIG1pc3Rha2VubHkgY29waWVkIGZyb20gZ2V0SW5jbHVkZWRJbnRlcnZhbHMoKSwgd2hl cmUgaXQgbWFrZXMgc2Vuc2UuCisKKyAgICAgICAgVGVzdDogZmFzdC9zaGFwZXMvc2hhcGUtb3V0 c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1mbG9hdHMtaW1hZ2UtdmdhcC5odG1sCisKKyAgICAg ICAgKiByZW5kZXJpbmcvc2hhcGVzL1Jhc3RlclNoYXBlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJhc3RlclNoYXBlSW50ZXJ2YWxzOjpnZXRFeGNsdWRlZEludGVydmFscyk6CisKIDIwMTMtMTEt MDYgIEJlbSBKb25lcy1CZXkgIDxiam9uZXNiZUBhZG9iZS5jb20+CiAKICAgICAgICAgUmVuYW1l IHJlZ2lvbiBsaW5lIG9mZnNldCBtZXRob2RzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc2hhcGVzL1Jhc3RlclNoYXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9zaGFwZXMvUmFzdGVyU2hhcGUuY3BwCmluZGV4IGJjY2EwYTguLjkwNTA5Y2IgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvUmFzdGVyU2hhcGUuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvUmFzdGVyU2hhcGUuY3BwCkBAIC0yMDgs MTEgKzIwOCw2IEBAIHZvaWQgUmFzdGVyU2hhcGVJbnRlcnZhbHM6OmdldEV4Y2x1ZGVkSW50ZXJ2 YWxzKGludCB5MSwgaW50IHkyLCBJbnRTaGFwZUludGVydmFsCiAgICAgeTEgPSBzdGQ6Om1heCh5 MSwgYm91bmRzKCkueSgpKTsKICAgICB5MiA9IHN0ZDo6bWluKHkyLCBib3VuZHMoKS5tYXhZKCkp OwogCi0gICAgZm9yIChpbnQgeSA9IHkxOyB5IDwgeTI7ICB5KyspIHsKLSAgICAgICAgaWYgKGlu dGVydmFsc0F0KHkpLmlzRW1wdHkoKSkKLSAgICAgICAgICAgIHJldHVybjsKLSAgICB9Ci0KICAg ICByZXN1bHQgPSBpbnRlcnZhbHNBdCh5MSk7CiAgICAgZm9yIChpbnQgeSA9IHkxICsgMTsgeSA8 IHkyOyAgeSsrKSB7CiAgICAgICAgIEludFNoYXBlSW50ZXJ2YWxzIGludGVydmFsczsK