219237 2020-11-21 11:51:08 -0800 [LFC][IFC] Move current logicalLeft from ContinuousContent to LineStatus 2020-11-21 12:47:15 -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 1709780 0 zalan 2020-11-21 11:51:08 -0800 This is more about line status (content logical right) than where the continuous content start 1709781 1 414769 zalan 2020-11-21 11:57:48 -0800 Created attachment 414769 Patch 1709786 2 ews-feeder 2020-11-21 12:46:47 -0800 Committed r270153: <https://trac.webkit.org/changeset/270153> All reviewed patches have been landed. Closing bug and clearing flags on attachment 414769. 1709787 3 webkit-bug-importer 2020-11-21 12:47:15 -0800 <rdar://problem/71657497> 414769 2020-11-21 11:57:48 -0800 2020-11-21 12:46:48 -0800 Patch bug-219237-20201121115748.patch text/plain 9776 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwMTQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDI5YTcxODgyNWIxZGYw Y2E5NTU5YjU5NDFiMTY4NDI2NDhhMTI1OC4uOTc2NjY0YTE1ZTI2MDg4ZTQzNTFhNDUyNDQwNmQy N2JiOTViMjViZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTExLTIxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBNb3ZlIGN1 cnJlbnQgbG9naWNhbExlZnQgZnJvbSBDb250aW51b3VzQ29udGVudCB0byBMaW5lU3RhdHVzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTkyMzcKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXRhaW4gdGhl IGNvbnRlbnQgbG9naWNhbCByaWdodCBpbiB0aGUgTGluZVN0YXR1cyBpbnN0ZWFkICh0aGlzIGlz IHVzZWQgdG8gbWVhc3VyZSB0ZXh0IHByb3Blcmx5IChzZWUgeFBvcykgd2hpbGUgZmluZGluZyBo eXBoZW4gcG9zaXRpb24pLgorCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lQ29udGVudEJyZWFrZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVD b250ZW50QnJlYWtlcjo6cHJvY2Vzc092ZXJmbG93aW5nVGV4dENvbnRlbnQgY29uc3QpOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVDb250ZW50QnJlYWtlcjo6Q29udGludW91c0Nv bnRlbnQ6OnJlc2V0KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVD b250ZW50QnJlYWtlci5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVDb250ZW50 QnJlYWtlcjo6Q29udGludW91c0NvbnRlbnQ6OmxvZ2ljYWxXaWR0aCBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUNvbnRlbnRCcmVha2VyOjpDb250aW51b3VzQ29udGVu dDo6bG9naWNhbExlZnQgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6TGluZUNhbmRpZGF0ZTo6SW5saW5lQ29udGVudDo6cmVzZXQpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpMaW5lQ2FuZGlkYXRlOjpyZXNldCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkxpbmVCdWlsZGVyOjpuZXh0Q29udGVudEZvckxpbmUpOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpMaW5lQnVpbGRlcjo6aGFuZGxlRmxvYXRzQW5kSW5saW5lQ29udGVudCk6CisKIDIw MjAtMTEtMjEgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZD XVtJRkNdIFRyZWF0IGZsb2F0cyBhcyBzb2Z0IHdyYXAgb3Bwb3J0dW5pdGllcwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lQ29udGVudEJy ZWFrZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Q29udGVudEJyZWFrZXIuY3BwCmluZGV4IGFlZTI0YmViZDZjYjA3YmRiMzc4MTViNjRjNTFkMzgy NDhhNjQ5YzguLmIzNmJmMTMyMmQ1OTljZmFiMWE3YzhiZTY2ZmVjYzc2ZDEzMGMzNmQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUNvbnRl bnRCcmVha2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVDb250ZW50QnJlYWtlci5jcHAKQEAgLTI3NCw3ICsyNzQsNyBAQCBPcHRpb25hbDxU cmFpbGluZ1RleHRDb250ZW50PiBJbmxpbmVDb250ZW50QnJlYWtlcjo6cHJvY2Vzc092ZXJmbG93 aW5nVGV4dENvbnRlbgogICAgICAgICAgICAgLy8gPHNwYW4gc3R5bGU9IndvcmQtYnJlYWs6IGtl ZXAtYWxsIj50ZXh0Y29udGVudHdpdGhub2JyZWFrPC9zcGFuPjxzcGFuPnRleHRjb250ZW50d2l0 aHllc2JyZWFrPC9zcGFuPgogICAgICAgICAgICAgLy8gV2hlbiB0aGUgZmlyc3Qgc3BhbiBjb21w dXRlcyBsb25nZXIgdGhhbiB0aGUgYXZhaWxhYmxlIHNwYWNlLCBieSB0aGUgdGltZSB3ZSBnZXQg dG8gdGhlIHNlY29uZCBzcGFuLCB0aGUgYWRqdXN0ZWQgYXZhaWxhYmxlIHNwYWNlIGJlY29tZXMg bmVnYXRpdmUuCiAgICAgICAgICAgICBhdXRvIGFkanVzdGVkQXZhaWxhYmxlV2lkdGggPSBzdGQ6 Om1heDxJbmxpbmVMYXlvdXRVbml0PigwLCBsaW5lU3RhdHVzLmF2YWlsYWJsZVdpZHRoIC0gYWNj dW11bGF0ZWRSdW5XaWR0aCk7Ci0gICAgICAgICAgICBpZiAoYXV0byBwYXJ0aWFsUnVuID0gdHJ5 QnJlYWtpbmdUZXh0UnVuKHJ1biwgY29udGludW91c0NvbnRlbnQubG9naWNhbExlZnQoKSArIGFj Y3VtdWxhdGVkUnVuV2lkdGgsIGFkanVzdGVkQXZhaWxhYmxlV2lkdGgpKSB7CisgICAgICAgICAg ICBpZiAoYXV0byBwYXJ0aWFsUnVuID0gdHJ5QnJlYWtpbmdUZXh0UnVuKHJ1biwgbGluZVN0YXR1 cy5jb250ZW50TG9naWNhbFJpZ2h0ICsgYWNjdW11bGF0ZWRSdW5XaWR0aCwgYWRqdXN0ZWRBdmFp bGFibGVXaWR0aCkpIHsKICAgICAgICAgICAgICAgICBpZiAocGFydGlhbFJ1bi0+bGVuZ3RoKQog ICAgICAgICAgICAgICAgICAgICByZXR1cm4gVHJhaWxpbmdUZXh0Q29udGVudCB7IGluZGV4LCBm YWxzZSwgcGFydGlhbFJ1biB9OwogICAgICAgICAgICAgICAgIC8vIFdoZW4gdGhlIGNvbnRlbnQg aXMgd3JhcHBlZCBhdCB0aGUgcnVuIGJvdW5kYXJ5LCB0aGUgdHJhaWxpbmcgcnVuIGlzIHRoZSBw cmV2aW91cyBydW4uCkBAIC0yOTYsNyArMjk2LDcgQEAgT3B0aW9uYWw8VHJhaWxpbmdUZXh0Q29u dGVudD4gSW5saW5lQ29udGVudEJyZWFrZXI6OnByb2Nlc3NPdmVyZmxvd2luZ1RleHRDb250ZW4K ICAgICAgICAgYWNjdW11bGF0ZWRSdW5XaWR0aCAtPSBydW4ubG9naWNhbFdpZHRoOwogICAgICAg ICBpZiAoaXNCcmVha2FibGVSdW4ocnVuKSkgewogICAgICAgICAgICAgQVNTRVJUKHJ1bi5pbmxp bmVJdGVtLmlzVGV4dCgpKTsKLSAgICAgICAgICAgIGlmIChhdXRvIHBhcnRpYWxSdW4gPSB0cnlC cmVha2luZ1RleHRSdW4ocnVuLCBjb250aW51b3VzQ29udGVudC5sb2dpY2FsTGVmdCgpICsgYWNj dW11bGF0ZWRSdW5XaWR0aCwgbWF4SW5saW5lTGF5b3V0VW5pdCgpKSkgeworICAgICAgICAgICAg aWYgKGF1dG8gcGFydGlhbFJ1biA9IHRyeUJyZWFraW5nVGV4dFJ1bihydW4sIGxpbmVTdGF0dXMu Y29udGVudExvZ2ljYWxSaWdodCArIGFjY3VtdWxhdGVkUnVuV2lkdGgsIG1heElubGluZUxheW91 dFVuaXQoKSkpIHsKICAgICAgICAgICAgICAgICAvLyBXZSBrbm93IHRoaXMgcnVuIGZpdHMsIHNv IGlmIHdyYXBwaW5nIGlzIGFsbG93ZWQgb24gdGhlIHJ1biwgaXQgc2hvdWxkIHJldHVybiBhIG5v bi1lbXB0eSBsZWZ0LXNpZGUuCiAgICAgICAgICAgICAgICAgQVNTRVJUKHBhcnRpYWxSdW4tPmxl bmd0aCk7CiAgICAgICAgICAgICAgICAgcmV0dXJuIFRyYWlsaW5nVGV4dENvbnRlbnQgeyBpbmRl eCwgZmFsc2UsIHBhcnRpYWxSdW4gfTsKQEAgLTQxMiw5ICs0MTIsOCBAQCB2b2lkIElubGluZUNv bnRlbnRCcmVha2VyOjpDb250aW51b3VzQ29udGVudDo6YXBwZW5kKGNvbnN0IElubGluZUl0ZW0m IGlubGluZUl0ZQogICAgIEFTU0VSVChtX2NvbGxhcHNpYmxlTG9naWNhbFdpZHRoIDw9IG1fbG9n aWNhbFdpZHRoKTsKIH0KIAotdm9pZCBJbmxpbmVDb250ZW50QnJlYWtlcjo6Q29udGludW91c0Nv bnRlbnQ6OnJlc2V0KElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxMZWZ0KQordm9pZCBJ bmxpbmVDb250ZW50QnJlYWtlcjo6Q29udGludW91c0NvbnRlbnQ6OnJlc2V0KCkKIHsKLSAgICBt X2xvZ2ljYWxMZWZ0ID0gY29udGVudExvZ2ljYWxMZWZ0OwogICAgIG1fbG9naWNhbFdpZHRoID0g eyB9OwogICAgIG1fY29sbGFwc2libGVMb2dpY2FsV2lkdGggPSB7IH07CiAgICAgbV9ydW5zLmNs ZWFyKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVDb250ZW50QnJlYWtlci5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lQ29udGVudEJyZWFrZXIuaAppbmRleCA1MjNmZjFmMDYzMmU1NTY1MzBj Mzg1NTE0YjBlZjk2ZmQxMTljNmMwLi44ODc4MWE4NWQ0NGEwNmViOTc4Y2M5MmZiZDZlMWJjMzVi MWY2NjBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVDb250ZW50QnJlYWtlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUNvbnRlbnRCcmVha2VyLmgKQEAgLTc5LDE0ICs3OSwxMyBAQCBw dWJsaWM6CiAgICAgLy8gc2VlIGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtdGV4dC0zLyNs aW5lLWJyZWFrLWRldGFpbHMKICAgICBzdHJ1Y3QgQ29udGludW91c0NvbnRlbnQgewogICAgICAg ICBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fbG9naWNh bFdpZHRoOyB9Ci0gICAgICAgIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQoKSBjb25zdCB7 IHJldHVybiBtX2xvZ2ljYWxMZWZ0OyB9CiAgICAgICAgIElubGluZUxheW91dFVuaXQgY29sbGFw c2libGVMb2dpY2FsV2lkdGgoKSBjb25zdCB7IHJldHVybiBtX2NvbGxhcHNpYmxlTG9naWNhbFdp ZHRoOyB9CiAgICAgICAgIElubGluZUxheW91dFVuaXQgbm9uQ29sbGFwc2libGVMb2dpY2FsV2lk dGgoKSBjb25zdCB7IHJldHVybiBsb2dpY2FsV2lkdGgoKSAtIGNvbGxhcHNpYmxlTG9naWNhbFdp ZHRoKCk7IH0KICAgICAgICAgYm9vbCBoYXNUcmFpbGluZ0NvbGxhcHNpYmxlQ29udGVudCgpIGNv bnN0IHsgcmV0dXJuICEhY29sbGFwc2libGVMb2dpY2FsV2lkdGgoKTsgfQogICAgICAgICBib29s IGlzRnVsbHlDb2xsYXBzaWJsZSgpIGNvbnN0IHsgcmV0dXJuIGxvZ2ljYWxXaWR0aCgpID09IGNv bGxhcHNpYmxlTG9naWNhbFdpZHRoKCk7IH0KIAogICAgICAgICB2b2lkIGFwcGVuZChjb25zdCBJ bmxpbmVJdGVtJiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgsIE9wdGlvbmFsPElubGlu ZUxheW91dFVuaXQ+IGNvbGxhcHNpYmxlV2lkdGgpOwotICAgICAgICB2b2lkIHJlc2V0KElubGlu ZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxMZWZ0KTsKKyAgICAgICAgdm9pZCByZXNldCgpOwog CiAgICAgICAgIHN0cnVjdCBSdW4gewogICAgICAgICAgICAgUnVuKGNvbnN0IElubGluZUl0ZW0m LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCk7CkBAIC0xMDEsMTIgKzEwMCwxMiBAQCBw dWJsaWM6CiAKICAgICBwcml2YXRlOgogICAgICAgICBSdW5MaXN0IG1fcnVuczsKLSAgICAgICAg SW5saW5lTGF5b3V0VW5pdCBtX2xvZ2ljYWxMZWZ0IHsgMCB9OwogICAgICAgICBJbmxpbmVMYXlv dXRVbml0IG1fbG9naWNhbFdpZHRoIHsgMCB9OwogICAgICAgICBJbmxpbmVMYXlvdXRVbml0IG1f Y29sbGFwc2libGVMb2dpY2FsV2lkdGggeyAwIH07CiAgICAgfTsKIAogICAgIHN0cnVjdCBMaW5l U3RhdHVzIHsKKyAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbFJpZ2h0IHsg MCB9OwogICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoIHsgMCB9OwogICAg ICAgICBJbmxpbmVMYXlvdXRVbml0IGNvbGxhcHNpYmxlV2lkdGggeyAwIH07CiAgICAgICAgIE9w dGlvbmFsPElubGluZUxheW91dFVuaXQ+IHRyYWlsaW5nU29mdEh5cGhlbldpZHRoOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1 aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l TGluZUJ1aWxkZXIuY3BwCmluZGV4IDdhZjFiYTY1ODg1MDFlNmY3YTgzNWY2M2I1YzQzZWJhOGNh ODI5MDIuLjY0Y2UwYzJlMzc0MGNkNGVlYWU2NGVmNTI5MjdmNjBkODZhYmY5M2YgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWls ZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVMaW5lQnVpbGRlci5jcHAKQEAgLTEyNCw3ICsxMjQsNyBAQCBzdGF0aWMgaW5saW5lIGJvb2wg aXNBdFNvZnRXcmFwT3Bwb3J0dW5pdHkoY29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGlu bGluZQogc3RydWN0IExpbmVDYW5kaWRhdGUgewogICAgIExpbmVDYW5kaWRhdGUoYm9vbCBpZ25v cmVUcmFpbGluZ0xldHRlclNwYWNpbmcpOwogCi0gICAgdm9pZCByZXNldChJbmxpbmVMYXlvdXRV bml0IGNvbnRlbnRMb2dpY2FsTGVmdCk7CisgICAgdm9pZCByZXNldCgpOwogCiAgICAgc3RydWN0 IElubGluZUNvbnRlbnQgewogICAgICAgICBJbmxpbmVDb250ZW50KGJvb2wgaWdub3JlVHJhaWxp bmdMZXR0ZXJTcGFjaW5nKTsKQEAgLTEzNiw3ICsxMzYsNyBAQCBzdHJ1Y3QgTGluZUNhbmRpZGF0 ZSB7CiAgICAgICAgIHZvaWQgYXBwZW5kSW5saW5lSXRlbShjb25zdCBJbmxpbmVJdGVtJiwgSW5s aW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpOwogICAgICAgICB2b2lkIGFwcGVuZFRyYWlsaW5n TGluZUJyZWFrKGNvbnN0IElubGluZUl0ZW0mIGxpbmVCcmVha0l0ZW0pIHsgbV90cmFpbGluZ0xp bmVCcmVhayA9ICZsaW5lQnJlYWtJdGVtOyB9CiAgICAgICAgIHZvaWQgYXBwZW5kdHJhaWxpbmdX b3JkQnJlYWtPcHBvcnR1bml0eShjb25zdCBJbmxpbmVJdGVtJiB3b3JkQnJlYWtJdGVtKSB7IG1f dHJhaWxpbmdXb3JkQnJlYWtPcHBvcnR1bml0eSA9ICZ3b3JkQnJlYWtJdGVtOyB9Ci0gICAgICAg IHZvaWQgcmVzZXQoSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbExlZnQpOworICAgICAg ICB2b2lkIHJlc2V0KCk7CiAKICAgICBwcml2YXRlOgogICAgICAgICBib29sIG1faWdub3JlVHJh aWxpbmdMZXR0ZXJTcGFjaW5nIHsgZmFsc2UgfTsKQEAgLTIwMiw5ICsyMDIsOSBAQCBpbmxpbmUg dm9pZCBMaW5lQ2FuZGlkYXRlOjpJbmxpbmVDb250ZW50OjphcHBlbmRJbmxpbmVJdGVtKGNvbnN0 IElubGluZUl0ZW0mIGlubAogICAgIG1fY29udGludW91c0NvbnRlbnQuYXBwZW5kKGlubGluZUl0 ZW0sIGxvZ2ljYWxXaWR0aCwgY29sbGFwc2libGVXaWR0aCgpKTsKIH0KIAotaW5saW5lIHZvaWQg TGluZUNhbmRpZGF0ZTo6SW5saW5lQ29udGVudDo6cmVzZXQoSW5saW5lTGF5b3V0VW5pdCBjb250 ZW50TG9naWNhbExlZnQpCitpbmxpbmUgdm9pZCBMaW5lQ2FuZGlkYXRlOjpJbmxpbmVDb250ZW50 OjpyZXNldCgpCiB7Ci0gICAgbV9jb250aW51b3VzQ29udGVudC5yZXNldChjb250ZW50TG9naWNh bExlZnQpOworICAgIG1fY29udGludW91c0NvbnRlbnQucmVzZXQoKTsKICAgICBtX3RyYWlsaW5n TGluZUJyZWFrID0geyB9OwogICAgIG1fdHJhaWxpbmdXb3JkQnJlYWtPcHBvcnR1bml0eSA9IHsg fTsKIH0KQEAgLTIyMiwxMCArMjIyLDEwIEBAIGlubGluZSB2b2lkIExpbmVDYW5kaWRhdGU6OkZs b2F0Q29udGVudDo6cmVzZXQoKQogICAgIG1faW50cnVzaXZlV2lkdGggPSB7IH07CiB9CiAKLWlu bGluZSB2b2lkIExpbmVDYW5kaWRhdGU6OnJlc2V0KElubGluZUxheW91dFVuaXQgY29udGVudExv Z2ljYWxMZWZ0KQoraW5saW5lIHZvaWQgTGluZUNhbmRpZGF0ZTo6cmVzZXQoKQogewogICAgIGZs b2F0Q29udGVudC5yZXNldCgpOwotICAgIGlubGluZUNvbnRlbnQucmVzZXQoY29udGVudExvZ2lj YWxMZWZ0KTsKKyAgICBpbmxpbmVDb250ZW50LnJlc2V0KCk7CiB9CiAKIElubGluZUxheW91dFVu aXQgTGluZUJ1aWxkZXI6OmlubGluZUl0ZW1XaWR0aChjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJ dGVtLCBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsTGVmdCkgY29uc3QKQEAgLTQ1NCw3 ICs0NTQsNyBAQCBMaW5lQnVpbGRlcjo6VXNlZENvbnN0cmFpbnRzIExpbmVCdWlsZGVyOjpjb25z dHJhaW50c0ZvckxpbmUoY29uc3QgSW5saW5lUmVjdCYgbAogdm9pZCBMaW5lQnVpbGRlcjo6bmV4 dENvbnRlbnRGb3JMaW5lKExpbmVDYW5kaWRhdGUmIGxpbmVDYW5kaWRhdGUsIHNpemVfdCBjdXJy ZW50SW5saW5lSXRlbUluZGV4LCBjb25zdCBJbmxpbmVJdGVtUmFuZ2UmIGxheW91dFJhbmdlLCBz aXplX3QgcGFydGlhbExlYWRpbmdDb250ZW50TGVuZ3RoLCBJbmxpbmVMYXlvdXRVbml0IGF2YWls YWJsZUxpbmVXaWR0aCwgSW5saW5lTGF5b3V0VW5pdCBjdXJyZW50TG9naWNhbFJpZ2h0KQogewog ICAgIEFTU0VSVChjdXJyZW50SW5saW5lSXRlbUluZGV4IDwgbGF5b3V0UmFuZ2UuZW5kKTsKLSAg ICBsaW5lQ2FuZGlkYXRlLnJlc2V0KGN1cnJlbnRMb2dpY2FsUmlnaHQpOworICAgIGxpbmVDYW5k aWRhdGUucmVzZXQoKTsKICAgICAvLyAxLiBTaW1wbHkgYWRkIGFueSBvdmVyZmxvdyBjb250ZW50 IGZyb20gdGhlIHByZXZpb3VzIGxpbmUgdG8gdGhlIGNhbmRpZGF0ZSBjb250ZW50LiBJdCdzIGFs d2F5cyBhIHRleHQgY29udGVudC4KICAgICAvLyAyLiBGaW5kIHRoZSBuZXh0IHNvZnQgd3JhcCBw b3NpdGlvbiBvciBleHBsaWNpdCBsaW5lIGJyZWFrLgogICAgIC8vIDMuIENvbGxlY3QgZmxvYXRz IGJldHdlZW4gdGhlIGlubGluZSBjb250ZW50LgpAQCAtNjA3LDcgKzYwNyw3IEBAIExpbmVCdWls ZGVyOjpSZXN1bHQgTGluZUJ1aWxkZXI6OmhhbmRsZUZsb2F0c0FuZElubGluZUNvbnRlbnQoSW5s aW5lQ29udGVudEJyZWFrCiAgICAgLy8gQ2hlY2sgaWYgdGhpcyBuZXcgY29udGVudCBmaXRzLgog ICAgIGF1dG8gYXZhaWxhYmxlV2lkdGggPSB0aGlzLT5hdmFpbGFibGVXaWR0aCgpIC0gZmxvYXRD b250ZW50LmludHJ1c2l2ZVdpZHRoKCk7CiAgICAgYXV0byBpc0xpbmVDb25zaWRlcmVkRW1wdHkg PSBtX2xpbmUuaXNDb25zaWRlcmVkRW1wdHkoKSAmJiAhbV9jb250ZW50SXNDb25zdHJhaW5lZEJ5 RmxvYXQ7Ci0gICAgYXV0byBsaW5lU3RhdHVzID0gSW5saW5lQ29udGVudEJyZWFrZXI6OkxpbmVT dGF0dXMgeyBhdmFpbGFibGVXaWR0aCwgbV9saW5lLnRyaW1tYWJsZVRyYWlsaW5nV2lkdGgoKSwg bV9saW5lLnRyYWlsaW5nU29mdEh5cGhlbldpZHRoKCksIG1fbGluZS5pc1RyYWlsaW5nUnVuRnVs bHlUcmltbWFibGUoKSwgaXNMaW5lQ29uc2lkZXJlZEVtcHR5IH07CisgICAgYXV0byBsaW5lU3Rh dHVzID0gSW5saW5lQ29udGVudEJyZWFrZXI6OkxpbmVTdGF0dXMgeyBtX2xpbmUuY29udGVudExv Z2ljYWxXaWR0aCgpLCBhdmFpbGFibGVXaWR0aCwgbV9saW5lLnRyaW1tYWJsZVRyYWlsaW5nV2lk dGgoKSwgbV9saW5lLnRyYWlsaW5nU29mdEh5cGhlbldpZHRoKCksIG1fbGluZS5pc1RyYWlsaW5n UnVuRnVsbHlUcmltbWFibGUoKSwgaXNMaW5lQ29uc2lkZXJlZEVtcHR5IH07CiAgICAgYXV0byBy ZXN1bHQgPSBpbmxpbmVDb250ZW50QnJlYWtlci5wcm9jZXNzSW5saW5lQ29udGVudChjb250aW51 b3VzSW5saW5lQ29udGVudCwgbGluZVN0YXR1cyk7CiAgICAgaWYgKHJlc3VsdC5sYXN0V3JhcE9w cG9ydHVuaXR5SXRlbSkKICAgICAgICAgbV93cmFwT3Bwb3J0dW5pdHlMaXN0LmFwcGVuZChyZXN1 bHQubGFzdFdyYXBPcHBvcnR1bml0eUl0ZW0pOwo=