219796 2020-12-11 11:48:16 -0800 [LFC][IFC] InlineTextItem::isCollapsible might be misleading 2020-12-11 13:38:25 -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 1714006 0 zalan 2020-12-11 11:48:16 -0800 it maps to RenderStyle::collapseWhiteSpace which is also misleading a bit (1. tabs are not preserved, 2. subsequent whitespace content is collapsed) 1714020 1 416027 zalan 2020-12-11 12:04:25 -0800 Created attachment 416027 Patch 1714071 2 ews-feeder 2020-12-11 13:37:13 -0800 Committed r270707: <https://trac.webkit.org/changeset/270707> All reviewed patches have been landed. Closing bug and clearing flags on attachment 416027. 1714073 3 webkit-bug-importer 2020-12-11 13:38:25 -0800 <rdar://problem/72236772> 416027 2020-12-11 12:04:25 -0800 2020-12-11 13:37:14 -0800 Patch bug-219796-20201211120424.patch text/plain 9840 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNjU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGU4ZDBjZTdhZDM1MmQ5 OWRmMTc0MGU5OWU0YzRjYmQ2MGRjZTkxZi4uZTkzN2RhZTcwNzk0ZmM2MWUwYTViMmFiZWMzNzRl ZDA4MTI1MDQzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIwLTEyLTExICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBJbmxpbmVU ZXh0SXRlbTo6aXNDb2xsYXBzaWJsZSBtaWdodCBiZSBtaXNsZWFkaW5nCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk3OTYKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGNoYW5nZSBtYWtlcyB0aGUg Y29kZSBtb3JlIGFsaWduZWQgd2l0aCB0aGUgc3BlYyBsYW5ndWFnZS4KKyAgICAgICAgOjppc0Nv bGxhcHNlZCAod2hpY2ggbWFwcyB0byBSZW5kZXJTdHlsZTo6Y29sbGFwc2VXaGl0ZVNwYWNlKSBp cyBub3QgYWx3YXlzIGFib3V0IGNvbGxhcHNpbmcgc3Vic2VxdWVudAorICAgICAgICB3aGl0ZXNw YWNlIGNvbnRlbnQgYnV0IGFsc28gYWJvdXQgcHJlc2VydmluZyB0YWIgc3RvcHMuCisKKyAgICAg ICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6TGluZTo6YXBwZW5kVGV4dENvbnRlbnQpOgorICAgICAgICAqIGxheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6TGluZTo6UnVuOjp0cmFpbGluZ1doaXRlc3BhY2VUeXBlIGNvbnN0KToKKyAgICAgICAgKiBs YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjppbmxpbmVJdGVtV2lkdGggY29uc3QpOgorICAg ICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZVRleHRJdGVtLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lVGV4dEl0ZW06OnNob3VsZFByZXNlcnZlU3BhY2Vz QW5kVGFicyk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lVGV4dEl0 ZW0uaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lVGV4dEl0ZW06OmlzV2hpdGVz cGFjZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZVRleHRJdGVtOjpJ bmxpbmVUZXh0SXRlbSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZVRleHRJdGVt Ojppc0NvbGxhcHNpYmxlIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlvdXQvaW5saW5l Zm9ybWF0dGluZy90ZXh0L1RleHRVdGlsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 VGV4dFV0aWw6OndpZHRoKToKKwogMjAyMC0xMi0xMSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBw bGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gTGluZSBzaG91bGQgcmVwb3J0IHRoZSBjb3Jy ZWN0IHZhbHVlIGZvciAiY29udGVudCBsb2dpY2FsIHJpZ2h0IgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lSXRlbS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVJdGVtLmNwcAppbmRleCA3MmI1 MGJhZTEzNTFhMmJiMDgyZGEwYzk5ODc3MjA0NDM0NmJlZTQ1Li4wNjA2ZjE4NDliNWE5YTYxODQ5 YTIwZWJkNDE5NjVhNmFkZDhlYzg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVJdGVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVJdGVtLmNwcApAQCAtMzksNyArMzksNiBAQCBzdHJ1 Y3QgU2FtZVNpemVBc0lubGluZUl0ZW0gewogICAgIHVpbnQ4X3QgZW51bTI7CiAgICAgYm9vbCB3 aWR0aEJvb2w7CiAgICAgYm9vbCBzb2Z0SHlwaGVuQm9vbDsKLSAgICBib29sIGlzQ29sbGFwc2li bGU7CiAgICAgYm9vbCBpc1dvcmRTZXBhcmF0b3I7CiAgICAgSW5saW5lTGF5b3V0VW5pdCB3aWR0 aDsKICAgICB1bnNpZ25lZCBzdGFydDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUl0ZW0uaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUl0ZW0uaAppbmRleCAwMzQ1N2I0ZGIwMGU1NTkyNDdhMzU4 OGEyZTQwYTc2ODY3NDgyYjNkLi5jMmFlMjRhNjEyNjg0NTg4NzRjNzIwOTk0MzgyYmFiODI5MWRk YzRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVJdGVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lSXRlbS5oCkBAIC02Miw3ICs2Miw2IEBAIHByb3RlY3RlZDoKICAgICBUZXh0SXRlbVR5 cGUgbV90ZXh0SXRlbVR5cGUgeyBUZXh0SXRlbVR5cGU6OlVuZGVmaW5lZCB9OwogICAgIGJvb2wg bV9oYXNXaWR0aCB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2hhc1RyYWlsaW5nU29mdEh5cGhlbiB7 IGZhbHNlIH07Ci0gICAgYm9vbCBtX2lzQ29sbGFwc2libGUgeyBmYWxzZSB9OwogICAgIGJvb2wg bV9pc1dvcmRTZXBhcmF0b3IgeyBmYWxzZSB9OwogICAgIElubGluZUxheW91dFVuaXQgbV93aWR0 aCB7IH07CiAgICAgdW5zaWduZWQgbV9sZW5ndGggeyAwIH07CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCmluZGV4IDA1YjBk OTg0ODgzYzBhOWRmYmE0ZGQ0MGY3Mjg0NjhlYzI1MGViZjIuLjFjMDk3YzQ4ZGEzNjM3NzQzMTA5 YmFkZDRmYjQ3YmQ2YTk5MTk1YzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCkBAIC0yNTAsNyArMjUwLDkgQEAgdm9p ZCBMaW5lOjphcHBlbmRUZXh0Q29udGVudChjb25zdCBJbmxpbmVUZXh0SXRlbSYgaW5saW5lVGV4 dEl0ZW0sIElubGluZUxheW91dFUKICAgICBhdXRvIHdpbGxDb2xsYXBzZUNvbXBsZXRlbHkgPSBb Jl0gewogICAgICAgICBpZiAoaW5saW5lVGV4dEl0ZW0uaXNFbXB0eUNvbnRlbnQoKSkKICAgICAg ICAgICAgIHJldHVybiB0cnVlOwotICAgICAgICBpZiAoIWlubGluZVRleHRJdGVtLmlzQ29sbGFw c2libGUoKSkKKyAgICAgICAgaWYgKCFpbmxpbmVUZXh0SXRlbS5pc1doaXRlc3BhY2UoKSkKKyAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgaWYgKElubGluZVRleHRJdGVtOjpzaG91 bGRQcmVzZXJ2ZVNwYWNlc0FuZFRhYnMoaW5saW5lVGV4dEl0ZW0pKQogICAgICAgICAgICAgcmV0 dXJuIGZhbHNlOwogICAgICAgICAvLyBDaGVjayBpZiB0aGUgbGFzdCBpdGVtIGlzIGNvbGxhcHNl ZCBhcyB3ZWxsLgogICAgICAgICBmb3IgKGF1dG8mIHJ1biA6IFdURjo6bWFrZVJldmVyc2VkUmFu Z2UobV9ydW5zKSkgewpAQCAtMjY2LDcgKzI2OCw3IEBAIHZvaWQgTGluZTo6YXBwZW5kVGV4dENv bnRlbnQoY29uc3QgSW5saW5lVGV4dEl0ZW0mIGlubGluZVRleHRJdGVtLCBJbmxpbmVMYXlvdXRV CiAgICAgICAgICAgICBBU1NFUlQocnVuLmlzSW5saW5lQm94U3RhcnQoKSB8fCBydW4uaXNJbmxp bmVCb3hFbmQoKSB8fCBydW4uaXNXb3JkQnJlYWtPcHBvcnR1bml0eSgpKTsKICAgICAgICAgfQog ICAgICAgICAvLyBMZWFkaW5nIHdoaXRlc3BhY2UuCi0gICAgICAgIHJldHVybiAhaXNXaGl0ZXNw YWNlUHJlc2VydmVkKHN0eWxlKTsKKyAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfTsKIAogICAg IGlmICh3aWxsQ29sbGFwc2VDb21wbGV0ZWx5KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmggYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmgKaW5kZXggZDdiNjk0ODQ4NzkzMmEy NzQwMjFkNDQ0MjZiZmUwYTU4NWIyZGUzMi4uMjg5ODMxMzFlNjRjNzY1NGE0NTY1Njg1MGE1Zjdk OTc3OGFkMGUwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lTGluZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmUuaApAQCAtMTkzLDcgKzE5Myw3IEBAIGlubGluZSBMaW5lOjpSdW46 OlRyYWlsaW5nV2hpdGVzcGFjZSBMaW5lOjpSdW46OnRyYWlsaW5nV2hpdGVzcGFjZVR5cGUoY29u c3QgSW5sCiB7CiAgICAgaWYgKCFpbmxpbmVUZXh0SXRlbS5pc1doaXRlc3BhY2UoKSkKICAgICAg ICAgcmV0dXJuIFRyYWlsaW5nV2hpdGVzcGFjZTo6Tm9uZTsKLSAgICBpZiAoIWlubGluZVRleHRJ dGVtLmlzQ29sbGFwc2libGUoKSkKKyAgICBpZiAoSW5saW5lVGV4dEl0ZW06OnNob3VsZFByZXNl cnZlU3BhY2VzQW5kVGFicyhpbmxpbmVUZXh0SXRlbSkpCiAgICAgICAgIHJldHVybiBUcmFpbGlu Z1doaXRlc3BhY2U6Ok5vdENvbGxhcHNpYmxlOwogICAgIGlmIChpbmxpbmVUZXh0SXRlbS5sZW5n dGgoKSA9PSAxKQogICAgICAgICByZXR1cm4gVHJhaWxpbmdXaGl0ZXNwYWNlOjpDb2xsYXBzaWJs ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcAppbmRleCBkMzY1NGZmZGNjMDMxMzM3NWJjZTQ1Y2Ji YjFiMGQyODM5MjMxNzZjLi43ZTNlMDE2Mzk5Y2MyNjlhMTIyMTRkNjU2NjlhNzUyZDA1NWRiOGQ1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVMaW5lQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCkBAIC0yMDgsOCArMjA4LDkgQEAgSW5saW5lTGF5 b3V0VW5pdCBMaW5lQnVpbGRlcjo6aW5saW5lSXRlbVdpZHRoKGNvbnN0IElubGluZUl0ZW0mIGlu bGluZUl0ZW0sIElubGkKICAgICAgICAgYXV0byYgaW5saW5lVGV4dEl0ZW0gPSBkb3duY2FzdDxJ bmxpbmVUZXh0SXRlbT4oaW5saW5lSXRlbSk7CiAgICAgICAgIGlmIChhdXRvIGNvbnRlbnRXaWR0 aCA9IGlubGluZVRleHRJdGVtLndpZHRoKCkpCiAgICAgICAgICAgICByZXR1cm4gKmNvbnRlbnRX aWR0aDsKLSAgICAgICAgYXV0byBlbmQgPSBpbmxpbmVUZXh0SXRlbS5pc0NvbGxhcHNpYmxlKCkg PyBpbmxpbmVUZXh0SXRlbS5zdGFydCgpICsgMSA6IGlubGluZVRleHRJdGVtLmVuZCgpOwotICAg ICAgICByZXR1cm4gVGV4dFV0aWw6OndpZHRoKGlubGluZVRleHRJdGVtLCBpbmxpbmVUZXh0SXRl bS5zdGFydCgpLCBlbmQsIGNvbnRlbnRMb2dpY2FsTGVmdCk7CisgICAgICAgIGlmICghaW5saW5l VGV4dEl0ZW0uaXNXaGl0ZXNwYWNlKCkgfHwgSW5saW5lVGV4dEl0ZW06OnNob3VsZFByZXNlcnZl U3BhY2VzQW5kVGFicyhpbmxpbmVUZXh0SXRlbSkpCisgICAgICAgICAgICByZXR1cm4gVGV4dFV0 aWw6OndpZHRoKGlubGluZVRleHRJdGVtLCBjb250ZW50TG9naWNhbExlZnQpOworICAgICAgICBy ZXR1cm4gVGV4dFV0aWw6OndpZHRoKGlubGluZVRleHRJdGVtLCBpbmxpbmVUZXh0SXRlbS5zdGFy dCgpLCBpbmxpbmVUZXh0SXRlbS5zdGFydCgpICsgMSwgY29udGVudExvZ2ljYWxMZWZ0KTsKICAg ICB9CiAKICAgICBpZiAoaW5saW5lSXRlbS5pc0xpbmVCcmVhaygpIHx8IGlubGluZUl0ZW0uaXNX b3JkQnJlYWtPcHBvcnR1bml0eSgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lVGV4dEl0ZW0uY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lVGV4dEl0ZW0uY3BwCmluZGV4IDJmOGM4Y2JmYTU4 ZGZiNGRjZTIyZTY1MzFjYWFiNTQyNDBjOGQ2NzcuLjQ5YmQwNWRmMGFkOTA4MDY2MGViZTczOWVm NTFhNWMxMjEwMjc5NWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZVRleHRJdGVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVUZXh0SXRlbS5jcHAKQEAgLTE1Nyw2ICsxNTcsMTMgQEAg Ym9vbCBJbmxpbmVUZXh0SXRlbTo6aXNFbXB0eUNvbnRlbnQoKSBjb25zdAogICAgIHJldHVybiAh bV9sZW5ndGggfHwgKG1fbGVuZ3RoID09IDEgJiYgaW5saW5lVGV4dEJveCgpLmNvbnRlbnQoKVtz dGFydCgpXSA9PSB6ZXJvV2lkdGhTcGFjZSk7IAogfQogCitib29sIElubGluZVRleHRJdGVtOjpz aG91bGRQcmVzZXJ2ZVNwYWNlc0FuZFRhYnMoY29uc3QgSW5saW5lVGV4dEl0ZW0mIGlubGluZVRl eHRJdGVtKQoreworICAgIEFTU0VSVChpbmxpbmVUZXh0SXRlbS5pc1doaXRlc3BhY2UoKSk7Cisg ICAgYXV0byB3aGl0ZXNwYWNlID0gaW5saW5lVGV4dEl0ZW0uc3R5bGUoKS53aGl0ZVNwYWNlKCk7 CisgICAgcmV0dXJuIHdoaXRlc3BhY2UgPT0gV2hpdGVTcGFjZTo6UHJlIHx8IHdoaXRlc3BhY2Ug PT0gV2hpdGVTcGFjZTo6UHJlV3JhcCB8fCB3aGl0ZXNwYWNlID09IFdoaXRlU3BhY2U6OkJyZWFr U3BhY2VzOworfQorCiB9CiB9CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZVRleHRJdGVtLmggYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVUZXh0SXRlbS5oCmluZGV4IDc1YmEyMGQyMWQz ODY5ZDQ5MTFhOGYyYjI4ZDFlM2JlZjk0MWNhNTAuLmFhNWM5ZmRiZGU2N2I2NTc5OGM4NGNkMDVj YTcxYWQ3ZTkzYjA2NDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZVRleHRJdGVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lVGV4dEl0ZW0uaApAQCAtNDQsNyArNDQsNiBAQCBwdWJsaWM6 CiAgICAgdW5zaWduZWQgbGVuZ3RoKCkgY29uc3QgeyByZXR1cm4gbV9sZW5ndGg7IH0KIAogICAg IGJvb2wgaXNXaGl0ZXNwYWNlKCkgY29uc3QgeyByZXR1cm4gbV90ZXh0SXRlbVR5cGUgPT0gVGV4 dEl0ZW1UeXBlOjpXaGl0ZXNwYWNlOyB9Ci0gICAgYm9vbCBpc0NvbGxhcHNpYmxlKCkgY29uc3Qg eyByZXR1cm4gbV9pc0NvbGxhcHNpYmxlOyB9CiAgICAgYm9vbCBpc1dvcmRTZXBhcmF0b3IoKSBj b25zdCB7IHJldHVybiBtX2lzV29yZFNlcGFyYXRvcjsgfQogICAgIGJvb2wgaGFzVHJhaWxpbmdT b2Z0SHlwaGVuKCkgY29uc3QgeyByZXR1cm4gbV9oYXNUcmFpbGluZ1NvZnRIeXBoZW47IH0KICAg ICBPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiB3aWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1faGFz V2lkdGggPyBtYWtlT3B0aW9uYWwobV93aWR0aCkgOiBPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0 PiB7IH07IH0KQEAgLTU1LDYgKzU0LDggQEAgcHVibGljOgogICAgIElubGluZVRleHRJdGVtIGxl ZnQodW5zaWduZWQgbGVuZ3RoKSBjb25zdDsKICAgICBJbmxpbmVUZXh0SXRlbSByaWdodCh1bnNp Z25lZCBsZW5ndGgpIGNvbnN0OwogCisgICAgc3RhdGljIGJvb2wgc2hvdWxkUHJlc2VydmVTcGFj ZXNBbmRUYWJzKGNvbnN0IElubGluZVRleHRJdGVtJik7CisKIHByaXZhdGU6CiAgICAgdXNpbmcg SW5saW5lSXRlbTo6VGV4dEl0ZW1UeXBlOwogCkBAIC04OCw3ICs4OSw2IEBAIGlubGluZSBJbmxp bmVUZXh0SXRlbTo6SW5saW5lVGV4dEl0ZW0oY29uc3QgSW5saW5lVGV4dEJveCYgaW5saW5lVGV4 dEJveCwgdW5zaWduCiAgICAgbV9sZW5ndGggPSBsZW5ndGg7CiAgICAgbV9oYXNXaWR0aCA9ICEh d2lkdGg7CiAgICAgbV9oYXNUcmFpbGluZ1NvZnRIeXBoZW4gPSBoYXNUcmFpbGluZ1NvZnRIeXBo ZW47Ci0gICAgbV9pc0NvbGxhcHNpYmxlID0gdGV4dEl0ZW1UeXBlID09IFRleHRJdGVtVHlwZTo6 V2hpdGVzcGFjZSAmJiBpbmxpbmVUZXh0Qm94LnN0eWxlKCkuY29sbGFwc2VXaGl0ZVNwYWNlKCk7 CiAgICAgbV9pc1dvcmRTZXBhcmF0b3IgPSBpc1dvcmRTZXBhcmF0b3I7CiAgICAgbV93aWR0aCA9 IHdpZHRoLnZhbHVlT3IoMCk7CiAgICAgbV90ZXh0SXRlbVR5cGUgPSB0ZXh0SXRlbVR5cGU7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy90ZXh0L1Rl eHRVdGlsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL3RleHQv VGV4dFV0aWwuY3BwCmluZGV4IDRlNTE2MGQ2MzYwMmM1OWZhZDFkZGJmNjVjNmMwYjZlMWE2MTVj ZGUuLjAzMTAxODhhNWEyYjY0OTMwZDA2YWVlYjlhNmVlYTgzNTVkNjllN2IgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL3RleHQvVGV4dFV0aWwuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL3RleHQvVGV4dFV0 aWwuY3BwCkBAIC00MCwxNSArNDAsMTUgQEAgbmFtZXNwYWNlIExheW91dCB7CiAKIElubGluZUxh eW91dFVuaXQgVGV4dFV0aWw6OndpZHRoKGNvbnN0IElubGluZVRleHRJdGVtJiBpbmxpbmVUZXh0 SXRlbSwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbExlZnQpCiB7Ci0gICAgcmV0dXJu IFRleHRVdGlsOjp3aWR0aChpbmxpbmVUZXh0SXRlbSwgaW5saW5lVGV4dEl0ZW0uc3RhcnQoKSwg aW5saW5lVGV4dEl0ZW0uZW5kKCkgLSAxLCBjb250ZW50TG9naWNhbExlZnQpOworICAgIHJldHVy biBUZXh0VXRpbDo6d2lkdGgoaW5saW5lVGV4dEl0ZW0sIGlubGluZVRleHRJdGVtLnN0YXJ0KCks IGlubGluZVRleHRJdGVtLmVuZCgpLCBjb250ZW50TG9naWNhbExlZnQpOwogfQogCiBJbmxpbmVM YXlvdXRVbml0IFRleHRVdGlsOjp3aWR0aChjb25zdCBJbmxpbmVUZXh0SXRlbSYgaW5saW5lVGV4 dEl0ZW0sIHVuc2lnbmVkIGZyb20sIHVuc2lnbmVkIHRvLCBJbmxpbmVMYXlvdXRVbml0IGNvbnRl bnRMb2dpY2FsTGVmdCkKIHsKICAgICBSRUxFQVNFX0FTU0VSVChmcm9tID49IGlubGluZVRleHRJ dGVtLnN0YXJ0KCkpOwogICAgIFJFTEVBU0VfQVNTRVJUKHRvIDw9IGlubGluZVRleHRJdGVtLmVu ZCgpKTsKLSAgICBpZiAoaW5saW5lVGV4dEl0ZW0uaXNDb2xsYXBzaWJsZSgpKSB7Ci0gICAgICAg IC8vIEZhc3QgcGF0aCBmb3IgY29sbGFwc2VkIHdoaXRlc3BhY2UuCisgICAgaWYgKGlubGluZVRl eHRJdGVtLmlzV2hpdGVzcGFjZSgpICYmICFJbmxpbmVUZXh0SXRlbTo6c2hvdWxkUHJlc2VydmVT cGFjZXNBbmRUYWJzKGlubGluZVRleHRJdGVtKSkgeworICAgICAgICAvLyBGYXN0IHBhdGggZm9y IG5vbi1wcmVzZXJ2ZWQgd2hpdGVzcGFjZS4KICAgICAgICAgYXV0byYgZm9udCA9IGlubGluZVRl eHRJdGVtLnN0eWxlKCkuZm9udENhc2NhZGUoKTsKICAgICAgICAgcmV0dXJuIGZvbnQuc3BhY2VX aWR0aCgpICsgZm9udC53b3JkU3BhY2luZygpOwogICAgIH0K