222562 2021-03-01 10:36:58 -0800 [LFC][IFC] Move simplified vertical alignment computation to struct SimplifiedVerticalAlignment 2021-03-01 20:22:14 -0800 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 1734483 0 zalan 2021-03-01 10:36:58 -0800 ssia 1734485 1 421843 zalan 2021-03-01 10:39:25 -0800 Created attachment 421843 Patch 1734731 2 421897 zalan 2021-03-01 19:39:44 -0800 Created attachment 421897 Patch 1734737 3 ews-feeder 2021-03-01 20:21:52 -0800 Committed r273722: <https://commits.webkit.org/r273722> All reviewed patches have been landed. Closing bug and clearing flags on attachment 421897. 1734738 4 webkit-bug-importer 2021-03-01 20:22:14 -0800 <rdar://problem/74907675> 421843 2021-03-01 10:39:25 -0800 2021-03-01 19:39:43 -0800 Patch bug-222562-20210301103924.patch text/plain 5717 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjczNjUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODgyMTk3ZTNjMDI5NTZi NzJmODYxOGVhZmU5NDc5YmE5M2I2N2VjMy4uMDdlOTNmNzFiNzc0ZGM0MjY4NDg1MzQ3YWViMDU4 YTk1ODc1NTA2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTAzLTAxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBNb3ZlIHNp bXBsaWZpZWQgdmVydGljYWwgYWxpZ25tZW50IGNvbXB1dGF0aW9uIHRvIHN0cnVjdCBTaW1wbGlm aWVkVmVydGljYWxBbGlnbm1lbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyMjU2MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIHN1cHBvcnRpbmcgbm9uLWF0 b21pYyBpbmxpbmUgbGV2ZWwgYm94ZXMgKGJ5IGp1c3QgY2FsbGluZyBzaW1wbGlmaWVkVmVydGlj YWxBbGlnbm1lbnQuYWRqdXN0KGlubGluZUxldmVsQm94KSkuCisKKyAgICAgICAgKiBsYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6U2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50OjpTaW1w bGlmaWVkVmVydGljYWxBbGlnbm1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpTaW1w bGlmaWVkVmVydGljYWxBbGlnbm1lbnQ6OnJvb3RJbmxpbmVCb3hMb2dpY2FsVG9wIGNvbnN0KToK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6U2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50Ojps aW5lQm94SGVpZ2h0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6U2ltcGxpZmll ZFZlcnRpY2FsQWxpZ25tZW50OjphZGp1c3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpM aW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyk6CisKIDIwMjEtMDMtMDEg IFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIERv IG5vdCB0cnkgdG8gcnVuIHNpbXBsaWZpZWQgYWxpZ25tZW50IHdoZW4gbGluZS1oZWlnaHQgaXMg c2V0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmlu ZGV4IDJmYmFkY2RhMTc0MTRhMDYwZDA2YTQwNTRmNjFkMzRjYWY0MjkxNDEuLmE5MDZiYWU0MjFk YTk3YjI2MWQyNDlhMjQzYjFmZmE4ODk5NGYyMzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnku Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCkBAIC0yMDEsMTggKzIwMSwzNiBAQCB2b2lkIExp bmVCb3hCdWlsZGVyOjpzZXRWZXJ0aWNhbEdlb21ldHJ5Rm9ySW5saW5lQm94KExpbmVCb3g6Oklu bGluZUxldmVsQm94JiBpbgogICAgIGlubGluZUxldmVsQm94LnNldExheW91dEJvdW5kcyhMaW5l Qm94OjpJbmxpbmVMZXZlbEJveDo6TGF5b3V0Qm91bmRzIHsgZmxvb3JmKGFzY2VudCksIGNlaWwo ZGVzY2VudCkgfSk7CiB9CiAKK3N0cnVjdCBTaW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQgewor ICAgIFNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudChjb25zdCBMaW5lQm94OjpJbmxpbmVMZXZl bEJveCYgcm9vdElubGluZUJveCkKKyAgICAgICAgOiBtX3Jvb3RJbmxpbmVCb3gocm9vdElubGlu ZUJveCkKKyAgICB7CisgICAgICAgIGFkanVzdChyb290SW5saW5lQm94KTsKKyAgICB9CisKKyAg ICBJbmxpbmVMYXlvdXRVbml0IHJvb3RJbmxpbmVCb3hMb2dpY2FsVG9wKCkgY29uc3QgeyByZXR1 cm4gbV9yb290SW5saW5lQm94TG9naWNhbFRvcDsgfQorICAgIElubGluZUxheW91dFVuaXQgbGlu ZUJveEhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1fbGluZUJveExvZ2ljYWxCb3R0b20gLSBtX2xp bmVCb3hMb2dpY2FsVG9wOyB9CisKKyAgICB2b2lkIGFkanVzdChjb25zdCBMaW5lQm94OjpJbmxp bmVMZXZlbEJveCYgaW5saW5lTGV2ZWxCb3gpCisgICAgeworICAgICAgICBhdXRvIGxheW91dEJv dW5kc0xvZ2ljYWxUb3AgPSBtX3Jvb3RJbmxpbmVCb3gubGF5b3V0Qm91bmRzKCkuYXNjZW50IC0g aW5saW5lTGV2ZWxCb3gubGF5b3V0Qm91bmRzKCkuYXNjZW50OworICAgICAgICBtX2xpbmVCb3hM b2dpY2FsVG9wID0gc3RkOjptaW4obV9saW5lQm94TG9naWNhbFRvcCwgbGF5b3V0Qm91bmRzTG9n aWNhbFRvcCk7CisgICAgICAgIG1fbGluZUJveExvZ2ljYWxCb3R0b20gPSBzdGQ6Om1heChtX2xp bmVCb3hMb2dpY2FsQm90dG9tLCBsYXlvdXRCb3VuZHNMb2dpY2FsVG9wICsgaW5saW5lTGV2ZWxC b3gubGF5b3V0Qm91bmRzKCkuaGVpZ2h0KCkpOworICAgICAgICBtX3Jvb3RJbmxpbmVCb3hMb2dp Y2FsVG9wID0gc3RkOjptYXgobV9yb290SW5saW5lQm94TG9naWNhbFRvcCwgaW5saW5lTGV2ZWxC b3gubGF5b3V0Qm91bmRzKCkuYXNjZW50IC0gbV9yb290SW5saW5lQm94LmJhc2VsaW5lKCkpOwor ICAgIH0KKworcHJpdmF0ZToKKyAgICBjb25zdCBMaW5lQm94OjpJbmxpbmVMZXZlbEJveCYgbV9y b290SW5saW5lQm94OworCisgICAgSW5saW5lTGF5b3V0VW5pdCBtX2xpbmVCb3hMb2dpY2FsVG9w IHsgMCB9OworICAgIElubGluZUxheW91dFVuaXQgbV9saW5lQm94TG9naWNhbEJvdHRvbSB7IDAg fTsKKyAgICBJbmxpbmVMYXlvdXRVbml0IG1fcm9vdElubGluZUJveExvZ2ljYWxUb3AgeyAwIH07 Cit9Owogdm9pZCBMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhMaW5l Qm94JiBsaW5lQm94LCBjb25zdCBMaW5lOjpSdW5MaXN0JiBydW5zKQogewotICAgIHN0cnVjdCBT aW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQgewotICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGxp bmVCb3hUb3AgeyAwIH07Ci0gICAgICAgIElubGluZUxheW91dFVuaXQgbGluZUJveEJvdHRvbSB7 IDAgfTsKLSAgICAgICAgSW5saW5lTGF5b3V0VW5pdCByb290SW5saW5lQm94VG9wIHsgMCB9Owot Ci0gICAgICAgIElubGluZUxheW91dFVuaXQgbGluZUJveEhlaWdodCgpIGNvbnN0IHsgcmV0dXJu IGxpbmVCb3hCb3R0b20gLSBsaW5lQm94VG9wOyB9Ci0gICAgfTsKICAgICBhdXRvJiByb290SW5s aW5lQm94ID0gbGluZUJveC5yb290SW5saW5lQm94KCk7CiAgICAgc2V0VmVydGljYWxHZW9tZXRy eUZvcklubGluZUJveChyb290SW5saW5lQm94KTsKLSAgICBhdXRvIHNpbXBsaWZpZWRWZXJ0aWNh bEFsaWdubWVudCA9IFNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudCB7IHsgfSAsIHJvb3RJbmxp bmVCb3gubGF5b3V0Qm91bmRzKCkuaGVpZ2h0KCksIHJvb3RJbmxpbmVCb3gubGF5b3V0Qm91bmRz KCkuYXNjZW50IC0gcm9vdElubGluZUJveC5iYXNlbGluZSgpIH07CisgICAgYXV0byBzaW1wbGlm aWVkVmVydGljYWxBbGlnbm1lbnQgPSBTaW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQgeyByb290 SW5saW5lQm94IH07CiAKICAgICBhdXRvIGNyZWF0ZVdyYXBwZWRJbmxpbmVCb3hlcyA9IFsmXSB7 CiAgICAgICAgIGlmIChydW5zLmlzRW1wdHkoKSkKQEAgLTMxNSwxMSArMzMzLDggQEAgdm9pZCBM aW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lQm94 LCBjb25zdCBMaW5lOjpSdW4KICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgLy8g T25seSBiYXNlbGluZSBhbGlnbm1lbnQgZm9yIG5vdy4KICAgICAgICAgICAgICAgICBhdXRvIGxv Z2ljYWxUb3AgPSByb290SW5saW5lQm94LmJhc2VsaW5lKCkgLSBhc2NlbnQ7Ci0gICAgICAgICAg ICAgICAgYXV0byBsYXlvdXRCb3VuZHNUb3AgPSByb290SW5saW5lQm94LmxheW91dEJvdW5kcygp LmFzY2VudCAtIGFzY2VudDsKLSAgICAgICAgICAgICAgICBzaW1wbGlmaWVkVmVydGljYWxBbGln bm1lbnQubGluZUJveFRvcCA9IHN0ZDo6bWluKHNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudC5s aW5lQm94VG9wLCBsYXlvdXRCb3VuZHNUb3ApOwotICAgICAgICAgICAgICAgIHNpbXBsaWZpZWRW ZXJ0aWNhbEFsaWdubWVudC5saW5lQm94Qm90dG9tID0gc3RkOjptYXgoc2ltcGxpZmllZFZlcnRp Y2FsQWxpZ25tZW50LmxpbmVCb3hCb3R0b20sIGxheW91dEJvdW5kc1RvcCArIG1hcmdpbkJveEhl aWdodCk7Ci0gICAgICAgICAgICAgICAgc2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50LnJvb3RJ bmxpbmVCb3hUb3AgPSBzdGQ6Om1heChzaW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQucm9vdElu bGluZUJveFRvcCwgYXNjZW50IC0gcm9vdElubGluZUJveC5iYXNlbGluZSgpKTsKICAgICAgICAg ICAgICAgICBhdG9taWNJbmxpbmVMZXZlbEJveC0+c2V0TG9naWNhbFRvcChsb2dpY2FsVG9wKTsK KyAgICAgICAgICAgICAgICBzaW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQuYWRqdXN0KCphdG9t aWNJbmxpbmVMZXZlbEJveCk7CiAgICAgICAgICAgICB9OwogICAgICAgICAgICAgYWxpZ25Jbmxp bmVCb3hJZkVsaWdpYmxlKCk7CiAgICAgICAgICAgICBsaW5lQm94LmFkZElubGluZUxldmVsQm94 KFdURk1vdmUoYXRvbWljSW5saW5lTGV2ZWxCb3gpKTsKQEAgLTM3NSw3ICszOTAsNyBAQCB2b2lk IExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmVC b3gsIGNvbnN0IExpbmU6OlJ1bgogICAgIC8vIFdlIHNob3VsZCBhbHdheXMgYmUgYWJsZSB0byBl eGVyY2lzZSB0aGUgZmFzdCBwYXRoIHdoZW4gdGhlIGxpbmUgaGFzIG5vIGNvbnRlbnQgYXQgYWxs LCBldmVuIGluIG5vbi1zdGFuZGFyZHMgbW9kZSBvciB3aXRoIGxpbmUtaGVpZ2h0IHNldC4KICAg ICBtX3VzZVNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudCA9IG1fdXNlU2ltcGxpZmllZFZlcnRp Y2FsQWxpZ25tZW50IHx8ICFsaW5lSGFzQ29udGVudDsKICAgICBpZiAobV91c2VTaW1wbGlmaWVk VmVydGljYWxBbGlnbm1lbnQpIHsKLSAgICAgICAgcm9vdElubGluZUJveC5zZXRMb2dpY2FsVG9w KGxpbmVIYXNDb250ZW50ID8gc2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50LnJvb3RJbmxpbmVC b3hUb3AgOiAtcm9vdElubGluZUJveC5iYXNlbGluZSgpKTsKKyAgICAgICAgcm9vdElubGluZUJv eC5zZXRMb2dpY2FsVG9wKGxpbmVIYXNDb250ZW50ID8gc2ltcGxpZmllZFZlcnRpY2FsQWxpZ25t ZW50LnJvb3RJbmxpbmVCb3hMb2dpY2FsVG9wKCkgOiAtcm9vdElubGluZUJveC5iYXNlbGluZSgp KTsKICAgICAgICAgbGluZUJveC5zZXRMb2dpY2FsSGVpZ2h0KGxpbmVIYXNDb250ZW50ID8gc2lt cGxpZmllZFZlcnRpY2FsQWxpZ25tZW50LmxpbmVCb3hIZWlnaHQoKSA6IElubGluZUxheW91dFVu aXQoKSk7CiAgICAgfQogfQo= 421897 2021-03-01 19:39:44 -0800 2021-03-01 20:21:53 -0800 Patch bug-222562-20210301193944.patch text/plain 5717 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjczNzAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTFmZTQwMzQyMDg4ZmMw N2Q4Mzc1YzIyNzg5MWFjM2MxYjBiZTM4YS4uMzE2NWE4NGEyYWM4YmZhMzBkN2Y1NTQyMmIwNmE1 MTE5ZjMxYTAxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTAzLTAxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBNb3ZlIHNp bXBsaWZpZWQgdmVydGljYWwgYWxpZ25tZW50IGNvbXB1dGF0aW9uIHRvIHN0cnVjdCBTaW1wbGlm aWVkVmVydGljYWxBbGlnbm1lbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyMjU2MgorCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3Rv LgorCisgICAgICAgIFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIHN1cHBvcnRpbmcgbm9uLWF0 b21pYyBpbmxpbmUgbGV2ZWwgYm94ZXMgKGJ5IGp1c3QgY2FsbGluZyBzaW1wbGlmaWVkVmVydGlj YWxBbGlnbm1lbnQuYWRqdXN0KGlubGluZUxldmVsQm94KSkuCisKKyAgICAgICAgKiBsYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6U2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50OjpTaW1w bGlmaWVkVmVydGljYWxBbGlnbm1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpTaW1w bGlmaWVkVmVydGljYWxBbGlnbm1lbnQ6OnJvb3RJbmxpbmVCb3hMb2dpY2FsVG9wIGNvbnN0KToK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6U2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50Ojps aW5lQm94SGVpZ2h0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6U2ltcGxpZmll ZFZlcnRpY2FsQWxpZ25tZW50OjphZGp1c3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpM aW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyk6CisKIDIwMjEtMDMtMDEg IFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIERv IG5vdCB0cnkgdG8gcnVuIHNpbXBsaWZpZWQgYWxpZ25tZW50IHdoZW4gbGluZS1oZWlnaHQgaXMg c2V0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmlu ZGV4IDJmYmFkY2RhMTc0MTRhMDYwZDA2YTQwNTRmNjFkMzRjYWY0MjkxNDEuLmE5MDZiYWU0MjFk YTk3YjI2MWQyNDlhMjQzYjFmZmE4ODk5NGYyMzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnku Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCkBAIC0yMDEsMTggKzIwMSwzNiBAQCB2b2lkIExp bmVCb3hCdWlsZGVyOjpzZXRWZXJ0aWNhbEdlb21ldHJ5Rm9ySW5saW5lQm94KExpbmVCb3g6Oklu bGluZUxldmVsQm94JiBpbgogICAgIGlubGluZUxldmVsQm94LnNldExheW91dEJvdW5kcyhMaW5l Qm94OjpJbmxpbmVMZXZlbEJveDo6TGF5b3V0Qm91bmRzIHsgZmxvb3JmKGFzY2VudCksIGNlaWwo ZGVzY2VudCkgfSk7CiB9CiAKK3N0cnVjdCBTaW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQgewor ICAgIFNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudChjb25zdCBMaW5lQm94OjpJbmxpbmVMZXZl bEJveCYgcm9vdElubGluZUJveCkKKyAgICAgICAgOiBtX3Jvb3RJbmxpbmVCb3gocm9vdElubGlu ZUJveCkKKyAgICB7CisgICAgICAgIGFkanVzdChyb290SW5saW5lQm94KTsKKyAgICB9CisKKyAg ICBJbmxpbmVMYXlvdXRVbml0IHJvb3RJbmxpbmVCb3hMb2dpY2FsVG9wKCkgY29uc3QgeyByZXR1 cm4gbV9yb290SW5saW5lQm94TG9naWNhbFRvcDsgfQorICAgIElubGluZUxheW91dFVuaXQgbGlu ZUJveEhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1fbGluZUJveExvZ2ljYWxCb3R0b20gLSBtX2xp bmVCb3hMb2dpY2FsVG9wOyB9CisKKyAgICB2b2lkIGFkanVzdChjb25zdCBMaW5lQm94OjpJbmxp bmVMZXZlbEJveCYgaW5saW5lTGV2ZWxCb3gpCisgICAgeworICAgICAgICBhdXRvIGxheW91dEJv dW5kc0xvZ2ljYWxUb3AgPSBtX3Jvb3RJbmxpbmVCb3gubGF5b3V0Qm91bmRzKCkuYXNjZW50IC0g aW5saW5lTGV2ZWxCb3gubGF5b3V0Qm91bmRzKCkuYXNjZW50OworICAgICAgICBtX2xpbmVCb3hM b2dpY2FsVG9wID0gc3RkOjptaW4obV9saW5lQm94TG9naWNhbFRvcCwgbGF5b3V0Qm91bmRzTG9n aWNhbFRvcCk7CisgICAgICAgIG1fbGluZUJveExvZ2ljYWxCb3R0b20gPSBzdGQ6Om1heChtX2xp bmVCb3hMb2dpY2FsQm90dG9tLCBsYXlvdXRCb3VuZHNMb2dpY2FsVG9wICsgaW5saW5lTGV2ZWxC b3gubGF5b3V0Qm91bmRzKCkuaGVpZ2h0KCkpOworICAgICAgICBtX3Jvb3RJbmxpbmVCb3hMb2dp Y2FsVG9wID0gc3RkOjptYXgobV9yb290SW5saW5lQm94TG9naWNhbFRvcCwgaW5saW5lTGV2ZWxC b3gubGF5b3V0Qm91bmRzKCkuYXNjZW50IC0gbV9yb290SW5saW5lQm94LmJhc2VsaW5lKCkpOwor ICAgIH0KKworcHJpdmF0ZToKKyAgICBjb25zdCBMaW5lQm94OjpJbmxpbmVMZXZlbEJveCYgbV9y b290SW5saW5lQm94OworCisgICAgSW5saW5lTGF5b3V0VW5pdCBtX2xpbmVCb3hMb2dpY2FsVG9w IHsgMCB9OworICAgIElubGluZUxheW91dFVuaXQgbV9saW5lQm94TG9naWNhbEJvdHRvbSB7IDAg fTsKKyAgICBJbmxpbmVMYXlvdXRVbml0IG1fcm9vdElubGluZUJveExvZ2ljYWxUb3AgeyAwIH07 Cit9Owogdm9pZCBMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhMaW5l Qm94JiBsaW5lQm94LCBjb25zdCBMaW5lOjpSdW5MaXN0JiBydW5zKQogewotICAgIHN0cnVjdCBT aW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQgewotICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGxp bmVCb3hUb3AgeyAwIH07Ci0gICAgICAgIElubGluZUxheW91dFVuaXQgbGluZUJveEJvdHRvbSB7 IDAgfTsKLSAgICAgICAgSW5saW5lTGF5b3V0VW5pdCByb290SW5saW5lQm94VG9wIHsgMCB9Owot Ci0gICAgICAgIElubGluZUxheW91dFVuaXQgbGluZUJveEhlaWdodCgpIGNvbnN0IHsgcmV0dXJu IGxpbmVCb3hCb3R0b20gLSBsaW5lQm94VG9wOyB9Ci0gICAgfTsKICAgICBhdXRvJiByb290SW5s aW5lQm94ID0gbGluZUJveC5yb290SW5saW5lQm94KCk7CiAgICAgc2V0VmVydGljYWxHZW9tZXRy eUZvcklubGluZUJveChyb290SW5saW5lQm94KTsKLSAgICBhdXRvIHNpbXBsaWZpZWRWZXJ0aWNh bEFsaWdubWVudCA9IFNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudCB7IHsgfSAsIHJvb3RJbmxp bmVCb3gubGF5b3V0Qm91bmRzKCkuaGVpZ2h0KCksIHJvb3RJbmxpbmVCb3gubGF5b3V0Qm91bmRz KCkuYXNjZW50IC0gcm9vdElubGluZUJveC5iYXNlbGluZSgpIH07CisgICAgYXV0byBzaW1wbGlm aWVkVmVydGljYWxBbGlnbm1lbnQgPSBTaW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQgeyByb290 SW5saW5lQm94IH07CiAKICAgICBhdXRvIGNyZWF0ZVdyYXBwZWRJbmxpbmVCb3hlcyA9IFsmXSB7 CiAgICAgICAgIGlmIChydW5zLmlzRW1wdHkoKSkKQEAgLTMxNSwxMSArMzMzLDggQEAgdm9pZCBM aW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lQm94 LCBjb25zdCBMaW5lOjpSdW4KICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgLy8g T25seSBiYXNlbGluZSBhbGlnbm1lbnQgZm9yIG5vdy4KICAgICAgICAgICAgICAgICBhdXRvIGxv Z2ljYWxUb3AgPSByb290SW5saW5lQm94LmJhc2VsaW5lKCkgLSBhc2NlbnQ7Ci0gICAgICAgICAg ICAgICAgYXV0byBsYXlvdXRCb3VuZHNUb3AgPSByb290SW5saW5lQm94LmxheW91dEJvdW5kcygp LmFzY2VudCAtIGFzY2VudDsKLSAgICAgICAgICAgICAgICBzaW1wbGlmaWVkVmVydGljYWxBbGln bm1lbnQubGluZUJveFRvcCA9IHN0ZDo6bWluKHNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudC5s aW5lQm94VG9wLCBsYXlvdXRCb3VuZHNUb3ApOwotICAgICAgICAgICAgICAgIHNpbXBsaWZpZWRW ZXJ0aWNhbEFsaWdubWVudC5saW5lQm94Qm90dG9tID0gc3RkOjptYXgoc2ltcGxpZmllZFZlcnRp Y2FsQWxpZ25tZW50LmxpbmVCb3hCb3R0b20sIGxheW91dEJvdW5kc1RvcCArIG1hcmdpbkJveEhl aWdodCk7Ci0gICAgICAgICAgICAgICAgc2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50LnJvb3RJ bmxpbmVCb3hUb3AgPSBzdGQ6Om1heChzaW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQucm9vdElu bGluZUJveFRvcCwgYXNjZW50IC0gcm9vdElubGluZUJveC5iYXNlbGluZSgpKTsKICAgICAgICAg ICAgICAgICBhdG9taWNJbmxpbmVMZXZlbEJveC0+c2V0TG9naWNhbFRvcChsb2dpY2FsVG9wKTsK KyAgICAgICAgICAgICAgICBzaW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQuYWRqdXN0KCphdG9t aWNJbmxpbmVMZXZlbEJveCk7CiAgICAgICAgICAgICB9OwogICAgICAgICAgICAgYWxpZ25Jbmxp bmVCb3hJZkVsaWdpYmxlKCk7CiAgICAgICAgICAgICBsaW5lQm94LmFkZElubGluZUxldmVsQm94 KFdURk1vdmUoYXRvbWljSW5saW5lTGV2ZWxCb3gpKTsKQEAgLTM3NSw3ICszOTAsNyBAQCB2b2lk IExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmVC b3gsIGNvbnN0IExpbmU6OlJ1bgogICAgIC8vIFdlIHNob3VsZCBhbHdheXMgYmUgYWJsZSB0byBl eGVyY2lzZSB0aGUgZmFzdCBwYXRoIHdoZW4gdGhlIGxpbmUgaGFzIG5vIGNvbnRlbnQgYXQgYWxs LCBldmVuIGluIG5vbi1zdGFuZGFyZHMgbW9kZSBvciB3aXRoIGxpbmUtaGVpZ2h0IHNldC4KICAg ICBtX3VzZVNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudCA9IG1fdXNlU2ltcGxpZmllZFZlcnRp Y2FsQWxpZ25tZW50IHx8ICFsaW5lSGFzQ29udGVudDsKICAgICBpZiAobV91c2VTaW1wbGlmaWVk VmVydGljYWxBbGlnbm1lbnQpIHsKLSAgICAgICAgcm9vdElubGluZUJveC5zZXRMb2dpY2FsVG9w KGxpbmVIYXNDb250ZW50ID8gc2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50LnJvb3RJbmxpbmVC b3hUb3AgOiAtcm9vdElubGluZUJveC5iYXNlbGluZSgpKTsKKyAgICAgICAgcm9vdElubGluZUJv eC5zZXRMb2dpY2FsVG9wKGxpbmVIYXNDb250ZW50ID8gc2ltcGxpZmllZFZlcnRpY2FsQWxpZ25t ZW50LnJvb3RJbmxpbmVCb3hMb2dpY2FsVG9wKCkgOiAtcm9vdElubGluZUJveC5iYXNlbGluZSgp KTsKICAgICAgICAgbGluZUJveC5zZXRMb2dpY2FsSGVpZ2h0KGxpbmVIYXNDb250ZW50ID8gc2lt cGxpZmllZFZlcnRpY2FsQWxpZ25tZW50LmxpbmVCb3hIZWlnaHQoKSA6IElubGluZUxheW91dFVu aXQoKSk7CiAgICAgfQogfQo=