147430 2015-07-29 18:47:59 -0700 Clean up makeFontCascadeCacheKey() 2015-09-25 09:12:39 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 147427 147457 1 mmaxfield mmaxfield bdakin cdumez commit-queue dino jonlee koivisto simon.fraser thorton oldest_to_newest 1113246 0 mmaxfield 2015-07-29 18:47:59 -0700 Clean up makeFontCascadeCacheKey() 1113248 1 257799 mmaxfield 2015-07-29 18:51:46 -0700 Created attachment 257799 Patch 1113500 2 257855 mmaxfield 2015-07-30 14:47:24 -0700 Created attachment 257855 Patch 1113511 3 257855 benjamin 2015-07-30 15:17:21 -0700 Comment on attachment 257855 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=257855&action=review > Source/WebCore/platform/graphics/FontCache.h:85 > + return static_cast<unsigned>(description.script()) << 9 > + | static_cast<unsigned>(description.smallCaps()) << 8 > + | static_cast<unsigned>(description.fontSynthesis()) << 6 This seems so fragile :( But I can't find a better way :( 1113541 4 257855 commit-queue 2015-07-30 16:07:16 -0700 Comment on attachment 257855 Patch Clearing flags on attachment: 257855 Committed r187615: <http://trac.webkit.org/changeset/187615> 1113542 5 commit-queue 2015-07-30 16:07:27 -0700 All reviewed patches have been landed. Closing bug. 1128643 6 cdumez 2015-09-24 18:53:34 -0700 Rolled out in <https://trac.webkit.org/r190232> because it seems to have caused a >1% regression on PLT (see rdar://problem/22657123). 1128656 7 bdakin 2015-09-24 22:12:11 -0700 (In reply to comment #6) > Rolled out in <https://trac.webkit.org/r190232> because it seems to have > caused a >1% regression on PLT (see rdar://problem/22657123). This rollout seems to have caused fast/css3-text/font-synthesis.html to start failing. 1128657 8 bdakin 2015-09-24 22:15:43 -0700 I marked the test as failing for now: http://trac.webkit.org/changeset/190236 1128706 9 cdumez 2015-09-25 09:12:39 -0700 Remanded in <http://trac.webkit.org/changeset/190242> as the rollout did not help the PLT recover. 257799 2015-07-29 18:51:46 -0700 2015-07-30 14:47:21 -0700 Patch bug-147430-20150729185023.patch text/plain 4939 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3NTcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmE5NTNjMmYwOGY2YmM0 MzllODI0ZTFiM2ZhOTQxYzBjNTM4ODk1OC4uZTMzNGRjYzFiMGViNzVhYWI0ZDEwNTMwNGI1Nzg2 ODYzYmNiNGEwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACisyMDE1LTA3LTI5ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYW4gdXAg bWFrZUZvbnRDYXNjYWRlQ2FjaGVLZXkoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3NDMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgRm9udERlc2NyaXB0aW9uS2V5IGlzIGRlc2lnbmVkIHRvIGVuY2Fw c3VsYXRlIGFsbCB0aGUgY2FjaGVhYmxlIHByb3BlcnRpZXMgb2YgYSBGb250RGVzY3JpcHRpb24u CisgICAgICAgIEhvd2V2ZXIsIGEgaGlnaGVyLWxldmVsIGNhY2hlLCBGb250Q2FzY2FkZUNhY2hl S2V5LCB3YXMgdGFraW5nIHNvbWUgdmFsdWVzIGZyb20gRm9udERlc2NyaXB0aW9ucy4KKyAgICAg ICAgVGhlIGZhY3QgdGhhdCB0aGVyZSB3YXNuJ3QgYSBidWcgYmVmb3JlIGlzIGp1c3QgYSBoYXBw eSBjb2luY2lkZW5jZS4gVGhpcyBwYXRjaCBtb3ZlcyB0aG9zZSBiaXRzCisgICAgICAgIGZyb20g dGhlIGhpZ2hlci1sZXZlbCBjYWNoZSBhbmQgcHV0cyB0aGVtIGludG8gRm9udERlc2NyaXB0aW9u S2V5IHdoZXJlIHRoZXkgYmVsb25nLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNlIHRo ZXJlIGlzIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L0ZvbnRDYWNoZS5oOgorICAgICAgICAoV2ViQ29yZTo6Rm9udERlc2NyaXB0aW9uS2V5OjptYWtl RmxhZ0tleSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6b3BlcmF0b3I9PSk6CisgICAgICAgIChXZWJDb3JlOjptYWtlRm9u dFNlbGVjdG9yRmxhZ3MpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6bWFrZUZvbnRDYXNj YWRlQ2FjaGVLZXkpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6Y29tcHV0ZUZvbnRDYXNj YWRlQ2FjaGVIYXNoKTogRGVsZXRlZC4KKwogMjAxNS0wNy0yOSAgTXlsZXMgQy4gTWF4ZmllbGQg IDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFVzZSBydmFsdWUgcmVmZXJlbmNlcyBp biBGb250Q2FzY2FkZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTQ3NDI3CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL0ZvbnRDYWNoZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENh Y2hlLmgKaW5kZXggOGJiY2MzYzYwOTc1YjY0MTQxYjI0NTI5MTE4MGVjNWI2M2M3ZWExOS4uYzYy NTY4ODA1YjQ3NGY3YmZlNGM4ZDMzZjkxMmY3OGNmOTZjNmZjZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmgKQEAgLTc5LDcgKzc5LDEwIEBAIHN0cnVj dCBGb250RGVzY3JpcHRpb25LZXkgewogICAgIHsgfQogICAgIHN0YXRpYyB1bnNpZ25lZCBtYWtl RmxhZ0tleShjb25zdCBGb250RGVzY3JpcHRpb24mIGRlc2NyaXB0aW9uKQogICAgIHsKLSAgICAg ICAgcmV0dXJuIHN0YXRpY19jYXN0PHVuc2lnbmVkPihkZXNjcmlwdGlvbi5mb250U3ludGhlc2lz KCkpIDw8IDYKKyAgICAgICAgc3RhdGljX2Fzc2VydChVU0NSSVBUX0NPREVfTElNSVQgPCAweDEw MDAsICJTY3JpcHQgY29kZSBtdXN0IGZpdCBpbiBhbiB1bnNpZ25lZCBhbG9uZyB3aXRoIHRoZSBv dGhlciBmbGFncyIpOworICAgICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGRlc2Ny aXB0aW9uLnNjcmlwdCgpKSA8PCA5CisgICAgICAgICAgICB8IHN0YXRpY19jYXN0PHVuc2lnbmVk PihkZXNjcmlwdGlvbi5zbWFsbENhcHMoKSkgPDwgOAorICAgICAgICAgICAgfCBzdGF0aWNfY2Fz dDx1bnNpZ25lZD4oZGVzY3JpcHRpb24uZm9udFN5bnRoZXNpcygpKSA8PCA2CiAgICAgICAgICAg ICB8IHN0YXRpY19jYXN0PHVuc2lnbmVkPihkZXNjcmlwdGlvbi53aWR0aFZhcmlhbnQoKSkgPDwg NAogICAgICAgICAgICAgfCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oZGVzY3JpcHRpb24ubm9uQ0pL R2x5cGhPcmllbnRhdGlvbigpKSA8PCAzCiAgICAgICAgICAgICB8IHN0YXRpY19jYXN0PHVuc2ln bmVkPihkZXNjcmlwdGlvbi5vcmllbnRhdGlvbigpKSA8PCAyCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2FkZS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2FkZS5jcHAKaW5kZXggZWMwNTk3ZTk0Y2MwMzUw NDMyZjQ0ZGVkZjJjNDhhZTRlYjY3YmEzZC4uYjlhMTI0NDBhMzBiYmUxNDZkN2Y2ODk0MWRlMGQ3 NjYyNmY1MTJkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Rm9udENhc2NhZGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0Zv bnRDYXNjYWRlLmNwcApAQCAtMjAwLDcgKzIwMCw2IEBAIHN0cnVjdCBGb250Q2FzY2FkZUNhY2hl S2V5IHsKICAgICBWZWN0b3I8QXRvbWljU3RyaW5nLCAzPiBmYW1pbGllczsKICAgICB1bnNpZ25l ZCBmb250U2VsZWN0b3JJZDsKICAgICB1bnNpZ25lZCBmb250U2VsZWN0b3JWZXJzaW9uOwotICAg IHVuc2lnbmVkIGZvbnRTZWxlY3RvckZsYWdzOwogfTsKIAogc3RydWN0IEZvbnRDYXNjYWRlQ2Fj aGVFbnRyeSB7CkBAIC0yMjAsNyArMjE5LDcgQEAgc3RhdGljIGJvb2wgb3BlcmF0b3I9PShjb25z dCBGb250Q2FzY2FkZUNhY2hlS2V5JiBhLCBjb25zdCBGb250Q2FzY2FkZUNhY2hlS2V5Jgogewog ICAgIGlmIChhLmZvbnREZXNjcmlwdGlvbktleSAhPSBiLmZvbnREZXNjcmlwdGlvbktleSkKICAg ICAgICAgcmV0dXJuIGZhbHNlOwotICAgIGlmIChhLmZvbnRTZWxlY3RvcklkICE9IGIuZm9udFNl bGVjdG9ySWQgfHwgYS5mb250U2VsZWN0b3JWZXJzaW9uICE9IGIuZm9udFNlbGVjdG9yVmVyc2lv biB8fCBhLmZvbnRTZWxlY3RvckZsYWdzICE9IGIuZm9udFNlbGVjdG9yRmxhZ3MpCisgICAgaWYg KGEuZm9udFNlbGVjdG9ySWQgIT0gYi5mb250U2VsZWN0b3JJZCB8fCBhLmZvbnRTZWxlY3RvclZl cnNpb24gIT0gYi5mb250U2VsZWN0b3JWZXJzaW9uKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAg ICAgaWYgKGEuZmFtaWxpZXMuc2l6ZSgpICE9IGIuZmFtaWxpZXMuc2l6ZSgpKQogICAgICAgICBy ZXR1cm4gZmFsc2U7CkBAIC0yNDgsMTEgKzI0Nyw2IEBAIHZvaWQgY2xlYXJXaWR0aENhY2hlcygp CiAgICAgICAgIHZhbHVlLT5mb250cy5nZXQoKS53aWR0aENhY2hlKCkuY2xlYXIoKTsKIH0KIAot c3RhdGljIHVuc2lnbmVkIG1ha2VGb250U2VsZWN0b3JGbGFncyhjb25zdCBGb250RGVzY3JpcHRp b24mIGRlc2NyaXB0aW9uKQotewotICAgIHJldHVybiBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oZGVz Y3JpcHRpb24uc2NyaXB0KCkpIDw8IDEgfCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oZGVzY3JpcHRp b24uc21hbGxDYXBzKCkpOwotfQotCiBzdGF0aWMgRm9udENhc2NhZGVDYWNoZUtleSBtYWtlRm9u dENhc2NhZGVDYWNoZUtleShjb25zdCBGb250RGVzY3JpcHRpb24mIGRlc2NyaXB0aW9uLCBGb250 U2VsZWN0b3IqIGZvbnRTZWxlY3RvcikKIHsKICAgICBGb250Q2FzY2FkZUNhY2hlS2V5IGtleTsK QEAgLTI2MSw3ICsyNTUsNiBAQCBzdGF0aWMgRm9udENhc2NhZGVDYWNoZUtleSBtYWtlRm9udENh c2NhZGVDYWNoZUtleShjb25zdCBGb250RGVzY3JpcHRpb24mIGRlc2NyaQogICAgICAgICBrZXku ZmFtaWxpZXMuYXBwZW5kKGRlc2NyaXB0aW9uLmZhbWlseUF0KGkpKTsKICAgICBrZXkuZm9udFNl bGVjdG9ySWQgPSBmb250U2VsZWN0b3IgPyBmb250U2VsZWN0b3ItPnVuaXF1ZUlkKCkgOiAwOwog ICAgIGtleS5mb250U2VsZWN0b3JWZXJzaW9uID0gZm9udFNlbGVjdG9yID8gZm9udFNlbGVjdG9y LT52ZXJzaW9uKCkgOiAwOwotICAgIGtleS5mb250U2VsZWN0b3JGbGFncyA9IGZvbnRTZWxlY3Rv ciAmJiBmb250U2VsZWN0b3ItPnJlc29sdmVzRmFtaWx5Rm9yKGRlc2NyaXB0aW9uKSA/IG1ha2VG b250U2VsZWN0b3JGbGFncyhkZXNjcmlwdGlvbikgOiAwOwogICAgIHJldHVybiBrZXk7CiB9CiAK QEAgLTI3Myw3ICsyNjYsNiBAQCBzdGF0aWMgdW5zaWduZWQgY29tcHV0ZUZvbnRDYXNjYWRlQ2Fj aGVIYXNoKGNvbnN0IEZvbnRDYXNjYWRlQ2FjaGVLZXkmIGtleSkKICAgICBoYXNoQ29kZXMudW5j aGVja2VkQXBwZW5kKGtleS5mb250RGVzY3JpcHRpb25LZXkuY29tcHV0ZUhhc2goKSk7CiAgICAg aGFzaENvZGVzLnVuY2hlY2tlZEFwcGVuZChrZXkuZm9udFNlbGVjdG9ySWQpOwogICAgIGhhc2hD b2Rlcy51bmNoZWNrZWRBcHBlbmQoa2V5LmZvbnRTZWxlY3RvclZlcnNpb24pOwotICAgIGhhc2hD b2Rlcy51bmNoZWNrZWRBcHBlbmQoa2V5LmZvbnRTZWxlY3RvckZsYWdzKTsKICAgICBmb3IgKHVu c2lnbmVkIGkgPSAwOyBpIDwga2V5LmZhbWlsaWVzLnNpemUoKTsgKytpKQogICAgICAgICBoYXNo Q29kZXMudW5jaGVja2VkQXBwZW5kKGtleS5mYW1pbGllc1tpXS5pbXBsKCkgPyBDYXNlRm9sZGlu Z0hhc2g6Omhhc2goa2V5LmZhbWlsaWVzW2ldKSA6IDApOwogCg== 257855 2015-07-30 14:47:24 -0700 2015-07-30 16:07:16 -0700 Patch bug-147430-20150730144723.patch text/plain 4872 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3NjA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTdjZDk2MzlmZTI5NDU4 Y2I3NzlhYTE5NTY3NjhlYzE2NjVjMmYwZi4uOGRjNzY5ZWU0NjIxZTJlM2FjMDkzMjI2YzJlZjFh MzVhZGExZjBiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE1LTA3LTMwICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYW4gdXAg bWFrZUZvbnRDYXNjYWRlQ2FjaGVLZXkoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3NDMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgRm9udERlc2NyaXB0aW9uS2V5IGlzIGRlc2lnbmVkIHRvIGVuY2Fw c3VsYXRlIGFsbCB0aGUgY2FjaGVhYmxlIHByb3BlcnRpZXMgb2YgYSBGb250RGVzY3JpcHRpb24u CisgICAgICAgIEhvd2V2ZXIsIGEgaGlnaGVyLWxldmVsIGNhY2hlLCBGb250Q2FzY2FkZUNhY2hl S2V5LCB3YXMgdGFraW5nIHNvbWUgdmFsdWVzIGZyb20gRm9udERlc2NyaXB0aW9ucy4KKyAgICAg ICAgVGhlIGZhY3QgdGhhdCB0aGVyZSB3YXNuJ3QgYSBidWcgYmVmb3JlIGlzIGp1c3QgYSBoYXBw eSBjb2luY2lkZW5jZS4gVGhpcyBwYXRjaCBtb3ZlcyB0aG9zZSBiaXRzCisgICAgICAgIGZyb20g dGhlIGhpZ2hlci1sZXZlbCBjYWNoZSBhbmQgcHV0cyB0aGVtIGludG8gRm9udERlc2NyaXB0aW9u S2V5IHdoZXJlIHRoZXkgYmVsb25nLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNlIHRo ZXJlIGlzIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L0ZvbnRDYWNoZS5oOgorICAgICAgICAoV2ViQ29yZTo6Rm9udERlc2NyaXB0aW9uS2V5OjptYWtl RmxhZ0tleSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6b3BlcmF0b3I9PSk6CisgICAgICAgIChXZWJDb3JlOjptYWtlRm9u dFNlbGVjdG9yRmxhZ3MpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6bWFrZUZvbnRDYXNj YWRlQ2FjaGVLZXkpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6Y29tcHV0ZUZvbnRDYXNj YWRlQ2FjaGVIYXNoKTogRGVsZXRlZC4KKwogMjAxNS0wNy0yOSAgRGVhbiBKYWNrc29uICA8ZGlu b0BhcHBsZS5jb20+CiAKICAgICAgICAgRG9uJ3QgdXNlIChEZXRhaWxzKSB3aGVuIGV4cG9zaW5n IFNQSQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENh Y2hlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuaAppbmRl eCA4YmJjYzNjNjA5NzViNjQxNDFiMjQ1MjkxMTgwZWM1YjYzYzdlYTE5Li5jNjI1Njg4MDViNDc0 ZjdiZmU0YzhkMzNmOTEyZjc4Y2Y5NmM2ZmNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9Gb250Q2FjaGUuaApAQCAtNzksNyArNzksMTAgQEAgc3RydWN0IEZvbnREZXNj cmlwdGlvbktleSB7CiAgICAgeyB9CiAgICAgc3RhdGljIHVuc2lnbmVkIG1ha2VGbGFnS2V5KGNv bnN0IEZvbnREZXNjcmlwdGlvbiYgZGVzY3JpcHRpb24pCiAgICAgewotICAgICAgICByZXR1cm4g c3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGRlc2NyaXB0aW9uLmZvbnRTeW50aGVzaXMoKSkgPDwgNgor ICAgICAgICBzdGF0aWNfYXNzZXJ0KFVTQ1JJUFRfQ09ERV9MSU1JVCA8IDB4MTAwMCwgIlNjcmlw dCBjb2RlIG11c3QgZml0IGluIGFuIHVuc2lnbmVkIGFsb25nIHdpdGggdGhlIG90aGVyIGZsYWdz Iik7CisgICAgICAgIHJldHVybiBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oZGVzY3JpcHRpb24uc2Ny aXB0KCkpIDw8IDkKKyAgICAgICAgICAgIHwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGRlc2NyaXB0 aW9uLnNtYWxsQ2FwcygpKSA8PCA4CisgICAgICAgICAgICB8IHN0YXRpY19jYXN0PHVuc2lnbmVk PihkZXNjcmlwdGlvbi5mb250U3ludGhlc2lzKCkpIDw8IDYKICAgICAgICAgICAgIHwgc3RhdGlj X2Nhc3Q8dW5zaWduZWQ+KGRlc2NyaXB0aW9uLndpZHRoVmFyaWFudCgpKSA8PCA0CiAgICAgICAg ICAgICB8IHN0YXRpY19jYXN0PHVuc2lnbmVkPihkZXNjcmlwdGlvbi5ub25DSktHbHlwaE9yaWVu dGF0aW9uKCkpIDw8IDMKICAgICAgICAgICAgIHwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGRlc2Ny aXB0aW9uLm9yaWVudGF0aW9uKCkpIDw8IDIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmNwcAppbmRleCAyYmZhYmU1OWJlMGNlY2VlNzYwNjY0OWU5 YWYyY2ZhMTExODM3ZTA3Li4xNTA4NDBjNTQ5MmJkN2I2OTEwMzJkNDhjMTI0MDMyZWQ4MDZmZjRi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2Fk ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUu Y3BwCkBAIC0xODMsNyArMTgzLDYgQEAgc3RydWN0IEZvbnRDYXNjYWRlQ2FjaGVLZXkgewogICAg IFZlY3RvcjxBdG9taWNTdHJpbmcsIDM+IGZhbWlsaWVzOwogICAgIHVuc2lnbmVkIGZvbnRTZWxl Y3RvcklkOwogICAgIHVuc2lnbmVkIGZvbnRTZWxlY3RvclZlcnNpb247Ci0gICAgdW5zaWduZWQg Zm9udFNlbGVjdG9yRmxhZ3M7CiB9OwogCiBzdHJ1Y3QgRm9udENhc2NhZGVDYWNoZUVudHJ5IHsK QEAgLTIwMyw3ICsyMDIsNyBAQCBzdGF0aWMgYm9vbCBvcGVyYXRvcj09KGNvbnN0IEZvbnRDYXNj YWRlQ2FjaGVLZXkmIGEsIGNvbnN0IEZvbnRDYXNjYWRlQ2FjaGVLZXkmCiB7CiAgICAgaWYgKGEu Zm9udERlc2NyaXB0aW9uS2V5ICE9IGIuZm9udERlc2NyaXB0aW9uS2V5KQogICAgICAgICByZXR1 cm4gZmFsc2U7Ci0gICAgaWYgKGEuZm9udFNlbGVjdG9ySWQgIT0gYi5mb250U2VsZWN0b3JJZCB8 fCBhLmZvbnRTZWxlY3RvclZlcnNpb24gIT0gYi5mb250U2VsZWN0b3JWZXJzaW9uIHx8IGEuZm9u dFNlbGVjdG9yRmxhZ3MgIT0gYi5mb250U2VsZWN0b3JGbGFncykKKyAgICBpZiAoYS5mb250U2Vs ZWN0b3JJZCAhPSBiLmZvbnRTZWxlY3RvcklkIHx8IGEuZm9udFNlbGVjdG9yVmVyc2lvbiAhPSBi LmZvbnRTZWxlY3RvclZlcnNpb24pCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAoYS5m YW1pbGllcy5zaXplKCkgIT0gYi5mYW1pbGllcy5zaXplKCkpCiAgICAgICAgIHJldHVybiBmYWxz ZTsKQEAgLTIzMSwxMSArMjMwLDYgQEAgdm9pZCBjbGVhcldpZHRoQ2FjaGVzKCkKICAgICAgICAg dmFsdWUtPmZvbnRzLmdldCgpLndpZHRoQ2FjaGUoKS5jbGVhcigpOwogfQogCi1zdGF0aWMgdW5z aWduZWQgbWFrZUZvbnRTZWxlY3RvckZsYWdzKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZGVzY3Jp cHRpb24pCi17Ci0gICAgcmV0dXJuIHN0YXRpY19jYXN0PHVuc2lnbmVkPihkZXNjcmlwdGlvbi5z Y3JpcHQoKSkgPDwgMSB8IHN0YXRpY19jYXN0PHVuc2lnbmVkPihkZXNjcmlwdGlvbi5zbWFsbENh cHMoKSk7Ci19Ci0KIHN0YXRpYyBGb250Q2FzY2FkZUNhY2hlS2V5IG1ha2VGb250Q2FzY2FkZUNh Y2hlS2V5KGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZGVzY3JpcHRpb24sIEZvbnRTZWxlY3Rvciog Zm9udFNlbGVjdG9yKQogewogICAgIEZvbnRDYXNjYWRlQ2FjaGVLZXkga2V5OwpAQCAtMjQ0LDcg KzIzOCw2IEBAIHN0YXRpYyBGb250Q2FzY2FkZUNhY2hlS2V5IG1ha2VGb250Q2FzY2FkZUNhY2hl S2V5KGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZGVzY3JpCiAgICAgICAgIGtleS5mYW1pbGllcy5h cHBlbmQoZGVzY3JpcHRpb24uZmFtaWx5QXQoaSkpOwogICAgIGtleS5mb250U2VsZWN0b3JJZCA9 IGZvbnRTZWxlY3RvciA/IGZvbnRTZWxlY3Rvci0+dW5pcXVlSWQoKSA6IDA7CiAgICAga2V5LmZv bnRTZWxlY3RvclZlcnNpb24gPSBmb250U2VsZWN0b3IgPyBmb250U2VsZWN0b3ItPnZlcnNpb24o KSA6IDA7Ci0gICAga2V5LmZvbnRTZWxlY3RvckZsYWdzID0gZm9udFNlbGVjdG9yICYmIGZvbnRT ZWxlY3Rvci0+cmVzb2x2ZXNGYW1pbHlGb3IoZGVzY3JpcHRpb24pID8gbWFrZUZvbnRTZWxlY3Rv ckZsYWdzKGRlc2NyaXB0aW9uKSA6IDA7CiAgICAgcmV0dXJuIGtleTsKIH0KIApAQCAtMjU2LDcg KzI0OSw2IEBAIHN0YXRpYyB1bnNpZ25lZCBjb21wdXRlRm9udENhc2NhZGVDYWNoZUhhc2goY29u c3QgRm9udENhc2NhZGVDYWNoZUtleSYga2V5KQogICAgIGhhc2hDb2Rlcy51bmNoZWNrZWRBcHBl bmQoa2V5LmZvbnREZXNjcmlwdGlvbktleS5jb21wdXRlSGFzaCgpKTsKICAgICBoYXNoQ29kZXMu dW5jaGVja2VkQXBwZW5kKGtleS5mb250U2VsZWN0b3JJZCk7CiAgICAgaGFzaENvZGVzLnVuY2hl Y2tlZEFwcGVuZChrZXkuZm9udFNlbGVjdG9yVmVyc2lvbik7Ci0gICAgaGFzaENvZGVzLnVuY2hl Y2tlZEFwcGVuZChrZXkuZm9udFNlbGVjdG9yRmxhZ3MpOwogICAgIGZvciAodW5zaWduZWQgaSA9 IDA7IGkgPCBrZXkuZmFtaWxpZXMuc2l6ZSgpOyArK2kpCiAgICAgICAgIGhhc2hDb2Rlcy51bmNo ZWNrZWRBcHBlbmQoa2V5LmZhbWlsaWVzW2ldLmltcGwoKSA/IENhc2VGb2xkaW5nSGFzaDo6aGFz aChrZXkuZmFtaWxpZXNbaV0pIDogMCk7CiAK