218882 2020-11-12 19:54:13 -0800 [LFC][Integration] Decouple box and text run construction 2020-11-13 04:08:20 -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 1707098 0 zalan 2020-11-12 19:54:13 -0800 this is in preparation for adding bidi support where we may need to split runs across bidi directions 1707099 1 413996 zalan 2020-11-12 19:56:45 -0800 Created attachment 413996 Patch 1707188 2 ews-feeder 2020-11-13 04:08:00 -0800 Committed r269769: <https://trac.webkit.org/changeset/269769> All reviewed patches have been landed. Closing bug and clearing flags on attachment 413996. 1707189 3 webkit-bug-importer 2020-11-13 04:08:20 -0800 <rdar://problem/71366938> 413996 2020-11-12 19:56:45 -0800 2020-11-13 04:08:01 -0800 Patch bug-218882-20201112195644.patch text/plain 9458 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5NzQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTk0NzU3MWE1ODAxNTlj MWNmZGI3ZGI2NzUwYzM0MzI3ZjkzZDliOC4uNjkwMGE5Y2EwMmVhNjJkZmJhNjRiMTY3MjJlMDFl NDAyMTMwMWJmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIwLTExLTEyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSW50ZWdyYXRpb25d IERlY291cGxlIGJveCBhbmQgdGV4dCBydW4gY29uc3RydWN0aW9uCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTg4ODIKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZv ciBhZGRpbmcgYmlkaSBzdXBwb3J0IHdoZXJlIHdlIG1heSBuZWVkIHRvIHNwbGl0IGEgcnVuIG9u IGJpZGkgYm91bmRhcmllcy4KKworICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJ bnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dEludGVncmF0aW9uOjpJbmxpbmVDb250ZW50QnVpbGRlcjo6Y29uc3RydWN0RGlzcGxheUxp bmVSdW5zIGNvbnN0KToKKwogMjAyMC0xMS0xMiAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUu Y29tPgogCiAgICAgICAgIFtMRkNdW0ludGVncmF0aW9uXSBFbmFibGUgaW5saW5lIHJlcGxhY2Vk IHN1cHBvcnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9M YXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWlsZGVy LmNwcAppbmRleCA0ZDc3ODVlM2JkY2M0YmY1NGJhODNmN2E3NTVmOGU2ZDg5MDdkMzJhLi4zZDI3 ODQ0YmYyMDFmMzg2MDc1N2VjZjAwMDM0NzUxYmI5YWM3ZjNhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50 QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91 dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwCkBAIC0xMDgsMjAgKzEwOCw3MCBA QCBJbmxpbmVDb250ZW50QnVpbGRlcjo6TGluZUxldmVsVmlzdWFsQWRqdXN0bWVudHNGb3JSdW5z TGlzdCBJbmxpbmVDb250ZW50QnVpbGRlcgogCiB2b2lkIElubGluZUNvbnRlbnRCdWlsZGVyOjpj b25zdHJ1Y3REaXNwbGF5TGluZVJ1bnMoSW5saW5lQ29udGVudCYgaW5saW5lQ29udGVudCwgY29u c3QgTGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nU3RhdGUmIGlubGluZUZvcm1hdHRpbmdTdGF0ZSwg Y29uc3QgTGluZUxldmVsVmlzdWFsQWRqdXN0bWVudHNGb3JSdW5zTGlzdCYgbGluZUxldmVsVmlz dWFsQWRqdXN0bWVudHNGb3JSdW5zKSBjb25zdAogeworICAgIGF1dG8mIHJ1bkxpc3QgPSBpbmxp bmVGb3JtYXR0aW5nU3RhdGUubGluZVJ1bnMoKTsKKyAgICBpZiAocnVuTGlzdC5pc0VtcHR5KCkp CisgICAgICAgIHJldHVybjsKICAgICBhdXRvJiBsaW5lcyA9IGlubGluZUZvcm1hdHRpbmdTdGF0 ZS5saW5lcygpOwotICAgIGF1dG8gaW5pdGlhbENvbnRhaW5nQmxvY2tTaXplID0gbV9sYXlvdXRT dGF0ZS52aWV3cG9ydFNpemUoKTsKICAgICBWZWN0b3I8Ym9vbD4gaGFzQWRqdXN0ZWRUcmFpbGlu Z0xpbmVMaXN0KGxpbmVzLnNpemUoKSwgZmFsc2UpOwotICAgIGZvciAoYXV0byYgbGluZVJ1biA6 IGlubGluZUZvcm1hdHRpbmdTdGF0ZS5saW5lUnVucygpKSB7CisKKyAgICBhdXRvIGNyZWF0ZURp c3BsYXlCb3hSdW4gPSBbJl0oYXV0byYgbGluZVJ1bikgeworICAgICAgICBhdXRvIGxpbmVJbmRl eCA9IGxpbmVSdW4ubGluZUluZGV4KCk7CisgICAgICAgIGF1dG8mIGxpbmUgPSBsaW5lc1tsaW5l SW5kZXhdOworICAgICAgICAvLyBJbmxpbmUgYm94ZXMgYXJlIHJlbGF0aXZlIHRvIHRoZSBsaW5l IGJveCB3aGlsZSBmaW5hbCBSdW5zIG5lZWQgdG8gYmUgcmVsYXRpdmUgdG8gdGhlIHBhcmVudCBC b3gKKyAgICAgICAgLy8gRklYTUU6IFNob3VsZG4ndCB3ZSBqdXN0IGxlYXZlIHRoZW0gYmUgcmVs YXRpdmUgdG8gdGhlIGxpbmUgYm94PworICAgICAgICBhdXRvIHJ1blJlY3QgPSBGbG9hdFJlY3Qg eyBsaW5lUnVuLmxvZ2ljYWxSZWN0KCkgfTsKKyAgICAgICAgcnVuUmVjdC5tb3ZlQnkoeyBsaW5l LmxvZ2ljYWxMZWZ0KCksIGxpbmUubG9naWNhbFRvcCgpIH0pOworICAgICAgICBpZiAobGluZUxl dmVsVmlzdWFsQWRqdXN0bWVudHNGb3JSdW5zW2xpbmVJbmRleF0ubmVlZHNJbnRlZ3JhbFBvc2l0 aW9uKQorICAgICAgICAgICAgcnVuUmVjdC5zZXRZKHJvdW5kVG9JbnQocnVuUmVjdC55KCkpKTsK KyAgICAgICAgLy8gRklYTUU6IEFkZCBzdXBwb3J0IGZvciBub24tdGV4dCBpbmsgb3ZlcmZsb3cu CisgICAgICAgIC8vIEZJWE1FOiBBZGQgc3VwcG9ydCBmb3IgY2FzZXMgd2hlbiB0aGUgcnVuIGlz IGFmdGVyIGVsbGlwc2lzLgorICAgICAgICBpbmxpbmVDb250ZW50LnJ1bnMuYXBwZW5kKHsgbGlu ZUluZGV4LCBsaW5lUnVuLmxheW91dEJveCgpLCBydW5SZWN0LCBydW5SZWN0LCB7IH0sIHsgfSB9 KTsKKyAgICB9OworCisgICAgYXV0byBjcmVhdGVEaXNwbGF5VGV4dFJ1bkZvclJhbmdlID0gWyZd KGF1dG8mIGxpbmVSdW4sIGF1dG8gc3RhcnRPZmZzZXQsIGF1dG8gZW5kT2Zmc2V0KSB7CisgICAg ICAgIFJFTEVBU0VfQVNTRVJUKHN0YXJ0T2Zmc2V0IDwgZW5kT2Zmc2V0KTsKICAgICAgICAgYXV0 byYgbGF5b3V0Qm94ID0gbGluZVJ1bi5sYXlvdXRCb3goKTsKKyAgICAgICAgYXV0byBsaW5lSW5k ZXggPSBsaW5lUnVuLmxpbmVJbmRleCgpOworICAgICAgICBhdXRvJiBsaW5lID0gbGluZXNbbGlu ZUluZGV4XTsKKyAgICAgICAgYXV0byBydW5SZWN0ID0gRmxvYXRSZWN0IHsgbGluZVJ1bi5sb2dp Y2FsUmVjdCgpIH07CisgICAgICAgIC8vIElubGluZSBib3hlcyBhcmUgcmVsYXRpdmUgdG8gdGhl IGxpbmUgYm94IHdoaWxlIGZpbmFsIFJ1bnMgbmVlZCB0byBiZSByZWxhdGl2ZSB0byB0aGUgcGFy ZW50IEJveAorICAgICAgICAvLyBGSVhNRTogU2hvdWxkbid0IHdlIGp1c3QgbGVhdmUgdGhlbSBi ZSByZWxhdGl2ZSB0byB0aGUgbGluZSBib3g/CisgICAgICAgIHJ1blJlY3QubW92ZUJ5KHsgbGlu ZS5sb2dpY2FsTGVmdCgpLCBsaW5lLmxvZ2ljYWxUb3AoKSB9KTsKKyAgICAgICAgaWYgKGxpbmVM ZXZlbFZpc3VhbEFkanVzdG1lbnRzRm9yUnVuc1tsaW5lSW5kZXhdLm5lZWRzSW50ZWdyYWxQb3Np dGlvbikKKyAgICAgICAgICAgIHJ1blJlY3Quc2V0WShyb3VuZFRvSW50KHJ1blJlY3QueSgpKSk7 CisKICAgICAgICAgYXV0byYgc3R5bGUgPSBsYXlvdXRCb3guc3R5bGUoKTsKKyAgICAgICAgYXV0 byB0ZXh0ID0gbGluZVJ1bi50ZXh0KCk7CisgICAgICAgIGF1dG8gYWRqdXN0ZWRDb250ZW50VG9S ZW5kZXJlciA9IFsmXSB7CisgICAgICAgICAgICBhdXRvIG9yaWdpbmFsQ29udGVudCA9IHRleHQt PmNvbnRlbnQoKS5zdWJzdHJpbmcodGV4dC0+c3RhcnQoKSwgdGV4dC0+bGVuZ3RoKCkpOworICAg ICAgICAgICAgaWYgKHRleHQtPm5lZWRzSHlwaGVuKCkpCisgICAgICAgICAgICAgICAgcmV0dXJu IG1ha2VTdHJpbmcob3JpZ2luYWxDb250ZW50LCBzdHlsZS5oeXBoZW5TdHJpbmcoKSk7CisgICAg ICAgICAgICBpZiAobGluZUxldmVsVmlzdWFsQWRqdXN0bWVudHNGb3JSdW5zW2xpbmVJbmRleF0u bmVlZHNUcmFpbGluZ0NvbnRlbnRSZXBsYWNlbWVudCkgeworICAgICAgICAgICAgICAgIC8vIEN1 cnJlbnRseSBpdCdzIGVsbGlwc2lzIHJlcGxhY2VtZW50IG9ubHksIGJ1dCBhZGRpbmcgc3VwcG9y dCBmb3IgInRleHQtb3ZlcmZsb3c6IHN0cmluZyIgc2hvdWxkIGJlIHJlbGF0aXZlbHkgc2ltcGxl LgorICAgICAgICAgICAgICAgIGlmIChoYXNBZGp1c3RlZFRyYWlsaW5nTGluZUxpc3RbbGluZUlu ZGV4XSkgeworICAgICAgICAgICAgICAgICAgICAvLyBUaGlzIGxpbmUgYWxyZWFkeSBoYXMgYWRq dXN0ZWQgdHJhaWxpbmcuIEFueSBydW5zIGFmdGVyIHRoZSBlbGxpcHNpcyBzaG91bGQgcmVuZGVy IGJsYW5rLgorICAgICAgICAgICAgICAgICAgICByZXR1cm4gZW1wdHlTdHJpbmcoKTsKKyAgICAg ICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgYXV0byBydW5Mb2dpY2FsUmVjdCA9IGxpbmVS dW4ubG9naWNhbFJlY3QoKTsKKyAgICAgICAgICAgICAgICBhdXRvIGxpbmVMb2dpY2FsUmlnaHQg PSBsaW5lLmxvZ2ljYWxSaWdodCgpOworICAgICAgICAgICAgICAgIGF1dG8gZWxsaXBzaXNXaWR0 aCA9IHN0eWxlLmZvbnRDYXNjYWRlKCkud2lkdGgoV2ViQ29yZTo6VGV4dFJ1biB7ICZob3Jpem9u dGFsRWxsaXBzaXMgfSk7CisgICAgICAgICAgICAgICAgaWYgKHJ1bkxvZ2ljYWxSZWN0LnJpZ2h0 KCkgKyBlbGxpcHNpc1dpZHRoID4gbGluZUxvZ2ljYWxSaWdodCkgeworICAgICAgICAgICAgICAg ICAgICAvLyBUaGUgbmV4dCBydW4gd2l0aCBlbGxpcHNpcyB3b3VsZCBzdXJlbHkgb3ZlcmZsb3cu IFNvIGxldCdzIGp1c3QgYWRkIGl0IHRvIHRoaXMgcnVuIGV2ZW4gaWYKKyAgICAgICAgICAgICAg ICAgICAgLy8gaXQgbWFrZXMgdGhlIHJ1biB3aWRlciB0aGFuIGl0IG9yaWdpbmFsbHkgd2FzLgor ICAgICAgICAgICAgICAgICAgICBoYXNBZGp1c3RlZFRyYWlsaW5nTGluZUxpc3RbbGluZUluZGV4 XSA9IHRydWU7CisgICAgICAgICAgICAgICAgICAgIGZsb2F0IHJlc3VsdFdpZHRoID0gMDsKKyAg ICAgICAgICAgICAgICAgICAgYXV0byBtYXhXaWR0aCA9IGxpbmUubG9naWNhbFdpZHRoKCkgLSBy dW5Mb2dpY2FsUmVjdC5sZWZ0KCk7CisgICAgICAgICAgICAgICAgICAgIHJldHVybiBTdHJpbmdU cnVuY2F0b3I6OnJpZ2h0VHJ1bmNhdGUob3JpZ2luYWxDb250ZW50LCBtYXhXaWR0aCwgc3R5bGUu Zm9udENhc2NhZGUoKSwgcmVzdWx0V2lkdGgsIHRydWUpOworICAgICAgICAgICAgICAgIH0KKyAg ICAgICAgICAgIH0KKyAgICAgICAgICAgIHJldHVybiBTdHJpbmcoKTsKKyAgICAgICAgfTsKKwog ICAgICAgICBhdXRvIGNvbXB1dGVkSW5rT3ZlcmZsb3cgPSBbJl0gKGF1dG8gcnVuUmVjdCkgewot ICAgICAgICAgICAgLy8gRklYTUU6IEFkZCBzdXBwb3J0IGZvciBub24tdGV4dCBpbmsgb3ZlcmZs b3cuCi0gICAgICAgICAgICBpZiAoIWxpbmVSdW4udGV4dCgpKQotICAgICAgICAgICAgICAgIHJl dHVybiBydW5SZWN0OwogICAgICAgICAgICAgYXV0byBpbmtPdmVyZmxvdyA9IHJ1blJlY3Q7Cisg ICAgICAgICAgICBhdXRvIGluaXRpYWxDb250YWluZ0Jsb2NrU2l6ZSA9IG1fbGF5b3V0U3RhdGUu dmlld3BvcnRTaXplKCk7CiAgICAgICAgICAgICBhdXRvIHN0cm9rZU92ZXJmbG93ID0gc3RkOjpj ZWlsKHN0eWxlLmNvbXB1dGVkU3Ryb2tlV2lkdGgoY2VpbGVkSW50U2l6ZShpbml0aWFsQ29udGFp bmdCbG9ja1NpemUpKSk7CiAgICAgICAgICAgICBpbmtPdmVyZmxvdy5pbmZsYXRlKHN0cm9rZU92 ZXJmbG93KTsKLQogICAgICAgICAgICAgYXV0byBsZXR0ZXJTcGFjaW5nID0gc3R5bGUuZm9udENh c2NhZGUoKS5sZXR0ZXJTcGFjaW5nKCk7CiAgICAgICAgICAgICBpZiAobGV0dGVyU3BhY2luZyA8 IDApIHsKICAgICAgICAgICAgICAgICAvLyBMYXN0IGxldHRlcidzIG5lZ2F0aXZlIHNwYWNpbmcg c2hyaW5rcyBsb2dpY2FsIHJlY3QuIFB1c2ggaXQgdG8gaW5rIG92ZXJmbG93LgpAQCAtMTI5LDQ2 ICsxNzksMTkgQEAgdm9pZCBJbmxpbmVDb250ZW50QnVpbGRlcjo6Y29uc3RydWN0RGlzcGxheUxp bmVSdW5zKElubGluZUNvbnRlbnQmIGlubGluZUNvbnRlbnQKICAgICAgICAgICAgIH0KICAgICAg ICAgICAgIHJldHVybiBpbmtPdmVyZmxvdzsKICAgICAgICAgfTsKLSAgICAgICAgYXV0byBydW5S ZWN0ID0gRmxvYXRSZWN0IHsgbGluZVJ1bi5sb2dpY2FsUmVjdCgpIH07Ci0gICAgICAgIC8vIElu bGluZSBib3hlcyBhcmUgcmVsYXRpdmUgdG8gdGhlIGxpbmUgYm94IHdoaWxlIGZpbmFsIFJ1bnMg bmVlZCB0byBiZSByZWxhdGl2ZSB0byB0aGUgcGFyZW50IEJveAotICAgICAgICAvLyBGSVhNRTog U2hvdWxkbid0IHdlIGp1c3QgbGVhdmUgdGhlbSBiZSByZWxhdGl2ZSB0byB0aGUgbGluZSBib3g/ Ci0gICAgICAgIGF1dG8gbGluZUluZGV4ID0gbGluZVJ1bi5saW5lSW5kZXgoKTsKLSAgICAgICAg YXV0byYgbGluZSA9IGxpbmVzW2xpbmVJbmRleF07Ci0gICAgICAgIHJ1blJlY3QubW92ZUJ5KHsg bGluZS5sb2dpY2FsTGVmdCgpLCBsaW5lLmxvZ2ljYWxUb3AoKSB9KTsKLSAgICAgICAgaWYgKGxp bmVMZXZlbFZpc3VhbEFkanVzdG1lbnRzRm9yUnVuc1tsaW5lSW5kZXhdLm5lZWRzSW50ZWdyYWxQ b3NpdGlvbikKLSAgICAgICAgICAgIHJ1blJlY3Quc2V0WShyb3VuZFRvSW50KHJ1blJlY3QueSgp KSk7Ci0KLSAgICAgICAgV1RGOjpPcHRpb25hbDxSdW46OlRleHRDb250ZW50PiB0ZXh0Q29udGVu dDsKLSAgICAgICAgaWYgKGF1dG8gdGV4dCA9IGxpbmVSdW4udGV4dCgpKSB7Ci0gICAgICAgICAg ICBhdXRvIGFkanVzdGVkQ29udGVudFRvUmVuZGVyZXIgPSBbJl0gewotICAgICAgICAgICAgICAg IGF1dG8gb3JpZ2luYWxDb250ZW50ID0gdGV4dC0+Y29udGVudCgpLnN1YnN0cmluZyh0ZXh0LT5z dGFydCgpLCB0ZXh0LT5sZW5ndGgoKSk7Ci0gICAgICAgICAgICAgICAgaWYgKHRleHQtPm5lZWRz SHlwaGVuKCkpCi0gICAgICAgICAgICAgICAgICAgIHJldHVybiBtYWtlU3RyaW5nKG9yaWdpbmFs Q29udGVudCwgc3R5bGUuaHlwaGVuU3RyaW5nKCkpOwotICAgICAgICAgICAgICAgIGlmIChsaW5l TGV2ZWxWaXN1YWxBZGp1c3RtZW50c0ZvclJ1bnNbbGluZUluZGV4XS5uZWVkc1RyYWlsaW5nQ29u dGVudFJlcGxhY2VtZW50KSB7Ci0gICAgICAgICAgICAgICAgICAgIC8vIEN1cnJlbnRseSBpdCdz IGVsbGlwc2lzIHJlcGxhY2VtZW50IG9ubHksIGJ1dCBhZGRpbmcgc3VwcG9ydCBmb3IgInRleHQt b3ZlcmZsb3c6IHN0cmluZyIgc2hvdWxkIGJlIHJlbGF0aXZlbHkgc2ltcGxlLgotICAgICAgICAg ICAgICAgICAgICBpZiAoaGFzQWRqdXN0ZWRUcmFpbGluZ0xpbmVMaXN0W2xpbmVJbmRleF0pIHsK LSAgICAgICAgICAgICAgICAgICAgICAgIC8vIFRoaXMgbGluZSBhbHJlYWR5IGhhcyBhZGp1c3Rl ZCB0cmFpbGluZy4gQW55IHJ1bnMgYWZ0ZXIgdGhlIGVsbGlwc2lzIHNob3VsZCByZW5kZXIgYmxh bmsuCi0gICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gZW1wdHlTdHJpbmcoKTsKLSAgICAg ICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgICBhdXRvIHJ1bkxvZ2ljYWxSZWN0 ID0gbGluZVJ1bi5sb2dpY2FsUmVjdCgpOwotICAgICAgICAgICAgICAgICAgICBhdXRvIGxpbmVM b2dpY2FsUmlnaHQgPSBsaW5lLmxvZ2ljYWxSaWdodCgpOwotICAgICAgICAgICAgICAgICAgICBh dXRvIGVsbGlwc2lzV2lkdGggPSBzdHlsZS5mb250Q2FzY2FkZSgpLndpZHRoKFdlYkNvcmU6OlRl eHRSdW4geyAmaG9yaXpvbnRhbEVsbGlwc2lzIH0pOwotICAgICAgICAgICAgICAgICAgICBpZiAo cnVuTG9naWNhbFJlY3QucmlnaHQoKSArIGVsbGlwc2lzV2lkdGggPiBsaW5lTG9naWNhbFJpZ2h0 KSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAvLyBUaGUgbmV4dCBydW4gd2l0aCBlbGxpcHNp cyB3b3VsZCBzdXJlbHkgb3ZlcmZsb3cuIFNvIGxldCdzIGp1c3QgYWRkIGl0IHRvIHRoaXMgcnVu IGV2ZW4gaWYKLSAgICAgICAgICAgICAgICAgICAgICAgIC8vIGl0IG1ha2VzIHRoZSBydW4gd2lk ZXIgdGhhbiBpdCBvcmlnaW5hbGx5IHdhcy4KLSAgICAgICAgICAgICAgICAgICAgICAgIGhhc0Fk anVzdGVkVHJhaWxpbmdMaW5lTGlzdFtsaW5lSW5kZXhdID0gdHJ1ZTsKLSAgICAgICAgICAgICAg ICAgICAgICAgIGZsb2F0IHJlc3VsdFdpZHRoID0gMDsKLSAgICAgICAgICAgICAgICAgICAgICAg IGF1dG8gbWF4V2lkdGggPSBsaW5lLmxvZ2ljYWxXaWR0aCgpIC0gcnVuTG9naWNhbFJlY3QubGVm dCgpOwotICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIFN0cmluZ1RydW5jYXRvcjo6cmln aHRUcnVuY2F0ZShvcmlnaW5hbENvbnRlbnQsIG1heFdpZHRoLCBzdHlsZS5mb250Q2FzY2FkZSgp LCByZXN1bHRXaWR0aCwgdHJ1ZSk7Ci0gICAgICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAg ICAgICB9Ci0gICAgICAgICAgICAgICAgcmV0dXJuIFN0cmluZygpOwotICAgICAgICAgICAgfTsK LSAgICAgICAgICAgIHRleHRDb250ZW50ID0gUnVuOjpUZXh0Q29udGVudCB7IHRleHQtPnN0YXJ0 KCksIHRleHQtPmxlbmd0aCgpLCB0ZXh0LT5jb250ZW50KCksIGFkanVzdGVkQ29udGVudFRvUmVu ZGVyZXIoKSwgdGV4dC0+bmVlZHNIeXBoZW4oKSB9OwotICAgICAgICB9CisgICAgICAgIFJFTEVB U0VfQVNTRVJUKHN0YXJ0T2Zmc2V0ID49IHRleHQtPnN0YXJ0KCkgJiYgc3RhcnRPZmZzZXQgPCB0 ZXh0LT5lbmQoKSk7CisgICAgICAgIFJFTEVBU0VfQVNTRVJUKGVuZE9mZnNldCA+IHRleHQtPnN0 YXJ0KCkgJiYgZW5kT2Zmc2V0IDw9IHRleHQtPmVuZCgpKTsKKyAgICAgICAgYXV0byB0ZXh0Q29u dGVudCA9IFJ1bjo6VGV4dENvbnRlbnQgeyBzdGFydE9mZnNldCwgZW5kT2Zmc2V0IC0gc3RhcnRP ZmZzZXQsIHRleHQtPmNvbnRlbnQoKSwgYWRqdXN0ZWRDb250ZW50VG9SZW5kZXJlcigpLCB0ZXh0 LT5uZWVkc0h5cGhlbigpIH07CiAgICAgICAgIGF1dG8gZXhwYW5zaW9uID0gUnVuOjpFeHBhbnNp b24geyBsaW5lUnVuLmV4cGFuc2lvbigpLmJlaGF2aW9yLCBsaW5lUnVuLmV4cGFuc2lvbigpLmhv cml6b250YWxFeHBhbnNpb24gfTsKICAgICAgICAgYXV0byBkaXNwbGF5UnVuID0gUnVuIHsgbGlu ZUluZGV4LCBsYXlvdXRCb3gsIHJ1blJlY3QsIGNvbXB1dGVkSW5rT3ZlcmZsb3cocnVuUmVjdCks IGV4cGFuc2lvbiwgdGV4dENvbnRlbnQgfTsKICAgICAgICAgaW5saW5lQ29udGVudC5ydW5zLmFw cGVuZChkaXNwbGF5UnVuKTsKKyAgICB9OworCisgICAgZm9yIChhdXRvJiBsaW5lUnVuIDogaW5s aW5lRm9ybWF0dGluZ1N0YXRlLmxpbmVSdW5zKCkpIHsKKyAgICAgICAgaWYgKGF1dG8mIHRleHQg PSBsaW5lUnVuLnRleHQoKSkKKyAgICAgICAgICAgIGNyZWF0ZURpc3BsYXlUZXh0UnVuRm9yUmFu Z2UobGluZVJ1biwgdGV4dC0+c3RhcnQoKSwgdGV4dC0+ZW5kKCkpOworICAgICAgICBlbHNlCisg ICAgICAgICAgICBjcmVhdGVEaXNwbGF5Qm94UnVuKGxpbmVSdW4pOwogICAgIH0KIH0KIAo=