221648 2021-02-09 20:41:26 -0800 [LFC][IFC] Logical width of a line box is equal to the inner logical width of its containing block 2021-02-10 18:26:13 -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 1727407 0 zalan 2021-02-09 20:41:26 -0800 https://www.w3.org/TR/css-inline-3/#line-boxes 1727408 1 419808 zalan 2021-02-09 20:44:29 -0800 Created attachment 419808 Patch 1727677 2 419874 zalan 2021-02-10 11:37:19 -0800 Created attachment 419874 Patch 1727914 3 ews-feeder 2021-02-10 18:25:24 -0800 Committed r272701: <https://commits.webkit.org/r272701> All reviewed patches have been landed. Closing bug and clearing flags on attachment 419874. 1727915 4 webkit-bug-importer 2021-02-10 18:26:13 -0800 <rdar://problem/74216529> 419808 2021-02-09 20:44:29 -0800 2021-02-10 11:37:17 -0800 Patch bug-221648-20210209204428.patch text/plain 7231 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyNDY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWViYTIwMmNkNmM5NzFk YjIyNzNlNjYxZmYxMjI4MDczOWVhMDdhNC4uMTYzZGFkYjk0MDVlOGYzZDM0ZDBlNjc1OGY3NWZk MmFjYTYwNWM5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTAyLTA5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBMb2dpY2Fs IHdpZHRoIG9mIGEgbGluZSBib3ggaXMgZXF1YWwgdG8gdGhlIGlubmVyIGxvZ2ljYWwgd2lkdGgg b2YgaXRzIGNvbnRhaW5pbmcgYmxvY2sKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIyMTY0OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFRoaXMgaXMgaXMgdXNlZCB3aGVuIGhvcml6b250YWwgc2Nyb2xsaW5n IGlzIGFsbG93ZWQgKG5vdCBzdXBwb3J0ZWQgYXRtKS4KKworICAgICAgICAqIGxheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6YnVpbGQpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyk6 CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OkxpbmVCb3gpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjptX2NvbnRlbnRMb2dpY2FsV2lkdGgpOgorICAgICAgICAqIGxheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6TGluZUJveDo6Y29udGVudExvZ2ljYWxXaWR0aCBjb25zdCk6CisKIDIwMjEtMDItMDkgIFph bGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIEFkZCBp bmxpbmUgYm94IHZlcnRpY2FsIGJvcmRlci9wYWRkaW5nIHRvIGVuY2xvc2luZyB0b3AgYW5kIGJv dHRvbQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApp bmRleCAxY2Y5YmY4N2ZiMzRkZDUxYWUwMWFkOGYyMjkyZDU4YWYyOGJkNDgyLi43NGE2MjUyZTU5 NWNiYzNkMjc4MGIyODRkY2M5ZWJlMWU5YTk1ZWU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVG b3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtMTU3LDcgKzE1Nyw3IEBAIExpbmVCb3gg TGluZUJveEJ1aWxkZXI6OmJ1aWxkKGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYgbGlu ZUNvbnRlbnQpCiAgICAgYXV0byYgcnVucyA9IGxpbmVDb250ZW50LnJ1bnM7CiAgICAgYXV0byBs aW5lTG9naWNhbFdpZHRoID0gbGluZUNvbnRlbnQubGluZUxvZ2ljYWxXaWR0aDsKICAgICBhdXRv IGNvbnRlbnRMb2dpY2FsV2lkdGggPSBsaW5lQ29udGVudC5jb250ZW50TG9naWNhbFdpZHRoOwot ICAgIGF1dG8gbGluZUJveCA9IExpbmVCb3ggeyBsaW5lQ29udGVudC5sb2dpY2FsVG9wTGVmdCwg Y29udGVudExvZ2ljYWxXaWR0aCwgcnVucy5zaXplKCkgfTsKKyAgICBhdXRvIGxpbmVCb3ggPSBM aW5lQm94IHsgbGluZUNvbnRlbnQubG9naWNhbFRvcExlZnQsIGxpbmVMb2dpY2FsV2lkdGgsIGNv bnRlbnRMb2dpY2FsV2lkdGgsIHJ1bnMuc2l6ZSgpIH07CiAKICAgICBpZiAoYXV0byBob3Jpem9u dGFsQWxpZ25tZW50T2Zmc2V0ID0gTGF5b3V0Ojpob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0KHJ1 bnMsIHJvb3RCb3goKS5zdHlsZSgpLnRleHRBbGlnbigpLCBsaW5lTG9naWNhbFdpZHRoLCBjb250 ZW50TG9naWNhbFdpZHRoLCBsaW5lQ29udGVudC5pc0xhc3RMaW5lV2l0aElubGluZUNvbnRlbnQp KQogICAgICAgICBsaW5lQm94LnNldEhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQoKmhvcml6b250 YWxBbGlnbm1lbnRPZmZzZXQpOwpAQCAtMjEyLDcgKzIxMiw3IEBAIHZvaWQgTGluZUJveEJ1aWxk ZXI6OmNvbnN0cnVjdElubGluZUxldmVsQm94ZXMoTGluZUJveCYgbGluZUJveCwgY29uc3QgTGlu ZTo6UnVuCiAgICAgYXV0byBzaW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQgPSBTaW1wbGlmaWVk VmVydGljYWxBbGlnbm1lbnQgeyB9OwogCiAgICAgYXV0byBjcmVhdGVSb290SW5saW5lQm94ID0g WyZdIHsKLSAgICAgICAgYXV0byByb290SW5saW5lQm94ID0gTGluZUJveDo6SW5saW5lTGV2ZWxC b3g6OmNyZWF0ZVJvb3RJbmxpbmVCb3gocm9vdEJveCgpLCBob3Jpem9udGFsQWxpZ21lbnRPZmZz ZXQsIGxpbmVCb3gubG9naWNhbFdpZHRoKCkpOworICAgICAgICBhdXRvIHJvb3RJbmxpbmVCb3gg PSBMaW5lQm94OjpJbmxpbmVMZXZlbEJveDo6Y3JlYXRlUm9vdElubGluZUJveChyb290Qm94KCks IGhvcml6b250YWxBbGlnbWVudE9mZnNldCwgbGluZUJveC5jb250ZW50TG9naWNhbFdpZHRoKCkp OwogICAgICAgICBzZXRWZXJ0aWNhbEdlb21ldHJ5Rm9ySW5saW5lQm94KCpyb290SW5saW5lQm94 KTsKICAgICAgICAgc2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50ID0geyB7IH0gLCByb290SW5s aW5lQm94LT5sYXlvdXRCb3VuZHMoKS5oZWlnaHQoKSwgcm9vdElubGluZUJveC0+bGF5b3V0Qm91 bmRzKCkuYXNjZW50IC0gcm9vdElubGluZUJveC0+YmFzZWxpbmUoKSB9OwogICAgICAgICBsaW5l Qm94LmFkZFJvb3RJbmxpbmVCb3goV1RGTW92ZShyb290SW5saW5lQm94KSk7CkBAIC0yNDgsNyAr MjQ4LDcgQEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhM aW5lQm94JiBsaW5lQm94LCBjb25zdCBMaW5lOjpSdW4KICAgICAgICAgfQogICAgICAgICAvLyBD b25zdHJ1Y3QgdGhlIG1pc3NpbmcgTGluZUJveDo6SW5saW5lQm94ZXMgc3RhcnRpbmcgd2l0aCB0 aGUgdG9wbW9zdCBsYXlvdXQgYm94LgogICAgICAgICBmb3IgKGF1dG8qIGxheW91dEJveCA6IFdU Rjo6bWFrZVJldmVyc2VkUmFuZ2UobGF5b3V0Qm94ZXNXaXRob3V0SW5saW5lQm94ZXMpKSB7Ci0g ICAgICAgICAgICBhdXRvIGlubGluZUJveCA9IExpbmVCb3g6OklubGluZUxldmVsQm94OjpjcmVh dGVJbmxpbmVCb3goKmxheW91dEJveCwgaG9yaXpvbnRhbEFsaWdtZW50T2Zmc2V0LCBsaW5lQm94 LmxvZ2ljYWxXaWR0aCgpKTsKKyAgICAgICAgICAgIGF1dG8gaW5saW5lQm94ID0gTGluZUJveDo6 SW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUlubGluZUJveCgqbGF5b3V0Qm94LCBob3Jpem9udGFsQWxp Z21lbnRPZmZzZXQsIGxpbmVCb3guY29udGVudExvZ2ljYWxXaWR0aCgpKTsKICAgICAgICAgICAg IHNldFZlcnRpY2FsR2VvbWV0cnlGb3JJbmxpbmVCb3goKmlubGluZUJveCk7CiAgICAgICAgICAg ICBsaW5lQm94LmFkZElubGluZUxldmVsQm94KFdURk1vdmUoaW5saW5lQm94KSk7CiAgICAgICAg IH0KQEAgLTMzNSw3ICszMzUsNyBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxp bmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1bgogICAgICAgICAv LyBlLmcuIDxkaXY+PHNwYW4+PC9zcGFuPjxzcGFuPjwvc3Bhbj48L2Rpdj4gaXMgc3RpbGwgb2th eS4KICAgICAgICAgbV9pbmxpbmVMZXZlbEJveGVzTmVlZFZlcnRpY2FsQWxpZ25tZW50ID0gbV9p bmxpbmVMZXZlbEJveGVzTmVlZFZlcnRpY2FsQWxpZ25tZW50IHx8IGxpbmVIYXNDb250ZW50Owog ICAgICAgICBpZiAocnVuLmlzSW5saW5lQm94U3RhcnQoKSkgewotICAgICAgICAgICAgYXV0byBp bml0aWFsTG9naWNhbFdpZHRoID0gbGluZUJveC5sb2dpY2FsV2lkdGgoKSAtIHJ1bi5sb2dpY2Fs TGVmdCgpOworICAgICAgICAgICAgYXV0byBpbml0aWFsTG9naWNhbFdpZHRoID0gbGluZUJveC5j b250ZW50TG9naWNhbFdpZHRoKCkgLSBydW4ubG9naWNhbExlZnQoKTsKICAgICAgICAgICAgIEFT U0VSVChpbml0aWFsTG9naWNhbFdpZHRoID49IDApOwogICAgICAgICAgICAgYXV0byBpbmxpbmVC b3ggPSBMaW5lQm94OjpJbmxpbmVMZXZlbEJveDo6Y3JlYXRlSW5saW5lQm94KGxheW91dEJveCwg bG9naWNhbExlZnQsIGluaXRpYWxMb2dpY2FsV2lkdGgpOwogICAgICAgICAgICAgc2V0VmVydGlj YWxHZW9tZXRyeUZvcklubGluZUJveCgqaW5saW5lQm94KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3BwIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHAKaW5kZXgg MjM4NjVlYzk0YzZmMWY4NjcwMmIzNWRiYTk4MzQwMDc4ZGZjNzZlMy4uZDNiOGFkMmRmNDFjZjI3 MWJhODViZjAwZDFmYjAxMzljZjc1Y2RiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHAKQEAgLTgzLDggKzgz LDkgQEAgYm9vbCBMaW5lQm94OjpJbmxpbmVMZXZlbEJveDo6aGFzTGluZUJveFJlbGF0aXZlQWxp Z25tZW50KCkgY29uc3QKICAgICByZXR1cm4gdmVydGljYWxBbGlnbm1lbnQgPT0gVmVydGljYWxB bGlnbjo6VG9wIHx8IHZlcnRpY2FsQWxpZ25tZW50ID09IFZlcnRpY2FsQWxpZ246OkJvdHRvbTsK IH0KIAotTGluZUJveDo6TGluZUJveChjb25zdCBJbmxpbmVMYXlvdXRQb2ludCYgbG9naWNhbFRv cGxlZnQsIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxXaWR0aCwgc2l6ZV90IG51bWJl ck9mUnVucykKLSAgICA6IG1fbG9naWNhbFJlY3QobG9naWNhbFRvcGxlZnQsIElubGluZUxheW91 dFNpemUgeyBjb250ZW50TG9naWNhbFdpZHRoLCB7IH0gfSkKK0xpbmVCb3g6OkxpbmVCb3goY29u c3QgSW5saW5lTGF5b3V0UG9pbnQmIGxvZ2ljYWxUb3BsZWZ0LCBJbmxpbmVMYXlvdXRVbml0IGxp bmVMb2dpY2FsV2lkdGgsIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxXaWR0aCwgc2l6 ZV90IG51bWJlck9mUnVucykKKyAgICA6IG1fbG9naWNhbFJlY3QobG9naWNhbFRvcGxlZnQsIElu bGluZUxheW91dFNpemUgeyBsaW5lTG9naWNhbFdpZHRoLCB7IH0gfSkKKyAgICAsIG1fY29udGVu dExvZ2ljYWxXaWR0aChjb250ZW50TG9naWNhbFdpZHRoKQogewogICAgIG1fbm9uUm9vdElubGlu ZUxldmVsQm94TGlzdC5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KG51bWJlck9mUnVucyk7CiAgICAg bV9pbmxpbmVMZXZlbEJveFJlY3RNYXAucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShudW1iZXJPZlJ1 bnMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lTGluZUJveC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lTGluZUJveC5oCmluZGV4IDhjYWVmYjg4M2Q3MDA3NzdmNWMwOGM1YTZlMzNlOTAyNDQx OTQxOGUuLmU0Zjc5OWRlNmUyNDAzYzJlYzBjNWVkZTBmMGY0NzIzN2NkMGUwZjQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3gu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5l Qm94LmgKQEAgLTEzMCwxMyArMTMwLDE0IEBAIHB1YmxpYzoKICAgICAgICAgVHlwZSBtX3R5cGUg eyBUeXBlOjpJbmxpbmVCb3ggfTsKICAgICB9OwogCi0gICAgTGluZUJveChjb25zdCBJbmxpbmVM YXlvdXRQb2ludCYgbG9naWNhbFRvcExlZnQsIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRo LCBzaXplX3QgbnVtYmVyT2ZSdW5zKTsKKyAgICBMaW5lQm94KGNvbnN0IElubGluZUxheW91dFBv aW50JiBsb2dpY2FsVG9wTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBsaW5lTG9naWNhbFdpZHRoLCBJ bmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsV2lkdGgsIHNpemVfdCBudW1iZXJPZlJ1bnMp OwogCiAgICAgY29uc3QgSW5saW5lUmVjdCYgbG9naWNhbFJlY3QoKSBjb25zdCB7IHJldHVybiBt X2xvZ2ljYWxSZWN0OyB9CiAgICAgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgoKSBjb25z dCB7IHJldHVybiBsb2dpY2FsU2l6ZSgpLndpZHRoKCk7IH0KICAgICBJbmxpbmVMYXlvdXRVbml0 IGxvZ2ljYWxIZWlnaHQoKSBjb25zdCB7IHJldHVybiBsb2dpY2FsU2l6ZSgpLmhlaWdodCgpOyB9 CiAgICAgSW5saW5lTGF5b3V0UG9pbnQgbG9naWNhbFRvcExlZnQoKSBjb25zdCB7IHJldHVybiBs b2dpY2FsUmVjdCgpLnRvcExlZnQoKTsgfQogICAgIElubGluZUxheW91dFNpemUgbG9naWNhbFNp emUoKSBjb25zdCB7IHJldHVybiBsb2dpY2FsUmVjdCgpLnNpemUoKTsgfQorICAgIElubGluZUxh eW91dFVuaXQgY29udGVudExvZ2ljYWxXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVudExv Z2ljYWxXaWR0aDsgfQogCiAgICAgT3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gaG9yaXpvbnRh bEFsaWdubWVudE9mZnNldCgpIGNvbnN0IHsgcmV0dXJuIG1faG9yaXpvbnRhbEFsaWdubWVudE9m ZnNldDsgfQogCkBAIC0xNzUsNiArMTc2LDcgQEAgcHJpdmF0ZToKIAogcHJpdmF0ZToKICAgICBJ bmxpbmVSZWN0IG1fbG9naWNhbFJlY3Q7CisgICAgSW5saW5lTGF5b3V0VW5pdCBtX2NvbnRlbnRM b2dpY2FsV2lkdGggeyAwIH07CiAgICAgYm9vbCBtX2hhc0NvbnRlbnQgeyBmYWxzZSB9OwogICAg IE9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IG1faG9yaXpvbnRhbEFsaWdubWVudE9mZnNldDsK ICAgICBPcHRpb25TZXQ8SW5saW5lTGV2ZWxCb3g6OlR5cGU+IG1fYm94VHlwZXM7Cg== 419874 2021-02-10 11:37:19 -0800 2021-02-10 18:25:25 -0800 Patch bug-221648-20210210113718.patch text/plain 8326 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyNTgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmFjN2M4NTUyYmQzZmQy YjkwMmYwMjZkNjJjZTNhMmIxZDFkZjA2MC4uNDYyNzYxMTBkODhjNjc4NWUyMDk1NjkyZmFlOTU0 ODhjYjNjMDAwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTAyLTEwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBMb2dpY2Fs IHdpZHRoIG9mIGEgbGluZSBib3ggaXMgZXF1YWwgdG8gdGhlIGlubmVyIGxvZ2ljYWwgd2lkdGgg b2YgaXRzIGNvbnRhaW5pbmcgYmxvY2sKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIyMTY0OAorCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZp c3RvLgorCisgICAgICAgIFRoaXMgaXMgaXMgdXNlZCB3aGVuIGhvcml6b250YWwgc2Nyb2xsaW5n IGlzIGFsbG93ZWQgKG5vdCBzdXBwb3J0ZWQgYXRtKS4KKworICAgICAgICAqIGxheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6YnVpbGQpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyk6 CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OkxpbmVCb3gpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjptX2NvbnRlbnRMb2dpY2FsV2lkdGgpOgorICAgICAgICAqIGxheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6TGluZUJveDo6Y29udGVudExvZ2ljYWxXaWR0aCBjb25zdCk6CisKIDIwMjEtMDItMDkgIFph bGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIGNhblVz ZUZvclRleHQgc2hvdWxkIGFsc28gY2hlY2sgaWYgdGhlIHNwYWNlIGdseXBoIGNvbWVzIGZyb20g dGhlIHByaW1hcnkgZm9udApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4 IGI3MTk5YWM1MTdjNWRkYzgyNWYwYmM5MWFjNGRjNmE2ODllYTQ5YmEuLmExOTRhZGVlNWQ5MjVh NjJhOTljYTY3MmE3NTZmZGQ5MDA2MDYwNjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29u dGV4dC5jcHAKQEAgLTQ1MCw4ICs0NTAsNyBAQCBJbmxpbmVSZWN0IElubGluZUZvcm1hdHRpbmdD b250ZXh0Ojpjb21wdXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudChjb25zdCBMaW5lQnVpbAogICAg IGF1dG8mIGxpbmVCb3hMb2dpY2FsUmVjdCA9IGxpbmVCb3gubG9naWNhbFJlY3QoKTsKICAgICBp ZiAoIWxpbmVCb3guaGFzQ29udGVudCgpKSB7CiAgICAgICAgIC8vIEZhc3QgcGF0aCBmb3IgbGlu ZXMgd2l0aCBubyBjb250ZW50IGUuZy4gPGRpdj48c3Bhbj48L3NwYW4+PHNwYW4+PC9zcGFuPjwv ZGl2PiBvciA8c3Bhbj48ZGl2PjwvZGl2Pjwvc3Bhbj4gd2hlcmUgd2UgY29uc3RydWN0IGVtcHR5 IHByZSBhbmQgcG9zdCBibG9ja3MuCi0gICAgICAgIEFTU0VSVCghbGluZUNvbnRlbnQuY29udGVu dExvZ2ljYWxXaWR0aCk7Ci0gICAgICAgIEFTU0VSVCghbGluZUJveExvZ2ljYWxSZWN0LndpZHRo KCkgJiYgIWxpbmVCb3hMb2dpY2FsUmVjdC5oZWlnaHQoKSk7CisgICAgICAgIEFTU0VSVCghbGlu ZUJveC5jb250ZW50TG9naWNhbFdpZHRoKCkgJiYgIWxpbmVCb3hMb2dpY2FsUmVjdC5oZWlnaHQo KSk7CiAgICAgICAgIGF1dG8gdXBkYXRlSW5saW5lQm94ZXNHZW9tZXRyeUlmQXBwbGljYWJsZSA9 IFsmXSB7CiAgICAgICAgICAgICBpZiAoIWxpbmVCb3guaGFzSW5saW5lQm94KCkpCiAgICAgICAg ICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdl b21ldHJ5LmNwcAppbmRleCAzOGY0OTQ3Y2FkN2UwM2EwOGMzZTYwMTJjYzdhNDVlNzczNDk3NDM3 Li5jOTgzNTA5MGE0YmYwNWI1MTYwM2Y0N2VhMDFhY2IyNmZjYTkwZTk4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29u dGV4dEdlb21ldHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtMTU3LDcgKzE1Nyw3 IEBAIExpbmVCb3ggTGluZUJveEJ1aWxkZXI6OmJ1aWxkKGNvbnN0IExpbmVCdWlsZGVyOjpMaW5l Q29udGVudCYgbGluZUNvbnRlbnQpCiAgICAgYXV0byYgcnVucyA9IGxpbmVDb250ZW50LnJ1bnM7 CiAgICAgYXV0byBsaW5lTG9naWNhbFdpZHRoID0gbGluZUNvbnRlbnQubGluZUxvZ2ljYWxXaWR0 aDsKICAgICBhdXRvIGNvbnRlbnRMb2dpY2FsV2lkdGggPSBsaW5lQ29udGVudC5jb250ZW50TG9n aWNhbFdpZHRoOwotICAgIGF1dG8gbGluZUJveCA9IExpbmVCb3ggeyBsaW5lQ29udGVudC5sb2dp Y2FsVG9wTGVmdCwgY29udGVudExvZ2ljYWxXaWR0aCwgcnVucy5zaXplKCkgfTsKKyAgICBhdXRv IGxpbmVCb3ggPSBMaW5lQm94IHsgbGluZUNvbnRlbnQubG9naWNhbFRvcExlZnQsIGxpbmVMb2dp Y2FsV2lkdGgsIGNvbnRlbnRMb2dpY2FsV2lkdGgsIHJ1bnMuc2l6ZSgpIH07CiAKICAgICBpZiAo YXV0byBob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0ID0gTGF5b3V0Ojpob3Jpem9udGFsQWxpZ25t ZW50T2Zmc2V0KHJ1bnMsIHJvb3RCb3goKS5zdHlsZSgpLnRleHRBbGlnbigpLCBsaW5lTG9naWNh bFdpZHRoLCBjb250ZW50TG9naWNhbFdpZHRoLCBsaW5lQ29udGVudC5pc0xhc3RMaW5lV2l0aElu bGluZUNvbnRlbnQpKQogICAgICAgICBsaW5lQm94LnNldEhvcml6b250YWxBbGlnbm1lbnRPZmZz ZXQoKmhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQpOwpAQCAtMjEyLDcgKzIxMiw3IEBAIHZvaWQg TGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGluZUxldmVsQm94ZXMoTGluZUJveCYgbGluZUJv eCwgY29uc3QgTGluZTo6UnVuCiAgICAgYXV0byBzaW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQg PSBTaW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQgeyB9OwogCiAgICAgYXV0byBjcmVhdGVSb290 SW5saW5lQm94ID0gWyZdIHsKLSAgICAgICAgYXV0byByb290SW5saW5lQm94ID0gTGluZUJveDo6 SW5saW5lTGV2ZWxCb3g6OmNyZWF0ZVJvb3RJbmxpbmVCb3gocm9vdEJveCgpLCBob3Jpem9udGFs QWxpZ21lbnRPZmZzZXQsIGxpbmVCb3gubG9naWNhbFdpZHRoKCkpOworICAgICAgICBhdXRvIHJv b3RJbmxpbmVCb3ggPSBMaW5lQm94OjpJbmxpbmVMZXZlbEJveDo6Y3JlYXRlUm9vdElubGluZUJv eChyb290Qm94KCksIGhvcml6b250YWxBbGlnbWVudE9mZnNldCwgbGluZUJveC5jb250ZW50TG9n aWNhbFdpZHRoKCkpOwogICAgICAgICBzZXRWZXJ0aWNhbEdlb21ldHJ5Rm9ySW5saW5lQm94KCpy b290SW5saW5lQm94KTsKICAgICAgICAgc2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50ID0geyB7 IH0gLCByb290SW5saW5lQm94LT5sYXlvdXRCb3VuZHMoKS5oZWlnaHQoKSwgcm9vdElubGluZUJv eC0+bGF5b3V0Qm91bmRzKCkuYXNjZW50IC0gcm9vdElubGluZUJveC0+YmFzZWxpbmUoKSB9Owog ICAgICAgICBsaW5lQm94LmFkZFJvb3RJbmxpbmVCb3goV1RGTW92ZShyb290SW5saW5lQm94KSk7 CkBAIC0yNDgsNyArMjQ4LDcgQEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5l TGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lQm94LCBjb25zdCBMaW5lOjpSdW4KICAgICAgICAgfQog ICAgICAgICAvLyBDb25zdHJ1Y3QgdGhlIG1pc3NpbmcgTGluZUJveDo6SW5saW5lQm94ZXMgc3Rh cnRpbmcgd2l0aCB0aGUgdG9wbW9zdCBsYXlvdXQgYm94LgogICAgICAgICBmb3IgKGF1dG8qIGxh eW91dEJveCA6IFdURjo6bWFrZVJldmVyc2VkUmFuZ2UobGF5b3V0Qm94ZXNXaXRob3V0SW5saW5l Qm94ZXMpKSB7Ci0gICAgICAgICAgICBhdXRvIGlubGluZUJveCA9IExpbmVCb3g6OklubGluZUxl dmVsQm94OjpjcmVhdGVJbmxpbmVCb3goKmxheW91dEJveCwgaG9yaXpvbnRhbEFsaWdtZW50T2Zm c2V0LCBsaW5lQm94LmxvZ2ljYWxXaWR0aCgpKTsKKyAgICAgICAgICAgIGF1dG8gaW5saW5lQm94 ID0gTGluZUJveDo6SW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUlubGluZUJveCgqbGF5b3V0Qm94LCBo b3Jpem9udGFsQWxpZ21lbnRPZmZzZXQsIGxpbmVCb3guY29udGVudExvZ2ljYWxXaWR0aCgpKTsK ICAgICAgICAgICAgIHNldFZlcnRpY2FsR2VvbWV0cnlGb3JJbmxpbmVCb3goKmlubGluZUJveCk7 CiAgICAgICAgICAgICBsaW5lQm94LmFkZElubGluZUxldmVsQm94KFdURk1vdmUoaW5saW5lQm94 KSk7CiAgICAgICAgIH0KQEAgLTMzNSw3ICszMzUsNyBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjpj b25zdHJ1Y3RJbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1 bgogICAgICAgICAvLyBlLmcuIDxkaXY+PHNwYW4+PC9zcGFuPjxzcGFuPjwvc3Bhbj48L2Rpdj4g aXMgc3RpbGwgb2theS4KICAgICAgICAgbV9pbmxpbmVMZXZlbEJveGVzTmVlZFZlcnRpY2FsQWxp Z25tZW50ID0gbV9pbmxpbmVMZXZlbEJveGVzTmVlZFZlcnRpY2FsQWxpZ25tZW50IHx8IGxpbmVI YXNDb250ZW50OwogICAgICAgICBpZiAocnVuLmlzSW5saW5lQm94U3RhcnQoKSkgewotICAgICAg ICAgICAgYXV0byBpbml0aWFsTG9naWNhbFdpZHRoID0gbGluZUJveC5sb2dpY2FsV2lkdGgoKSAt IHJ1bi5sb2dpY2FsTGVmdCgpOworICAgICAgICAgICAgYXV0byBpbml0aWFsTG9naWNhbFdpZHRo ID0gbGluZUJveC5jb250ZW50TG9naWNhbFdpZHRoKCkgLSBydW4ubG9naWNhbExlZnQoKTsKICAg ICAgICAgICAgIEFTU0VSVChpbml0aWFsTG9naWNhbFdpZHRoID49IDApOwogICAgICAgICAgICAg YXV0byBpbmxpbmVCb3ggPSBMaW5lQm94OjpJbmxpbmVMZXZlbEJveDo6Y3JlYXRlSW5saW5lQm94 KGxheW91dEJveCwgbG9naWNhbExlZnQsIGluaXRpYWxMb2dpY2FsV2lkdGgpOwogICAgICAgICAg ICAgc2V0VmVydGljYWxHZW9tZXRyeUZvcklubGluZUJveCgqaW5saW5lQm94KTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3gu Y3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJv eC5jcHAKaW5kZXggMjM4NjVlYzk0YzZmMWY4NjcwMmIzNWRiYTk4MzQwMDc4ZGZjNzZlMy4uZDNi OGFkMmRmNDFjZjI3MWJhODViZjAwZDFmYjAxMzljZjc1Y2RiZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHAK QEAgLTgzLDggKzgzLDkgQEAgYm9vbCBMaW5lQm94OjpJbmxpbmVMZXZlbEJveDo6aGFzTGluZUJv eFJlbGF0aXZlQWxpZ25tZW50KCkgY29uc3QKICAgICByZXR1cm4gdmVydGljYWxBbGlnbm1lbnQg PT0gVmVydGljYWxBbGlnbjo6VG9wIHx8IHZlcnRpY2FsQWxpZ25tZW50ID09IFZlcnRpY2FsQWxp Z246OkJvdHRvbTsKIH0KIAotTGluZUJveDo6TGluZUJveChjb25zdCBJbmxpbmVMYXlvdXRQb2lu dCYgbG9naWNhbFRvcGxlZnQsIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxXaWR0aCwg c2l6ZV90IG51bWJlck9mUnVucykKLSAgICA6IG1fbG9naWNhbFJlY3QobG9naWNhbFRvcGxlZnQs IElubGluZUxheW91dFNpemUgeyBjb250ZW50TG9naWNhbFdpZHRoLCB7IH0gfSkKK0xpbmVCb3g6 OkxpbmVCb3goY29uc3QgSW5saW5lTGF5b3V0UG9pbnQmIGxvZ2ljYWxUb3BsZWZ0LCBJbmxpbmVM YXlvdXRVbml0IGxpbmVMb2dpY2FsV2lkdGgsIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2lj YWxXaWR0aCwgc2l6ZV90IG51bWJlck9mUnVucykKKyAgICA6IG1fbG9naWNhbFJlY3QobG9naWNh bFRvcGxlZnQsIElubGluZUxheW91dFNpemUgeyBsaW5lTG9naWNhbFdpZHRoLCB7IH0gfSkKKyAg ICAsIG1fY29udGVudExvZ2ljYWxXaWR0aChjb250ZW50TG9naWNhbFdpZHRoKQogewogICAgIG1f bm9uUm9vdElubGluZUxldmVsQm94TGlzdC5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KG51bWJlck9m UnVucyk7CiAgICAgbV9pbmxpbmVMZXZlbEJveFJlY3RNYXAucmVzZXJ2ZUluaXRpYWxDYXBhY2l0 eShudW1iZXJPZlJ1bnMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oCmluZGV4IDhjYWVmYjg4M2Q3MDA3NzdmNWMwOGM1 YTZlMzNlOTAyNDQxOTQxOGUuLmU0Zjc5OWRlNmUyNDAzYzJlYzBjNWVkZTBmMGY0NzIzN2NkMGUw ZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUxpbmVCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVMaW5lQm94LmgKQEAgLTEzMCwxMyArMTMwLDE0IEBAIHB1YmxpYzoKICAgICAgICAg VHlwZSBtX3R5cGUgeyBUeXBlOjpJbmxpbmVCb3ggfTsKICAgICB9OwogCi0gICAgTGluZUJveChj b25zdCBJbmxpbmVMYXlvdXRQb2ludCYgbG9naWNhbFRvcExlZnQsIElubGluZUxheW91dFVuaXQg bG9naWNhbFdpZHRoLCBzaXplX3QgbnVtYmVyT2ZSdW5zKTsKKyAgICBMaW5lQm94KGNvbnN0IElu bGluZUxheW91dFBvaW50JiBsb2dpY2FsVG9wTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBsaW5lTG9n aWNhbFdpZHRoLCBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsV2lkdGgsIHNpemVfdCBu dW1iZXJPZlJ1bnMpOwogCiAgICAgY29uc3QgSW5saW5lUmVjdCYgbG9naWNhbFJlY3QoKSBjb25z dCB7IHJldHVybiBtX2xvZ2ljYWxSZWN0OyB9CiAgICAgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2Fs V2lkdGgoKSBjb25zdCB7IHJldHVybiBsb2dpY2FsU2l6ZSgpLndpZHRoKCk7IH0KICAgICBJbmxp bmVMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQoKSBjb25zdCB7IHJldHVybiBsb2dpY2FsU2l6ZSgp LmhlaWdodCgpOyB9CiAgICAgSW5saW5lTGF5b3V0UG9pbnQgbG9naWNhbFRvcExlZnQoKSBjb25z dCB7IHJldHVybiBsb2dpY2FsUmVjdCgpLnRvcExlZnQoKTsgfQogICAgIElubGluZUxheW91dFNp emUgbG9naWNhbFNpemUoKSBjb25zdCB7IHJldHVybiBsb2dpY2FsUmVjdCgpLnNpemUoKTsgfQor ICAgIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxXaWR0aCgpIGNvbnN0IHsgcmV0dXJu IG1fY29udGVudExvZ2ljYWxXaWR0aDsgfQogCiAgICAgT3B0aW9uYWw8SW5saW5lTGF5b3V0VW5p dD4gaG9yaXpvbnRhbEFsaWdubWVudE9mZnNldCgpIGNvbnN0IHsgcmV0dXJuIG1faG9yaXpvbnRh bEFsaWdubWVudE9mZnNldDsgfQogCkBAIC0xNzUsNiArMTc2LDcgQEAgcHJpdmF0ZToKIAogcHJp dmF0ZToKICAgICBJbmxpbmVSZWN0IG1fbG9naWNhbFJlY3Q7CisgICAgSW5saW5lTGF5b3V0VW5p dCBtX2NvbnRlbnRMb2dpY2FsV2lkdGggeyAwIH07CiAgICAgYm9vbCBtX2hhc0NvbnRlbnQgeyBm YWxzZSB9OwogICAgIE9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IG1faG9yaXpvbnRhbEFsaWdu bWVudE9mZnNldDsKICAgICBPcHRpb25TZXQ8SW5saW5lTGV2ZWxCb3g6OlR5cGU+IG1fYm94VHlw ZXM7Cg==