100446 2012-10-25 19:50:56 -0700 local(Helvetica) in src descriptor prevent fallback 2012-10-30 17:45:41 -0700 1 1 1 Unclassified WebKit Text 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 100498 1 bashi bashi cmarcelo macpherson menard mitz webkit.review.bot oldest_to_newest 751463 0 170791 bashi 2012-10-25 19:50:56 -0700 Created attachment 170791 test case Test case attached. WebKit doesn't fallback src descriptor of @font-face when the src descriptor contain "local(Helvetica)" even if a machine doesn't have Helvetica font. Instead, WebKit uses Arial font to render text. The following code causes the issue (in FontCache.cpp): static const AtomicString& alternateFamilyName(const AtomicString& familyName) { ... // Alias Arial and Helvetica DEFINE_STATIC_LOCAL(AtomicString, arial, ("Arial")); DEFINE_STATIC_LOCAL(AtomicString, helvetica, ("Helvetica")); if (equalIgnoringCase(familyName, arial)) return helvetica; if (equalIgnoringCase(familyName, helvetica)) return arial; ... } Helvetica is replaced with Arial when Helvetica isn't on the machine. Since most machines have Arial, the text will be rendered with Arial. This behavior prevents page authors to use their Helvetica fonts as webfonts. 751466 1 bashi 2012-10-25 19:52:08 -0700 I'm not sure why these replacements exists. We can fix the issue by just removing these replacements. Mitz, what do you think? 751514 2 mitz 2012-10-25 21:22:49 -0700 (In reply to comment #1) > I'm not sure why these replacements exists. We can fix the issue by just removing these replacements. > > Mitz, what do you think? I think the aliases exist for better compatibility with some websites, and that this bug can be fixed by changing CSSFontFaceSource::getFontData() to pass true as the checkingAlternateName parameter of getCachedFontData(). 751549 3 170815 bashi 2012-10-25 22:30:37 -0700 Created attachment 170815 Patch 751551 4 bashi 2012-10-25 22:32:06 -0700 (In reply to comment #2) > I think the aliases exist for better compatibility with some websites, and that this bug can be fixed by changing CSSFontFaceSource::getFontData() to pass true as the checkingAlternateName parameter of getCachedFontData(). Thanks for the suggestion. It works. Posted a patch. 751556 5 170815 mitz 2012-10-25 22:42:04 -0700 Comment on attachment 170815 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=170815&action=review > Source/WebCore/ChangeLog:19 > + Somewhere in this change log there should be a description of the problem and how it was solved. Something along these lines, perhaps: FontCache::getCachedFontData() has a mechanism that aliases a few pairs of font family names, so that if the family name specified in the font-family property is not available on the system, but the its alias is available, it will be used instead. This is appropriate for the font-family property, but not for font family names specified in the local() function of the src descriptor in a @font-face rule. > Source/WebCore/css/CSSFontFaceSource.cpp:109 > + return fontCache()->getCachedFontData(fontDescription, m_string, true); You can even add a comment before this line explaining why we’re passing true. 751587 6 170825 bashi 2012-10-25 23:23:03 -0700 Created attachment 170825 Patch for landing 751588 7 170815 bashi 2012-10-25 23:23:34 -0700 Comment on attachment 170815 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=170815&action=review Thank you for review. >> Source/WebCore/ChangeLog:19 >> + > > Somewhere in this change log there should be a description of the problem and how it was solved. Something along these lines, perhaps: > FontCache::getCachedFontData() has a mechanism that aliases a few pairs of font family names, so that if the family name specified in the font-family property is not available on the system, but the its alias is available, it will be used instead. This is appropriate for the font-family property, but not for font family names specified in the local() function of the src descriptor in a @font-face rule. Done. >> Source/WebCore/css/CSSFontFaceSource.cpp:109 >> + return fontCache()->getCachedFontData(fontDescription, m_string, true); > > You can even add a comment before this line explaining why we’re passing true. Done. 751711 8 170825 webkit.review.bot 2012-10-26 02:09:23 -0700 Comment on attachment 170825 Patch for landing Clearing flags on attachment: 170825 Committed r132589: <http://trac.webkit.org/changeset/132589> 751712 9 webkit.review.bot 2012-10-26 02:09:27 -0700 All reviewed patches have been landed. Closing bug. 751848 10 webkit.review.bot 2012-10-26 04:30:16 -0700 Re-opened since this is blocked by bug 100498 754793 11 171549 bashi 2012-10-30 16:49:03 -0700 Created attachment 171549 Patch for landing 754834 12 171549 webkit.review.bot 2012-10-30 17:45:37 -0700 Comment on attachment 171549 Patch for landing Clearing flags on attachment: 171549 Committed r132969: <http://trac.webkit.org/changeset/132969> 754835 13 webkit.review.bot 2012-10-30 17:45:41 -0700 All reviewed patches have been landed. Closing bug. 170791 2012-10-25 19:50:56 -0700 2012-10-25 19:50:56 -0700 test case helvetica.html text/html 337 bashi PGh0bWw+CjxoZWFkPgo8c3R5bGU+CkBmb250LWZhY2UgewogIGZvbnQtZmFtaWx5OiBIZWx2ZXRp Y2E7CiAgc3JjOiBsb2NhbChIZWx2ZXRpY2EpLCB1cmwoaHR0cDovL3d3dy5oaXhpZS5jaC9yZXNv dXJjZXMvZm9udHMvQUhFTV9fX18uVFRGKTsKfQo8L3N0eWxlPgo8L2hlYWQ+Cjxib2R5Pgo8cD5U aGUgZm9sbG93aW5nIFhYWCBzaG91bGQgYmUgZGlzcGxheWVkIGFzIGJsYWNrIGJveGVzIG9uIG1h Y2hpbmVzIHdoaWNoIGRvZXNuJ3QgaGF2ZSBIZWx2ZXRpY2EgZm9udC48L3A+CjxkaXYgc3R5bGU9 ImZvbnQtZmFtaWx5OiBIZWx2ZXRpY2E7Ij5YWFg8L2Rpdj4KPC9ib2R5Pgo8L2h0bWw+Cg== 170815 2012-10-25 22:30:37 -0700 2012-10-25 23:23:34 -0700 Patch bug-100446-20121026142909.patch text/plain 1901 bashi U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyNTU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2M1NGVlNDRmODYyNDQw NWUxMmY0OGE0N2M3ZmIyZGNlODU5MGRkNS4uYzhhMzkzZmZiNDgyMjc5YjRhZWE5YjM5MWFkYzNl MzVmMzg2ZGVmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTEwLTI1ICBLZW5p Y2hpIElzaGliYXNoaSAgPGJhc2hpQGNocm9taXVtLm9yZz4KKworICAgICAgICBsb2NhbChIZWx2 ZXRpY2EpIGluIHNyYyBkZXNjcmlwdG9yIHByZXZlbnQgZmFsbGJhY2sKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMDQ0NgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERvbid0IGNoZWNrIGFsdGVybmF0ZSBm b250IGZhbWlseSBuYW1lIHdoaWxlIGNoZWNraW5nIHNyYyBkZXNjcmlwdG9yIG9mCisgICAgICAg IEBmb250LWZhY2UuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBJdCdzIGRpZmZpY3VsdCB0byB0 ZXN0IHRoZSBjaGFuZ2UgYmVjYXVzZSAnSGVsdmV0aWNhJyBjYW4KKyAgICAgICAgYmUgbWFwcGVk IGFueSBvdGhlciBmb250LiBGb3IgZXhhbXBsZSwgY2hyb21pdW0gRFJUIHVzZXMgRm9udENvbmZp ZyB0bworICAgICAgICBtYXAgSGVsdmV0aWNhIHRvIFRpbWVzIE5ldyBSb21hbi4gT3RoZXIgcG9y dHMgbWF5IG1hcCBIZWx2ZXRpY2EgdG8gb3RoZXIKKyAgICAgICAgZm9udHMuIFdlIGNhbid0IGRl ZmluZSB0aGUgZXhwZWN0ZWQgcmVzdWx0LgorCisgICAgICAgICogY3NzL0NTU0ZvbnRGYWNlU291 cmNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU0ZvbnRGYWNlU291cmNlOjpnZXRGb250RGF0 YSk6CisgICAgICAgIENhbGwgZm9udENhY2hlKCktPmdldENhY2hlZEZvbnREYXRhKCkgd2l0aCBj aGVja2luZ0FsdGVydHJ1ZU5hbWUgPSB0cnVlLgorCiAyMDEyLTEwLTI1ICBLZWlzaGkgSGF0dG9y aSAgPGtlaXNoaUB3ZWJraXQub3JnPgogCiAgICAgICAgIEhpZGUgcG9wdXAgd2hpbGUgdHJhbnNp dGlvbmluZyBmcm9tIHRoZSBzdWdnZXN0aW9uIHBpY2tlciB0byB0aGUgY2FsZW5kYXIgcGlja2Vy CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2VTb3VyY2UuY3BwIGIv U291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlU291cmNlLmNwcAppbmRleCA1ZTUyODlmNmQ1 MjI3YWU5ZmQxY2NjYTI3NGI4MWNjMTJjZWQ5MWRiLi4xMTZhZTVkMGRmN2MxZjlhZDVkMzQ0MWRi MzM1M2NkZDQ3N2Y2NGE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZh Y2VTb3VyY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250RmFjZVNvdXJjZS5j cHAKQEAgLTEwNiw3ICsxMDYsNyBAQCBQYXNzUmVmUHRyPFNpbXBsZUZvbnREYXRhPiBDU1NGb250 RmFjZVNvdXJjZTo6Z2V0Rm9udERhdGEoY29uc3QgRm9udERlc2NyaXB0aW9uJgogI2VuZGlmCiAg ICAgKSB7CiAgICAgICAgIC8vIFdlJ3JlIGxvY2FsLiBKdXN0IHJldHVybiBhIFNpbXBsZUZvbnRE YXRhIGZyb20gdGhlIG5vcm1hbCBjYWNoZS4KLSAgICAgICAgcmV0dXJuIGZvbnRDYWNoZSgpLT5n ZXRDYWNoZWRGb250RGF0YShmb250RGVzY3JpcHRpb24sIG1fc3RyaW5nKTsKKyAgICAgICAgcmV0 dXJuIGZvbnRDYWNoZSgpLT5nZXRDYWNoZWRGb250RGF0YShmb250RGVzY3JpcHRpb24sIG1fc3Ry aW5nLCB0cnVlKTsKICAgICB9CiAKICAgICAvLyBTZWUgaWYgd2UgaGF2ZSBhIG1hcHBpbmcgaW4g b3VyIEZvbnREYXRhIGNhY2hlLgo= 170825 2012-10-25 23:23:03 -0700 2012-10-30 16:48:58 -0700 Patch for landing bug-100446-20121026152135.patch text/plain 2534 bashi U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyNTU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2M1NGVlNDRmODYyNDQw NWUxMmY0OGE0N2M3ZmIyZGNlODU5MGRkNS4uYmU0OTkxZjQ4ZTI2NjljNDVmZWY3MmEzNTQyMGFj OTcyYzU5MDJkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEyLTEwLTI1ICBLZW5p Y2hpIElzaGliYXNoaSAgPGJhc2hpQGNocm9taXVtLm9yZz4KKworICAgICAgICBsb2NhbChIZWx2 ZXRpY2EpIGluIHNyYyBkZXNjcmlwdG9yIHByZXZlbnQgZmFsbGJhY2sKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMDQ0NgorCisgICAgICAgIFJldmll d2VkIGJ5IERhbiBCZXJuc3RlaW4uCisKKyAgICAgICAgRm9udENhY2hlOjpnZXRDYWNoZWRGb250 RGF0YSgpIGhhcyBhIG1lY2hhbmlzbSB0aGF0IGFsaWFzZXMgYSBmZXcgcGFpcnMKKyAgICAgICAg b2YgZm9udCBmYW1pbHkgbmFtZXMsIHNvIHRoYXQgaWYgdGhlIGZhbWlseSBuYW1lIHNwZWNpZmll ZCBpbiB0aGUgZm9udC1mYW1pbHkKKyAgICAgICAgcHJvcGVydHkgaXMgbm90IGF2YWlsYWJsZSBv biB0aGUgc3lzdGVtLCBidXQgdGhlIGl0cyBhbGlhcyBpcyBhdmFpbGFibGUsCisgICAgICAgIGl0 IHdpbGwgYmUgdXNlZCBpbnN0ZWFkLiBUaGlzIGlzIGFwcHJvcHJpYXRlIGZvciB0aGUgZm9udC1m YW1pbHkgcHJvcGVydHksCisgICAgICAgIGJ1dCBub3QgZm9yIGZvbnQgZmFtaWx5IG5hbWVzIHNw ZWNpZmllZCBpbiB0aGUgbG9jYWwoKSBmdW5jdGlvbiBvZiB0aGUgc3JjCisgICAgICAgIGRlc2Ny aXB0b3IgaW4gYSBAZm9udC1mYWNlIHJ1bGUuCisKKyAgICAgICAgVGhpcyBwYXRjaCBkaXNhYmxl cyB0aGUgbWVjaGFuaXNtIHdoaWxlIGNoZWNraW5nIHNyYyBkZXNjcmlwdG9yIG9mIEBmb250LWZh Y2UuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBJdCdzIGRpZmZpY3VsdCB0byB0ZXN0IHRoZSBj aGFuZ2UgYmVjYXVzZSAnSGVsdmV0aWNhJyBjYW4KKyAgICAgICAgYmUgbWFwcGVkIGFueSBvdGhl ciBmb250LiBGb3IgZXhhbXBsZSwgY2hyb21pdW0gRFJUIHVzZXMgRm9udENvbmZpZyB0bworICAg ICAgICBtYXAgSGVsdmV0aWNhIHRvIFRpbWVzIE5ldyBSb21hbi4gT3RoZXIgcG9ydHMgbWF5IG1h cCBIZWx2ZXRpY2EgdG8gb3RoZXIKKyAgICAgICAgZm9udHMuIFdlIGNhbid0IGRlZmluZSB0aGUg ZXhwZWN0ZWQgcmVzdWx0LgorCisgICAgICAgICogY3NzL0NTU0ZvbnRGYWNlU291cmNlLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkNTU0ZvbnRGYWNlU291cmNlOjpnZXRGb250RGF0YSk6CisgICAg ICAgIENhbGwgZm9udENhY2hlKCktPmdldENhY2hlZEZvbnREYXRhKCkgd2l0aCBjaGVja2luZ0Fs dGVybmF0ZU5hbWUgPSB0cnVlLgorICAgICAgICBUaGlzIGRpc2FibGVzIGFsaWFzaW5nIGZvbnQg ZmFtaWx5IG5hbWVzIGluIEZvbnRDYWNoZS4KKwogMjAxMi0xMC0yNSAgS2Vpc2hpIEhhdHRvcmkg IDxrZWlzaGlAd2Via2l0Lm9yZz4KIAogICAgICAgICBIaWRlIHBvcHVwIHdoaWxlIHRyYW5zaXRp b25pbmcgZnJvbSB0aGUgc3VnZ2VzdGlvbiBwaWNrZXIgdG8gdGhlIGNhbGVuZGFyIHBpY2tlcgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlU291cmNlLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250RmFjZVNvdXJjZS5jcHAKaW5kZXggNWU1Mjg5ZjZkNTIy N2FlOWZkMWNjY2EyNzRiODFjYzEyY2VkOTFkYi4uMmZkNjNmNmZhZTAwMGY0NWRjMTUyNDI3OTFm OWQ0NGQ2YmYzZGU3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNl U291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2VTb3VyY2UuY3Bw CkBAIC0xMDYsNyArMTA2LDggQEAgUGFzc1JlZlB0cjxTaW1wbGVGb250RGF0YT4gQ1NTRm9udEZh Y2VTb3VyY2U6OmdldEZvbnREYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYKICNlbmRpZgogICAg ICkgewogICAgICAgICAvLyBXZSdyZSBsb2NhbC4gSnVzdCByZXR1cm4gYSBTaW1wbGVGb250RGF0 YSBmcm9tIHRoZSBub3JtYWwgY2FjaGUuCi0gICAgICAgIHJldHVybiBmb250Q2FjaGUoKS0+Z2V0 Q2FjaGVkRm9udERhdGEoZm9udERlc2NyaXB0aW9uLCBtX3N0cmluZyk7CisgICAgICAgIC8vIFdl IGRvbid0IHdhbnQgdG8gY2hlY2sgYWx0ZXJuYXRlIGZvbnQgZmFtaWx5IG5hbWVzIGhlcmUsIHNv IHBhc3MgdHJ1ZSBhcyB0aGUgY2hlY2tpbmdBbHRlcm5hdGVOYW1lIHBhcmFtZXRlci4KKyAgICAg ICAgcmV0dXJuIGZvbnRDYWNoZSgpLT5nZXRDYWNoZWRGb250RGF0YShmb250RGVzY3JpcHRpb24s IG1fc3RyaW5nLCB0cnVlKTsKICAgICB9CiAKICAgICAvLyBTZWUgaWYgd2UgaGF2ZSBhIG1hcHBp bmcgaW4gb3VyIEZvbnREYXRhIGNhY2hlLgo= 171549 2012-10-30 16:49:03 -0700 2012-10-30 17:45:37 -0700 Patch for landing bug-100446-20121031084727.patch text/plain 6266 bashi U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyOTUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTMxODZlYmFkNWQzOTY0 Y2M1NDBhMzAwZWZhNDcxOTYxYzZiYzY5ZC4uMmI4OGYxNzdiMzA4OTY2MzJhNTkwZjZlNThjOTY4 N2UyYjNjMjk5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEyLTEwLTI1ICBLZW5p Y2hpIElzaGliYXNoaSAgPGJhc2hpQGNocm9taXVtLm9yZz4KKworICAgICAgICBsb2NhbChIZWx2 ZXRpY2EpIGluIHNyYyBkZXNjcmlwdG9yIHByZXZlbnQgZmFsbGJhY2sKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMDQ0NgorCisgICAgICAgIFJldmll d2VkIGJ5IERhbiBCZXJuc3RlaW4uCisKKyAgICAgICAgRm9udENhY2hlOjpnZXRDYWNoZWRGb250 RGF0YSgpIGhhcyBhIG1lY2hhbmlzbSB0aGF0IGFsaWFzZXMgYSBmZXcgcGFpcnMKKyAgICAgICAg b2YgZm9udCBmYW1pbHkgbmFtZXMsIHNvIHRoYXQgaWYgdGhlIGZhbWlseSBuYW1lIHNwZWNpZmll ZCBpbiB0aGUgZm9udC1mYW1pbHkKKyAgICAgICAgcHJvcGVydHkgaXMgbm90IGF2YWlsYWJsZSBv biB0aGUgc3lzdGVtLCBidXQgdGhlIGl0cyBhbGlhcyBpcyBhdmFpbGFibGUsCisgICAgICAgIGl0 IHdpbGwgYmUgdXNlZCBpbnN0ZWFkLiBUaGlzIGlzIGFwcHJvcHJpYXRlIGZvciB0aGUgZm9udC1m YW1pbHkgcHJvcGVydHksCisgICAgICAgIGJ1dCBub3QgZm9yIGZvbnQgZmFtaWx5IG5hbWVzIHNw ZWNpZmllZCBpbiB0aGUgbG9jYWwoKSBmdW5jdGlvbiBvZiB0aGUgc3JjCisgICAgICAgIGRlc2Ny aXB0b3IgaW4gYSBAZm9udC1mYWNlIHJ1bGUuCisKKyAgICAgICAgVGhpcyBwYXRjaCBkaXNhYmxl cyB0aGUgbWVjaGFuaXNtIHdoaWxlIGNoZWNraW5nIHNyYyBkZXNjcmlwdG9yIG9mIEBmb250LWZh Y2UuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBJdCdzIGRpZmZpY3VsdCB0byB0ZXN0IHRoZSBj aGFuZ2UgYmVjYXVzZSAnSGVsdmV0aWNhJyBjYW4KKyAgICAgICAgYmUgbWFwcGVkIGFueSBvdGhl ciBmb250LiBGb3IgZXhhbXBsZSwgY2hyb21pdW0gRFJUIHVzZXMgRm9udENvbmZpZyB0bworICAg ICAgICBtYXAgSGVsdmV0aWNhIHRvIFRpbWVzIE5ldyBSb21hbi4gT3RoZXIgcG9ydHMgbWF5IG1h cCBIZWx2ZXRpY2EgdG8gb3RoZXIKKyAgICAgICAgZm9udHMuIFdlIGNhbid0IGRlZmluZSB0aGUg ZXhwZWN0ZWQgcmVzdWx0LgorCisgICAgICAgICogY3NzL0NTU0ZvbnRGYWNlU291cmNlLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkNTU0ZvbnRGYWNlU291cmNlOjpnZXRGb250RGF0YSk6CisgICAg ICAgIENhbGwgZm9udENhY2hlKCktPmdldENhY2hlZEZvbnREYXRhKCkgd2l0aCBjaGVja2luZ0Fs dGVybmF0ZU5hbWUgPSB0cnVlLgorICAgICAgICBUaGlzIGRpc2FibGVzIGFsaWFzaW5nIGZvbnQg ZmFtaWx5IG5hbWVzIGluIEZvbnRDYWNoZS4KKwogMjAxMi0xMC0zMCAgQW5kcmVhcyBLbGluZyAg PGtsaW5nQHdlYmtpdC5vcmc+CiAKICAgICAgICAgU3R5bGVQcm9wZXJ0eVNldDogQ29udmVydCBt b3JlIGxvZ2ljIHRvIHVzZSBQcm9wZXJ0eVJlZmVyZW5jZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NGb250RmFjZVNvdXJjZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NT Rm9udEZhY2VTb3VyY2UuY3BwCmluZGV4IDVlNTI4OWY2ZDUyMjdhZTlmZDFjY2NhMjc0YjgxY2Mx MmNlZDkxZGIuLjJmZDYzZjZmYWUwMDBmNDVkYzE1MjQyNzkxZjlkNDRkNmJmM2RlNzYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250RmFjZVNvdXJjZS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlU291cmNlLmNwcApAQCAtMTA2LDcgKzEwNiw4IEBA IFBhc3NSZWZQdHI8U2ltcGxlRm9udERhdGE+IENTU0ZvbnRGYWNlU291cmNlOjpnZXRGb250RGF0 YShjb25zdCBGb250RGVzY3JpcHRpb24mCiAjZW5kaWYKICAgICApIHsKICAgICAgICAgLy8gV2Un cmUgbG9jYWwuIEp1c3QgcmV0dXJuIGEgU2ltcGxlRm9udERhdGEgZnJvbSB0aGUgbm9ybWFsIGNh Y2hlLgotICAgICAgICByZXR1cm4gZm9udENhY2hlKCktPmdldENhY2hlZEZvbnREYXRhKGZvbnRE ZXNjcmlwdGlvbiwgbV9zdHJpbmcpOworICAgICAgICAvLyBXZSBkb24ndCB3YW50IHRvIGNoZWNr IGFsdGVybmF0ZSBmb250IGZhbWlseSBuYW1lcyBoZXJlLCBzbyBwYXNzIHRydWUgYXMgdGhlIGNo ZWNraW5nQWx0ZXJuYXRlTmFtZSBwYXJhbWV0ZXIuCisgICAgICAgIHJldHVybiBmb250Q2FjaGUo KS0+Z2V0Q2FjaGVkRm9udERhdGEoZm9udERlc2NyaXB0aW9uLCBtX3N0cmluZywgdHJ1ZSk7CiAg ICAgfQogCiAgICAgLy8gU2VlIGlmIHdlIGhhdmUgYSBtYXBwaW5nIGluIG91ciBGb250RGF0YSBj YWNoZS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwppbmRleCA2MjAzZWI5OWJmZjAyMWM3YzNlOGI5Y2M5NThjYjgzZjI4MmMwNWZlLi5h NTlhYjRmNzkxYjViN2Q5ZjUzM2ZmNGVlZWY0MTFkNTQxNTZmNmFkIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTcgQEAKKzIwMTItMTAtMzAgIEtlbmljaGkgSXNoaWJhc2hpICA8YmFzaGlAY2hyb21pdW0ub3Jn PgorCisgICAgICAgIGxvY2FsKEhlbHZldGljYSkgaW4gc3JjIGRlc2NyaXB0b3IgcHJldmVudCBm YWxsYmFjaworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTAwNDQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4KKworICAgICAgICBB ZGQgYWx0ZXJuYXRlIGZvbnQgZmFtaWx5IG5hbWVzIHRvIHNyYyBkZXNjcmlwdG9yIG9mIEBmb250 LWZhY2UgcnVsZXMKKyAgICAgICAgc28gdGhhdCB0aGUgY2hhbmdlIGRvZXNuJ3QgY2hhbmdlIHRo ZSBleHBlY3RhdGlvbnMgb2YgdGVzdHMuCisKKyAgICAgICAgKiBmYXN0L2Nzcy9mb250LWZhY2Ut aW1wbGljaXQtbG9jYWwtZm9udC5odG1sOgorICAgICAgICAqIGZhc3QvY3NzL2ZvbnQtZmFjZS1t dWx0aXBsZS1mYWNlcy5odG1sOgorICAgICAgICAqIHN2Zy9jdXN0b20vZm9udC1mYWNlLXNpbXBs ZS5zdmc6CisKIDIwMTItMTAtMzAgIFZpbmNlbnQgU2NoZWliICA8c2NoZWliQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBbY2hyb21pdW1dIFVucmV2aWV3ZWQ6IEFkZGl0aW9uYWwgd2ViZ2wgdGVz dCBzdXBwcmVzc2lvbiB0byBnbyBhbG9uZyB3aXRoIGVhcmxpZXIgb25lcy4KZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2Zhc3QvY3NzL2ZvbnQtZmFjZS1pbXBsaWNpdC1sb2NhbC1mb250Lmh0bWwg Yi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9mb250LWZhY2UtaW1wbGljaXQtbG9jYWwtZm9udC5odG1s CmluZGV4IGNiODk3ODBmNDA2MGMyODRhMDRiZjFmMmFlMjJhNzk0OGYzNTU4ZGMuLmZlN2I3MWM0 YTE3ZmFiZDcwNDFjYmVlZjhiZmQ0YWU1ZWE1MjQyOTIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L2Zhc3QvY3NzL2ZvbnQtZmFjZS1pbXBsaWNpdC1sb2NhbC1mb250Lmh0bWwKKysrIGIvTGF5b3V0 VGVzdHMvZmFzdC9jc3MvZm9udC1mYWNlLWltcGxpY2l0LWxvY2FsLWZvbnQuaHRtbApAQCAtMSw3 ICsxLDcgQEAKIDxzdHlsZT4KICAgICBAZm9udC1mYWNlIHsKICAgICAgICAgZm9udC1mYW1pbHk6 ICdjb3VyaWVyJzsKLSAgICAgICAgc3JjOiBsb2NhbCgnVGltZXMnKTsKKyAgICAgICAgc3JjOiBs b2NhbCgnVGltZXMnKSwgbG9jYWwoJ1RpbWVzIE5ldyBSb21hbicpOwogICAgICAgICB1bmljb2Rl LXJhbmdlOiBVKzAwMz87CiAgICAgfQogPC9zdHlsZT4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2Zhc3QvY3NzL2ZvbnQtZmFjZS1tdWx0aXBsZS1mYWNlcy5odG1sIGIvTGF5b3V0VGVzdHMvZmFz dC9jc3MvZm9udC1mYWNlLW11bHRpcGxlLWZhY2VzLmh0bWwKaW5kZXggYmQ1ODBhMjQ1MGQzNGI0 YzE5ZDFlMDJkYzk4ZDc4NDU3Mjk3NDI4Mi4uMDJmY2Y1MWVjYTNiMzQzODRmZGUxMTI2ZDA0OWIz MDVlZDk4ZDUxOSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MvZm9udC1mYWNlLW11 bHRpcGxlLWZhY2VzLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvZm9udC1mYWNlLW11 bHRpcGxlLWZhY2VzLmh0bWwKQEAgLTIsMTMgKzIsMTMgQEAKICAgICBAZm9udC1mYWNlIHsKICAg ICAgICAgZm9udC1mYW1pbHk6IHdlYmtpdC1vbmU7CiAgICAgICAgIGZvbnQtc3R5bGU6IGl0YWxp YzsKLSAgICAgICAgc3JjOiBsb2NhbChDb3VyaWVyKTsKKyAgICAgICAgc3JjOiBsb2NhbChDb3Vy aWVyKSwgbG9jYWwoJ0NvdXJpZXIgTmV3Jyk7CiAgICAgfQogCiAgICAgQGZvbnQtZmFjZSB7CiAg ICAgICAgIGZvbnQtZmFtaWx5OiB3ZWJraXQtb25lOwogICAgICAgICBmb250LXN0eWxlOiBub3Jt YWw7Ci0gICAgICAgIHNyYzogbG9jYWwoSGVsdmV0aWNhKTsKKyAgICAgICAgc3JjOiBsb2NhbChI ZWx2ZXRpY2EpLCBsb2NhbChBcmlhbCk7CiAgICAgfQogCiAgICAgQGZvbnQtZmFjZSB7CkBAIC00 NCwxMyArNDQsMTMgQEAKICAgICBAZm9udC1mYWNlIHsKICAgICAgICAgZm9udC1mYW1pbHk6IHdl YmtpdC1zaXg7CiAgICAgICAgIGZvbnQtd2VpZ2h0OiA0MDA7Ci0gICAgICAgIHNyYzogbG9jYWwo Q291cmllcik7CisgICAgICAgIHNyYzogbG9jYWwoQ291cmllciksIGxvY2FsKCdDb3VyaWVyIE5l dycpOwogICAgIH0KIAogICAgIEBmb250LWZhY2UgewogICAgICAgICBmb250LWZhbWlseTogd2Vi a2l0LXNpeDsKICAgICAgICAgZm9udC13ZWlnaHQ6IDcwMDsKLSAgICAgICAgc3JjOiBsb2NhbChI ZWx2ZXRpY2EpOworICAgICAgICBzcmM6IGxvY2FsKEhlbHZldGljYSksIGxvY2FsKEFyaWFsKTsK ICAgICB9CiAKICAgICBAZm9udC1mYWNlIHsKQEAgLTYyLDI1ICs2MiwyNSBAQAogICAgIEBmb250 LWZhY2UgewogICAgICAgICBmb250LWZhbWlseTogd2Via2l0LXNldmVuOwogICAgICAgICBmb250 LXdlaWdodDogMzAwOwotICAgICAgICBzcmM6IGxvY2FsKENvdXJpZXIpOworICAgICAgICBzcmM6 IGxvY2FsKENvdXJpZXIpLCBsb2NhbCgnQ291cmllciBOZXcnKTsKICAgICB9CiAKICAgICBAZm9u dC1mYWNlIHsKICAgICAgICAgZm9udC1mYW1pbHk6IHdlYmtpdC1zZXZlbjsKICAgICAgICAgZm9u dC13ZWlnaHQ6IDYwMDsKLSAgICAgICAgc3JjOiBsb2NhbChIZWx2ZXRpY2EpOworICAgICAgICBz cmM6IGxvY2FsKEhlbHZldGljYSksIGxvY2FsKEFyaWFsKTsKICAgICB9CiAKICAgICBAZm9udC1m YWNlIHsKICAgICAgICAgZm9udC1mYW1pbHk6IHdlYmtpdC1laWdodDsKICAgICAgICAgZm9udC13 ZWlnaHQ6IDEwMDsKLSAgICAgICAgc3JjOiBsb2NhbChDb3VyaWVyKTsKKyAgICAgICAgc3JjOiBs b2NhbChDb3VyaWVyKSwgbG9jYWwoJ0NvdXJpZXIgTmV3Jyk7CiAgICAgfQogCiAgICAgQGZvbnQt ZmFjZSB7CiAgICAgICAgIGZvbnQtZmFtaWx5OiB3ZWJraXQtZWlnaHQ7CiAgICAgICAgIGZvbnQt d2VpZ2h0OiA5MDA7Ci0gICAgICAgIHNyYzogbG9jYWwoSGVsdmV0aWNhKTsKKyAgICAgICAgc3Jj OiBsb2NhbChIZWx2ZXRpY2EpLCBsb2NhbChBcmlhbCk7CiAgICAgfQogCiAgICAgZGl2IHsgYm9y ZGVyOiAxcHggc29saWQgbGlnaHRibHVlOyBtYXJnaW46IDRweDsgfQpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvc3ZnL2N1c3RvbS9mb250LWZhY2Utc2ltcGxlLnN2ZyBiL0xheW91dFRlc3RzL3N2 Zy9jdXN0b20vZm9udC1mYWNlLXNpbXBsZS5zdmcKaW5kZXggMzk0ZDVkZTk3ZDVhYjk2ODQ0M2M1 MmEwMWI1MGEzN2YwYWFjMzAxOC4uYzQ5MDYyMmY0YjkzNGJlZTExODAyOGM2ZDg5Mzk5NmQ2NWRi YmRlNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvc3ZnL2N1c3RvbS9mb250LWZhY2Utc2ltcGxl LnN2ZworKysgYi9MYXlvdXRUZXN0cy9zdmcvY3VzdG9tL2ZvbnQtZmFjZS1zaW1wbGUuc3ZnCkBA IC0xMCw3ICsxMCw3IEBACiAgIH0KICAgQGZvbnQtZmFjZSB7CiAgICAgZm9udC1mYW1pbHk6ICJj c3N0ZXN0IjsKLSAgICBzcmM6IGxvY2FsKCJDb3VyaWVyIik7CisgICAgc3JjOiBsb2NhbCgiQ291 cmllciIpLCBsb2NhbCgiQ291cmllciBOZXciKTsKICAgfQogPC9zdHlsZT4KIDxkZWZzPgo=