129461 2014-02-27 16:31:02 -0800 [CSS Shapes] Update line segments for ShapeInside only if the new line is wide enough 2014-02-28 10:09:14 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zoltan zoltan commit-queue esprehn+autocc glenn kondapallykalyan oldest_to_newest 985407 0 zoltan 2014-02-27 16:31:02 -0800 Shape-inside can make a line only narrower than the original line width, thus we don't need to update the line/shape segments in fitBelowFloats for every single line inside shape-inside. This patch adds a helper function, which updates the line segments, furthermore it updates the line segments only when the content would fit without the shape. 985410 1 225427 zoltan 2014-02-27 16:34:44 -0800 Created attachment 225427 Patch 985597 2 225427 hyatt 2014-02-28 09:32:28 -0800 Comment on attachment 225427 Patch r=me 985620 3 225427 commit-queue 2014-02-28 10:09:11 -0800 Comment on attachment 225427 Patch Clearing flags on attachment: 225427 Committed r164868: <http://trac.webkit.org/changeset/164868> 985621 4 commit-queue 2014-02-28 10:09:14 -0800 All reviewed patches have been landed. Closing bug. 225427 2014-02-27 16:34:44 -0800 2014-02-28 10:09:11 -0800 Patch updateLine.patch text/plain 6216 zoltan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjNzVmNjc5Li5mNDcxMzY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjUg QEAKIDIwMTQtMDItMjcgIFpvbHRhbiBIb3J2YXRoICA8em9sdGFuQHdlYmtpdC5vcmc+CiAKKyAg ICAgICAgW0NTUyBTaGFwZXNdIFVwZGF0ZSBsaW5lIHNlZ21lbnRzIGZvciBTaGFwZUluc2lkZSBv bmx5IGlmIHRoZSBuZXcgbGluZSBpcyB3aWRlIGVub3VnaAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI5NDYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2hhcGUtaW5zaWRlIGNhbiBtYWtlIGEgbGluZSBv bmx5IG5hcnJvd2VyIHRoYW4gdGhlIG9yaWdpbmFsIGxpbmUgd2lkdGgsIHRodXMgd2UgZG9uJ3Qg bmVlZAorICAgICAgICB0byB1cGRhdGUgdGhlIGxpbmUvc2hhcGUgc2VnbWVudHMgaW4gZml0QmVs b3dGbG9hdHMgZm9yIGV2ZXJ5IHNpbmdsZSBsaW5lIGluc2lkZSBzaGFwZS1pbnNpZGUuCisgICAg ICAgIFRoaXMgcGF0Y2ggYWRkcyBhIGhlbHBlciBmdW5jdGlvbiwgd2hpY2ggdXBkYXRlcyB0aGUg bGluZSBzZWdtZW50cywgZnVydGhlcm1vcmUgaXQgdXBkYXRlcyB0aGUKKyAgICAgICAgbGluZSBz ZWdtZW50cyBvbmx5IHdoZW4gdGhlIGNvbnRlbnQgd291bGQgZml0IHdpdGhvdXQgdGhlIHNoYXBl LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gYmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAg ICogcmVuZGVyaW5nL2xpbmUvQnJlYWtpbmdDb250ZXh0SW5saW5lSGVhZGVycy5oOiBVc2UgbmV3 IGhlbHBlci4KKyAgICAgICAgKFdlYkNvcmU6OnVwZGF0ZVNlZ21lbnRzRm9yU2hhcGVzKToKKyAg ICAgICAgKiByZW5kZXJpbmcvbGluZS9MaW5lV2lkdGguY3BwOiBVc2UgbmV3IGhlbHBlci4KKyAg ICAgICAgKFdlYkNvcmU6OkxpbmVXaWR0aDo6dXBkYXRlTGluZVNlZ21lbnQpOiBBZGQgbmV3IGhl bHBlci4KKyAgICAgICAgKFdlYkNvcmU6OkxpbmVXaWR0aDo6Zml0QmVsb3dGbG9hdHMpOgorCisy MDE0LTAyLTI3ICBab2x0YW4gSG9ydmF0aCAgPHpvbHRhbkB3ZWJraXQub3JnPgorCiAgICAgICAg IEF2b2lkIGNhbGxpbmcgbG9naWNhbExlZnRPZmZzZXRGb3JMaW5lIDIgdGltZXMgaW4gTGluZVdp ZHRoOjpmaXRCZWxvd0Zsb2F0cwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTI5NDMzCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9saW5lL0JyZWFraW5nQ29udGV4dElubGluZUhlYWRlcnMuaCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9saW5lL0JyZWFraW5nQ29udGV4dElubGluZUhlYWRlcnMuaAppbmRleCA4OWY3MjY2 Li45ZTg5Y2RmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9CcmVh a2luZ0NvbnRleHRJbmxpbmVIZWFkZXJzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L2xpbmUvQnJlYWtpbmdDb250ZXh0SW5saW5lSGVhZGVycy5oCkBAIC00NjEsNiArNDYxLDcgQEAg aW5saW5lIGZsb2F0IGZpcnN0UG9zaXRpdmVXaWR0aChjb25zdCBXb3JkTWVhc3VyZW1lbnRzJiB3 b3JkTWVhc3VyZW1lbnRzKQogfQogCiAjaWYgRU5BQkxFKENTU19TSEFQRVMpICYmIEVOQUJMRShD U1NfU0hBUEVfSU5TSURFKQorLy8gRklYTUU6IFdlIGNhbiBtb3ZlIHRoaXMgZnVuY3Rpb24gJiBs b2dpYyBpbnRvIExpbmVXaWR0aDo6Zml0QmVsb3dGbG9hdHMKIGlubGluZSB2b2lkIHVwZGF0ZVNl Z21lbnRzRm9yU2hhcGVzKFJlbmRlckJsb2NrRmxvdyYgYmxvY2ssIGNvbnN0IEZsb2F0aW5nT2Jq ZWN0KiBsYXN0RmxvYXRGcm9tUHJldmlvdXNMaW5lLCBjb25zdCBXb3JkTWVhc3VyZW1lbnRzJiB3 b3JkTWVhc3VyZW1lbnRzLCBMaW5lV2lkdGgmIHdpZHRoLCBib29sIGlzRmlyc3RMaW5lKQogewog ICAgIEFTU0VSVChsYXN0RmxvYXRGcm9tUHJldmlvdXNMaW5lKTsKQEAgLTQ5NSwxMSArNDk2LDcg QEAgaW5saW5lIHZvaWQgdXBkYXRlU2VnbWVudHNGb3JTaGFwZXMoUmVuZGVyQmxvY2tGbG93JiBi bG9jaywgY29uc3QgRmxvYXRpbmdPYmplY3QKICAgICAgICAgYmxvY2suc2V0TG9naWNhbEhlaWdo dChzaGFwZUluc2lkZUluZm8tPmxvZ2ljYWxMaW5lVG9wKCkgLSBsb2dpY2FsT2Zmc2V0RnJvbVNo YXBlQ29udGFpbmVyKTsKICAgICB9CiAKLSAgICBsaW5lTG9naWNhbFRvcCA9IGJsb2NrLmxvZ2lj YWxIZWlnaHQoKSArIGxvZ2ljYWxPZmZzZXRGcm9tU2hhcGVDb250YWluZXI7Ci0KLSAgICBzaGFw ZUluc2lkZUluZm8tPnVwZGF0ZVNlZ21lbnRzRm9yTGluZShsaW5lTG9naWNhbFRvcCwgbGluZUxv Z2ljYWxIZWlnaHQpOwotICAgIHdpZHRoLnVwZGF0ZUN1cnJlbnRTaGFwZVNlZ21lbnQoKTsKLSAg ICB3aWR0aC51cGRhdGVBdmFpbGFibGVXaWR0aCgpOworICAgIHdpZHRoLnVwZGF0ZUxpbmVTZWdt ZW50KGJsb2NrLmxvZ2ljYWxIZWlnaHQoKSk7CiB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUvTGluZVdpZHRoLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9saW5lL0xpbmVXaWR0aC5jcHAKaW5kZXggNTA1OGVhOC4uOTMzZTFmYiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUvTGluZVdpZHRoLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9MaW5lV2lkdGguY3BwCkBAIC0yMTYsNiAr MjE2LDIxIEBAIHZvaWQgTGluZVdpZHRoOjp3cmFwTmV4dFRvU2hhcGVPdXRzaWRlKGJvb2wgaXNG aXJzdExpbmUpCiAgICAgfQogICAgIHVwZGF0ZUxpbmVEaW1lbnNpb24obmV3TGluZVRvcCwgbmV3 TGluZVdpZHRoLCBuZXdMaW5lTGVmdCwgbmV3TGluZVJpZ2h0KTsKIH0KKworI2lmIEVOQUJMRShD U1NfU0hBUEVfSU5TSURFKQordm9pZCBMaW5lV2lkdGg6OnVwZGF0ZUxpbmVTZWdtZW50KGNvbnN0 IExheW91dFVuaXQmIGxpbmVUb3ApCit7CisgICAgU2hhcGVJbnNpZGVJbmZvKiBzaGFwZUluc2lk ZUluZm8gPSBtX2Jsb2NrLmxheW91dFNoYXBlSW5zaWRlSW5mbygpOworICAgIGlmICghc2hhcGVJ bnNpZGVJbmZvKQorICAgICAgICByZXR1cm47CisKKyAgICBMYXlvdXRVbml0IGxvZ2ljYWxPZmZz ZXRGcm9tU2hhcGVDb250YWluZXIgPSBtX2Jsb2NrLmxvZ2ljYWxPZmZzZXRGcm9tU2hhcGVBbmNl c3RvckNvbnRhaW5lcigmc2hhcGVJbnNpZGVJbmZvLT5vd25lcigpKS5oZWlnaHQoKTsKKyAgICBM YXlvdXRVbml0IGxpbmVIZWlnaHQgPSBtX2Jsb2NrLmxpbmVIZWlnaHQoZmFsc2UsIG1fYmxvY2su aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IEhvcml6b250YWxMaW5lIDogVmVydGljYWxMaW5l LCBQb3NpdGlvbk9mSW50ZXJpb3JMaW5lQm94ZXMpOworICAgIHNoYXBlSW5zaWRlSW5mby0+dXBk YXRlU2VnbWVudHNGb3JMaW5lKGxpbmVUb3AgKyBsb2dpY2FsT2Zmc2V0RnJvbVNoYXBlQ29udGFp bmVyLCBsaW5lSGVpZ2h0KTsKKyAgICB1cGRhdGVDdXJyZW50U2hhcGVTZWdtZW50KCk7CisgICAg dXBkYXRlQXZhaWxhYmxlV2lkdGgoKTsKK30KKyNlbmRpZgogI2VuZGlmCiAKIHZvaWQgTGluZVdp ZHRoOjpmaXRCZWxvd0Zsb2F0cyhib29sIGlzRmlyc3RMaW5lKQpAQCAtMjQ3LDE4ICsyNjIsMTIg QEAgdm9pZCBMaW5lV2lkdGg6OmZpdEJlbG93RmxvYXRzKGJvb2wgaXNGaXJzdExpbmUpCiAgICAg ICAgIG5ld0xpbmVXaWR0aCA9IGF2YWlsYWJsZVdpZHRoQXRPZmZzZXQobV9ibG9jaywgZmxvYXRM b2dpY2FsQm90dG9tLCBzaG91bGRJbmRlbnRUZXh0KCksIG5ld0xpbmVMZWZ0LCBuZXdMaW5lUmln aHQpOwogICAgICAgICBsYXN0RmxvYXRMb2dpY2FsQm90dG9tID0gZmxvYXRMb2dpY2FsQm90dG9t OwogCisgICAgICAgIGlmIChuZXdMaW5lV2lkdGggPj0gbV91bmNvbW1pdHRlZFdpZHRoKSB7CiAj aWYgRU5BQkxFKENTU19TSEFQRVMpICYmIEVOQUJMRShDU1NfU0hBUEVfSU5TSURFKQotICAgICAg ICBTaGFwZUluc2lkZUluZm8qIHNoYXBlSW5zaWRlSW5mbyA9IG1fYmxvY2subGF5b3V0U2hhcGVJ bnNpZGVJbmZvKCk7Ci0gICAgICAgIGlmIChzaGFwZUluc2lkZUluZm8pIHsKLSAgICAgICAgICAg IExheW91dFVuaXQgbG9naWNhbE9mZnNldEZyb21TaGFwZUNvbnRhaW5lciA9IG1fYmxvY2subG9n aWNhbE9mZnNldEZyb21TaGFwZUFuY2VzdG9yQ29udGFpbmVyKCZzaGFwZUluc2lkZUluZm8tPm93 bmVyKCkpLmhlaWdodCgpOwotICAgICAgICAgICAgTGF5b3V0VW5pdCBsaW5lSGVpZ2h0ID0gbV9i bG9jay5saW5lSGVpZ2h0KGZhbHNlLCBtX2Jsb2NrLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkg PyBIb3Jpem9udGFsTGluZSA6IFZlcnRpY2FsTGluZSwgUG9zaXRpb25PZkludGVyaW9yTGluZUJv eGVzKTsKLSAgICAgICAgICAgIHNoYXBlSW5zaWRlSW5mby0+dXBkYXRlU2VnbWVudHNGb3JMaW5l KGxhc3RGbG9hdExvZ2ljYWxCb3R0b20gKyBsb2dpY2FsT2Zmc2V0RnJvbVNoYXBlQ29udGFpbmVy LCBsaW5lSGVpZ2h0KTsKLSAgICAgICAgICAgIHVwZGF0ZUN1cnJlbnRTaGFwZVNlZ21lbnQoKTsK LSAgICAgICAgICAgIHVwZGF0ZUF2YWlsYWJsZVdpZHRoKCk7Ci0gICAgICAgIH0KKyAgICAgICAg ICAgIHVwZGF0ZUxpbmVTZWdtZW50KGxhc3RGbG9hdExvZ2ljYWxCb3R0b20pOwogI2VuZGlmCi0g ICAgICAgIGlmIChuZXdMaW5lV2lkdGggPj0gbV91bmNvbW1pdHRlZFdpZHRoKQogICAgICAgICAg ICAgYnJlYWs7CisgICAgICAgIH0KICAgICB9CiAKICAgICB1cGRhdGVMaW5lRGltZW5zaW9uKGxh c3RGbG9hdExvZ2ljYWxCb3R0b20sIG5ld0xpbmVXaWR0aCwgbmV3TGluZUxlZnQsIG5ld0xpbmVS aWdodCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9MaW5lV2lk dGguaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9saW5lL0xpbmVXaWR0aC5oCmluZGV4IGEx OWUwZTEuLmM1ZjIzYjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9saW5l L0xpbmVXaWR0aC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9saW5lL0xpbmVXaWR0 aC5oCkBAIC02NiwxOSArNjYsMjAgQEAgcHVibGljOgogICAgIHZvaWQgYXBwbHlPdmVyaGFuZyhS ZW5kZXJSdWJ5UnVuKiwgUmVuZGVyT2JqZWN0KiBzdGFydFJlbmRlcmVyLCBSZW5kZXJPYmplY3Qq IGVuZFJlbmRlcmVyKTsKICAgICB2b2lkIGZpdEJlbG93RmxvYXRzKGJvb2wgaXNGaXJzdExpbmUg PSBmYWxzZSk7CiAgICAgdm9pZCBzZXRUcmFpbGluZ1doaXRlc3BhY2VXaWR0aChmbG9hdCBjb2xs YXBzZWRXaGl0ZXNwYWNlLCBmbG9hdCBib3JkZXJQYWRkaW5nTWFyZ2luID0gMCk7Ci0KKyAgICBi b29sIHNob3VsZEluZGVudFRleHQoKSBjb25zdCB7IHJldHVybiBtX3Nob3VsZEluZGVudFRleHQg PT0gSW5kZW50VGV4dDsgfQogI2lmIEVOQUJMRShDU1NfU0hBUEVTKSAmJiBFTkFCTEUoQ1NTX1NI QVBFX0lOU0lERSkKLSAgICB2b2lkIHVwZGF0ZUN1cnJlbnRTaGFwZVNlZ21lbnQoKTsKKyAgICB2 b2lkIHVwZGF0ZUxpbmVTZWdtZW50KGNvbnN0IExheW91dFVuaXQmKTsKICNlbmRpZgogCi0gICAg Ym9vbCBzaG91bGRJbmRlbnRUZXh0KCkgY29uc3QgeyByZXR1cm4gbV9zaG91bGRJbmRlbnRUZXh0 ID09IEluZGVudFRleHQ7IH0KLQogcHJpdmF0ZToKICAgICB2b2lkIGNvbXB1dGVBdmFpbGFibGVX aWR0aEZyb21MZWZ0QW5kUmlnaHQoKTsKICAgICBib29sIGZpdHNPbkxpbmVFeGNsdWRpbmdUcmFp bGluZ0NvbGxhcHNlZFdoaXRlc3BhY2UoKSBjb25zdDsKICAgICB2b2lkIHVwZGF0ZUxpbmVEaW1l bnNpb24oTGF5b3V0VW5pdCBuZXdMaW5lVG9wLCBMYXlvdXRVbml0IG5ld0xpbmVXaWR0aCwgZmxv YXQgbmV3TGluZUxlZnQsIGZsb2F0IG5ld0xpbmVSaWdodCk7CiAjaWYgRU5BQkxFKENTU19TSEFQ RVMpCiAgICAgdm9pZCB3cmFwTmV4dFRvU2hhcGVPdXRzaWRlKGJvb2wgaXNGaXJzdExpbmUpOwor I2lmIEVOQUJMRShDU1NfU0hBUEVfSU5TSURFKQorICAgIHZvaWQgdXBkYXRlQ3VycmVudFNoYXBl U2VnbWVudCgpOworI2VuZGlmCiAjZW5kaWYKIAogICAgIFJlbmRlckJsb2NrRmxvdyYgbV9ibG9j azsK