198489 2019-06-03 10:56:36 -0700 [LFC][IFC] Remove redundant InlineItem::width() calls. 2019-06-04 07:55:00 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1541266 0 zalan 2019-06-03 10:56:36 -0700 This is in preparation for removing InlineItem::width 1541267 1 webkit-bug-importer 2019-06-03 10:57:02 -0700 <rdar://problem/51360390> 1541269 2 371196 zalan 2019-06-03 11:00:46 -0700 Created attachment 371196 Patch 1541565 3 371196 commit-queue 2019-06-04 07:54:59 -0700 Comment on attachment 371196 Patch Clearing flags on attachment: 371196 Committed r246062: <https://trac.webkit.org/changeset/246062> 1541566 4 commit-queue 2019-06-04 07:55:00 -0700 All reviewed patches have been landed. Closing bug. 371196 2019-06-03 11:00:46 -0700 2019-06-04 07:54:59 -0700 Patch bug-198489-20190603110045.patch text/plain 6773 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2MDI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTk2ZDI2MDljOWUzZDcy MDdmZmE5MmQxZGEyZWE3NjNmMzZhMjEwNS4uNjBjOWE3M2RjNDMzYzhkYTU1NGI3ZDNkZDMyNjg0 OWI3OTY1NzJmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE5LTA2LTAzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBSZW1vdmUg cmVkdW5kYW50IElubGluZUl0ZW06OndpZHRoKCkgY2FsbHMuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTg0ODkKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzUxMzYwMzkwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIHJlbW92aW5nIElubGluZUl0ZW06Ondp ZHRoKCkuCisKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0 aW5nQ29udGV4dExpbmVMYXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxp bmVGb3JtYXR0aW5nQ29udGV4dDo6TGluZUxheW91dDo6aGFuZGxlRmxvYXQgY29uc3QpOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6TGluZUxheW91 dDo6Y29tbWl0SW5saW5lSXRlbVRvTGluZSBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Okxp bmU6OmFwcGVuZE5vbkJyZWFrYWJsZVNwYWNlKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 TGluZTo6YXBwZW5kSW5saW5lQ29udGFpbmVyU3RhcnQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpMaW5lOjphcHBlbmRJbmxpbmVDb250YWluZXJFbmQpOgorICAgICAgICAqIGxheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaDoKKwogMjAxOS0wNi0wMSAgU2ltb24gRnJhc2Vy ICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBbQXN5bmMgb3ZlcmZsb3cgc2Ny b2xsXSBGbGFzaGluZyBjb250ZW50IHdoZW4gc2Nyb2xsaW5nIGFzeW5jIG92ZXJmbG93IHdpdGgg YSBuZWdhdGl2ZSB6LWluZGV4IGNoaWxkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQuY3Bw IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGlu Z0NvbnRleHRMaW5lTGF5b3V0LmNwcAppbmRleCBmYjY0ZTJjOTc3NDJkZjFmZGFiOWQ2MjJiODQz OTk2ODdhMjhjNDBlLi44Zjc4Y2FmZWVkZDM3NWZjMmRiMzEwZTM5OWU5Y2M3N2M5ZjI3NWVjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVG b3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0TGluZUxheW91dC5jcHAK QEAgLTM0MCwyNyArMzQwLDMxIEBAIHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OkxpbmVM YXlvdXQ6OmhhbmRsZUZsb2F0KExpbmUmIGxpbmUsIGNvbnN0IEZsb2F0aW5nCiAgICAgZGlzcGxh eUJveC5zZXRUb3BMZWZ0KGZsb2F0aW5nQ29udGV4dC5wb3NpdGlvbkZvckZsb2F0KGZsb2F0Qm94 KSk7CiAgICAgbV9mbG9hdGluZ1N0YXRlLmFwcGVuZChmbG9hdEJveCk7CiAgICAgLy8gU2hyaW5r IGF2YWlsYmxlIHNwYWNlIGZvciBjdXJyZW50IGxpbmUgYW5kIG1vdmUgZXhpc3RpbmcgaW5saW5l IHJ1bnMuCi0gICAgYXV0byBmbG9hdEJveFdpZHRoID0gZmxvYXRJdGVtLndpZHRoKCk7CisgICAg YXV0byBmbG9hdEJveFdpZHRoID0gZGlzcGxheUJveC5tYXJnaW5Cb3hXaWR0aCgpOwogICAgIGZs b2F0Qm94LmlzTGVmdEZsb2F0aW5nUG9zaXRpb25lZCgpID8gbGluZS5tb3ZlTG9naWNhbExlZnQo ZmxvYXRCb3hXaWR0aCkgOiBsaW5lLm1vdmVMb2dpY2FsUmlnaHQoZmxvYXRCb3hXaWR0aCk7CiB9 CiAKIHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OkxpbmVMYXlvdXQ6OmNvbW1pdElubGlu ZUl0ZW1Ub0xpbmUoTGluZSYgbGluZSwgY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSkgY29u c3QKIHsKLSAgICBpZiAoaW5saW5lSXRlbS5pc0NvbnRhaW5lclN0YXJ0KCkpCi0gICAgICAgIHJl dHVybiBsaW5lLmFwcGVuZElubGluZUNvbnRhaW5lclN0YXJ0KGlubGluZUl0ZW0pOwotCi0gICAg aWYgKGlubGluZUl0ZW0uaXNDb250YWluZXJFbmQoKSkKLSAgICAgICAgcmV0dXJuIGxpbmUuYXBw ZW5kSW5saW5lQ29udGFpbmVyRW5kKGlubGluZUl0ZW0pOwotCiAgICAgaWYgKGlubGluZUl0ZW0u aXNIYXJkTGluZUJyZWFrKCkpCiAgICAgICAgIHJldHVybiBsaW5lLmFwcGVuZEhhcmRMaW5lQnJl YWsoaW5saW5lSXRlbSk7CiAKICAgICBhdXRvIHdpZHRoID0gaW5saW5lSXRlbS53aWR0aCgpOwor ICAgIGF1dG8mIGZvbnRNZXRyaWNzID0gaW5saW5lSXRlbS5zdHlsZSgpLmZvbnRNZXRyaWNzKCk7 CiAgICAgaWYgKGlzPElubGluZVRleHRJdGVtPihpbmxpbmVJdGVtKSkKLSAgICAgICAgcmV0dXJu IGxpbmUuYXBwZW5kVGV4dENvbnRlbnQoZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KGlubGluZUl0 ZW0pLCB7IHdpZHRoLCBpbmxpbmVJdGVtLnN0eWxlKCkuZm9udE1ldHJpY3MoKS5oZWlnaHQoKSB9 KTsKKyAgICAgICAgcmV0dXJuIGxpbmUuYXBwZW5kVGV4dENvbnRlbnQoZG93bmNhc3Q8SW5saW5l VGV4dEl0ZW0+KGlubGluZUl0ZW0pLCB7IHdpZHRoLCBmb250TWV0cmljcy5oZWlnaHQoKSB9KTsK IAogICAgIGF1dG8mIGxheW91dEJveCA9IGlubGluZUl0ZW0ubGF5b3V0Qm94KCk7CiAgICAgYXV0 byYgZGlzcGxheUJveCA9IGxheW91dFN0YXRlKCkuZGlzcGxheUJveEZvckxheW91dEJveChsYXlv dXRCb3gpOworCisgICAgaWYgKGlubGluZUl0ZW0uaXNDb250YWluZXJTdGFydCgpKSB7CisgICAg ICAgIGF1dG8gY29udGFpbmVySGVpZ2h0ID0gZm9udE1ldHJpY3MuaGVpZ2h0KCkgKyBkaXNwbGF5 Qm94LnZlcnRpY2FsQm9yZGVyKCkgKyBkaXNwbGF5Qm94LnZlcnRpY2FsUGFkZGluZygpLnZhbHVl T3IoMCk7CisgICAgICAgIHJldHVybiBsaW5lLmFwcGVuZElubGluZUNvbnRhaW5lclN0YXJ0KGlu bGluZUl0ZW0sIHsgd2lkdGgsIGNvbnRhaW5lckhlaWdodCB9KTsKKyAgICB9CisKKyAgICBpZiAo aW5saW5lSXRlbS5pc0NvbnRhaW5lckVuZCgpKQorICAgICAgICByZXR1cm4gbGluZS5hcHBlbmRJ bmxpbmVDb250YWluZXJFbmQoaW5saW5lSXRlbSwgeyB3aWR0aCwgMCB9KTsKKwogICAgIGlmIChs YXlvdXRCb3guaXNSZXBsYWNlZCgpKQogICAgICAgICByZXR1cm4gbGluZS5hcHBlbmRSZXBsYWNl ZElubGluZUJveChpbmxpbmVJdGVtLCB7IHdpZHRoLCBkaXNwbGF5Qm94LmhlaWdodCgpIH0pOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVMaW5lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUxpbmUuY3BwCmluZGV4IGE1NWUwMTRjMGY5Y2MyZGE1ZmNlYmNiODQ0NmNhYmEzYzg1MmMzM2Iu LjJmMGY1ZDVjMDk2YjY5YWQ3YmUwMzRjMjdiZDIxNDQzZGU3ODE1MzcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCkBA IC0xMTYsMTAgKzExNiwxMCBAQCBMYXlvdXRVbml0IExpbmU6OnRyYWlsaW5nVHJpbW1hYmxlV2lk dGgoKSBjb25zdAogdm9pZCBMaW5lOjphcHBlbmROb25CcmVha2FibGVTcGFjZShjb25zdCBJbmxp bmVJdGVtJiBpbmxpbmVJdGVtLCBjb25zdCBEaXNwbGF5OjpSZWN0JiBsb2dpY2FsUmVjdCkKIHsK ICAgICBtX2NvbnRlbnQtPnJ1bnMoKS5hcHBlbmQoc3RkOjptYWtlX3VuaXF1ZTxDb250ZW50OjpS dW4+KERpc3BsYXk6OlJ1biB7IGxvZ2ljYWxSZWN0IH0sIGlubGluZUl0ZW0sIGZhbHNlLCBmYWxz ZSkpOwotICAgIG1fY29udGVudExvZ2ljYWxXaWR0aCArPSBpbmxpbmVJdGVtLndpZHRoKCk7Cisg ICAgbV9jb250ZW50TG9naWNhbFdpZHRoICs9IGxvZ2ljYWxSZWN0LndpZHRoKCk7CiB9CiAKLXZv aWQgTGluZTo6YXBwZW5kSW5saW5lQ29udGFpbmVyU3RhcnQoY29uc3QgSW5saW5lSXRlbSYgaW5s aW5lSXRlbSkKK3ZvaWQgTGluZTo6YXBwZW5kSW5saW5lQ29udGFpbmVyU3RhcnQoY29uc3QgSW5s aW5lSXRlbSYgaW5saW5lSXRlbSwgTGF5b3V0U2l6ZSBydW5TaXplKQogewogICAgIGF1dG8mIGxh eW91dEJveCA9IGlubGluZUl0ZW0ubGF5b3V0Qm94KCk7CiAgICAgYXV0byYgc3R5bGUgPSBsYXlv dXRCb3guc3R5bGUoKTsKQEAgLTEzNywxNiArMTM3LDE1IEBAIHZvaWQgTGluZTo6YXBwZW5kSW5s aW5lQ29udGFpbmVyU3RhcnQoY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSkKIAogICAgIGFs aWduQW5kQWRqdXN0TGluZUhlaWdodCgpOwogICAgIGF1dG8mIGRpc3BsYXlCb3ggPSBtX2xheW91 dFN0YXRlLmRpc3BsYXlCb3hGb3JMYXlvdXRCb3gobGF5b3V0Qm94KTsKLSAgICBhdXRvIGNvbnRh aW5lckhlaWdodCA9IGZvbnRNZXRyaWNzLmhlaWdodCgpICsgZGlzcGxheUJveC52ZXJ0aWNhbEJv cmRlcigpICsgZGlzcGxheUJveC52ZXJ0aWNhbFBhZGRpbmcoKS52YWx1ZU9yKDApOwogICAgIGF1 dG8gbG9naWNhbFRvcCA9IC1mb250TWV0cmljcy5hc2NlbnQoKSAtIGRpc3BsYXlCb3guYm9yZGVy VG9wKCkgLSBkaXNwbGF5Qm94LnBhZGRpbmdUb3AoKS52YWx1ZU9yKDApOwotICAgIGF1dG8gbG9n aWNhbFJlY3QgPSBEaXNwbGF5OjpSZWN0IHsgbG9naWNhbFRvcCwgY29udGVudExvZ2ljYWxSaWdo dCgpLCBpbmxpbmVJdGVtLndpZHRoKCksIGNvbnRhaW5lckhlaWdodCB9OworICAgIGF1dG8gbG9n aWNhbFJlY3QgPSBEaXNwbGF5OjpSZWN0IHsgbG9naWNhbFRvcCwgY29udGVudExvZ2ljYWxSaWdo dCgpLCBydW5TaXplLndpZHRoKCksIHJ1blNpemUuaGVpZ2h0KCkgfTsKICAgICBhcHBlbmROb25C cmVha2FibGVTcGFjZShpbmxpbmVJdGVtLCBsb2dpY2FsUmVjdCk7CiB9CiAKLXZvaWQgTGluZTo6 YXBwZW5kSW5saW5lQ29udGFpbmVyRW5kKGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0pCit2 b2lkIExpbmU6OmFwcGVuZElubGluZUNvbnRhaW5lckVuZChjb25zdCBJbmxpbmVJdGVtJiBpbmxp bmVJdGVtLCBMYXlvdXRTaXplIHJ1blNpemUpCiB7CiAgICAgLy8gVGhpcyBpcyByZWFsbHkganVz dCBhIHBsYWNlaG9sZGVyIHRvIG1hcmsgdGhlIGVuZCBvZiB0aGUgaW5saW5lIGxldmVsIGNvbnRh aW5lci4KLSAgICBhdXRvIGxvZ2ljYWxSZWN0ID0gRGlzcGxheTo6UmVjdCB7IDAsIGNvbnRlbnRM b2dpY2FsUmlnaHQoKSwgaW5saW5lSXRlbS53aWR0aCgpLCAwIH07CisgICAgYXV0byBsb2dpY2Fs UmVjdCA9IERpc3BsYXk6OlJlY3QgeyAwLCBjb250ZW50TG9naWNhbFJpZ2h0KCksIHJ1blNpemUu d2lkdGgoKSwgcnVuU2l6ZS5oZWlnaHQoKSB9OwogICAgIGFwcGVuZE5vbkJyZWFrYWJsZVNwYWNl KGlubGluZUl0ZW0sIGxvZ2ljYWxSZWN0KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oCmluZGV4IDYxNTI5ZmI0ZDBkZTBj OTlmMDlkOTMwNWU5ZmY2ODE1NTVhMDNhNTAuLmJjYTFiYzczMmU4ODg0M2ZkZjc4MGM2YzE3YTIz MjM1NzcxMjJmZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVMaW5lLmgKQEAgLTc4LDggKzc4LDggQEAgcHVibGljOgogICAgIHZvaWQg YXBwZW5kVGV4dENvbnRlbnQoY29uc3QgSW5saW5lVGV4dEl0ZW0mLCBMYXlvdXRTaXplKTsKICAg ICB2b2lkIGFwcGVuZE5vblJlcGxhY2VkSW5saW5lQm94KGNvbnN0IElubGluZUl0ZW0mLCBMYXlv dXRTaXplKTsKICAgICB2b2lkIGFwcGVuZFJlcGxhY2VkSW5saW5lQm94KGNvbnN0IElubGluZUl0 ZW0mLCBMYXlvdXRTaXplKTsKLSAgICB2b2lkIGFwcGVuZElubGluZUNvbnRhaW5lclN0YXJ0KGNv bnN0IElubGluZUl0ZW0mKTsKLSAgICB2b2lkIGFwcGVuZElubGluZUNvbnRhaW5lckVuZChjb25z dCBJbmxpbmVJdGVtJik7CisgICAgdm9pZCBhcHBlbmRJbmxpbmVDb250YWluZXJTdGFydChjb25z dCBJbmxpbmVJdGVtJiwgTGF5b3V0U2l6ZSk7CisgICAgdm9pZCBhcHBlbmRJbmxpbmVDb250YWlu ZXJFbmQoY29uc3QgSW5saW5lSXRlbSYsIExheW91dFNpemUpOwogICAgIHZvaWQgYXBwZW5kSGFy ZExpbmVCcmVhayhjb25zdCBJbmxpbmVJdGVtJik7CiAKICAgICBib29sIGhhc0NvbnRlbnQoKSBj b25zdCB7IHJldHVybiAhbV9jb250ZW50LT5pc1Zpc3VhbGx5RW1wdHkoKTsgfQo=