189276 2018-09-04 15:12:14 -0700 [LFC] Rename LayoutPair to BoxPair 2018-09-04 15:18: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 1456473 0 zalan 2018-09-04 15:12:14 -0700 ssia 1456474 1 348855 zalan 2018-09-04 15:13:09 -0700 Created attachment 348855 Patch 1456475 2 zalan 2018-09-04 15:16:51 -0700 Committed r235643: <https://trac.webkit.org/changeset/235643> 1456476 3 webkit-bug-importer 2018-09-04 15:18:18 -0700 <rdar://problem/44115051> 348855 2018-09-04 15:13:09 -0700 2018-09-04 15:13:43 -0700 Patch bug-189276-20180904151307.patch text/plain 6150 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1NjM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTMxYTkxZGU0MDhiYTUw ZjAzNjgxYzI0OGE5OGNmMjc1Mjk2YmI3OS4uNGE2OWU1MzAwOTFmOTg4OTk3N2U5ZWRlOTA0ZDg3 OTU0MWZkYWZmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE4LTA5LTA0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gUmVuYW1lIExheW91 dFBhaXIgdG8gQm94UGFpcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTg5Mjc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBsYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaDoKKyAgICAgICAgKiBsYXlvdXQv YmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXQgY29uc3QpOgorCiAy MDE4LTA5LTA0ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xG Q11bQkZDXSBNZXJnZSBjb21wdXRlSW5GbG93V2lkdGgoSGVpZ2h0KUFuZE1hcmdpbiBhbmQgY29t cHV0ZUZsb2F0aW5nV2lkdGgoSGVpZ2h0KUFuZE1hcmdpbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L0Zvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggMmQ2NTIwNjNlZjIxYTZkY2I2MjQ3Zjc3ODg0NDdk ZDhmZTc1Zjc0Ni4uMTFjNzcxN2QxMTlkZWRhZGQ3NDc1ZTJlMTA0YzVjNGVkOTI4MzdiNiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmgKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmgKQEAgLTY0LDExICs2NCwx MSBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFBvc2l0aW9uIG1hcENvb3JkaW5hdGVUb0FuY2VzdG9y KGNvbnN0IExheW91dENvbnRleHQmLCBQb3NpdGlvbiwgY29uc3QgQ29udGFpbmVyJiBjb250YWlu aW5nQmxvY2ssIGNvbnN0IENvbnRhaW5lciYgYW5jZXN0b3IpOwogCiBwcm90ZWN0ZWQ6Ci0gICAg c3RydWN0IExheW91dFBhaXIgewotICAgICAgICBjb25zdCBCb3gmIGxheW91dEJveDsKLSAgICAg ICAgRGlzcGxheTo6Qm94JiBkaXNwbGF5Qm94OworICAgIHN0cnVjdCBCb3hQYWlyIHsKKyAgICAg ICAgY29uc3QgQm94JiBsYXlvdXQ7CisgICAgICAgIERpc3BsYXk6OkJveCYgZGlzcGxheTsKICAg ICB9OwotICAgIHVzaW5nIExheW91dFF1ZXVlID0gVmVjdG9yPHN0ZDo6dW5pcXVlX3B0cjxMYXlv dXRQYWlyPj47CisgICAgdXNpbmcgTGF5b3V0UXVldWUgPSBWZWN0b3I8c3RkOjp1bmlxdWVfcHRy PEJveFBhaXI+PjsKIAogICAgIGNvbnN0IEJveCYgcm9vdCgpIGNvbnN0IHsgcmV0dXJuICptX3Jv b3Q7IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGlu Zy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9j a2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggYTljZmNhOTFkYTg2 ZWUwMjk1MTg4ZjIxZDIwZDgxOTM4OTM5Y2Q5Ny4uMGYxMjBjZDFkMzIyYzAxMGEwNzMwNzg3MWNh NDk1ZDQ1MzIzNzE0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9y bWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC02Niw3 ICs2Niw3IEBAIHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0KExheW91dENvbnRl eHQmIGxheW91dENvbnRleHQsIEZvcm1hdHRpbmdTdGF0CiAgICAgLy8gVGhpcyBpcyBhIHBvc3Qt b3JkZXIgdHJlZSB0cmF2ZXJzYWwgbGF5b3V0LgogICAgIC8vIFRoZSByb290IGNvbnRhaW5lciBs YXlvdXQgaXMgZG9uZSBpbiB0aGUgZm9ybWF0dGluZyBjb250ZXh0IGl0IGxpdmVzIGluLCBub3Qg dGhhdCBvbmUgaXQgY3JlYXRlcywgc28gbGV0J3Mgc3RhcnQgd2l0aCB0aGUgZmlyc3QgY2hpbGQu CiAgICAgaWYgKGF1dG8qIGZpcnN0Q2hpbGQgPSBmb3JtYXR0aW5nUm9vdC5maXJzdEluRmxvd09y RmxvYXRpbmdDaGlsZCgpKQotICAgICAgICBsYXlvdXRRdWV1ZS5hcHBlbmQoc3RkOjptYWtlX3Vu aXF1ZTxMYXlvdXRQYWlyPihMYXlvdXRQYWlyIHsqZmlyc3RDaGlsZCwgbGF5b3V0Q29udGV4dC5j cmVhdGVEaXNwbGF5Qm94KCpmaXJzdENoaWxkKX0pKTsKKyAgICAgICAgbGF5b3V0UXVldWUuYXBw ZW5kKHN0ZDo6bWFrZV91bmlxdWU8Qm94UGFpcj4oQm94UGFpciB7KmZpcnN0Q2hpbGQsIGxheW91 dENvbnRleHQuY3JlYXRlRGlzcGxheUJveCgqZmlyc3RDaGlsZCl9KSk7CiAgICAgLy8gMS4gR28g YWxsIHRoZSB3YXkgZG93biB0byB0aGUgbGVhZiBub2RlCiAgICAgLy8gMi4gQ29tcHV0ZSBzdGF0 aWMgcG9zaXRpb24gYW5kIHdpZHRoIGFzIHdlIHRyYXZlcnNlIGRvd24KICAgICAvLyAzLiBBcyB3 ZSBjbGltYiBiYWNrIG9uIHRoZSB0cmVlLCBjb21wdXRlIGhlaWdodCBhbmQgZmluaWFsaXplIHBv c2l0aW9uCkBAIC03NCw5ICs3NCw5IEBAIHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5 b3V0KExheW91dENvbnRleHQmIGxheW91dENvbnRleHQsIEZvcm1hdHRpbmdTdGF0CiAgICAgd2hp bGUgKCFsYXlvdXRRdWV1ZS5pc0VtcHR5KCkpIHsKICAgICAgICAgLy8gVHJhdmVyc2UgZG93biBv biB0aGUgZGVzY2VuZGFudHMgYW5kIGNvbXB1dGUgd2lkdGgvc3RhdGljIHBvc2l0aW9uIHVudGls IHdlIGZpbmQgYSBsZWFmIG5vZGUuCiAgICAgICAgIHdoaWxlICh0cnVlKSB7Ci0gICAgICAgICAg ICBhdXRvJiBsYXlvdXRQYWlyID0gKmxheW91dFF1ZXVlLmxhc3QoKTsKLSAgICAgICAgICAgIGF1 dG8mIGxheW91dEJveCA9IGxheW91dFBhaXIubGF5b3V0Qm94OwotICAgICAgICAgICAgYXV0byYg ZGlzcGxheUJveCA9IGxheW91dFBhaXIuZGlzcGxheUJveDsKKyAgICAgICAgICAgIGF1dG8mIGJv eFBhaXIgPSAqbGF5b3V0UXVldWUubGFzdCgpOworICAgICAgICAgICAgYXV0byYgbGF5b3V0Qm94 ID0gYm94UGFpci5sYXlvdXQ7CisgICAgICAgICAgICBhdXRvJiBkaXNwbGF5Qm94ID0gYm94UGFp ci5kaXNwbGF5OwogCiAgICAgICAgICAgICBpZiAobGF5b3V0Qm94LmVzdGFibGlzaGVzRm9ybWF0 dGluZ0NvbnRleHQoKSkgewogICAgICAgICAgICAgICAgIGxheW91dEZvcm1hdHRpbmdDb250ZXh0 Um9vdChsYXlvdXRDb250ZXh0LCBmbG9hdGluZ0NvbnRleHQsIGZvcm1hdHRpbmdTdGF0ZSwgbGF5 b3V0Qm94LCBkaXNwbGF5Qm94KTsKQEAgLTg2LDcgKzg2LDcgQEAgdm9pZCBCbG9ja0Zvcm1hdHRp bmdDb250ZXh0OjpsYXlvdXQoTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwgRm9ybWF0dGlu Z1N0YXQKICAgICAgICAgICAgICAgICBpZiAoIWxheW91dEJveC5uZXh0SW5GbG93T3JGbG9hdGlu Z1NpYmxpbmcoKSkKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAg YXV0byogbmV4dFNpYmxpbmcgPSBsYXlvdXRCb3gubmV4dEluRmxvd09yRmxvYXRpbmdTaWJsaW5n KCk7Ci0gICAgICAgICAgICAgICAgbGF5b3V0UXVldWUuYXBwZW5kKHN0ZDo6bWFrZV91bmlxdWU8 TGF5b3V0UGFpcj4oTGF5b3V0UGFpciB7Km5leHRTaWJsaW5nLCBsYXlvdXRDb250ZXh0LmNyZWF0 ZURpc3BsYXlCb3goKm5leHRTaWJsaW5nKX0pKTsKKyAgICAgICAgICAgICAgICBsYXlvdXRRdWV1 ZS5hcHBlbmQoc3RkOjptYWtlX3VuaXF1ZTxCb3hQYWlyPihCb3hQYWlyIHsqbmV4dFNpYmxpbmcs IGxheW91dENvbnRleHQuY3JlYXRlRGlzcGxheUJveCgqbmV4dFNpYmxpbmcpfSkpOwogICAgICAg ICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgfQogCkBAIC05NywxNSArOTcsMTUgQEAg dm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXQoTGF5b3V0Q29udGV4dCYgbGF5b3V0 Q29udGV4dCwgRm9ybWF0dGluZ1N0YXQKICAgICAgICAgICAgIGlmICghaXM8Q29udGFpbmVyPihs YXlvdXRCb3gpIHx8ICFkb3duY2FzdDxDb250YWluZXI+KGxheW91dEJveCkuaGFzSW5GbG93T3JG bG9hdGluZ0NoaWxkKCkpCiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICBhdXRv JiBmaXJzdENoaWxkID0gKmRvd25jYXN0PENvbnRhaW5lcj4obGF5b3V0Qm94KS5maXJzdEluRmxv d09yRmxvYXRpbmdDaGlsZCgpOwotICAgICAgICAgICAgbGF5b3V0UXVldWUuYXBwZW5kKHN0ZDo6 bWFrZV91bmlxdWU8TGF5b3V0UGFpcj4oTGF5b3V0UGFpciB7Zmlyc3RDaGlsZCwgbGF5b3V0Q29u dGV4dC5jcmVhdGVEaXNwbGF5Qm94KGZpcnN0Q2hpbGQpfSkpOworICAgICAgICAgICAgbGF5b3V0 UXVldWUuYXBwZW5kKHN0ZDo6bWFrZV91bmlxdWU8Qm94UGFpcj4oQm94UGFpciB7Zmlyc3RDaGls ZCwgbGF5b3V0Q29udGV4dC5jcmVhdGVEaXNwbGF5Qm94KGZpcnN0Q2hpbGQpfSkpOwogICAgICAg ICB9CiAKICAgICAgICAgLy8gQ2xpbWIgYmFjayBvbiB0aGUgYW5jZXN0b3JzIGFuZCBjb21wdXRl IGhlaWdodC9maW5hbCBwb3NpdGlvbi4KICAgICAgICAgd2hpbGUgKCFsYXlvdXRRdWV1ZS5pc0Vt cHR5KCkpIHsKICAgICAgICAgICAgIC8vIEFsbCBpbmZsb3cgZGVzY2VuZGFudHMgKGlmIHRoZXJl IGFyZSBhbnkpIGFyZSBsYWlkIG91dCBieSBub3cuIExldCdzIGNvbXB1dGUgdGhlIGJveCdzIGhl aWdodC4KLSAgICAgICAgICAgIGF1dG8gbGF5b3V0UGFpciA9IGxheW91dFF1ZXVlLnRha2VMYXN0 KCk7Ci0gICAgICAgICAgICBhdXRvJiBsYXlvdXRCb3ggPSBsYXlvdXRQYWlyLT5sYXlvdXRCb3g7 Ci0gICAgICAgICAgICBhdXRvJiBkaXNwbGF5Qm94ID0gbGF5b3V0UGFpci0+ZGlzcGxheUJveDsK KyAgICAgICAgICAgIGF1dG8gYm94UGFpciA9IGxheW91dFF1ZXVlLnRha2VMYXN0KCk7CisgICAg ICAgICAgICBhdXRvJiBsYXlvdXRCb3ggPSBib3hQYWlyLT5sYXlvdXQ7CisgICAgICAgICAgICBh dXRvJiBkaXNwbGF5Qm94ID0gYm94UGFpci0+ZGlzcGxheTsKIAogICAgICAgICAgICAgTE9HX1dJ VEhfU1RSRUFNKEZvcm1hdHRpbmdDb250ZXh0TGF5b3V0LCBzdHJlYW0gPDwgIltDb21wdXRlXSAt PiBbSGVpZ2h0XVtNYXJnaW5dIC0+IGZvciBsYXlvdXRCb3goIiA8PCAmbGF5b3V0Qm94IDw8ICIp Iik7CiAgICAgICAgICAgICAvLyBGb3JtYXR0aW5nIHJvb3QgYm94ZXMgYXJlIHNwZWNpYWwtY2Fz ZWQgYW5kIHRoZXkgZG9uJ3QgY29tZSBoZXJlLgpAQCAtMTIwLDcgKzEyMCw3IEBAIHZvaWQgQmxv Y2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0KExheW91dENvbnRleHQmIGxheW91dENvbnRleHQs IEZvcm1hdHRpbmdTdGF0CiAgICAgICAgICAgICAvLyBNb3ZlIGluLWZsb3cgcG9zaXRpb25lZCBj aGlsZHJlbiB0byB0aGVpciBmaW5hbCBwb3NpdGlvbi4KICAgICAgICAgICAgIHBsYWNlSW5GbG93 UG9zaXRpb25lZENoaWxkcmVuKGxheW91dENvbnRleHQsIGNvbnRhaW5lcik7CiAgICAgICAgICAg ICBpZiAoYXV0byogbmV4dFNpYmxpbmcgPSBjb250YWluZXIubmV4dEluRmxvd09yRmxvYXRpbmdT aWJsaW5nKCkpIHsKLSAgICAgICAgICAgICAgICBsYXlvdXRRdWV1ZS5hcHBlbmQoc3RkOjptYWtl X3VuaXF1ZTxMYXlvdXRQYWlyPihMYXlvdXRQYWlyIHsqbmV4dFNpYmxpbmcsIGxheW91dENvbnRl eHQuY3JlYXRlRGlzcGxheUJveCgqbmV4dFNpYmxpbmcpfSkpOworICAgICAgICAgICAgICAgIGxh eW91dFF1ZXVlLmFwcGVuZChzdGQ6Om1ha2VfdW5pcXVlPEJveFBhaXI+KEJveFBhaXIgeypuZXh0 U2libGluZywgbGF5b3V0Q29udGV4dC5jcmVhdGVEaXNwbGF5Qm94KCpuZXh0U2libGluZyl9KSk7 CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0K