215186 2020-08-05 13:01:01 -0700 Use references instead of pointers for WidthIterator's fonts 2020-08-07 23:23:13 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 206208 1 mmaxfield mmaxfield changseok dino esprehn+autocc ews-watchlist fmalita glenn gyuyoung.kim jonlee kondapallykalyan pdr sabouhallawa schenney sergio simon.fraser thorton webkit-bug-importer zalan oldest_to_newest 1678047 0 mmaxfield 2020-08-05 13:01:01 -0700 Use references instead of pointers for WidthIterator's fonts 1678049 1 406028 mmaxfield 2020-08-05 13:01:42 -0700 Created attachment 406028 Patch 1678454 2 ews-feeder 2020-08-06 16:26:51 -0700 Tools/Scripts/svn-apply failed to apply attachment 406028 to trunk. Please resolve the conflicts and upload a new patch. 1678459 3 mmaxfield 2020-08-06 16:47:04 -0700 Committed r265353: <https://trac.webkit.org/changeset/265353> 1678460 4 webkit-bug-importer 2020-08-06 16:48:22 -0700 <rdar://problem/66652191> 406028 2020-08-05 13:01:42 -0700 2020-08-06 16:26:51 -0700 Patch bug-215186-20200805130141.patch text/plain 14852 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1Mjc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGY2NjQ5MGJiZjJjNDc4 NmVlYzU2N2UxOTYzNGIzYjc4YmMzY2M4NS4uZjQ1YWM2YTQ3MWYwNzY1MjgyNzM4NzVmNjkzZGZj ZjU5MWE0YzdkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIwLTA4LTA1ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIHJlZmVy ZW5jZXMgaW5zdGVhZCBvZiBwb2ludGVycyBmb3IgV2lkdGhJdGVyYXRvcidzIGZvbnRzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTUxODYKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGV5IGNhbiBuZXZl ciBiZSBudWxsLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNlIHRoZXJlIGlzIG5vIGJl aGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYXNjYWRl LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRDYXNjYWRlOjp3aWR0aE9mVGV4dFJhbmdlIGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRDYXNjYWRlOjpsYXlvdXRTaW1wbGVUZXh0IGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRDYXNjYWRlOjpmbG9hdFdpZHRoRm9yU2ltcGxl VGV4dCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpGb250Q2FzY2FkZTo6YWRqdXN0U2VsZWN0 aW9uUmVjdEZvclNpbXBsZVRleHQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhc2Nh ZGU6Om9mZnNldEZvclBvc2l0aW9uRm9yU2ltcGxlVGV4dCBjb25zdCk6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvV2lkdGhJdGVyYXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXaWR0 aEl0ZXJhdG9yOjpXaWR0aEl0ZXJhdG9yKToKKyAgICAgICAgKFdlYkNvcmU6OldpZHRoSXRlcmF0 b3I6OmFwcGx5Rm9udFRyYW5zZm9ybXMpOgorICAgICAgICAoV2ViQ29yZTo6V2lkdGhJdGVyYXRv cjo6YWR2YW5jZUludGVybmFsKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9XaWR0aEl0 ZXJhdG9yLmg6CisgICAgICAgICogcmVuZGVyaW5nL3N2Zy9TVkdUZXh0TWV0cmljc0J1aWxkZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6U1ZHVGV4dE1ldHJpY3NCdWlsZGVyOjppbml0aWFsaXpl TWVhc3VyZW1lbnRXaXRoVGV4dFJlbmRlcmVyKToKKwogMjAyMC0wOC0wNCAgRGV2aW4gUm91c3Nv ICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgIkRvdWJsZURvd24gQ2FzaW5vIiByZXNw aW4gYnV0dG9uIHN0b3BzIHdvcmtpbmcgd2l0aCB0cmFja3BhZApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuY3BwCmluZGV4IDgwZmFiYjMyYWRiZjY5 Y2MxZTQ4MGIxN2JkMWM2OTljODlkZjQyNmMuLjZhYzAyNDk5ZGMyODdhYzMwMmY2YzdlMjQwMzFm ODhmYzY4ZjlmZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0ZvbnRDYXNjYWRlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9G b250Q2FzY2FkZS5jcHAKQEAgLTM3Miw3ICszNzIsNyBAQCBmbG9hdCBGb250Q2FzY2FkZTo6d2lk dGhPZlRleHRSYW5nZShjb25zdCBUZXh0UnVuJiBydW4sIHVuc2lnbmVkIGZyb20sIHVuc2lnbmVk CiAgICAgICAgIGNvbXBsZXhJdGVyYXRvci5hZHZhbmNlKHJ1bi5sZW5ndGgoKSwgbnVsbHB0ciwg SW5jbHVkZVBhcnRpYWxHbHlwaHMsIGZhbGxiYWNrRm9udHMpOwogICAgICAgICB0b3RhbFdpZHRo ID0gY29tcGxleEl0ZXJhdG9yLnJ1bldpZHRoU29GYXIoKTsKICAgICB9IGVsc2UgewotICAgICAg ICBXaWR0aEl0ZXJhdG9yIHNpbXBsZUl0ZXJhdG9yKHRoaXMsIHJ1biwgZmFsbGJhY2tGb250cyk7 CisgICAgICAgIFdpZHRoSXRlcmF0b3Igc2ltcGxlSXRlcmF0b3IoKnRoaXMsIHJ1biwgZmFsbGJh Y2tGb250cyk7CiAgICAgICAgIHNpbXBsZUl0ZXJhdG9yLmFkdmFuY2UoZnJvbSwgbnVsbHB0cik7 CiAgICAgICAgIG9mZnNldEJlZm9yZVJhbmdlID0gc2ltcGxlSXRlcmF0b3IucnVuV2lkdGhTb0Zh cigpOwogICAgICAgICBzaW1wbGVJdGVyYXRvci5hZHZhbmNlKHRvLCBudWxscHRyKTsKQEAgLTEz NzIsNyArMTM3Miw3IEBAIEdseXBoQnVmZmVyIEZvbnRDYXNjYWRlOjpsYXlvdXRTaW1wbGVUZXh0 KGNvbnN0IFRleHRSdW4mIHJ1biwgdW5zaWduZWQgZnJvbSwgdW5zCiB7CiAgICAgR2x5cGhCdWZm ZXIgZ2x5cGhCdWZmZXI7CiAKLSAgICBXaWR0aEl0ZXJhdG9yIGl0KHRoaXMsIHJ1biwgMCwgZmFs c2UsIGZvclRleHRFbXBoYXNpcyk7CisgICAgV2lkdGhJdGVyYXRvciBpdCgqdGhpcywgcnVuLCAw LCBmYWxzZSwgZm9yVGV4dEVtcGhhc2lzKTsKICAgICAvLyBGSVhNRTogVXNpbmcgc2VwYXJhdGUg Z2x5cGggYnVmZmVycyBmb3IgdGhlIHByZWZpeCBhbmQgdGhlIHN1ZmZpeCBpcyBpbmNvcnJlY3Qg d2hlbiBrZXJuaW5nIG9yCiAgICAgLy8gbGlnYXR1cmVzIGFyZSBlbmFibGVkLgogICAgIEdseXBo QnVmZmVyIGxvY2FsR2x5cGhCdWZmZXI7CkBAIC0xNTIxLDcgKzE1MjEsNyBAQCB2b2lkIEZvbnRD YXNjYWRlOjpkcmF3RW1waGFzaXNNYXJrcyhHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0 IEdseXBoQnVmZmVyJgogCiBmbG9hdCBGb250Q2FzY2FkZTo6ZmxvYXRXaWR0aEZvclNpbXBsZVRl eHQoY29uc3QgVGV4dFJ1biYgcnVuLCBIYXNoU2V0PGNvbnN0IEZvbnQqPiogZmFsbGJhY2tGb250 cywgR2x5cGhPdmVyZmxvdyogZ2x5cGhPdmVyZmxvdykgY29uc3QKIHsKLSAgICBXaWR0aEl0ZXJh dG9yIGl0KHRoaXMsIHJ1biwgZmFsbGJhY2tGb250cywgZ2x5cGhPdmVyZmxvdyk7CisgICAgV2lk dGhJdGVyYXRvciBpdCgqdGhpcywgcnVuLCBmYWxsYmFja0ZvbnRzLCBnbHlwaE92ZXJmbG93KTsK ICAgICBHbHlwaEJ1ZmZlciBnbHlwaEJ1ZmZlcjsKICAgICBpdC5hZHZhbmNlKHJ1bi5sZW5ndGgo KSwgKGVuYWJsZUtlcm5pbmcoKSB8fCByZXF1aXJlc1NoYXBpbmcoKSkgPyAmZ2x5cGhCdWZmZXIg OiBudWxscHRyKTsKIApAQCAtMTU1MCw3ICsxNTUwLDcgQEAgZmxvYXQgRm9udENhc2NhZGU6OmZs b2F0V2lkdGhGb3JDb21wbGV4VGV4dChjb25zdCBUZXh0UnVuJiBydW4sIEhhc2hTZXQ8Y29uc3Qg Rm8KIHZvaWQgRm9udENhc2NhZGU6OmFkanVzdFNlbGVjdGlvblJlY3RGb3JTaW1wbGVUZXh0KGNv bnN0IFRleHRSdW4mIHJ1biwgTGF5b3V0UmVjdCYgc2VsZWN0aW9uUmVjdCwgdW5zaWduZWQgZnJv bSwgdW5zaWduZWQgdG8pIGNvbnN0CiB7CiAgICAgR2x5cGhCdWZmZXIgZ2x5cGhCdWZmZXI7Ci0g ICAgV2lkdGhJdGVyYXRvciBpdCh0aGlzLCBydW4pOworICAgIFdpZHRoSXRlcmF0b3IgaXQoKnRo aXMsIHJ1bik7CiAgICAgaXQuYWR2YW5jZShmcm9tLCAmZ2x5cGhCdWZmZXIpOwogICAgIGZsb2F0 IGJlZm9yZVdpZHRoID0gaXQucnVuV2lkdGhTb0ZhcigpOwogICAgIGl0LmFkdmFuY2UodG8sICZn bHlwaEJ1ZmZlcik7CkBAIC0xNTg0LDcgKzE1ODQsNyBAQCBpbnQgRm9udENhc2NhZGU6Om9mZnNl dEZvclBvc2l0aW9uRm9yU2ltcGxlVGV4dChjb25zdCBUZXh0UnVuJiBydW4sIGZsb2F0IHgsIGJv bwogewogICAgIGZsb2F0IGRlbHRhID0geDsKIAotICAgIFdpZHRoSXRlcmF0b3IgaXQodGhpcywg cnVuKTsKKyAgICBXaWR0aEl0ZXJhdG9yIGl0KCp0aGlzLCBydW4pOwogICAgIEdseXBoQnVmZmVy IGxvY2FsR2x5cGhCdWZmZXI7CiAgICAgdW5zaWduZWQgb2Zmc2V0OwogICAgIGlmIChydW4ucnRs KCkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1dpZHRo SXRlcmF0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJdGVy YXRvci5jcHAKaW5kZXggNjE2M2JjZTI3YTI0ZmI3M2Y3ZjQ3MGYwOTkyYWIxYzcyYTA1ZWY5ZS4u MWU4MzIwMGNkOTg5ZjViMzU4NWZjYjFjOWMzZTY5NGEyN2YyYTc5NyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJdGVyYXRvci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJdGVyYXRvci5jcHAKQEAgLTM0LDE1 ICszNCwxNSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHVzaW5nIG5hbWVzcGFjZSBXVEY6OlVu aWNvZGU7CiAKLVdpZHRoSXRlcmF0b3I6OldpZHRoSXRlcmF0b3IoY29uc3QgRm9udENhc2NhZGUq IGZvbnQsIGNvbnN0IFRleHRSdW4mIHJ1biwgSGFzaFNldDxjb25zdCBGb250Kj4qIGZhbGxiYWNr Rm9udHMsIGJvb2wgYWNjb3VudEZvckdseXBoQm91bmRzLCBib29sIGZvclRleHRFbXBoYXNpcykK K1dpZHRoSXRlcmF0b3I6OldpZHRoSXRlcmF0b3IoY29uc3QgRm9udENhc2NhZGUmIGZvbnQsIGNv bnN0IFRleHRSdW4mIHJ1biwgSGFzaFNldDxjb25zdCBGb250Kj4qIGZhbGxiYWNrRm9udHMsIGJv b2wgYWNjb3VudEZvckdseXBoQm91bmRzLCBib29sIGZvclRleHRFbXBoYXNpcykKICAgICA6IG1f Zm9udChmb250KQogICAgICwgbV9ydW4ocnVuKQogICAgICwgbV9mYWxsYmFja0ZvbnRzKGZhbGxi YWNrRm9udHMpCiAgICAgLCBtX2V4cGFuc2lvbihydW4uZXhwYW5zaW9uKCkpCiAgICAgLCBtX2lz QWZ0ZXJFeHBhbnNpb24oKHJ1bi5leHBhbnNpb25CZWhhdmlvcigpICYgTGVhZGluZ0V4cGFuc2lv bk1hc2spID09IEZvcmJpZExlYWRpbmdFeHBhbnNpb24pCiAgICAgLCBtX2FjY291bnRGb3JHbHlw aEJvdW5kcyhhY2NvdW50Rm9yR2x5cGhCb3VuZHMpCi0gICAgLCBtX2VuYWJsZUtlcm5pbmcoZm9u dC0+ZW5hYmxlS2VybmluZygpKQotICAgICwgbV9yZXF1aXJlc1NoYXBpbmcoZm9udC0+cmVxdWly ZXNTaGFwaW5nKCkpCisgICAgLCBtX2VuYWJsZUtlcm5pbmcoZm9udC5lbmFibGVLZXJuaW5nKCkp CisgICAgLCBtX3JlcXVpcmVzU2hhcGluZyhmb250LnJlcXVpcmVzU2hhcGluZygpKQogICAgICwg bV9mb3JUZXh0RW1waGFzaXMoZm9yVGV4dEVtcGhhc2lzKQogewogICAgIGlmICghbV9leHBhbnNp b24pCkBAIC04NSw3ICs4NSw3IEBAIGlubGluZSBhdXRvIFdpZHRoSXRlcmF0b3I6OnNob3VsZEFw cGx5Rm9udFRyYW5zZm9ybXMoY29uc3QgR2x5cGhCdWZmZXIqIGdseXBoQnVmCiAgICAgcmV0dXJu IFRyYW5zZm9ybXNUeXBlOjpOb3RGb3JjZWQ7CiB9CiAKLWlubGluZSBmbG9hdCBXaWR0aEl0ZXJh dG9yOjphcHBseUZvbnRUcmFuc2Zvcm1zKEdseXBoQnVmZmVyKiBnbHlwaEJ1ZmZlciwgYm9vbCBs dHIsIHVuc2lnbmVkJiBsYXN0R2x5cGhDb3VudCwgY29uc3QgRm9udCogZm9udCwgVUNoYXIzMiBw cmV2aW91c0NoYXJhY3RlciwgYm9vbCBmb3JjZSwgQ2hhcmFjdGVyc1RyZWF0ZWRBc1NwYWNlJiBj aGFyYWN0ZXJzVHJlYXRlZEFzU3BhY2UpCitpbmxpbmUgZmxvYXQgV2lkdGhJdGVyYXRvcjo6YXBw bHlGb250VHJhbnNmb3JtcyhHbHlwaEJ1ZmZlciogZ2x5cGhCdWZmZXIsIGJvb2wgbHRyLCB1bnNp Z25lZCYgbGFzdEdseXBoQ291bnQsIGNvbnN0IEZvbnQmIGZvbnQsIFVDaGFyMzIgcHJldmlvdXND aGFyYWN0ZXIsIGJvb2wgZm9yY2UsIENoYXJhY3RlcnNUcmVhdGVkQXNTcGFjZSYgY2hhcmFjdGVy c1RyZWF0ZWRBc1NwYWNlKQogewogICAgIEFTU0VSVF9VTlVTRUQocHJldmlvdXNDaGFyYWN0ZXIs IHNob3VsZEFwcGx5Rm9udFRyYW5zZm9ybXMoZ2x5cGhCdWZmZXIsIGxhc3RHbHlwaENvdW50LCBw cmV2aW91c0NoYXJhY3RlcikgIT0gV2lkdGhJdGVyYXRvcjo6VHJhbnNmb3Jtc1R5cGU6Ok5vbmUp OwogCkBAIC0xMDcsNyArMTA3LDcgQEAgaW5saW5lIGZsb2F0IFdpZHRoSXRlcmF0b3I6OmFwcGx5 Rm9udFRyYW5zZm9ybXMoR2x5cGhCdWZmZXIqIGdseXBoQnVmZmVyLCBib29sIGwKICAgICBpZiAo IWx0cikKICAgICAgICAgZ2x5cGhCdWZmZXItPnJldmVyc2UobGFzdEdseXBoQ291bnQsIGdseXBo QnVmZmVyU2l6ZSAtIGxhc3RHbHlwaENvdW50KTsKIAotICAgIGZvbnQtPmFwcGx5VHJhbnNmb3Jt cygqZ2x5cGhCdWZmZXIsIGxhc3RHbHlwaENvdW50LCBtX2VuYWJsZUtlcm5pbmcsIG1fcmVxdWly ZXNTaGFwaW5nLCBtX2ZvbnQtPmZvbnREZXNjcmlwdGlvbigpLmNvbXB1dGVkTG9jYWxlKCkpOwor ICAgIGZvbnQuYXBwbHlUcmFuc2Zvcm1zKCpnbHlwaEJ1ZmZlciwgbGFzdEdseXBoQ291bnQsIG1f ZW5hYmxlS2VybmluZywgbV9yZXF1aXJlc1NoYXBpbmcsIG1fZm9udC5mb250RGVzY3JpcHRpb24o KS5jb21wdXRlZExvY2FsZSgpKTsKICAgICBnbHlwaEJ1ZmZlclNpemUgPSBnbHlwaEJ1ZmZlci0+ c2l6ZSgpOwogCiAgICAgZm9yICh1bnNpZ25lZCBpID0gbGFzdEdseXBoQ291bnQ7IGkgPCBnbHlw aEJ1ZmZlclNpemU7ICsraSkKQEAgLTE3Myw3ICsxNzMsNyBAQCBpbmxpbmUgdm9pZCBXaWR0aEl0 ZXJhdG9yOjphZHZhbmNlSW50ZXJuYWwoVGV4dEl0ZXJhdG9yJiB0ZXh0SXRlcmF0b3IsIEdseXBo QnVmZgogewogICAgIC8vIFRoZSBjb3JlIGxvZ2ljIGhlcmUgbmVlZHMgdG8gbWF0Y2ggU2ltcGxl TGluZUxheW91dDo6d2lkdGhGb3JTaW1wbGVUZXh0KCkKICAgICBib29sIHJ0bCA9IG1fcnVuLnJ0 bCgpOwotICAgIGJvb2wgaGFzRXh0cmFTcGFjaW5nID0gKG1fZm9udC0+bGV0dGVyU3BhY2luZygp IHx8IG1fZm9udC0+d29yZFNwYWNpbmcoKSB8fCBtX2V4cGFuc2lvbikgJiYgIW1fcnVuLnNwYWNp bmdEaXNhYmxlZCgpOworICAgIGJvb2wgaGFzRXh0cmFTcGFjaW5nID0gKG1fZm9udC5sZXR0ZXJT cGFjaW5nKCkgfHwgbV9mb250LndvcmRTcGFjaW5nKCkgfHwgbV9leHBhbnNpb24pICYmICFtX3J1 bi5zcGFjaW5nRGlzYWJsZWQoKTsKIAogICAgIGJvb2wgcnVuRm9yY2VzTGVhZGluZ0V4cGFuc2lv biA9IChtX3J1bi5leHBhbnNpb25CZWhhdmlvcigpICYgTGVhZGluZ0V4cGFuc2lvbk1hc2spID09 IEZvcmNlTGVhZGluZ0V4cGFuc2lvbjsKICAgICBib29sIHJ1bkZvcmNlc1RyYWlsaW5nRXhwYW5z aW9uID0gKG1fcnVuLmV4cGFuc2lvbkJlaGF2aW9yKCkgJiBUcmFpbGluZ0V4cGFuc2lvbk1hc2sp ID09IEZvcmNlVHJhaWxpbmdFeHBhbnNpb247CkBAIC0xODcsNyArMTg3LDcgQEAgaW5saW5lIHZv aWQgV2lkdGhJdGVyYXRvcjo6YWR2YW5jZUludGVybmFsKFRleHRJdGVyYXRvciYgdGV4dEl0ZXJh dG9yLCBHbHlwaEJ1ZmYKICAgICBmbG9hdCBsYXN0Um91bmRpbmdXaWR0aCA9IG1fZmluYWxSb3Vu ZGluZ1dpZHRoOwogICAgIEZsb2F0UmVjdCBib3VuZHM7CiAKLSAgICBjb25zdCBGb250JiBwcmlt YXJ5Rm9udCA9IG1fZm9udC0+cHJpbWFyeUZvbnQoKTsKKyAgICBjb25zdCBGb250JiBwcmltYXJ5 Rm9udCA9IG1fZm9udC5wcmltYXJ5Rm9udCgpOwogICAgIGNvbnN0IEZvbnQqIGxhc3RGb250RGF0 YSA9ICZwcmltYXJ5Rm9udDsKICAgICB1bnNpZ25lZCBsYXN0R2x5cGhDb3VudCA9IGdseXBoQnVm ZmVyID8gZ2x5cGhCdWZmZXItPnNpemUoKSA6IDA7CiAKQEAgLTIwOSwxOSArMjA5LDE5IEBAIGlu bGluZSB2b2lkIFdpZHRoSXRlcmF0b3I6OmFkdmFuY2VJbnRlcm5hbChUZXh0SXRlcmF0b3ImIHRl eHRJdGVyYXRvciwgR2x5cGhCdWZmCiAgICAgICAgIH0KICNlbmRpZgogICAgICAgICBpbnQgY3Vy cmVudENoYXJhY3RlckluZGV4ID0gdGV4dEl0ZXJhdG9yLmN1cnJlbnRJbmRleCgpOwotICAgICAg ICBjb25zdCBHbHlwaERhdGEmIGdseXBoRGF0YSA9IG1fZm9udC0+Z2x5cGhEYXRhRm9yQ2hhcmFj dGVyKGNoYXJhY3RlciwgcnRsKTsKKyAgICAgICAgY29uc3QgR2x5cGhEYXRhJiBnbHlwaERhdGEg PSBtX2ZvbnQuZ2x5cGhEYXRhRm9yQ2hhcmFjdGVyKGNoYXJhY3RlciwgcnRsKTsKICAgICAgICAg R2x5cGggZ2x5cGggPSBnbHlwaERhdGEuZ2x5cGg7CiAgICAgICAgIGlmICghZ2x5cGggJiYgIWNo YXJhY3Rlck11c3REcmF3U29tZXRoaW5nKSB7CiAgICAgICAgICAgICB0ZXh0SXRlcmF0b3IuYWR2 YW5jZShhZHZhbmNlTGVuZ3RoKTsKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9Ci0g ICAgICAgIGNvbnN0IEZvbnQqIGZvbnQgPSBnbHlwaERhdGEuZm9udCA/IGdseXBoRGF0YS5mb250 IDogJm1fZm9udC0+cHJpbWFyeUZvbnQoKTsKKyAgICAgICAgY29uc3QgRm9udCogZm9udCA9IGds eXBoRGF0YS5mb250ID8gZ2x5cGhEYXRhLmZvbnQgOiAmbV9mb250LnByaW1hcnlGb250KCk7CiAg ICAgICAgIEFTU0VSVChmb250KTsKIAogICAgICAgICAvLyBOb3cgdGhhdCB3ZSBoYXZlIGEgZ2x5 cGggYW5kIGZvbnQgZGF0YSwgZ2V0IGl0cyB3aWR0aC4KICAgICAgICAgZmxvYXQgd2lkdGg7CiAg ICAgICAgIGlmIChjaGFyYWN0ZXIgPT0gJ1x0JyAmJiBtX3J1bi5hbGxvd1RhYnMoKSkKLSAgICAg ICAgICAgIHdpZHRoID0gbV9mb250LT50YWJXaWR0aCgqZm9udCwgbV9ydW4udGFiU2l6ZSgpLCBt X3J1bi54UG9zKCkgKyBtX3J1bldpZHRoU29GYXIgKyB3aWR0aFNpbmNlTGFzdFJvdW5kaW5nKTsK KyAgICAgICAgICAgIHdpZHRoID0gbV9mb250LnRhYldpZHRoKCpmb250LCBtX3J1bi50YWJTaXpl KCksIG1fcnVuLnhQb3MoKSArIG1fcnVuV2lkdGhTb0ZhciArIHdpZHRoU2luY2VMYXN0Um91bmRp bmcpOwogICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIHdpZHRoID0gZm9udC0+d2lkdGhGb3JH bHlwaChnbHlwaCk7CiAKQEAgLTIzMiw3ICsyMzIsNyBAQCBpbmxpbmUgdm9pZCBXaWR0aEl0ZXJh dG9yOjphZHZhbmNlSW50ZXJuYWwoVGV4dEl0ZXJhdG9yJiB0ZXh0SXRlcmF0b3IsIEdseXBoQnVm ZgogICAgICAgICBpZiAoZm9udCAhPSBsYXN0Rm9udERhdGEgJiYgd2lkdGgpIHsKICAgICAgICAg ICAgIGF1dG8gdHJhbnNmb3Jtc1R5cGUgPSBzaG91bGRBcHBseUZvbnRUcmFuc2Zvcm1zKGdseXBo QnVmZmVyLCBsYXN0R2x5cGhDb3VudCwgcHJldmlvdXNDaGFyYWN0ZXIpOwogICAgICAgICAgICAg aWYgKHRyYW5zZm9ybXNUeXBlICE9IFRyYW5zZm9ybXNUeXBlOjpOb25lKSB7Ci0gICAgICAgICAg ICAgICAgbV9ydW5XaWR0aFNvRmFyICs9IGFwcGx5Rm9udFRyYW5zZm9ybXMoZ2x5cGhCdWZmZXIs IG1fcnVuLmx0cigpLCBsYXN0R2x5cGhDb3VudCwgbGFzdEZvbnREYXRhLCBwcmV2aW91c0NoYXJh Y3RlciwgdHJhbnNmb3Jtc1R5cGUgPT0gVHJhbnNmb3Jtc1R5cGU6OkZvcmNlZCwgY2hhcmFjdGVy c1RyZWF0ZWRBc1NwYWNlKTsKKyAgICAgICAgICAgICAgICBtX3J1bldpZHRoU29GYXIgKz0gYXBw bHlGb250VHJhbnNmb3JtcyhnbHlwaEJ1ZmZlciwgbV9ydW4ubHRyKCksIGxhc3RHbHlwaENvdW50 LCAqbGFzdEZvbnREYXRhLCBwcmV2aW91c0NoYXJhY3RlciwgdHJhbnNmb3Jtc1R5cGUgPT0gVHJh bnNmb3Jtc1R5cGU6OkZvcmNlZCwgY2hhcmFjdGVyc1RyZWF0ZWRBc1NwYWNlKTsKICAgICAgICAg ICAgICAgICBpZiAoZ2x5cGhCdWZmZXIpCiAgICAgICAgICAgICAgICAgICAgIGdseXBoQnVmZmVy LT5zaHJpbmsobGFzdEdseXBoQ291bnQpOwogICAgICAgICAgICAgfQpAQCAtMjQxLDEwICsyNDEs MTAgQEAgaW5saW5lIHZvaWQgV2lkdGhJdGVyYXRvcjo6YWR2YW5jZUludGVybmFsKFRleHRJdGVy YXRvciYgdGV4dEl0ZXJhdG9yLCBHbHlwaEJ1ZmYKICAgICAgICAgICAgIGlmIChtX2ZhbGxiYWNr Rm9udHMgJiYgZm9udCAhPSAmcHJpbWFyeUZvbnQpIHsKICAgICAgICAgICAgICAgICAvLyBGSVhN RTogVGhpcyBkb2VzIGEgbGl0dGxlIGV4dHJhIHdvcmsgdGhhdCBjb3VsZCBiZSBhdm9pZGVkIGlm CiAgICAgICAgICAgICAgICAgLy8gZ2x5cGhEYXRhRm9yQ2hhcmFjdGVyKCkgcmV0dXJuZWQgd2hl dGhlciBpdCBjaG9zZSB0byB1c2UgYSBzbWFsbCBjYXBzIGZvbnQuCi0gICAgICAgICAgICAgICAg aWYgKCFtX2ZvbnQtPmlzU21hbGxDYXBzKCkgfHwgY2hhcmFjdGVyID09IHVfdG91cHBlcihjaGFy YWN0ZXIpKQorICAgICAgICAgICAgICAgIGlmICghbV9mb250LmlzU21hbGxDYXBzKCkgfHwgY2hh cmFjdGVyID09IHVfdG91cHBlcihjaGFyYWN0ZXIpKQogICAgICAgICAgICAgICAgICAgICBtX2Zh bGxiYWNrRm9udHMtPmFkZChmb250KTsKICAgICAgICAgICAgICAgICBlbHNlIHsKLSAgICAgICAg ICAgICAgICAgICAgY29uc3QgR2x5cGhEYXRhJiB1cHBlcmNhc2VHbHlwaERhdGEgPSBtX2ZvbnQt PmdseXBoRGF0YUZvckNoYXJhY3Rlcih1X3RvdXBwZXIoY2hhcmFjdGVyKSwgcnRsKTsKKyAgICAg ICAgICAgICAgICAgICAgY29uc3QgR2x5cGhEYXRhJiB1cHBlcmNhc2VHbHlwaERhdGEgPSBtX2Zv bnQuZ2x5cGhEYXRhRm9yQ2hhcmFjdGVyKHVfdG91cHBlcihjaGFyYWN0ZXIpLCBydGwpOwogICAg ICAgICAgICAgICAgICAgICBpZiAodXBwZXJjYXNlR2x5cGhEYXRhLmZvbnQgIT0gJnByaW1hcnlG b250KQogICAgICAgICAgICAgICAgICAgICAgICAgbV9mYWxsYmFja0ZvbnRzLT5hZGQodXBwZXJj YXNlR2x5cGhEYXRhLmZvbnQpOwogICAgICAgICAgICAgICAgIH0KQEAgLTI1NCw3ICsyNTQsNyBA QCBpbmxpbmUgdm9pZCBXaWR0aEl0ZXJhdG9yOjphZHZhbmNlSW50ZXJuYWwoVGV4dEl0ZXJhdG9y JiB0ZXh0SXRlcmF0b3IsIEdseXBoQnVmZgogICAgICAgICBpZiAoaGFzRXh0cmFTcGFjaW5nKSB7 CiAgICAgICAgICAgICAvLyBBY2NvdW50IGZvciBsZXR0ZXItc3BhY2luZy4KICAgICAgICAgICAg IGlmICh3aWR0aCkgewotICAgICAgICAgICAgICAgIHdpZHRoICs9IG1fZm9udC0+bGV0dGVyU3Bh Y2luZygpOworICAgICAgICAgICAgICAgIHdpZHRoICs9IG1fZm9udC5sZXR0ZXJTcGFjaW5nKCk7 CiAgICAgICAgICAgICAgICAgd2lkdGggKz0gbGVmdG92ZXJKdXN0aWZpY2F0aW9uV2lkdGg7CiAg ICAgICAgICAgICAgICAgbGVmdG92ZXJKdXN0aWZpY2F0aW9uV2lkdGggPSAwOwogICAgICAgICAg ICAgfQpAQCAtMzEwLDggKzMxMCw4IEBAIGlubGluZSB2b2lkIFdpZHRoSXRlcmF0b3I6OmFkdmFu Y2VJbnRlcm5hbChUZXh0SXRlcmF0b3ImIHRleHRJdGVyYXRvciwgR2x5cGhCdWZmCiAKICAgICAg ICAgICAgICAgICAvLyBBY2NvdW50IGZvciB3b3JkIHNwYWNpbmcuCiAgICAgICAgICAgICAgICAg Ly8gV2UgYXBwbHkgYWRkaXRpb25hbCBzcGFjZSBiZXR3ZWVuICJ3b3JkcyIgYnkgYWRkaW5nIHdp ZHRoIHRvIHRoZSBzcGFjZSBjaGFyYWN0ZXIuCi0gICAgICAgICAgICAgICAgaWYgKHRyZWF0QXNT cGFjZSAmJiAoY2hhcmFjdGVyICE9ICdcdCcgfHwgIW1fcnVuLmFsbG93VGFicygpKSAmJiAoY3Vy cmVudENoYXJhY3RlckluZGV4IHx8IGNoYXJhY3RlciA9PSBub0JyZWFrU3BhY2UpICYmIG1fZm9u dC0+d29yZFNwYWNpbmcoKSkKLSAgICAgICAgICAgICAgICAgICAgd2lkdGggKz0gbV9mb250LT53 b3JkU3BhY2luZygpOworICAgICAgICAgICAgICAgIGlmICh0cmVhdEFzU3BhY2UgJiYgKGNoYXJh Y3RlciAhPSAnXHQnIHx8ICFtX3J1bi5hbGxvd1RhYnMoKSkgJiYgKGN1cnJlbnRDaGFyYWN0ZXJJ bmRleCB8fCBjaGFyYWN0ZXIgPT0gbm9CcmVha1NwYWNlKSAmJiBtX2ZvbnQud29yZFNwYWNpbmco KSkKKyAgICAgICAgICAgICAgICAgICAgd2lkdGggKz0gbV9mb250LndvcmRTcGFjaW5nKCk7CiAg ICAgICAgICAgICB9IGVsc2UKICAgICAgICAgICAgICAgICBtX2lzQWZ0ZXJFeHBhbnNpb24gPSBm YWxzZTsKICAgICAgICAgfQpAQCAtMzYwLDcgKzM2MCw3IEBAIGlubGluZSB2b2lkIFdpZHRoSXRl cmF0b3I6OmFkdmFuY2VJbnRlcm5hbChUZXh0SXRlcmF0b3ImIHRleHRJdGVyYXRvciwgR2x5cGhC dWZmCiAKICAgICBhdXRvIHRyYW5zZm9ybXNUeXBlID0gc2hvdWxkQXBwbHlGb250VHJhbnNmb3Jt cyhnbHlwaEJ1ZmZlciwgbGFzdEdseXBoQ291bnQsIHByZXZpb3VzQ2hhcmFjdGVyKTsKICAgICBp ZiAodHJhbnNmb3Jtc1R5cGUgIT0gVHJhbnNmb3Jtc1R5cGU6Ok5vbmUpIHsKLSAgICAgICAgbV9y dW5XaWR0aFNvRmFyICs9IGFwcGx5Rm9udFRyYW5zZm9ybXMoZ2x5cGhCdWZmZXIsIG1fcnVuLmx0 cigpLCBsYXN0R2x5cGhDb3VudCwgbGFzdEZvbnREYXRhLCBwcmV2aW91c0NoYXJhY3RlciwgdHJh bnNmb3Jtc1R5cGUgPT0gVHJhbnNmb3Jtc1R5cGU6OkZvcmNlZCwgY2hhcmFjdGVyc1RyZWF0ZWRB c1NwYWNlKTsKKyAgICAgICAgbV9ydW5XaWR0aFNvRmFyICs9IGFwcGx5Rm9udFRyYW5zZm9ybXMo Z2x5cGhCdWZmZXIsIG1fcnVuLmx0cigpLCBsYXN0R2x5cGhDb3VudCwgKmxhc3RGb250RGF0YSwg cHJldmlvdXNDaGFyYWN0ZXIsIHRyYW5zZm9ybXNUeXBlID09IFRyYW5zZm9ybXNUeXBlOjpGb3Jj ZWQsIGNoYXJhY3RlcnNUcmVhdGVkQXNTcGFjZSk7CiAgICAgICAgIGlmIChnbHlwaEJ1ZmZlcikK ICAgICAgICAgICAgIGdseXBoQnVmZmVyLT5zaHJpbmsobGFzdEdseXBoQ291bnQpOwogICAgIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0 b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0b3IuaApp bmRleCA4ZGIzOGJiMjEwYjMxOGE5MjNjMWU5ODJjNTQ2OWUyNThlY2IzYjMyLi44N2JhNTU4NWEy MDIwOTgxNDcyMWJkNTYzNmQ4MDlhZjZjZmQzZWU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJhdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJdGVyYXRvci5oCkBAIC00MCw3ICs0MCw3IEBAIHR5cGVk ZWYgVmVjdG9yPHN0ZDo6cGFpcjx1bnNpZ25lZCwgT3JpZ2luYWxBZHZhbmNlc0ZvckNoYXJhY3Rl clRyZWF0ZWRBc1NwYWNlPiwKIHN0cnVjdCBXaWR0aEl0ZXJhdG9yIHsKICAgICBXVEZfTUFLRV9G QVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKLSAgICBXaWR0aEl0ZXJhdG9yKGNvbnN0IEZvbnRDYXNj YWRlKiwgY29uc3QgVGV4dFJ1biYsIEhhc2hTZXQ8Y29uc3QgRm9udCo+KiBmYWxsYmFja0ZvbnRz ID0gMCwgYm9vbCBhY2NvdW50Rm9yR2x5cGhCb3VuZHMgPSBmYWxzZSwgYm9vbCBmb3JUZXh0RW1w aGFzaXMgPSBmYWxzZSk7CisgICAgV2lkdGhJdGVyYXRvcihjb25zdCBGb250Q2FzY2FkZSYsIGNv bnN0IFRleHRSdW4mLCBIYXNoU2V0PGNvbnN0IEZvbnQqPiogZmFsbGJhY2tGb250cyA9IDAsIGJv b2wgYWNjb3VudEZvckdseXBoQm91bmRzID0gZmFsc2UsIGJvb2wgZm9yVGV4dEVtcGhhc2lzID0g ZmFsc2UpOwogCiAgICAgdm9pZCBhZHZhbmNlKHVuc2lnbmVkIHRvLCBHbHlwaEJ1ZmZlciopOwog ICAgIGJvb2wgYWR2YW5jZU9uZUNoYXJhY3RlcihmbG9hdCYgd2lkdGgsIEdseXBoQnVmZmVyJik7 CkBAIC02Miw5ICs2Miw5IEBAIHByaXZhdGU6CiAKICAgICBlbnVtIGNsYXNzIFRyYW5zZm9ybXNU eXBlIHsgTm9uZSwgRm9yY2VkLCBOb3RGb3JjZWQgfTsKICAgICBUcmFuc2Zvcm1zVHlwZSBzaG91 bGRBcHBseUZvbnRUcmFuc2Zvcm1zKGNvbnN0IEdseXBoQnVmZmVyKiwgdW5zaWduZWQgbGFzdEds eXBoQ291bnQsIFVDaGFyMzIgcHJldmlvdXNDaGFyYWN0ZXIpIGNvbnN0OwotICAgIGZsb2F0IGFw cGx5Rm9udFRyYW5zZm9ybXMoR2x5cGhCdWZmZXIqLCBib29sIGx0ciwgdW5zaWduZWQmIGxhc3RH bHlwaENvdW50LCBjb25zdCBGb250KiwgVUNoYXIzMiBwcmV2aW91c0NoYXJhY3RlciwgYm9vbCBm b3JjZSwgQ2hhcmFjdGVyc1RyZWF0ZWRBc1NwYWNlJik7CisgICAgZmxvYXQgYXBwbHlGb250VHJh bnNmb3JtcyhHbHlwaEJ1ZmZlciosIGJvb2wgbHRyLCB1bnNpZ25lZCYgbGFzdEdseXBoQ291bnQs IGNvbnN0IEZvbnQmLCBVQ2hhcjMyIHByZXZpb3VzQ2hhcmFjdGVyLCBib29sIGZvcmNlLCBDaGFy YWN0ZXJzVHJlYXRlZEFzU3BhY2UmKTsKIAotICAgIGNvbnN0IEZvbnRDYXNjYWRlKiBtX2ZvbnQ7 CisgICAgY29uc3QgRm9udENhc2NhZGUmIG1fZm9udDsKICAgICBjb25zdCBUZXh0UnVuJiBtX3J1 bjsKICAgICBIYXNoU2V0PGNvbnN0IEZvbnQqPiogbV9mYWxsYmFja0ZvbnRzIHsgbnVsbHB0ciB9 OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1NWR1RleHRNZXRy aWNzQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1NWR1RleHRNZXRy aWNzQnVpbGRlci5jcHAKaW5kZXggYzg1MWNiNDRlNmVkMWQ2ODlhMDI3Yzg4OWM5MzZhNGM0NjRl Zjc3NC4uNTM4NGVkMGE2YzMxOGJiMDZhNDJjZTIzMDlhYjViNDlkNjFjNzk0MyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9TVkdUZXh0TWV0cmljc0J1aWxkZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvU1ZHVGV4dE1ldHJpY3NCdWlsZGVy LmNwcApAQCAtMTA1LDcgKzEwNSw3IEBAIHZvaWQgU1ZHVGV4dE1ldHJpY3NCdWlsZGVyOjppbml0 aWFsaXplTWVhc3VyZW1lbnRXaXRoVGV4dFJlbmRlcmVyKFJlbmRlclNWR0lubGluCiAgICAgaWYg KG1faXNDb21wbGV4VGV4dCkKICAgICAgICAgbV9zaW1wbGVXaWR0aEl0ZXJhdG9yID0gbnVsbHB0 cjsKICAgICBlbHNlCi0gICAgICAgIG1fc2ltcGxlV2lkdGhJdGVyYXRvciA9IG1ha2VVbmlxdWU8 V2lkdGhJdGVyYXRvcj4oJnNjYWxlZEZvbnQsIG1fcnVuKTsKKyAgICAgICAgbV9zaW1wbGVXaWR0 aEl0ZXJhdG9yID0gbWFrZVVuaXF1ZTxXaWR0aEl0ZXJhdG9yPihzY2FsZWRGb250LCBtX3J1bik7 CiB9CiAKIHN0cnVjdCBNZWFzdXJlVGV4dERhdGEgewo=