134697 2014-07-07 15:10:24 -0700 Remove misleadingly-named Font::isSVGFont() 2014-07-07 19:27:43 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mmaxfield mmaxfield commit-queue dino d-r enrica esprehn+autocc fmalita glenn gyuyoung.kim jonlee kondapallykalyan pdr schenney sergio simon.fraser thorton oldest_to_newest 1020921 0 mmaxfield 2014-07-07 15:10:24 -0700 Remove misleadingly-named Font::isSVGFont() 1020922 1 234516 mmaxfield 2014-07-07 15:13:02 -0700 Created attachment 234516 Patch 1020952 2 234516 darin 2014-07-07 16:17:05 -0700 Comment on attachment 234516 Patch What guarantees that primaryFont is non-null at all these call sites? 1020962 3 mmaxfield 2014-07-07 16:44:26 -0700 I don't believe there is any, other than that the existing code already dereferences these pointers. Do you have an opinion about how I should do this differently? 1021008 4 234516 commit-queue 2014-07-07 19:27:38 -0700 Comment on attachment 234516 Patch Clearing flags on attachment: 234516 Committed r170871: <http://trac.webkit.org/changeset/170871> 1021009 5 commit-queue 2014-07-07 19:27:43 -0700 All reviewed patches have been landed. Closing bug. 234516 2014-07-07 15:13:02 -0700 2014-07-07 19:27:38 -0700 Patch bug-134697-20140707151244.patch text/plain 8178 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwODUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTlmOThiYmE5OTQ0OWE0 ZDA4YTQyOTg0MGQ3YzEzNzA5NDg4ZTBlYS4uODg1ZjRhNTEwZGJkM2VkYjM3ZmZiMTAyMjg5ZmMw ZjhkNDY3NWNlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE0LTA3LTA3ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIG1p c2xlYWRpbmdseS1uYW1lZCBGb250Ojppc1NWR0ZvbnQoKQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM0Njk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQmVpbmcgYSBTVkcgZm9udCBpcyBhIHByb3BlcnR5 IG9mIHRoZSBGb250RGF0YSBvYmplY3QsIG5vdAorICAgICAgICB0aGUgRm9udCBvYmplY3QuIFBy b3ZpZGluZyBhbiBpc1NWR0ZvbnQoKSBmdW5jdGlvbiBvbiB0aGUKKyAgICAgICAgRm9udCBjbGFz cyB3aWxsIGxpa2VseSBsZWFkIHRvIGluY29ycmVjdCBjb2RlIGFuZCBub24tb2J2aW91cworICAg ICAgICBidWdzLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNlIHRoZXJlIGlzIG5vIGJl aGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuaDoKKyAg ICAgICAgKFdlYkNvcmU6OkZvbnQ6OmlzU1ZHRm9udCk6IERlbGV0ZWQuCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpGb250Ojpw cmltYXJ5Rm9udERhdGFJc1N5c3RlbUZvbnQpOgorICAgICAgICAqIHJlbmRlcmluZy9JbmxpbmVU ZXh0Qm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklubGluZVRleHRCb3g6OmNvbnN0cnVjdFRl eHRSdW4pOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpjb25zdHJ1Y3RUZXh0UnVuSW50ZXJuYWwpOgorICAgICAgICAqIHJlbmRlcmluZy9T aW1wbGVMaW5lTGF5b3V0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6 OmNhblVzZUZvcik6CisgICAgICAgICogcmVuZGVyaW5nL3N2Zy9TVkdJbmxpbmVUZXh0Qm94LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlNWR0lubGluZVRleHRCb3g6OmNvbnN0cnVjdFRleHRSdW4p OgorICAgICAgICAqIHJlbmRlcmluZy9zdmcvU1ZHVGV4dE1ldHJpY3MuY3BwOgorICAgICAgICAo V2ViQ29yZTo6U1ZHVGV4dE1ldHJpY3M6OmNvbnN0cnVjdFRleHRSdW4pOgorICAgICAgICAoV2Vi Q29yZTo6U1ZHVGV4dE1ldHJpY3M6OlNWR1RleHRNZXRyaWNzKToKKwogMjAxNC0wNy0wNyAgQWxl eCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFtpT1Mg V2ViR0xdIEZpeCBjcmFzaCB3aXRoIHRvbyBtYW55IG5lc3RlZCBnbHNsIGZ1bmN0aW9ucy4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuaCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuaAppbmRleCA4ZDJkNzRjZTNmMGQ5YzZj ZWYzY2RkZTAzNWRmOGI2MDcwOWNlMTZhLi5mMTlhZTZkNWVhYzA4MTk4ODIyYzJiYzQ1ZmZlNGZm ZjRlODRhMjQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9G b250LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5oCkBAIC0x NTcsNyArMTU3LDYgQEAgcHVibGljOgogICAgIHZvaWQgc2V0TGV0dGVyU3BhY2luZyhmbG9hdCBz KSB7IG1fbGV0dGVyU3BhY2luZyA9IHM7IH0KICAgICBib29sIGlzRml4ZWRQaXRjaCgpIGNvbnN0 OwogICAgIGJvb2wgaXNQcmludGVyRm9udCgpIGNvbnN0IHsgcmV0dXJuIG1fZm9udERlc2NyaXB0 aW9uLnVzZVByaW50ZXJGb250KCk7IH0KLSAgICBib29sIGlzU1ZHRm9udCgpIGNvbnN0IHsgcmV0 dXJuIHByaW1hcnlGb250KCktPmlzU1ZHRm9udCgpOyB9CiAgICAgCiAgICAgRm9udFJlbmRlcmlu Z01vZGUgcmVuZGVyaW5nTW9kZSgpIGNvbnN0IHsgcmV0dXJuIG1fZm9udERlc2NyaXB0aW9uLnJl bmRlcmluZ01vZGUoKTsgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9tYWMvRm9udE1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L21hYy9Gb250TWFjLm1tCmluZGV4IGFkNTdjNWQyZjgyMzMwN2NkMjc1M2ZkYjg3YTVlYTlhZjc2 NGFmNjcuLjZjNmYxNDE3ZWQ5N2U3ZWM4MTdmYTI4YmQzODE5MDkwODA5NzcxYmIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250TWFjLm1tCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250TWFjLm1tCkBAIC01NzYs NyArNTc2LDggQEAgRGFzaEFycmF5IEZvbnQ6OmRhc2hlc0ZvckludGVyc2VjdGlvbnNXaXRoUmVj dChjb25zdCBUZXh0UnVuJiBydW4sIGNvbnN0IEZsb2F0UG8KIGJvb2wgRm9udDo6cHJpbWFyeUZv bnREYXRhSXNTeXN0ZW1Gb250KCkgY29uc3QKIHsKICNpZiBQTEFURk9STShJT1MpIHx8IF9fTUFD X09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPiAxMDkwCi0gICAgcmV0dXJuICFpc1NWR0ZvbnQo KSAmJiBDVEZvbnREZXNjcmlwdG9ySXNTeXN0ZW1VSUZvbnQoYWRvcHRDRihDVEZvbnRDb3B5Rm9u dERlc2NyaXB0b3IocHJpbWFyeUZvbnQoKS0+cGxhdGZvcm1EYXRhKCkuY3RGb250KCkpKS5nZXQo KSk7CisgICAgY29uc3QgYXV0byogZm9udERhdGEgPSBwcmltYXJ5Rm9udCgpOworICAgIHJldHVy biAhZm9udERhdGEtPmlzU1ZHRm9udCgpICYmIENURm9udERlc2NyaXB0b3JJc1N5c3RlbVVJRm9u dChhZG9wdENGKENURm9udENvcHlGb250RGVzY3JpcHRvcihmb250RGF0YS0+cGxhdGZvcm1EYXRh KCkuY3RGb250KCkpKS5nZXQoKSk7CiAjZWxzZQogICAgIC8vIFN5c3RlbSBmb250cyBhcmUgaGlk ZGVuIGJ5IGhhdmluZyBhIG5hbWUgdGhhdCBiZWdpbnMgd2l0aCBhIHBlcmlvZCwgc28gc2ltcGx5 IHNlYXJjaAogICAgIC8vIGZvciB0aGF0IGhlcmUgcmF0aGVyIHRoYW4gdHJ5IHRvIGtlZXAgdGhl IGxpc3QgdXAgdG8gZGF0ZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9J bmxpbmVUZXh0Qm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94 LmNwcAppbmRleCAwM2EyMzc3NjFhNjNiOWExNTczN2VkMTZmZGQ4YWEyYTU5NGMyNjYxLi42ZmUy ZTJmMjI0YjZmMTQyYTk1ZDUwMGU4YmZiYzVkMDliMTIzMTRhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL0lubGluZVRleHRCb3guY3BwCkBAIC0xNDM4LDcgKzE0MzgsNyBAQCBUZXh0UnVu IElubGluZVRleHRCb3g6OmNvbnN0cnVjdFRleHRSdW4oY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxl LCBjb25zdCBGb250JiBmbwogCiAgICAgVGV4dFJ1biBydW4oc3RyaW5nLCB0ZXh0UG9zKCksIGV4 cGFuc2lvbigpLCBleHBhbnNpb25CZWhhdmlvcigpLCBkaXJlY3Rpb24oKSwgZGlyT3ZlcnJpZGUo KSB8fCBzdHlsZS5ydGxPcmRlcmluZygpID09IFZpc3VhbE9yZGVyLCAhcmVuZGVyZXIoKS5jYW5V c2VTaW1wbGVGb250Q29kZVBhdGgoKSk7CiAgICAgcnVuLnNldFRhYlNpemUoIXN0eWxlLmNvbGxh cHNlV2hpdGVTcGFjZSgpLCBzdHlsZS50YWJTaXplKCkpOwotICAgIGlmIChmb250LmlzU1ZHRm9u dCgpKQorICAgIGlmIChmb250LnByaW1hcnlGb250KCktPmlzU1ZHRm9udCgpKQogICAgICAgICBy dW4uc2V0UmVuZGVyaW5nQ29udGV4dChTVkdUZXh0UnVuUmVuZGVyaW5nQ29udGV4dDo6Y3JlYXRl KHJlbmRlcmVyKCkpKTsKIAogICAgIC8vIFByb3BhZ2F0ZSB0aGUgbWF4aW11bSBsZW5ndGggb2Yg dGhlIGNoYXJhY3RlcnMgYnVmZmVyIHRvIHRoZSBUZXh0UnVuLCBldmVuIHdoZW4gd2UncmUgb25s eSBwcm9jZXNzaW5nIGEgc3Vic3RyaW5nLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJsb2NrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9jay5jcHAKaW5kZXggZDE0ZGIwMzc0OGZhMjQxNTliMDNiNjkyNmU5N2ZhNGYxMjZmZjgzOS4u YmRhYWNkMGIwNDU4YTJjYTRhYWYwNTBhYjFiNTY3NTU5NjZkODYwNSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCkBAIC00MTE0LDcgKzQxMTQsNyBAQCBzdGF0aWMg aW5saW5lIFRleHRSdW4gY29uc3RydWN0VGV4dFJ1bkludGVybmFsKFJlbmRlck9iamVjdCogY29u dGV4dCwgY29uc3QgRm9udAogICAgIGJvb2wgZGlyZWN0aW9uYWxPdmVycmlkZSA9IHN0eWxlLnJ0 bE9yZGVyaW5nKCkgPT0gVmlzdWFsT3JkZXI7CiAKICAgICBUZXh0UnVuIHJ1bihjaGFyYWN0ZXJz LCBsZW5ndGgsIDAsIDAsIGV4cGFuc2lvbiwgdGV4dERpcmVjdGlvbiwgZGlyZWN0aW9uYWxPdmVy cmlkZSk7Ci0gICAgaWYgKGZvbnQuaXNTVkdGb250KCkpIHsKKyAgICBpZiAoZm9udC5wcmltYXJ5 Rm9udCgpLT5pc1NWR0ZvbnQoKSkgewogICAgICAgICBBU1NFUlQoY29udGV4dCk7IC8vIEZJWE1F OiBUaHJlYWQgYSBSZW5kZXJPYmplY3QmIHRvIHRoaXMgcG9pbnQgc28gd2UgZG9uJ3QgaGF2ZSB0 byBkZXJlZmVyZW5jZSBhbnl0aGluZy4KICAgICAgICAgcnVuLnNldFJlbmRlcmluZ0NvbnRleHQo U1ZHVGV4dFJ1blJlbmRlcmluZ0NvbnRleHQ6OmNyZWF0ZSgqY29udGV4dCkpOwogICAgIH0KQEAg LTQxMzQsNyArNDEzNCw3IEBAIHN0YXRpYyBpbmxpbmUgVGV4dFJ1biBjb25zdHJ1Y3RUZXh0UnVu SW50ZXJuYWwoUmVuZGVyT2JqZWN0KiBjb250ZXh0LCBjb25zdCBGb250CiAgICAgICAgICAgICBk aXJlY3Rpb25hbE92ZXJyaWRlIHw9IGlzT3ZlcnJpZGUoc3R5bGUudW5pY29kZUJpZGkoKSk7CiAg ICAgfQogICAgIFRleHRSdW4gcnVuKGNoYXJhY3RlcnMsIGxlbmd0aCwgMCwgMCwgZXhwYW5zaW9u LCB0ZXh0RGlyZWN0aW9uLCBkaXJlY3Rpb25hbE92ZXJyaWRlKTsKLSAgICBpZiAoZm9udC5pc1NW R0ZvbnQoKSkgeworICAgIGlmIChmb250LnByaW1hcnlGb250KCktPmlzU1ZHRm9udCgpKSB7CiAg ICAgICAgIEFTU0VSVChjb250ZXh0KTsgLy8gRklYTUU6IFRocmVhZCBhIFJlbmRlck9iamVjdCYg dG8gdGhpcyBwb2ludCBzbyB3ZSBkb24ndCBoYXZlIHRvIGRlcmVmZXJlbmNlIGFueXRoaW5nLgog ICAgICAgICBydW4uc2V0UmVuZGVyaW5nQ29udGV4dChTVkdUZXh0UnVuUmVuZGVyaW5nQ29udGV4 dDo6Y3JlYXRlKCpjb250ZXh0KSk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1NpbXBsZUxpbmVMYXlvdXQuY3BwCmluZGV4IGNhOTdiMWVmM2FmNjgzZjA1Nzc4YTk3Y2NmMWQ3 OWM0MDBlYmU0ZjcuLjYxMDZjMWQ0ODdlNWU3YmFhODc2NzMxMDk0NGMwOTI5YzJkNjdjZTcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dC5jcHAKQEAgLTE3 OCw3ICsxNzgsNyBAQCBib29sIGNhblVzZUZvcihjb25zdCBSZW5kZXJCbG9ja0Zsb3cmIGZsb3cp CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAoc3R5bGUuZm9udCgpLmNvZGVQYXRoKFRl eHRSdW4odGV4dFJlbmRlcmVyLnRleHQoKSkpICE9IEZvbnQ6OlNpbXBsZSkKICAgICAgICAgcmV0 dXJuIGZhbHNlOwotICAgIGlmIChzdHlsZS5mb250KCkuaXNTVkdGb250KCkpCisgICAgaWYgKHN0 eWxlLmZvbnQoKS5wcmltYXJ5Rm9udCgpLT5pc1NWR0ZvbnQoKSkKICAgICAgICAgcmV0dXJuIGZh bHNlOwogCiAgICAgLy8gV2UgYXNzdW1lIHRoYXQgYWxsIGxpbmVzIGhhdmUgbWV0cmljcyBiYXNl ZCBwdXJlbHkgb24gdGhlIHByaW1hcnkgZm9udC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9zdmcvU1ZHSW5saW5lVGV4dEJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvc3ZnL1NWR0lubGluZVRleHRCb3guY3BwCmluZGV4IGNhMGY1ZWRmMWYyMGVhOTZkMDk5 NDdmMDRkMzIxOWQzYWU0YjJkYTUuLmQwODNmZGJlODY2ZWIxZjU4Yzk2YTM0YzRiZDdlYWRiM2Iy NDkzMGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvU1ZHSW5saW5l VGV4dEJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9TVkdJbmxpbmVU ZXh0Qm94LmNwcApAQCAtNDMwLDcgKzQzMCw3IEBAIFRleHRSdW4gU1ZHSW5saW5lVGV4dEJveDo6 Y29uc3RydWN0VGV4dFJ1bihSZW5kZXJTdHlsZSogc3R5bGUsIGNvbnN0IFNWR1RleHRGcmFnCiAg ICAgICAgICAgICAgICAgLCBkaXJlY3Rpb24oKQogICAgICAgICAgICAgICAgICwgZGlyT3ZlcnJp ZGUoKSB8fCBzdHlsZS0+cnRsT3JkZXJpbmcoKSA9PSBWaXN1YWxPcmRlciAvKiBkaXJlY3Rpb25h bE92ZXJyaWRlICovKTsKIAotICAgIGlmIChzdHlsZS0+Zm9udCgpLmlzU1ZHRm9udCgpKQorICAg IGlmIChzdHlsZS0+Zm9udCgpLnByaW1hcnlGb250KCktPmlzU1ZHRm9udCgpKQogICAgICAgICBy dW4uc2V0UmVuZGVyaW5nQ29udGV4dChTVkdUZXh0UnVuUmVuZGVyaW5nQ29udGV4dDo6Y3JlYXRl KHJlbmRlcmVyKCkpKTsKIAogICAgIHJ1bi5kaXNhYmxlUm91bmRpbmdIYWNrcygpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9TVkdUZXh0TWV0cmljcy5jcHAgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1NWR1RleHRNZXRyaWNzLmNwcAppbmRleCBjZWNh MGVlODQ2MjlmMWExMzY1MjE1NWVjZTRkZTQ3ZTZjODFjOWZmLi45Y2Y2MmRmZmIyMWQ1OWQ1ZTIy YjhmMDg5MTdmOTdhZDg5MWUwYjU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvc3ZnL1NWR1RleHRNZXRyaWNzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv c3ZnL1NWR1RleHRNZXRyaWNzLmNwcApAQCAtNzAsNyArNzAsNyBAQCBUZXh0UnVuIFNWR1RleHRN ZXRyaWNzOjpjb25zdHJ1Y3RUZXh0UnVuKFJlbmRlclNWR0lubGluZVRleHQmIHRleHQsIHVuc2ln bmVkIHBvcwogICAgICAgICAgICAgICAgICwgc3R5bGUuZGlyZWN0aW9uKCkKICAgICAgICAgICAg ICAgICAsIGlzT3ZlcnJpZGUoc3R5bGUudW5pY29kZUJpZGkoKSkgLyogZGlyZWN0aW9uYWxPdmVy cmlkZSAqLyk7CiAKLSAgICBpZiAoc3R5bGUuZm9udCgpLmlzU1ZHRm9udCgpKQorICAgIGlmIChz dHlsZS5mb250KCkucHJpbWFyeUZvbnQoKS0+aXNTVkdGb250KCkpCiAgICAgICAgIHJ1bi5zZXRS ZW5kZXJpbmdDb250ZXh0KFNWR1RleHRSdW5SZW5kZXJpbmdDb250ZXh0OjpjcmVhdGUodGV4dCkp OwogCiAgICAgcnVuLmRpc2FibGVSb3VuZGluZ0hhY2tzKCk7CkBAIC05MSw3ICs5MSw3IEBAIFNW R1RleHRNZXRyaWNzIFNWR1RleHRNZXRyaWNzOjptZWFzdXJlQ2hhcmFjdGVyUmFuZ2UoUmVuZGVy U1ZHSW5saW5lVGV4dCYgdGV4dCwKIAogU1ZHVGV4dE1ldHJpY3M6OlNWR1RleHRNZXRyaWNzKFJl bmRlclNWR0lubGluZVRleHQmIHRleHQsIHVuc2lnbmVkIHBvc2l0aW9uLCB1bnNpZ25lZCBsZW5n dGgsIGZsb2F0IHdpZHRoLCBjb25zdCBTdHJpbmcmIGdseXBoTmFtZSkKIHsKLSAgICBib29sIG5l ZWRzQ29udGV4dCA9IHRleHQuc3R5bGUoKS5mb250KCkuaXNTVkdGb250KCk7CisgICAgYm9vbCBu ZWVkc0NvbnRleHQgPSB0ZXh0LnN0eWxlKCkuZm9udCgpLnByaW1hcnlGb250KCktPmlzU1ZHRm9u dCgpOwogICAgIGZsb2F0IHNjYWxpbmdGYWN0b3IgPSB0ZXh0LnNjYWxpbmdGYWN0b3IoKTsKICAg ICBBU1NFUlQoc2NhbGluZ0ZhY3Rvcik7CiAK