172661 2017-05-26 13:22:15 -0700 Only apply font features for the particular type of font they are being applied to 2020-06-24 12:02:51 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=213569 InRadar P2 Normal --- 1 mmaxfield mmaxfield commit-queue darin dino jonlee rackler simon.fraser thorton webkit-bug-importer oldest_to_newest 1313217 0 mmaxfield 2017-05-26 13:22:15 -0700 Only apply font features for the particular type of font they are being applied to 1313218 1 311368 mmaxfield 2017-05-26 13:23:22 -0700 Created attachment 311368 WIP 1313220 2 mmaxfield 2017-05-26 13:23:41 -0700 <rdar://problem/31534119> 1323547 3 314025 mmaxfield 2017-06-28 09:10:54 -0700 Created attachment 314025 Patch 1323843 4 314106 mmaxfield 2017-06-28 20:51:00 -0700 Created attachment 314106 Patch 1323844 5 mmaxfield 2017-06-28 20:53:09 -0700 <rdar://problem/32799624> 1323888 6 314106 commit-queue 2017-06-28 22:45:48 -0700 Comment on attachment 314106 Patch Clearing flags on attachment: 314106 Committed r218919: <http://trac.webkit.org/changeset/218919> 1323889 7 commit-queue 2017-06-28 22:45:49 -0700 All reviewed patches have been landed. Closing bug. 311368 2017-05-26 13:23:22 -0700 2017-06-28 09:10:53 -0700 WIP bug-172661-20170526132330.patch text/plain 6909 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjE3NDk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjA3ZTM3NjJiOWQ4YmI1 OTA2MDc4ZDIyYzQyZGZkZjM3ZTMwNTVmMC4uNzU1ZDg4ODQ4MTBjYzdjZDBmMTRlY2M2OGQ0MDJm OGQ5MzNlN2JlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE3LTA1LTI2ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgT25seSBhcHBs eSBmb250IGZlYXR1cmVzIGZvciB0aGUgcGFydGljdWxhciB0eXBlIG9mIGZvbnQgdGhleSBhcmUg YmVpbmcgYXBwbGllZCB0bworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTcyNjYxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMTUzNDExOT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMg KE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYWNoZUNv cmVUZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRUeXBlOjpGb250VHlwZSk6CisgICAg ICAgIChXZWJDb3JlOjpwcmVwYXJlUGxhdGZvcm1Gb250KToKKyAgICAgICAgKFdlYkNvcmU6OnZh cmlhdGlvbkNhcGFiaWxpdGllc0ZvckZvbnREZXNjcmlwdG9yKToKKyAgICAgICAgKFdlYkNvcmU6 OmlzR1hWYXJpYWJsZUZvbnQpOiBEZWxldGVkLgorCiAyMDE3LTA1LTI2ICBCZXRoIERha2luICA8 YmRha2luQGFwcGxlLmNvbT4KIAogICAgICAgICBNZWRpYSBkb2N1bWVudHMgaW5zaWRlIGlmcmFt ZXMgc2hvdWxkIG5vdCBnZXQgY29udHJvbHMgaW4gdGhlIFRvdWNoQmFyIHVubGVzcyB0aGUgCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2Fj aGVDb3JlVGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9G b250Q2FjaGVDb3JlVGV4dC5jcHAKaW5kZXggMTgxYzAzMzhhNmZiZjQzNGIwZDhmOWIxMDAzOGE3 YmRlYjZjZTlkNi4uNTg5OWVjYWJjZDQ3Y2ViOWRhMGNlN2U3MGViZWIwODRhOTcyNTk2YyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhY2hl Q29yZVRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29h L0ZvbnRDYWNoZUNvcmVUZXh0LmNwcApAQCAtNDI5LDI0ICs0MjksNiBAQCBzdGF0aWMgaW5saW5l IGJvb2wgZm9udElzU3lzdGVtRm9udChDVEZvbnRSZWYgZm9udCkKICAgICByZXR1cm4gQ0ZTdHJp bmdHZXRMZW5ndGgobmFtZS5nZXQoKSkgPiAwICYmIENGU3RyaW5nR2V0Q2hhcmFjdGVyQXRJbmRl eChuYW1lLmdldCgpLCAwKSA9PSAnLic7CiB9CiAKLXN0YXRpYyBpbmxpbmUgYm9vbCBpc0dYVmFy aWFibGVGb250KENURm9udFJlZiBmb250KQotewotICAgIGF1dG8gdGFibGVzID0gYWRvcHRDRihD VEZvbnRDb3B5QXZhaWxhYmxlVGFibGVzKGZvbnQsIGtDVEZvbnRUYWJsZU9wdGlvbk5vT3B0aW9u cykpOwotICAgIGlmICghdGFibGVzKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgYXV0byBz aXplID0gQ0ZBcnJheUdldENvdW50KHRhYmxlcy5nZXQoKSk7Ci0gICAgZm9yIChDRkluZGV4IGkg PSAwOyBpIDwgc2l6ZTsgKytpKSB7Ci0gICAgICAgIC8vIFRoaXMgaXMgc28geXVja3kuCi0gICAg ICAgIC8vIGh0dHBzOi8vZGV2ZWxvcGVyLmFwcGxlLmNvbS9yZWZlcmVuY2UvY29yZXRleHQvMTUx MDc3NC1jdGZvbnRjb3B5YXZhaWxhYmxldGFibGVzCi0gICAgICAgIC8vICJUaGUgcmV0dXJuZWQg c2V0IHdpbGwgY29udGFpbiB1bmJveGVkIHZhbHVlcywgd2hpY2ggY2FuIGJlIGV4dHJhY3RlZCBs aWtlIHNvOiIKLSAgICAgICAgLy8gIkNURm9udFRhYmxlVGFnIHRhZyA9IChDVEZvbnRUYWJsZVRh ZykodWludHB0cl90KUNGQXJyYXlHZXRWYWx1ZUF0SW5kZXgodGFncywgaW5kZXgpOyIKLSAgICAg ICAgQ1RGb250VGFibGVUYWcgdGFibGVUYWcgPSBzdGF0aWNfY2FzdDxDVEZvbnRUYWJsZVRhZz4o cmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KENGQXJyYXlHZXRWYWx1ZUF0SW5kZXgodGFibGVz LmdldCgpLCBpKSkpOwotICAgICAgICBpZiAodGFibGVUYWcgPT0gJ1NUQVQnKQotICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOwotICAgIH0KLSAgICByZXR1cm4gdHJ1ZTsKLX0KLQogLy8gVGhlc2Ug dmFsdWVzIHdlcmUgY2FsY3VsYXRlZCBieSBwZXJmb3JtaW5nIGEgbGluZWFyIHJlZ3Jlc3Npb24g b24gdGhlIENTUyB3ZWlnaHRzL3dpZHRocy9zbG9wZXMgYW5kIENvcmUgVGV4dCB3ZWlnaHRzL3dp ZHRocy9zbG9wZXMgb2YgU2FuIEZyYW5jaXNjby4KIC8vIEZJWE1FOiA8cmRhcjovL3Byb2JsZW0v MzEzMTI2MDI+IEdldCB0aGUgcmVhbCB2YWx1ZXMgZnJvbSBDb3JlIFRleHQuCiBzdGF0aWMgaW5s aW5lIGZsb2F0IG5vcm1hbGl6ZVdlaWdodChmbG9hdCB2YWx1ZSkKQEAgLTQ5Nyw2ICs0NzksNDkg QEAgc3RhdGljIGlubGluZSBmbG9hdCBub3JtYWxpemVXaWR0aChmbG9hdCB2YWx1ZSkKIH0KICNl bmRpZgogCitzdHJ1Y3QgRm9udFR5cGUgeworICAgIEZvbnRUeXBlKENURm9udFJlZiBmb250KQor ICAgIHsKKyAgICAgICAgYXV0byB0YWJsZXMgPSBhZG9wdENGKENURm9udENvcHlBdmFpbGFibGVU YWJsZXMoZm9udCwga0NURm9udFRhYmxlT3B0aW9uTm9PcHRpb25zKSk7CisgICAgICAgIGlmICgh dGFibGVzKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBhdXRvIHNpemUgPSBDRkFycmF5 R2V0Q291bnQodGFibGVzLmdldCgpKTsKKyAgICAgICAgZm9yIChDRkluZGV4IGkgPSAwOyBpIDwg c2l6ZTsgKytpKSB7CisgICAgICAgICAgICAvLyBUaGlzIGlzIHNvIHl1Y2t5LgorICAgICAgICAg ICAgLy8gaHR0cHM6Ly9kZXZlbG9wZXIuYXBwbGUuY29tL3JlZmVyZW5jZS9jb3JldGV4dC8xNTEw Nzc0LWN0Zm9udGNvcHlhdmFpbGFibGV0YWJsZXMKKyAgICAgICAgICAgIC8vICJUaGUgcmV0dXJu ZWQgc2V0IHdpbGwgY29udGFpbiB1bmJveGVkIHZhbHVlcywgd2hpY2ggY2FuIGJlIGV4dHJhY3Rl ZCBsaWtlIHNvOiIKKyAgICAgICAgICAgIC8vICJDVEZvbnRUYWJsZVRhZyB0YWcgPSAoQ1RGb250 VGFibGVUYWcpKHVpbnRwdHJfdClDRkFycmF5R2V0VmFsdWVBdEluZGV4KHRhZ3MsIGluZGV4KTsi CisgICAgICAgICAgICBDVEZvbnRUYWJsZVRhZyB0YWJsZVRhZyA9IHN0YXRpY19jYXN0PENURm9u dFRhYmxlVGFnPihyZWludGVycHJldF9jYXN0PHVpbnRwdHJfdD4oQ0ZBcnJheUdldFZhbHVlQXRJ bmRleCh0YWJsZXMuZ2V0KCksIGkpKSk7CisgICAgICAgICAgICBzd2l0Y2ggKHRhYmxlVGFnKSB7 CisgICAgICAgICAgICBjYXNlICdmdmFyJzoKKyAgICAgICAgICAgICAgICBpZiAodmFyaWF0aW9u VHlwZSA9PSBWYXJpYXRpb25UeXBlOjpOb3RWYXJpYWJsZSkKKyAgICAgICAgICAgICAgICAgICAg dmFyaWF0aW9uVHlwZSA9IFZhcmlhdGlvblR5cGU6OlRydWVUeXBlR1g7CisgICAgICAgICAgICAg ICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlICdTVEFUJzoKKyAgICAgICAgICAgICAgICB2YXJp YXRpb25UeXBlID0gVmFyaWF0aW9uVHlwZTo6T3BlblR5cGUxODsKKyAgICAgICAgICAgICAgICBi cmVhazsKKyAgICAgICAgICAgIGNhc2UgJ21vcngnOgorICAgICAgICAgICAgY2FzZSAnbW9ydCc6 CisgICAgICAgICAgICAgICAgYWF0U2hhcGluZyA9IHRydWU7CisgICAgICAgICAgICAgICAgYnJl YWs7CisgICAgICAgICAgICBjYXNlICdHUE9TJzoKKyAgICAgICAgICAgIGNhc2UgJ0dTVUInOgor ICAgICAgICAgICAgICAgIG9wZW5UeXBlU2hhcGluZyA9IHRydWU7CisgICAgICAgICAgICAgICAg YnJlYWs7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9CisKKyAgICBlbnVtIGNsYXNz IFZhcmlhdGlvblR5cGUgeworICAgICAgICBOb3RWYXJpYWJsZSwKKyAgICAgICAgVHJ1ZVR5cGVH WCwKKyAgICAgICAgT3BlblR5cGUxOAorICAgIH07CisgICAgVmFyaWF0aW9uVHlwZSB2YXJpYXRp b25UeXBlIHsgVmFyaWF0aW9uVHlwZTo6Tm90VmFyaWFibGUgfTsKKyAgICBib29sIG9wZW5UeXBl U2hhcGluZyB7IGZhbHNlIH07CisgICAgYm9vbCBhYXRTaGFwaW5nIHsgZmFsc2UgfTsKK307CisK IFJldGFpblB0cjxDVEZvbnRSZWY+IHByZXBhcmVQbGF0Zm9ybUZvbnQoQ1RGb250UmVmIG9yaWdp bmFsRm9udCwgVGV4dFJlbmRlcmluZ01vZGUgdGV4dFJlbmRlcmluZ01vZGUsIGNvbnN0IEZvbnRG ZWF0dXJlU2V0dGluZ3MqIGZvbnRGYWNlRmVhdHVyZXMsIGNvbnN0IEZvbnRWYXJpYW50U2V0dGlu Z3MqIGZvbnRGYWNlVmFyaWFudFNldHRpbmdzLCBGb250U2VsZWN0aW9uU3BlY2lmaWVkQ2FwYWJp bGl0aWVzIGZvbnRGYWNlQ2FwYWJpbGl0aWVzLCBjb25zdCBGb250RmVhdHVyZVNldHRpbmdzJiBm ZWF0dXJlcywgY29uc3QgRm9udFZhcmlhbnRTZXR0aW5ncyYgdmFyaWFudFNldHRpbmdzLCBGb250 U2VsZWN0aW9uUmVxdWVzdCBmb250U2VsZWN0aW9uUmVxdWVzdCwgY29uc3QgRm9udFZhcmlhdGlv blNldHRpbmdzJiB2YXJpYXRpb25zLCBGb250T3B0aWNhbFNpemluZyBmb250T3B0aWNhbFNpemlu ZywgZmxvYXQgc2l6ZSwgRm9udFN0eWxlQXhpcyBheGlzKQogewogICAgIGJvb2wgYWx3YXlzQWRk VmFyaWF0aW9ucyA9IGZhbHNlOwpAQCAtNTQ5LDEwICs1NzQsMTIgQEAgUmV0YWluUHRyPENURm9u dFJlZj4gcHJlcGFyZVBsYXRmb3JtRm9udChDVEZvbnRSZWYgb3JpZ2luYWxGb250LCBUZXh0UmVu ZGVyaW5nTW8KICAgICBmb3IgKGF1dG8mIG5ld0ZlYXR1cmUgOiBmZWF0dXJlcykKICAgICAgICAg ZmVhdHVyZXNUb0JlQXBwbGllZC5zZXQobmV3RmVhdHVyZS50YWcoKSwgbmV3RmVhdHVyZS52YWx1 ZSgpKTsKIAorICAgIEZvbnRUeXBlIGZvbnRUeXBlKG9yaWdpbmFsRm9udCk7CisKICNpZiBFTkFC TEUoVkFSSUFUSU9OX0ZPTlRTKQogICAgIFZhcmlhdGlvbnNNYXAgdmFyaWF0aW9uc1RvQmVBcHBs aWVkOwogCi0gICAgYm9vbCBuZWVkc0NvbnZlcnNpb24gPSBpc0dYVmFyaWFibGVGb250KG9yaWdp bmFsRm9udCk7CisgICAgYm9vbCBuZWVkc0NvbnZlcnNpb24gPSBmb250VHlwZS52YXJpYXRpb25U eXBlID09IEZvbnRUeXBlOjpWYXJpYXRpb25UeXBlOjpUcnVlVHlwZUdYOwogICAgIGF1dG8gYXBw bHlWYXJpYXRpb25WYWx1ZSA9IFsmXShjb25zdCBGb250VGFnJiB0YWcsIGZsb2F0IHZhbHVlLCBi b29sIGlzRGVmYXVsdFZhbHVlKSB7CiAgICAgICAgIC8vIEZJWE1FOiBSZW1vdmUgd2hlbiA8cmRh cjovL3Byb2JsZW0vMjg3MDc4MjI+IGlzIGZpeGVkCiAjZGVmaW5lIFdPUktBUk9VTkRfQ09SRVRF WFRfVkFSSUFUSU9OU19ERUZBVUxUX1ZBTFVFX0JVRyAoKFBMQVRGT1JNKE1BQykgJiYgX19NQUNf T1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA8IDEwMTMwMCkgfHwgKFBMQVRGT1JNKElPUykgJiYg X19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPCAxMTAwMDApKQpAQCAtNjI1LDggKzY1 MiwxMCBAQCBSZXRhaW5QdHI8Q1RGb250UmVmPiBwcmVwYXJlUGxhdGZvcm1Gb250KENURm9udFJl ZiBvcmlnaW5hbEZvbnQsIFRleHRSZW5kZXJpbmdNbwogICAgICAgICBhdXRvIGZlYXR1cmVBcnJh eSA9IGFkb3B0Q0YoQ0ZBcnJheUNyZWF0ZU11dGFibGUoa0NGQWxsb2NhdG9yRGVmYXVsdCwgZmVh dHVyZXMuc2l6ZSgpLCAma0NGVHlwZUFycmF5Q2FsbEJhY2tzKSk7CiAgICAgICAgIGZvciAoYXV0 byYgcCA6IGZlYXR1cmVzVG9CZUFwcGxpZWQpIHsKICAgICAgICAgICAgIGF1dG8gZmVhdHVyZSA9 IEZvbnRGZWF0dXJlKHAua2V5LCBwLnZhbHVlKTsKLSAgICAgICAgICAgIGFwcGVuZFRydWVUeXBl RmVhdHVyZShmZWF0dXJlQXJyYXkuZ2V0KCksIGZlYXR1cmUpOwotICAgICAgICAgICAgYXBwZW5k T3BlblR5cGVGZWF0dXJlKGZlYXR1cmVBcnJheS5nZXQoKSwgZmVhdHVyZSk7CisgICAgICAgICAg ICBpZiAoZm9udFR5cGUuYWF0U2hhcGluZykKKyAgICAgICAgICAgICAgICBhcHBlbmRUcnVlVHlw ZUZlYXR1cmUoZmVhdHVyZUFycmF5LmdldCgpLCBmZWF0dXJlKTsKKyAgICAgICAgICAgIGlmIChm b250VHlwZS5vcGVuVHlwZVNoYXBpbmcpCisgICAgICAgICAgICAgICAgYXBwZW5kT3BlblR5cGVG ZWF0dXJlKGZlYXR1cmVBcnJheS5nZXQoKSwgZmVhdHVyZSk7CiAgICAgICAgIH0KICAgICAgICAg Q0ZEaWN0aW9uYXJ5QWRkVmFsdWUoYXR0cmlidXRlcy5nZXQoKSwga0NURm9udEZlYXR1cmVTZXR0 aW5nc0F0dHJpYnV0ZSwgZmVhdHVyZUFycmF5LmdldCgpKTsKICAgICB9CkBAIC05ODIsNyArMTAx MSw3IEBAIHN0YXRpYyBWYXJpYXRpb25DYXBhYmlsaXRpZXMgdmFyaWF0aW9uQ2FwYWJpbGl0aWVz Rm9yRm9udERlc2NyaXB0b3IoQ1RGb250RGVzY3JpCiAgICAgICAgICAgICByZXN1bHQuc2xvcGUg PSBleHRyYWN0VmFyaWF0aW9uQm91bmRzKGF4aXMpOwogICAgIH0KIAotICAgIGlmIChpc0dYVmFy aWFibGVGb250KGZvbnQuZ2V0KCkpKSB7CisgICAgaWYgKEZvbnRUeXBlKGZvbnQuZ2V0KCkpLnZh cmlhdGlvblR5cGUgPT0gRm9udFR5cGU6OlZhcmlhdGlvblR5cGU6OlRydWVUeXBlR1gpIHsKICAg ICAgICAgaWYgKHJlc3VsdC53ZWlnaHQpCiAgICAgICAgICAgICByZXN1bHQud2VpZ2h0ID0ge3sg bm9ybWFsaXplV2VpZ2h0KHJlc3VsdC53ZWlnaHQudmFsdWUoKS5taW5pbXVtKSwgbm9ybWFsaXpl V2VpZ2h0KHJlc3VsdC53ZWlnaHQudmFsdWUoKS5tYXhpbXVtKSB9fTsKICAgICAgICAgaWYgKHJl c3VsdC53aWR0aCkK 314025 2017-06-28 09:10:54 -0700 2017-06-28 20:50:59 -0700 Patch bug-172661-20170628091053.patch text/plain 6654 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4ODY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzkxODZhZjY0MmNlYTJj NTJlYjEyZmM3OTU3MjYxMDhhOGYwNTMwNy4uNjMyZjE4ZDI4NDNjMWFiZDExOTZhYzY3ZjBkNGQ4 NWNlNzk1OGNiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE3LTA2LTI3ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgT25seSBhcHBs eSBmb250IGZlYXR1cmVzIGZvciB0aGUgcGFydGljdWxhciB0eXBlIG9mIGZvbnQgdGhleSBhcmUg YmVpbmcgYXBwbGllZCB0bworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTcyNjYxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMTUzNDExOT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBVbi1tYXJr aW5nIHRoZXNlIHRlc3RzIGFzIGZhaWx1cmUgb24gSGlnaCBTaWVycmE6CisgICAgICAgICAgICAg IGNzczMvZm9udC12YXJpYW50LXBldGl0ZS1jYXBzLXN5bnRoZXNpcy1jb3ZlcmFnZS5odG1sCisg ICAgICAgICAgICAgIGNzczMvZm9udC12YXJpYW50LXNtYWxsLWNhcHMtc3ludGhlc2lzLWNvdmVy YWdlLmh0bWwKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYWNoZUNv cmVUZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRUeXBlOjpGb250VHlwZSk6CisgICAg ICAgIChXZWJDb3JlOjpwcmVwYXJlUGxhdGZvcm1Gb250KToKKyAgICAgICAgKFdlYkNvcmU6OnZh cmlhdGlvbkNhcGFiaWxpdGllc0ZvckZvbnREZXNjcmlwdG9yKToKKyAgICAgICAgKFdlYkNvcmU6 OmlzR1hWYXJpYWJsZUZvbnQpOiBEZWxldGVkLgorCiAyMDE3LTA2LTI3ICBDaHJpcyBEdW1leiAg PGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgW1Jlc291cmNlTG9hZFN0YXRpc3RpY3NdIFVw ZGF0ZSBtaW5pbXVtVGltZUJldHdlZWVuRGF0YVJlY29yZHNSZW1vdmFsIHRvIDEgaG91ciBpbnN0 ZWFkIG9mIDEgbWludXRlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jb2NvYS9Gb250Q2FjaGVDb3JlVGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jb2NvYS9Gb250Q2FjaGVDb3JlVGV4dC5jcHAKaW5kZXggZGEwZWMyNjJjYzRj OTIyNzIwNTI1MWNhN2U2NTViNmI1Mzc1NWQwZS4uMjIzMWZlMjM0YWZiNThiZmYwODFkN2NlODI0 YTk3NjI1OTBkZTcxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY29jb2EvRm9udENhY2hlQ29yZVRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYWNoZUNvcmVUZXh0LmNwcApAQCAtNDIwLDI0ICs0MjAs NiBAQCBzdGF0aWMgaW5saW5lIGJvb2wgZm9udElzU3lzdGVtRm9udChDVEZvbnRSZWYgZm9udCkK ICAgICByZXR1cm4gQ0ZTdHJpbmdHZXRMZW5ndGgobmFtZS5nZXQoKSkgPiAwICYmIENGU3RyaW5n R2V0Q2hhcmFjdGVyQXRJbmRleChuYW1lLmdldCgpLCAwKSA9PSAnLic7CiB9CiAKLXN0YXRpYyBp bmxpbmUgYm9vbCBpc0dYVmFyaWFibGVGb250KENURm9udFJlZiBmb250KQotewotICAgIGF1dG8g dGFibGVzID0gYWRvcHRDRihDVEZvbnRDb3B5QXZhaWxhYmxlVGFibGVzKGZvbnQsIGtDVEZvbnRU YWJsZU9wdGlvbk5vT3B0aW9ucykpOwotICAgIGlmICghdGFibGVzKQotICAgICAgICByZXR1cm4g ZmFsc2U7Ci0gICAgYXV0byBzaXplID0gQ0ZBcnJheUdldENvdW50KHRhYmxlcy5nZXQoKSk7Ci0g ICAgZm9yIChDRkluZGV4IGkgPSAwOyBpIDwgc2l6ZTsgKytpKSB7Ci0gICAgICAgIC8vIFRoaXMg aXMgc28geXVja3kuCi0gICAgICAgIC8vIGh0dHBzOi8vZGV2ZWxvcGVyLmFwcGxlLmNvbS9yZWZl cmVuY2UvY29yZXRleHQvMTUxMDc3NC1jdGZvbnRjb3B5YXZhaWxhYmxldGFibGVzCi0gICAgICAg IC8vICJUaGUgcmV0dXJuZWQgc2V0IHdpbGwgY29udGFpbiB1bmJveGVkIHZhbHVlcywgd2hpY2gg Y2FuIGJlIGV4dHJhY3RlZCBsaWtlIHNvOiIKLSAgICAgICAgLy8gIkNURm9udFRhYmxlVGFnIHRh ZyA9IChDVEZvbnRUYWJsZVRhZykodWludHB0cl90KUNGQXJyYXlHZXRWYWx1ZUF0SW5kZXgodGFn cywgaW5kZXgpOyIKLSAgICAgICAgQ1RGb250VGFibGVUYWcgdGFibGVUYWcgPSBzdGF0aWNfY2Fz dDxDVEZvbnRUYWJsZVRhZz4ocmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KENGQXJyYXlHZXRW YWx1ZUF0SW5kZXgodGFibGVzLmdldCgpLCBpKSkpOwotICAgICAgICBpZiAodGFibGVUYWcgPT0g J1NUQVQnKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIH0KLSAgICByZXR1cm4gdHJ1 ZTsKLX0KLQogLy8gVGhlc2UgdmFsdWVzIHdlcmUgY2FsY3VsYXRlZCBieSBwZXJmb3JtaW5nIGEg bGluZWFyIHJlZ3Jlc3Npb24gb24gdGhlIENTUyB3ZWlnaHRzL3dpZHRocy9zbG9wZXMgYW5kIENv cmUgVGV4dCB3ZWlnaHRzL3dpZHRocy9zbG9wZXMgb2YgU2FuIEZyYW5jaXNjby4KIC8vIEZJWE1F OiA8cmRhcjovL3Byb2JsZW0vMzEzMTI2MDI+IEdldCB0aGUgcmVhbCB2YWx1ZXMgZnJvbSBDb3Jl IFRleHQuCiBzdGF0aWMgaW5saW5lIGZsb2F0IG5vcm1hbGl6ZVdlaWdodChmbG9hdCB2YWx1ZSkK QEAgLTQ4OCw2ICs0NzAsNDkgQEAgc3RhdGljIGlubGluZSBmbG9hdCBub3JtYWxpemVXaWR0aChm bG9hdCB2YWx1ZSkKIH0KICNlbmRpZgogCitzdHJ1Y3QgRm9udFR5cGUgeworICAgIEZvbnRUeXBl KENURm9udFJlZiBmb250KQorICAgIHsKKyAgICAgICAgYXV0byB0YWJsZXMgPSBhZG9wdENGKENU Rm9udENvcHlBdmFpbGFibGVUYWJsZXMoZm9udCwga0NURm9udFRhYmxlT3B0aW9uTm9PcHRpb25z KSk7CisgICAgICAgIGlmICghdGFibGVzKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBh dXRvIHNpemUgPSBDRkFycmF5R2V0Q291bnQodGFibGVzLmdldCgpKTsKKyAgICAgICAgZm9yIChD RkluZGV4IGkgPSAwOyBpIDwgc2l6ZTsgKytpKSB7CisgICAgICAgICAgICAvLyBUaGlzIGlzIHNv IHl1Y2t5LgorICAgICAgICAgICAgLy8gaHR0cHM6Ly9kZXZlbG9wZXIuYXBwbGUuY29tL3JlZmVy ZW5jZS9jb3JldGV4dC8xNTEwNzc0LWN0Zm9udGNvcHlhdmFpbGFibGV0YWJsZXMKKyAgICAgICAg ICAgIC8vICJUaGUgcmV0dXJuZWQgc2V0IHdpbGwgY29udGFpbiB1bmJveGVkIHZhbHVlcywgd2hp Y2ggY2FuIGJlIGV4dHJhY3RlZCBsaWtlIHNvOiIKKyAgICAgICAgICAgIC8vICJDVEZvbnRUYWJs ZVRhZyB0YWcgPSAoQ1RGb250VGFibGVUYWcpKHVpbnRwdHJfdClDRkFycmF5R2V0VmFsdWVBdElu ZGV4KHRhZ3MsIGluZGV4KTsiCisgICAgICAgICAgICBDVEZvbnRUYWJsZVRhZyB0YWJsZVRhZyA9 IHN0YXRpY19jYXN0PENURm9udFRhYmxlVGFnPihyZWludGVycHJldF9jYXN0PHVpbnRwdHJfdD4o Q0ZBcnJheUdldFZhbHVlQXRJbmRleCh0YWJsZXMuZ2V0KCksIGkpKSk7CisgICAgICAgICAgICBz d2l0Y2ggKHRhYmxlVGFnKSB7CisgICAgICAgICAgICBjYXNlICdmdmFyJzoKKyAgICAgICAgICAg ICAgICBpZiAodmFyaWF0aW9uVHlwZSA9PSBWYXJpYXRpb25UeXBlOjpOb3RWYXJpYWJsZSkKKyAg ICAgICAgICAgICAgICAgICAgdmFyaWF0aW9uVHlwZSA9IFZhcmlhdGlvblR5cGU6OlRydWVUeXBl R1g7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlICdTVEFUJzoKKyAg ICAgICAgICAgICAgICB2YXJpYXRpb25UeXBlID0gVmFyaWF0aW9uVHlwZTo6T3BlblR5cGUxODsK KyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGNhc2UgJ21vcngnOgorICAgICAg ICAgICAgY2FzZSAnbW9ydCc6CisgICAgICAgICAgICAgICAgYWF0U2hhcGluZyA9IHRydWU7Cisg ICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlICdHUE9TJzoKKyAgICAgICAg ICAgIGNhc2UgJ0dTVUInOgorICAgICAgICAgICAgICAgIG9wZW5UeXBlU2hhcGluZyA9IHRydWU7 CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9 CisKKyAgICBlbnVtIGNsYXNzIFZhcmlhdGlvblR5cGUgeworICAgICAgICBOb3RWYXJpYWJsZSwK KyAgICAgICAgVHJ1ZVR5cGVHWCwKKyAgICAgICAgT3BlblR5cGUxOAorICAgIH07CisgICAgVmFy aWF0aW9uVHlwZSB2YXJpYXRpb25UeXBlIHsgVmFyaWF0aW9uVHlwZTo6Tm90VmFyaWFibGUgfTsK KyAgICBib29sIG9wZW5UeXBlU2hhcGluZyB7IGZhbHNlIH07CisgICAgYm9vbCBhYXRTaGFwaW5n IHsgZmFsc2UgfTsKK307CisKIFJldGFpblB0cjxDVEZvbnRSZWY+IHByZXBhcmVQbGF0Zm9ybUZv bnQoQ1RGb250UmVmIG9yaWdpbmFsRm9udCwgY29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVz Y3JpcHRpb24sIGNvbnN0IEZvbnRGZWF0dXJlU2V0dGluZ3MqIGZvbnRGYWNlRmVhdHVyZXMsIGNv bnN0IEZvbnRWYXJpYW50U2V0dGluZ3MqIGZvbnRGYWNlVmFyaWFudFNldHRpbmdzLCBGb250U2Vs ZWN0aW9uU3BlY2lmaWVkQ2FwYWJpbGl0aWVzIGZvbnRGYWNlQ2FwYWJpbGl0aWVzLCBmbG9hdCBz aXplKQogewogICAgIGJvb2wgYWx3YXlzQWRkVmFyaWF0aW9ucyA9IGZhbHNlOwpAQCAtNTQ2LDEw ICs1NzEsMTIgQEAgUmV0YWluUHRyPENURm9udFJlZj4gcHJlcGFyZVBsYXRmb3JtRm9udChDVEZv bnRSZWYgb3JpZ2luYWxGb250LCBjb25zdCBGb250RGVzY3IKICAgICBmb3IgKGF1dG8mIG5ld0Zl YXR1cmUgOiBmZWF0dXJlcykKICAgICAgICAgZmVhdHVyZXNUb0JlQXBwbGllZC5zZXQobmV3RmVh dHVyZS50YWcoKSwgbmV3RmVhdHVyZS52YWx1ZSgpKTsKIAorICAgIEZvbnRUeXBlIGZvbnRUeXBl KG9yaWdpbmFsRm9udCk7CisKICNpZiBFTkFCTEUoVkFSSUFUSU9OX0ZPTlRTKQogICAgIFZhcmlh dGlvbnNNYXAgdmFyaWF0aW9uc1RvQmVBcHBsaWVkOwogCi0gICAgYm9vbCBuZWVkc0NvbnZlcnNp b24gPSBpc0dYVmFyaWFibGVGb250KG9yaWdpbmFsRm9udCk7CisgICAgYm9vbCBuZWVkc0NvbnZl cnNpb24gPSBmb250VHlwZS52YXJpYXRpb25UeXBlID09IEZvbnRUeXBlOjpWYXJpYXRpb25UeXBl OjpUcnVlVHlwZUdYOwogCiAgICAgYXV0byBhcHBseVZhcmlhdGlvbiA9IFsmXShjb25zdCBGb250 VGFnJiB0YWcsIGZsb2F0IHZhbHVlKSB7CiAgICAgICAgIGF1dG8gaXRlcmF0b3IgPSBkZWZhdWx0 VmFsdWVzLmZpbmQodGFnKTsKQEAgLTU5OCw4ICs2MjUsMTAgQEAgUmV0YWluUHRyPENURm9udFJl Zj4gcHJlcGFyZVBsYXRmb3JtRm9udChDVEZvbnRSZWYgb3JpZ2luYWxGb250LCBjb25zdCBGb250 RGVzY3IKICAgICAgICAgYXV0byBmZWF0dXJlQXJyYXkgPSBhZG9wdENGKENGQXJyYXlDcmVhdGVN dXRhYmxlKGtDRkFsbG9jYXRvckRlZmF1bHQsIGZlYXR1cmVzLnNpemUoKSwgJmtDRlR5cGVBcnJh eUNhbGxCYWNrcykpOwogICAgICAgICBmb3IgKGF1dG8mIHAgOiBmZWF0dXJlc1RvQmVBcHBsaWVk KSB7CiAgICAgICAgICAgICBhdXRvIGZlYXR1cmUgPSBGb250RmVhdHVyZShwLmtleSwgcC52YWx1 ZSk7Ci0gICAgICAgICAgICBhcHBlbmRUcnVlVHlwZUZlYXR1cmUoZmVhdHVyZUFycmF5LmdldCgp LCBmZWF0dXJlKTsKLSAgICAgICAgICAgIGFwcGVuZE9wZW5UeXBlRmVhdHVyZShmZWF0dXJlQXJy YXkuZ2V0KCksIGZlYXR1cmUpOworICAgICAgICAgICAgaWYgKGZvbnRUeXBlLmFhdFNoYXBpbmcp CisgICAgICAgICAgICAgICAgYXBwZW5kVHJ1ZVR5cGVGZWF0dXJlKGZlYXR1cmVBcnJheS5nZXQo KSwgZmVhdHVyZSk7CisgICAgICAgICAgICBpZiAoZm9udFR5cGUub3BlblR5cGVTaGFwaW5nKQor ICAgICAgICAgICAgICAgIGFwcGVuZE9wZW5UeXBlRmVhdHVyZShmZWF0dXJlQXJyYXkuZ2V0KCks IGZlYXR1cmUpOwogICAgICAgICB9CiAgICAgICAgIENGRGljdGlvbmFyeUFkZFZhbHVlKGF0dHJp YnV0ZXMuZ2V0KCksIGtDVEZvbnRGZWF0dXJlU2V0dGluZ3NBdHRyaWJ1dGUsIGZlYXR1cmVBcnJh eS5nZXQoKSk7CiAgICAgfQpAQCAtOTYzLDcgKzk5Miw3IEBAIHN0YXRpYyBWYXJpYXRpb25DYXBh YmlsaXRpZXMgdmFyaWF0aW9uQ2FwYWJpbGl0aWVzRm9yRm9udERlc2NyaXB0b3IoQ1RGb250RGVz Y3JpCiAgICAgICAgICAgICByZXN1bHQuc2xvcGUgPSBleHRyYWN0VmFyaWF0aW9uQm91bmRzKGF4 aXMpOwogICAgIH0KIAotICAgIGlmIChpc0dYVmFyaWFibGVGb250KGZvbnQuZ2V0KCkpKSB7Cisg ICAgaWYgKEZvbnRUeXBlKGZvbnQuZ2V0KCkpLnZhcmlhdGlvblR5cGUgPT0gRm9udFR5cGU6OlZh cmlhdGlvblR5cGU6OlRydWVUeXBlR1gpIHsKICAgICAgICAgaWYgKHJlc3VsdC53ZWlnaHQpCiAg ICAgICAgICAgICByZXN1bHQud2VpZ2h0ID0ge3sgbm9ybWFsaXplV2VpZ2h0KHJlc3VsdC53ZWln aHQudmFsdWUoKS5taW5pbXVtKSwgbm9ybWFsaXplV2VpZ2h0KHJlc3VsdC53ZWlnaHQudmFsdWUo KS5tYXhpbXVtKSB9fTsKICAgICAgICAgaWYgKHJlc3VsdC53aWR0aCkK 314106 2017-06-28 20:51:00 -0700 2017-06-28 22:45:48 -0700 Patch bug-172661-20170628205214.patch text/plain 7051 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4OTA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDA4ODI3YjcxNGMyODMz NTY0M2Q4NDMxZTA4NTg2NjczOTY2Nzk2Zi4uZTQ2OWQ4NmUwYjAwMTJmYTdjNWY4Njk5MmE0MjU0 MTMxMzk3Y2JmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE3LTA2LTI4ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgT25seSBhcHBs eSBmb250IGZlYXR1cmVzIGZvciB0aGUgcGFydGljdWxhciB0eXBlIG9mIGZvbnQgdGhleSBhcmUg YmVpbmcgYXBwbGllZCB0bworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTcyNjYxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMTUzNDExOT4KKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzMyNzk5NjI0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFRoZXJlIGFyZSB0d28gdHlwZXMgb2YgZm9udCBmb3JtYXRz IHdoaWNoIHN1cHBvcnQgZmVhdHVyZXM6IEFBVCBhbmQgT1RGLiBFYWNoIG9mIHRoZW0gaGFzCisg ICAgICAgIGEgZGlmZmVyZW50IGlkZWEgYWJvdXQgd2hhdCB0aGUgaWRlbnRpdHkgb2YgYSBmZWF0 dXJlIGlzLiBXZSB3ZXJlIHNwZWNpZnlpbmcgYm90aCB0eXBlcworICAgICAgICBvZiBmZWF0dXJl IGlkZW50aXRpZXMgdG8gQ29yZSBUZXh0OyBob3dldmVyLCB0aGlzIGlzIGNhdXNpbmcgQ29yZSBU ZXh0IHRvIGdldCBjb25mdXNlZC4KKyAgICAgICAgSW5zdGVhZCwgd2Ugc2hvdWxkIG9ubHkgYXBw bHkgQUFUIGZlYXR1cmVzIHRvIEFBVCBmb250cyBhbmQgT1RGIGZlYXR1cmVzIHRvIE9URiBmb250 cy4KKworICAgICAgICBUZXN0OiBVbi1tYXJraW5nIHRoZXNlIHRlc3RzIGFzIGZhaWx1cmUgb24g SGlnaCBTaWVycmE6CisgICAgICAgICAgICAgIGNzczMvZm9udC12YXJpYW50LXBldGl0ZS1jYXBz LXN5bnRoZXNpcy1jb3ZlcmFnZS5odG1sCisgICAgICAgICAgICAgIGNzczMvZm9udC12YXJpYW50 LXNtYWxsLWNhcHMtc3ludGhlc2lzLWNvdmVyYWdlLmh0bWwKKworICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL2NvY29hL0ZvbnRDYWNoZUNvcmVUZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkZvbnRUeXBlOjpGb250VHlwZSk6CisgICAgICAgIChXZWJDb3JlOjpwcmVwYXJlUGxhdGZvcm1G b250KToKKyAgICAgICAgKFdlYkNvcmU6OnZhcmlhdGlvbkNhcGFiaWxpdGllc0ZvckZvbnREZXNj cmlwdG9yKToKKyAgICAgICAgKFdlYkNvcmU6OmlzR1hWYXJpYWJsZUZvbnQpOiBEZWxldGVkLgor CiAyMDE3LTA2LTI3ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAK ICAgICAgICAgW2lPU10gQ2Fubm90IGl0YWxpY2l6ZSBvciBib2xkIHRleHQgcmVuZGVyZWQgd2l0 aCB0ZXh0IHN0eWxlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY29jb2EvRm9udENhY2hlQ29yZVRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY29jb2EvRm9udENhY2hlQ29yZVRleHQuY3BwCmluZGV4IGRhMGVjMjYyY2M0Yzky MjcyMDUyNTFjYTdlNjU1YjZiNTM3NTVkMGUuLjIyMzFmZTIzNGFmYjU4YmZmMDgxZDdjZTgyNGE5 NzYyNTkwZGU3MTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2NvY29hL0ZvbnRDYWNoZUNvcmVUZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jb2NvYS9Gb250Q2FjaGVDb3JlVGV4dC5jcHAKQEAgLTQyMCwyNCArNDIwLDYg QEAgc3RhdGljIGlubGluZSBib29sIGZvbnRJc1N5c3RlbUZvbnQoQ1RGb250UmVmIGZvbnQpCiAg ICAgcmV0dXJuIENGU3RyaW5nR2V0TGVuZ3RoKG5hbWUuZ2V0KCkpID4gMCAmJiBDRlN0cmluZ0dl dENoYXJhY3RlckF0SW5kZXgobmFtZS5nZXQoKSwgMCkgPT0gJy4nOwogfQogCi1zdGF0aWMgaW5s aW5lIGJvb2wgaXNHWFZhcmlhYmxlRm9udChDVEZvbnRSZWYgZm9udCkKLXsKLSAgICBhdXRvIHRh YmxlcyA9IGFkb3B0Q0YoQ1RGb250Q29weUF2YWlsYWJsZVRhYmxlcyhmb250LCBrQ1RGb250VGFi bGVPcHRpb25Ob09wdGlvbnMpKTsKLSAgICBpZiAoIXRhYmxlcykKLSAgICAgICAgcmV0dXJuIGZh bHNlOwotICAgIGF1dG8gc2l6ZSA9IENGQXJyYXlHZXRDb3VudCh0YWJsZXMuZ2V0KCkpOwotICAg IGZvciAoQ0ZJbmRleCBpID0gMDsgaSA8IHNpemU7ICsraSkgewotICAgICAgICAvLyBUaGlzIGlz IHNvIHl1Y2t5LgotICAgICAgICAvLyBodHRwczovL2RldmVsb3Blci5hcHBsZS5jb20vcmVmZXJl bmNlL2NvcmV0ZXh0LzE1MTA3NzQtY3Rmb250Y29weWF2YWlsYWJsZXRhYmxlcwotICAgICAgICAv LyAiVGhlIHJldHVybmVkIHNldCB3aWxsIGNvbnRhaW4gdW5ib3hlZCB2YWx1ZXMsIHdoaWNoIGNh biBiZSBleHRyYWN0ZWQgbGlrZSBzbzoiCi0gICAgICAgIC8vICJDVEZvbnRUYWJsZVRhZyB0YWcg PSAoQ1RGb250VGFibGVUYWcpKHVpbnRwdHJfdClDRkFycmF5R2V0VmFsdWVBdEluZGV4KHRhZ3Ms IGluZGV4KTsiCi0gICAgICAgIENURm9udFRhYmxlVGFnIHRhYmxlVGFnID0gc3RhdGljX2Nhc3Q8 Q1RGb250VGFibGVUYWc+KHJlaW50ZXJwcmV0X2Nhc3Q8dWludHB0cl90PihDRkFycmF5R2V0VmFs dWVBdEluZGV4KHRhYmxlcy5nZXQoKSwgaSkpKTsKLSAgICAgICAgaWYgKHRhYmxlVGFnID09ICdT VEFUJykKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICB9Ci0gICAgcmV0dXJuIHRydWU7 Ci19Ci0KIC8vIFRoZXNlIHZhbHVlcyB3ZXJlIGNhbGN1bGF0ZWQgYnkgcGVyZm9ybWluZyBhIGxp bmVhciByZWdyZXNzaW9uIG9uIHRoZSBDU1Mgd2VpZ2h0cy93aWR0aHMvc2xvcGVzIGFuZCBDb3Jl IFRleHQgd2VpZ2h0cy93aWR0aHMvc2xvcGVzIG9mIFNhbiBGcmFuY2lzY28uCiAvLyBGSVhNRTog PHJkYXI6Ly9wcm9ibGVtLzMxMzEyNjAyPiBHZXQgdGhlIHJlYWwgdmFsdWVzIGZyb20gQ29yZSBU ZXh0Lgogc3RhdGljIGlubGluZSBmbG9hdCBub3JtYWxpemVXZWlnaHQoZmxvYXQgdmFsdWUpCkBA IC00ODgsNiArNDcwLDQ5IEBAIHN0YXRpYyBpbmxpbmUgZmxvYXQgbm9ybWFsaXplV2lkdGgoZmxv YXQgdmFsdWUpCiB9CiAjZW5kaWYKIAorc3RydWN0IEZvbnRUeXBlIHsKKyAgICBGb250VHlwZShD VEZvbnRSZWYgZm9udCkKKyAgICB7CisgICAgICAgIGF1dG8gdGFibGVzID0gYWRvcHRDRihDVEZv bnRDb3B5QXZhaWxhYmxlVGFibGVzKGZvbnQsIGtDVEZvbnRUYWJsZU9wdGlvbk5vT3B0aW9ucykp OworICAgICAgICBpZiAoIXRhYmxlcykKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgYXV0 byBzaXplID0gQ0ZBcnJheUdldENvdW50KHRhYmxlcy5nZXQoKSk7CisgICAgICAgIGZvciAoQ0ZJ bmRleCBpID0gMDsgaSA8IHNpemU7ICsraSkgeworICAgICAgICAgICAgLy8gVGhpcyBpcyBzbyB5 dWNreS4KKyAgICAgICAgICAgIC8vIGh0dHBzOi8vZGV2ZWxvcGVyLmFwcGxlLmNvbS9yZWZlcmVu Y2UvY29yZXRleHQvMTUxMDc3NC1jdGZvbnRjb3B5YXZhaWxhYmxldGFibGVzCisgICAgICAgICAg ICAvLyAiVGhlIHJldHVybmVkIHNldCB3aWxsIGNvbnRhaW4gdW5ib3hlZCB2YWx1ZXMsIHdoaWNo IGNhbiBiZSBleHRyYWN0ZWQgbGlrZSBzbzoiCisgICAgICAgICAgICAvLyAiQ1RGb250VGFibGVU YWcgdGFnID0gKENURm9udFRhYmxlVGFnKSh1aW50cHRyX3QpQ0ZBcnJheUdldFZhbHVlQXRJbmRl eCh0YWdzLCBpbmRleCk7IgorICAgICAgICAgICAgQ1RGb250VGFibGVUYWcgdGFibGVUYWcgPSBz dGF0aWNfY2FzdDxDVEZvbnRUYWJsZVRhZz4ocmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KENG QXJyYXlHZXRWYWx1ZUF0SW5kZXgodGFibGVzLmdldCgpLCBpKSkpOworICAgICAgICAgICAgc3dp dGNoICh0YWJsZVRhZykgeworICAgICAgICAgICAgY2FzZSAnZnZhcic6CisgICAgICAgICAgICAg ICAgaWYgKHZhcmlhdGlvblR5cGUgPT0gVmFyaWF0aW9uVHlwZTo6Tm90VmFyaWFibGUpCisgICAg ICAgICAgICAgICAgICAgIHZhcmlhdGlvblR5cGUgPSBWYXJpYXRpb25UeXBlOjpUcnVlVHlwZUdY OworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgY2FzZSAnU1RBVCc6CisgICAg ICAgICAgICAgICAgdmFyaWF0aW9uVHlwZSA9IFZhcmlhdGlvblR5cGU6Ok9wZW5UeXBlMTg7Cisg ICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlICdtb3J4JzoKKyAgICAgICAg ICAgIGNhc2UgJ21vcnQnOgorICAgICAgICAgICAgICAgIGFhdFNoYXBpbmcgPSB0cnVlOworICAg ICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgY2FzZSAnR1BPUyc6CisgICAgICAgICAg ICBjYXNlICdHU1VCJzoKKyAgICAgICAgICAgICAgICBvcGVuVHlwZVNoYXBpbmcgPSB0cnVlOwor ICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfQor CisgICAgZW51bSBjbGFzcyBWYXJpYXRpb25UeXBlIHsKKyAgICAgICAgTm90VmFyaWFibGUsCisg ICAgICAgIFRydWVUeXBlR1gsCisgICAgICAgIE9wZW5UeXBlMTgKKyAgICB9OworICAgIFZhcmlh dGlvblR5cGUgdmFyaWF0aW9uVHlwZSB7IFZhcmlhdGlvblR5cGU6Ok5vdFZhcmlhYmxlIH07Cisg ICAgYm9vbCBvcGVuVHlwZVNoYXBpbmcgeyBmYWxzZSB9OworICAgIGJvb2wgYWF0U2hhcGluZyB7 IGZhbHNlIH07Cit9OworCiBSZXRhaW5QdHI8Q1RGb250UmVmPiBwcmVwYXJlUGxhdGZvcm1Gb250 KENURm9udFJlZiBvcmlnaW5hbEZvbnQsIGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2Ny aXB0aW9uLCBjb25zdCBGb250RmVhdHVyZVNldHRpbmdzKiBmb250RmFjZUZlYXR1cmVzLCBjb25z dCBGb250VmFyaWFudFNldHRpbmdzKiBmb250RmFjZVZhcmlhbnRTZXR0aW5ncywgRm9udFNlbGVj dGlvblNwZWNpZmllZENhcGFiaWxpdGllcyBmb250RmFjZUNhcGFiaWxpdGllcywgZmxvYXQgc2l6 ZSkKIHsKICAgICBib29sIGFsd2F5c0FkZFZhcmlhdGlvbnMgPSBmYWxzZTsKQEAgLTU0NiwxMCAr NTcxLDEyIEBAIFJldGFpblB0cjxDVEZvbnRSZWY+IHByZXBhcmVQbGF0Zm9ybUZvbnQoQ1RGb250 UmVmIG9yaWdpbmFsRm9udCwgY29uc3QgRm9udERlc2NyCiAgICAgZm9yIChhdXRvJiBuZXdGZWF0 dXJlIDogZmVhdHVyZXMpCiAgICAgICAgIGZlYXR1cmVzVG9CZUFwcGxpZWQuc2V0KG5ld0ZlYXR1 cmUudGFnKCksIG5ld0ZlYXR1cmUudmFsdWUoKSk7CiAKKyAgICBGb250VHlwZSBmb250VHlwZShv cmlnaW5hbEZvbnQpOworCiAjaWYgRU5BQkxFKFZBUklBVElPTl9GT05UUykKICAgICBWYXJpYXRp b25zTWFwIHZhcmlhdGlvbnNUb0JlQXBwbGllZDsKIAotICAgIGJvb2wgbmVlZHNDb252ZXJzaW9u ID0gaXNHWFZhcmlhYmxlRm9udChvcmlnaW5hbEZvbnQpOworICAgIGJvb2wgbmVlZHNDb252ZXJz aW9uID0gZm9udFR5cGUudmFyaWF0aW9uVHlwZSA9PSBGb250VHlwZTo6VmFyaWF0aW9uVHlwZTo6 VHJ1ZVR5cGVHWDsKIAogICAgIGF1dG8gYXBwbHlWYXJpYXRpb24gPSBbJl0oY29uc3QgRm9udFRh ZyYgdGFnLCBmbG9hdCB2YWx1ZSkgewogICAgICAgICBhdXRvIGl0ZXJhdG9yID0gZGVmYXVsdFZh bHVlcy5maW5kKHRhZyk7CkBAIC01OTgsOCArNjI1LDEwIEBAIFJldGFpblB0cjxDVEZvbnRSZWY+ IHByZXBhcmVQbGF0Zm9ybUZvbnQoQ1RGb250UmVmIG9yaWdpbmFsRm9udCwgY29uc3QgRm9udERl c2NyCiAgICAgICAgIGF1dG8gZmVhdHVyZUFycmF5ID0gYWRvcHRDRihDRkFycmF5Q3JlYXRlTXV0 YWJsZShrQ0ZBbGxvY2F0b3JEZWZhdWx0LCBmZWF0dXJlcy5zaXplKCksICZrQ0ZUeXBlQXJyYXlD YWxsQmFja3MpKTsKICAgICAgICAgZm9yIChhdXRvJiBwIDogZmVhdHVyZXNUb0JlQXBwbGllZCkg ewogICAgICAgICAgICAgYXV0byBmZWF0dXJlID0gRm9udEZlYXR1cmUocC5rZXksIHAudmFsdWUp OwotICAgICAgICAgICAgYXBwZW5kVHJ1ZVR5cGVGZWF0dXJlKGZlYXR1cmVBcnJheS5nZXQoKSwg ZmVhdHVyZSk7Ci0gICAgICAgICAgICBhcHBlbmRPcGVuVHlwZUZlYXR1cmUoZmVhdHVyZUFycmF5 LmdldCgpLCBmZWF0dXJlKTsKKyAgICAgICAgICAgIGlmIChmb250VHlwZS5hYXRTaGFwaW5nKQor ICAgICAgICAgICAgICAgIGFwcGVuZFRydWVUeXBlRmVhdHVyZShmZWF0dXJlQXJyYXkuZ2V0KCks IGZlYXR1cmUpOworICAgICAgICAgICAgaWYgKGZvbnRUeXBlLm9wZW5UeXBlU2hhcGluZykKKyAg ICAgICAgICAgICAgICBhcHBlbmRPcGVuVHlwZUZlYXR1cmUoZmVhdHVyZUFycmF5LmdldCgpLCBm ZWF0dXJlKTsKICAgICAgICAgfQogICAgICAgICBDRkRpY3Rpb25hcnlBZGRWYWx1ZShhdHRyaWJ1 dGVzLmdldCgpLCBrQ1RGb250RmVhdHVyZVNldHRpbmdzQXR0cmlidXRlLCBmZWF0dXJlQXJyYXku Z2V0KCkpOwogICAgIH0KQEAgLTk2Myw3ICs5OTIsNyBAQCBzdGF0aWMgVmFyaWF0aW9uQ2FwYWJp bGl0aWVzIHZhcmlhdGlvbkNhcGFiaWxpdGllc0ZvckZvbnREZXNjcmlwdG9yKENURm9udERlc2Ny aQogICAgICAgICAgICAgcmVzdWx0LnNsb3BlID0gZXh0cmFjdFZhcmlhdGlvbkJvdW5kcyhheGlz KTsKICAgICB9CiAKLSAgICBpZiAoaXNHWFZhcmlhYmxlRm9udChmb250LmdldCgpKSkgeworICAg IGlmIChGb250VHlwZShmb250LmdldCgpKS52YXJpYXRpb25UeXBlID09IEZvbnRUeXBlOjpWYXJp YXRpb25UeXBlOjpUcnVlVHlwZUdYKSB7CiAgICAgICAgIGlmIChyZXN1bHQud2VpZ2h0KQogICAg ICAgICAgICAgcmVzdWx0LndlaWdodCA9IHt7IG5vcm1hbGl6ZVdlaWdodChyZXN1bHQud2VpZ2h0 LnZhbHVlKCkubWluaW11bSksIG5vcm1hbGl6ZVdlaWdodChyZXN1bHQud2VpZ2h0LnZhbHVlKCku bWF4aW11bSkgfX07CiAgICAgICAgIGlmIChyZXN1bHQud2lkdGgpCg==