216723 2020-09-18 19:27:48 -0700 [LFC][IFC] InlineFormattingContext::computeGeometryForLineContent should not construct Display::Lines 2020-09-19 09:47:17 -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 1690024 0 zalan 2020-09-18 19:27:48 -0700 It belongs in display builder. 1690026 1 409189 zalan 2020-09-18 19:38:46 -0700 Created attachment 409189 Patch 1690084 2 ews-feeder 2020-09-19 09:47:01 -0700 Committed r267315: <https://trac.webkit.org/changeset/267315> All reviewed patches have been landed. Closing bug and clearing flags on attachment 409189. 1690085 3 webkit-bug-importer 2020-09-19 09:47:17 -0700 <rdar://problem/69216860> 409189 2020-09-18 19:38:46 -0700 2020-09-19 09:47:01 -0700 Patch bug-216723-20200918193845.patch text/plain 9737 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3MzA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmRhNDdlOTZlZTBmYmUx ZjUzNGIxZjA2YzI0ODVjN2ZjNDM4MjFiOS4uNzRiMmM5ZTAyMDZkMzlhY2NmZjVhMmNmMmM4ZThh NTU1NmYyODEwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTA5LTE4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBJbmxpbmVG b3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUdlb21ldHJ5Rm9yTGluZUNvbnRlbnQgc2hvdWxkIG5v dCBjb25zdHJ1Y3QgRGlzcGxheTo6TGluZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIxNjcyMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIERpc3BsYXk6OkxpbmVzIGNvbnN0cnVjdGlvbiBzaG91bGQgbGl2 ZSBpbiB0aGUgZGlzcGxheSBidWlsZGVyLiBIb3dldmVyIGN1cnJlbnRseSB3ZSBkb24ndCB5ZXQg aGF2ZSBhIHJlYWwgYnVpbGRlciwgc28gbGV0J3MKKyAgICAgICAganVzdCB1c2UgdGhlIGludGVn cmF0aW9uIGxheWVyLgorICAgICAgICBUaGlzIGlzIGFsc28gaW4gcHJlcGFyYXRpb24gZm9yIHJl bW92aW5nIGFsbCB0aGUgRGlzcGxheTo6SW5saW5lQ29udGVudCBjb2RlIGZyb20gdGhlIExheW91 dCBuYW1lc3BhY2UuCisKKyAgICAgICAgKiBsYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheVBhaW50 ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6cGFpbnRJbmxpbmVDb250ZW50KToK KyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4 dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0 Ojpjb21wdXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudCk6CisgICAgICAgICogbGF5b3V0L2ludGVn cmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUxheW91dDo6bGF5b3V0KToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dEludGVncmF0aW9uOjpMaW5lTGF5b3V0Ojpjb25zdHJ1Y3REaXNwbGF5Q29udGVu dCk6CisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxh eW91dC5oOgorCiAyMDIwLTA5LTE4ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW0xGQ11bSUZDXSBEbyBub3QgdXNlIERpc3BsYXk6OkxpbmUgZ2VvbWV0cnkgaW4g bGF5b3V0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlz cGxheVBhaW50ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3Bs YXlQYWludGVyLmNwcAppbmRleCA3M2YyZTBhMjA5YmQxMGM5Y2Q3MmYyN2Y3NGE4YWUyMWFlNjM1 YmQ3Li5jODNhZWM2MTc2MGI4MGZhNjIzNDRkMDdhZmU1M2E2NDAyNTA2ZDU1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheVBhaW50ZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5UGFpbnRlci5jcHAK QEAgLTEyOSwxMCArMTI5LDEwIEBAIHN0YXRpYyB2b2lkIHBhaW50SW5saW5lQ29udGVudChHcmFw aGljc0NvbnRleHQmIGNvbnRleHQsIExheW91dFBvaW50IGFic29sdXRlT2ZmCiAKICAgICAgICAg ICAgIGF1dG8gYWJzb2x1dGVMZWZ0ID0gYWJzb2x1dGVPZmZzZXQueCgpICsgcnVuLmxlZnQoKTsK ICAgICAgICAgICAgIC8vIEZJWE1FOiBBZGQgbm9uLWJhc2VsaW5lIGFsaWduIHBhaW50aW5nCi0g ICAgICAgICAgICBhdXRvJiBsaW5lID0gZGlzcGxheUlubGluZUNvbnRlbnQtPmxpbmVGb3JSdW4o cnVuKTsKICAgICAgICAgICAgIGF1dG8gYmFzZWxpbmUgPSBhYnNvbHV0ZU9mZnNldC55KCkgKyBy dW4udG9wKCkgKyBzdHlsZS5mb250TWV0cmljcygpLmFzY2VudCgpOwogICAgICAgICAgICAgYXV0 byBleHBhbnNpb24gPSBydW4uZXhwYW5zaW9uKCk7Ci0gICAgICAgICAgICBhdXRvIHRleHRSdW4g PSBUZXh0UnVuIHsgdGV4dENvbnRlbnQtPmNvbnRlbnQoKSwgcnVuLmxlZnQoKSAtIGxpbmUucmVj dCgpLngoKSwgZXhwYW5zaW9uLmhvcml6b250YWxFeHBhbnNpb24sIGV4cGFuc2lvbi5iZWhhdmlv ciB9OworICAgICAgICAgICAgLy8gRklYTUU6IFRoZSBmaW5hbCBwYWludGVyIHNob3VsZCBoYXZl IGFjY2VzcyB0byB0aGUgY3VycmVudCBsaW5lIHRvIG9mZnNldCB0aGUgcnVucy4KKyAgICAgICAg ICAgIGF1dG8gdGV4dFJ1biA9IFRleHRSdW4geyB0ZXh0Q29udGVudC0+Y29udGVudCgpLCBydW4u bGVmdCgpLCBleHBhbnNpb24uaG9yaXpvbnRhbEV4cGFuc2lvbiwgZXhwYW5zaW9uLmJlaGF2aW9y IH07CiAgICAgICAgICAgICB0ZXh0UnVuLnNldFRhYlNpemUoIXN0eWxlLmNvbGxhcHNlV2hpdGVT cGFjZSgpLCBzdHlsZS50YWJTaXplKCkpOwogICAgICAgICAgICAgY29udGV4dC5kcmF3VGV4dChz dHlsZS5mb250Q2FzY2FkZSgpLCB0ZXh0UnVuLCB7IGFic29sdXRlTGVmdCwgYmFzZWxpbmUgfSk7 CiAgICAgICAgIH0gZWxzZSBpZiAoYXV0byogY2FjaGVkSW1hZ2UgPSBydW4uaW1hZ2UoKSkgewpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDNiN2E0M2RiM2ZjNzQyODI1 OTNhNTU1YTMwNWU5MmJiN2RjNmEyMTguLjg4NmQ3ZTcxZTRiNjE1MDYyOWIxODUyMGYyN2U3ZjNk ZTM3YWZlZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTM5OSw2 ICszOTksNyBAQCBJbmxpbmVSZWN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlR2Vv bWV0cnlGb3JMaW5lQ29udGVudChjb25zdCBMaW5lQnVpbAogICAgIGF1dG8gbGluZVJlY3RBbmRM aW5lQm94T2Zmc2V0ID0gZ2VvbWV0cnkuY29tcHV0ZWRMaW5lTG9naWNhbFJlY3QobGluZUJveCwg cm9vdCgpLnN0eWxlKCksIGxpbmVDb250ZW50KTsKICAgICBhdXRvIGxpbmVMb2dpY2FsUmVjdCA9 IGxpbmVSZWN0QW5kTGluZUJveE9mZnNldC5sb2dpY2FsUmVjdDsKICAgICBhdXRvIGxpbmVCb3hW ZXJ0aWNhbE9mZnNldCA9IGxpbmVSZWN0QW5kTGluZUJveE9mZnNldC5saW5lQm94VmVydGljYWxP ZmZzZXQ7CisgICAgYXV0byBsaW5lSW5kZXggPSBmb3JtYXR0aW5nU3RhdGUubGluZXMoKS5zaXpl KCk7CiAKICAgICBhdXRvIGNvbnN0cnVjdExpbmVHZW9tZXRyeSA9IFsmXSB7CiAgICAgICAgIGF1 dG8gbGluZUJveExvZ2ljYWxSZWN0ID0gSW5saW5lUmVjdCB7IGxpbmVMb2dpY2FsUmVjdC50b3Ao KSArIGxpbmVCb3hWZXJ0aWNhbE9mZnNldCwgbGluZUxvZ2ljYWxSZWN0LmxlZnQoKSArIGxpbmVC b3guaG9yaXpvbnRhbEFsaWdubWVudE9mZnNldCgpLnZhbHVlT3IoSW5saW5lTGF5b3V0VW5pdCB7 IH0pLCBsaW5lQm94LmxvZ2ljYWxXaWR0aCgpLCBsaW5lQm94LmxvZ2ljYWxIZWlnaHQoKSB9OwpA QCAtNDA2LDcgKzQwNyw2IEBAIElubGluZVJlY3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNv bXB1dGVHZW9tZXRyeUZvckxpbmVDb250ZW50KGNvbnN0IExpbmVCdWlsCiAgICAgfTsKICAgICBj b25zdHJ1Y3RMaW5lR2VvbWV0cnkoKTsKIAotICAgIGF1dG8gc2Nyb2xsYWJsZU92ZXJmbG93ID0g SW5saW5lUmVjdCB7IGxpbmVMb2dpY2FsUmVjdC50b3BMZWZ0KCksIHN0ZDo6bWF4KGxpbmVMb2dp Y2FsUmVjdC53aWR0aCgpLCBsaW5lQm94LmxvZ2ljYWxXaWR0aCgpKSwgc3RkOjptYXgobGluZUxv Z2ljYWxSZWN0LmhlaWdodCgpLCBsaW5lQm94VmVydGljYWxPZmZzZXQgKyBsaW5lQm94LmxvZ2lj YWxIZWlnaHQoKSkgfTsKICAgICBpZiAoIWxpbmVDb250ZW50LmZsb2F0cy5pc0VtcHR5KCkpIHsK ICAgICAgICAgYXV0byBmbG9hdGluZ0NvbnRleHQgPSBGbG9hdGluZ0NvbnRleHQgeyByb290KCks ICp0aGlzLCBmb3JtYXR0aW5nU3RhdGUuZmxvYXRpbmdTdGF0ZSgpIH07CiAgICAgICAgIC8vIE1v dmUgZmxvYXRzIHRvIHRoZWlyIGZpbmFsIHBvc2l0aW9uLgpAQCAtNDI5LDggKzQyOSw2IEBAIElu bGluZVJlY3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVHZW9tZXRyeUZvckxpbmVD b250ZW50KGNvbnN0IExpbmVCdWlsCiAgICAgfSBlbHNlCiAgICAgICAgIGluaXRpYWxDb250YWlu Z0Jsb2NrU2l6ZSA9IGdlb21ldHJ5Rm9yQm94KHJvb3QoKS5pbml0aWFsQ29udGFpbmluZ0Jsb2Nr KCksIEVzY2FwZVJlYXNvbjo6U3Ryb2tlT3ZlcmZsb3dOZWVkc1ZpZXdwb3J0R2VvbWV0cnkpLmNv bnRlbnRCb3goKS5zaXplKCk7CiAgICAgYXV0byYgaW5saW5lQ29udGVudCA9IGZvcm1hdHRpbmdT dGF0ZS5lbnN1cmVEaXNwbGF5SW5saW5lQ29udGVudCgpOwotICAgIGF1dG8gbGluZUluZGV4ID0g aW5saW5lQ29udGVudC5saW5lcy5zaXplKCk7Ci0gICAgYXV0byBsaW5lSW5rT3ZlcmZsb3cgPSBz Y3JvbGxhYmxlT3ZlcmZsb3c7CiAgICAgLy8gQ29tcHV0ZSBmaW5hbCBib3ggZ2VvbWV0cnkuCiAg ICAgZm9yIChhdXRvJiBsaW5lUnVuIDogbGluZUNvbnRlbnQucnVucykgewogICAgICAgICBhdXRv JiBsYXlvdXRCb3ggPSBsaW5lUnVuLmxheW91dEJveCgpOwpAQCAtNDU3LDkgKzQ1NSw3IEBAIElu bGluZVJlY3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVHZW9tZXRyeUZvckxpbmVD b250ZW50KGNvbnN0IExpbmVCdWlsCiAgICAgICAgICAgICAvLyBJbmxpbmUgYm94ZXMgYXJlIHJl bGF0aXZlIHRvIHRoZSBsaW5lIGJveCB3aGlsZSBmaW5hbCBEaXNwbGF5OjpSdW5zIG5lZWQgdG8g YmUgcmVsYXRpdmUgdG8gdGhlIHBhcmVudCBEaXNwbGF5OkJveAogICAgICAgICAgICAgLy8gRklY TUU6IFNob3VsZG4ndCB3ZSBqdXN0IGxlYXZlIHRoZW0gYmUgcmVsYXRpdmUgdG8gdGhlIGxpbmUg Ym94PwogICAgICAgICAgICAgbG9naWNhbFJlY3QubW92ZUJ5KHsgbGluZUxvZ2ljYWxSZWN0Lmxl ZnQoKSwgbGluZUxvZ2ljYWxSZWN0LnRvcCgpICsgbGluZUJveFZlcnRpY2FsT2Zmc2V0IH0pOwot ICAgICAgICAgICAgYXV0byBpbmtPdmVyZmxvdyA9IGNvbXB1dGVkSW5rT3ZlcmZsb3cobG9naWNh bFJlY3QpOwotICAgICAgICAgICAgbGluZUlua092ZXJmbG93LmV4cGFuZFRvQ29udGFpbihpbmtP dmVyZmxvdyk7Ci0gICAgICAgICAgICBpbmxpbmVDb250ZW50LnJ1bnMuYXBwZW5kKHsgbGluZUlu ZGV4LCBsYXlvdXRCb3gsIGxvZ2ljYWxSZWN0LCBpbmtPdmVyZmxvdywgbGluZVJ1bi5leHBhbnNp b24oKSwgbGluZVJ1bi50ZXh0Q29udGVudCgpIH0pOworICAgICAgICAgICAgaW5saW5lQ29udGVu dC5ydW5zLmFwcGVuZCh7IGxpbmVJbmRleCwgbGF5b3V0Qm94LCBsb2dpY2FsUmVjdCwgY29tcHV0 ZWRJbmtPdmVyZmxvdyhsb2dpY2FsUmVjdCksIGxpbmVSdW4uZXhwYW5zaW9uKCksIGxpbmVSdW4u dGV4dENvbnRlbnQoKSB9KTsKICAgICAgICAgfQogCiAgICAgICAgIC8vIENyZWF0ZSBkaXNwbGF5 IGJveGVzLgpAQCAtNDgyLDE1ICs0NzgsNiBAQCBJbmxpbmVSZWN0IElubGluZUZvcm1hdHRpbmdD b250ZXh0Ojpjb21wdXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudChjb25zdCBMaW5lQnVpbAogICAg ICAgICAgICAgfQogICAgICAgICB9CiAgICAgfQotICAgIGF1dG8gY29uc3RydWN0RGlzcGxheUxp bmUgPSBbJl0gewotICAgICAgICAvLyBGSVhNRTogVGhpcyBpcyB3aGVyZSB0aGUgbG9naWNhbCB0 byBwaHlzaWNhbCB0cmFuc2xhdGUgc2hvdWxkIGhhcHBlbi4KLSAgICAgICAgaWYgKGF1dG8gaG9y aXpvbnRhbEFsaWdubWVudE9mZnNldCA9IGxpbmVCb3guaG9yaXpvbnRhbEFsaWdubWVudE9mZnNl dCgpKSB7Ci0gICAgICAgICAgICAvLyBQYWludGluZyBjb2RlIChzcGVjaWZpY2FsbHkgVGV4dFJ1 bidzIHhQb3MpIG5lZWRzIHRoZSBhbGlnbmVkIG9mZnNldCB0byBiZSBhYmxlIHRvIGNvbXB1dGUg dGFiIHBvc2l0aW9ucy4KLSAgICAgICAgICAgIGxpbmVMb2dpY2FsUmVjdC5tb3ZlSG9yaXpvbnRh bGx5KCpob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0KTsKLSAgICAgICAgfQotICAgICAgICBpbmxp bmVDb250ZW50LmxpbmVzLmFwcGVuZCh7IGxpbmVMb2dpY2FsUmVjdCwgc2Nyb2xsYWJsZU92ZXJm bG93LCBsaW5lSW5rT3ZlcmZsb3csIGxpbmVCb3hWZXJ0aWNhbE9mZnNldCArIGxpbmVCb3guYWxp Z25tZW50QmFzZWxpbmUoKSB9KTsKLSAgICB9OwotICAgIGNvbnN0cnVjdERpc3BsYXlMaW5lKCk7 CiAgICAgcmV0dXJuIGxpbmVMb2dpY2FsUmVjdDsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5l TGF5b3V0LmNwcAppbmRleCBlZmM1NTUzMDY4ZDkyZjExZTY2ZTgyYWNiZjJkYmQ3ZmMzYWJlNGI1 Li5iYjE4YjUyNDJmYjJjM2Q4NGQwOWE4Mzg4ODYxNDQ2ZDMzZjY4N2YxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5 b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50 ZWdyYXRpb25MaW5lTGF5b3V0LmNwcApAQCAtMTE3LDYgKzExNywzNiBAQCB2b2lkIExpbmVMYXlv dXQ6OmxheW91dCgpCiAgICAgYXV0byB2ZXJ0aWNhbENvbnN0cmFpbnRzID0gTGF5b3V0OjpWZXJ0 aWNhbENvbnN0cmFpbnRzIHsgbV9mbG93LmJvcmRlckFuZFBhZGRpbmdCZWZvcmUoKSwgeyB9IH07 CiAKICAgICBpbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5sYXlvdXRJbkZsb3dDb250ZW50KGludmFs aWRhdGlvblN0YXRlLCB7IGhvcml6b250YWxDb25zdHJhaW50cywgdmVydGljYWxDb25zdHJhaW50 cyB9KTsKKyAgICBjb25zdHJ1Y3REaXNwbGF5Q29udGVudCgpOworfQorCit2b2lkIExpbmVMYXlv dXQ6OmNvbnN0cnVjdERpc3BsYXlDb250ZW50KCkKK3sKKyAgICAvLyBGSVhNRTogTW92ZSBEaXNw bGF5OjpSdW4gY29uc3RydWN0aW9uIG92ZXIgaGVyZS4KKyAgICBhdXRvIGNvbnN0cnVjdERpc3Bs YXlMaW5lID0gWyZdIHsKKyAgICAgICAgYXV0byYgZGlzcGxheUlubGluZUNvbnRlbnQgPSBtX2lu bGluZUZvcm1hdHRpbmdTdGF0ZS5lbnN1cmVEaXNwbGF5SW5saW5lQ29udGVudCgpOworICAgICAg ICBhdXRvJiBsaW5lcyA9IG1faW5saW5lRm9ybWF0dGluZ1N0YXRlLmxpbmVzKCk7CisgICAgICAg IGF1dG8mIHJ1bnMgPSBkaXNwbGF5SW5saW5lQ29udGVudC5ydW5zOworICAgICAgICBzaXplX3Qg cnVuSW5kZXggPSAwOworICAgICAgICBmb3IgKHNpemVfdCBsaW5lSW5kZXggPSAwOyBsaW5lSW5k ZXggPCBsaW5lcy5zaXplKCk7ICsrbGluZUluZGV4KSB7CisgICAgICAgICAgICBhdXRvJiBsaW5l ID0gbGluZXNbbGluZUluZGV4XTsKKyAgICAgICAgICAgIGF1dG8mIGxpbmVCb3hMb2dpY2FsUmVj dCA9IGxpbmUubGluZUJveExvZ2ljYWxSZWN0KCk7CisgICAgICAgICAgICAvLyBGSVhNRTogVGhp cyBpcyB3aGVyZSB0aGUgbG9naWNhbCB0byBwaHlzaWNhbCB0cmFuc2xhdGUgc2hvdWxkIGhhcHBl bi4KKyAgICAgICAgICAgIGF1dG8gb3ZlcmZsb3dXaWR0aCA9IHN0ZDo6bWF4KGxpbmUubG9naWNh bFdpZHRoKCksIGxpbmVCb3hMb2dpY2FsUmVjdC53aWR0aCgpKTsKKyAgICAgICAgICAgIGF1dG8g bGluZUJveExvZ2ljYWxCb3R0b20gPSAobGluZUJveExvZ2ljYWxSZWN0LnRvcCgpIC0gbGluZS5s b2dpY2FsVG9wKCkpICsgbGluZUJveExvZ2ljYWxSZWN0LmhlaWdodCgpOworICAgICAgICAgICAg YXV0byBvdmVyZmxvd0hlaWdodCA9IHN0ZDo6bWF4KGxpbmUubG9naWNhbEhlaWdodCgpLCBsaW5l Qm94TG9naWNhbEJvdHRvbSk7CisgICAgICAgICAgICBhdXRvIHNjcm9sbGFibGVPdmVyZmxvd1Jl Y3QgPSBGbG9hdFJlY3QgeyBsaW5lLmxvZ2ljYWxMZWZ0KCksIGxpbmUubG9naWNhbFRvcCgpLCBv dmVyZmxvd1dpZHRoLCBvdmVyZmxvd0hlaWdodCB9OworCisgICAgICAgICAgICBhdXRvIGxpbmVJ bmtPdmVyZmxvd1JlY3QgPSBzY3JvbGxhYmxlT3ZlcmZsb3dSZWN0OworICAgICAgICAgICAgd2hp bGUgKHJ1bkluZGV4IDwgcnVucy5zaXplKCkgJiYgcnVuc1tydW5JbmRleF0ubGluZUluZGV4KCkg PT0gbGluZUluZGV4KQorICAgICAgICAgICAgICAgIGxpbmVJbmtPdmVyZmxvd1JlY3QudW5pdGUo cnVuc1tydW5JbmRleCsrXS5pbmtPdmVyZmxvdygpKTsKKyAgICAgICAgICAgIGF1dG8gbGluZVJl Y3QgPSBGbG9hdFJlY3QgeyBsaW5lLmxvZ2ljYWxSZWN0KCkgfTsKKyAgICAgICAgICAgIC8vIFBh aW50aW5nIGNvZGUgKHNwZWNpZmljYWxseSBUZXh0UnVuJ3MgeFBvcykgbmVlZHMgdGhlIGxpbmUg Ym94IG9mZnNldCB0byBiZSBhYmxlIHRvIGNvbXB1dGUgdGFiIHBvc2l0aW9ucy4KKyAgICAgICAg ICAgIGxpbmVSZWN0LnNldFgobGluZUJveExvZ2ljYWxSZWN0LmxlZnQoKSk7CisgICAgICAgICAg ICBkaXNwbGF5SW5saW5lQ29udGVudC5saW5lcy5hcHBlbmQoeyBsaW5lUmVjdCwgc2Nyb2xsYWJs ZU92ZXJmbG93UmVjdCwgbGluZUlua092ZXJmbG93UmVjdCwgbGluZS5iYXNlbGluZSgpIH0pOwor ICAgICAgICB9CisgICAgfTsKKyAgICBjb25zdHJ1Y3REaXNwbGF5TGluZSgpOwogICAgIG1faW5s aW5lRm9ybWF0dGluZ1N0YXRlLnNocmlua0Rpc3BsYXlJbmxpbmVDb250ZW50KCk7CiB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3Jh dGlvbkxpbmVMYXlvdXQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlv dXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuaAppbmRleCBjZTA2ZTU3YzY4MjJjZTJiNDg3ZjIzNTI5 NjliNWJjZGIxMjUwNmYyLi5iNjk0ODg1NDZlZGRkYWVlZmZjY2UyNDM5MTFmMmE4NmVhZGZhYTQ2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50 ZWdyYXRpb25MaW5lTGF5b3V0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0 aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5oCkBAIC04Miw2ICs4Miw3IEBAIHB1Ymxp YzoKIHByaXZhdGU6CiAgICAgdm9pZCBwcmVwYXJlTGF5b3V0U3RhdGUoKTsKICAgICB2b2lkIHBy ZXBhcmVGbG9hdGluZ1N0YXRlKCk7CisgICAgdm9pZCBjb25zdHJ1Y3REaXNwbGF5Q29udGVudCgp OwogCiAgICAgY29uc3QgTGF5b3V0OjpDb250YWluZXJCb3gmIHJvb3RMYXlvdXRCb3goKSBjb25z dDsKICAgICBMYXlvdXQ6OkNvbnRhaW5lckJveCYgcm9vdExheW91dEJveCgpOwo=