217402 2020-10-06 13:21:53 -0700 [LFC][BFC] Move document box special height computation out of contentHeightForFormattingContextRoot 2020-10-06 16:01:19 -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 1695287 0 zalan 2020-10-06 13:21:53 -0700 it's not a formatting context root 1695288 1 410687 zalan 2020-10-06 13:24:41 -0700 Created attachment 410687 Patch 1695309 2 410687 simon.fraser 2020-10-06 14:17:50 -0700 Comment on attachment 410687 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=410687&action=review > Source/WebCore/layout/FormattingContextGeometry.cpp:826 > + else if (layoutBox.isDocumentBox() && !layoutBox.establishesFormattingContext()) { isDocumentElementBox 1695319 3 zalan 2020-10-06 14:40:15 -0700 (In reply to Simon Fraser (smfr) from comment #2) > Comment on attachment 410687 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=410687&action=review > > > Source/WebCore/layout/FormattingContextGeometry.cpp:826 > > + else if (layoutBox.isDocumentBox() && !layoutBox.establishesFormattingContext()) { > > isDocumentElementBox Make sense. Will rename it in a separate patch. 1695368 4 ews-feeder 2020-10-06 16:00:02 -0700 Committed r268082: <https://trac.webkit.org/changeset/268082> All reviewed patches have been landed. Closing bug and clearing flags on attachment 410687. 1695370 5 webkit-bug-importer 2020-10-06 16:01:19 -0700 <rdar://problem/70021597> 410687 2020-10-06 13:24:41 -0700 2020-10-06 16:00:02 -0700 Patch bug-217402-20201006132440.patch text/plain 5976 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3OTczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGFjNjllMzU2ZjA3NTgy NGM2YjZkMDQzZmFiODQzMzg0ZThiODE1NC4uNzVjMTdhMDkwMmQ1ZmNkNGE4ZmRkZGU4ZDk5YmVl NDY4YjU0OTg5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTEwLTA2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bQkZDXSBNb3ZlIGRv Y3VtZW50IGJveCBzcGVjaWFsIGhlaWdodCBjb21wdXRhdGlvbiBvdXQgb2YgY29udGVudEhlaWdo dEZvckZvcm1hdHRpbmdDb250ZXh0Um9vdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjE3NDAyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgRG9jdW1lbnQgYm94ICg8aHRtbD4pIGlzIG5vdCBhIGZvcm1hdHRp bmcgY29udGV4dCByb290IGFuZCB3aGlsZSBpdHMgY29udGVudCBoZWlnaHQgY29tcHV0YXRpb24g aXMgdmVyeSBzaW1pbGFyIHRvCisgICAgICAgIEJGQyByb290IGhlaWdodCBjb21wdXRhdGlvbiwg aXQgc2hvdWxkIG5vdCBwb2xsdXRlIHRoZSBnZW5lcmljIGNvbnRlbnRIZWlnaHRGb3JGb3JtYXR0 aW5nQ29udGV4dFJvb3QgY29kZS4KKworICAgICAgICAqIGxheW91dC9Gb3JtYXR0aW5nQ29udGV4 dEdlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRl eHQ6Okdlb21ldHJ5Ojpjb250ZW50SGVpZ2h0Rm9yRm9ybWF0dGluZ0NvbnRleHRSb290IGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5 Ojpjb21wbGljYXRlZENhc2VzIGNvbnN0KToKKwogMjAyMC0xMC0wNiAgWmFsYW4gQnVqdGFzICA8 emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0Zsb2F0aW5nXSBSZW1vdmUgcmVkdW5k YW50IEZvcm1hdHRpbmdDb250ZXh0Um9vdCBpbiBGbG9hdGluZ0NvbnRleHQgYyd0b3IKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNw cCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApp bmRleCA0ZmY0MzI1NDc0ZDIyNzk4YmZmMzgwNjI4OGU2YzI2NGRkNzIwZjVjLi41OTZmYjI5Njky Y2I3MDdhY2RkNjYwODkwOTg0NjkzZGUxYTg5NmIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCkBAIC0xNzAsNyArMTcwLDgg QEAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojpjb21w dXRlZFdpZHRoKGNvbnN0IEJveCYgbGF5b3UKIAogTGF5b3V0VW5pdCBGb3JtYXR0aW5nQ29udGV4 dDo6R2VvbWV0cnk6OmNvbnRlbnRIZWlnaHRGb3JGb3JtYXR0aW5nQ29udGV4dFJvb3QoY29uc3Qg Qm94JiBsYXlvdXRCb3gpIGNvbnN0CiB7Ci0gICAgQVNTRVJUKChpc0hlaWdodEF1dG8obGF5b3V0 Qm94KSB8fCBsYXlvdXRCb3guZXN0YWJsaXNoZXNUYWJsZUZvcm1hdHRpbmdDb250ZXh0KCkgfHwg bGF5b3V0Qm94LmlzVGFibGVDZWxsKCkpICYmIChsYXlvdXRCb3guZXN0YWJsaXNoZXNGb3JtYXR0 aW5nQ29udGV4dCgpIHx8IGxheW91dEJveC5pc0RvY3VtZW50Qm94KCkpKTsKKyAgICBBU1NFUlQo bGF5b3V0Qm94LmVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQoKSk7CisgICAgQVNTRVJUKGlz SGVpZ2h0QXV0byhsYXlvdXRCb3gpIHx8IGxheW91dEJveC5lc3RhYmxpc2hlc1RhYmxlRm9ybWF0 dGluZ0NvbnRleHQoKSB8fCBsYXlvdXRCb3guaXNUYWJsZUNlbGwoKSk7CiAKICAgICAvLyAxMC42 LjcgJ0F1dG8nIGhlaWdodHMgZm9yIGJsb2NrIGZvcm1hdHRpbmcgY29udGV4dCByb290cwogCkBA IC0yMDMsNyArMjA0LDcgQEAgTGF5b3V0VW5pdCBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6 OmNvbnRlbnRIZWlnaHRGb3JGb3JtYXR0aW5nQ29udGV4dFJvb3QoY28KICAgICAgICAgLy8gRklY TUU6IE1vdmUgZmxleCBvdmVyIHRvIGxheW91dCBnZW9tZXRyeS4KICAgICAgICAgdG9wID0gbGlu ZXMuZmlyc3QoKS50b3AoKTsKICAgICAgICAgYm90dG9tID0gbGluZXMubGFzdCgpLmJvdHRvbSgp OwotICAgIH0gZWxzZSBpZiAoZm9ybWF0dGluZ1Jvb3RDb250YWluZXIuZXN0YWJsaXNoZXNCbG9j a0Zvcm1hdHRpbmdDb250ZXh0KCkgfHwgZm9ybWF0dGluZ1Jvb3RDb250YWluZXIuZXN0YWJsaXNo ZXNUYWJsZUZvcm1hdHRpbmdDb250ZXh0KCkgfHwgZm9ybWF0dGluZ1Jvb3RDb250YWluZXIuaXNE b2N1bWVudEJveCgpKSB7CisgICAgfSBlbHNlIGlmIChmb3JtYXR0aW5nUm9vdENvbnRhaW5lci5l c3RhYmxpc2hlc0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQoKSB8fCBmb3JtYXR0aW5nUm9vdENvbnRh aW5lci5lc3RhYmxpc2hlc1RhYmxlRm9ybWF0dGluZ0NvbnRleHQoKSkgewogICAgICAgICBpZiAo Zm9ybWF0dGluZ1Jvb3RDb250YWluZXIuaGFzSW5GbG93Q2hpbGQoKSkgewogICAgICAgICAgICAg YXV0byYgZmlyc3RCb3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdDb250ZXh0Lmdlb21ldHJ5Rm9yQm94 KCpmb3JtYXR0aW5nUm9vdENvbnRhaW5lci5maXJzdEluRmxvd0NoaWxkKCksIEVzY2FwZVJlYXNv bjo6TmVlZHNHZW9tZXRyeUZyb21Fc3RhYmxpc2hlZEZvcm1hdHRpbmdDb250ZXh0KTsKICAgICAg ICAgICAgIGF1dG8mIGxhc3RCb3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdDb250ZXh0Lmdlb21ldHJ5 Rm9yQm94KCpmb3JtYXR0aW5nUm9vdENvbnRhaW5lci5sYXN0SW5GbG93Q2hpbGQoKSwgRXNjYXBl UmVhc29uOjpOZWVkc0dlb21ldHJ5RnJvbUVzdGFibGlzaGVkRm9ybWF0dGluZ0NvbnRleHQpOwpA QCAtMjEzLDE4ICsyMTQsMTEgQEAgTGF5b3V0VW5pdCBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0 cnk6OmNvbnRlbnRIZWlnaHRGb3JGb3JtYXR0aW5nQ29udGV4dFJvb3QoY28KICAgICB9IGVsc2UK ICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAKLSAgICBhdXRvKiBmb3JtYXR0aW5nQ29u dGV4dFJvb3QgPSAmZm9ybWF0dGluZ1Jvb3RDb250YWluZXI7Ci0gICAgLy8gVE9ETzogVGhlIGRv Y3VtZW50IHJlbmRlcmVyIGlzIG5vdCBhIGZvcm1hdHRpbmcgY29udGV4dCByb290IGJ5IGRlZmF1 bHQgYXQgYWxsLiBOZWVkIHRvIGZpbmQgb3V0IHdoYXQgaXQgaXMuCi0gICAgaWYgKCFsYXlvdXRC b3guZXN0YWJsaXNoZXNGb3JtYXR0aW5nQ29udGV4dCgpKSB7Ci0gICAgICAgIEFTU0VSVChsYXlv dXRCb3guaXNEb2N1bWVudEJveCgpKTsKLSAgICAgICAgZm9ybWF0dGluZ0NvbnRleHRSb290ID0g JmxheW91dEJveC5mb3JtYXR0aW5nQ29udGV4dFJvb3QoKTsKLSAgICB9Ci0KLSAgICBhdXRvJiBm bG9hdGluZ1N0YXRlID0gbGF5b3V0U3RhdGUuZXN0YWJsaXNoZWRGb3JtYXR0aW5nU3RhdGUoKmZv cm1hdHRpbmdDb250ZXh0Um9vdCkuZmxvYXRpbmdTdGF0ZSgpOwotICAgIGF1dG8gZmxvYXRCb3R0 b20gPSBmbG9hdGluZ1N0YXRlLmJvdHRvbSgqZm9ybWF0dGluZ0NvbnRleHRSb290KTsKKyAgICBh dXRvJiBmbG9hdGluZ1N0YXRlID0gbGF5b3V0U3RhdGUuZXN0YWJsaXNoZWRGb3JtYXR0aW5nU3Rh dGUoZm9ybWF0dGluZ1Jvb3RDb250YWluZXIpLmZsb2F0aW5nU3RhdGUoKTsKKyAgICBhdXRvIGZs b2F0Qm90dG9tID0gZmxvYXRpbmdTdGF0ZS5ib3R0b20oZm9ybWF0dGluZ1Jvb3RDb250YWluZXIp OwogICAgIGlmIChmbG9hdEJvdHRvbSkgewogICAgICAgICBib3R0b20gPSBzdGQ6Om1heDxMYXlv dXRVbml0PigqZmxvYXRCb3R0b20sIGJvdHRvbSk7Ci0gICAgICAgIGF1dG8gZmxvYXRUb3AgPSBm bG9hdGluZ1N0YXRlLnRvcCgqZm9ybWF0dGluZ0NvbnRleHRSb290KTsKKyAgICAgICAgYXV0byBm bG9hdFRvcCA9IGZsb2F0aW5nU3RhdGUudG9wKGZvcm1hdHRpbmdSb290Q29udGFpbmVyKTsKICAg ICAgICAgQVNTRVJUKGZsb2F0VG9wKTsKICAgICAgICAgdG9wID0gc3RkOjptaW48TGF5b3V0VW5p dD4oKmZsb2F0VG9wLCB0b3ApOwogICAgIH0KQEAgLTgyNyw3ICs4MjEsMjcgQEAgQ29udGVudEhl aWdodEFuZE1hcmdpbiBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNvbXBsaWNhdGVkQ2Fz ZXMoY29uc3QgQm94JgogICAgIC8vICMyCiAgICAgaWYgKCFoZWlnaHQpIHsKICAgICAgICAgQVNT RVJUKGlzSGVpZ2h0QXV0byhsYXlvdXRCb3gpKTsKLSAgICAgICAgaGVpZ2h0ID0gY29udGVudEhl aWdodEZvckZvcm1hdHRpbmdDb250ZXh0Um9vdChsYXlvdXRCb3gpOworICAgICAgICBpZiAoIWlz PENvbnRhaW5lckJveD4obGF5b3V0Qm94KSB8fCAhZG93bmNhc3Q8Q29udGFpbmVyQm94PihsYXlv dXRCb3gpLmhhc0luRmxvd09yRmxvYXRpbmdDaGlsZCgpKQorICAgICAgICAgICAgaGVpZ2h0ID0g MF9sdTsKKyAgICAgICAgZWxzZSBpZiAobGF5b3V0Qm94LmlzRG9jdW1lbnRCb3goKSAmJiAhbGF5 b3V0Qm94LmVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQoKSkgeworICAgICAgICAgICAgYXV0 byYgZG9jdW1lbnRCb3ggPSBkb3duY2FzdDxDb250YWluZXJCb3g+KGxheW91dEJveCk7CisgICAg ICAgICAgICBhdXRvIHRvcCA9IGZvcm1hdHRpbmdDb250ZXh0KCkuZ2VvbWV0cnlGb3JCb3goKmRv Y3VtZW50Qm94LmZpcnN0SW5GbG93Q2hpbGQoKSkubG9naWNhbFJlY3RXaXRoTWFyZ2luKCkudG9w KCk7CisgICAgICAgICAgICBhdXRvIGJvdHRvbSA9IGZvcm1hdHRpbmdDb250ZXh0KCkuZ2VvbWV0 cnlGb3JCb3goKmRvY3VtZW50Qm94Lmxhc3RJbkZsb3dDaGlsZCgpKS5sb2dpY2FsUmVjdFdpdGhN YXJnaW4oKS5ib3R0b20oKTsKKyAgICAgICAgICAgIC8vIFRoaXMgaXMgYSBzcGVjaWFsIChxdWly az8pIGJlaGF2aW9yIHNpbmNlIHRoZSBkb2N1bWVudCBib3ggaXMgbm90IGEgZm9ybWF0dGluZyBj b250ZXh0IHJvb3QgYW5kCisgICAgICAgICAgICAvLyBhbGwgdGhlIGZsb2F0IGJveGVzIGVuZCB1 cCBhdCB0aGUgSUNCIGxldmVsLgorICAgICAgICAgICAgYXV0byYgaW5pdGlhbENvbnRhaW5pbmdC bG9jayA9IGRvY3VtZW50Qm94LmZvcm1hdHRpbmdDb250ZXh0Um9vdCgpOworICAgICAgICAgICAg YXV0byYgZmxvYXRpbmdTdGF0ZSA9IGxheW91dFN0YXRlKCkuZXN0YWJsaXNoZWRGb3JtYXR0aW5n U3RhdGUoaW5pdGlhbENvbnRhaW5pbmdCbG9jaykuZmxvYXRpbmdTdGF0ZSgpOworICAgICAgICAg ICAgaWYgKGF1dG8gZmxvYXRCb3R0b20gPSBmbG9hdGluZ1N0YXRlLmJvdHRvbShpbml0aWFsQ29u dGFpbmluZ0Jsb2NrKSkgeworICAgICAgICAgICAgICAgIGJvdHRvbSA9IHN0ZDo6bWF4PExheW91 dFVuaXQ+KCpmbG9hdEJvdHRvbSwgYm90dG9tKTsKKyAgICAgICAgICAgICAgICBhdXRvIGZsb2F0 VG9wID0gZmxvYXRpbmdTdGF0ZS50b3AoaW5pdGlhbENvbnRhaW5pbmdCbG9jayk7CisgICAgICAg ICAgICAgICAgQVNTRVJUKGZsb2F0VG9wKTsKKyAgICAgICAgICAgICAgICB0b3AgPSBzdGQ6Om1p bjxMYXlvdXRVbml0PigqZmxvYXRUb3AsIHRvcCk7CisgICAgICAgICAgICB9CisgICAgICAgICAg ICBoZWlnaHQgPSBib3R0b20gLSB0b3A7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBB U1NFUlQobGF5b3V0Qm94LmVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQoKSk7CisgICAgICAg ICAgICBoZWlnaHQgPSBjb250ZW50SGVpZ2h0Rm9yRm9ybWF0dGluZ0NvbnRleHRSb290KGxheW91 dEJveCk7CisgICAgICAgIH0KICAgICB9CiAKICAgICBBU1NFUlQoaGVpZ2h0KTsK