187097 2018-06-27 07:40:48 -0700 [LFC] Move formatting context root layout logic to a dedicated function. 2018-06-27 09:19:18 -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 1436933 0 zalan 2018-06-27 07:40:48 -0700 ssia. 1436934 1 343709 zalan 2018-06-27 07:42:07 -0700 Created attachment 343709 Patch 1436968 2 zalan 2018-06-27 09:18:07 -0700 Committed r233260: <https://trac.webkit.org/changeset/233260> 1436970 3 webkit-bug-importer 2018-06-27 09:19:18 -0700 <rdar://problem/41526987> 343709 2018-06-27 07:42:07 -0700 2018-06-27 09:12:21 -0700 Patch bug-187097-20180627074206.patch text/plain 6138 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzMjAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTc2OTIzYmJjMDQxMTVk NmJiM2IwZjEyMzBhMDUwYWI2YWFlMTVlNi4uMzViMjU1ZWZkMjllZTkwZDJiZTY0Yjg5ZDFmYTEx ZDZmMTQ2NmM2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE4LTA2LTI3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gTW92ZSBmb3JtYXR0 aW5nIGNvbnRleHQgcm9vdCBsYXlvdXQgbG9naWMgdG8gYSBkZWRpY2F0ZWQgZnVuY3Rpb24uCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODcwOTcKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGxheW91dC9i bG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dCBjb25zdCk6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEZvcm1h dHRpbmdDb250ZXh0Um9vdCBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGlu Zy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0Lmg6CisKIDIwMTgtMDYtMjYgIFRoaWJhdWx0IFNhdW5p ZXIgIDx0c2F1bmllckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHU3RyZWFtZXJdIERvIG5vdCBm b3JnZXQgdG8gc2V0IHN0cmVhbSBvbiB0cmFjayBzd2l0Y2hpbmcKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGlu Z0NvbnRleHQuY3BwCmluZGV4IDMxMjVmMjQxNDMxZDM2MTQ4ZGExZjYwODIwYTU0MjUwZjU5Yjli MGMuLmVjZmIwYTEzOWViZWJkMDM5NDAyZTg3YjI2NWJjN2EyODgyZWE1MTIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29u dGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9j a0Zvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtNzcsMTYgKzc3LDE4IEBAIHZvaWQgQmxvY2tGb3Jt YXR0aW5nQ29udGV4dDo6bGF5b3V0KExheW91dENvbnRleHQmIGxheW91dENvbnRleHQsIEZvcm1h dHRpbmdTdGF0CiAgICAgICAgICAgICBhdXRvJiBsYXlvdXRQYWlyID0gKmxheW91dFF1ZXVlLmxh c3QoKTsKICAgICAgICAgICAgIGF1dG8mIGxheW91dEJveCA9IGxheW91dFBhaXIubGF5b3V0Qm94 OwogICAgICAgICAgICAgYXV0byYgZGlzcGxheUJveCA9IGxheW91dFBhaXIuZGlzcGxheUJveDsK KworICAgICAgICAgICAgaWYgKGxheW91dEJveC5lc3RhYmxpc2hlc0Zvcm1hdHRpbmdDb250ZXh0 KCkpIHsKKyAgICAgICAgICAgICAgICBsYXlvdXRGb3JtYXR0aW5nQ29udGV4dFJvb3QobGF5b3V0 Q29udGV4dCwgZm9ybWF0dGluZ1N0YXRlLCBsYXlvdXRCb3gsIGRpc3BsYXlCb3gpOworICAgICAg ICAgICAgICAgIGxheW91dFF1ZXVlLnJlbW92ZUxhc3QoKTsKKyAgICAgICAgICAgICAgICAvLyBT aW5jZSB0aGlzIGJveCBpcyBhIGZvcm1hdHRpbmcgY29udGV4dCByb290LCBpdCB0YWtlcyBjYXJl IG9mIGl0cyBlbnRpcmUgc3VidHJlZS4KKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAg ICAgIH0KICAgICAgICAgICAgIAogICAgICAgICAgICAgTE9HX1dJVEhfU1RSRUFNKEZvcm1hdHRp bmdDb250ZXh0TGF5b3V0LCBzdHJlYW0gPDwgIltDb21wdXRlXSAtPiBbUG9zaXRpb25dW0JvcmRl cl1bUGFkZGluZ11bV2lkdGhdW01hcmdpbl0gLT4gZm9yIGxheW91dEJveCgiIDw8ICZsYXlvdXRC b3ggPDwgIikiKTsKICAgICAgICAgICAgIGNvbXB1dGVTdGF0aWNQb3NpdGlvbihsYXlvdXRDb250 ZXh0LCBsYXlvdXRCb3gsIGRpc3BsYXlCb3gpOwogICAgICAgICAgICAgY29tcHV0ZUJvcmRlckFu ZFBhZGRpbmcobGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94LCBkaXNwbGF5Qm94KTsKICAgICAgICAg ICAgIGNvbXB1dGVXaWR0aEFuZE1hcmdpbihsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gsIGRpc3Bs YXlCb3gpOwotICAgICAgICAgICAgaWYgKGxheW91dEJveC5lc3RhYmxpc2hlc0Zvcm1hdHRpbmdD b250ZXh0KCkpIHsKLSAgICAgICAgICAgICAgICBhdXRvIGZvcm1hdHRpbmdDb250ZXh0ID0gbGF5 b3V0Q29udGV4dC5mb3JtYXR0aW5nQ29udGV4dChsYXlvdXRCb3gpOwotICAgICAgICAgICAgICAg IGZvcm1hdHRpbmdDb250ZXh0LT5sYXlvdXQobGF5b3V0Q29udGV4dCwgbGF5b3V0Q29udGV4dC5l c3RhYmxpc2hlZEZvcm1hdHRpbmdTdGF0ZShsYXlvdXRCb3gsICpmb3JtYXR0aW5nQ29udGV4dCkp OwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgfQogICAgICAgICAgICAgaWYg KCFpczxDb250YWluZXI+KGxheW91dEJveCkgfHwgIWRvd25jYXN0PENvbnRhaW5lcj4obGF5b3V0 Qm94KS5oYXNJbkZsb3dPckZsb2F0aW5nQ2hpbGQoKSkKICAgICAgICAgICAgICAgICBicmVhazsK ICAgICAgICAgICAgIGF1dG8mIGZpcnN0Q2hpbGQgPSAqZG93bmNhc3Q8Q29udGFpbmVyPihsYXlv dXRCb3gpLmZpcnN0SW5GbG93T3JGbG9hdGluZ0NoaWxkKCk7CkBAIC05OSw3ICsxMDEsMTAgQEAg dm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXQoTGF5b3V0Q29udGV4dCYgbGF5b3V0 Q29udGV4dCwgRm9ybWF0dGluZ1N0YXQKICAgICAgICAgICAgIGF1dG8gbGF5b3V0UGFpciA9IGxh eW91dFF1ZXVlLnRha2VMYXN0KCk7CiAgICAgICAgICAgICBhdXRvJiBsYXlvdXRCb3ggPSBsYXlv dXRQYWlyLT5sYXlvdXRCb3g7CiAgICAgICAgICAgICBhdXRvJiBkaXNwbGF5Qm94ID0gbGF5b3V0 UGFpci0+ZGlzcGxheUJveDsKKwogICAgICAgICAgICAgTE9HX1dJVEhfU1RSRUFNKEZvcm1hdHRp bmdDb250ZXh0TGF5b3V0LCBzdHJlYW0gPDwgIltDb21wdXRlXSAtPiBbSGVpZ2h0XVtNYXJnaW5d IC0+IGZvciBsYXlvdXRCb3goIiA8PCAmbGF5b3V0Qm94IDw8ICIpIik7CisgICAgICAgICAgICAv LyBGb3JtYXR0aW5nIHJvb3QgYm94ZXMgYXJlIHNwZWNpYWwtY2FzZWQgYW5kIHRoZXkgZG9uJ3Qg Y29tZSBoZXJlLiAgCisgICAgICAgICAgICBBU1NFUlQoIWxheW91dEJveC5lc3RhYmxpc2hlc0Zv cm1hdHRpbmdDb250ZXh0KCkpOwogCiAgICAgICAgICAgICBjb21wdXRlSGVpZ2h0QW5kTWFyZ2lu KGxheW91dENvbnRleHQsIGxheW91dEJveCwgZGlzcGxheUJveCk7CiAgICAgICAgICAgICAvLyBB ZGp1c3QgcG9zaXRpb24gbm93IHRoYXQgd2UgaGF2ZSBhbGwgdGhlIHByZXZpb3VzIGZsb2F0cyBw bGFjZWQgaW4gdGhpcyBjb250ZXh0IC1pZiBuZWVkZWQuCkBAIC0xMjUsNiArMTMwLDI1IEBAIHZv aWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0KExheW91dENvbnRleHQmIGxheW91dENv bnRleHQsIEZvcm1hdHRpbmdTdGF0CiAgICAgTE9HX1dJVEhfU1RSRUFNKEZvcm1hdHRpbmdDb250 ZXh0TGF5b3V0LCBzdHJlYW0gPDwgIltFbmRdIC0+IGJsb2NrIGZvcm1hdHRpbmcgY29udGV4dCAt PiBsYXlvdXQgY29udGV4dCgiIDw8ICZsYXlvdXRDb250ZXh0IDw8ICIpIGZvcm1hdHRpbmcgcm9v dCgiIDw8ICZyb290KCkgPDwgIikiKTsKIH0KIAordm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0 OjpsYXlvdXRGb3JtYXR0aW5nQ29udGV4dFJvb3QoTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4 dCwgRm9ybWF0dGluZ1N0YXRlJiBmb3JtYXR0aW5nU3RhdGUsIGNvbnN0IEJveCYgbGF5b3V0Qm94 LCBEaXNwbGF5OjpCb3gmIGRpc3BsYXlCb3gpIGNvbnN0Cit7CisgICAgLy8gU3RhcnQgbGF5aW5n IG91dCB0aGlzIGZvcm1hdHRpbmcgcm9vdCBpbiB0aGUgZm9ybWF0dGluZyBjb250ZW54dCBpdCBs aXZlcyBpbi4KKyAgICBMT0dfV0lUSF9TVFJFQU0oRm9ybWF0dGluZ0NvbnRleHRMYXlvdXQsIHN0 cmVhbSA8PCAiW0NvbXB1dGVdIC0+IFtQb3NpdGlvbl1bQm9yZGVyXVtQYWRkaW5nXVtXaWR0aF1b TWFyZ2luXSAtPiBmb3IgbGF5b3V0Qm94KCIgPDwgJmxheW91dEJveCA8PCAiKSIpOworICAgIGNv bXB1dGVTdGF0aWNQb3NpdGlvbihsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gsIGRpc3BsYXlCb3gp OworICAgIGNvbXB1dGVCb3JkZXJBbmRQYWRkaW5nKGxheW91dENvbnRleHQsIGxheW91dEJveCwg ZGlzcGxheUJveCk7CisgICAgY29tcHV0ZVdpZHRoQW5kTWFyZ2luKGxheW91dENvbnRleHQsIGxh eW91dEJveCwgZGlzcGxheUJveCk7CisKKyAgICAvLyBTd2ljaCBvdmVyIHRvIHRoZSBuZXcgZm9y bWF0dGluZyBjb250ZXh0ICh0aGUgb25lIHRoYXQgdGhlIHJvb3QgY3JlYXRlcykuCisgICAgYXV0 byBmb3JtYXR0aW5nQ29udGV4dCA9IGxheW91dENvbnRleHQuZm9ybWF0dGluZ0NvbnRleHQobGF5 b3V0Qm94KTsKKyAgICBhdXRvJiBlc3RhYmxpc2hlZEZvcm1hdHRpbmdTdGF0ZSA9IGxheW91dENv bnRleHQuZXN0YWJsaXNoZWRGb3JtYXR0aW5nU3RhdGUobGF5b3V0Qm94LCAqZm9ybWF0dGluZ0Nv bnRleHQpOworICAgIGZvcm1hdHRpbmdDb250ZXh0LT5sYXlvdXQobGF5b3V0Q29udGV4dCwgZXN0 YWJsaXNoZWRGb3JtYXR0aW5nU3RhdGUpOworCisgICAgLy8gQ29tZSBiYWNrIGFuZCBmaW5hbGl6 ZSB0aGUgcm9vdCdzIGdlb21ldHJ5LgorICAgIEZsb2F0aW5nQ29udGV4dChmb3JtYXR0aW5nU3Rh dGUuZmxvYXRpbmdTdGF0ZSgpKS5jb21wdXRlUG9zaXRpb24obGF5b3V0Qm94LCBkaXNwbGF5Qm94 KTsKKyAgICBMT0dfV0lUSF9TVFJFQU0oRm9ybWF0dGluZ0NvbnRleHRMYXlvdXQsIHN0cmVhbSA8 PCAiW0NvbXB1dGVdIC0+IFtIZWlnaHRdW01hcmdpbl0gLT4gZm9yIGxheW91dEJveCgiIDw8ICZs YXlvdXRCb3ggPDwgIikiKTsKKyAgICBjb21wdXRlSGVpZ2h0QW5kTWFyZ2luKGxheW91dENvbnRl eHQsIGxheW91dEJveCwgZGlzcGxheUJveCk7Cit9CisKIHN0ZDo6dW5pcXVlX3B0cjxGb3JtYXR0 aW5nU3RhdGU+IEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNyZWF0ZUZvcm1hdHRpbmdTdGF0ZShS ZWY8RmxvYXRpbmdTdGF0ZT4mJiBmbG9hdGluZ1N0YXRlKSBjb25zdAogewogICAgIHJldHVybiBz dGQ6Om1ha2VfdW5pcXVlPEJsb2NrRm9ybWF0dGluZ1N0YXRlPihXVEZNb3ZlKGZsb2F0aW5nU3Rh dGUpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcv QmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9y bWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggMzExYjIyOTA4YzdhOWQzMDNi ZGIzMGRjZmM0OTU5NGQ1NmU5ODM2OC4uZjMzZDc1NTEyMmY1YWY1MDJhMjAzNDkwODM1Mzk4YTQ1 ZTk1MDgzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGlu Zy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Js b2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmgKQEAgLTUxLDYgKzUxLDggQEAg cHVibGljOgogICAgIFJlZjxGbG9hdGluZ1N0YXRlPiBjcmVhdGVPckZpbmRGbG9hdGluZ1N0YXRl KExheW91dENvbnRleHQmKSBjb25zdCBvdmVycmlkZTsKIAogcHJpdmF0ZToKKyAgICB2b2lkIGxh eW91dEZvcm1hdHRpbmdDb250ZXh0Um9vdChMYXlvdXRDb250ZXh0JiwgRm9ybWF0dGluZ1N0YXRl JiwgY29uc3QgQm94JiwgRGlzcGxheTo6Qm94JikgY29uc3Q7CisgICAgCiAgICAgdm9pZCBjb21w dXRlV2lkdGhBbmRNYXJnaW4oTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYsIERpc3BsYXk6OkJv eCYpIGNvbnN0OwogICAgIHZvaWQgY29tcHV0ZUhlaWdodEFuZE1hcmdpbihMYXlvdXRDb250ZXh0 JiwgY29uc3QgQm94JiwgRGlzcGxheTo6Qm94JikgY29uc3Q7CiAK