184679 2018-04-16 20:12:29 -0700 [LayoutReloaded] Minor InlineFormattingContext::layout() cleanup. 2018-04-16 20:16: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 1415014 0 zalan 2018-04-16 20:12:29 -0700 ssia 1415015 1 338073 zalan 2018-04-16 20:14:00 -0700 Created attachment 338073 Patch 1415016 2 zalan 2018-04-16 20:15:26 -0700 Committed r230699: <https://trac.webkit.org/changeset/230699> 1415017 3 webkit-bug-importer 2018-04-16 20:16:21 -0700 <rdar://problem/39479338> 338073 2018-04-16 20:14:00 -0700 2018-04-16 20:14:00 -0700 Patch bug-184679-20180416201359.patch text/plain 7586 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwNjk2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMWE5NjY4ZDk1Yjc0NzA5MjcxNmI4MWY4YmQ5OWU5MjZl YjRiZTkwMy4uYmMzMDdjZWQyNWY2ZjhkMTZkZDhjNDcyMmUyYWExMzgyMzY5ZDUxZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDE4LTA0LTE2ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAg ICAgW0xheW91dFJlbG9hZGVkXSBNaW5vciBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0 KCkgY2xlYW51cC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE4NDY3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvSW5saW5lRm9ybWF0dGluZy9J bmxpbmVGb3JtYXR0aW5nQ29udGV4dC5qczoKKyAgICAgICAgKElubGluZUZvcm1hdHRpbmdDb250 ZXh0KToKKyAgICAgICAgKElubGluZUZvcm1hdHRpbmdDb250ZXh0LnByb3RvdHlwZS5sYXlvdXQp OgorICAgICAgICAoSW5saW5lRm9ybWF0dGluZ0NvbnRleHQucHJvdG90eXBlLl9oYW5kbGVJbmxp bmVDb250YWluZXIpOgorICAgICAgICAoSW5saW5lRm9ybWF0dGluZ0NvbnRleHQucHJvdG90eXBl Ll9oYW5kbGVJbmxpbmVDb250ZW50KToKKyAgICAgICAgKElubGluZUZvcm1hdHRpbmdDb250ZXh0 LnByb3RvdHlwZS5faGFuZGxlSW5saW5lQmxvY2spOgorICAgICAgICAoSW5saW5lRm9ybWF0dGlu Z0NvbnRleHQucHJvdG90eXBlLl9oYW5kbGVSZXBsYWNlZEJveCk6CisgICAgICAgIChJbmxpbmVG b3JtYXR0aW5nQ29udGV4dC5wcm90b3R5cGUuX2NsZWFyTmVlZHNMYXlvdXRBbmRNb3ZlVG9OZXh0 U2libGluZyk6CisgICAgICAgIChJbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5wcm90b3R5cGUuX2hh bmRsZUlubGluZUJsb2NrQ29udGFpbmVyKTogRGVsZXRlZC4KKyAgICAgICAgKElubGluZUZvcm1h dHRpbmdDb250ZXh0LnByb3RvdHlwZS5fY2xlYXJBbmRNb3ZlVG9OZXh0KTogRGVsZXRlZC4KKwog MjAxOC0wNC0xNiAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtM YXlvdXRSZWxvYWRlZF0gSW50cm9kdWNlIGZyYWdtZW50YXRpb24gc3RhdGUvY29udGV4dC4KZGlm ZiAtLWdpdCBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0lubGluZUZv cm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuanMgYi9Ub29scy9MYXlvdXRSZWxvYWRl ZC9Gb3JtYXR0aW5nQ29udGV4dC9JbmxpbmVGb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250 ZXh0LmpzCmluZGV4IGVlOTczZGY2ZTE5NTUzNDgwNGJhMDU4OGFmMDBmYjc0NDVhNGU1NTQuLjk5 YTgwMGIyYTJmYmUyZmY4MjhmZDBmYTM1YzgxOTFlZmYwZDIzMTMgMTAwNjQ0Ci0tLSBhL1Rvb2xz L0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0lubGluZUZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQuanMKKysrIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGlu Z0NvbnRleHQvSW5saW5lRm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5qcwpAQCAt NDEsNyArNDEsNiBAQCBjbGFzcyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCBleHRlbmRzIEZvcm1h dHRpbmdDb250ZXh0IHsKICAgICBjb25zdHJ1Y3RvcihpbmxpbmVGb3JtYXR0aW5nU3RhdGUpIHsK ICAgICAgICAgc3VwZXIoaW5saW5lRm9ybWF0dGluZ1N0YXRlKTsKICAgICAgICAgQVNTRVJUKHRo aXMuZm9ybWF0dGluZ1Jvb3QoKS5pc0Jsb2NrQ29udGFpbmVyQm94KCkpOwotICAgICAgICB0aGlz Lm1faW5saW5lQ29udGFpbmVyU3RhY2sgPSBuZXcgQXJyYXkoKTsKICAgICB9CiAKICAgICBsYXlv dXQoKSB7CkBAIC01NCw2MiArNTMsNTIgQEAgY2xhc3MgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQg ZXh0ZW5kcyBGb3JtYXR0aW5nQ29udGV4dCB7CiAgICAgICAgIHRoaXMuX2FkZFRvTGF5b3V0UXVl dWUodGhpcy5fZmlyc3RJbkZsb3dDaGlsZFdpdGhOZWVkc0xheW91dCh0aGlzLmZvcm1hdHRpbmdS b290KCkpKTsKICAgICAgICAgd2hpbGUgKHRoaXMuX2Rlc2NlbmRhbnROZWVkc0xheW91dCgpKSB7 CiAgICAgICAgICAgICBsZXQgbGF5b3V0Qm94ID0gdGhpcy5fbmV4dEluTGF5b3V0UXVldWUoKTsK LSAgICAgICAgICAgIGlmIChsYXlvdXRCb3guaXNJbmxpbmVDb250YWluZXIoKSkKLSAgICAgICAg ICAgICAgICB0aGlzLl9oYW5kbGVJbmxpbmVDb250YWluZXIobGF5b3V0Qm94KTsKLSAgICAgICAg ICAgIGVsc2UgaWYgKGxheW91dEJveC5pc0lubGluZUJsb2NrQm94KCkpCi0gICAgICAgICAgICAg ICAgdGhpcy5faGFuZGxlSW5saW5lQmxvY2tDb250YWluZXIobGF5b3V0Qm94KTsKLSAgICAgICAg ICAgIGVsc2UKKyAgICAgICAgICAgIGlmIChsYXlvdXRCb3guaXNJbmxpbmVDb250YWluZXIoKSkg eworICAgICAgICAgICAgICAgIGxldCBjb250YWluZXJTdGFydCA9IGlubGluZUNvbnRhaW5lclN0 YWNrLmluZGV4T2YobGF5b3V0Qm94KSA9PSAtMTsKKyAgICAgICAgICAgICAgICB0aGlzLl9oYW5k bGVJbmxpbmVDb250YWluZXIobGF5b3V0Qm94LCBjb250YWluZXJTdGFydCk7CisgICAgICAgICAg ICAgICAgLy8gY29udGFpbmVyIHN0YXJ0LgorICAgICAgICAgICAgICAgIGlmIChjb250YWluZXJT dGFydCkgeworICAgICAgICAgICAgICAgICAgICBpbmxpbmVDb250YWluZXJTdGFjay5wdXNoKGxh eW91dEJveCk7CisgICAgICAgICAgICAgICAgICAgIHRoaXMuX2FkZFRvTGF5b3V0UXVldWUodGhp cy5fZmlyc3RJbkZsb3dDaGlsZFdpdGhOZWVkc0xheW91dChsYXlvdXRCb3gpKTsKKyAgICAgICAg ICAgICAgICAgICAgLy8gS2VlcCB0aGUgaW5saW5lIGNvbnRhaW5lciBpbiB0aGUgbGF5b3V0IHN0 YWNrIHNvIHRoYXQgd2UgY2FuIGZpbmlzaCBpdCB3aGVuIGFsbCB0aGUgZGVzY2VuZGFudHMgYXJl IGFsbCBzZXQuCisgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgICAg IH0KKyAgICAgICAgICAgICAgICAvLyBjb250YWluZXIgZW5kLgorICAgICAgICAgICAgICAgIGlu bGluZUNvbnRhaW5lclN0YWNrLnBvcChsYXlvdXRCb3gpOworICAgICAgICAgICAgfSBlbHNlCiAg ICAgICAgICAgICAgICAgdGhpcy5faGFuZGxlSW5saW5lQ29udGVudChsYXlvdXRCb3gpOworICAg ICAgICAgICAgdGhpcy5fY2xlYXJOZWVkc0xheW91dEFuZE1vdmVUb05leHRTaWJsaW5nKGxheW91 dEJveCk7CiAgICAgICAgIH0KICAgICAgICAgLy8gUGxhY2UgdGhlIGluZmxvdyBwb3NpdGlvbmVk IGNoaWxkcmVuLgogICAgICAgICB0aGlzLl9wbGFjZUluRmxvd1Bvc2l0aW9uZWRDaGlsZHJlbih0 aGlzLmZvcm1hdHRpbmdSb290KCkpOwogICAgICAgICAvLyBBbmQgdGFrZSBjYXJlIG9mIG91dC1v Zi1mbG93IGJveGVzIGFzIHRoZSBmaW5hbCBzdGVwLgogICAgICAgICB0aGlzLl9sYXlvdXRPdXRP ZkZsb3dEZXNjZW5kYW50cyh0aGlzLmZvcm1hdHRpbmdSb290KCkpOwogICAgICAgICB0aGlzLl9j b21taXRMaW5lKCk7Ci0gICAgICAgIEFTU0VSVCghdGhpcy5tX2lubGluZUNvbnRhaW5lclN0YWNr Lmxlbmd0aCk7CisgICAgICAgIEFTU0VSVCghaW5saW5lQ29udGFpbmVyU3RhY2subGVuZ3RoKTsK ICAgICAgICAgQVNTRVJUKCF0aGlzLmZvcm1hdHRpbmdTdGF0ZSgpLmxheW91dE5lZWRlZCgpKTsK ICAgIH0KIAotICAgIF9oYW5kbGVJbmxpbmVDb250YWluZXIoaW5saW5lQ29udGFpbmVyKSB7Cisg ICAgX2hhbmRsZUlubGluZUNvbnRhaW5lcihpbmxpbmVDb250YWluZXIsIGNvbnRhaW5lclN0YXJ0 KSB7CiAgICAgICAgIEFTU0VSVCghaW5saW5lQ29udGFpbmVyLmVzdGFibGlzaGVzRm9ybWF0dGlu Z0NvbnRleHQoKSk7Ci0gICAgICAgIGxldCBpbmxpbmVDb250YWluZXJTdGFydCA9IHRoaXMubV9p bmxpbmVDb250YWluZXJTdGFjay5pbmRleE9mKGlubGluZUNvbnRhaW5lcikgPT0gLTE7Ci0gICAg ICAgIGlmIChpbmxpbmVDb250YWluZXJTdGFydCkgewotICAgICAgICAgICAgdGhpcy5tX2lubGlu ZUNvbnRhaW5lclN0YWNrLnB1c2goaW5saW5lQ29udGFpbmVyKTsKKyAgICAgICAgaWYgKGNvbnRh aW5lclN0YXJ0KSB7CiAgICAgICAgICAgICB0aGlzLl9hZGp1c3RMaW5lRm9ySW5saW5lQ29udGFp bmVyU3RhcnQoaW5saW5lQ29udGFpbmVyKTsKLSAgICAgICAgICAgIHRoaXMuX2FkZFRvTGF5b3V0 UXVldWUodGhpcy5fZmlyc3RJbkZsb3dDaGlsZFdpdGhOZWVkc0xheW91dChpbmxpbmVDb250YWlu ZXIpKTsKLSAgICAgICAgICAgIC8vIEtlZXAgdGhlIGlubGluZSBjb250YWluZXIgaW4gdGhlIGxh eW91dCBzdGFjayBzbyB0aGF0IHdlIGNhbiBmaW5pc2ggaXQgd2hlbiBhbGwgdGhlIGRlc2NlbmRh bnRzIGFyZSBhbGwgc2V0LgogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9Ci0gICAgICAg IHRoaXMubV9pbmxpbmVDb250YWluZXJTdGFjay5wb3AoaW5saW5lQ29udGFpbmVyKTsKICAgICAg ICAgdGhpcy5fYWRqdXN0TGluZUZvcklubGluZUNvbnRhaW5lckVuZChpbmxpbmVDb250YWluZXIp OwotICAgICAgICB0aGlzLl9jbGVhckFuZE1vdmVUb05leHQoaW5saW5lQ29udGFpbmVyKTsKICAg ICAgICAgLy8gUGxhY2UgaW5mbG93IHBvc2l0aW9uZWQgY2hpbGRyZW4uCiAgICAgICAgIHRoaXMu X3BsYWNlSW5GbG93UG9zaXRpb25lZENoaWxkcmVuKGlubGluZUNvbnRhaW5lcik7CiAgICAgfQog CiAKLSAgICBfaGFuZGxlSW5saW5lQmxvY2tDb250YWluZXIoaW5saW5lQmxvY2tDb250YWluZXIp IHsKLSAgICAgICAgQVNTRVJUKGlubGluZUJsb2NrQ29udGFpbmVyLmVzdGFibGlzaGVzRm9ybWF0 dGluZ0NvbnRleHQoKSk7Ci0gICAgICAgIGxldCBkaXNwbGF5Qm94ID0gdGhpcy5kaXNwbGF5Qm94 KGlubGluZUJsb2NrQ29udGFpbmVyKTsKLQotICAgICAgICAvLyBUT0RPOiBhdXRvIHdpZHRoL2hl aWdodAotICAgICAgICB0aGlzLl9hZGp1c3RMaW5lRm9ySW5saW5lQ29udGFpbmVyU3RhcnQoaW5s aW5lQmxvY2tDb250YWluZXIpOwotICAgICAgICBkaXNwbGF5Qm94LnNldFdpZHRoKFV0aWxzLndp ZHRoKGlubGluZUJsb2NrQ29udGFpbmVyKSArIFV0aWxzLmNvbXB1dGVkSG9yaXpvbnRhbEJvcmRl ckFuZFBhZGRpbmcoaW5saW5lQmxvY2tDb250YWluZXIubm9kZSgpKSk7Ci0gICAgICAgIHRoaXMu bGF5b3V0U3RhdGUoKS5mb3JtYXR0aW5nQ29udGV4dChpbmxpbmVCbG9ja0NvbnRhaW5lcikubGF5 b3V0KCk7Ci0gICAgICAgIGRpc3BsYXlCb3guc2V0SGVpZ2h0KFV0aWxzLmhlaWdodChpbmxpbmVC bG9ja0NvbnRhaW5lcikgKyBVdGlscy5jb21wdXRlZFZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZyhp bmxpbmVCbG9ja0NvbnRhaW5lci5ub2RlKCkpKTsKLSAgICAgICAgdGhpcy5fYWRqdXN0TGluZUZv cklubGluZUNvbnRhaW5lckVuZChpbmxpbmVCbG9ja0NvbnRhaW5lcik7Ci0gICAgICAgIHRoaXMu X2xpbmUoKS5hZGRJbmxpbmVDb250YWluZXJCb3goZGlzcGxheUJveC5zaXplKCkpOwotICAgICAg ICB0aGlzLl9jbGVhckFuZE1vdmVUb05leHQoaW5saW5lQmxvY2tDb250YWluZXIpOwotICAgIH0K LQogICAgIF9oYW5kbGVJbmxpbmVDb250ZW50KGxheW91dEJveCkgewogICAgICAgICBpZiAobGF5 b3V0Qm94LmlzSW5saW5lQm94KCkpCiAgICAgICAgICAgICB0aGlzLl9oYW5kbGVJbmxpbmVCb3go bGF5b3V0Qm94KTsKICAgICAgICAgZWxzZSBpZiAobGF5b3V0Qm94LmlzRmxvYXRpbmdQb3NpdGlv bmVkKCkpCiAgICAgICAgICAgICB0aGlzLl9oYW5kbGVGbG9hdGluZ0JveChsYXlvdXRCb3gpOwor ICAgICAgICBlbHNlIGlmIChsYXlvdXRCb3guaXNJbmxpbmVCbG9ja0JveCgpKQorICAgICAgICAg ICAgdGhpcy5faGFuZGxlSW5saW5lQmxvY2sobGF5b3V0Qm94KTsKICAgICAgICAgZWxzZQogICAg ICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgICAgIHRoaXMuX2NsZWFyQW5kTW92 ZVRvTmV4dChsYXlvdXRCb3gpOwogICAgIH0KIAogICAgIF9oYW5kbGVJbmxpbmVCb3goaW5saW5l Qm94KSB7CkBAIC0xMTcsNiArMTA2LDE5IEBAIGNsYXNzIElubGluZUZvcm1hdHRpbmdDb250ZXh0 IGV4dGVuZHMgRm9ybWF0dGluZ0NvbnRleHQgewogICAgICAgICAgICAgcmV0dXJuIHRoaXMuX2hh bmRsZVRleHQoaW5saW5lQm94KTsKICAgICB9CiAKKyAgICBfaGFuZGxlSW5saW5lQmxvY2soaW5s aW5lQmxvY2tCb3gpIHsKKyAgICAgICAgQVNTRVJUKGlubGluZUJsb2NrQm94LmVzdGFibGlzaGVz Rm9ybWF0dGluZ0NvbnRleHQoKSk7CisgICAgICAgIGxldCBkaXNwbGF5Qm94ID0gdGhpcy5kaXNw bGF5Qm94KGlubGluZUJsb2NrQm94KTsKKworICAgICAgICAvLyBUT0RPOiBhdXRvIHdpZHRoL2hl aWdodAorICAgICAgICB0aGlzLl9hZGp1c3RMaW5lRm9ySW5saW5lQ29udGFpbmVyU3RhcnQoaW5s aW5lQmxvY2tCb3gpOworICAgICAgICBkaXNwbGF5Qm94LnNldFdpZHRoKFV0aWxzLndpZHRoKGlu bGluZUJsb2NrQm94KSArIFV0aWxzLmNvbXB1dGVkSG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmco aW5saW5lQmxvY2tCb3gubm9kZSgpKSk7CisgICAgICAgIHRoaXMubGF5b3V0U3RhdGUoKS5mb3Jt YXR0aW5nQ29udGV4dChpbmxpbmVCbG9ja0JveCkubGF5b3V0KCk7CisgICAgICAgIGRpc3BsYXlC b3guc2V0SGVpZ2h0KFV0aWxzLmhlaWdodChpbmxpbmVCbG9ja0JveCkgKyBVdGlscy5jb21wdXRl ZFZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZyhpbmxpbmVCbG9ja0JveC5ub2RlKCkpKTsKKyAgICAg ICAgdGhpcy5fYWRqdXN0TGluZUZvcklubGluZUNvbnRhaW5lckVuZChpbmxpbmVCbG9ja0JveCk7 CisgICAgICAgIHRoaXMuX2xpbmUoKS5hZGRJbmxpbmVDb250YWluZXJCb3goZGlzcGxheUJveC5z aXplKCkpOworICAgIH0KKwogICAgIF9oYW5kbGVUZXh0KGlubGluZUJveCkgewogICAgICAgICAv LyBGSVhNRTogVGhpcyBpcyBhIGV4dHJlbWVseSBzaW1wbGUgbGluZSBicmVha2luZyBhbGdvcml0 aG0uCiAgICAgICAgIGxldCBjdXJyZW50UG9zaXRpb24gPSAwOwpAQCAtMjI0LDcgKzIyNiw3IEBA IGNsYXNzIElubGluZUZvcm1hdHRpbmdDb250ZXh0IGV4dGVuZHMgRm9ybWF0dGluZ0NvbnRleHQg ewogICAgICAgICByZXR1cm4gaG9yaXpvbnRhbFBvc2l0aW9uIC0gcm9vdExlZnQ7CiAgICAgIH0K IAotICAgIF9jbGVhckFuZE1vdmVUb05leHQobGF5b3V0Qm94KSB7CisgICAgX2NsZWFyTmVlZHNM YXlvdXRBbmRNb3ZlVG9OZXh0U2libGluZyhsYXlvdXRCb3gpIHsKICAgICAgICAgdGhpcy5fcmVt b3ZlRnJvbUxheW91dFF1ZXVlKGxheW91dEJveCk7CiAgICAgICAgIHRoaXMuZm9ybWF0dGluZ1N0 YXRlKCkuY2xlYXJOZWVkc0xheW91dChsYXlvdXRCb3gpOwogICAgICAgICB0aGlzLl9hZGRUb0xh eW91dFF1ZXVlKHRoaXMuX25leHRJbkZsb3dTaWJsaW5nV2l0aE5lZWRzTGF5b3V0KGxheW91dEJv eCkpOwo=