184212 2018-03-31 17:47:04 -0700 [layoutReloaded] Introduce margin to Display.Box 2018-03-31 17:51:21 -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 1410889 0 zalan 2018-03-31 17:47:04 -0700 This is in preparation for moving margin box out of formatting context to Display.Box 1410892 1 336939 zalan 2018-03-31 17:48:15 -0700 Created attachment 336939 Patch 1410893 2 zalan 2018-03-31 17:50:18 -0700 Committed r230135: <https://trac.webkit.org/changeset/230135> 1410894 3 webkit-bug-importer 2018-03-31 17:51:21 -0700 <rdar://problem/39078371> 336939 2018-03-31 17:48:15 -0700 2018-03-31 17:48:15 -0700 Patch bug-184212-20180331174815.patch text/plain 7395 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwMTM0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzBjOWE3NDVlODYzYjg5MTJhYjE1ZjY2ZDU4NjY5NTgz MmI2MmQyMi4uYTkyODhmMjY2NTRmY2ZhN2QxNWMyYjBjMzhjYTI4OWU0YjBiMjcxNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3 IEBACisyMDE4LTAzLTMxICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAg ICAgW2xheW91dFJlbG9hZGVkXSBJbnRyb2R1Y2UgbWFyZ2luIHRvIERpc3BsYXkuQm94CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODQyMTIKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIGluIHBy ZXBhcmF0aW9uIGZvciBtb3ZpbmcgbWFyZ2luIGJveCBvdXQgb2YgZm9ybWF0dGluZyBjb250ZXh0 IHRvIERpc3BsYXkuQm94LgorCisgICAgICAgICogTGF5b3V0UmVsb2FkZWQvRGlzcGxheVRyZWUv Qm94LmpzOgorICAgICAgICAoRGlzcGxheS5Cb3gpOgorICAgICAgICAoRGlzcGxheS5Cb3gucHJv dG90eXBlLnNldFJlY3QpOgorICAgICAgICAoRGlzcGxheS5Cb3gucHJvdG90eXBlLnNldFRvcExl ZnQpOgorICAgICAgICAoRGlzcGxheS5Cb3gucHJvdG90eXBlLnNldFRvcCk6CisgICAgICAgIChE aXNwbGF5LkJveC5wcm90b3R5cGUuc2V0TGVmdCk6CisgICAgICAgIChEaXNwbGF5LkJveC5wcm90 b3R5cGUuc2V0U2l6ZSk6CisgICAgICAgIChEaXNwbGF5LkJveC5wcm90b3R5cGUuc2V0V2lkdGgp OgorICAgICAgICAoRGlzcGxheS5Cb3gucHJvdG90eXBlLnNldEhlaWdodCk6CisgICAgICAgIChE aXNwbGF5LkJveC5wcm90b3R5cGUud2lkdGgpOgorICAgICAgICAoRGlzcGxheS5Cb3gucHJvdG90 eXBlLnNldE1hcmdpblRvcCk6CisgICAgICAgIChEaXNwbGF5LkJveC5wcm90b3R5cGUuc2V0TWFy Z2luTGVmdCk6CisgICAgICAgIChEaXNwbGF5LkJveC5wcm90b3R5cGUuc2V0TWFyZ2luQm90dG9t KToKKyAgICAgICAgKERpc3BsYXkuQm94LnByb3RvdHlwZS5zZXRNYXJnaW5SaWdodCk6CisgICAg ICAgIChEaXNwbGF5LkJveC5wcm90b3R5cGUubWFyZ2luVG9wKToKKyAgICAgICAgKERpc3BsYXku Qm94LnByb3RvdHlwZS5tYXJnaW5MZWZ0KToKKyAgICAgICAgKERpc3BsYXkuQm94LnByb3RvdHlw ZS5tYXJnaW5Cb3R0b20pOgorICAgICAgICAoRGlzcGxheS5Cb3gucHJvdG90eXBlLm1hcmdpblJp Z2h0KToKKyAgICAgICAgKERpc3BsYXkuQm94LnByb3RvdHlwZS5tYXJnaW5Cb3gpOgorICAgICAg ICAqIExheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Zvcm1hdHRpbmdDb250ZXh0Lmpz OgorICAgICAgICAoRm9ybWF0dGluZ0NvbnRleHQucHJvdG90eXBlLmFic29sdXRlTWFyZ2luQm94 KToKKyAgICAgICAgKEZvcm1hdHRpbmdDb250ZXh0LnByb3RvdHlwZS5fYWRkVG9MYXlvdXRRdWV1 ZSk6CisgICAgICAgICogTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ1N0YXRlL0Zvcm1hdHRpbmdT dGF0ZS5qczoKKyAgICAgICAgKEZvcm1hdHRpbmdTdGF0ZS5wcm90b3R5cGUuY3JlYXRlRGlzcGxh eUJveCk6CisKIDIwMTgtMDMtMzEgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAog ICAgICAgICBbTGF5b3V0UmVsb2FkZWRdIEFkZCB0cmVlIGNvbnRleHQgdG8gRGlzcGxheS5Cb3gK ZGlmZiAtLWdpdCBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Rpc3BsYXlUcmVlL0JveC5qcyBiL1Rv b2xzL0xheW91dFJlbG9hZGVkL0Rpc3BsYXlUcmVlL0JveC5qcwppbmRleCA3NjFlZjZlZTcwOTNi ZDc1ZjI4YjdlZWQ4OGEwZmFlMmZmYmI1YTY0Li40N2VkMTUwZGI1YzM1MWIwOGQ4MTE2MWYxYWNj N2RkYzc5ZTMxN2JhIDEwMDY0NAotLS0gYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9EaXNwbGF5VHJl ZS9Cb3guanMKKysrIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRGlzcGxheVRyZWUvQm94LmpzCkBA IC0yOSw2ICsyOSwxMCBAQCBEaXNwbGF5LkJveCA9IGNsYXNzIEJveCB7CiAgICAgY29uc3RydWN0 b3Iobm9kZSkgewogICAgICAgICB0aGlzLm1fbm9kZSA9IG5vZGU7CiAgICAgICAgIHRoaXMubV9y ZWN0ID0gbmV3IExheW91dFJlY3QobmV3IExheW91dFBvaW50KDAsIDApLCBuZXcgTGF5b3V0U2l6 ZSgwLCAwKSk7CisgICAgICAgIHRoaXMubV9tYXJnaW5Ub3AgPSAwOworICAgICAgICB0aGlzLm1f bWFyZ2luTGVmdCA9IDA7CisgICAgICAgIHRoaXMubV9tYXJnaW5Cb3R0b20gPSAwOworICAgICAg ICB0aGlzLm1fbWFyZ2luUmlnaHQgPSAwOwogICAgICAgICB0aGlzLm1fcGFyZW50ID0gbnVsbDsK ICAgICAgICAgdGhpcy5tX25leHRTaWJsaW5nID0gbnVsbDsKICAgICAgICAgdGhpcy5tX3ByZXZp b3VzU2libGluZyA9IG51bGw7CkBAIC00MiwxNCArNDYsMzggQEAgRGlzcGxheS5Cb3ggPSBjbGFz cyBCb3ggewogICAgICAgICByZXR1cm4gY2xvbmVCb3g7CiAgICAgfQogCisgICAgc2V0UmVjdChy ZWN0KSB7CisgICAgICAgIHJldHVybiB0aGlzLm1fcmVjdCA9IHJlY3Q7CisgICAgfQorCisgICAg c2V0VG9wTGVmdCh0b3BMZWZ0KSB7CisgICAgICAgIHRoaXMubV9yZWN0LnNldFRvcExlZnQodG9w TGVmdCk7CisgICAgfQorCisgICAgc2V0VG9wKHRvcCkgeworICAgICAgICB0aGlzLm1fcmVjdC5z ZXRUb3AodG9wKTsKKyAgICB9CisKKyAgICBzZXRMZWZ0KGxlZnQpIHsKKyAgICAgICAgdGhpcy5t X3JlY3Quc2V0TGVmdChsZWZ0KTsKKyAgICB9CisKKyAgICBzZXRTaXplKHNpemUpIHsKKyAgICAg ICAgdGhpcy5tX3JlY3Quc2V0U2l6ZShzaXplKTsKKyAgICB9CisKKyAgICBzZXRXaWR0aCh3aWR0 aCkgeworICAgICAgICB0aGlzLm1fcmVjdC5zZXRXaWR0aCh3aWR0aCk7CisgICAgfQorCisgICAg c2V0SGVpZ2h0KGhlaWdodCkgeworICAgICAgICB0aGlzLm1fcmVjdC5zZXRIZWlnaHQoaGVpZ2h0 KTsKKyAgICB9CisKICAgICByZWN0KCkgewogICAgICAgICByZXR1cm4gdGhpcy5tX3JlY3QuY2xv bmUoKTsKICAgICB9CiAKLSAgICBzZXRSZWN0KHJlY3QpIHsKLSAgICAgICAgcmV0dXJuIHRoaXMu bV9yZWN0ID0gcmVjdDsKLSAgICB9Ci0gICAgCiAgICAgdG9wKCkgewogICAgICAgICByZXR1cm4g dGhpcy5yZWN0KCkudG9wKCk7CiAgICAgfQpAQCAtNzgsMzQgKzEwNiw1MyBAQCBEaXNwbGF5LkJv eCA9IGNsYXNzIEJveCB7CiAgICAgICAgIHJldHVybiB0aGlzLnJlY3QoKS5zaXplKCk7CiAgICAg fQogCisgICAgd2lkdGgoKSB7CisgICAgICAgIHJldHVybiB0aGlzLnJlY3QoKS53aWR0aCgpOwor ICAgIH0KKwogICAgIGhlaWdodCgpIHsKICAgICAgICAgcmV0dXJuIHRoaXMucmVjdCgpLmhlaWdo dCgpOwogICAgIH0KIAotICAgIHdpZHRoKCkgewotICAgICAgICByZXR1cm4gdGhpcy5yZWN0KCku d2lkdGgoKTsKLSAgICB9CisgICAgc2V0TWFyZ2luVG9wKG1hcmdpblRvcCkgeworICAgICAgICB0 aGlzLm1fbWFyZ2luVG9wID0gbWFyZ2luVG9wOworICAgICB9CiAKLSAgICBzZXRUb3BMZWZ0KHRv cExlZnQpIHsKLSAgICAgICAgdGhpcy5tX3JlY3Quc2V0VG9wTGVmdCh0b3BMZWZ0KTsKKyAgICBz ZXRNYXJnaW5MZWZ0KG1hcmdpbkxlZnQpIHsKKyAgICAgICAgdGhpcy5tX21hcmdpbkxlZnQgPSBt YXJnaW5MZWZ0OworICAgICB9CisKKyAgICBzZXRNYXJnaW5Cb3R0b20obWFyZ2luQm90dG9tKSB7 CisgICAgICAgIHRoaXMubV9tYXJnaW5Cb3R0b20gPSBtYXJnaW5Cb3R0b207CisgICAgIH0KKwor ICAgIHNldE1hcmdpblJpZ2h0KG1hcmdpblJpZ2h0KSB7CisgICAgICAgIHRoaXMubV9tYXJnaW5S aWdodCA9IG1hcmdpblJpZ2h0OwogICAgIH0KIAotICAgIHNldFRvcCh0b3ApIHsKLSAgICAgICAg dGhpcy5tX3JlY3Quc2V0VG9wKHRvcCk7CisgICAgbWFyZ2luVG9wKCkgeworICAgICAgICByZXR1 cm4gdGhpcy5tX21hcmdpblRvcDsKICAgICB9CiAKLSAgICBzZXRTaXplKHNpemUpIHsKLSAgICAg ICAgdGhpcy5tX3JlY3Quc2V0U2l6ZShzaXplKTsKKyAgICBtYXJnaW5MZWZ0KCkgeworICAgICAg ICByZXR1cm4gdGhpcy5tX21hcmdpbkxlZnQ7CiAgICAgfQogCi0gICAgc2V0V2lkdGgod2lkdGgp IHsKLSAgICAgICAgdGhpcy5tX3JlY3Quc2V0V2lkdGgod2lkdGgpOworICAgIG1hcmdpbkJvdHRv bSgpIHsKKyAgICAgICAgcmV0dXJuIHRoaXMubV9tYXJnaW5Cb3R0b207CiAgICAgfQogCi0gICAg c2V0SGVpZ2h0KGhlaWdodCkgewotICAgICAgICB0aGlzLm1fcmVjdC5zZXRIZWlnaHQoaGVpZ2h0 KTsKKyAgICBtYXJnaW5SaWdodCgpIHsKKyAgICAgICAgcmV0dXJuIHRoaXMubV9tYXJnaW5SaWdo dDsKICAgICB9CiAKKyAgICBtYXJnaW5Cb3goKSB7CisgICAgICAgIGxldCBtYXJnaW5Cb3ggPSB0 aGlzLnJlY3QoKTsKKyAgICAgICAgbWFyZ2luQm94Lm1vdmVCeShuZXcgTGF5b3V0U2l6ZSgtdGhp cy5tX21hcmdpbkxlZnQsIC10aGlzLm1fbWFyZ2luVG9wKSk7CisgICAgICAgIG1hcmdpbkJveC5n cm93QnkobmV3IExheW91dFNpemUodGhpcy5tX21hcmdpbkxlZnQgKyB0aGlzLm1fbWFyZ2luUmln aHQsIHRoaXMubV9tYXJnaW5Ub3AgKyB0aGlzLm1fbWFyZ2luQm90dG9tKSk7CisgICAgICAgIHJl dHVybiBtYXJnaW5Cb3g7CisgICAgIH0KKwogICAgIGJvcmRlckJveCgpIHsKICAgICAgICAgcmV0 dXJuIG5ldyBMYXlvdXRSZWN0KG5ldyBMYXlvdXRQb2ludCgwLCAwKSwgdGhpcy5yZWN0KCkuc2l6 ZSgpKTsKICAgICB9CmRpZmYgLS1naXQgYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5n Q29udGV4dC9Gb3JtYXR0aW5nQ29udGV4dC5qcyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1h dHRpbmdDb250ZXh0L0Zvcm1hdHRpbmdDb250ZXh0LmpzCmluZGV4IDQyMGUzMzk5Yzk3NGQ4MWIx NDAxNWJmMmI3M2YwMTUxMDRlYTE3MDYuLmMxNDU1ZDQ5NWY1OWMyYjdjZmQ5MDc4ZTZkYzg4Zjk4 ZGY3OTllNjMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250 ZXh0L0Zvcm1hdHRpbmdDb250ZXh0LmpzCisrKyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1h dHRpbmdDb250ZXh0L0Zvcm1hdHRpbmdDb250ZXh0LmpzCkBAIC03NCwxMCArNzQsMTAgQEAgY2xh c3MgRm9ybWF0dGluZ0NvbnRleHQgewogCiAgICAgYWJzb2x1dGVNYXJnaW5Cb3gobGF5b3V0Qm94 KSB7CiAgICAgICAgIGxldCBkaXNwbGF5Qm94ID0gdGhpcy5kaXNwbGF5Qm94KGxheW91dEJveCk7 Ci0gICAgICAgIGxldCBhYnNvbHV0ZUNvbnRlbnRCb3ggPSBuZXcgTGF5b3V0UmVjdCh0aGlzLl90 b1Jvb3RBYnNvbHV0ZVBvc2l0aW9uKGxheW91dEJveCksIGRpc3BsYXlCb3guc2l6ZSgpKTsKLSAg ICAgICAgYWJzb2x1dGVDb250ZW50Qm94Lm1vdmVCeShuZXcgTGF5b3V0U2l6ZSgtdGhpcy5tYXJn aW5MZWZ0KGxheW91dEJveCksIC10aGlzLm1hcmdpblRvcChsYXlvdXRCb3gpKSk7Ci0gICAgICAg IGFic29sdXRlQ29udGVudEJveC5ncm93QnkobmV3IExheW91dFNpemUodGhpcy5tYXJnaW5MZWZ0 KGxheW91dEJveCkgKyB0aGlzLm1hcmdpblJpZ2h0KGxheW91dEJveCksIHRoaXMubWFyZ2luVG9w KGxheW91dEJveCkgKyB0aGlzLm1hcmdpbkJvdHRvbShsYXlvdXRCb3gpKSk7Ci0gICAgICAgIHJl dHVybiBhYnNvbHV0ZUNvbnRlbnRCb3g7CisgICAgICAgIGxldCBhYnNvbHV0ZVJlY3QgPSBuZXcg TGF5b3V0UmVjdCh0aGlzLl90b1Jvb3RBYnNvbHV0ZVBvc2l0aW9uKGxheW91dEJveCksIGRpc3Bs YXlCb3guYm9yZGVyQm94KCkuc2l6ZSgpKTsKKyAgICAgICAgYWJzb2x1dGVSZWN0Lm1vdmVCeShu ZXcgTGF5b3V0U2l6ZSgtZGlzcGxheUJveC5tYXJnaW5MZWZ0KCksIC1kaXNwbGF5Qm94Lm1hcmdp blRvcCgpKSk7CisgICAgICAgIGFic29sdXRlUmVjdC5ncm93QnkobmV3IExheW91dFNpemUoZGlz cGxheUJveC5tYXJnaW5MZWZ0KCkgKyBkaXNwbGF5Qm94Lm1hcmdpblJpZ2h0KCksIGRpc3BsYXlC b3gubWFyZ2luVG9wKCkgKyBkaXNwbGF5Qm94Lm1hcmdpbkJvdHRvbSgpKSk7CisgICAgICAgIHJl dHVybiBhYnNvbHV0ZVJlY3Q7CiAgICAgfQogCiAgICAgYWJzb2x1dGVCb3JkZXJCb3gobGF5b3V0 Qm94KSB7CkBAIC0xMjQsNyArMTI0LDE0IEBAIGNsYXNzIEZvcm1hdHRpbmdDb250ZXh0IHsKIAog ICAgIF9hZGRUb0xheW91dFF1ZXVlKGxheW91dEJveCkgewogICAgICAgICAvLyBJbml0aWFsaXpl IHRoZSBjb3JyZXNwb25kaW5nIGRpc3BsYXkgYm94LgotICAgICAgICB0aGlzLmZvcm1hdHRpbmdT dGF0ZSgpLmNyZWF0ZURpc3BsYXlCb3gobGF5b3V0Qm94KTsKKyAgICAgICAgbGV0IGRpc3BsYXlC b3ggPSB0aGlzLmZvcm1hdHRpbmdTdGF0ZSgpLmNyZWF0ZURpc3BsYXlCb3gobGF5b3V0Qm94LCB0 aGlzKTsKKyAgICAgICAgaWYgKGxheW91dEJveC5ub2RlKCkpIHsKKyAgICAgICAgICAgIGRpc3Bs YXlCb3guc2V0TWFyZ2luVG9wKHRoaXMubWFyZ2luVG9wKGxheW91dEJveCkpOworICAgICAgICAg ICAgZGlzcGxheUJveC5zZXRNYXJnaW5MZWZ0KHRoaXMubWFyZ2luTGVmdChsYXlvdXRCb3gpKTsK KyAgICAgICAgICAgIGRpc3BsYXlCb3guc2V0TWFyZ2luQm90dG9tKHRoaXMubWFyZ2luQm90dG9t KGxheW91dEJveCkpOworICAgICAgICAgICAgZGlzcGxheUJveC5zZXRNYXJnaW5SaWdodCh0aGlz Lm1hcmdpblJpZ2h0KGxheW91dEJveCkpOworICAgICAgICB9CisKICAgICAgICAgdGhpcy5tX2xh eW91dFN0YWNrLnB1c2gobGF5b3V0Qm94KTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0xh eW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdTdGF0ZS9Gb3JtYXR0aW5nU3RhdGUuanMgYi9Ub29scy9M YXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nU3RhdGUvRm9ybWF0dGluZ1N0YXRlLmpzCmluZGV4IDkx MGZiNDdmOTMwZjA2ODUwYWY2Zjc3NWFiNjExMzcxMGFmYjZkMTguLjAwY2U5MWExYzc2YjQwMzcw NWE4NWQ4YmIwMzY5NWEzZmIxMzJlY2MgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0xheW91dFJlbG9hZGVk L0Zvcm1hdHRpbmdTdGF0ZS9Gb3JtYXR0aW5nU3RhdGUuanMKKysrIGIvVG9vbHMvTGF5b3V0UmVs b2FkZWQvRm9ybWF0dGluZ1N0YXRlL0Zvcm1hdHRpbmdTdGF0ZS5qcwpAQCAtNTcsNiArNTcsNyBA QCBjbGFzcyBGb3JtYXR0aW5nU3RhdGUgewogICAgICAgICAgICAgcGFyZW50RGlzcGxheUJveC5z ZXRMYXN0Q2hpbGQoZGlzcGxheUJveCk7CiAgICAgICAgIH0KICAgICAgICAgdGhpcy5tX2Rpc3Bs YXlUb0xheW91dC5zZXQobGF5b3V0Qm94LCBkaXNwbGF5Qm94KTsKKyAgICAgICAgcmV0dXJuIGRp c3BsYXlCb3g7CiAgICAgfQogCiAgICAgZGlzcGxheUJveE1hcCgpIHsK