261128 2023-09-04 17:37:11 -0700 [IFC] Move placed float geometry update to a dedicated function (InlineFormattingContext::updateBoxGeometryForPlacedFloats) 2023-09-04 18:47:20 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham simon.fraser webkit-bug-importer zalan oldest_to_newest 1975431 0 zalan 2023-09-04 17:37:11 -0700 ssia 1975432 1 467546 zalan 2023-09-04 17:39:24 -0700 Created attachment 467546 [fast-cq]Patch 1975445 2 ews-feeder 2023-09-04 18:46:15 -0700 Committed 267616@main (3ccc045675ad): <https://commits.webkit.org/267616@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 467546. 1975446 3 webkit-bug-importer 2023-09-04 18:47:20 -0700 <rdar://problem/114955786> 467546 2023-09-04 17:39:24 -0700 2023-09-04 18:46:16 -0700 [fast-cq]Patch bug-261128-20230904173923.patch text/plain 7107 zalan RnJvbSAyNWNmMDFiNDQyN2Y0YTkyMWMzNzEwYjQ5ZjU2NzMxNDRlZjY5ODFhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IE1vbiwgNCBTZXAgMjAyMyAxNzozNzozMiAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIFtJRkNdIE1v dmUgcGxhY2VkIGZsb2F0IGdlb21ldHJ5IHVwZGF0ZSB0byBhIGRlZGljYXRlZAogZnVuY3Rpb24g KElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojp1cGRhdGVCb3hHZW9tZXRyeUZvclBsYWNlZEZsb2F0 cykKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjExMjgKClJldmll d2VkIGJ5IEFudHRpIEtvaXZpc3RvLgoKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHA6CihXZWJDb3JlOjpM YXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpsaW5lTGF5b3V0KToKKFdlYkNvcmU6Okxh eW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OnVwZGF0ZUJveEdlb21ldHJ5Rm9yUGxhY2Vk RmxvYXRzKToKKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNyZWF0 ZURpc3BsYXlDb250ZW50Rm9ySW5saW5lQ29udGVudCk6CihXZWJDb3JlOjpMYXlvdXQ6OklubGlu ZUZvcm1hdHRpbmdDb250ZXh0OjpjcmVhdGVEaXNwbGF5Q29udGVudEZvckxpbmVGcm9tQ2FjaGVk Q29udGVudCk6CihXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpjcmVh dGVEaXNwbGF5Q29udGVudEZvckxpbmUpOiBEZWxldGVkLgoqIFNvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0Lmg6Ci0t LQogLi4uL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAgICAgICAgIHwgMzkgKysr KysrKysrKy0tLS0tLS0tLQogLi4uL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oICAg ICAgICAgIHwgIDMgKy0KIDIgZmlsZXMgY2hhbmdlZCwgMjIgaW5zZXJ0aW9ucygrKSwgMjAgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRl eHQuY3BwCmluZGV4IGZlZWIxNTY3YjIwZC4uYzdmMmU1YjE0ZGZlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0 aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC0xODIsNyArMTgyLDgg QEAgSW5saW5lTGF5b3V0UmVzdWx0IElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpsaW5lTGF5b3V0 KEFic3RyYWN0TGluZUJ1aWxkZXImIGxpbmUKICAgICAgICAgYXV0byBsaW5lTGF5b3V0UmVzdWx0 ID0gbGluZUJ1aWxkZXIubGF5b3V0SW5saW5lQ29udGVudChsaW5lSW5wdXQsIHByZXZpb3VzTGlu ZSk7CiAKICAgICAgICAgYXV0byBsaW5lSW5kZXggPSBwcmV2aW91c0xpbmUgPyAocHJldmlvdXNM aW5lLT5saW5lSW5kZXggKyAxKSA6IDBsdTsKLSAgICAgICAgYXV0byBsaW5lTG9naWNhbFJlY3Qg PSBjcmVhdGVEaXNwbGF5Q29udGVudEZvckxpbmUobGluZUluZGV4LCBsaW5lTGF5b3V0UmVzdWx0 LCBjb25zdHJhaW50cywgaW5saW5lTGF5b3V0U3RhdGUsIGxheW91dFJlc3VsdC5kaXNwbGF5Q29u dGVudCk7CisgICAgICAgIGF1dG8gbGluZUxvZ2ljYWxSZWN0ID0gY3JlYXRlRGlzcGxheUNvbnRl bnRGb3JJbmxpbmVDb250ZW50KGxpbmVJbmRleCwgbGluZUxheW91dFJlc3VsdCwgY29uc3RyYWlu dHMsIGlubGluZUxheW91dFN0YXRlLCBsYXlvdXRSZXN1bHQuZGlzcGxheUNvbnRlbnQpOworICAg ICAgICB1cGRhdGVCb3hHZW9tZXRyeUZvclBsYWNlZEZsb2F0cyhsaW5lTGF5b3V0UmVzdWx0LmZs b2F0Q29udGVudC5wbGFjZWRGbG9hdHMpOwogCiAgICAgICAgIGlmIChhdXRvIGZpcnN0TGluZUdh cCA9IGxpbmVMYXlvdXRSZXN1bHQubGluZUdlb21ldHJ5LmluaXRpYWxMZXR0ZXJDbGVhckdhcCkg ewogICAgICAgICAgICAgQVNTRVJUKCFpbmxpbmVMYXlvdXRTdGF0ZS5jbGVhckdhcEJlZm9yZUZp cnN0TGluZSgpKTsKQEAgLTI1Myw3ICsyNTQsMjMgQEAgc3RhdGljIExpbmVFbmRpbmdFbGxpcHNp c1BvbGljeSBsaW5lRW5kaW5nRWxsaXBzaXNQb2xpY3koY29uc3QgUmVuZGVyU3R5bGUmIHJvb3QK ICAgICByZXR1cm4gTGluZUVuZGluZ0VsbGlwc2lzUG9saWN5OjpObzsKIH0KIAotSW5saW5lUmVj dCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y3JlYXRlRGlzcGxheUNvbnRlbnRGb3JMaW5lKHNp emVfdCBsaW5lSW5kZXgsIGNvbnN0IExpbmVMYXlvdXRSZXN1bHQmIGxpbmVMYXlvdXRSZXN1bHQs IGNvbnN0IENvbnN0cmFpbnRzRm9ySW5saW5lQ29udGVudCYgY29uc3RyYWludHMsIElubGluZUxh eW91dFN0YXRlJiBpbmxpbmVMYXlvdXRTdGF0ZSwgSW5saW5lRGlzcGxheTo6Q29udGVudCYgZGlz cGxheUNvbnRlbnQpCit2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojp1cGRhdGVCb3hHZW9t ZXRyeUZvclBsYWNlZEZsb2F0cyhjb25zdCBMaW5lTGF5b3V0UmVzdWx0OjpQbGFjZWRGbG9hdExp c3QmIHBsYWNlZEZsb2F0cykKK3sKKyAgICBmb3IgKGF1dG8mIGZsb2F0SXRlbSA6IHBsYWNlZEZs b2F0cykgeworICAgICAgICBpZiAoIWZsb2F0SXRlbS5sYXlvdXRCb3goKSkgeworICAgICAgICAg ICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgICAgICAvLyBXZSBzaG91bGQgbm90IGJl IHBsYWNpbmcgaW50cnVzaXZlIGZsb2F0cyBjb21pbmcgZnJvbSBwYXJlbnQgQkZDLgorICAgICAg ICAgICAgY29udGludWU7CisgICAgICAgIH0KKyAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBm b3JtYXR0aW5nU3RhdGUoKS5ib3hHZW9tZXRyeSgqZmxvYXRJdGVtLmxheW91dEJveCgpKTsKKyAg ICAgICAgYXV0byB1c2VkR2VvbWV0cnkgPSBmbG9hdEl0ZW0uYm94R2VvbWV0cnkoKTsKKyAgICAg ICAgYm94R2VvbWV0cnkuc2V0TG9naWNhbFRvcExlZnQoQm94R2VvbWV0cnk6OmJvcmRlckJveFRv cExlZnQodXNlZEdlb21ldHJ5KSk7CisgICAgICAgIC8vIEFkb3B0IHRyaW1tZWQgaW5saW5lIGRp cmVjdGlvbiBtYXJnaW4uCisgICAgICAgIGJveEdlb21ldHJ5LnNldEhvcml6b250YWxNYXJnaW4o dXNlZEdlb21ldHJ5Lmhvcml6b250YWxNYXJnaW4oKSk7CisgICAgfQorfQorCitJbmxpbmVSZWN0 IElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpjcmVhdGVEaXNwbGF5Q29udGVudEZvcklubGluZUNv bnRlbnQoc2l6ZV90IGxpbmVJbmRleCwgY29uc3QgTGluZUxheW91dFJlc3VsdCYgbGluZUxheW91 dFJlc3VsdCwgY29uc3QgQ29uc3RyYWludHNGb3JJbmxpbmVDb250ZW50JiBjb25zdHJhaW50cywg SW5saW5lTGF5b3V0U3RhdGUmIGlubGluZUxheW91dFN0YXRlLCBJbmxpbmVEaXNwbGF5OjpDb250 ZW50JiBkaXNwbGF5Q29udGVudCkKIHsKICAgICBhdXRvIG51bWJlck9mVmlzaWJsZUxpbmVzQWxs b3dlZCA9IFsmXSAoKSAtPiBzdGQ6Om9wdGlvbmFsPHNpemVfdD4gewogICAgICAgICBpZiAoYXV0 byBsaW5lQ2xhbXAgPSBpbmxpbmVMYXlvdXRTdGF0ZS5wYXJlbnRCbG9ja0xheW91dFN0YXRlKCku bGluZUNsYW1wKCkpCkBAIC0yNzQsMjIgKzI5MSw2IEBAIElubGluZVJlY3QgSW5saW5lRm9ybWF0 dGluZ0NvbnRleHQ6OmNyZWF0ZURpc3BsYXlDb250ZW50Rm9yTGluZShzaXplX3QgbGluZUluZGV4 CiAKICAgICBkaXNwbGF5Q29udGVudC5ib3hlcy5hcHBlbmRWZWN0b3IoV1RGTW92ZShib3hlcykp OwogICAgIGRpc3BsYXlDb250ZW50LmxpbmVzLmFwcGVuZChkaXNwbGF5TGluZSk7Ci0gICAgYXV0 byB1cGRhdGVCb3hHZW9tZXRyeUZvclBsYWNlZEZsb2F0cyA9IFsmXSB7Ci0gICAgICAgIGZvciAo YXV0byYgZmxvYXRJdGVtIDogbGluZUxheW91dFJlc3VsdC5mbG9hdENvbnRlbnQucGxhY2VkRmxv YXRzKSB7Ci0gICAgICAgICAgICBpZiAoIWZsb2F0SXRlbS5sYXlvdXRCb3goKSkgewotICAgICAg ICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgICAgICAgICAgICAgIC8vIFdlIHNo b3VsZCBub3QgYmUgcGxhY2luZyBpbnRydXNpdmUgZmxvYXRzIGNvbWluZyBmcm9tIHBhcmVudCBC RkMuCi0gICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAg ICBhdXRvJiBib3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdTdGF0ZSgpLmJveEdlb21ldHJ5KCpmbG9h dEl0ZW0ubGF5b3V0Qm94KCkpOwotICAgICAgICAgICAgYXV0byB1c2VkR2VvbWV0cnkgPSBmbG9h dEl0ZW0uYm94R2VvbWV0cnkoKTsKLSAgICAgICAgICAgIGJveEdlb21ldHJ5LnNldExvZ2ljYWxU b3BMZWZ0KEJveEdlb21ldHJ5Ojpib3JkZXJCb3hUb3BMZWZ0KHVzZWRHZW9tZXRyeSkpOwotICAg ICAgICAgICAgLy8gQWRvcHQgdHJpbW1lZCBpbmxpbmUgZGlyZWN0aW9uIG1hcmdpbi4KLSAgICAg ICAgICAgIGJveEdlb21ldHJ5LnNldEhvcml6b250YWxNYXJnaW4odXNlZEdlb21ldHJ5Lmhvcml6 b250YWxNYXJnaW4oKSk7Ci0gICAgICAgIH0KLSAgICB9OwotICAgIHVwZGF0ZUJveEdlb21ldHJ5 Rm9yUGxhY2VkRmxvYXRzKCk7Ci0KICAgICByZXR1cm4gSW5saW5lRm9ybWF0dGluZ0dlb21ldHJ5 OjpmbGlwVmlzdWFsUmVjdFRvTG9naWNhbEZvcldyaXRpbmdNb2RlKGRpc3BsYXlDb250ZW50Lmxp bmVzLmxhc3QoKS5saW5lQm94UmVjdCgpLCByb290KCkuc3R5bGUoKS53cml0aW5nTW9kZSgpKTsK IH0KIApAQCAtMzQ5LDcgKzM1MCw3IEBAIGJvb2wgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNy ZWF0ZURpc3BsYXlDb250ZW50Rm9yTGluZUZyb21DYWNoZWRDb250ZW50KGNvbnN0CiAgICAgbGlu ZUJyZWFraW5nUmVzdWx0LmxpbmVHZW9tZXRyeS5sb2dpY2FsVG9wTGVmdCA9IHsgY29uc3RyYWlu dHMuaG9yaXpvbnRhbCgpLmxvZ2ljYWxMZWZ0LCBjb25zdHJhaW50cy5sb2dpY2FsVG9wKCkgfTsK ICAgICBsaW5lQnJlYWtpbmdSZXN1bHQubGluZUdlb21ldHJ5LmxvZ2ljYWxXaWR0aCA9IGNvbnN0 cmFpbnRzLmhvcml6b250YWwoKS5sb2dpY2FsV2lkdGg7CiAgICAgbGluZUJyZWFraW5nUmVzdWx0 LmNvbnRlbnRHZW9tZXRyeS5sb2dpY2FsTGVmdCA9IElubGluZUZvcm1hdHRpbmdHZW9tZXRyeTo6 aG9yaXpvbnRhbEFsaWdubWVudE9mZnNldChyb290KCkuc3R5bGUoKSwgbGluZUJyZWFraW5nUmVz dWx0LmNvbnRlbnRHZW9tZXRyeS5sb2dpY2FsV2lkdGgsIGxpbmVCcmVha2luZ1Jlc3VsdC5saW5l R2VvbWV0cnkubG9naWNhbFdpZHRoLCBsaW5lQnJlYWtpbmdSZXN1bHQuaGFuZ2luZ0NvbnRlbnQu bG9naWNhbFdpZHRoLCBsaW5lQnJlYWtpbmdSZXN1bHQuaW5saW5lQ29udGVudCwgdHJ1ZSk7Ci0g ICAgY3JlYXRlRGlzcGxheUNvbnRlbnRGb3JMaW5lKDAsIGxpbmVCcmVha2luZ1Jlc3VsdCwgY29u c3RyYWludHMsIGlubGluZUxheW91dFN0YXRlLCBsYXlvdXRSZXN1bHQuZGlzcGxheUNvbnRlbnQp OworICAgIGNyZWF0ZURpc3BsYXlDb250ZW50Rm9ySW5saW5lQ29udGVudCgwLCBsaW5lQnJlYWtp bmdSZXN1bHQsIGNvbnN0cmFpbnRzLCBpbmxpbmVMYXlvdXRTdGF0ZSwgbGF5b3V0UmVzdWx0LmRp c3BsYXlDb250ZW50KTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGlu Z0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s aW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggNDFjMmFmNzlhOWM2Li5jZWYzOWFj MTg2MDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQu aApAQCAtNzIsNyArNzIsOCBAQCBwcml2YXRlOgogICAgIHZvaWQgbGF5b3V0RmxvYXRDb250ZW50 T25seShjb25zdCBDb25zdHJhaW50c0ZvcklubGluZUNvbnRlbnQmLCBGbG9hdGluZ1N0YXRlJik7 CiAKICAgICB2b2lkIGNvbGxlY3RDb250ZW50SWZOZWVkZWQoKTsKLSAgICBJbmxpbmVSZWN0IGNy ZWF0ZURpc3BsYXlDb250ZW50Rm9yTGluZShzaXplX3QgbGluZUluZGV4LCBjb25zdCBMaW5lTGF5 b3V0UmVzdWx0JiwgY29uc3QgQ29uc3RyYWludHNGb3JJbmxpbmVDb250ZW50JiwgSW5saW5lTGF5 b3V0U3RhdGUmLCBJbmxpbmVEaXNwbGF5OjpDb250ZW50Jik7CisgICAgSW5saW5lUmVjdCBjcmVh dGVEaXNwbGF5Q29udGVudEZvcklubGluZUNvbnRlbnQoc2l6ZV90IGxpbmVJbmRleCwgY29uc3Qg TGluZUxheW91dFJlc3VsdCYsIGNvbnN0IENvbnN0cmFpbnRzRm9ySW5saW5lQ29udGVudCYsIElu bGluZUxheW91dFN0YXRlJiwgSW5saW5lRGlzcGxheTo6Q29udGVudCYpOworICAgIHZvaWQgdXBk YXRlQm94R2VvbWV0cnlGb3JQbGFjZWRGbG9hdHMoY29uc3QgTGluZUxheW91dFJlc3VsdDo6UGxh Y2VkRmxvYXRMaXN0Jik7CiAgICAgdm9pZCByZXNldEdlb21ldHJ5Rm9yQ2xhbXBlZENvbnRlbnQo Y29uc3QgSW5saW5lSXRlbVJhbmdlJiBuZWVkc0Rpc3BsYXlDb250ZW50UmFuZ2UsIGNvbnN0IExp bmVMYXlvdXRSZXN1bHQ6OlN1c3BlbmRlZEZsb2F0TGlzdCYgc3VzcGVuZGVkRmxvYXRzLCBMYXlv dXRQb2ludCB0b3BsZWZ0KTsKICAgICBib29sIGNyZWF0ZURpc3BsYXlDb250ZW50Rm9yTGluZUZy b21DYWNoZWRDb250ZW50KGNvbnN0IENvbnN0cmFpbnRzRm9ySW5saW5lQ29udGVudCYsIElubGlu ZUxheW91dFN0YXRlJiwgSW5saW5lTGF5b3V0UmVzdWx0Jik7CiAK