218029 2020-10-21 09:05:25 -0700 [LFC][Integration] Use LineLayout::containing() in more places 2020-10-21 11:08:20 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned bfulgham changseok esprehn+autocc ews-watchlist glenn kondapallykalyan mmaxfield pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1700209 0 koivisto 2020-10-21 09:05:25 -0700 A netter way to find the line layout. 1700216 1 411995 koivisto 2020-10-21 09:17:25 -0700 Created attachment 411995 patch 1700277 2 ews-feeder 2020-10-21 11:07:14 -0700 Committed r268806: <https://trac.webkit.org/changeset/268806> All reviewed patches have been landed. Closing bug and clearing flags on attachment 411995. 1700279 3 webkit-bug-importer 2020-10-21 11:08:20 -0700 <rdar://problem/70536870> 411995 2020-10-21 09:17:25 -0700 2020-10-21 11:07:15 -0700 patch lfc-linelayout-containing.patch text/plain 5715 koivisto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5NjFhYzMwZmQxZTMuLjZhMDI3YjdjNTMxNSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE5IEBACisyMDIwLTEwLTIxICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNv bT4KKworICAgICAgICBbTEZDXVtJbnRlZ3JhdGlvbl0gVXNlIExpbmVMYXlvdXQ6OmNvbnRhaW5p bmcoKSBpbiBtb3JlIHBsYWNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE4MDI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25SdW5JdGVy YXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6Zmlyc3RUZXh0 UnVuRm9yKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpydW5Gb3IpOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OmxpbmVMYXlvdXRTeXN0ZW1GbG93 Rm9yUmVuZGVyZXIpOiBEZWxldGVkLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUZXh0LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHQ6OnVzZXNDb21wbGV4TGluZUxheW91dFBh dGggY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dDo6bGF5b3V0Rm9ybWF0dGlu Z0NvbnRleHRMaW5lTGF5b3V0IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyVGV4dC5oOgorCiAyMDIwLTEwLTIxICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxl LmNvbT4KIAogICAgICAgICBbTEZDXVtJbnRlZ3JhdGlvbl0gVXBkYXRlIHN0eWxlIG9mIGNvbnRh aW5lZCBsYXlvdXQgYm94ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRl Z3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblJ1bkl0ZXJhdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblJ1bkl0ZXJhdG9yLmNwcAppbmRl eCA5ZmYxMmRlMzBjZDcuLmQ4MjViMTgxODA5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uUnVuSXRlcmF0b3IuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblJ1bkl0 ZXJhdG9yLmNwcApAQCAtMTYwLDIzICsxNjAsMTEgQEAgTGluZVJ1bkl0ZXJhdG9yJiBMaW5lUnVu SXRlcmF0b3I6OnRyYXZlcnNlUHJldmlvdXNPbkxpbmVJZ25vcmluZ0xpbmVCcmVhaygpCiAgICAg cmV0dXJuICp0aGlzOwogfQogCi0jaWYgRU5BQkxFKExBWU9VVF9GT1JNQVRUSU5HX0NPTlRFWFQp Ci1zdGF0aWMgY29uc3QgUmVuZGVyQmxvY2tGbG93KiBsaW5lTGF5b3V0U3lzdGVtRmxvd0ZvclJl bmRlcmVyKGNvbnN0IFJlbmRlck9iamVjdCYgcmVuZGVyZXIpCi17Ci0gICAgLy8gSW4gY3VycmVu dGx5IHN1cHBvcnRlZCBjYXNlcyB0aGUgcmVuZGVyZXIgaXMgYWx3YXlzIGRpcmVjdCBjaGlsZCBv ZiB0aGUgZmxvdy4KLSAgICBpZiAoIWlzPFJlbmRlckJsb2NrRmxvdz4ocmVuZGVyZXIucGFyZW50 KCkpKQotICAgICAgICByZXR1cm4gbnVsbHB0cjsKLSAgICByZXR1cm4gZG93bmNhc3Q8UmVuZGVy QmxvY2tGbG93PihyZW5kZXJlci5wYXJlbnQoKSk7Ci19Ci0jZW5kaWYKLQogVGV4dFJ1bkl0ZXJh dG9yIGZpcnN0VGV4dFJ1bkZvcihjb25zdCBSZW5kZXJUZXh0JiB0ZXh0KQogewogI2lmIEVOQUJM RShMQVlPVVRfRk9STUFUVElOR19DT05URVhUKQotICAgIGlmIChhdXRvKiBmbG93ID0gbGluZUxh eW91dFN5c3RlbUZsb3dGb3JSZW5kZXJlcih0ZXh0KSkgewotICAgICAgICBpZiAoYXV0byogbGF5 b3V0Rm9ybWF0dGluZ0NvbnRleHRMaW5lTGF5b3V0ID0gZmxvdy0+bGF5b3V0Rm9ybWF0dGluZ0Nv bnRleHRMaW5lTGF5b3V0KCkpCi0gICAgICAgICAgICByZXR1cm4gbGF5b3V0Rm9ybWF0dGluZ0Nv bnRleHRMaW5lTGF5b3V0LT50ZXh0UnVuc0Zvcih0ZXh0KTsKLSAgICB9CisgICAgaWYgKGF1dG8q IGxpbmVMYXlvdXQgPSBMaW5lTGF5b3V0Ojpjb250YWluaW5nKHRleHQpKQorICAgICAgICByZXR1 cm4gbGluZUxheW91dC0+dGV4dFJ1bnNGb3IodGV4dCk7CiAjZW5kaWYKIAogICAgIHJldHVybiB7 IFJ1bkl0ZXJhdG9yTGVnYWN5UGF0aCB7IHRleHQuZmlyc3RUZXh0Qm94KCkgfSB9OwpAQCAtMjAx LDI2ICsxODksMjIgQEAgVGV4dFJ1blJhbmdlIHRleHRSdW5zRm9yKGNvbnN0IFJlbmRlclRleHQm IHRleHQpCiAgICAgcmV0dXJuIHsgZmlyc3RUZXh0UnVuRm9yKHRleHQpIH07CiB9CiAKLVJ1bkl0 ZXJhdG9yIHJ1bkZvcihjb25zdCBSZW5kZXJMaW5lQnJlYWsmIHJlbmRlckVsZW1lbnQpCitSdW5J dGVyYXRvciBydW5Gb3IoY29uc3QgUmVuZGVyTGluZUJyZWFrJiByZW5kZXJlcikKIHsKICNpZiBF TkFCTEUoTEFZT1VUX0ZPUk1BVFRJTkdfQ09OVEVYVCkKLSAgICBpZiAoYXV0byogZmxvdyA9IGxp bmVMYXlvdXRTeXN0ZW1GbG93Rm9yUmVuZGVyZXIocmVuZGVyRWxlbWVudCkpIHsKLSAgICAgICAg aWYgKGF1dG8qIGxheW91dEZvcm1hdHRpbmdDb250ZXh0TGluZUxheW91dCA9IGZsb3ctPmxheW91 dEZvcm1hdHRpbmdDb250ZXh0TGluZUxheW91dCgpKQotICAgICAgICAgICAgcmV0dXJuIGxheW91 dEZvcm1hdHRpbmdDb250ZXh0TGluZUxheW91dC0+cnVuRm9yKHJlbmRlckVsZW1lbnQpOwotICAg IH0KKyAgICBpZiAoYXV0byogbGluZUxheW91dCA9IExpbmVMYXlvdXQ6OmNvbnRhaW5pbmcocmVu ZGVyZXIpKQorICAgICAgICByZXR1cm4gbGluZUxheW91dC0+cnVuRm9yKHJlbmRlcmVyKTsKICNl bmRpZgotICAgIHJldHVybiB7IFJ1bkl0ZXJhdG9yTGVnYWN5UGF0aChyZW5kZXJFbGVtZW50Lmlu bGluZUJveFdyYXBwZXIoKSkgfTsKKyAgICByZXR1cm4geyBSdW5JdGVyYXRvckxlZ2FjeVBhdGgo cmVuZGVyZXIuaW5saW5lQm94V3JhcHBlcigpKSB9OwogfQogCi1SdW5JdGVyYXRvciBydW5Gb3Io Y29uc3QgUmVuZGVyQm94JiByZW5kZXJFbGVtZW50KQorUnVuSXRlcmF0b3IgcnVuRm9yKGNvbnN0 IFJlbmRlckJveCYgcmVuZGVyZXIpCiB7CiAjaWYgRU5BQkxFKExBWU9VVF9GT1JNQVRUSU5HX0NP TlRFWFQpCi0gICAgaWYgKGF1dG8qIGZsb3cgPSBsaW5lTGF5b3V0U3lzdGVtRmxvd0ZvclJlbmRl cmVyKHJlbmRlckVsZW1lbnQpKSB7Ci0gICAgICAgIGlmIChhdXRvKiBsYXlvdXRGb3JtYXR0aW5n Q29udGV4dExpbmVMYXlvdXQgPSBmbG93LT5sYXlvdXRGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlv dXQoKSkKLSAgICAgICAgICAgIHJldHVybiBsYXlvdXRGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlv dXQtPnJ1bkZvcihyZW5kZXJFbGVtZW50KTsKLSAgICB9CisgICAgaWYgKGF1dG8qIGxpbmVMYXlv dXQgPSBMaW5lTGF5b3V0Ojpjb250YWluaW5nKHJlbmRlcmVyKSkKKyAgICAgICAgcmV0dXJuIGxp bmVMYXlvdXQtPnJ1bkZvcihyZW5kZXJlcik7CiAjZW5kaWYKLSAgICByZXR1cm4geyBSdW5JdGVy YXRvckxlZ2FjeVBhdGgocmVuZGVyRWxlbWVudC5pbmxpbmVCb3hXcmFwcGVyKCkpIH07CisgICAg cmV0dXJuIHsgUnVuSXRlcmF0b3JMZWdhY3lQYXRoKHJlbmRlcmVyLmlubGluZUJveFdyYXBwZXIo KSkgfTsKIH0KIAogTGluZVJ1bkl0ZXJhdG9yIGxpbmVSdW4oY29uc3QgUnVuSXRlcmF0b3ImIHJ1 bkl0ZXJhdG9yKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRl eHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuY3BwCmluZGV4IDdk Y2ZiZjQyYmM2MS4uM2U3YTNiNzA4YjMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRleHQuY3BwCkBAIC0zOCw2ICszOCw3IEBACiAjaW5jbHVkZSAiSHlwaGVuYXRpb24uaCIKICNp bmNsdWRlICJJbmxpbmVUZXh0Qm94LmgiCiAjaW5jbHVkZSAiTGF5b3V0SW50ZWdyYXRpb25MaW5l SXRlcmF0b3IuaCIKKyNpbmNsdWRlICJMYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuaCIKICNp bmNsdWRlICJMYXlvdXRJbnRlZ3JhdGlvblJ1bkl0ZXJhdG9yLmgiCiAjaW5jbHVkZSAiUmFuZ2Uu aCIKICNpbmNsdWRlICJSZW5kZXJCbG9jay5oIgpAQCAtMTQ2NCwyMiArMTQ2NSwxMyBAQCB2b2lk IFJlbmRlclRleHQ6OmVuc3VyZUxpbmVCb3hlcygpCiAgICAgZG93bmNhc3Q8UmVuZGVyQmxvY2tG bG93PigqcGFyZW50KCkpLmVuc3VyZUxpbmVCb3hlcygpOwogfQogCi0jaWYgRU5BQkxFKExBWU9V VF9GT1JNQVRUSU5HX0NPTlRFWFQpCi1jb25zdCBMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUxheW91 dCogUmVuZGVyVGV4dDo6bGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRMaW5lTGF5b3V0KCkgY29uc3QK LXsKLSAgICBpZiAoIWlzPFJlbmRlckJsb2NrRmxvdz4oKnBhcmVudCgpKSkKLSAgICAgICAgcmV0 dXJuIG51bGxwdHI7Ci0gICAgcmV0dXJuIGRvd25jYXN0PFJlbmRlckJsb2NrRmxvdz4oKnBhcmVu dCgpKS5sYXlvdXRGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQoKTsKLX0KLSNlbmRpZgotCiBi b29sIFJlbmRlclRleHQ6OnVzZXNDb21wbGV4TGluZUxheW91dFBhdGgoKSBjb25zdAogewogI2lm IEVOQUJMRShMQVlPVVRfRk9STUFUVElOR19DT05URVhUKQotICAgIGlmIChsYXlvdXRGb3JtYXR0 aW5nQ29udGV4dExpbmVMYXlvdXQoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotI2VuZGlmCisg ICAgcmV0dXJuICFMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUxheW91dDo6Y29udGFpbmluZygqdGhp cyk7CisjZWxzZQogICAgIHJldHVybiB0cnVlOworI2VuZGlmCiB9CiAKIGZsb2F0IFJlbmRlclRl eHQ6OndpZHRoKHVuc2lnbmVkIGZyb20sIHVuc2lnbmVkIGxlbiwgZmxvYXQgeFBvcywgYm9vbCBm aXJzdExpbmUsIEhhc2hTZXQ8Y29uc3QgRm9udCo+KiBmYWxsYmFja0ZvbnRzLCBHbHlwaE92ZXJm bG93KiBnbHlwaE92ZXJmbG93KSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0 LmgKaW5kZXggMjkxZDE5NDdhNjdjLi41Mjg4MDkzNGNjYjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRleHQuaApAQCAtMTY4LDkgKzE2OCw2IEBAIHB1YmxpYzoKICNlbmRpZgogCiAg ICAgdm9pZCBlbnN1cmVMaW5lQm94ZXMoKTsKLSNpZiBFTkFCTEUoTEFZT1VUX0ZPUk1BVFRJTkdf Q09OVEVYVCkKLSAgICBjb25zdCBMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUxheW91dCogbGF5b3V0 Rm9ybWF0dGluZ0NvbnRleHRMaW5lTGF5b3V0KCkgY29uc3Q7Ci0jZW5kaWYKICAgICBib29sIHVz ZXNDb21wbGV4TGluZUxheW91dFBhdGgoKSBjb25zdDsKIAogICAgIFN0cmluZ1ZpZXcgc3RyaW5n Vmlldyh1bnNpZ25lZCBzdGFydCA9IDAsIE9wdGlvbmFsPHVuc2lnbmVkPiBzdG9wID0gV1RGOjpu dWxsb3B0KSBjb25zdDsK