216680 2020-09-17 19:42:05 -0700 [LFC][IFC] Move computedLineLogicalRect to InlineFormattingContext::Geometry 2020-09-18 05:16:16 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham simon.fraser webkit-bug-importer zalan oldest_to_newest 1689704 0 zalan 2020-09-17 19:42:05 -0700 where it belongs. 1689706 1 409101 zalan 2020-09-17 19:46:04 -0700 Created attachment 409101 Patch 1689767 2 ews-feeder 2020-09-18 05:15:10 -0700 Committed r267236: <https://trac.webkit.org/changeset/267236> All reviewed patches have been landed. Closing bug and clearing flags on attachment 409101. 1689768 3 webkit-bug-importer 2020-09-18 05:16:16 -0700 <rdar://problem/69142726> 409101 2020-09-17 19:46:04 -0700 2020-09-18 05:15:11 -0700 Patch bug-216680-20200917194603.patch text/plain 11830 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3MTg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTM2ZDViZWRmZWVhOGIw N2JiMGM5M2Y1ZTA2ZDdjYzc0NjU1ZmJjNS4uMjk2YTM1ZDhhYjllMzQ0ODI0MjQxZTI0ZTU5OGI1 ZDY5MTEwODNkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTA5LTE3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBNb3ZlIGNv bXB1dGVkTGluZUxvZ2ljYWxSZWN0IHRvIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRy eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2Njgw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBm dW5jdGlvbiBjb21wdXRlcyBsaW5lIGdlb21ldHJ5LiBJdCBiZWxvbmdzIGluIElubGluZUZvcm1h dHRpbmdDb250ZXh0OjpHZW9tZXRyeS4gCisKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlR2VvbWV0cnlGb3JMaW5lQ29udGVu dCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpj b21wdXRlZExpbmVMb2dpY2FsUmVjdCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaDoKKyAgICAgICAgKiBs YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6Okdl b21ldHJ5Ojpjb21wdXRlZExpbmVMb2dpY2FsUmVjdCBjb25zdCk6CisKIDIwMjAtMDktMTcgIFph bGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIE1vdmUg aW5saW5lIGJveCBjb25zdHJ1Y3RpbmcgYW5kIGFsaWdubWVudCBsb2dpYyB0byBMaW5lQm94QnVp bGRlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IGYxOTZkMmU1MDU3 MGViYTQxNTcwMzcyODI2N2I3YzFkMWUyZjVmNmMuLmEyODk4MmI2MjJjODBkMjc5MjA4OGUxZTFj OGFkZDIzZDFlZWNlNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAg LTM5MSw1OSArMzkxLDEyIEBAIHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbGxlY3RJ bmxpbmVDb250ZW50SWZOZWVkZWQoKQogICAgIH0KIH0KIAotSW5saW5lRm9ybWF0dGluZ0NvbnRl eHQ6OkxpbmVSZWN0QW5kTGluZUJveE9mZnNldCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29t cHV0ZWRMaW5lTG9naWNhbFJlY3QoY29uc3QgTGluZUJveCYgbGluZUJveCwgY29uc3QgTGluZUJ1 aWxkZXI6OkxpbmVDb250ZW50JiBsaW5lQ29udGVudCkgY29uc3QKLXsKLSAgICAvLyBDb21wdXRl IHRoZSBsaW5lIGhlaWdodCBhbmQgdGhlIGxpbmUgYm94IHZlcnRpY2FsIG9mZnNldC4KLSAgICAv LyBUaGUgbGluZSBoZWlnaHQgaXMgZWl0aGVyIHRoZSBsaW5lLWhlaWdodCB2YWx1ZSAobmVnYXRp dmUgdmFsdWUgbWVhbnMgbGluZSBoZWlnaHQgaXMgbm90IHNldCkgb3IgdGhlIGZvbnQgbWV0cmlj cydzIGxpbmUgc3BhY2luZy9saW5lIGJveCBoZWlnaHQuCi0gICAgLy8gVGhlIGxpbmUgYm94IGlz IHRoZW4gcG9zaXRpb25lZCB1c2luZyB0aGUgaGFsZiBsZWFkaW5nIGNlbnRlcmluZy4KLSAgICAv LyAgIF9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18gIGxpbmUKLSAg ICAvLyB8ICAgICAgICAgICAgICAgICAgICBeICAgICAgICAgICAgICAgICAgICAgICB8Ci0gICAg Ly8gfCAgICAgICAgICAgICAgICAgICAgfCBsaW5lIHNwYWNpbmcgICAgICAgICAgfAotICAgIC8v IHwgICAgICAgICAgICAgICAgICAgIHYgICAgICAgICAgICAgICAgICAgICAgIHwKLSAgICAvLyB8 IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS18LS0tLS0tLS0tICBM aW5lQm94Ci0gICAgLy8gfHwgICAgXiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgfCAgICAgICAgIHwKLSAgICAvLyB8fCAgICB8IGxpbmUgYm94IGhlaWdodCAgICAgICAgICAg ICAgICAgICAgICB8ICAgICAgICAgfAotICAgIC8vIHx8LS0tLXYtLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLXwtLS0tLS0tLSB8IGFsaWdubWVudCBiYXNlbGluZQotICAgIC8v IHwgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLXwtLS0tLS0tLS0K LSAgICAvLyB8ICAgICAgICAgICAgICAgICAgICBeICAgICAgICAgICAgICAgICAgICAgICB8ICAg XgotICAgIC8vIHwgICAgICAgICAgICAgICAgICAgIHwgbGluZSBzcGFjaW5nICAgICAgICAgIHwg ICB8Ci0gICAgLy8gfF9fX19fX19fX19fX19fX19fX19fdl9fX19fX19fX19fX19fX19fX19fX19f fCAgc2Nyb2xsYWJsZSBvdmVyZmxvdwotICAgIC8vCi0gICAgaWYgKGxpbmVDb250ZW50LnJ1bnMu aXNFbXB0eSgpIHx8IGxpbmVCb3guaXNMaW5lVmlzdWFsbHlFbXB0eSgpKQotICAgICAgICByZXR1 cm4geyB7IH0sIHsgbGluZUNvbnRlbnQubG9naWNhbFRvcExlZnQsIGxpbmVDb250ZW50LmxpbmVM b2dpY2FsV2lkdGgsIHsgfSB9IH07Ci0KLSAgICBhdXRvJiByb290U3R5bGUgPSByb290KCkuc3R5 bGUoKTsKLSAgICBhdXRvIGxpbmVCb3hMb2dpY2FsSGVpZ2h0ID0gbGluZUJveC5sb2dpY2FsSGVp Z2h0KCk7Ci0gICAgYXV0byBsaW5lTG9naWNhbEhlaWdodCA9IElubGluZUxheW91dFVuaXQgeyB9 OwotICAgIGlmIChyb290U3R5bGUubGluZUhlaWdodCgpLmlzTmVnYXRpdmUoKSkgewotICAgICAg ICAvLyBOZWdhdGl2ZSBsaW5lIGhlaWdodCB2YWx1ZSBtZWFucyB0aGUgbGluZSBoZWlnaHQgaXMg ZHJpdmVuIGJ5IHRoZSBjb250ZW50LgotICAgICAgICBhdXRvIHVzZWRMaW5lU3BhY2luZyA9IFsm XSB7Ci0gICAgICAgICAgICBhdXRvIGxvZ2ljYWxUb3BXaXRoTGluZVNwYWNpbmcgPSBJbmxpbmVM YXlvdXRVbml0IHsgfTsKLSAgICAgICAgICAgIGF1dG8gbG9naWNhbEJvdHRvbVdpdGhMaW5lU3Bh Y2luZyA9IGxpbmVCb3hMb2dpY2FsSGVpZ2h0OwotICAgICAgICAgICAgZm9yIChhdXRvJiBpbmxp bmVCb3ggOiBsaW5lQm94LmlubGluZUJveExpc3QoKSkgewotICAgICAgICAgICAgICAgIGlmIChh dXRvIGxpbmVTcGFjaW5nID0gaW5saW5lQm94LT5saW5lU3BhY2luZygpKSB7Ci0gICAgICAgICAg ICAgICAgICAgIC8vIEZJWE1FOiBjaGVjayBpZiBsaW5lIHNwYWNpbmcgaXMgZGlzdHJpYnV0ZWQg ZXZlbmx5LgotICAgICAgICAgICAgICAgICAgICBsb2dpY2FsVG9wV2l0aExpbmVTcGFjaW5nID0g c3RkOjptaW4obG9naWNhbFRvcFdpdGhMaW5lU3BhY2luZywgaW5saW5lQm94LT5sb2dpY2FsVG9w KCkgLSAqbGluZVNwYWNpbmcgLyAyKTsKLSAgICAgICAgICAgICAgICAgICAgbG9naWNhbEJvdHRv bVdpdGhMaW5lU3BhY2luZyA9IHN0ZDo6bWF4KGxvZ2ljYWxCb3R0b21XaXRoTGluZVNwYWNpbmcs IGlubGluZUJveC0+bG9naWNhbEJvdHRvbSgpICsgKmxpbmVTcGFjaW5nIC8gMik7Ci0gICAgICAg ICAgICAgICAgfQotICAgICAgICAgICAgfQotICAgICAgICAgICAgcmV0dXJuIC1sb2dpY2FsVG9w V2l0aExpbmVTcGFjaW5nICsgKGxvZ2ljYWxCb3R0b21XaXRoTGluZVNwYWNpbmcgLSBsaW5lQm94 TG9naWNhbEhlaWdodCk7Ci0gICAgICAgIH07Ci0gICAgICAgIGxpbmVMb2dpY2FsSGVpZ2h0ID0g bGluZUJveC5sb2dpY2FsSGVpZ2h0KCkgKyB1c2VkTGluZVNwYWNpbmcoKTsKLSAgICB9IGVsc2UK LSAgICAgICAgbGluZUxvZ2ljYWxIZWlnaHQgPSByb290U3R5bGUuY29tcHV0ZWRMaW5lSGVpZ2h0 KCk7Ci0KLSAgICBhdXRvIGxvZ2ljYWxSZWN0ID0gSW5saW5lUmVjdCB7IGxpbmVDb250ZW50Lmxv Z2ljYWxUb3BMZWZ0LCBsaW5lQ29udGVudC5saW5lTG9naWNhbFdpZHRoLCBsaW5lTG9naWNhbEhl aWdodH07Ci0gICAgLy8gSW5saW5lIHRyZWUgaGVpZ2h0IGlzIGFsbCBpbnRlZ2VyIGJhc2VkLgot ICAgIGF1dG8gbGluZUJveE9mZnNldCA9IGZsb29yZigobGluZUxvZ2ljYWxIZWlnaHQgLSBsaW5l Qm94TG9naWNhbEhlaWdodCkgLyAyKTsKLSAgICByZXR1cm4geyBsaW5lQm94T2Zmc2V0LCBsb2dp Y2FsUmVjdCB9OwotfQotCiBJbmxpbmVSZWN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21w dXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQm IGxpbmVDb250ZW50LCBjb25zdCBIb3Jpem9udGFsQ29uc3RyYWludHMmIGhvcml6b250YWxDb25z dHJhaW50cykKIHsKICAgICBhdXRvJiBmb3JtYXR0aW5nU3RhdGUgPSB0aGlzLT5mb3JtYXR0aW5n U3RhdGUoKTsKLSAgICBjb25zdCBhdXRvIGxpbmVCb3ggPSBnZW9tZXRyeSgpLmxpbmVCb3hGb3JM aW5lQ29udGVudChsaW5lQ29udGVudCk7Ci0gICAgYXV0byBsaW5lUmVjdEFuZExpbmVCb3hPZmZz ZXQgPSBjb21wdXRlZExpbmVMb2dpY2FsUmVjdChsaW5lQm94LCBsaW5lQ29udGVudCk7CisgICAg YXV0byBnZW9tZXRyeSA9IHRoaXMtPmdlb21ldHJ5KCk7CisgICAgY29uc3QgYXV0byBsaW5lQm94 ID0gZ2VvbWV0cnkubGluZUJveEZvckxpbmVDb250ZW50KGxpbmVDb250ZW50KTsKKyAgICBhdXRv IGxpbmVSZWN0QW5kTGluZUJveE9mZnNldCA9IGdlb21ldHJ5LmNvbXB1dGVkTGluZUxvZ2ljYWxS ZWN0KGxpbmVCb3gsIHJvb3QoKS5zdHlsZSgpLCBsaW5lQ29udGVudCk7CiAgICAgYXV0byBsaW5l TG9naWNhbFJlY3QgPSBsaW5lUmVjdEFuZExpbmVCb3hPZmZzZXQubG9naWNhbFJlY3Q7CiAgICAg YXV0byBsaW5lQm94VmVydGljYWxPZmZzZXQgPSBsaW5lUmVjdEFuZExpbmVCb3hPZmZzZXQubGlu ZUJveFZlcnRpY2FsT2Zmc2V0OwogICAgIGF1dG8gc2Nyb2xsYWJsZU92ZXJmbG93ID0gSW5saW5l UmVjdCB7IGxpbmVMb2dpY2FsUmVjdC50b3BMZWZ0KCksIHN0ZDo6bWF4KGxpbmVMb2dpY2FsUmVj dC53aWR0aCgpLCBsaW5lQm94LmxvZ2ljYWxXaWR0aCgpKSwgc3RkOjptYXgobGluZUxvZ2ljYWxS ZWN0LmhlaWdodCgpLCBsaW5lQm94VmVydGljYWxPZmZzZXQgKyBsaW5lQm94LmxvZ2ljYWxIZWln aHQoKSkgfTsKQEAgLTUxMiw3ICs0NjUsNyBAQCBJbmxpbmVSZWN0IElubGluZUZvcm1hdHRpbmdD b250ZXh0Ojpjb21wdXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudChjb25zdCBMaW5lQnVpbAogICAg ICAgICAgICAgYXV0byB0b3BMZWZ0ID0gaW5saW5lQm94LmxvZ2ljYWxSZWN0KCkudG9wTGVmdCgp OwogICAgICAgICAgICAgdG9wTGVmdC5tb3ZlKHsgfSwgbGluZUJveFZlcnRpY2FsT2Zmc2V0KTsK ICAgICAgICAgICAgIGlmIChsYXlvdXRCb3guaXNJbkZsb3dQb3NpdGlvbmVkKCkpCi0gICAgICAg ICAgICAgICAgdG9wTGVmdCArPSBnZW9tZXRyeSgpLmluRmxvd1Bvc2l0aW9uZWRQb3NpdGlvbk9m ZnNldChsYXlvdXRCb3gsIGhvcml6b250YWxDb25zdHJhaW50cyk7CisgICAgICAgICAgICAgICAg dG9wTGVmdCArPSBnZW9tZXRyeS5pbkZsb3dQb3NpdGlvbmVkUG9zaXRpb25PZmZzZXQobGF5b3V0 Qm94LCBob3Jpem9udGFsQ29uc3RyYWludHMpOwogICAgICAgICAgICAgYm94R2VvbWV0cnkuc2V0 TG9naWNhbFRvcExlZnQodG9MYXlvdXRQb2ludCh0b3BMZWZ0KSk7CiAgICAgICAgICAgICBpZiAo bGluZVJ1bi5pc0NvbnRhaW5lclN0YXJ0KCkpIHsKICAgICAgICAgICAgICAgICBhdXRvIG1hcmdp bkJveFdpZHRoID0gaW5saW5lQm94LmxvZ2ljYWxXaWR0aCgpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQu aCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRp bmdDb250ZXh0LmgKaW5kZXggNzBhYjJkZTk5MzYxOTc3MTNkNzk4ODA1ZjYyZGE4MWNiMWY5MDM1 OS4uYTI0MGIzOTBhZDE0ZTUxNjc3M2VmYmNjNDkwOWE1MGM1MzIzMzBiMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVGb3JtYXR0aW5nQ29udGV4dC5oCkBAIC02NSw2ICs2NSwxMiBAQCBwcml2YXRlOgogICAgIGNs YXNzIEdlb21ldHJ5IDogcHVibGljIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeSB7CiAgICAg cHVibGljOgogICAgICAgICBMaW5lQm94IGxpbmVCb3hGb3JMaW5lQ29udGVudChjb25zdCBMaW5l QnVpbGRlcjo6TGluZUNvbnRlbnQmKTsKKyAgICAgICAgc3RydWN0IExpbmVSZWN0QW5kTGluZUJv eE9mZnNldCB7CisgICAgICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGxpbmVCb3hWZXJ0aWNhbE9m ZnNldDsKKyAgICAgICAgICAgIElubGluZVJlY3QgbG9naWNhbFJlY3Q7CisgICAgICAgIH07Cisg ICAgICAgIExpbmVSZWN0QW5kTGluZUJveE9mZnNldCBjb21wdXRlZExpbmVMb2dpY2FsUmVjdChj b25zdCBMaW5lQm94JiwgY29uc3QgUmVuZGVyU3R5bGUmIHJvb3RTdHlsZSwgY29uc3QgTGluZUJ1 aWxkZXI6OkxpbmVDb250ZW50JikgY29uc3Q7CisKICAgICAgICAgQ29udGVudEhlaWdodEFuZE1h cmdpbiBpbmxpbmVCbG9ja0hlaWdodEFuZE1hcmdpbihjb25zdCBCb3gmLCBjb25zdCBIb3Jpem9u dGFsQ29uc3RyYWludHMmLCBjb25zdCBPdmVycmlkZVZlcnRpY2FsVmFsdWVzJikgY29uc3Q7CiAg ICAgICAgIENvbnRlbnRXaWR0aEFuZE1hcmdpbiBpbmxpbmVCbG9ja1dpZHRoQW5kTWFyZ2luKGNv bnN0IEJveCYsIGNvbnN0IEhvcml6b250YWxDb25zdHJhaW50cyYsIGNvbnN0IE92ZXJyaWRlSG9y aXpvbnRhbFZhbHVlcyYpOwogCkBAIC04OCwxMSArOTQsNiBAQCBwcml2YXRlOgogCiAgICAgdm9p ZCBjb2xsZWN0SW5saW5lQ29udGVudElmTmVlZGVkKCk7CiAgICAgSW5saW5lUmVjdCBjb21wdXRl R2VvbWV0cnlGb3JMaW5lQ29udGVudChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQmLCBj b25zdCBIb3Jpem9udGFsQ29uc3RyYWludHMmKTsKLSAgICBzdHJ1Y3QgTGluZVJlY3RBbmRMaW5l Qm94T2Zmc2V0IHsKLSAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBsaW5lQm94VmVydGljYWxPZmZz ZXQ7Ci0gICAgICAgIElubGluZVJlY3QgbG9naWNhbFJlY3Q7Ci0gICAgfTsKLSAgICBMaW5lUmVj dEFuZExpbmVCb3hPZmZzZXQgY29tcHV0ZWRMaW5lTG9naWNhbFJlY3QoY29uc3QgTGluZUJveCYs IGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYpIGNvbnN0OwogICAgIHZvaWQgaW52YWxp ZGF0ZUZvcm1hdHRpbmdTdGF0ZShjb25zdCBJbnZhbGlkYXRpb25TdGF0ZSYpOwogCiAgICAgY29u c3QgSW5saW5lRm9ybWF0dGluZ1N0YXRlJiBmb3JtYXR0aW5nU3RhdGUoKSBjb25zdCB7IHJldHVy biBkb3duY2FzdDxJbmxpbmVGb3JtYXR0aW5nU3RhdGU+KEZvcm1hdHRpbmdDb250ZXh0Ojpmb3Jt YXR0aW5nU3RhdGUoKSk7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRH ZW9tZXRyeS5jcHAKaW5kZXggYTk4ZjYwNjdhNDc2MTk3N2JlMGRlNzI0ODg5ZmY5OGJiZGMzMTNj YS4uMzE3ZDlmMzc2YTNkMGZmZWIyYzk2MGIwMGYwY2Q3OTA3OTMyMzM4OCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0Nv bnRleHRHZW9tZXRyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKQEAgLTQwNyw2ICs0MDcs NTMgQEAgTGluZUJveCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmxpbmVCb3hG b3JMaW5lQ29udGVudChjb25zdCBMaW5lQnVpbGQKICAgICByZXR1cm4gTGluZUJveEJ1aWxkZXIo Zm9ybWF0dGluZ0NvbnRleHQoKSkuYnVpbGQobGluZUNvbnRlbnQpOwogfQogCitJbmxpbmVGb3Jt YXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OkxpbmVSZWN0QW5kTGluZUJveE9mZnNldCBJbmxpbmVG b3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNvbXB1dGVkTGluZUxvZ2ljYWxSZWN0KGNvbnN0 IExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IFJlbmRlclN0eWxlJiByb290U3R5bGUsIGNvbnN0IExp bmVCdWlsZGVyOjpMaW5lQ29udGVudCYgbGluZUNvbnRlbnQpIGNvbnN0Cit7CisgICAgLy8gQ29t cHV0ZSB0aGUgbGluZSBoZWlnaHQgYW5kIHRoZSBsaW5lIGJveCB2ZXJ0aWNhbCBvZmZzZXQuCisg ICAgLy8gVGhlIGxpbmUgaGVpZ2h0IGlzIGVpdGhlciB0aGUgbGluZS1oZWlnaHQgdmFsdWUgKG5l Z2F0aXZlIHZhbHVlIG1lYW5zIGxpbmUgaGVpZ2h0IGlzIG5vdCBzZXQpIG9yIHRoZSBmb250IG1l dHJpY3MncyBsaW5lIHNwYWNpbmcvbGluZSBib3ggaGVpZ2h0LgorICAgIC8vIFRoZSBsaW5lIGJv eCBpcyB0aGVuIHBvc2l0aW9uZWQgdXNpbmcgdGhlIGhhbGYgbGVhZGluZyBjZW50ZXJpbmcuCisg ICAgLy8gICBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fICBsaW5l CisgICAgLy8gfCAgICAgICAgICAgICAgICAgICAgXiAgICAgICAgICAgICAgICAgICAgICAgfAor ICAgIC8vIHwgICAgICAgICAgICAgICAgICAgIHwgbGluZSBzcGFjaW5nICAgICAgICAgIHwKKyAg ICAvLyB8ICAgICAgICAgICAgICAgICAgICB2ICAgICAgICAgICAgICAgICAgICAgICB8CisgICAg Ly8gfCAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tfC0tLS0tLS0t LSAgTGluZUJveAorICAgIC8vIHx8ICAgIF4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHwgICAgICAgICB8CisgICAgLy8gfHwgICAgfCBsaW5lIGJveCBoZWlnaHQgICAgICAg ICAgICAgICAgICAgICAgfCAgICAgICAgIHwKKyAgICAvLyB8fC0tLS12LS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS18LS0tLS0tLS0gfCBhbGlnbm1lbnQgYmFzZWxpbmUKKyAg ICAvLyB8IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS18LS0tLS0t LS0tCisgICAgLy8gfCAgICAgICAgICAgICAgICAgICAgXiAgICAgICAgICAgICAgICAgICAgICAg fCAgIF4KKyAgICAvLyB8ICAgICAgICAgICAgICAgICAgICB8IGxpbmUgc3BhY2luZyAgICAgICAg ICB8ICAgfAorICAgIC8vIHxfX19fX19fX19fX19fX19fX19fX3ZfX19fX19fX19fX19fX19fX19f X19fX3wgIHNjcm9sbGFibGUgb3ZlcmZsb3cKKyAgICAvLworICAgIGlmIChsaW5lQ29udGVudC5y dW5zLmlzRW1wdHkoKSB8fCBsaW5lQm94LmlzTGluZVZpc3VhbGx5RW1wdHkoKSkKKyAgICAgICAg cmV0dXJuIHsgeyB9LCB7IGxpbmVDb250ZW50LmxvZ2ljYWxUb3BMZWZ0LCBsaW5lQ29udGVudC5s aW5lTG9naWNhbFdpZHRoLCB7IH0gfSB9OworCisgICAgYXV0byBsaW5lQm94TG9naWNhbEhlaWdo dCA9IGxpbmVCb3gubG9naWNhbEhlaWdodCgpOworICAgIGF1dG8gbGluZUxvZ2ljYWxIZWlnaHQg PSBJbmxpbmVMYXlvdXRVbml0IHsgfTsKKyAgICBpZiAocm9vdFN0eWxlLmxpbmVIZWlnaHQoKS5p c05lZ2F0aXZlKCkpIHsKKyAgICAgICAgLy8gTmVnYXRpdmUgbGluZSBoZWlnaHQgdmFsdWUgbWVh bnMgdGhlIGxpbmUgaGVpZ2h0IGlzIGRyaXZlbiBieSB0aGUgY29udGVudC4KKyAgICAgICAgYXV0 byB1c2VkTGluZVNwYWNpbmcgPSBbJl0geworICAgICAgICAgICAgYXV0byBsb2dpY2FsVG9wV2l0 aExpbmVTcGFjaW5nID0gSW5saW5lTGF5b3V0VW5pdCB7IH07CisgICAgICAgICAgICBhdXRvIGxv Z2ljYWxCb3R0b21XaXRoTGluZVNwYWNpbmcgPSBsaW5lQm94TG9naWNhbEhlaWdodDsKKyAgICAg ICAgICAgIGZvciAoYXV0byYgaW5saW5lQm94IDogbGluZUJveC5pbmxpbmVCb3hMaXN0KCkpIHsK KyAgICAgICAgICAgICAgICBpZiAoYXV0byBsaW5lU3BhY2luZyA9IGlubGluZUJveC0+bGluZVNw YWNpbmcoKSkgeworICAgICAgICAgICAgICAgICAgICAvLyBGSVhNRTogY2hlY2sgaWYgbGluZSBz cGFjaW5nIGlzIGRpc3RyaWJ1dGVkIGV2ZW5seS4KKyAgICAgICAgICAgICAgICAgICAgbG9naWNh bFRvcFdpdGhMaW5lU3BhY2luZyA9IHN0ZDo6bWluKGxvZ2ljYWxUb3BXaXRoTGluZVNwYWNpbmcs IGlubGluZUJveC0+bG9naWNhbFRvcCgpIC0gKmxpbmVTcGFjaW5nIC8gMik7CisgICAgICAgICAg ICAgICAgICAgIGxvZ2ljYWxCb3R0b21XaXRoTGluZVNwYWNpbmcgPSBzdGQ6Om1heChsb2dpY2Fs Qm90dG9tV2l0aExpbmVTcGFjaW5nLCBpbmxpbmVCb3gtPmxvZ2ljYWxCb3R0b20oKSArICpsaW5l U3BhY2luZyAvIDIpOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKyAgICAgICAg ICAgIHJldHVybiAtbG9naWNhbFRvcFdpdGhMaW5lU3BhY2luZyArIChsb2dpY2FsQm90dG9tV2l0 aExpbmVTcGFjaW5nIC0gbGluZUJveExvZ2ljYWxIZWlnaHQpOworICAgICAgICB9OworICAgICAg ICBsaW5lTG9naWNhbEhlaWdodCA9IGxpbmVCb3gubG9naWNhbEhlaWdodCgpICsgdXNlZExpbmVT cGFjaW5nKCk7CisgICAgfSBlbHNlCisgICAgICAgIGxpbmVMb2dpY2FsSGVpZ2h0ID0gcm9vdFN0 eWxlLmNvbXB1dGVkTGluZUhlaWdodCgpOworCisgICAgYXV0byBsb2dpY2FsUmVjdCA9IElubGlu ZVJlY3QgeyBsaW5lQ29udGVudC5sb2dpY2FsVG9wTGVmdCwgbGluZUNvbnRlbnQubGluZUxvZ2lj YWxXaWR0aCwgbGluZUxvZ2ljYWxIZWlnaHR9OworICAgIC8vIElubGluZSB0cmVlIGhlaWdodCBp cyBhbGwgaW50ZWdlciBiYXNlZC4KKyAgICBhdXRvIGxpbmVCb3hPZmZzZXQgPSBmbG9vcmYoKGxp bmVMb2dpY2FsSGVpZ2h0IC0gbGluZUJveExvZ2ljYWxIZWlnaHQpIC8gMik7CisgICAgcmV0dXJu IHsgbGluZUJveE9mZnNldCwgbG9naWNhbFJlY3QgfTsKK30KKwogQ29udGVudFdpZHRoQW5kTWFy Z2luIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5saW5lQmxvY2tXaWR0aEFu ZE1hcmdpbihjb25zdCBCb3gmIGZvcm1hdHRpbmdDb250ZXh0Um9vdCwgY29uc3QgSG9yaXpvbnRh bENvbnN0cmFpbnRzJiBob3Jpem9udGFsQ29uc3RyYWludHMsIGNvbnN0IE92ZXJyaWRlSG9yaXpv bnRhbFZhbHVlcyYgb3ZlcnJpZGVIb3Jpem9udGFsVmFsdWVzKQogewogICAgIEFTU0VSVChmb3Jt YXR0aW5nQ29udGV4dFJvb3QuaXNJbkZsb3coKSk7Cg==