167705 2017-02-01 13:11:24 -0800 Simple line layout: Move TextFragmentIterator::runWidth to ::textWidth. 2017-02-01 14:27:28 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue esprehn+autocc glenn koivisto kondapallykalyan mmaxfield simon.fraser webkit-bug-importer zalan oldest_to_newest 1272243 0 zalan 2017-02-01 13:11:24 -0800 No one else calls runWidth. 1272244 1 webkit-bug-importer 2017-02-01 13:12:55 -0800 <rdar://problem/30314393> 1272247 2 300347 zalan 2017-02-01 13:15:09 -0800 Created attachment 300347 Patch 1272249 3 300347 koivisto 2017-02-01 13:18:06 -0800 Comment on attachment 300347 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=300347&action=review > Source/WebCore/rendering/SimpleLineLayout.cpp:607 > + line.setLogicalLeftOffset(flow.logicalLeftOffsetForLine(height, DoNotIndentText) + (shouldApplyTextIndent && isFirstLine ? flow.textIndentOffset() : LayoutUnit(0))); Wonder if that LayoutUnit(0) could be just { 0 } 1272278 4 300347 commit-queue 2017-02-01 14:27:24 -0800 Comment on attachment 300347 Patch Clearing flags on attachment: 300347 Committed r211531: <http://trac.webkit.org/changeset/211531> 1272279 5 commit-queue 2017-02-01 14:27:28 -0800 All reviewed patches have been landed. Closing bug. 300347 2017-02-01 13:15:09 -0800 2017-02-01 14:27:24 -0800 Patch bug-167705-20170201131256.patch text/plain 7241 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjExNDY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjM1OWJlNjEwMmRmNTE1 YTlkMDNkZGIyODZiMTQ4NjJjZjgwZjJkNS4uMmUxY2Y1Yzg1MWMwNmU1YzQzODg5YzBkN2YwM2Q5 MmQ0M2UwNGExNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE3LTAyLTAxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxlIGxpbmUgbGF5b3V0 OiBNb3ZlIFRleHRGcmFnbWVudEl0ZXJhdG9yOjpydW5XaWR0aCB0byA6OnRleHRXaWR0aC4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NzcwNQorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vMzAzMTQzOTM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgYWxzbyBkb24ndCBuZWVkIHRvIGNvbXB1dGUgbG9n aWNhbEhlaWdodCBmb3IgbG9naWNhbExlZnQvcmlnaHQgc2luY2UgdGhlCisgICAgICAgIGNhc2Vz IHdoZXJlIGl0IG1hdHRlcnMgKGZsb2F0aW5nIGJveGVzKSBhcmUgbm90IHN1cHBvcnRlZCBieSBz aW1wbGUgbGluZSBsYXlvdXQuIAorCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdC4K KworICAgICAgICAqIHJlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OnVwZGF0ZUxpbmVDb25zdHJhaW5zKToKKyAgICAgICAg KiByZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dFRleHRGcmFnbWVudEl0ZXJhdG9yLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6Om5leHRCcmVha2FibGVQb3NpdGlvbklu U2VnbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0OjpUZXh0RnJhZ21l bnRJdGVyYXRvcjo6dGV4dFdpZHRoKToKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlv dXQ6OlRleHRGcmFnbWVudEl0ZXJhdG9yOjpydW5XaWR0aCk6IERlbGV0ZWQuCisgICAgICAgICog cmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRUZXh0RnJhZ21lbnRJdGVyYXRvci5oOgorCiAyMDE3 LTAxLTMxICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgU2ltcGxl IGxpbmUgbGF5b3V0OiBEbyBub3QgYXNzZXJ0IG9uIHplcm8gbGVuZ3RoL3dpZHRoIHRyYWlsaW5n IHdoaXRlc3BhY2UuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxl TGluZUxheW91dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91 dC5jcHAKaW5kZXggNzY0ODM0MmFkMTZhNmQ0MWFmYjM2MDI2NzIxYjJhNzAyZmMyYTNiMS4uOGYz ZTEyZDU2OGEyYTM4MzY5NTE0MzcxNTgzZTY0ODgzMDA5MmU4ZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0LmNwcApAQCAtNjA0LDEwICs2MDQsOCBAQCBz dGF0aWMgdm9pZCB1cGRhdGVMaW5lQ29uc3RyYWlucyhjb25zdCBSZW5kZXJCbG9ja0Zsb3cmIGZs b3csIExpbmVTdGF0ZSYgbGluZSwgYwogewogICAgIGJvb2wgc2hvdWxkQXBwbHlUZXh0SW5kZW50 ID0gIWZsb3cuaXNBbm9ueW1vdXMoKSB8fCBmbG93LnBhcmVudCgpLT5maXJzdENoaWxkKCkgPT0g JmZsb3c7CiAgICAgTGF5b3V0VW5pdCBoZWlnaHQgPSBmbG93LmxvZ2ljYWxIZWlnaHQoKTsKLSAg ICBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQgPSBmbG93Lm1pbkxpbmVIZWlnaHRGb3JSZXBsYWNl ZFJlbmRlcmVyKGZhbHNlLCAwKTsKLSAgICBmbG9hdCBsb2dpY2FsUmlnaHRPZmZzZXQgPSBmbG93 LmxvZ2ljYWxSaWdodE9mZnNldEZvckxpbmUoaGVpZ2h0LCBEb05vdEluZGVudFRleHQsIGxvZ2lj YWxIZWlnaHQpOwotICAgIGxpbmUuc2V0TG9naWNhbExlZnRPZmZzZXQoZmxvdy5sb2dpY2FsTGVm dE9mZnNldEZvckxpbmUoaGVpZ2h0LCBEb05vdEluZGVudFRleHQsIGxvZ2ljYWxIZWlnaHQpICsK LSAgICAgICAgKHNob3VsZEFwcGx5VGV4dEluZGVudCAmJiBpc0ZpcnN0TGluZSA/IGZsb3cudGV4 dEluZGVudE9mZnNldCgpIDogTGF5b3V0VW5pdCgwKSkpOworICAgIGxpbmUuc2V0TG9naWNhbExl ZnRPZmZzZXQoZmxvdy5sb2dpY2FsTGVmdE9mZnNldEZvckxpbmUoaGVpZ2h0LCBEb05vdEluZGVu dFRleHQpICsgKHNob3VsZEFwcGx5VGV4dEluZGVudCAmJiBpc0ZpcnN0TGluZSA/IGZsb3cudGV4 dEluZGVudE9mZnNldCgpIDogTGF5b3V0VW5pdCgwKSkpOworICAgIGZsb2F0IGxvZ2ljYWxSaWdo dE9mZnNldCA9IGZsb3cubG9naWNhbFJpZ2h0T2Zmc2V0Rm9yTGluZShoZWlnaHQsIERvTm90SW5k ZW50VGV4dCk7CiAgICAgbGluZS5zZXRBdmFpbGFibGVXaWR0aChzdGQ6Om1heDxmbG9hdD4oMCwg bG9naWNhbFJpZ2h0T2Zmc2V0IC0gbGluZS5sb2dpY2FsTGVmdE9mZnNldCgpKSk7CiAgICAgaWYg KHN0eWxlLnRleHRBbGlnbiA9PSBKVVNUSUZZKQogICAgICAgICBsaW5lLnNldE5lZWRzQWxsRnJh Z21lbnRzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGlu ZUxheW91dFRleHRGcmFnbWVudEl0ZXJhdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9TaW1wbGVMaW5lTGF5b3V0VGV4dEZyYWdtZW50SXRlcmF0b3IuY3BwCmluZGV4IDdhYjM0ZjNi Y2NlNWYzYTA1NDg5NWY2ZDQ2MjIwYjAwNWM3ZTAxYWEuLmVkZjg5YTkxOWMwMDgzYWE4MjVkODdh MDg1NmUwNDNjMGY4ZDUyOTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9T aW1wbGVMaW5lTGF5b3V0VGV4dEZyYWdtZW50SXRlcmF0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0VGV4dEZyYWdtZW50SXRlcmF0b3IuY3BwCkBA IC0xMTksNyArMTE5LDcgQEAgdm9pZCBUZXh0RnJhZ21lbnRJdGVyYXRvcjo6cmV2ZXJ0VG9FbmRP ZkZyYWdtZW50KGNvbnN0IFRleHRGcmFnbWVudCYgZnJhZ21lbnQpCiAgICAgbV9hdEVuZE9mU2Vn bWVudCA9IGZhbHNlOwogfQogCi1zdGF0aWMgdW5zaWduZWQgbmV4dEJyZWFrYWJsZVBvc2l0aW9u SW5TZWdtZW50KExhenlMaW5lQnJlYWtJdGVyYXRvciYgbGluZUJyZWFrSXRlcmF0b3IsIHVuc2ln bmVkIHN0YXJ0UG9zaXRpb24sIGJvb2wgYnJlYWtOQlNQLCBib29sIGtlZXBBbGxXb3Jkc0ZvckNK SykKK3N0YXRpYyBpbmxpbmUgdW5zaWduZWQgbmV4dEJyZWFrYWJsZVBvc2l0aW9uSW5TZWdtZW50 KExhenlMaW5lQnJlYWtJdGVyYXRvciYgbGluZUJyZWFrSXRlcmF0b3IsIHVuc2lnbmVkIHN0YXJ0 UG9zaXRpb24sIGJvb2wgYnJlYWtOQlNQLCBib29sIGtlZXBBbGxXb3Jkc0ZvckNKSykKIHsKICAg ICBpZiAoa2VlcEFsbFdvcmRzRm9yQ0pLKSB7CiAgICAgICAgIGlmIChicmVha05CU1ApCkBAIC0x NjYsMTggKzE2Niw2IEBAIHVuc2lnbmVkIFRleHRGcmFnbWVudEl0ZXJhdG9yOjpuZXh0Tm9uV2hp dGVzcGFjZVBvc2l0aW9uKGNvbnN0IEZsb3dDb250ZW50czo6U2VnCiAgICAgcmV0dXJuIHBvc2l0 aW9uOwogfQogCi1mbG9hdCBUZXh0RnJhZ21lbnRJdGVyYXRvcjo6dGV4dFdpZHRoKHVuc2lnbmVk IGZyb20sIHVuc2lnbmVkIHRvLCBmbG9hdCB4UG9zaXRpb24pIGNvbnN0Ci17Ci0gICAgYXV0byYg c2VnbWVudCA9ICptX2N1cnJlbnRTZWdtZW50OwotICAgIEFTU0VSVChzZWdtZW50LnN0YXJ0IDw9 IGZyb20gJiYgZnJvbSA8PSBzZWdtZW50LmVuZCAmJiBzZWdtZW50LnN0YXJ0IDw9IHRvICYmIHRv IDw9IHNlZ21lbnQuZW5kKTsKLSAgICBBU1NFUlQoaXM8UmVuZGVyVGV4dD4oc2VnbWVudC5yZW5k ZXJlcikpOwotICAgIGlmICghbV9zdHlsZS5mb250LnNpemUoKSkKLSAgICAgICAgcmV0dXJuIDA7 Ci0gICAgaWYgKG1fc3R5bGUuZm9udC5pc0ZpeGVkUGl0Y2goKSB8fCAoZnJvbSA9PSBzZWdtZW50 LnN0YXJ0ICYmIHRvID09IHNlZ21lbnQuZW5kKSkKLSAgICAgICAgcmV0dXJuIGRvd25jYXN0PFJl bmRlclRleHQ+KHNlZ21lbnQucmVuZGVyZXIpLndpZHRoKHNlZ21lbnQudG9TZWdtZW50UG9zaXRp b24oZnJvbSksIHRvIC0gZnJvbSwgbV9zdHlsZS5mb250LCB4UG9zaXRpb24sIG51bGxwdHIsIG51 bGxwdHIpOwotICAgIHJldHVybiBydW5XaWR0aChzZWdtZW50LCBmcm9tLCB0bywgeFBvc2l0aW9u KTsKLX0KLQogc3RkOjpvcHRpb25hbDx1bnNpZ25lZD4gVGV4dEZyYWdtZW50SXRlcmF0b3I6Omxh c3RIeXBoZW5Qb3NpdGlvbihjb25zdCBUZXh0RnJhZ21lbnRJdGVyYXRvcjo6VGV4dEZyYWdtZW50 JiBydW4sIHVuc2lnbmVkIGJlZm9yZSkgY29uc3QKIHsKICAgICBBU1NFUlQocnVuLnN0YXJ0KCkg PCBiZWZvcmUpOwpAQCAtMjQzLDIwICsyMzEsMjUgQEAgdW5zaWduZWQgVGV4dEZyYWdtZW50SXRl cmF0b3I6OnNraXBUb05leHRQb3NpdGlvbihQb3NpdGlvblR5cGUgcG9zaXRpb25UeXBlLCB1bnMK ICAgICByZXR1cm4gbmV4dFBvc2l0aW9uOwogfQogCi1mbG9hdCBUZXh0RnJhZ21lbnRJdGVyYXRv cjo6cnVuV2lkdGgoY29uc3QgRmxvd0NvbnRlbnRzOjpTZWdtZW50JiBzZWdtZW50LCB1bnNpZ25l ZCBzdGFydFBvc2l0aW9uLCB1bnNpZ25lZCBlbmRQb3NpdGlvbiwgZmxvYXQgeFBvc2l0aW9uKSBj b25zdAorZmxvYXQgVGV4dEZyYWdtZW50SXRlcmF0b3I6OnRleHRXaWR0aCh1bnNpZ25lZCBmcm9t LCB1bnNpZ25lZCB0bywgZmxvYXQgeFBvc2l0aW9uKSBjb25zdAogewotICAgIEFTU0VSVChtX3N0 eWxlLmZvbnQuc2l6ZSgpKTsKLSAgICBBU1NFUlQoc3RhcnRQb3NpdGlvbiA8PSBlbmRQb3NpdGlv bik7Ci0gICAgaWYgKHN0YXJ0UG9zaXRpb24gPT0gZW5kUG9zaXRpb24pCisgICAgYXV0byYgc2Vn bWVudCA9ICptX2N1cnJlbnRTZWdtZW50OworICAgIEFTU0VSVChzZWdtZW50LnN0YXJ0IDw9IGZy b20gJiYgZnJvbSA8PSBzZWdtZW50LmVuZCAmJiBzZWdtZW50LnN0YXJ0IDw9IHRvICYmIHRvIDw9 IHNlZ21lbnQuZW5kKTsKKyAgICBBU1NFUlQoaXM8UmVuZGVyVGV4dD4oc2VnbWVudC5yZW5kZXJl cikpOworICAgIGlmICghbV9zdHlsZS5mb250LnNpemUoKSB8fCBmcm9tID09IHRvKQogICAgICAg ICByZXR1cm4gMDsKLSAgICB1bnNpZ25lZCBzZWdtZW50RnJvbSA9IHNlZ21lbnQudG9TZWdtZW50 UG9zaXRpb24oc3RhcnRQb3NpdGlvbik7Ci0gICAgdW5zaWduZWQgc2VnbWVudFRvID0gc2VnbWVu dC50b1NlZ21lbnRQb3NpdGlvbihlbmRQb3NpdGlvbik7CisKKyAgICB1bnNpZ25lZCBzZWdtZW50 RnJvbSA9IHNlZ21lbnQudG9TZWdtZW50UG9zaXRpb24oZnJvbSk7CisgICAgdW5zaWduZWQgc2Vn bWVudFRvID0gc2VnbWVudC50b1NlZ21lbnRQb3NpdGlvbih0byk7CisgICAgaWYgKG1fc3R5bGUu Zm9udC5pc0ZpeGVkUGl0Y2goKSkKKyAgICAgICAgcmV0dXJuIGRvd25jYXN0PFJlbmRlclRleHQ+ KHNlZ21lbnQucmVuZGVyZXIpLndpZHRoKHNlZ21lbnRGcm9tLCBzZWdtZW50VG8gLSBzZWdtZW50 RnJvbSwgbV9zdHlsZS5mb250LCB4UG9zaXRpb24sIG51bGxwdHIsIG51bGxwdHIpOworCiAgICAg Ym9vbCBtZWFzdXJlV2l0aEVuZFNwYWNlID0gbV9zdHlsZS5jb2xsYXBzZVdoaXRlc3BhY2UgJiYg c2VnbWVudFRvIDwgc2VnbWVudC50ZXh0Lmxlbmd0aCgpICYmIHNlZ21lbnQudGV4dFtzZWdtZW50 VG9dID09ICcgJzsKICAgICBpZiAobWVhc3VyZVdpdGhFbmRTcGFjZSkKICAgICAgICAgKytzZWdt ZW50VG87Ci0gICAgVGV4dFJ1biBydW4oU3RyaW5nVmlldyhzZWdtZW50LnRleHQpLnN1YnN0cmlu ZyhzZWdtZW50RnJvbSwgc2VnbWVudFRvIC0gc2VnbWVudEZyb20pKTsKLSAgICBydW4uc2V0WFBv cyh4UG9zaXRpb24pOwotICAgIHJ1bi5zZXRUYWJTaXplKCEhbV9zdHlsZS50YWJXaWR0aCwgbV9z dHlsZS50YWJXaWR0aCk7CisgICAgVGV4dFJ1biBydW4oU3RyaW5nVmlldyhzZWdtZW50LnRleHQp LnN1YnN0cmluZyhzZWdtZW50RnJvbSwgc2VnbWVudFRvIC0gc2VnbWVudEZyb20pLCB4UG9zaXRp b24pOworICAgIGlmIChtX3N0eWxlLnRhYldpZHRoKQorICAgICAgICBydW4uc2V0VGFiU2l6ZSh0 cnVlLCBtX3N0eWxlLnRhYldpZHRoKTsKICAgICBmbG9hdCB3aWR0aCA9IG1fc3R5bGUuZm9udC53 aWR0aChydW4pOwogICAgIGlmIChtZWFzdXJlV2l0aEVuZFNwYWNlKQogICAgICAgICB3aWR0aCAt PSAobV9zdHlsZS5zcGFjZVdpZHRoICsgbV9zdHlsZS53b3JkU3BhY2luZyk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dFRleHRGcmFnbWVudEl0 ZXJhdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dFRleHRG cmFnbWVudEl0ZXJhdG9yLmgKaW5kZXggMDUzM2EzMjhiNjE2NDFhYWVmMjcxMWY4YmFhNDhiMDc1 MTA2M2ZkNC4uNTg1ODA2NTE1OWM5MGEwMmIzODYxMGY2ZmY1NmRiMTc3YzhkOGQwYSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRUZXh0RnJhZ21l bnRJdGVyYXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5 b3V0VGV4dEZyYWdtZW50SXRlcmF0b3IuaApAQCAtMTM2LDcgKzEzNiw2IEBAIHByaXZhdGU6CiAg ICAgYm9vbCBpc0hhcmRMaW5lQnJlYWsoY29uc3QgRmxvd0NvbnRlbnRzOjpJdGVyYXRvciYgc2Vn bWVudCkgY29uc3Q7CiAgICAgdW5zaWduZWQgbmV4dEJyZWFrYWJsZVBvc2l0aW9uKGNvbnN0IEZs b3dDb250ZW50czo6U2VnbWVudCYsIHVuc2lnbmVkIHN0YXJ0UG9zaXRpb24pOwogICAgIHVuc2ln bmVkIG5leHROb25XaGl0ZXNwYWNlUG9zaXRpb24oY29uc3QgRmxvd0NvbnRlbnRzOjpTZWdtZW50 JiwgdW5zaWduZWQgc3RhcnRQb3NpdGlvbik7Ci0gICAgZmxvYXQgcnVuV2lkdGgoY29uc3QgRmxv d0NvbnRlbnRzOjpTZWdtZW50JiwgdW5zaWduZWQgc3RhcnRQb3NpdGlvbiwgdW5zaWduZWQgZW5k UG9zaXRpb24sIGZsb2F0IHhQb3NpdGlvbikgY29uc3Q7CiAKICAgICBGbG93Q29udGVudHMgbV9m bG93Q29udGVudHM7CiAgICAgRmxvd0NvbnRlbnRzOjpJdGVyYXRvciBtX2N1cnJlbnRTZWdtZW50 Owo=