189145 2018-08-29 21:41:53 -0700 [LFC][Floating] Move containing block constraint logic from FloatAvoider to FloatingContext 2018-08-30 07:33:33 -0700 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 1455154 0 zalan 2018-08-29 21:41:53 -0700 and check the overflow and the float intersecting together. 1455155 1 348484 zalan 2018-08-29 21:47:21 -0700 Created attachment 348484 Patch 1455214 2 zalan 2018-08-30 07:32:37 -0700 Committed r235503: <https://trac.webkit.org/changeset/235503> 1455216 3 webkit-bug-importer 2018-08-30 07:33:33 -0700 <rdar://problem/43885020> 348484 2018-08-29 21:47:21 -0700 2018-08-30 06:43:58 -0700 Patch Patch.txt text/plain 5367 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlNmY4NmM3Mjg3ZC4uNTVmNjk5ZjFkMDQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMSBAQAorMjAxOC0wOC0yOSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgor CisgICAgICAgIFtMRkNdW0Zsb2F0aW5nXSBNb3ZlIGNvbnRhaW5pbmcgYmxvY2sgY29uc3RyYWlu dCBsb2dpYyBmcm9tIEZsb2F0QXZvaWRlciB0byBGbG9hdGluZ0NvbnRleHQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTE0NQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gdGhlIGZsb2F0IGF2b2lk ZXIgaXMgY29uc3RyYWluZWQgaG9yaXpvbnRhbGx5LCBzaW1wbHkgYWxpZ24gaXQgd2l0aCB0aGUg bGVmdC9yaWdodCBlZGdlIG9mIGl0cyBjb250YWluaW5nIGJsb2NrICh3aXRoIHRoZSBjb21iaW5h dGlvbiBvZiB0aGUgY29uc3RyYWludHMpCisgICAgICAgIGFuZCBjaGVjayB0aGUgb3ZlcmZsb3cg YXMgcGFydCBvZiB0aGUgRmxvYXRpbmdDb250ZXh0OjpmbG9hdGluZ1Bvc2l0aW9uKCkgbG9naWMu IEl0IHNpbXBsaWZpZXMgdGhlIGNvbnN0cmFpbnQgbG9naWMvaGVscHMgaW1wbGVtZW50aW5nIHRo ZSBub24tZmxvYXQgYXZvaWRlcgorICAgICAgICBjYXNlLgorCisgICAgICAgICogbGF5b3V0L2Zs b2F0cy9GbG9hdEF2b2lkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGbG9hdEF2 b2lkZXI6OnNldEhvcml6b250YWxDb25zdHJhaW50cyk6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkZsb2F0QXZvaWRlcjo6b3ZlcmZsb3dzQ29udGFpbmluZ0Jsb2NrIGNvbnN0KToKKyAgICAg ICAgKiBsYXlvdXQvZmxvYXRzL0Zsb2F0QXZvaWRlci5oOgorICAgICAgICAqIGxheW91dC9mbG9h dHMvRmxvYXRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6RmxvYXRp bmdDb250ZXh0OjpmbG9hdGluZ1Bvc2l0aW9uIGNvbnN0KToKKwogMjAxOC0wOC0yOSAgWmFsYW4g QnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0Zsb2F0aW5nXSBVc2Ug bm9uLWNvbXB1dGVkIGhvcml6b250YWwgbWFyZ2lucyB3aGVuIGludGVyc2VjdGluZyBmbG9hdHMg d2l0aCBmbG9hdCBhdm9pZGVycy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m bG9hdHMvRmxvYXRBdm9pZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mbG9hdHMvRmxv YXRBdm9pZGVyLmNwcAppbmRleCBhZjUyZDM0NDY4NS4uZTk2NWRmM2ExZjIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mbG9hdHMvRmxvYXRBdm9pZGVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZmxvYXRzL0Zsb2F0QXZvaWRlci5jcHAKQEAgLTU5LDEzICs1OSwx MiBAQCB2b2lkIEZsb2F0QXZvaWRlcjo6c2V0SG9yaXpvbnRhbENvbnN0cmFpbnRzKEhvcml6b250 YWxDb25zdHJhaW50cyBob3Jpem9udGFsQ29ucwogICAgICAgICAvLyBIb3Jpem9udGFsIHBvc2l0 aW9uIGlzIGNvbnN0cmFpbmVkIGJ5IHRoZSBjb250YWluaW5nIGJsb2NrJ3MgY29udGVudCBib3gu CiAgICAgICAgIC8vIENvbXB1dGUgdGhlIGhvcml6b250YWwgcG9zaXRpb24gZm9yIHRoZSBuZXcg ZmxvYXRpbmcgYnkgdGFraW5nIGJvdGggdGhlIGNvbnRpbmluZyBibG9jayBhbmQgdGhlIGN1cnJl bnQgbGVmdC9yaWdodCBmbG9hdHMgaW50byBhY2NvdW50LgogICAgICAgICBhdXRvIGNvbnRhaW5p bmdCbG9ja0NvbnRlbnRCb3hMZWZ0ID0gbV9jb250YWluaW5nQmxvY2tBYnNvbHV0ZURpc3BsYXlC b3gubGVmdCgpICsgbV9jb250YWluaW5nQmxvY2tBYnNvbHV0ZURpc3BsYXlCb3guY29udGVudEJv eExlZnQoKTsKLSAgICAgICAgYXV0byBjb250YWluaW5nQmxvY2tDb250ZW50Qm94UmlnaHQgPSBj b250YWluaW5nQmxvY2tDb250ZW50Qm94TGVmdCArIG1fY29udGFpbmluZ0Jsb2NrQWJzb2x1dGVE aXNwbGF5Qm94LmNvbnRlbnRCb3hXaWR0aCgpOwotICAgICAgICAvLyBBbGlnbiBpdCB3aXRoIHRo ZSBjb250YWluaW5nIGJsb2NrJ3MgbGVmdCBlZGdlIGZpcnN0LgotICAgICAgICBsZWZ0ID0gc3Rk OjptYXgoY29udGFpbmluZ0Jsb2NrQ29udGVudEJveExlZnQgKyBtYXJnaW5MZWZ0KCksIGxlZnQp OwotICAgICAgICAvLyBNYWtlIHN1cmUgaXQgZG9lcyBub3Qgb3ZlcmZsb3cgdGhlIGNvbnRhaW5p bmcgYmxvY2sgb24gdGhlIHJpZ2h0LgotICAgICAgICBsZWZ0ID0gc3RkOjptaW4obGVmdCwgY29u dGFpbmluZ0Jsb2NrQ29udGVudEJveFJpZ2h0IC0gbWFyZ2luQm94V2lkdGgoKSArIG1hcmdpbkxl ZnQoKSk7CisgICAgICAgIGlmIChpc0xlZnRBbGlnbmVkKCkpCisgICAgICAgICAgICByZXR1cm4g c3RkOjptYXgoY29udGFpbmluZ0Jsb2NrQ29udGVudEJveExlZnQgKyBtYXJnaW5MZWZ0KCksIGxl ZnQpOwogCi0gICAgICAgIHJldHVybiBsZWZ0OworICAgICAgICAvLyBNYWtlIHN1cmUgaXQgZG9l cyBub3Qgb3ZlcmZsb3cgdGhlIGNvbnRhaW5pbmcgYmxvY2sgb24gdGhlIHJpZ2h0LgorICAgICAg ICBhdXRvIGNvbnRhaW5pbmdCbG9ja0NvbnRlbnRCb3hSaWdodCA9IGNvbnRhaW5pbmdCbG9ja0Nv bnRlbnRCb3hMZWZ0ICsgbV9jb250YWluaW5nQmxvY2tBYnNvbHV0ZURpc3BsYXlCb3guY29udGVu dEJveFdpZHRoKCk7CisgICAgICAgIHJldHVybiBzdGQ6Om1pbihsZWZ0LCBjb250YWluaW5nQmxv Y2tDb250ZW50Qm94UmlnaHQgLSBtYXJnaW5Cb3hXaWR0aCgpICsgbWFyZ2luTGVmdCgpKTsKICAg ICB9OwogCiAgICAgYXV0byBwb3NpdGlvbkNhbmRpZGF0ZSA9IGhvcml6b250YWxQb3NpdGlvbkNh bmRpZGF0ZShob3Jpem9udGFsQ29uc3RyYWludHMpOwpAQCAtMTA0LDYgKzEwMywyMCBAQCBQb3Np dGlvbkluQ29udGV4dFJvb3QgRmxvYXRBdm9pZGVyOjppbml0aWFsSG9yaXpvbnRhbFBvc2l0aW9u KCkgY29uc3QKICAgICByZXR1cm4gbGVmdDsKIH0KIAorYm9vbCBGbG9hdEF2b2lkZXI6Om92ZXJm bG93c0NvbnRhaW5pbmdCbG9jaygpIGNvbnN0Cit7CisgICAgYXV0byBjb250YWluaW5nQmxvY2tD b250ZW50Qm94TGVmdCA9IG1fY29udGFpbmluZ0Jsb2NrQWJzb2x1dGVEaXNwbGF5Qm94LmxlZnQo KSArIG1fY29udGFpbmluZ0Jsb2NrQWJzb2x1dGVEaXNwbGF5Qm94LmNvbnRlbnRCb3hMZWZ0KCk7 CisgICAgYXV0byBsZWZ0ID0gZGlzcGxheUJveCgpLmxlZnQoKSAtIG1hcmdpbkxlZnQoKTsKKwor ICAgIGlmIChjb250YWluaW5nQmxvY2tDb250ZW50Qm94TGVmdCA+IGxlZnQpCisgICAgICAgIHJl dHVybiB0cnVlOworCisgICAgYXV0byBjb250YWluaW5nQmxvY2tDb250ZW50Qm94UmlnaHQgPSBj b250YWluaW5nQmxvY2tDb250ZW50Qm94TGVmdCArIG1fY29udGFpbmluZ0Jsb2NrQWJzb2x1dGVE aXNwbGF5Qm94LmNvbnRlbnRCb3hXaWR0aCgpOworICAgIGF1dG8gcmlnaHQgPSBkaXNwbGF5Qm94 KCkucmlnaHQoKSArIG1hcmdpblJpZ2h0KCk7CisKKyAgICByZXR1cm4gY29udGFpbmluZ0Jsb2Nr Q29udGVudEJveFJpZ2h0IDwgcmlnaHQ7Cit9CisKIERpc3BsYXk6OkJveDo6UmVjdCBGbG9hdEF2 b2lkZXI6OnJlY3RJbkNvbnRhaW5pbmdCbG9jaygpIGNvbnN0CiB7CiAgICAgLy8gRnJvbSBmb3Jt YXR0aW5nIHJvb3QgY29vcmRpbmF0ZSBzeXN0ZW0gYmFjayB0byBjb250YWluaW5nIGJsb2NrJ3Mu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZmxvYXRzL0Zsb2F0QXZvaWRlci5o IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdEF2b2lkZXIuaAppbmRleCBjZTkx ZDljOTFjMS4uZGNmYjE3M2Y2MzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m bG9hdHMvRmxvYXRBdm9pZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9G bG9hdEF2b2lkZXIuaApAQCAtNTYsNiArNTYsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRIb3Jp em9udGFsQ29uc3RyYWludHMoSG9yaXpvbnRhbENvbnN0cmFpbnRzKTsKICAgICB2b2lkIHNldFZl cnRpY2FsQ29uc3RyYWludChQb3NpdGlvbkluQ29udGV4dFJvb3QpOwogCisgICAgYm9vbCBvdmVy Zmxvd3NDb250YWluaW5nQmxvY2soKSBjb25zdDsKKwogICAgIHZvaWQgcmVzZXRQb3NpdGlvbigp OwogCiBwcm90ZWN0ZWQ6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZmxvYXRz L0Zsb2F0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZmxvYXRzL0Zsb2F0 aW5nQ29udGV4dC5jcHAKaW5kZXggZjE1ZDY4ZGFkZmQuLjI0YjU1MzI1ZmI2IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZmxvYXRzL0Zsb2F0aW5nQ29udGV4dC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ0NvbnRleHQuY3BwCkBAIC0yMzAs OCArMjMwLDExIEBAIHZvaWQgRmxvYXRpbmdDb250ZXh0OjpmbG9hdGluZ1Bvc2l0aW9uKEZsb2F0 QXZvaWRlciYgZmxvYXRBdm9pZGVyKSBjb25zdAogICAgICAgICAvLyAyLiBvciB3aXRoIHRoZSBj b250YWluaW5nIGJsb2NrJ3MgY29udGVudCBib3ggaWYgdGhlcmUncyBubyBmbG9hdCB0byBhbGln biB3aXRoIGF0IHRoaXMgdmVydGljYWwgcG9zaXRpb24uCiAgICAgICAgIGZsb2F0QXZvaWRlci5z ZXRIb3Jpem9udGFsQ29uc3RyYWludHMoZmxvYXRzLmhvcml6b250YWxDb25zdHJhaW50cygpKTsK ICAgICAgICAgZmxvYXRBdm9pZGVyLnNldFZlcnRpY2FsQ29uc3RyYWludChmbG9hdHMudmVydGlj YWxDb25zdHJhaW50KCkpOwotICAgICAgICAvLyBDaGVjayBpZiB0aGUgYm94IGZpdHMgYXQgdGhp cyBwb3NpdGlvbi4KLSAgICAgICAgaWYgKCFmbG9hdHMuaW50ZXJzZWN0cyhmbG9hdEF2b2lkZXIu cmVjdCgpKSkKKworICAgICAgICAvLyBFbnN1cmUgdGhhdCB0aGUgZmxvYXQgYXZvaWRlcgorICAg ICAgICAvLyAxLiBkb2VzIG5vdCBvdmVyZmxvdyBpdHMgY29udGFpbmluZyBibG9jayB3aXRoIHRo ZSBjdXJyZW50IGhvcml6dG9uYWwgY29uc3RyYWludHMKKyAgICAgICAgLy8gMi4gYXZvaWRzIGZs b2F0cyBvbiBib3RoIHNpZGVzLgorICAgICAgICBpZiAoIWZsb2F0QXZvaWRlci5vdmVyZmxvd3ND b250YWluaW5nQmxvY2soKSAmJiAhZmxvYXRzLmludGVyc2VjdHMoZmxvYXRBdm9pZGVyLnJlY3Qo KSkpCiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgYm90dG9tTW9zdCA9IGZsb2F0cy5i b3R0b20oKTsK