236255 2022-02-07 13:39:11 -0800 [LFC][IFC] LineBoxBuilder::setBaselineAndLayoutBounds should handle atomic inline level boxes too 2022-02-08 06:28:17 -0800 1 1 1 Unclassified WebKit Layout and Rendering Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1838331 0 zalan 2022-02-07 13:39:11 -0800 ssia 1838335 1 451146 zalan 2022-02-07 13:41:43 -0800 Created attachment 451146 Patch 1838488 2 451194 zalan 2022-02-07 19:14:25 -0800 Created attachment 451194 Patch 1838637 3 ews-feeder 2022-02-08 06:27:29 -0800 Committed r289372 (246960@main): <https://commits.webkit.org/246960@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 451194. 1838638 4 webkit-bug-importer 2022-02-08 06:28:17 -0800 <rdar://problem/88626368> 451146 2022-02-07 13:41:43 -0800 2022-02-07 19:14:23 -0800 Patch bug-236255-20220207134142.patch text/plain 5840 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MjIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDE5N2U1Y2Q5MjkzZWFl M2ZkMzc0OGZlYWVmNzAzMmRiYjgzMjM5MS4uMDRkZjYyMzIzYjBhYTU4NjY1MTYyOWMyZWVhNGZi NzU3ODE4NzAwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIyLTAyLTA3ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIExpbmVCb3hC dWlsZGVyOjpzZXRCYXNlbGluZUFuZExheW91dEJvdW5kcyBzaG91bGQgaGFuZGxlIGF0b21pYyBp bmxpbmUgbGV2ZWwgYm94ZXMgdG9vCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMzYyNTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciBhZGRpbmcgc3VwcG9ydCBm b3IgaWRlb2dyYXBoaWMgYmFzZWxpbmUgb24gYXRvbWljIGlubGluZSBsZXZlbCBib3hlcy4KKwor ICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hC dWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OnNl dEJhc2VsaW5lQW5kTGF5b3V0Qm91bmRzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6TGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGluZUxldmVsQm94ZXMpOgorCiAyMDIyLTAy LTA3ICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgogCiAgICAgICAgIEltcHJv dmUgRG9jdW1lbnRUaW1lbGluZTo6YW5pbWF0aW9uQ2FuQmVSZW1vdmVkKCkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxp bmVCb3hCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmNwcAppbmRleCA3MGYxMTNkNTY2Y2Q4NWEw ODBhZDc2ODhhMTkwMmZmM2Y5YTdkYjc4Li5lYTIzNDNkODcyNWZhMjNmMTQ5OTRmNjVkNjdhNTI4 YzlkZjVmZjNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIu Y3BwCkBAIC0xNzYsMjYgKzE3NiwzNSBAQCBzdGF0aWMgTGF5b3V0Qm91bmRzTWV0cmljcyBsYXlv dXRCb3VuZHNNZXRyaWNzRm9ySW5saW5lQm94KGNvbnN0IElubGluZUxldmVsQm94JgogICAgIHJl dHVybiB7IGFzY2VudCwgZGVzY2VudCwgbGluZVNwYWNpbmcsIGlubGluZUJveC5pc1ByZWZlcnJl ZExpbmVIZWlnaHRGb250TWV0cmljc0Jhc2VkKCkgPyBzdGQ6Om51bGxvcHQgOiBzdGQ6Om1ha2Vf b3B0aW9uYWwoaW5saW5lQm94LnByZWZlcnJlZExpbmVIZWlnaHQoKSkgfTsKIH0KIAotdm9pZCBM aW5lQm94QnVpbGRlcjo6c2V0QmFzZWxpbmVBbmRMYXlvdXRCb3VuZHMoSW5saW5lTGV2ZWxCb3gm IGlubGluZUJveCwgY29uc3QgTGF5b3V0Qm91bmRzTWV0cmljcyYgbGF5b3V0Qm91bmRzTWV0cmlj cykgY29uc3QKK3ZvaWQgTGluZUJveEJ1aWxkZXI6OnNldEJhc2VsaW5lQW5kTGF5b3V0Qm91bmRz KElubGluZUxldmVsQm94JiBpbmxpbmVMZXZlbEJveCwgY29uc3QgTGF5b3V0Qm91bmRzTWV0cmlj cyYgbGF5b3V0Qm91bmRzTWV0cmljcykgY29uc3QKIHsKLSAgICBhdXRvIGxvZ2ljYWxIZWlnaHQg PSBsYXlvdXRCb3VuZHNNZXRyaWNzLmFzY2VudCArIGxheW91dEJvdW5kc01ldHJpY3MuZGVzY2Vu dDsKLSAgICBhdXRvIGhhbGZMZWFkaW5nID0gSW5saW5lTGF5b3V0VW5pdCB7IH07Ci0gICAgaWYg KGxheW91dEJvdW5kc01ldHJpY3MucHJlZmVycmVkTGluZUhlaWdodCkgewotICAgICAgICAvLyBJ ZiBsaW5lLWhlaWdodCBjb21wdXRlcyB0byBub3JtYWwgYW5kIGVpdGhlciB0ZXh0LWVkZ2UgaXMg bGVhZGluZyBvciB0aGlzIGlzIHRoZSByb290IGlubGluZSBib3gsCi0gICAgICAgIC8vIHRoZSBm b2504oCZcyBsaW5lIGdhcCBtZXRyaWMgbWF5IGFsc28gYmUgaW5jb3Jwb3JhdGVkIGludG8gQSBh bmQgRCBieSBhZGRpbmcgaGFsZiB0byBlYWNoIHNpZGUgYXMgaGFsZi1sZWFkaW5nLgotICAgICAg ICAvLyBodHRwczovL3d3dy53My5vcmcvVFIvY3NzLWlubGluZS0zLyNpbmxpbmUtaGVpZ2h0Ci0g ICAgICAgIC8vIFNpbmNlIHRleHQtZWRnZSBpcyBub3Qgc3VwcG9ydGVkIHlldCBhbmQgdGhlIGlu aXRpYWwgdmFsdWUgaXMgbGVhZGluZywgd2Ugc2hvdWxkIGp1c3QgYXBwbHkgaXQgdG8KLSAgICAg ICAgLy8gYWxsIGlubGluZSBib3hlcy4KLSAgICAgICAgaGFsZkxlYWRpbmcgPSAoKmxheW91dEJv dW5kc01ldHJpY3MucHJlZmVycmVkTGluZUhlaWdodCAtIGxvZ2ljYWxIZWlnaHQpIC8gMjsKLSAg ICB9IGVsc2UgewotICAgICAgICAvLyBQcmVmZXJyZWQgbGluZSBoZWlnaHQgaXMgcHVyZWx5IGZv bnQgbWV0cmljcyBiYXNlZCAoaS5lIGdseXBocyBzdHJldGNoIHRoZSBsaW5lKS4KLSAgICAgICAg aGFsZkxlYWRpbmcgPSAobGF5b3V0Qm91bmRzTWV0cmljcy5saW5lU3BhY2luZyAtIGxvZ2ljYWxI ZWlnaHQpIC8gMjsKKyAgICBpZiAoaW5saW5lTGV2ZWxCb3guaXNJbmxpbmVCb3goKSB8fCBpbmxp bmVMZXZlbEJveC5pc0xpbmVCcmVha0JveCgpKSB7CisgICAgICAgIGF1dG8gbG9naWNhbEhlaWdo dCA9IGxheW91dEJvdW5kc01ldHJpY3MuYXNjZW50ICsgbGF5b3V0Qm91bmRzTWV0cmljcy5kZXNj ZW50OworICAgICAgICBhdXRvIGhhbGZMZWFkaW5nID0gSW5saW5lTGF5b3V0VW5pdCB7IH07Cisg ICAgICAgIGlmIChsYXlvdXRCb3VuZHNNZXRyaWNzLnByZWZlcnJlZExpbmVIZWlnaHQpIHsKKyAg ICAgICAgICAgIC8vIElmIGxpbmUtaGVpZ2h0IGNvbXB1dGVzIHRvIG5vcm1hbCBhbmQgZWl0aGVy IHRleHQtZWRnZSBpcyBsZWFkaW5nIG9yIHRoaXMgaXMgdGhlIHJvb3QgaW5saW5lIGJveCwKKyAg ICAgICAgICAgIC8vIHRoZSBmb2504oCZcyBsaW5lIGdhcCBtZXRyaWMgbWF5IGFsc28gYmUgaW5j b3Jwb3JhdGVkIGludG8gQSBhbmQgRCBieSBhZGRpbmcgaGFsZiB0byBlYWNoIHNpZGUgYXMgaGFs Zi1sZWFkaW5nLgorICAgICAgICAgICAgLy8gaHR0cHM6Ly93d3cudzMub3JnL1RSL2Nzcy1pbmxp bmUtMy8jaW5saW5lLWhlaWdodAorICAgICAgICAgICAgLy8gU2luY2UgdGV4dC1lZGdlIGlzIG5v dCBzdXBwb3J0ZWQgeWV0IGFuZCB0aGUgaW5pdGlhbCB2YWx1ZSBpcyBsZWFkaW5nLCB3ZSBzaG91 bGQganVzdCBhcHBseSBpdCB0bworICAgICAgICAgICAgLy8gYWxsIGlubGluZSBib3hlcy4KKyAg ICAgICAgICAgIGhhbGZMZWFkaW5nID0gKCpsYXlvdXRCb3VuZHNNZXRyaWNzLnByZWZlcnJlZExp bmVIZWlnaHQgLSBsb2dpY2FsSGVpZ2h0KSAvIDI7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAg ICAgICAvLyBQcmVmZXJyZWQgbGluZSBoZWlnaHQgaXMgcHVyZWx5IGZvbnQgbWV0cmljcyBiYXNl ZCAoaS5lIGdseXBocyBzdHJldGNoIHRoZSBsaW5lKS4KKyAgICAgICAgICAgIGhhbGZMZWFkaW5n ID0gKGxheW91dEJvdW5kc01ldHJpY3MubGluZVNwYWNpbmcgLSBsb2dpY2FsSGVpZ2h0KSAvIDI7 CisgICAgICAgIH0KKyAgICAgICAgLy8gV2UgbmVlZCBmbG9vci9jZWlsIHRvIG1hdGNoIGxlZ2Fj eSBsYXlvdXQgaW50ZWdyYWwgcG9zaXRpb25pbmcuCisgICAgICAgIGlubGluZUxldmVsQm94LnNl dEFzY2VudChmbG9vcmYobGF5b3V0Qm91bmRzTWV0cmljcy5hc2NlbnQpKTsKKyAgICAgICAgaW5s aW5lTGV2ZWxCb3guc2V0RGVzY2VudChjZWlsZihsYXlvdXRCb3VuZHNNZXRyaWNzLmRlc2NlbnQp KTsKKyAgICAgICAgaW5saW5lTGV2ZWxCb3guc2V0TG9naWNhbEhlaWdodChsb2dpY2FsSGVpZ2h0 KTsKKyAgICAgICAgaW5saW5lTGV2ZWxCb3guc2V0TGF5b3V0Qm91bmRzKHsgZmxvb3JmKGxheW91 dEJvdW5kc01ldHJpY3MuYXNjZW50ICsgaGFsZkxlYWRpbmcpLCBjZWlsZihsYXlvdXRCb3VuZHNN ZXRyaWNzLmRlc2NlbnQgKyBoYWxmTGVhZGluZykgfSk7CisgICAgICAgIHJldHVybjsKICAgICB9 Ci0gICAgLy8gV2UgbmVlZCBmbG9vci9jZWlsIHRvIG1hdGNoIGxlZ2FjeSBsYXlvdXQgaW50ZWdy YWwgcG9zaXRpb25pbmcuCi0gICAgaW5saW5lQm94LnNldEFzY2VudChmbG9vcmYobGF5b3V0Qm91 bmRzTWV0cmljcy5hc2NlbnQpKTsKLSAgICBpbmxpbmVCb3guc2V0RGVzY2VudChjZWlsZihsYXlv dXRCb3VuZHNNZXRyaWNzLmRlc2NlbnQpKTsKLSAgICBpbmxpbmVCb3guc2V0TG9naWNhbEhlaWdo dChsb2dpY2FsSGVpZ2h0KTsKLSAgICBpbmxpbmVCb3guc2V0TGF5b3V0Qm91bmRzKHsgZmxvb3Jm KGxheW91dEJvdW5kc01ldHJpY3MuYXNjZW50ICsgaGFsZkxlYWRpbmcpLCBjZWlsZihsYXlvdXRC b3VuZHNNZXRyaWNzLmRlc2NlbnQgKyBoYWxmTGVhZGluZykgfSk7CisgICAgaWYgKGlubGluZUxl dmVsQm94LmlzQXRvbWljSW5saW5lTGV2ZWxCb3goKSkgeworICAgICAgICBpbmxpbmVMZXZlbEJv eC5zZXRBc2NlbnQobGF5b3V0Qm91bmRzTWV0cmljcy5hc2NlbnQpOworICAgICAgICBpbmxpbmVM ZXZlbEJveC5zZXRMYXlvdXRCb3VuZHMoeyBsYXlvdXRCb3VuZHNNZXRyaWNzLmFzY2VudCwgbGF5 b3V0Qm91bmRzTWV0cmljcy5kZXNjZW50IH0pOworICAgICAgICByZXR1cm47CisgICAgfQorICAg IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogfQogCiB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1 Y3RJbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmVCdWlsZGVyOjpM aW5lQ29udGVudCYgbGluZUNvbnRlbnQsIHNpemVfdCBsaW5lSW5kZXgpCkBAIC0yNTYsOCArMjY1 LDcgQEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhMaW5l Qm94JiBsaW5lQm94LCBjb25zdCBMaW5lQnVpbGQKICAgICAgICAgICAgICAgICBhc2NlbnQgPSBt YXJnaW5Cb3hIZWlnaHQ7CiAgICAgICAgICAgICBsb2dpY2FsTGVmdCArPSBzdGQ6Om1heCgwX2x1 LCBpbmxpbmVMZXZlbEJveEdlb21ldHJ5Lm1hcmdpblN0YXJ0KCkpOwogICAgICAgICAgICAgYXV0 byBhdG9taWNJbmxpbmVMZXZlbEJveCA9IElubGluZUxldmVsQm94OjpjcmVhdGVBdG9taWNJbmxp bmVMZXZlbEJveChsYXlvdXRCb3gsIHN0eWxlLCBsb2dpY2FsTGVmdCwgeyBpbmxpbmVMZXZlbEJv eEdlb21ldHJ5LmJvcmRlckJveFdpZHRoKCksIG1hcmdpbkJveEhlaWdodCB9KTsKLSAgICAgICAg ICAgIGF0b21pY0lubGluZUxldmVsQm94LnNldEFzY2VudChhc2NlbnQpOwotICAgICAgICAgICAg YXRvbWljSW5saW5lTGV2ZWxCb3guc2V0TGF5b3V0Qm91bmRzKElubGluZUxldmVsQm94OjpMYXlv dXRCb3VuZHMgeyBhc2NlbnQsIG1hcmdpbkJveEhlaWdodCAtIGFzY2VudCB9KTsKKyAgICAgICAg ICAgIHNldEJhc2VsaW5lQW5kTGF5b3V0Qm91bmRzKGF0b21pY0lubGluZUxldmVsQm94LCB7IGFz Y2VudCwgbWFyZ2luQm94SGVpZ2h0IC0gYXNjZW50IH0pOwogICAgICAgICAgICAgbGluZUJveC5h ZGRJbmxpbmVMZXZlbEJveChXVEZNb3ZlKGF0b21pY0lubGluZUxldmVsQm94KSk7CiAgICAgICAg ICAgICBjb250aW51ZTsKICAgICAgICAgfQo= 451194 2022-02-07 19:14:25 -0800 2022-02-08 06:27:30 -0800 Patch bug-236255-20220207191425.patch text/plain 6389 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MjU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjU2NzE4N2Q3NGNiNjFk NTAwNTAzNmUwMjNiZDQ3OTIwN2M4OWZmYi4uNWMzZDdiOGIxMWNlMzZmMWJkMDAwNTI4NjdhOWU4 OTJmYmU0YjZlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIyLTAyLTA3ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIExpbmVCb3hC dWlsZGVyOjpzZXRCYXNlbGluZUFuZExheW91dEJvdW5kcyBzaG91bGQgaGFuZGxlIGF0b21pYyBp bmxpbmUgbGV2ZWwgYm94ZXMgdG9vCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMzYyNTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBDYWxsIHNldEJhc2VsaW5lQW5kTGF5b3V0Qm91bmRzIHdpdGggYXRvbWlj IHR5cGUgb2YgaW5saW5lIGxldmVsIGJveGVzLgorICAgICAgICBUaGlzIGlzIGluIHByZXBhcmF0 aW9uIGZvciBhZGRpbmcgc3VwcG9ydCBmb3IgaWRlb2dyYXBoaWMgYmFzZWxpbmUgb24gYXRvbWlj IGlubGluZSBsZXZlbCBib3hlcy4KKworICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6TGluZUJveEJ1aWxkZXI6OnNldEJhc2VsaW5lQW5kTGF5b3V0Qm91bmRzIGNvbnN0KToK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGlu ZUxldmVsQm94ZXMpOgorCiAyMDIyLTAyLTA3ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBw bGUuY29tPgogCiAgICAgICAgIEFsd2F5cyBzeW5jIFJlc291cmNlUmVxdWVzdCBpc0FwcEluaXRp YXRlZCByZXF1ZXN0IHdpdGggTlNVUkxSZXF1ZXN0IGF0dHJpYnV0aW9uIHZhbHVlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9Jbmxp bmVMaW5lQm94QnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5jcHAKaW5kZXggNzBmMTEzZDU2NmNk ODVhMDgwYWQ3Njg4YTE5MDJmZjNmOWE3ZGI3OC4uYmM0MTgxMWI1ODMwM2MxZmNlY2ZlOTk2MWNj YmEzMmU1YzViMjg3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWls ZGVyLmNwcApAQCAtMTY0LDcgKzE2NCw3IEBAIHN0cnVjdCBMYXlvdXRCb3VuZHNNZXRyaWNzIHsK ICAgICBJbmxpbmVMYXlvdXRVbml0IGFzY2VudCB7IDAgfTsKICAgICBJbmxpbmVMYXlvdXRVbml0 IGRlc2NlbnQgeyAwIH07CiAgICAgSW5saW5lTGF5b3V0VW5pdCBsaW5lU3BhY2luZyB7IDAgfTsK LSAgICBzdGQ6Om9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IHByZWZlcnJlZExpbmVIZWlnaHQ7 CisgICAgc3RkOjpvcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBwcmVmZXJyZWRMaW5lSGVpZ2h0 IHsgfTsKIH07CiBzdGF0aWMgTGF5b3V0Qm91bmRzTWV0cmljcyBsYXlvdXRCb3VuZHNNZXRyaWNz Rm9ySW5saW5lQm94KGNvbnN0IElubGluZUxldmVsQm94JiBpbmxpbmVCb3gsIEZvbnRCYXNlbGlu ZSBmb250QmFzZWxpbmUgPSBBbHBoYWJldGljQmFzZWxpbmUpCiB7CkBAIC0xNzYsMjYgKzE3Niwz NSBAQCBzdGF0aWMgTGF5b3V0Qm91bmRzTWV0cmljcyBsYXlvdXRCb3VuZHNNZXRyaWNzRm9ySW5s aW5lQm94KGNvbnN0IElubGluZUxldmVsQm94JgogICAgIHJldHVybiB7IGFzY2VudCwgZGVzY2Vu dCwgbGluZVNwYWNpbmcsIGlubGluZUJveC5pc1ByZWZlcnJlZExpbmVIZWlnaHRGb250TWV0cmlj c0Jhc2VkKCkgPyBzdGQ6Om51bGxvcHQgOiBzdGQ6Om1ha2Vfb3B0aW9uYWwoaW5saW5lQm94LnBy ZWZlcnJlZExpbmVIZWlnaHQoKSkgfTsKIH0KIAotdm9pZCBMaW5lQm94QnVpbGRlcjo6c2V0QmFz ZWxpbmVBbmRMYXlvdXRCb3VuZHMoSW5saW5lTGV2ZWxCb3gmIGlubGluZUJveCwgY29uc3QgTGF5 b3V0Qm91bmRzTWV0cmljcyYgbGF5b3V0Qm91bmRzTWV0cmljcykgY29uc3QKK3ZvaWQgTGluZUJv eEJ1aWxkZXI6OnNldEJhc2VsaW5lQW5kTGF5b3V0Qm91bmRzKElubGluZUxldmVsQm94JiBpbmxp bmVMZXZlbEJveCwgY29uc3QgTGF5b3V0Qm91bmRzTWV0cmljcyYgbGF5b3V0Qm91bmRzTWV0cmlj cykgY29uc3QKIHsKLSAgICBhdXRvIGxvZ2ljYWxIZWlnaHQgPSBsYXlvdXRCb3VuZHNNZXRyaWNz LmFzY2VudCArIGxheW91dEJvdW5kc01ldHJpY3MuZGVzY2VudDsKLSAgICBhdXRvIGhhbGZMZWFk aW5nID0gSW5saW5lTGF5b3V0VW5pdCB7IH07Ci0gICAgaWYgKGxheW91dEJvdW5kc01ldHJpY3Mu cHJlZmVycmVkTGluZUhlaWdodCkgewotICAgICAgICAvLyBJZiBsaW5lLWhlaWdodCBjb21wdXRl cyB0byBub3JtYWwgYW5kIGVpdGhlciB0ZXh0LWVkZ2UgaXMgbGVhZGluZyBvciB0aGlzIGlzIHRo ZSByb290IGlubGluZSBib3gsCi0gICAgICAgIC8vIHRoZSBmb2504oCZcyBsaW5lIGdhcCBtZXRy aWMgbWF5IGFsc28gYmUgaW5jb3Jwb3JhdGVkIGludG8gQSBhbmQgRCBieSBhZGRpbmcgaGFsZiB0 byBlYWNoIHNpZGUgYXMgaGFsZi1sZWFkaW5nLgotICAgICAgICAvLyBodHRwczovL3d3dy53My5v cmcvVFIvY3NzLWlubGluZS0zLyNpbmxpbmUtaGVpZ2h0Ci0gICAgICAgIC8vIFNpbmNlIHRleHQt ZWRnZSBpcyBub3Qgc3VwcG9ydGVkIHlldCBhbmQgdGhlIGluaXRpYWwgdmFsdWUgaXMgbGVhZGlu Zywgd2Ugc2hvdWxkIGp1c3QgYXBwbHkgaXQgdG8KLSAgICAgICAgLy8gYWxsIGlubGluZSBib3hl cy4KLSAgICAgICAgaGFsZkxlYWRpbmcgPSAoKmxheW91dEJvdW5kc01ldHJpY3MucHJlZmVycmVk TGluZUhlaWdodCAtIGxvZ2ljYWxIZWlnaHQpIC8gMjsKLSAgICB9IGVsc2UgewotICAgICAgICAv LyBQcmVmZXJyZWQgbGluZSBoZWlnaHQgaXMgcHVyZWx5IGZvbnQgbWV0cmljcyBiYXNlZCAoaS5l IGdseXBocyBzdHJldGNoIHRoZSBsaW5lKS4KLSAgICAgICAgaGFsZkxlYWRpbmcgPSAobGF5b3V0 Qm91bmRzTWV0cmljcy5saW5lU3BhY2luZyAtIGxvZ2ljYWxIZWlnaHQpIC8gMjsKKyAgICBpZiAo aW5saW5lTGV2ZWxCb3guaXNJbmxpbmVCb3goKSB8fCBpbmxpbmVMZXZlbEJveC5pc0xpbmVCcmVh a0JveCgpKSB7CisgICAgICAgIGF1dG8gbG9naWNhbEhlaWdodCA9IGxheW91dEJvdW5kc01ldHJp Y3MuYXNjZW50ICsgbGF5b3V0Qm91bmRzTWV0cmljcy5kZXNjZW50OworICAgICAgICBhdXRvIGhh bGZMZWFkaW5nID0gSW5saW5lTGF5b3V0VW5pdCB7IH07CisgICAgICAgIGlmIChsYXlvdXRCb3Vu ZHNNZXRyaWNzLnByZWZlcnJlZExpbmVIZWlnaHQpIHsKKyAgICAgICAgICAgIC8vIElmIGxpbmUt aGVpZ2h0IGNvbXB1dGVzIHRvIG5vcm1hbCBhbmQgZWl0aGVyIHRleHQtZWRnZSBpcyBsZWFkaW5n IG9yIHRoaXMgaXMgdGhlIHJvb3QgaW5saW5lIGJveCwKKyAgICAgICAgICAgIC8vIHRoZSBmb250 4oCZcyBsaW5lIGdhcCBtZXRyaWMgbWF5IGFsc28gYmUgaW5jb3Jwb3JhdGVkIGludG8gQSBhbmQg RCBieSBhZGRpbmcgaGFsZiB0byBlYWNoIHNpZGUgYXMgaGFsZi1sZWFkaW5nLgorICAgICAgICAg ICAgLy8gaHR0cHM6Ly93d3cudzMub3JnL1RSL2Nzcy1pbmxpbmUtMy8jaW5saW5lLWhlaWdodAor ICAgICAgICAgICAgLy8gU2luY2UgdGV4dC1lZGdlIGlzIG5vdCBzdXBwb3J0ZWQgeWV0IGFuZCB0 aGUgaW5pdGlhbCB2YWx1ZSBpcyBsZWFkaW5nLCB3ZSBzaG91bGQganVzdCBhcHBseSBpdCB0bwor ICAgICAgICAgICAgLy8gYWxsIGlubGluZSBib3hlcy4KKyAgICAgICAgICAgIGhhbGZMZWFkaW5n ID0gKCpsYXlvdXRCb3VuZHNNZXRyaWNzLnByZWZlcnJlZExpbmVIZWlnaHQgLSBsb2dpY2FsSGVp Z2h0KSAvIDI7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAvLyBQcmVmZXJyZWQgbGlu ZSBoZWlnaHQgaXMgcHVyZWx5IGZvbnQgbWV0cmljcyBiYXNlZCAoaS5lIGdseXBocyBzdHJldGNo IHRoZSBsaW5lKS4KKyAgICAgICAgICAgIGhhbGZMZWFkaW5nID0gKGxheW91dEJvdW5kc01ldHJp Y3MubGluZVNwYWNpbmcgLSBsb2dpY2FsSGVpZ2h0KSAvIDI7CisgICAgICAgIH0KKyAgICAgICAg Ly8gV2UgbmVlZCBmbG9vci9jZWlsIHRvIG1hdGNoIGxlZ2FjeSBsYXlvdXQgaW50ZWdyYWwgcG9z aXRpb25pbmcuCisgICAgICAgIGlubGluZUxldmVsQm94LnNldEFzY2VudChmbG9vcmYobGF5b3V0 Qm91bmRzTWV0cmljcy5hc2NlbnQpKTsKKyAgICAgICAgaW5saW5lTGV2ZWxCb3guc2V0RGVzY2Vu dChjZWlsZihsYXlvdXRCb3VuZHNNZXRyaWNzLmRlc2NlbnQpKTsKKyAgICAgICAgaW5saW5lTGV2 ZWxCb3guc2V0TG9naWNhbEhlaWdodChsb2dpY2FsSGVpZ2h0KTsKKyAgICAgICAgaW5saW5lTGV2 ZWxCb3guc2V0TGF5b3V0Qm91bmRzKHsgZmxvb3JmKGxheW91dEJvdW5kc01ldHJpY3MuYXNjZW50 ICsgaGFsZkxlYWRpbmcpLCBjZWlsZihsYXlvdXRCb3VuZHNNZXRyaWNzLmRlc2NlbnQgKyBoYWxm TGVhZGluZykgfSk7CisgICAgICAgIHJldHVybjsKICAgICB9Ci0gICAgLy8gV2UgbmVlZCBmbG9v ci9jZWlsIHRvIG1hdGNoIGxlZ2FjeSBsYXlvdXQgaW50ZWdyYWwgcG9zaXRpb25pbmcuCi0gICAg aW5saW5lQm94LnNldEFzY2VudChmbG9vcmYobGF5b3V0Qm91bmRzTWV0cmljcy5hc2NlbnQpKTsK LSAgICBpbmxpbmVCb3guc2V0RGVzY2VudChjZWlsZihsYXlvdXRCb3VuZHNNZXRyaWNzLmRlc2Nl bnQpKTsKLSAgICBpbmxpbmVCb3guc2V0TG9naWNhbEhlaWdodChsb2dpY2FsSGVpZ2h0KTsKLSAg ICBpbmxpbmVCb3guc2V0TGF5b3V0Qm91bmRzKHsgZmxvb3JmKGxheW91dEJvdW5kc01ldHJpY3Mu YXNjZW50ICsgaGFsZkxlYWRpbmcpLCBjZWlsZihsYXlvdXRCb3VuZHNNZXRyaWNzLmRlc2NlbnQg KyBoYWxmTGVhZGluZykgfSk7CisgICAgaWYgKGlubGluZUxldmVsQm94LmlzQXRvbWljSW5saW5l TGV2ZWxCb3goKSkgeworICAgICAgICBpbmxpbmVMZXZlbEJveC5zZXRBc2NlbnQobGF5b3V0Qm91 bmRzTWV0cmljcy5hc2NlbnQpOworICAgICAgICBpbmxpbmVMZXZlbEJveC5zZXRMYXlvdXRCb3Vu ZHMoeyBsYXlvdXRCb3VuZHNNZXRyaWNzLmFzY2VudCwgbGF5b3V0Qm91bmRzTWV0cmljcy5kZXNj ZW50IH0pOworICAgICAgICByZXR1cm47CisgICAgfQorICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgp OwogfQogCiB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZlbEJveGVzKExp bmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYgbGluZUNvbnRl bnQsIHNpemVfdCBsaW5lSW5kZXgpCkBAIC0yNTYsOCArMjY1LDcgQEAgdm9pZCBMaW5lQm94QnVp bGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lQm94LCBjb25zdCBM aW5lQnVpbGQKICAgICAgICAgICAgICAgICBhc2NlbnQgPSBtYXJnaW5Cb3hIZWlnaHQ7CiAgICAg ICAgICAgICBsb2dpY2FsTGVmdCArPSBzdGQ6Om1heCgwX2x1LCBpbmxpbmVMZXZlbEJveEdlb21l dHJ5Lm1hcmdpblN0YXJ0KCkpOwogICAgICAgICAgICAgYXV0byBhdG9taWNJbmxpbmVMZXZlbEJv eCA9IElubGluZUxldmVsQm94OjpjcmVhdGVBdG9taWNJbmxpbmVMZXZlbEJveChsYXlvdXRCb3gs IHN0eWxlLCBsb2dpY2FsTGVmdCwgeyBpbmxpbmVMZXZlbEJveEdlb21ldHJ5LmJvcmRlckJveFdp ZHRoKCksIG1hcmdpbkJveEhlaWdodCB9KTsKLSAgICAgICAgICAgIGF0b21pY0lubGluZUxldmVs Qm94LnNldEFzY2VudChhc2NlbnQpOwotICAgICAgICAgICAgYXRvbWljSW5saW5lTGV2ZWxCb3gu c2V0TGF5b3V0Qm91bmRzKElubGluZUxldmVsQm94OjpMYXlvdXRCb3VuZHMgeyBhc2NlbnQsIG1h cmdpbkJveEhlaWdodCAtIGFzY2VudCB9KTsKKyAgICAgICAgICAgIHNldEJhc2VsaW5lQW5kTGF5 b3V0Qm91bmRzKGF0b21pY0lubGluZUxldmVsQm94LCB7IGFzY2VudCwgbWFyZ2luQm94SGVpZ2h0 IC0gYXNjZW50IH0pOwogICAgICAgICAgICAgbGluZUJveC5hZGRJbmxpbmVMZXZlbEJveChXVEZN b3ZlKGF0b21pY0lubGluZUxldmVsQm94KSk7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAg ICAgfQo=