216405 2020-09-11 05:05:23 -0700 [LFC][IFC] Make InlineBoxes grow vertically as they gain content 2020-09-11 08:06:21 -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 1687705 0 zalan 2020-09-11 05:05:23 -0700 so start them with 0 height/baseline etc. 1687709 1 408527 zalan 2020-09-11 06:00:51 -0700 Created attachment 408527 Patch 1687718 2 ews-feeder 2020-09-11 08:05:54 -0700 Committed r266921: <https://trac.webkit.org/changeset/266921> All reviewed patches have been landed. Closing bug and clearing flags on attachment 408527. 1687719 3 webkit-bug-importer 2020-09-11 08:06:21 -0700 <rdar://problem/68710663> 408527 2020-09-11 06:00:51 -0700 2020-09-11 08:05:54 -0700 Patch bug-216405-20200911060050.patch text/plain 15898 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2ODk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDI3YjhkNDkzMzQ2NzU3 OTMwMzUzNGNlODg0Nzg3OTczZDgyMzEyMS4uZTI0NmJjOWFjM2ViODU2ZGNkM2VjNGUxNjFkMGMx MjliYmUyNzc5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA5LTExICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBNYWtlIElu bGluZUJveGVzIGdyb3cgdmVydGljYWxseSBhcyB0aGV5IGdhaW4gY29udGVudAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2NDA1CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ29uc3RydWN0IElubGluZUJv eGVzIHdpdGggemVybyBoZWlnaHQgKGV2ZW4gdGhlIHJvb3QgaW5saW5lIGJveCBzdGFydHMgZW1w dHkgaW4gcXVpcmtzIG1vZGUpIGFuZCBtYWtlIHRoZW0gZ3JvdyBhcyB0aGV5IGdhaW4gdGV4dCBy dW5zLgorICAgICAgICAoVGhpcyBpbml0aWFsIHZlcnRpY2FsIGdlb21ldHJ5IGFkanVzdG1lbnQg aXMgZGlmZmVyZW50IGZyb20gdGhlIHNpemluZyBpbiBjb21wdXRlSW5saW5lQm94ZXNMb2dpY2Fs SGVpZ2h0KCkuIEl0IGlzIGJhc2VkIG9uCisgICAgICAgIHRoZSBmb250IG1ldHJpY3MgKHRyaWdn ZXJlZCBieSB0ZXh0IHJ1bnMpLCB3aGlsZSBpbiBjb21wdXRlSW5saW5lQm94ZXNMb2dpY2FsSGVp Z2h0IGlubGluZSBib3hlcyBzdHJldGNoIHRoZWlyIHBhcmVudCBpbmxpbmUgYm94ZXMuKSAKKyAg ICAgICAgVGhpcyB3aWxsIGFsc28gdHVybiBpbnRvIGEgbW9yZSBkeW5hbWljIHNpemluZyB3aGVu IHdlIHN0YXJ0IGhhbmRsaW5nIGZhbGxiYWNrIGZvbnRzLgorCisgICAgICAgICogbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkxpbmVCb3g6OklubGluZUJveDo6SW5saW5lQm94KToKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6TGluZUJveDo6Y29uc3RydWN0SW5saW5lQm94ZXMpOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpMaW5lQm94Ojpjb21wdXRlSW5saW5lQm94ZXNMb2dpY2FsSGVpZ2h0KToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6YWxpZ25JbmxpbmVCb3hlc1ZlcnRpY2FsbHlB bmRDb21wdXRlTGluZUJveEhlaWdodCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lTGluZUJveC5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpJ bmxpbmVCb3g6OmZvbnRNZXRyaWNzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 TGluZUJveDo6SW5saW5lQm94OjpzZXREZXNjZW50KToKKwogMjAyMC0wOS0xMCAgWmFsYW4gQnVq dGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gQ29uc3RydWN0IExp bmVCb3g6OklubGluZUJveGVzIGZvciBuZXN0ZWQgaW5saW5lIGxldmVsIGJveGVzIHdoZW4gdGhl eSBvdmVybGFwIG11bHRpcGxlIGxpbmVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3BwCmluZGV4IGY1YTg4NDMzYmNj MzJjY2FiMjhiNWUxN2EyNjFkMmU2MGQxM2M5ZWYuLjUwZDQ4MWNjZjE0ZDc5N2JmZGVkNmZkOWFm NTg4MDEyZjQxODg5YjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3BwCkBAIC0xMTcsMTIgKzExNywxOCBAQCBz dGF0aWMgT3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gaG9yaXpvbnRhbEFsaWdubWVudE9mZnNl dChjb25zdCBMaW5lOjpSdW5MaXN0JgogICAgIHJldHVybiB7IH07CiB9CiAKLUxpbmVCb3g6Oklu bGluZUJveDo6SW5saW5lQm94KGNvbnN0IEJveCYgbGF5b3V0Qm94LCBjb25zdCBEaXNwbGF5OjpJ bmxpbmVSZWN0JiByZWN0LCBJbmxpbmVMYXlvdXRVbml0IGJhc2VsaW5lLCBJbmxpbmVMYXlvdXRV bml0IGRlc2NlbnQsIElzQ29uc2lkZXJlZEVtcHR5IGlzQ29uc2lkZXJlZEVtcHR5KQorTGluZUJv eDo6SW5saW5lQm94OjpJbmxpbmVCb3goY29uc3QgQm94JiBsYXlvdXRCb3gsIGNvbnN0IERpc3Bs YXk6OklubGluZVJlY3QmIHJlY3QsIElubGluZUxheW91dFVuaXQgYmFzZWxpbmUsIElubGluZUxh eW91dFVuaXQgZGVzY2VudCkKICAgICA6IG1fbGF5b3V0Qm94KG1ha2VXZWFrUHRyKGxheW91dEJv eCkpCiAgICAgLCBtX2xvZ2ljYWxSZWN0KHJlY3QpCiAgICAgLCBtX2Jhc2VsaW5lKGJhc2VsaW5l KQogICAgICwgbV9kZXNjZW50KGRlc2NlbnQpCi0gICAgLCBtX2lzRW1wdHkoaXNDb25zaWRlcmVk RW1wdHkgPT0gSXNDb25zaWRlcmVkRW1wdHk6OlllcykKKyAgICAsIG1faXNFbXB0eShmYWxzZSkK K3sKK30KKworTGluZUJveDo6SW5saW5lQm94OjpJbmxpbmVCb3goY29uc3QgQm94JiBsYXlvdXRC b3gsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQsIElubGluZUxheW91dFVuaXQgbG9naWNh bFdpZHRoKQorICAgIDogbV9sYXlvdXRCb3gobWFrZVdlYWtQdHIobGF5b3V0Qm94KSkKKyAgICAs IG1fbG9naWNhbFJlY3QoeyB9LCBsb2dpY2FsTGVmdCwgbG9naWNhbFdpZHRoLCB7IH0pCiB7CiB9 CiAKQEAgLTE0NywxNiArMTUzLDI5IEBAIERpc3BsYXk6OklubGluZVJlY3QgTGluZUJveDo6bG9n aWNhbFJlY3RGb3JUZXh0UnVuKGNvbnN0IExpbmU6OlJ1biYgcnVuKSBjb25zdAogCiB2b2lkIExp bmVCb3g6OmNvbnN0cnVjdElubGluZUJveGVzKGNvbnN0IExpbmU6OlJ1bkxpc3QmIHJ1bnMpCiB7 Ci0gICAgYXV0byBjb25zdHJ1Y3RSb290SW5saW5lQm94ID0gWyZdIHsKLSAgICAgICAgYXV0byYg Zm9udE1ldHJpY3MgPSByb290KCkuc3R5bGUoKS5mb250TWV0cmljcygpOworICAgIGF1dG8gYWRq dXN0VmVydGljYWxHZW9tZXRyeUZvck5vbkVtcHR5SW5saW5lQm94ID0gW10oYXV0byYgaW5saW5l Qm94KSB7CisgICAgICAgIC8vIElubGluZSBib3ggdmVydGljYWwgZ2VvbWV0cnkgaXMgZHJpdmVu IGJ5IGVpdGhlciBjaGlsZCBpbmxpbmUgYm94ZXMgKHNlZSBjb21wdXRlSW5saW5lQm94ZXNMb2dp Y2FsSGVpZ2h0KQorICAgICAgICAvLyBvciB0aGUgdGV4dCBydW5zJyBmb250IG1ldHJpY3MgKHRl eHQgcnVucyBkb24ndCBnZW5lcmF0ZSBpbmxpbmUgYm94ZXMpLiAKKyAgICAgICAgQVNTRVJUKCFp bmxpbmVCb3guaXNFbXB0eSgpKTsKKyAgICAgICAgYXV0byYgZm9udE1ldHJpY3MgPSBpbmxpbmVC b3guZm9udE1ldHJpY3MoKTsKICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0 ID0gZm9udE1ldHJpY3MuaGVpZ2h0KCk7Ci0gICAgICAgIGF1dG8gbG9naWNhbFJlY3QgPSBEaXNw bGF5OjpJbmxpbmVSZWN0IHsgeyB9LCBtX2hvcml6b250YWxBbGlnbm1lbnRPZmZzZXQudmFsdWVP cihJbmxpbmVMYXlvdXRVbml0IHsgfSksIGxvZ2ljYWxXaWR0aCgpLCBsb2dpY2FsSGVpZ2h0IH07 CiAgICAgICAgIElubGluZUxheW91dFVuaXQgYmFzZWxpbmUgPSBmb250TWV0cmljcy5hc2NlbnQo KTsKLSAgICAgICAgYXV0byBkZXNjZW50ID0gbG9naWNhbEhlaWdodCAtIGJhc2VsaW5lOwotICAg ICAgICBhdXRvIGxpbmVIYXNJbWFnaW5hcnlTdHJ1dCA9ICFsYXlvdXRTdGF0ZSgpLmluUXVpcmtz TW9kZSgpOwotICAgICAgICBhdXRvIGlzSW5pdGlhbGx5Q29uc2lkZXJlZEVtcHR5ID0gICFtX2lz TGluZVZpc3VhbGx5RW1wdHkgJiYgbGluZUhhc0ltYWdpbmFyeVN0cnV0ID8gSW5saW5lQm94OjpJ c0NvbnNpZGVyZWRFbXB0eTo6Tm8gOiBJbmxpbmVCb3g6OklzQ29uc2lkZXJlZEVtcHR5OjpZZXM7 Ci0gICAgICAgIG1fcm9vdElubGluZUJveCA9IElubGluZUJveCB7IHJvb3QoKSwgbG9naWNhbFJl Y3QsIGJhc2VsaW5lLCBkZXNjZW50LCBpc0luaXRpYWxseUNvbnNpZGVyZWRFbXB0eSB9OworCisg ICAgICAgIGlubGluZUJveC5zZXRMb2dpY2FsSGVpZ2h0KGxvZ2ljYWxIZWlnaHQpOworICAgICAg ICBpbmxpbmVCb3guc2V0QmFzZWxpbmUoYmFzZWxpbmUpOworICAgICAgICBpbmxpbmVCb3guc2V0 RGVzY2VudChsb2dpY2FsSGVpZ2h0IC0gYmFzZWxpbmUpOworICAgIH07CisKKyAgICBhdXRvIGNv bnN0cnVjdFJvb3RJbmxpbmVCb3ggPSBbJl0geworICAgICAgICBtX3Jvb3RJbmxpbmVCb3ggPSBJ bmxpbmVCb3ggeyByb290KCksIG1faG9yaXpvbnRhbEFsaWdubWVudE9mZnNldC52YWx1ZU9yKElu bGluZUxheW91dFVuaXQgeyB9KSwgbG9naWNhbFdpZHRoKCkgfTsKICAgICAgICAgbV9pbmxpbmVC b3hSZWN0TWFwLnNldCgmcm9vdCgpLCAmbV9yb290SW5saW5lQm94KTsKKworICAgICAgICBhdXRv IGxpbmVIYXNJbWFnaW5hcnlTdHJ1dCA9ICFsYXlvdXRTdGF0ZSgpLmluUXVpcmtzTW9kZSgpOwor ICAgICAgICBhdXRvIGlzSW5pdGlhbGx5Q29uc2lkZXJlZE5vbkVtcHR5ID0gIW1faXNMaW5lVmlz dWFsbHlFbXB0eSAmJiBsaW5lSGFzSW1hZ2luYXJ5U3RydXQ7CisgICAgICAgIGlmIChpc0luaXRp YWxseUNvbnNpZGVyZWROb25FbXB0eSkgeworICAgICAgICAgICAgbV9yb290SW5saW5lQm94LnNl dElzTm9uRW1wdHkoKTsKKyAgICAgICAgICAgIGFkanVzdFZlcnRpY2FsR2VvbWV0cnlGb3JOb25F bXB0eUlubGluZUJveChtX3Jvb3RJbmxpbmVCb3gpOworICAgICAgICB9CiAgICAgfTsKICAgICBj b25zdHJ1Y3RSb290SW5saW5lQm94KCk7CiAgICAgaWYgKCFydW5zLmlzRW1wdHkoKSkgewpAQCAt MTc3LDEwICsxOTYsOSBAQCB2b2lkIExpbmVCb3g6OmNvbnN0cnVjdElubGluZUJveGVzKGNvbnN0 IExpbmU6OlJ1bkxpc3QmIHJ1bnMpCiAgICAgICAgICAgICB9CiAgICAgICAgICAgICAvLyBDb25z dHJ1Y3QgdGhlIG1pc3NpbmcgTGluZUJveDo6SW5saW5lQm94ZXMgc3RhcnRpbmcgd2l0aCB0aGUg dG9wbW9zdCBhbmNlc3Rvci4KICAgICAgICAgICAgIGZvciAoYXV0byogYW5jZXN0b3IgOiBXVEY6 Om1ha2VSZXZlcnNlZFJhbmdlKGFuY2VzdG9yc1dpdGhvdXRJbmxpbmVCb3hlcykpIHsKLSAgICAg ICAgICAgICAgICBhdXRvJiBmb250TWV0cmljcyA9IGFuY2VzdG9yLT5zdHlsZSgpLmZvbnRNZXRy aWNzKCk7Ci0gICAgICAgICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0ID0g Zm9udE1ldHJpY3MuaGVpZ2h0KCk7Ci0gICAgICAgICAgICAgICAgYXV0byBpbmxpbmVCb3hSZWN0 ID0gRGlzcGxheTo6SW5saW5lUmVjdCB7IHsgfSwgbV9ob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0 LnZhbHVlT3IoSW5saW5lTGF5b3V0VW5pdCB7IH0pLCBsb2dpY2FsV2lkdGgoKSwgbG9naWNhbEhl aWdodCB9OwotICAgICAgICAgICAgICAgIGF1dG8gaW5saW5lQm94ID0gbWFrZVVuaXF1ZTxJbmxp bmVCb3g+KCphbmNlc3RvciwgaW5saW5lQm94UmVjdCwgZm9udE1ldHJpY3MuYXNjZW50KCksIGZv bnRNZXRyaWNzLmRlc2NlbnQoKSwgSW5saW5lQm94OjpJc0NvbnNpZGVyZWRFbXB0eTo6Tm8pOwor ICAgICAgICAgICAgICAgIGF1dG8gaW5saW5lQm94ID0gbWFrZVVuaXF1ZTxJbmxpbmVCb3g+KCph bmNlc3RvciwgbV9ob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0LnZhbHVlT3IoSW5saW5lTGF5b3V0 VW5pdCB7IH0pLCBsb2dpY2FsV2lkdGgoKSk7CisgICAgICAgICAgICAgICAgaW5saW5lQm94LT5z ZXRJc05vbkVtcHR5KCk7CisgICAgICAgICAgICAgICAgYWRqdXN0VmVydGljYWxHZW9tZXRyeUZv ck5vbkVtcHR5SW5saW5lQm94KCppbmxpbmVCb3gpOwogICAgICAgICAgICAgICAgIG1faW5saW5l Qm94UmVjdE1hcC5zZXQoYW5jZXN0b3IsIGlubGluZUJveC5nZXQoKSk7CiAgICAgICAgICAgICAg ICAgbV9pbmxpbmVCb3hMaXN0LmFwcGVuZChXVEZNb3ZlKGlubGluZUJveCkpOwogICAgICAgICAg ICAgfQpAQCAtMjEzLDE4ICsyMzEsMTQgQEAgdm9pZCBMaW5lQm94Ojpjb25zdHJ1Y3RJbmxpbmVC b3hlcyhjb25zdCBMaW5lOjpSdW5MaXN0JiBydW5zKQogICAgICAgICAgICAgICAgIGJhc2VsaW5l ID0gaW5saW5lTGV2ZWxCb3hHZW9tZXRyeS5tYXJnaW5CZWZvcmUoKSArIGlubGluZUxldmVsQm94 R2VvbWV0cnkuYm9yZGVyVG9wKCkgKyBpbmxpbmVMZXZlbEJveEdlb21ldHJ5LnBhZGRpbmdUb3Ao KS52YWx1ZU9yKDApICsgaW5saW5lQmxvY2tCYXNlbGluZTsKICAgICAgICAgICAgIH0KICAgICAg ICAgICAgIGF1dG8gcmVjdCA9IERpc3BsYXk6OklubGluZVJlY3QgeyB7IH0sIGxvZ2ljYWxMZWZ0 LCBydW4ubG9naWNhbFdpZHRoKCksIGxvZ2ljYWxIZWlnaHQgfTsKLSAgICAgICAgICAgIGF1dG8g aW5saW5lQm94ID0gbWFrZVVuaXF1ZTxJbmxpbmVCb3g+KGlubGluZUxldmVsQm94LCByZWN0LCBi YXNlbGluZSwgSW5saW5lTGF5b3V0VW5pdCB7IH0sIElubGluZUJveDo6SXNDb25zaWRlcmVkRW1w dHk6Ok5vKTsKKyAgICAgICAgICAgIGF1dG8gaW5saW5lQm94ID0gbWFrZVVuaXF1ZTxJbmxpbmVC b3g+KGlubGluZUxldmVsQm94LCByZWN0LCBiYXNlbGluZSwgSW5saW5lTGF5b3V0VW5pdCB7IH0p OwogICAgICAgICAgICAgbV9pbmxpbmVCb3hSZWN0TWFwLnNldCgmaW5saW5lTGV2ZWxCb3gsIGlu bGluZUJveC5nZXQoKSk7CiAgICAgICAgICAgICBtX2lubGluZUJveExpc3QuYXBwZW5kKFdURk1v dmUoaW5saW5lQm94KSk7CiAgICAgICAgIH0gZWxzZSBpZiAocnVuLmlzQ29udGFpbmVyU3RhcnQo KSkgewotICAgICAgICAgICAgYXV0byBpbmxpbmVCb3hMb2dpY2FsTGVmdCA9IG1faG9yaXpvbnRh bEFsaWdubWVudE9mZnNldC52YWx1ZU9yKElubGluZUxheW91dFVuaXQgeyB9KSArIHJ1bi5sb2dp Y2FsTGVmdCgpOwotICAgICAgICAgICAgYXV0byBpbml0aWFsV2lkdGggPSBsb2dpY2FsV2lkdGgo KSAtIHJ1bi5sb2dpY2FsTGVmdCgpOwotICAgICAgICAgICAgQVNTRVJUKGluaXRpYWxXaWR0aCA+ PSAwKTsKLSAgICAgICAgICAgIGF1dG8mIGZvbnRNZXRyaWNzID0gaW5saW5lTGV2ZWxCb3guc3R5 bGUoKS5mb250TWV0cmljcygpOwotICAgICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2Fs SGVpZ2h0ID0gZm9udE1ldHJpY3MuaGVpZ2h0KCk7Ci0gICAgICAgICAgICBJbmxpbmVMYXlvdXRV bml0IGJhc2VsaW5lID0gZm9udE1ldHJpY3MuYXNjZW50KCk7Ci0gICAgICAgICAgICBhdXRvIGxv Z2ljYWxSZWN0ID0gRGlzcGxheTo6SW5saW5lUmVjdCB7IHsgfSwgaW5saW5lQm94TG9naWNhbExl ZnQsIGluaXRpYWxXaWR0aCwgbG9naWNhbEhlaWdodCB9OwotICAgICAgICAgICAgYXV0byBpbmxp bmVCb3ggPSBtYWtlVW5pcXVlPElubGluZUJveD4oaW5saW5lTGV2ZWxCb3gsIGxvZ2ljYWxSZWN0 LCBiYXNlbGluZSwgbG9naWNhbEhlaWdodCAtIGJhc2VsaW5lLCBJbmxpbmVCb3g6OklzQ29uc2lk ZXJlZEVtcHR5OjpZZXMpOworICAgICAgICAgICAgYXV0byBsb2dpY2FsTGVmdCA9IG1faG9yaXpv bnRhbEFsaWdubWVudE9mZnNldC52YWx1ZU9yKElubGluZUxheW91dFVuaXQgeyB9KSArIHJ1bi5s b2dpY2FsTGVmdCgpOworICAgICAgICAgICAgYXV0byBpbml0aWFsTG9naWNhbFdpZHRoID0gbG9n aWNhbFdpZHRoKCkgLSBydW4ubG9naWNhbExlZnQoKTsKKyAgICAgICAgICAgIEFTU0VSVChpbml0 aWFsTG9naWNhbFdpZHRoID49IDApOworICAgICAgICAgICAgYXV0byBpbmxpbmVCb3ggPSBtYWtl VW5pcXVlPElubGluZUJveD4oaW5saW5lTGV2ZWxCb3gsIGxvZ2ljYWxMZWZ0LCBpbml0aWFsTG9n aWNhbFdpZHRoKTsKICAgICAgICAgICAgIG1faW5saW5lQm94UmVjdE1hcC5zZXQoJmlubGluZUxl dmVsQm94LCBpbmxpbmVCb3guZ2V0KCkpOwogICAgICAgICAgICAgbV9pbmxpbmVCb3hMaXN0LmFw cGVuZChXVEZNb3ZlKGlubGluZUJveCkpOwogICAgICAgICB9IGVsc2UgaWYgKHJ1bi5pc0NvbnRh aW5lckVuZCgpKSB7CkBAIC0yMzIsOCArMjQ2LDEzIEBAIHZvaWQgTGluZUJveDo6Y29uc3RydWN0 SW5saW5lQm94ZXMoY29uc3QgTGluZTo6UnVuTGlzdCYgcnVucykKICAgICAgICAgICAgIGF1dG8m IGlubGluZUJveCA9ICptX2lubGluZUJveFJlY3RNYXAuZ2V0KCZpbmxpbmVMZXZlbEJveCk7CiAg ICAgICAgICAgICBpbmxpbmVCb3guc2V0TG9naWNhbFdpZHRoKHJ1bi5sb2dpY2FsUmlnaHQoKSAt IGlubGluZUJveC5sb2dpY2FsTGVmdCgpKTsKICAgICAgICAgfSBlbHNlIGlmIChydW4uaXNUZXh0 KCkgfHwgcnVuLmlzTGluZUJyZWFrKCkpIHsKLSAgICAgICAgICAgIGF1dG8mIGNvbnRhaW5lckJv eCA9IGlubGluZUxldmVsQm94LnBhcmVudCgpOwotICAgICAgICAgICAgJmNvbnRhaW5lckJveCA9 PSAmcm9vdCgpID8gbV9yb290SW5saW5lQm94LnNldElzTm9uRW1wdHkoKSA6IG1faW5saW5lQm94 UmVjdE1hcC5nZXQoJmNvbnRhaW5lckJveCktPnNldElzTm9uRW1wdHkoKTsKKyAgICAgICAgICAg IGF1dG8mIHBhcmVudEJveCA9IGlubGluZUxldmVsQm94LnBhcmVudCgpOworICAgICAgICAgICAg YXV0byYgcGFyZW50SW5saW5lQm94ID0gJnBhcmVudEJveCA9PSAmcm9vdCgpID8gbV9yb290SW5s aW5lQm94IDogKm1faW5saW5lQm94UmVjdE1hcC5nZXQoJnBhcmVudEJveCk7CisgICAgICAgICAg ICBpZiAocGFyZW50SW5saW5lQm94LmlzRW1wdHkoKSkgeworICAgICAgICAgICAgICAgIC8vIEZJ WE1FOiBBZGp1c3Qgbm9uLWVtcHR5IGlubGluZSBib3ggaGVpZ2h0IHdoZW4gZ2x5cGhzIGZyb20g dGhlIG5vbi1wcmltYXJ5IGZvbnQgc3RyZXRjaCB0aGUgYm94LgorICAgICAgICAgICAgICAgIHBh cmVudElubGluZUJveC5zZXRJc05vbkVtcHR5KCk7CisgICAgICAgICAgICAgICAgYWRqdXN0VmVy dGljYWxHZW9tZXRyeUZvck5vbkVtcHR5SW5saW5lQm94KHBhcmVudElubGluZUJveCk7CisgICAg ICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CiB9CkBAIC0yNTMsNyArMjcyLDcgQEAgdm9pZCBM aW5lQm94Ojpjb21wdXRlSW5saW5lQm94ZXNMb2dpY2FsSGVpZ2h0KCkKICAgICAgICAgICAgIGJy ZWFrOwogICAgICAgICBjYXNlIFZlcnRpY2FsQWxpZ246OlRleHRUb3A6IHsKICAgICAgICAgICAg IGF1dG8mIHBhcmVudElubGluZUJveCA9IGlubGluZUJveEZvckxheW91dEJveChsYXlvdXRCb3gu cGFyZW50KCkpOwotICAgICAgICAgICAgYXV0byBwYXJlbnRUZXh0TG9naWNhbFRvcCA9IHBhcmVu dElubGluZUJveC5iYXNlbGluZSgpIC0gcGFyZW50SW5saW5lQm94LmxheW91dEJveCgpLnN0eWxl KCkuZm9udE1ldHJpY3MoKS5hc2NlbnQoKTsKKyAgICAgICAgICAgIGF1dG8gcGFyZW50VGV4dExv Z2ljYWxUb3AgPSBwYXJlbnRJbmxpbmVCb3guYmFzZWxpbmUoKSAtIHBhcmVudElubGluZUJveC5m b250TWV0cmljcygpLmFzY2VudCgpOwogICAgICAgICAgICAgcGFyZW50SW5saW5lQm94LnNldExv Z2ljYWxIZWlnaHQoc3RkOjptYXgocGFyZW50SW5saW5lQm94LmxvZ2ljYWxIZWlnaHQoKSwgcGFy ZW50VGV4dExvZ2ljYWxUb3AgKyBpbmxpbmVCb3gtPmxvZ2ljYWxIZWlnaHQoKSkpOwogICAgICAg ICAgICAgYnJlYWs7CiAgICAgICAgIH0KQEAgLTI4NSw3ICszMDQsNyBAQCB2b2lkIExpbmVCb3g6 OmNvbXB1dGVJbmxpbmVCb3hlc0xvZ2ljYWxIZWlnaHQoKQogICAgICAgICBjYXNlIFZlcnRpY2Fs QWxpZ246Ok1pZGRsZTogewogICAgICAgICAgICAgYXV0byYgcGFyZW50TGF5b3V0Qm94ID0gbGF5 b3V0Qm94LnBhcmVudCgpOwogICAgICAgICAgICAgYXV0byYgcGFyZW50SW5saW5lQm94ID0gaW5s aW5lQm94Rm9yTGF5b3V0Qm94KHBhcmVudExheW91dEJveCk7Ci0gICAgICAgICAgICBhdXRvIGxv Z2ljYWxUb3AgPSBwYXJlbnRJbmxpbmVCb3guYmFzZWxpbmUoKSAtIChpbmxpbmVCb3gtPmxvZ2lj YWxIZWlnaHQoKSAvIDIgKyBwYXJlbnRMYXlvdXRCb3guc3R5bGUoKS5mb250TWV0cmljcygpLnhI ZWlnaHQoKSAvIDIpOworICAgICAgICAgICAgYXV0byBsb2dpY2FsVG9wID0gcGFyZW50SW5saW5l Qm94LmJhc2VsaW5lKCkgLSAoaW5saW5lQm94LT5sb2dpY2FsSGVpZ2h0KCkgLyAyICsgcGFyZW50 SW5saW5lQm94LmZvbnRNZXRyaWNzKCkueEhlaWdodCgpIC8gMik7CiAgICAgICAgICAgICBpZiAo bG9naWNhbFRvcCA8IDApIHsKICAgICAgICAgICAgICAgICBhdXRvIG92ZXJmbG93ID0gLWxvZ2lj YWxUb3A7CiAgICAgICAgICAgICAgICAgLy8gQ2hpbGQgaW5saW5lIGJveCB3aXRoIG1pZGRsZSBh bGlnbm1lbnQgcHVzaGVzIHRoZSBiYXNlbGluZSBkb3duIHdoZW4gb3ZlcmZsb3dzLiAKQEAgLTMz NiwxMyArMzU1LDEzIEBAIHZvaWQgTGluZUJveDo6YWxpZ25JbmxpbmVCb3hlc1ZlcnRpY2FsbHlB bmRDb21wdXRlTGluZUJveEhlaWdodCgpCiAgICAgICAgIGNhc2UgVmVydGljYWxBbGlnbjo6VGV4 dFRvcDogewogICAgICAgICAgICAgYXV0byYgcGFyZW50TGF5b3V0Qm94ID0gbGF5b3V0Qm94LnBh cmVudCgpOwogICAgICAgICAgICAgYXV0byYgcGFyZW50SW5saW5lQm94ID0gaW5saW5lQm94Rm9y TGF5b3V0Qm94KHBhcmVudExheW91dEJveCk7Ci0gICAgICAgICAgICBpbmxpbmVCb3hMb2dpY2Fs VG9wID0gcGFyZW50SW5saW5lQm94LmxvZ2ljYWxUb3AoKSArIHBhcmVudElubGluZUJveC5iYXNl bGluZSgpIC0gcGFyZW50TGF5b3V0Qm94LnN0eWxlKCkuZm9udE1ldHJpY3MoKS5hc2NlbnQoKTsK KyAgICAgICAgICAgIGlubGluZUJveExvZ2ljYWxUb3AgPSBwYXJlbnRJbmxpbmVCb3gubG9naWNh bFRvcCgpICsgcGFyZW50SW5saW5lQm94LmJhc2VsaW5lKCkgLSBwYXJlbnRJbmxpbmVCb3guZm9u dE1ldHJpY3MoKS5hc2NlbnQoKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAg ICAgIGNhc2UgVmVydGljYWxBbGlnbjo6VGV4dEJvdHRvbTogewogICAgICAgICAgICAgYXV0byYg cGFyZW50TGF5b3V0Qm94ID0gbGF5b3V0Qm94LnBhcmVudCgpOwogICAgICAgICAgICAgYXV0byYg cGFyZW50SW5saW5lQm94ID0gaW5saW5lQm94Rm9yTGF5b3V0Qm94KHBhcmVudExheW91dEJveCk7 Ci0gICAgICAgICAgICBhdXRvIHBhcmVudFRleHRMb2dpY2FsQm90dG9tID0gcGFyZW50SW5saW5l Qm94LmxvZ2ljYWxUb3AoKSArIHBhcmVudElubGluZUJveC5iYXNlbGluZSgpICsgcGFyZW50TGF5 b3V0Qm94LnN0eWxlKCkuZm9udE1ldHJpY3MoKS5kZXNjZW50KCk7CisgICAgICAgICAgICBhdXRv IHBhcmVudFRleHRMb2dpY2FsQm90dG9tID0gcGFyZW50SW5saW5lQm94LmxvZ2ljYWxUb3AoKSAr IHBhcmVudElubGluZUJveC5iYXNlbGluZSgpICsgcGFyZW50SW5saW5lQm94LmZvbnRNZXRyaWNz KCkuZGVzY2VudCgpOwogICAgICAgICAgICAgaW5saW5lQm94TG9naWNhbFRvcCA9IHBhcmVudFRl eHRMb2dpY2FsQm90dG9tIC0gaW5saW5lQm94LT5sb2dpY2FsSGVpZ2h0KCk7CiAgICAgICAgICAg ICBicmVhazsKICAgICAgICAgfQpAQCAtMzU1LDcgKzM3NCw3IEBAIHZvaWQgTGluZUJveDo6YWxp Z25JbmxpbmVCb3hlc1ZlcnRpY2FsbHlBbmRDb21wdXRlTGluZUJveEhlaWdodCgpCiAgICAgICAg IGNhc2UgVmVydGljYWxBbGlnbjo6TWlkZGxlOiB7CiAgICAgICAgICAgICBhdXRvJiBwYXJlbnRM YXlvdXRCb3ggPSBsYXlvdXRCb3gucGFyZW50KCk7CiAgICAgICAgICAgICBhdXRvJiBwYXJlbnRJ bmxpbmVCb3ggPSBpbmxpbmVCb3hGb3JMYXlvdXRCb3gocGFyZW50TGF5b3V0Qm94KTsKLSAgICAg ICAgICAgIGlubGluZUJveExvZ2ljYWxUb3AgPSBwYXJlbnRJbmxpbmVCb3gubG9naWNhbFRvcCgp ICsgcGFyZW50SW5saW5lQm94LmJhc2VsaW5lKCkgLSAoaW5saW5lQm94LT5sb2dpY2FsSGVpZ2h0 KCkgLyAyICsgcGFyZW50TGF5b3V0Qm94LnN0eWxlKCkuZm9udE1ldHJpY3MoKS54SGVpZ2h0KCkg LyAyKTsKKyAgICAgICAgICAgIGlubGluZUJveExvZ2ljYWxUb3AgPSBwYXJlbnRJbmxpbmVCb3gu bG9naWNhbFRvcCgpICsgcGFyZW50SW5saW5lQm94LmJhc2VsaW5lKCkgLSAoaW5saW5lQm94LT5s b2dpY2FsSGVpZ2h0KCkgLyAyICsgcGFyZW50SW5saW5lQm94LmZvbnRNZXRyaWNzKCkueEhlaWdo dCgpIC8gMik7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICBkZWZhdWx0 OgpAQCAtMzY0LDMzICszODMsNiBAQCB2b2lkIExpbmVCb3g6OmFsaWduSW5saW5lQm94ZXNWZXJ0 aWNhbGx5QW5kQ29tcHV0ZUxpbmVCb3hIZWlnaHQoKQogICAgICAgICB9CiAgICAgICAgIGlubGlu ZUJveC0+c2V0TG9naWNhbFRvcChpbmxpbmVCb3hMb2dpY2FsVG9wKTsKICAgICB9Ci0KLSAgICBh dXRvIGFkanVzdENvbnRlbnRCb3R0b21JZk5lZWRlZCA9IFsmXSB7Ci0gICAgICAgIGlmICghbV9y b290SW5saW5lQm94LmlzRW1wdHkoKSkKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgYXV0 byBjb2xsYXBzZWRDb250ZW50TG9naWNhbFRvcCA9IGNvbnRlbnRMb2dpY2FsSGVpZ2h0OwotICAg ICAgICBhdXRvIGNvbGxhcHNlZENvbnRlbnRMb2dpY2FsQm90dG9tID0gSW5saW5lTGF5b3V0VW5p dCB7IH07Ci0gICAgICAgIGZvciAoYXV0byYgaW5saW5lQm94IDogbV9pbmxpbmVCb3hMaXN0KSB7 Ci0gICAgICAgICAgICBhdXRvIHZlcnRpY2FsQWxpZ24gPSBpbmxpbmVCb3gtPmxheW91dEJveCgp LnN0eWxlKCkudmVydGljYWxBbGlnbigpOwotICAgICAgICAgICAgYXV0byBzdHJldGNoZXNMaW5l Qm94ID0gdmVydGljYWxBbGlnbiA9PSBWZXJ0aWNhbEFsaWduOjpCb3R0b20gfHwgdmVydGljYWxB bGlnbiA9PSBWZXJ0aWNhbEFsaWduOjpUb3AgfHwgJmlubGluZUJveC0+bGF5b3V0Qm94KCkucGFy ZW50KCkgPT0gJm1fcm9vdElubGluZUJveC5sYXlvdXRCb3goKTsKLSAgICAgICAgICAgIGlmICgh c3RyZXRjaGVzTGluZUJveCkKLSAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAg IGlmIChpbmxpbmVCb3gtPmlzRW1wdHkoKSkKLSAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAg ICAgICAgICAgIGNvbGxhcHNlZENvbnRlbnRMb2dpY2FsVG9wID0gc3RkOjptaW4oY29sbGFwc2Vk Q29udGVudExvZ2ljYWxUb3AsIGlubGluZUJveC0+bG9naWNhbFRvcCgpKTsKLSAgICAgICAgICAg IGNvbGxhcHNlZENvbnRlbnRMb2dpY2FsQm90dG9tID0gc3RkOjptYXgoY29sbGFwc2VkQ29udGVu dExvZ2ljYWxCb3R0b20sIGlubGluZUJveC0+bG9naWNhbEJvdHRvbSgpKTsKLSAgICAgICAgfQot ICAgICAgICBpZiAoIWNvbGxhcHNlZENvbnRlbnRMb2dpY2FsVG9wKSB7Ci0gICAgICAgICAgICBj b250ZW50TG9naWNhbEhlaWdodCA9IGNvbGxhcHNlZENvbnRlbnRMb2dpY2FsQm90dG9tOwotICAg ICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0gICAgICAgIGNvbnRlbnRMb2dpY2FsSGVpZ2h0 ID0gSW5saW5lTGF5b3V0VW5pdCB7IH07Ci0gICAgICAgIGZvciAoYXV0byYgaW5saW5lQm94IDog bV9pbmxpbmVCb3hMaXN0KSB7Ci0gICAgICAgICAgICBpbmxpbmVCb3gtPnNldExvZ2ljYWxUb3Ao aW5saW5lQm94LT5sb2dpY2FsVG9wKCkgLSBjb2xsYXBzZWRDb250ZW50TG9naWNhbFRvcCk7Ci0g ICAgICAgICAgICBjb250ZW50TG9naWNhbEhlaWdodCA9IHN0ZDo6bWF4KGNvbnRlbnRMb2dpY2Fs SGVpZ2h0LCBpbmxpbmVCb3gtPmxvZ2ljYWxCb3R0b20oKSk7Ci0gICAgICAgIH0KLSAgICB9Owot ICAgIGFkanVzdENvbnRlbnRCb3R0b21JZk5lZWRlZCgpOwogICAgIGlmICghbV9pc0xpbmVWaXN1 YWxseUVtcHR5KQogICAgICAgICBtX2xvZ2ljYWxTaXplLnNldEhlaWdodChjb250ZW50TG9naWNh bEhlaWdodCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVMaW5lQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVMaW5lQm94LmgKaW5kZXggZGJiNTZkOWM4NTlmY2QxMDFjOGQwODczMjlm NjA4Njk3YjdhYmNjZS4uNDk4ZWM2MWJmYjJlNjY5MmNiNzg1YzkzMTFiYWZkYjdlMDdlNGZlMSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l TGluZUJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUxpbmVCb3guaApAQCAtNTksOCArNTksOCBAQCBwdWJsaWM6CiAgICAgc3RydWN0IElubGlu ZUJveCB7CiAgICAgICAgIFdURl9NQUtFX0lTT19BTExPQ0FURURfSU5MSU5FKElubGluZUJveCk7 CiAgICAgcHVibGljOgotICAgICAgICBlbnVtIGNsYXNzIElzQ29uc2lkZXJlZEVtcHR5IHsgWWVz LCBObyB9OwotICAgICAgICBJbmxpbmVCb3goY29uc3QgQm94JiwgY29uc3QgRGlzcGxheTo6SW5s aW5lUmVjdCYsIElubGluZUxheW91dFVuaXQgYmFzZWxpbmUsIElubGluZUxheW91dFVuaXQgZGVz Y2VudCwgSXNDb25zaWRlcmVkRW1wdHkpOworICAgICAgICBJbmxpbmVCb3goY29uc3QgQm94Jiwg Y29uc3QgRGlzcGxheTo6SW5saW5lUmVjdCYsIElubGluZUxheW91dFVuaXQgYmFzZWxpbmUsIElu bGluZUxheW91dFVuaXQgZGVzY2VudCk7CisgICAgICAgIElubGluZUJveChjb25zdCBCb3gmLCBJ bmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0 aCk7CiAgICAgICAgIElubGluZUJveCgpID0gZGVmYXVsdDsKIAogICAgICAgICBjb25zdCBEaXNw bGF5OjpJbmxpbmVSZWN0JiBsb2dpY2FsUmVjdCgpIGNvbnN0IHsgcmV0dXJuIG1fbG9naWNhbFJl Y3Q7IH0KQEAgLTc2LDYgKzc2LDcgQEAgcHVibGljOgogICAgICAgICBib29sIGlzRW1wdHkoKSBj b25zdCB7IHJldHVybiBtX2lzRW1wdHk7IH0KICAgICAgICAgdm9pZCBzZXRJc05vbkVtcHR5KCkg eyBtX2lzRW1wdHkgPSBmYWxzZTsgfQogCisgICAgICAgIGNvbnN0IEZvbnRNZXRyaWNzJiBmb250 TWV0cmljcygpIGNvbnN0IHsgcmV0dXJuIGxheW91dEJveCgpLnN0eWxlKCkuZm9udE1ldHJpY3Mo KTsgfQogICAgICAgICBjb25zdCBCb3gmIGxheW91dEJveCgpIGNvbnN0IHsgcmV0dXJuICptX2xh eW91dEJveDsgfQogCiAgICAgcHJpdmF0ZToKQEAgLTg1LDEwICs4NiwxMSBAQCBwdWJsaWM6CiAg ICAgICAgIHZvaWQgc2V0TG9naWNhbFdpZHRoKElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRo KSB7IG1fbG9naWNhbFJlY3Quc2V0V2lkdGgobG9naWNhbFdpZHRoKTsgfQogICAgICAgICB2b2lk IHNldExvZ2ljYWxIZWlnaHQoSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0KSB7IG1fbG9n aWNhbFJlY3Quc2V0SGVpZ2h0KGxvZ2ljYWxIZWlnaHQpOyB9CiAgICAgICAgIHZvaWQgc2V0QmFz ZWxpbmUoSW5saW5lTGF5b3V0VW5pdCBiYXNlbGluZSkgeyBtX2Jhc2VsaW5lID0gYmFzZWxpbmU7 IH0KKyAgICAgICAgdm9pZCBzZXREZXNjZW50KElubGluZUxheW91dFVuaXQgZGVzY2VudCkgeyBt X2Rlc2NlbnQgPSBkZXNjZW50OyB9CiAKICAgICAgICAgV2Vha1B0cjxjb25zdCBCb3g+IG1fbGF5 b3V0Qm94OwogICAgICAgICBEaXNwbGF5OjpJbmxpbmVSZWN0IG1fbG9naWNhbFJlY3Q7Ci0gICAg ICAgIElubGluZUxheW91dFVuaXQgbV9iYXNlbGluZTsKKyAgICAgICAgSW5saW5lTGF5b3V0VW5p dCBtX2Jhc2VsaW5lIHsgMCB9OwogICAgICAgICBPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBt X2Rlc2NlbnQ7CiAgICAgICAgIGJvb2wgbV9pc0VtcHR5IHsgdHJ1ZSB9OwogICAgIH07Cg==