147424 2015-07-29 15:45:47 -0700 Rename FontDescriptionFontDataCacheKey to FontDescriptionKey 2015-07-30 16:54:02 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 147427 1 mmaxfield mmaxfield commit-queue dino hyatt koivisto simon.fraser thorton oldest_to_newest 1113198 0 mmaxfield 2015-07-29 15:45:47 -0700 Rename FontDescriptionFontDataCacheKey to FontDescriptionKey 1113199 1 257779 mmaxfield 2015-07-29 15:46:57 -0700 Created attachment 257779 Patch 1113206 2 257779 commit-queue 2015-07-29 16:39:58 -0700 Comment on attachment 257779 Patch Clearing flags on attachment: 257779 Committed r187568: <http://trac.webkit.org/changeset/187568> 1113207 3 commit-queue 2015-07-29 16:40:04 -0700 All reviewed patches have been landed. Closing bug. 257779 2015-07-29 15:46:57 -0700 2015-07-29 16:39:58 -0700 Patch bug-147424-20150729154534.patch text/plain 9038 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3NTYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2M1ZDdmN2M5YWZkM2Qy YzMzNWZhOGUyZTJmZjNiM2IzM2E5ZmY0OC4uYjVhMGIxYmViYzg3Mzc0NGM4MjM3YjRjMzJiZmUz NDIyZmNlNGQ2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE1LTA3LTI5ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuYW1lIEZv bnREZXNjcmlwdGlvbkZvbnREYXRhQ2FjaGVLZXkgdG8gRm9udERlc2NyaXB0aW9uS2V5CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDc0MjQKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHN0cnVjdCBo b2xkcyBpbmZvcm1hdGlvbiBhYm91dCBhIEZvbnREZXNjcmlwdGlvbi4KKworICAgICAgICBObyBu ZXcgdGVzdHMgYmVjYXVzZSB0aGVyZSBpcyBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAg KiBjc3MvQ1NTU2VnbWVudGVkRm9udEZhY2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTU2Vn bWVudGVkRm9udEZhY2U6OmZvbnRSYW5nZXMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L0ZvbnRDYWNoZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGb250UGxhdGZvcm1EYXRhQ2FjaGVL ZXlIYXNoOjpoYXNoKToKKyAgICAgICAgKFdlYkNvcmU6OmNvbXB1dGVIYXNoKTogRGVsZXRlZC4K KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuaDoKKyAgICAgICAgKFdlYkNv cmU6OkZvbnREZXNjcmlwdGlvbktleTo6Rm9udERlc2NyaXB0aW9uS2V5KToKKyAgICAgICAgKFdl YkNvcmU6OkZvbnREZXNjcmlwdGlvbktleTo6b3BlcmF0b3I9PSk6CisgICAgICAgIChXZWJDb3Jl OjpGb250RGVzY3JpcHRpb25LZXk6Om9wZXJhdG9yIT0pOgorICAgICAgICAoV2ViQ29yZTo6Rm9u dERlc2NyaXB0aW9uS2V5Ojpjb21wdXRlSGFzaCk6CisgICAgICAgIChXZWJDb3JlOjpGb250RGVz Y3JpcHRpb25Gb250RGF0YUNhY2hlS2V5OjpGb250RGVzY3JpcHRpb25Gb250RGF0YUNhY2hlS2V5 KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkZvbnREZXNjcmlwdGlvbkZvbnREYXRhQ2Fj aGVLZXk6Om9wZXJhdG9yPT0pOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6Rm9udERlc2Ny aXB0aW9uRm9udERhdGFDYWNoZUtleTo6b3BlcmF0b3IhPSk6IERlbGV0ZWQuCisgICAgICAgIChX ZWJDb3JlOjpGb250RGVzY3JpcHRpb25Gb250RGF0YUNhY2hlS2V5Ojpjb21wdXRlSGFzaCk6IERl bGV0ZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6b3BlcmF0b3I9PSk6CisgICAgICAgIChXZWJDb3JlOjptYWtlRm9udENh c2NhZGVDYWNoZUtleSk6CisgICAgICAgIChXZWJDb3JlOjpjb21wdXRlRm9udENhc2NhZGVDYWNo ZUhhc2gpOgorCiAyMDE1LTA3LTI5ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4K IAogICAgICAgICBSZXZpZXcgZmVlZGJhY2sgZm9sbG93dXAgdG86IENyYXNoIGluIFdlYkNvcmU6 OkRvY3VtZW50TG9hZGVyOjpzdG9wTG9hZGluZ0ZvclBvbGljeUNoYW5nZS4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTZWdtZW50ZWRGb250RmFjZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTU2VnbWVudGVkRm9udEZhY2UuY3BwCmluZGV4IDE3NGNlMzhiNzRjZjk3YjM5 ZmY0YjkzNGJiNGNhYjA2MTY1ZmM4NWMuLmJmOTk0ODhiM2JlMzU0ZjVjM2U3NTBiMjM4MDYzYTc3 MzUzNDgxM2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTZWdtZW50ZWRGb250 RmFjZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1NlZ21lbnRlZEZvbnRGYWNlLmNw cApAQCAtMTEzLDcgKzExMyw3IEBAIEZvbnRSYW5nZXMgQ1NTU2VnbWVudGVkRm9udEZhY2U6OmZv bnRSYW5nZXMoY29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVzY3JpcHRpCiAgICAgICAgIHJl dHVybiBGb250UmFuZ2VzKCk7CiAKICAgICBGb250VHJhaXRzTWFzayBkZXNpcmVkVHJhaXRzTWFz ayA9IGZvbnREZXNjcmlwdGlvbi50cmFpdHNNYXNrKCk7Ci0gICAgLy8gRklYTUU6IFVuaWZ5IHRo aXMgZnVuY3Rpb24gd2l0aCBGb250RGVzY3JpcHRpb25Gb250RGF0YUNhY2hlS2V5IGluIEZvbnRD YWNoZS5oIChPciBqdXN0IHVzZSB0aGUgcmVndWxhciBGb250Q2FjaGUgaW5zdGVhZCBvZiB0aGlz KQorICAgIC8vIEZJWE1FOiBVbmlmeSB0aGlzIGZ1bmN0aW9uIHdpdGggRm9udERlc2NyaXB0aW9u S2V5IGluIEZvbnRDYWNoZS5oIChPciBqdXN0IHVzZSB0aGUgcmVndWxhciBGb250Q2FjaGUgaW5z dGVhZCBvZiB0aGlzKQogICAgIHVuc2lnbmVkIGhhc2hLZXkgPSAoKGZvbnREZXNjcmlwdGlvbi5j b21wdXRlZFBpeGVsU2l6ZSgpICsgMSkgPDwgKEZvbnRUcmFpdHNNYXNrV2lkdGggKyBGb250V2lk dGhWYXJpYW50V2lkdGggKyBGb250U3ludGhlc2lzV2lkdGggKyAxKSkKICAgICAgICAgfCAoZm9u dERlc2NyaXB0aW9uLmZvbnRTeW50aGVzaXMoKSA8PCAoRm9udFRyYWl0c01hc2tXaWR0aCArIEZv bnRXaWR0aFZhcmlhbnRXaWR0aCArIDEpKQogICAgICAgICB8ICgoZm9udERlc2NyaXB0aW9uLm9y aWVudGF0aW9uKCkgPT0gVmVydGljYWwgPyAxIDogMCkgPDwgKEZvbnRUcmFpdHNNYXNrV2lkdGgg KyBGb250V2lkdGhWYXJpYW50V2lkdGgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL0ZvbnRDYWNoZS5jcHAKaW5kZXggOGQxYTgzNTlkNjljYjcwZTRjMjBiNWVhODMyODc2 NWE2YmNkNDYzNC4uMzY4YzRiOTMyMTkzZTI0ZmIyZWU3MzZhYmQyM2Q5YTcwODA2NjhlNCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuY3BwCkBAIC0x MTMsMjIgKzExMywxNyBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBlcXVhbElnbm9yaW5nQ2Fz ZShtX2ZhbWlseSwgb3RoZXIubV9mYW1pbHkpICYmIG1fZm9udERlc2NyaXB0aW9uS2V5ID09IG90 aGVyLm1fZm9udERlc2NyaXB0aW9uS2V5OwogICAgIH0KIAotICAgIEZvbnREZXNjcmlwdGlvbkZv bnREYXRhQ2FjaGVLZXkgbV9mb250RGVzY3JpcHRpb25LZXk7CisgICAgRm9udERlc2NyaXB0aW9u S2V5IG1fZm9udERlc2NyaXB0aW9uS2V5OwogICAgIEF0b21pY1N0cmluZyBtX2ZhbWlseTsKIAog cHJpdmF0ZToKICAgICBzdGF0aWMgdW5zaWduZWQgaGFzaFRhYmxlRGVsZXRlZFNpemUoKSB7IHJl dHVybiAweEZGRkZGRkZGVTsgfQogfTsKIAotaW5saW5lIHVuc2lnbmVkIGNvbXB1dGVIYXNoKGNv bnN0IEZvbnRQbGF0Zm9ybURhdGFDYWNoZUtleSYgZm9udEtleSkKLXsKLSAgICByZXR1cm4gcGFp ckludEhhc2goQ2FzZUZvbGRpbmdIYXNoOjpoYXNoKGZvbnRLZXkubV9mYW1pbHkpLCBmb250S2V5 Lm1fZm9udERlc2NyaXB0aW9uS2V5LmNvbXB1dGVIYXNoKCkpOwotfQotCiBzdHJ1Y3QgRm9udFBs YXRmb3JtRGF0YUNhY2hlS2V5SGFzaCB7Ci0gICAgc3RhdGljIHVuc2lnbmVkIGhhc2goY29uc3Qg Rm9udFBsYXRmb3JtRGF0YUNhY2hlS2V5JiBmb250KQorICAgIHN0YXRpYyB1bnNpZ25lZCBoYXNo KGNvbnN0IEZvbnRQbGF0Zm9ybURhdGFDYWNoZUtleSYgZm9udEtleSkKICAgICB7Ci0gICAgICAg IHJldHVybiBjb21wdXRlSGFzaChmb250KTsKKyAgICAgICAgcmV0dXJuIHBhaXJJbnRIYXNoKENh c2VGb2xkaW5nSGFzaDo6aGFzaChmb250S2V5Lm1fZmFtaWx5KSwgZm9udEtleS5tX2ZvbnREZXNj cmlwdGlvbktleS5jb21wdXRlSGFzaCgpKTsKICAgICB9CiAgICAgICAgICAKICAgICBzdGF0aWMg Ym9vbCBlcXVhbChjb25zdCBGb250UGxhdGZvcm1EYXRhQ2FjaGVLZXkmIGEsIGNvbnN0IEZvbnRQ bGF0Zm9ybURhdGFDYWNoZUtleSYgYikKQEAgLTEzOSw5ICsxMzQsNyBAQCBzdHJ1Y3QgRm9udFBs YXRmb3JtRGF0YUNhY2hlS2V5SGFzaCB7CiAgICAgc3RhdGljIGNvbnN0IGJvb2wgc2FmZVRvQ29t cGFyZVRvRW1wdHlPckRlbGV0ZWQgPSB0cnVlOwogfTsKIAotc3RydWN0IEZvbnRQbGF0Zm9ybURh dGFDYWNoZUtleVRyYWl0cyA6IFdURjo6U2ltcGxlQ2xhc3NIYXNoVHJhaXRzPEZvbnRQbGF0Zm9y bURhdGFDYWNoZUtleT4geyB9OwotCi10eXBlZGVmIEhhc2hNYXA8Rm9udFBsYXRmb3JtRGF0YUNh Y2hlS2V5LCBzdGQ6OnVuaXF1ZV9wdHI8Rm9udFBsYXRmb3JtRGF0YT4sIEZvbnRQbGF0Zm9ybURh dGFDYWNoZUtleUhhc2gsIEZvbnRQbGF0Zm9ybURhdGFDYWNoZUtleVRyYWl0cz4gRm9udFBsYXRm b3JtRGF0YUNhY2hlOwordHlwZWRlZiBIYXNoTWFwPEZvbnRQbGF0Zm9ybURhdGFDYWNoZUtleSwg c3RkOjp1bmlxdWVfcHRyPEZvbnRQbGF0Zm9ybURhdGE+LCBGb250UGxhdGZvcm1EYXRhQ2FjaGVL ZXlIYXNoLCBXVEY6OlNpbXBsZUNsYXNzSGFzaFRyYWl0czxGb250UGxhdGZvcm1EYXRhQ2FjaGVL ZXk+PiBGb250UGxhdGZvcm1EYXRhQ2FjaGU7CiAKIHN0YXRpYyBGb250UGxhdGZvcm1EYXRhQ2Fj aGUmIGZvbnRQbGF0Zm9ybURhdGFDYWNoZSgpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0ZvbnRDYWNoZS5oCmluZGV4IDE3NmEzMzAyYWIzMDE5MTgzNzdkYWFjNGUzZmM5 YThmN2NjNDQwYWQuLjhiYmNjM2M2MDk3NWI2NDE0MWIyNDUyOTExODBlYzViNjNjN2VhMTkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oCkBAIC02Niwx MyArNjYsMTMgQEAgdHlwZWRlZiBJTUxhbmdGb250TGluayBJTUxhbmdGb250TGlua1R5cGU7CiAj ZW5kaWYKIAogLy8gVGhpcyBrZXkgY29udGFpbnMgdGhlIEZvbnREZXNjcmlwdGlvbiBmaWVsZHMg b3RoZXIgdGhhbiBmYW1pbHkgdGhhdCBtYXR0ZXIgd2hlbiBmZXRjaGluZyBGb250RGF0YXMgKHBs YXRmb3JtIGZvbnRzKS4KLXN0cnVjdCBGb250RGVzY3JpcHRpb25Gb250RGF0YUNhY2hlS2V5IHsK LSAgICBleHBsaWNpdCBGb250RGVzY3JpcHRpb25Gb250RGF0YUNhY2hlS2V5KHVuc2lnbmVkIHNp emUgPSAwKQorc3RydWN0IEZvbnREZXNjcmlwdGlvbktleSB7CisgICAgZXhwbGljaXQgRm9udERl c2NyaXB0aW9uS2V5KHVuc2lnbmVkIHNpemUgPSAwKQogICAgICAgICA6IHNpemUoc2l6ZSkKICAg ICAgICAgLCB3ZWlnaHQoMCkKICAgICAgICAgLCBmbGFncygwKQogICAgIHsgfQotICAgIEZvbnRE ZXNjcmlwdGlvbkZvbnREYXRhQ2FjaGVLZXkoY29uc3QgRm9udERlc2NyaXB0aW9uJiBkZXNjcmlw dGlvbikKKyAgICBGb250RGVzY3JpcHRpb25LZXkoY29uc3QgRm9udERlc2NyaXB0aW9uJiBkZXNj cmlwdGlvbikKICAgICAgICAgOiBzaXplKGRlc2NyaXB0aW9uLmNvbXB1dGVkUGl4ZWxTaXplKCkp CiAgICAgICAgICwgd2VpZ2h0KGRlc2NyaXB0aW9uLndlaWdodCgpKQogICAgICAgICAsIGZsYWdz KG1ha2VGbGFnS2V5KGRlc2NyaXB0aW9uKSkKQEAgLTg2LDE3ICs4NiwxNyBAQCBzdHJ1Y3QgRm9u dERlc2NyaXB0aW9uRm9udERhdGFDYWNoZUtleSB7CiAgICAgICAgICAgICB8IHN0YXRpY19jYXN0 PHVuc2lnbmVkPihkZXNjcmlwdGlvbi5pdGFsaWMoKSkgPDwgMQogICAgICAgICAgICAgfCBzdGF0 aWNfY2FzdDx1bnNpZ25lZD4oZGVzY3JpcHRpb24ucmVuZGVyaW5nTW9kZSgpKTsKICAgICB9Ci0g ICAgYm9vbCBvcGVyYXRvcj09KGNvbnN0IEZvbnREZXNjcmlwdGlvbkZvbnREYXRhQ2FjaGVLZXkm IG90aGVyKSBjb25zdAorICAgIGJvb2wgb3BlcmF0b3I9PShjb25zdCBGb250RGVzY3JpcHRpb25L ZXkmIG90aGVyKSBjb25zdAogICAgIHsKICAgICAgICAgcmV0dXJuIHNpemUgPT0gb3RoZXIuc2l6 ZSAmJiB3ZWlnaHQgPT0gb3RoZXIud2VpZ2h0ICYmIGZsYWdzID09IG90aGVyLmZsYWdzOwogICAg IH0KLSAgICBib29sIG9wZXJhdG9yIT0oY29uc3QgRm9udERlc2NyaXB0aW9uRm9udERhdGFDYWNo ZUtleSYgb3RoZXIpIGNvbnN0CisgICAgYm9vbCBvcGVyYXRvciE9KGNvbnN0IEZvbnREZXNjcmlw dGlvbktleSYgb3RoZXIpIGNvbnN0CiAgICAgewogICAgICAgICByZXR1cm4gISgqdGhpcyA9PSBv dGhlcik7CiAgICAgfQogICAgIGlubGluZSB1bnNpZ25lZCBjb21wdXRlSGFzaCgpIGNvbnN0CiAg ICAgewotICAgICAgICByZXR1cm4gU3RyaW5nSGFzaGVyOjpoYXNoTWVtb3J5PHNpemVvZihGb250 RGVzY3JpcHRpb25Gb250RGF0YUNhY2hlS2V5KT4odGhpcyk7CisgICAgICAgIHJldHVybiBTdHJp bmdIYXNoZXI6Omhhc2hNZW1vcnk8c2l6ZW9mKEZvbnREZXNjcmlwdGlvbktleSk+KHRoaXMpOwog ICAgIH0KICAgICB1bnNpZ25lZCBzaXplOwogICAgIHVuc2lnbmVkIHdlaWdodDsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmNwcAppbmRleCA2ODVi ZTIyY2Q2NWQxMTljNzIzMTBmMDNlZWU2ZDBjNzM4ZjJkNzVhLi5hNzZlZDIxYjhhNjE5MTVlOTRl ODlhMzkzMWFiZWJlZDViZDVlOGQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9Gb250Q2FzY2FkZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvRm9udENhc2NhZGUuY3BwCkBAIC0xOTYsNyArMTk2LDcgQEAgYm9vbCBGb250Q2Fz Y2FkZTo6b3BlcmF0b3I9PShjb25zdCBGb250Q2FzY2FkZSYgb3RoZXIpIGNvbnN0CiAKIHN0cnVj dCBGb250Q2FzY2FkZUNhY2hlS2V5IHsKICAgICAvLyBUaGlzIHBhcnQgb2YgdGhlIGtleSBpcyBz aGFyZWQgd2l0aCB0aGUgbG93ZXIgbGV2ZWwgRm9udENhY2hlIChjYWNoaW5nIEZvbnREYXRhIG9i amVjdHMpLgotICAgIEZvbnREZXNjcmlwdGlvbkZvbnREYXRhQ2FjaGVLZXkgZm9udERlc2NyaXB0 aW9uQ2FjaGVLZXk7CisgICAgRm9udERlc2NyaXB0aW9uS2V5IGZvbnREZXNjcmlwdGlvbktleTsK ICAgICBWZWN0b3I8QXRvbWljU3RyaW5nLCAzPiBmYW1pbGllczsKICAgICB1bnNpZ25lZCBmb250 U2VsZWN0b3JJZDsKICAgICB1bnNpZ25lZCBmb250U2VsZWN0b3JWZXJzaW9uOwpAQCAtMjE4LDcg KzIxOCw3IEBAIHR5cGVkZWYgSGFzaE1hcDx1bnNpZ25lZCwgc3RkOjp1bmlxdWVfcHRyPEZvbnRD YXNjYWRlQ2FjaGVFbnRyeT4sIEFscmVhZHlIYXNoZWQ+CiAKIHN0YXRpYyBib29sIG9wZXJhdG9y PT0oY29uc3QgRm9udENhc2NhZGVDYWNoZUtleSYgYSwgY29uc3QgRm9udENhc2NhZGVDYWNoZUtl eSYgYikKIHsKLSAgICBpZiAoYS5mb250RGVzY3JpcHRpb25DYWNoZUtleSAhPSBiLmZvbnREZXNj cmlwdGlvbkNhY2hlS2V5KQorICAgIGlmIChhLmZvbnREZXNjcmlwdGlvbktleSAhPSBiLmZvbnRE ZXNjcmlwdGlvbktleSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmIChhLmZvbnRTZWxl Y3RvcklkICE9IGIuZm9udFNlbGVjdG9ySWQgfHwgYS5mb250U2VsZWN0b3JWZXJzaW9uICE9IGIu Zm9udFNlbGVjdG9yVmVyc2lvbiB8fCBhLmZvbnRTZWxlY3RvckZsYWdzICE9IGIuZm9udFNlbGVj dG9yRmxhZ3MpCiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTI1Niw3ICsyNTYsNyBAQCBzdGF0 aWMgdW5zaWduZWQgbWFrZUZvbnRTZWxlY3RvckZsYWdzKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYg ZGVzY3JpcHRpb24pCiBzdGF0aWMgRm9udENhc2NhZGVDYWNoZUtleSBtYWtlRm9udENhc2NhZGVD YWNoZUtleShjb25zdCBGb250RGVzY3JpcHRpb24mIGRlc2NyaXB0aW9uLCBGb250U2VsZWN0b3Iq IGZvbnRTZWxlY3RvcikKIHsKICAgICBGb250Q2FzY2FkZUNhY2hlS2V5IGtleTsKLSAgICBrZXku Zm9udERlc2NyaXB0aW9uQ2FjaGVLZXkgPSBGb250RGVzY3JpcHRpb25Gb250RGF0YUNhY2hlS2V5 KGRlc2NyaXB0aW9uKTsKKyAgICBrZXkuZm9udERlc2NyaXB0aW9uS2V5ID0gRm9udERlc2NyaXB0 aW9uS2V5KGRlc2NyaXB0aW9uKTsKICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgZGVzY3Jp cHRpb24uZmFtaWx5Q291bnQoKTsgKytpKQogICAgICAgICBrZXkuZmFtaWxpZXMuYXBwZW5kKGRl c2NyaXB0aW9uLmZhbWlseUF0KGkpKTsKICAgICBrZXkuZm9udFNlbGVjdG9ySWQgPSBmb250U2Vs ZWN0b3IgPyBmb250U2VsZWN0b3ItPnVuaXF1ZUlkKCkgOiAwOwpAQCAtMjcwLDcgKzI3MCw3IEBA IHN0YXRpYyB1bnNpZ25lZCBjb21wdXRlRm9udENhc2NhZGVDYWNoZUhhc2goY29uc3QgRm9udENh c2NhZGVDYWNoZUtleSYga2V5KQogICAgIFZlY3Rvcjx1bnNpZ25lZCwgNz4gaGFzaENvZGVzOwog ICAgIGhhc2hDb2Rlcy5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KDQgKyBrZXkuZmFtaWxpZXMuc2l6 ZSgpKTsKIAotICAgIGhhc2hDb2Rlcy51bmNoZWNrZWRBcHBlbmQoa2V5LmZvbnREZXNjcmlwdGlv bkNhY2hlS2V5LmNvbXB1dGVIYXNoKCkpOworICAgIGhhc2hDb2Rlcy51bmNoZWNrZWRBcHBlbmQo a2V5LmZvbnREZXNjcmlwdGlvbktleS5jb21wdXRlSGFzaCgpKTsKICAgICBoYXNoQ29kZXMudW5j aGVja2VkQXBwZW5kKGtleS5mb250U2VsZWN0b3JJZCk7CiAgICAgaGFzaENvZGVzLnVuY2hlY2tl ZEFwcGVuZChrZXkuZm9udFNlbGVjdG9yVmVyc2lvbik7CiAgICAgaGFzaENvZGVzLnVuY2hlY2tl ZEFwcGVuZChrZXkuZm9udFNlbGVjdG9yRmxhZ3MpOwo=