194479 2019-02-09 22:52:17 -0800 [LFC][IFC] Add intrinsic width support for inline-block boxes 2019-02-10 10:04:27 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1504669 0 zalan 2019-02-09 22:52:17 -0800 ssia 1504671 1 361625 zalan 2019-02-09 22:59:34 -0800 Created attachment 361625 Patch 1504673 2 361625 koivisto 2019-02-09 23:22:08 -0800 Comment on attachment 361625 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=361625&action=review > Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp:160 > + auto usedValues = UsedHorizontalValues { { }, { }, { } }; Nice. Maybe give the fields = { } so you could just say UsedHorizontalValues { } here? > Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp:163 > + layoutState().createFormattingContext(layoutBox)->instrinsicWidthConstraints(); It looks weird that this calls instrinsicWidthConstraints() but doesn't do anything with the return value. It would be nice if functions with side effect wouldn't sound like accessors. 1504688 3 zalan 2019-02-10 09:48:29 -0800 (In reply to Antti Koivisto from comment #2) > Comment on attachment 361625 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=361625&action=review > > > Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp:160 > > + auto usedValues = UsedHorizontalValues { { }, { }, { } }; > > Nice. Maybe give the fields = { } so you could just say UsedHorizontalValues > { } here? > > > Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp:163 > > + layoutState().createFormattingContext(layoutBox)->instrinsicWidthConstraints(); > > It looks weird that this calls instrinsicWidthConstraints() but doesn't do > anything with the return value. It would be nice if functions with side > effect wouldn't sound like accessors. Yeah, I need to fix this eventually. They are either accessor functions and the caller saves the return value to the state or rename them to computeInstrinsicWidthConstraints(). I'll get back to it once I am done with floats. 1504689 4 zalan 2019-02-10 10:03:59 -0800 Committed r241250: <https://trac.webkit.org/changeset/241250> 1504690 5 webkit-bug-importer 2019-02-10 10:04:27 -0800 <rdar://problem/47949584> 361625 2019-02-09 22:59:34 -0800 2019-02-09 23:11:55 -0800 Patch Patch.txt text/plain 6594 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0NDI5ODI1OTRlOS4uNjFlYWRjZDkyYWUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNiBAQAorMjAxOS0wMi0wOSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgor CisgICAgICAgIFtMRkNdW0lGQ10gQWRkIGludHJpbnNpYyB3aWR0aCBzdXBwb3J0IGZvciBpbmxp bmUtYmxvY2sgYm94ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE5NDQ3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIENvbXB1dGUgdGhlIGludHJpbnNpYyB3aWR0aCBmb3IgdGhlIGlubGluZS1ibG9jayAo Zm9ybWF0dGluZyBjb250ZXh0IHJvb3QpIGFuZCBzZXQgaXQgYXMgdGhlIGNvbnRlbnQgYm94IHdp ZHRoIHdoaWxlCisgICAgICAgIGxheWluZyBvdXQgdGhlIGNvbnRlbnQgZm9yIHRoZSBtaW4vbWF4 IHdpZHRoLgorCisgICAgICAgIDxkaXYgc3R5bGU9InBvc2l0aW9uOiBhYnNvbHV0ZSI+YmVmb3Jl PHNwYW4gaWQ9aW5saW5lLWJsb2NrIHN0eWxlPSJkaXNwbGF5OiBpbmxpbmUtYmxvY2siPmlubGlu ZV9ibG9jayBjb250ZW50PHNwYW4+YWZ0ZXI8L2Rpdj4KKworICAgICAgICBUaGUgImlubGluZS1i bG9jayIgZm9ybWF0dGluZyByb290IHJldHVybnMgImlubGluZV9ibG9jayIgd2lkdGggZm9yIHRo ZSBtaW5pbXVtIGFuZCAiaW5saW5lX2Jsb2NrIHdpZHRoIiBmb3IKKyAgICAgICAgdGhlIG1heGlt dW0gd2lkdGguIFRoZXNlIG1pbi9tYXggdmFsdWVzIGFyZSB1c2VkIHRvIGZpZ3VyZSBvdXQgdGhl IGludHJpbnNpYyB3aWR0aCBmb3IgdGhlIHBhcmVudCA8ZGl2Pi4KKworICAgICAgICAqIGxheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6Omluc3RyaW5zaWNXaWR0 aENvbnN0cmFpbnRzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9y bWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVJbnRyaW5zaWNXaWR0aEZvckZvcm1hdHRpbmdDb250ZXh0 Um9vdCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdD b250ZXh0Ojpjb21wdXRlTWFyZ2luIGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oOgorICAgICAgICAqIHBhZ2UvRnJhbWVW aWV3TGF5b3V0Q29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpsYXlvdXRVc2luZ0Zvcm1h dHRpbmdDb250ZXh0KToKKwogMjAxOS0wMi0wOSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUu Y29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gQWRkIGludHJpbnNpYyB3aWR0aCBzdXBwb3J0IGZv ciByZXBsYWNlZCBib3hlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4 IGYyZDVmYTYzYWI2Li5hMTNjYzgyNGZkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250 ZXh0LmNwcApAQCAtOTQsMjAgKzk0LDI3IEBAIHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6 OmxheW91dCgpIGNvbnN0CiAKIEZvcm1hdHRpbmdDb250ZXh0OjpJbnN0cmluc2ljV2lkdGhDb25z dHJhaW50cyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6aW5zdHJpbnNpY1dpZHRoQ29uc3RyYWlu dHMoKSBjb25zdAogewotICAgIEFTU0VSVCghbGF5b3V0U3RhdGUoKS5mb3JtYXR0aW5nU3RhdGVG b3JCb3gocm9vdCgpKS5pbnN0cmluc2ljV2lkdGhDb25zdHJhaW50cyhyb290KCkpKTsKICAgICBB U1NFUlQoaXM8Q29udGFpbmVyPihyb290KCkpKTsKIAogICAgIGF1dG8mIGxheW91dFN0YXRlID0g dGhpcy0+bGF5b3V0U3RhdGUoKTsKICAgICBhdXRvJiByb290ID0gZG93bmNhc3Q8Q29udGFpbmVy Pih0aGlzLT5yb290KCkpOworICAgIGlmIChhdXRvIGluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRz ID0gbGF5b3V0U3RhdGUuZm9ybWF0dGluZ1N0YXRlRm9yQm94KHJvb3QpLmluc3RyaW5zaWNXaWR0 aENvbnN0cmFpbnRzKHJvb3QpKQorICAgICAgICByZXR1cm4gKmluc3RyaW5zaWNXaWR0aENvbnN0 cmFpbnRzOwogCisgICAgVmVjdG9yPGNvbnN0IEJveCo+IGZvcm1hdHRpbmdDb250ZXh0Um9vdExp c3Q7CiAgICAgYXV0byB1c2VkVmFsdWVzID0gVXNlZEhvcml6b250YWxWYWx1ZXMgeyB7IH0sIHsg fSwgeyB9IH07CiAgICAgYXV0byogbGF5b3V0Qm94ID0gcm9vdC5maXJzdEluRmxvd09yRmxvYXRp bmdDaGlsZCgpOwogICAgIHdoaWxlIChsYXlvdXRCb3gpIHsKLSAgICAgICAgaWYgKGxheW91dEJv eC0+ZXN0YWJsaXNoZXNGb3JtYXR0aW5nQ29udGV4dCgpKQorICAgICAgICBpZiAobGF5b3V0Qm94 LT5pc0Zsb2F0aW5nUG9zaXRpb25lZCgpKQogICAgICAgICAgICAgQVNTRVJUX05PVF9JTVBMRU1F TlRFRF9ZRVQoKTsKLSAgICAgICAgZWxzZSBpZiAobGF5b3V0Qm94LT5pc1JlcGxhY2VkKCkgfHwg aXM8Q29udGFpbmVyPigqbGF5b3V0Qm94KSkgeworICAgICAgICBlbHNlIGlmIChsYXlvdXRCb3gt PmlzSW5saW5lQmxvY2tCb3goKSkgeworICAgICAgICAgICAgY29tcHV0ZUludHJpbnNpY1dpZHRo Rm9yRm9ybWF0dGluZ0NvbnRleHRSb290KCpsYXlvdXRCb3gpOworICAgICAgICAgICAgZm9ybWF0 dGluZ0NvbnRleHRSb290TGlzdC5hcHBlbmQobGF5b3V0Qm94KTsKKyAgICAgICAgfSBlbHNlIGlm IChsYXlvdXRCb3gtPmlzUmVwbGFjZWQoKSB8fCBpczxDb250YWluZXI+KCpsYXlvdXRCb3gpKSB7 CiAgICAgICAgICAgICBjb21wdXRlQm9yZGVyQW5kUGFkZGluZygqbGF5b3V0Qm94LCB1c2VkVmFs dWVzKTsKLSAgICAgICAgICAgIGlmIChsYXlvdXRCb3gtPmlzUmVwbGFjZWQoKSkKKyAgICAgICAg ICAgIC8vIGlubGluZS1ibG9jayBhbmQgcmVwbGFjZWQuCisgICAgICAgICAgICBhdXRvIG5lZWRz V2lkdGhDb21wdXRhdGlvbiA9IGxheW91dEJveC0+aXNSZXBsYWNlZCgpIHx8IGxheW91dEJveC0+ ZXN0YWJsaXNoZXNGb3JtYXR0aW5nQ29udGV4dCgpOworICAgICAgICAgICAgaWYgKG5lZWRzV2lk dGhDb21wdXRhdGlvbikKICAgICAgICAgICAgICAgICBjb21wdXRlV2lkdGhBbmRNYXJnaW4oKmxh eW91dEJveCwgdXNlZFZhbHVlcyk7CiAgICAgICAgICAgICBlbHNlIHsKICAgICAgICAgICAgICAg ICAvLyBTaW1wbGUgaW5saW5lIGNvbnRhaW5lciB3aXRoIG5vIGludHJpbnNpYyB3aWR0aCA8c3Bh bj4uCkBAIC0xMjQsNiArMTMxLDEzIEBAIEZvcm1hdHRpbmdDb250ZXh0OjpJbnN0cmluc2ljV2lk dGhDb25zdHJhaW50cyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6aW5zdHJpbnNpCiAgICAgICAg IExheW91dFVuaXQgbWF4Q29udGVudExvZ2ljYWxSaWdodDsKICAgICAgICAgYXV0byBsaW5lQnJl YWtlciA9IElubGluZUxpbmVCcmVha2VyIHsgbGF5b3V0U3RhdGUsIGZvcm1hdHRpbmdTdGF0ZSgp LmlubGluZUNvbnRlbnQoKSwgaW5saW5lUnVuUHJvdmlkZXIucnVucygpIH07CiAgICAgICAgIExh eW91dFVuaXQgbGluZUxvZ2ljYWxSaWdodDsKKworICAgICAgICAvLyBTd2l0Y2ggdG8gdGhlIG1p bi9tYXggZm9ybWF0dGluZyByb290IHdpZHRoIHZhbHVlcyBiZWZvcmUgZm9ybWF0dGluZyB0aGUg bGluZXMuCisgICAgICAgIGZvciAoYXV0byogZm9ybWF0dGluZ1Jvb3QgOiBmb3JtYXR0aW5nQ29u dGV4dFJvb3RMaXN0KSB7CisgICAgICAgICAgICBhdXRvIGluc3RyaW5zaWNXaWR0aHMgPSBsYXlv dXRTdGF0ZS5mb3JtYXR0aW5nU3RhdGVGb3JCb3goKmZvcm1hdHRpbmdSb290KS5pbnN0cmluc2lj V2lkdGhDb25zdHJhaW50cygqZm9ybWF0dGluZ1Jvb3QpOworICAgICAgICAgICAgbGF5b3V0U3Rh dGUuZGlzcGxheUJveEZvckxheW91dEJveCgqZm9ybWF0dGluZ1Jvb3QpLnNldENvbnRlbnRCb3hX aWR0aChhdmFpbGFibGVXaWR0aCA/IGluc3RyaW5zaWNXaWR0aHMtPm1heGltdW0gOiBpbnN0cmlu c2ljV2lkdGhzLT5taW5pbXVtKTsKKyAgICAgICAgfQorCiAgICAgICAgIHdoaWxlIChhdXRvIHJ1 biA9IGxpbmVCcmVha2VyLm5leHRSdW4obGluZUxvZ2ljYWxSaWdodCwgYXZhaWxhYmxlV2lkdGgs ICFsaW5lTG9naWNhbFJpZ2h0KSkgewogICAgICAgICAgICAgaWYgKHJ1bi0+cG9zaXRpb24gPT0g SW5saW5lTGluZUJyZWFrZXI6OlJ1bjo6UG9zaXRpb246OkxpbmVCZWdpbikKICAgICAgICAgICAg ICAgICBsaW5lTG9naWNhbFJpZ2h0ID0gMDsKQEAgLTEzOSwxMSArMTUzLDIwIEBAIEZvcm1hdHRp bmdDb250ZXh0OjpJbnN0cmluc2ljV2lkdGhDb25zdHJhaW50cyBJbmxpbmVGb3JtYXR0aW5nQ29u dGV4dDo6aW5zdHJpbnNpCiAgICAgcmV0dXJuIGluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzOwog fQogCit2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlSW50cmluc2ljV2lkdGhG b3JGb3JtYXR0aW5nQ29udGV4dFJvb3QoY29uc3QgQm94JiBsYXlvdXRCb3gpIGNvbnN0Cit7Cisg ICAgQVNTRVJUKGxheW91dEJveC5lc3RhYmxpc2hlc0Zvcm1hdHRpbmdDb250ZXh0KCkpOworCisg ICAgYXV0byB1c2VkVmFsdWVzID0gVXNlZEhvcml6b250YWxWYWx1ZXMgeyB7IH0sIHsgfSwgeyB9 IH07CisgICAgY29tcHV0ZUJvcmRlckFuZFBhZGRpbmcobGF5b3V0Qm94LCB1c2VkVmFsdWVzKTsK KyAgICBjb21wdXRlTWFyZ2luKGRvd25jYXN0PElubGluZUNvbnRhaW5lcj4obGF5b3V0Qm94KSwg dXNlZFZhbHVlcyk7CisgICAgbGF5b3V0U3RhdGUoKS5jcmVhdGVGb3JtYXR0aW5nQ29udGV4dChs YXlvdXRCb3gpLT5pbnN0cmluc2ljV2lkdGhDb25zdHJhaW50cygpOworfQorCiB2b2lkIElubGlu ZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlTWFyZ2luKGNvbnN0IElubGluZUNvbnRhaW5lciYg aW5saW5lQ29udGFpbmVyLCBVc2VkSG9yaXpvbnRhbFZhbHVlcyB1c2VkVmFsdWVzKSBjb25zdAog ewotICAgIC8vIE5vbi1yZXBsYWNlZCwgbm9uLWZvcm1hdHRpbmcgcm9vdCBjb250YWluZXJzICg8 c3Bhbj48L3NwYW4+KSBkb24ndCBoYXZlIHdpZHRoIHByb3BlcnR5IC0+IG5vbiB3aWR0aCBjb21w dXRhdGlvbi4gCisgICAgLy8gTm9uLXJlcGxhY2VkIGFuZCBmb3JtYXR0aW5nIHJvb3QgY29udGFp bmVycyAoPHNwYW4+PC9zcGFuPikgZG9uJ3QgaGF2ZSB3aWR0aCBwcm9wZXJ0eSAtPiBub24gd2lk dGggY29tcHV0YXRpb24uIAogICAgIEFTU0VSVCghaW5saW5lQ29udGFpbmVyLnJlcGxhY2VkKCkp OwotICAgIEFTU0VSVCghaW5saW5lQ29udGFpbmVyLmVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRl eHQoKSk7CiAKICAgICBhdXRvJiBkaXNwbGF5Qm94ID0gbGF5b3V0U3RhdGUoKS5kaXNwbGF5Qm94 Rm9yTGF5b3V0Qm94KGlubGluZUNvbnRhaW5lcik7CiAgICAgYXV0byBjb21wdXRlZEhvcml6b250 YWxNYXJnaW4gPSBHZW9tZXRyeTo6Y29tcHV0ZWRIb3Jpem9udGFsTWFyZ2luKGlubGluZUNvbnRh aW5lciwgdXNlZFZhbHVlcyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCBm ZmE3MGU5YzkwNy4uNmY5YzdhY2JhOTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmgKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQu aApAQCAtODYsNiArODYsNyBAQCBwcml2YXRlOgogICAgIH07CiAKICAgICB2b2lkIGxheW91dEZv cm1hdHRpbmdDb250ZXh0Um9vdChjb25zdCBCb3gmLCBVc2VkSG9yaXpvbnRhbFZhbHVlcykgY29u c3Q7CisgICAgdm9pZCBjb21wdXRlSW50cmluc2ljV2lkdGhGb3JGb3JtYXR0aW5nQ29udGV4dFJv b3QoY29uc3QgQm94JikgY29uc3Q7CiAgICAgdm9pZCBjb21wdXRlV2lkdGhBbmRIZWlnaHRGb3JS ZXBsYWNlZElubGluZUJveChjb25zdCBCb3gmLCBVc2VkSG9yaXpvbnRhbFZhbHVlcykgY29uc3Q7 CiAgICAgdm9pZCBjb21wdXRlTWFyZ2luKGNvbnN0IElubGluZUNvbnRhaW5lciYsIFVzZWRIb3Jp em9udGFsVmFsdWVzKSBjb25zdDsKICAgICB2b2lkIGNvbXB1dGVCb3JkZXJBbmRQYWRkaW5nKGNv bnN0IEJveCYsIFVzZWRIb3Jpem9udGFsVmFsdWVzKSBjb25zdDsK