184219 2018-03-31 19:35:45 -0700 [LayoutReloaded] FloatingContext does not need a parent formatting context. 2018-03-31 19:45:23 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan webkit-bug-importer oldest_to_newest 1410915 0 zalan 2018-03-31 19:35:45 -0700 Now that margins are moved over to Display.Box. This is in preparation for being able to create a FloatingContext for an inline formatting context when the context actually inherits the floating state from the formatting root's formatting state. 1410917 1 336947 zalan 2018-03-31 19:43:09 -0700 Created attachment 336947 Patch 1410918 2 zalan 2018-03-31 19:44:54 -0700 Committed r230139: <https://trac.webkit.org/changeset/230139> 1410919 3 webkit-bug-importer 2018-03-31 19:45:23 -0700 <rdar://problem/39079624> 336947 2018-03-31 19:43:09 -0700 2018-03-31 19:43:09 -0700 Patch bug-184219-20180331194309.patch text/plain 5211 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwMTM4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODI2YTRjNWMzYjA1NGVkNmEyM2IzNGI3NDg1OTVhY2Y0 MmQ0NDZjMC4uZTEzODJjNzVhYjA4OTczMjk5YzU3OTUwYmM2YzQ1ZTgzYzczMTgzYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDE4LTAzLTMxICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAg ICAgW0xheW91dFJlbG9hZGVkXSBGbG9hdGluZ0NvbnRleHQgZG9lcyBub3QgbmVlZCBhIHBhcmVu dCBmb3JtYXR0aW5nIGNvbnRleHQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xODQyMTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBXZSBkb24ndCBuZWVkIHRoZSBmb3JtYXR0aW5nIGNvbnRleHQgaW4gdGhl IEZsb2F0aW5nQ29udGV4dCBub3cgdGhhdCBtYXJnaW5zIGFyZSBtb3ZlZCBvdmVyIHRvIERpc3Bs YXkuQm94LgorICAgICAgICBUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciBiZWluZyBhYmxlIHRv IGNyZWF0ZSBhIEZsb2F0aW5nQ29udGV4dCBmb3IgYW4gaW5saW5lIGZvcm1hdHRpbmcgY29udGV4 dCwKKyAgICAgICAgd2hlbiB0aGUgaW5saW5lIGNvbnRleHQgYWN0dWFsbHkgaW5oZXJpdHMgdGhl IGZsb2F0aW5nIHN0YXRlIGZyb20gaXRzIGZvcm1hdHRpbmcgcm9vdC4KKworICAgICAgICAqIExh eW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Zsb2F0aW5nQ29udGV4dC5qczoKKyAgICAg ICAgKEZsb2F0aW5nQ29udGV4dCk6CisgICAgICAgIChGbG9hdGluZ0NvbnRleHQucHJvdG90eXBl Ll9hdmFpbGFibGVTcGFjZSk6CisgICAgICAgIChGbG9hdGluZ0NvbnRleHQucHJvdG90eXBlLl9h ZGp1c3RlZEZsb2F0aW5nUG9zaXRpb24pOgorICAgICAgICAoRmxvYXRpbmdDb250ZXh0LnByb3Rv dHlwZS5fYWRkRmxvYXRpbmdCb3gpOgorICAgICAgICAoRmxvYXRpbmdDb250ZXh0LnByb3RvdHlw ZS5fZm9ybWF0dGluZ0NvbnRleHQpOiBEZWxldGVkLgorICAgICAgICAqIExheW91dFJlbG9hZGVk L0Zvcm1hdHRpbmdDb250ZXh0L0Zvcm1hdHRpbmdDb250ZXh0LmpzOgorICAgICAgICAoRm9ybWF0 dGluZ0NvbnRleHQpOgorCiAyMDE4LTAzLTMxICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5j b20+CiAKICAgICAgICAgW0xheW91dFJlbG9hZGVkXSBEbyBub3QgY2xvbmUgRGlzcGxheS5Cb3gg Zm9yIEZsb2F0aW5nU3RhdGUgc3RhY2tzLgpkaWZmIC0tZ2l0IGEvVG9vbHMvTGF5b3V0UmVsb2Fk ZWQvRm9ybWF0dGluZ0NvbnRleHQvRmxvYXRpbmdDb250ZXh0LmpzIGIvVG9vbHMvTGF5b3V0UmVs b2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvRmxvYXRpbmdDb250ZXh0LmpzCmluZGV4IDRkNThhMmFl MzgyYTcxYzBlNDcxZjJjNDUzMzNjNmM4MmJjOWU1ZTMuLmNmYTk3ZWU3NDFjZmNkNDA4MzBjYjQw MzI2MTE2MDEwYWNlNDIyYjUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1h dHRpbmdDb250ZXh0L0Zsb2F0aW5nQ29udGV4dC5qcworKysgYi9Ub29scy9MYXlvdXRSZWxvYWRl ZC9Gb3JtYXR0aW5nQ29udGV4dC9GbG9hdGluZ0NvbnRleHQuanMKQEAgLTI1LDkgKzI1LDggQEAK IAogLy8gQWxsIGdlb21ldHJ5IGhlcmUgaXMgYWJzb2x1dGUgdG8gdGhlIGZvcm1hdHRpbmcgY29u dGV4dCdzIHJvb3QuCiBjbGFzcyBGbG9hdGluZ0NvbnRleHQgewotICAgIGNvbnN0cnVjdG9yKGZs b2F0aW5nU3RhdGUsIHBhcmVudEZvcm1hdHRpbmdDb250ZXh0KSB7CisgICAgY29uc3RydWN0b3Io ZmxvYXRpbmdTdGF0ZSkgewogICAgICAgICB0aGlzLm1fZmxvYXRpbmdTdGF0ZSA9IGZsb2F0aW5n U3RhdGU7Ci0gICAgICAgIHRoaXMubV9wYXJlbnRGb3JtYXR0aW5nQ29udGV4dCA9IHBhcmVudEZv cm1hdHRpbmdDb250ZXh0OwogICAgIH0KIAogICAgIGNvbXB1dGVQb3NpdGlvbihsYXlvdXRCb3gp IHsKQEAgLTEyMyw3ICsxMjIsNyBAQCBjbGFzcyBGbG9hdGluZ0NvbnRleHQgewogICAgIH0KIAog ICAgIF9hdmFpbGFibGVTcGFjZShjb250YWluaW5nQmxvY2ssIGZsb2F0aW5nUGFpcikgewotICAg ICAgICBsZXQgY29udGFpbmluZ0Jsb2NrQ29udGVudEJveCA9IHRoaXMuX2Zvcm1hdHRpbmdDb250 ZXh0KCkuZGlzcGxheUJveChjb250YWluaW5nQmxvY2spOworICAgICAgICBsZXQgY29udGFpbmlu Z0Jsb2NrQ29udGVudEJveCA9IHRoaXMuX2Zvcm1hdHRpbmdTdGF0ZSgpLmRpc3BsYXlCb3goY29u dGFpbmluZ0Jsb2NrKTsKICAgICAgICAgaWYgKGZsb2F0aW5nUGFpci5sZWZ0ICYmIGZsb2F0aW5n UGFpci5yaWdodCkKICAgICAgICAgICAgIHJldHVybiBmbG9hdGluZ1BhaXIucmlnaHQubGVmdCgp IC0gZmxvYXRpbmdQYWlyLmxlZnQucmlnaHQoKTsKICAgICAgICAgaWYgKGZsb2F0aW5nUGFpci5s ZWZ0KSB7CkBAIC0xNjIsOSArMTYxLDEwIEBAIGNsYXNzIEZsb2F0aW5nQ29udGV4dCB7CiAgICAg ICAgICAgICAgICAgICAgIHJpZ2h0ID0gZmxvYXRpbmdCb3hMZWZ0OwogICAgICAgICAgICAgfQog ICAgICAgICB9Ci0gICAgICAgIGxlZnQgKz0gdGhpcy5fZm9ybWF0dGluZ0NvbnRleHQoKS5tYXJn aW5MZWZ0KGZsb2F0aW5nQm94KTsKLSAgICAgICAgcmlnaHQgLT0gdGhpcy5fZm9ybWF0dGluZ0Nv bnRleHQoKS5tYXJnaW5SaWdodChmbG9hdGluZ0JveCk7Ci0gICAgICAgIHZlcnRpY2FsUG9zaXRp b24gKz0gdGhpcy5fZm9ybWF0dGluZ0NvbnRleHQoKS5tYXJnaW5Ub3AoZmxvYXRpbmdCb3gpOwor ICAgICAgICBsZXQgZmxvYXRpbmdEaXNwbGF5Qm94ID0gdGhpcy5fZm9ybWF0dGluZ1N0YXRlKCku ZGlzcGxheUJveChmbG9hdGluZ0JveCk7CisgICAgICAgIGxlZnQgKz0gZmxvYXRpbmdEaXNwbGF5 Qm94Lm1hcmdpbkxlZnQoKTsKKyAgICAgICAgcmlnaHQgLT0gZmxvYXRpbmdEaXNwbGF5Qm94Lm1h cmdpblJpZ2h0KCk7CisgICAgICAgIHZlcnRpY2FsUG9zaXRpb24gKz0gZmxvYXRpbmdEaXNwbGF5 Qm94Lm1hcmdpblRvcCgpOwogICAgICAgICAvLyBObyBjb252ZXJ0IHRoZW0gYmFjayByZWxhdGl2 ZSB0byB0aGUgZmxvYXRpbmdCb3gncyBjb250YWluaW5nIGJsb2NrLgogICAgICAgICBsZXQgY29u dGFpbmluZ0Jsb2NrTGVmdCA9IHRoaXMuX21hcEJvcmRlckJveFRvRm9ybWF0dGluZ1Jvb3QoY29u dGFpbmluZ0Jsb2NrKS5sZWZ0KCk7CiAgICAgICAgIGxldCBjb250YWluaW5nQmxvY2tUb3AgPSB0 aGlzLl9tYXBCb3JkZXJCb3hUb0Zvcm1hdHRpbmdSb290KGNvbnRhaW5pbmdCbG9jaykudG9wKCk7 CkBAIC0xNzQsNyArMTc0LDcgQEAgY2xhc3MgRmxvYXRpbmdDb250ZXh0IHsKIAogICAgICAgICBp ZiAoVXRpbHMuaXNGbG9hdGluZ0xlZnQoZmxvYXRpbmdCb3gpIHx8ICFVdGlscy5pc0Zsb2F0aW5n UG9zaXRpb25lZChmbG9hdGluZ0JveCkpCiAgICAgICAgICAgICByZXR1cm4gbmV3IExheW91dFBv aW50KHZlcnRpY2FsUG9zaXRpb24sIGxlZnQpOwotICAgICAgICByZXR1cm4gbmV3IExheW91dFBv aW50KHZlcnRpY2FsUG9zaXRpb24sIHJpZ2h0IC0gdGhpcy5fZm9ybWF0dGluZ0NvbnRleHQoKS5k aXNwbGF5Qm94KGZsb2F0aW5nQm94KS5yZWN0KCkud2lkdGgoKSk7CisgICAgICAgIHJldHVybiBu ZXcgTGF5b3V0UG9pbnQodmVydGljYWxQb3NpdGlvbiwgcmlnaHQgLSBmbG9hdGluZ0Rpc3BsYXlC b3gucmVjdCgpLndpZHRoKCkpOwogICAgIH0KIAogICAgIF9ib3R0b20oZmxvYXRpbmdTdGFjaykg ewpAQCAtMTg3LDcgKzE4Nyw3IEBAIGNsYXNzIEZsb2F0aW5nQ29udGV4dCB7CiAgICAgfQogCiAg ICAgX2FkZEZsb2F0aW5nQm94KGxheW91dEJveCkgewotICAgICAgICB0aGlzLl9mbG9hdGluZ1N0 YXRlKCkuYWRkRmxvYXRpbmcodGhpcy5fZm9ybWF0dGluZ0NvbnRleHQoKS5kaXNwbGF5Qm94KGxh eW91dEJveCksIFV0aWxzLmlzRmxvYXRpbmdMZWZ0KGxheW91dEJveCkpOworICAgICAgICB0aGlz Ll9mbG9hdGluZ1N0YXRlKCkuYWRkRmxvYXRpbmcodGhpcy5fZm9ybWF0dGluZ1N0YXRlKCkuZGlz cGxheUJveChsYXlvdXRCb3gpLCBVdGlscy5pc0Zsb2F0aW5nTGVmdChsYXlvdXRCb3gpKTsKICAg ICB9CiAKICAgICBfbWFwTWFyZ2luQm94VG9Gb3JtYXR0aW5nUm9vdChsYXlvdXRCb3gpIHsKQEAg LTIxNiwxMCArMjE2LDYgQEAgY2xhc3MgRmxvYXRpbmdDb250ZXh0IHsKICAgICAgICAgcmV0dXJu IHRoaXMubV9mbG9hdGluZ1N0YXRlOwogICAgIH0KIAotICAgIF9mb3JtYXR0aW5nQ29udGV4dCgp IHsKLSAgICAgICAgcmV0dXJuIHRoaXMubV9wYXJlbnRGb3JtYXR0aW5nQ29udGV4dDsKLSAgICB9 Ci0KICAgICBfZm9ybWF0dGluZ1Jvb3QoKSB7CiAgICAgICAgIHJldHVybiB0aGlzLl9mb3JtYXR0 aW5nU3RhdGUoKS5mb3JtYXR0aW5nUm9vdCgpOwogICAgIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL0xh eW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Zvcm1hdHRpbmdDb250ZXh0LmpzIGIvVG9v bHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvRm9ybWF0dGluZ0NvbnRleHQuanMK aW5kZXggZjUyMWYwNTRlMzUyZmRkMWNjYTJmZGQwMDBmYTcwMDBhMzRmMjZjZi4uMGFiOGFkMDAz ZTljYjM2MjdhYjI0YTFlOTBjY2M3M2I3MzQwYTc3NSAxMDA2NDQKLS0tIGEvVG9vbHMvTGF5b3V0 UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvRm9ybWF0dGluZ0NvbnRleHQuanMKKysrIGIvVG9v bHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvRm9ybWF0dGluZ0NvbnRleHQuanMK QEAgLTI2LDcgKzI2LDcgQEAKIGNsYXNzIEZvcm1hdHRpbmdDb250ZXh0IHsKICAgICBjb25zdHJ1 Y3Rvcihmb3JtYXR0aW5nU3RhdGUpIHsKICAgICAgICAgdGhpcy5tX2Zvcm1hdHRpbmdTdGF0ZSA9 IGZvcm1hdHRpbmdTdGF0ZTsKLSAgICAgICAgdGhpcy5tX2Zsb2F0aW5nQ29udGV4dCA9IG5ldyBG bG9hdGluZ0NvbnRleHQoZm9ybWF0dGluZ1N0YXRlLmZsb2F0aW5nU3RhdGUoKSwgdGhpcyk7Cisg ICAgICAgIHRoaXMubV9mbG9hdGluZ0NvbnRleHQgPSBuZXcgRmxvYXRpbmdDb250ZXh0KGZvcm1h dHRpbmdTdGF0ZS5mbG9hdGluZ1N0YXRlKCkpOwogICAgICAgICB0aGlzLm1fbGF5b3V0U3RhY2sg PSBuZXcgQXJyYXkoKTsKICAgICB9CiAK