150340 2015-10-19 14:06:16 -0700 [FreeType] Add support for the USE_TYPO_METRICS flag 2015-10-21 09:43:13 -0700 1 1 1 Unclassified WebKit Text WebKit Nightly Build PC Linux RESOLVED FIXED P2 Normal --- 131839 150394 1 fred.wang fred.wang commit-queue mmaxfield mrobinson oldest_to_newest 1134688 0 fred.wang 2015-10-19 14:06:16 -0700 This is bug 131839 for Linux. 1134698 1 263512 fred.wang 2015-10-19 14:35:20 -0700 Created attachment 263512 Patch 1134927 2 263512 mmaxfield 2015-10-20 10:51:22 -0700 Comment on attachment 263512 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=263512&action=review I can't comment on the FreeType-specific stuff, but this approach looks good to me. > Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp:72 > + if (TT_OS2* os2 = static_cast<TT_OS2*>(FT_Get_Sfnt_Table(freeTypeFace, ft_sfnt_os2))) { > + const FT_Short kUseTypoMetricsMask = 1 << 7; > + if (os2->fsSelection & kUseTypoMetricsMask) { There's really no FreeType API for this? :( 1134938 3 fred.wang 2015-10-20 11:14:49 -0700 > There's really no FreeType API for this? :( I checked the Cairo and FreeType online documentation and could not find any easier way to retrieve the typo values (the yscale parameter was actually taken from Gecko's gfx/thebes/gfxFT2Utils.cpp and they also hardcode the use_typo_metrics bit). I just downloaded the freetype-2.6 source and searched for "typo" metrics but I did not find anything either... 1135003 4 263512 mrobinson 2015-10-20 13:56:29 -0700 Comment on attachment 263512 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=263512&action=review Looks good to me, except for a few nits. > Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp:70 > + if (TT_OS2* os2 = static_cast<TT_OS2*>(FT_Get_Sfnt_Table(freeTypeFace, ft_sfnt_os2))) { I think WebKit style specifies this should be called OS2Table instead of os2. > LayoutTests/fonts/use-typo-metrics-1.html:9 > + src: url("./lineheight5000-typolineheight2300.woff"); Is the "./" necessary here? 1135014 5 263619 fred.wang 2015-10-20 14:42:25 -0700 Created attachment 263619 Patch final version Thanks! 1135146 6 263663 fred.wang 2015-10-20 23:59:50 -0700 Created attachment 263663 Patch final version 1135148 7 fred.wang 2015-10-21 00:06:07 -0700 Committed r191378: <http://trac.webkit.org/changeset/191378> 263512 2015-10-19 14:35:20 -0700 2015-10-20 14:42:25 -0700 Patch bug-150340-20151019233437.patch text/plain 9310 fred.wang U3VidmVyc2lvbiBSZXZpc2lvbjogMTkxMjg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWQ0ZWI5NDM0MTgyYzgz NTRmZmIzZGJjZTBlMGNhODgxMjgxZWMyMi4uMGJkMzMyNmI4ZTdmZTVkYjNmYmQzOGYzODkzYWMw MmUwZGE1ODhkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE1LTEwLTE5ICBGcmVk ZXJpYyBXYW5nICA8ZnJlZC53YW5nQGZyZWUuZnI+CisKKyAgICAgICAgW0ZyZWVUeXBlXSBBZGQg c3VwcG9ydCBmb3IgdGhlIFVTRV9UWVBPX01FVFJJQ1MgZmxhZworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUwMzQwCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdDogZm9udHMvdXNlLXR5cG8tbWV0cmlj cy0xLmh0bWwKKworICAgICAgICBNYWtlIHRoZSBGcmVlVHlwZSBiYWNrZW5kIHVzZSB0aGUgdHlw byBtZXRyaWNzIHdoZW4gdGhlIE9TLzIgVVNFX1RZUE9fTUVUUklDUyBmbGFnIGlzIHNldC4KKyAg ICAgICAgU2ltaWxhciB3b3JrIHNob3VsZCBiZSBkb25lIGZvciBvdGhlciBiYWNrZW5kcywgc2Vl IGJ1ZyAxMzE4MzkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9TaW1w bGVGb250RGF0YUZyZWVUeXBlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6OnBsYXRmb3Jt SW5pdCk6IFZlcmlmeSB3aGV0aGVyIHRoZSBPUy8yIFVTRV9UWVBPX01FVFJJQ1MgZmxhZyBpcyBz ZXQgYW5kIHVzZSB0aGUgdHlwbyBtZXRyaWNzIGlmIHRoYXQncyB0aGUgY2FzZS4KKwogMjAxNS0x MC0xOSAgWW91ZW5uIEZhYmxldCAgPHlvdWVubi5mYWJsZXRAY3JmLmNhbm9uLmZyPgogCiAgICAg ICAgIEJpbmRpbmcgZ2VuZXJhdG9yIHNob3VsZCBnZW5lcmF0ZSBuYW1lcyBmb3IgSlNCdWlsdGlu cyBwYXJ0aWFsIGludGVyZmFjZSBtZXRob2RzIHVzaW5nIEltcGxlbWVudGVkQnkgdmFsdWUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL1NpbXBs ZUZvbnREYXRhRnJlZVR5cGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv ZnJlZXR5cGUvU2ltcGxlRm9udERhdGFGcmVlVHlwZS5jcHAKaW5kZXggNTVlMzQ4OGYwNWNiNzQ4 NmRiM2UzMDFjMWJhYmI5MjNhN2FjOTQ3Ni4uY2ZhMzNlZDQ0NDhmNzE1YjIwODVhMjI4Zjg2ZmY3 OTY1YjM2ODFhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv ZnJlZXR5cGUvU2ltcGxlRm9udERhdGFGcmVlVHlwZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvU2ltcGxlRm9udERhdGFGcmVlVHlwZS5jcHAKQEAg LTY1LDYgKzY1LDIxIEBAIHZvaWQgRm9udDo6cGxhdGZvcm1Jbml0KCkKICAgICBmbG9hdCBjYXBI ZWlnaHQgPSBuYXJyb3dQcmVjaXNpb25Ub0Zsb2F0KGZvbnRFeHRlbnRzLmhlaWdodCk7CiAgICAg ZmxvYXQgbGluZUdhcCA9IG5hcnJvd1ByZWNpc2lvblRvRmxvYXQoZm9udEV4dGVudHMuaGVpZ2h0 IC0gZm9udEV4dGVudHMuYXNjZW50IC0gZm9udEV4dGVudHMuZGVzY2VudCk7CiAKKyAgICAvLyBJ ZiB0aGUgVVNFX1RZUE9fTUVUUklDUyBmbGFnIGlzIHNldCBpbiB0aGUgT1MvMiB0YWJsZSB0aGVu IHdlIHVzZSB0eXBvIG1ldHJpY3MgaW5zdGVhZC4KKyAgICBGVF9GYWNlIGZyZWVUeXBlRmFjZSA9 IGNhaXJvX2Z0X3NjYWxlZF9mb250X2xvY2tfZmFjZShtX3BsYXRmb3JtRGF0YS5zY2FsZWRGb250 KCkpOworICAgIGlmIChUVF9PUzIqIG9zMiA9IHN0YXRpY19jYXN0PFRUX09TMio+KEZUX0dldF9T Zm50X1RhYmxlKGZyZWVUeXBlRmFjZSwgZnRfc2ZudF9vczIpKSkgeworICAgICAgICBjb25zdCBG VF9TaG9ydCBrVXNlVHlwb01ldHJpY3NNYXNrID0gMSA8PCA3OworICAgICAgICBpZiAob3MyLT5m c1NlbGVjdGlvbiAmIGtVc2VUeXBvTWV0cmljc01hc2spIHsKKyAgICAgICAgICAgIC8vIEZUX1Np emVfTWV0cmljczo6eV9zY2FsZSBpcyBpbiAxNi4xNiBmaXhlZCBwb2ludCBmb3JtYXQuCisgICAg ICAgICAgICAvLyBJdHMgKGZyYWN0aW9uYWwpIHZhbHVlIGlzIGEgZmFjdG9yIHRoYXQgY29udmVy dHMgdmVydGljYWwgbWV0cmljcyBmcm9tIGRlc2lnbiB1bml0cyB0byB1bml0cyBvZiAxLzY0IHBp eGVscy4KKyAgICAgICAgICAgIGRvdWJsZSB5c2NhbGUgPSAoZnJlZVR5cGVGYWNlLT5zaXplLT5t ZXRyaWNzLnlfc2NhbGUgLyA2NTUzNi4wKSAvIDY0LjA7CisgICAgICAgICAgICBhc2NlbnQgPSBu YXJyb3dQcmVjaXNpb25Ub0Zsb2F0KHlzY2FsZSAqIG9zMi0+c1R5cG9Bc2NlbmRlcik7CisgICAg ICAgICAgICBkZXNjZW50ID0gLW5hcnJvd1ByZWNpc2lvblRvRmxvYXQoeXNjYWxlICogb3MyLT5z VHlwb0Rlc2NlbmRlcik7CisgICAgICAgICAgICBsaW5lR2FwID0gbmFycm93UHJlY2lzaW9uVG9G bG9hdCh5c2NhbGUgKiBvczItPnNUeXBvTGluZUdhcCk7CisgICAgICAgIH0KKyAgICB9CisgICAg Y2Fpcm9fZnRfc2NhbGVkX2ZvbnRfdW5sb2NrX2ZhY2UobV9wbGF0Zm9ybURhdGEuc2NhbGVkRm9u dCgpKTsKKwogICAgIG1fZm9udE1ldHJpY3Muc2V0QXNjZW50KGFzY2VudCk7CiAgICAgbV9mb250 TWV0cmljcy5zZXREZXNjZW50KGRlc2NlbnQpOwogICAgIG1fZm9udE1ldHJpY3Muc2V0Q2FwSGVp Z2h0KGNhcEhlaWdodCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYzUwMWE4NTQ2ZWFiMTEwMjYxN2IyNmE0MmFhMWIwZjFk ZDdlYmE3ZC4uOWJkOTVjOWVmY2M2MjNkNzkwMjM3MzM1YjU2MWEwZGIwMDEwNmMzYyAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE4IEBACisyMDE1LTEwLTE5ICBGcmVkZXJpYyBXYW5nICA8ZnJlZC53YW5nQGZy ZWUuZnI+CisKKyAgICAgICAgW0ZyZWVUeXBlXSBBZGQgc3VwcG9ydCBmb3IgdGhlIFVTRV9UWVBP X01FVFJJQ1MgZmxhZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTUwMzQwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQWRkIGEgdGVzdCB0byB2ZXJpZnkgdGhhdCB0aGUgbGluZSBoZWlnaHQgb2YgYSBmb250 IGlzIGNhbGN1bGF0ZWQgZnJvbSB0aGUgdHlwbyBtZXRyaWNzIHdoZW4gdGhlIE9TLzIgVVNFX1RZ UE9fTUVUUklDUyBmbGFnIGlzIHNldC4gQ3VycmVudGx5LCB0aGUgdGVzdCBvbmx5IHBhc3NlcyB3 aXRoIHRoZSBGcmVlVHlwZSBiYWNrZW5kLgorCisgICAgICAgICogZm9udHMvbGluZWhlaWdodDUw MDAtdHlwb2xpbmVoZWlnaHQyMzAwLndvZmY6IEFkZGVkLgorICAgICAgICAqIGZvbnRzL3VzZS10 eXBvLW1ldHJpY3MtMS1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmb250cy91c2Ut dHlwby1tZXRyaWNzLTEuaHRtbDogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vbWFjL1Rlc3RF eHBlY3RhdGlvbnM6IE1hcmsgYXMgZmFpbGluZy4KKyAgICAgICAgKiBwbGF0Zm9ybS93aW4vVGVz dEV4cGVjdGF0aW9uczogTWFyayBhcyBmYWlsaW5nLgorCiAyMDE1LTEwLTE5ICBZb3Vlbm4gRmFi bGV0ICA8eW91ZW5uLmZhYmxldEBjcmYuY2Fub24uZnI+CiAKICAgICAgICAgW1N0cmVhbXMgQVBJ XSBJbXBsZW1lbnQgUmVhZGFibGVTdHJlYW0gdGVlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9m b250cy9saW5laGVpZ2h0NTAwMC10eXBvbGluZWhlaWdodDIzMDAud29mZiBiL0xheW91dFRlc3Rz L2ZvbnRzL2xpbmVoZWlnaHQ1MDAwLXR5cG9saW5laGVpZ2h0MjMwMC53b2ZmCm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu LjdlMzAwNzgyMTI1OGFlYzk1ZjYwMjQ1MWJhNzJiNDIyNjcxZmE2NDAKR0lUIGJpbmFyeSBwYXRj aApsaXRlcmFsIDExMDgKemNtWFQtY1hSVSgzR3J1T1U8cU8xVmdMZFQwUn4xOGpSfkNIKyFUUEtV eDReTjB8VFEqPVNjLUtIQDZVOUFvfmhYCnpPY0lEPyU4bS1RYDNMSjgwbVZLNWA3U2A1cG08ZTZK dmxlQWZQc09AMWp1JjwlNlR6Tlc/cT8qbndTQzxze3g3YAp6MEk/WitaXnJmdnBkZTZlNFVqSmIj NDVhTmREbXk7bVEoPTZQNX04SjdqbSYqVXxgNWl0TkB0QHZYPjJ2bkZBUXwKejVfNDA1VnQwViUk MSpUNUtZM29lYGF3WnthUzcwR0hiNkNFSyY8ZTtqbHNCTFBJNXtAVnEhdXtOe0lqSV5WJTJCCnpv Oz40eSo1ajx0Y0AwQlQxQV9+P0R8SnF8YjRXQGBPQmZnITg1JFY5YDE+SUpodkx+RSZUVEstYncy WlJQTHE+Ngp6X1Vedm57O2F5WiNIb29EQy1lXj1QKjZEaCE2JUB0KFo0T3d0RHtrSmlGQHpDX0p0 PWJfYj1HUWt1dDV4WlBUKSoKemlIIT9hSHN2Ukl3eXAxUE4taXZ7REBzZjlPc2tWQylLazIpKld0 ajRnYVpmOG9MSTRCJkdvKEMraDR+VytnbnxxCnpja31kfkBIZitzXmlUYi1hXnVAU1A0VH1FZS0p cFc0PT1PWmNpJko0WCErR1lzfXJDOTRwcUxTOClmKFpgTHcpawp6ZDIpSVRlTDJhfDNfJC1TQnFY RlRHPGxjaD8+TSsrXk15REdVSXpPPCl7RFJaMExkbFI5a2dne29aOHM5dk9BTlgKem5jMTFZQzlV UV8haWZfc0JCPT5hUXlMaUUqaCglT1NhOUlNYDg2TnpILSl4Kj02RWpIQjkrRjxDWG05eVZEKjx2 Cno3aC0tfEx4TG9tOD1GN0A8MHB4T0hEWVlNM1RONHROSmBGLTVSdiV2fDNDWXVnSjFyKXwyS0VP JUZMKU4mRF8rPwp6RUhLSFAqPUxFU0pUTk54ODk2UFhaYj9aPFYwZzQobnpfKSZLVzZjZ0o3JmYr eEp1fCphPSYlR0BMelhFeW4hfnUKelA4bDhfZytLPTVNTz5YQWRzN2t+KmNfXkNYPjl6LSVGSHw/ Q0I9YyZoYXV0LWIxQ3grVjJsR1gxT3h5JUFpb30rCnpXYmIjX0s7cjI5JWwxT3Q4I2N7c1RxV3hE YmpoaHBZZVFaSXNBaGooPHUlek9HKTZWOWh8I1VEJCUwOXkkKyY8dwp6UEtLRz14IXRSRz5XfXAy ZCo1JWltcCkoYHIrQzRaemVBUzA9ZmtAamh4YjtMKyZMVW5XQSFmaU5vcFZhajw1RyoKel96aHAo NGJjMSpGMCojKz5lUGNUclk3X0l8MHVlMWMoYUdoY2Zzb05LSzJSc3gqc2IoeDhLbG1PcHRmNiRj WUp1Cno5Zz0hdikhc08zdXlsQkVadT5LTmJIOFFPZzAjeWFxR2tJT3JYTDhCcFN8aXRrQEU0fm9q am9lQ3NWUk5zWjh0TQp6YiF+VDJIa2E/c2QjaVlCV00xZUBHfEt4bStjeFJrd3gzVmh2QGljKDwj YzhaUzlQcV58OX5sKF5SfkBZVU9GWHoKeio1WkcmeHpmOUs4ODVMP0piZnk2P09XfCUhTz0lRj8r Typ+ZHchPSUtMDtEUD1pNXZGJTd9O1FvYm4yZilIPUwhCnpRZ0xPfUw9QiNfeCY/b31KPCUpaWsp RVl9Wnx5cmImdXFSTiNAKUtmbGZ6OCZDeCZSdkZ6VlFJIyVlI0tLPXVBSwpiWCNBeHlIMiopIzxM MXljayYlfnlLX2lyTENqJGNqTENkWDIKCmxpdGVyYWwgMApIY21WP2QwMDAwMQoKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2ZvbnRzL3VzZS10eXBvLW1ldHJpY3MtMS1leHBlY3RlZC5odG1sIGIv TGF5b3V0VGVzdHMvZm9udHMvdXNlLXR5cG8tbWV0cmljcy0xLWV4cGVjdGVkLmh0bWwKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uM2Y3Zjc2NDA0NTg2MzlhYjBiNTQ4NDg5ZTA0YjYzZjk4Y2RhZDQwYgotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2ZvbnRzL3VzZS10eXBvLW1ldHJpY3MtMS1leHBlY3RlZC5o dG1sCkBAIC0wLDAgKzEsMTkgQEAKKzwhRE9DVFlQRSBodG1sPgorPG1ldGEgY2hhcnNldD0idXRm LTgiLz4KKzx0aXRsZT5PcGVuIEZvbnQgRm9ybWF0OiBVU0VfVFlQT19NRVRSSUNTIChyZWZlcmVu Y2UpPC90aXRsZT4KKzxzdHlsZT4KKyAgI2dyZWVuIHsKKyAgICAgcG9zaXRpb246IGFic29sdXRl OworICAgICBiYWNrZ3JvdW5kOiBncmVlbjsKKyAgICAgbGVmdDogMTBweDsKKyAgICAgd2lkdGg6 IDIzMHB4OworICAgICBoZWlnaHQ6IDIzMHB4OworICB9Cis8L3N0eWxlPgorPGJvZHk+CisgIDxw PlRlc3QgcGFzc2VzIGlmIHRoZXJlIGlzIGEgZ3JlZW4gc3F1YXJlIGFuZCBubyByZWQuPC9wPgor CisgIDxkaXY+CisgICAgPGRpdiBpZD0iZ3JlZW4iPjwvZGl2PgorICA8L2Rpdj4KKzwvYm9keT4K ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ZvbnRzL3VzZS10eXBvLW1ldHJpY3MtMS5odG1sIGIv TGF5b3V0VGVzdHMvZm9udHMvdXNlLXR5cG8tbWV0cmljcy0xLmh0bWwKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYjVj MzU5YTk2MTg1NWIxODliMjJlNjljOWRmMWVmNGFhNzEwMGE5YwotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2ZvbnRzL3VzZS10eXBvLW1ldHJpY3MtMS5odG1sCkBAIC0wLDAgKzEsNTAg QEAKKzwhRE9DVFlQRSBodG1sPgorPG1ldGEgY2hhcnNldD0idXRmLTgiLz4KKzx0aXRsZT5PcGVu IEZvbnQgRm9ybWF0OiBVU0VfVFlQT19NRVRSSUNTPC90aXRsZT4KKzxsaW5rIHJlbD0iaGVscCIg aHJlZj0iaHR0cDovL3d3dy5tYXRobWwtYXNzb2NpYXRpb24ub3JnL01hdGhNTGluSFRNTDUvUzIu aHRtbCNTUzIuU1NTMSIvPgorPGxpbmsgcmVsPSJtYXRjaCIgaHJlZj0idXNlLXR5cG8tbWV0cmlj cy0xLXJlZi5odG1sIi8+Cis8c3R5bGU+CisgIEBmb250LWZhY2UgeworICAgIGZvbnQtZmFtaWx5 OiBUZXN0Rm9udDsKKyAgICBzcmM6IHVybCgiLi9saW5laGVpZ2h0NTAwMC10eXBvbGluZWhlaWdo dDIzMDAud29mZiIpOworICB9CisgIC5ncmVlbiB7CisgICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsK KyAgICAgYmFja2dyb3VuZDogZ3JlZW47CisgICAgIHdpZHRoOiAxMTVweDsKKyAgfQorICAucmVk IHsKKyAgICAgcG9zaXRpb246IGFic29sdXRlOworICAgICBiYWNrZ3JvdW5kOiByZWQ7CisgICAg IHdpZHRoOiAxMTVweDsKKyAgfQorICAuZm9yY2VIZWlnaHQgeworICAgIGhlaWdodDogMjMwcHg7 CisgIH0KKyAgLmxlZnRTaWRlIHsKKyAgICBsZWZ0OiAxMHB4OworICB9CisgIC5yaWdodFNpZGUg eworICAgIGxlZnQ6IDEyNXB4OworICB9CisgIHNwYW4geworICAgIC8qIGVtPTEwMDAsIGxpbmVI ZWlnaHQ9NTAwMCwgdHlwb0xpbmVIZWlnaHQ9MjMwMCBhbmQgZm9udC1zaXplPTEwMHB4CisgICAg ICAgaW1wbGllcyB0eXBvTGluZUhlaWdodFB4ID0gMjMwcHggPCA1MDBweCA9IGxpbmVIZWlnaHRQ eCAqLworICAgICBmb250LWZhbWlseTogVGVzdEZvbnQ7CisgICAgIGZvbnQtc2l6ZTogMTAwcHg7 CisgICAgIGNvbG9yOiB0cmFuc3BhcmVudDsKKyAgfQorPC9zdHlsZT4KKzxib2R5PgorICA8cD5U ZXN0IHBhc3NlcyBpZiB0aGVyZSBpcyBhIGdyZWVuIHNxdWFyZSBhbmQgbm8gcmVkLjwvcD4KKwor ICA8ZGl2PgorICAgIDwhLS0gTGVmdCBzaWRlIHZlcmlmaWVzIHRoYXQgdHlwb0xpbmVIZWlnaHRQ eCA8PSAyMzBweCAtLT4KKyAgICA8ZGl2IGNsYXNzPSJsZWZ0U2lkZSByZWQiPjxzcGFuPk88L3Nw YW4+PC9kaXY+CisgICAgPGRpdiBjbGFzcz0ibGVmdFNpZGUgZ3JlZW4gZm9yY2VIZWlnaHQiPjwv ZGl2PgorCisgICAgPCEtLSBSaWdodCBzaWRlIHZlcmlmaWVzIHRoYXQgdHlwb0xpbmVIZWlnaHRQ eCA9PiAyMzBweCAtLT4KKyAgICA8ZGl2IGNsYXNzPSJyaWdodFNpZGUgcmVkIGZvcmNlSGVpZ2h0 Ij48L2Rpdj4KKyAgICA8ZGl2IGNsYXNzPSJyaWdodFNpZGUgZ3JlZW4iPjxzcGFuPk88L3NwYW4+ PC9kaXY+CisgIDwvZGl2PgorPC9ib2R5PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZv cm0vbWFjL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvVGVzdEV4 cGVjdGF0aW9ucwppbmRleCAxYzM4MzY4OTY0NDllODg0ZjE3MWE5MWY5NmYyMmY4OGY2YTVkZjkx Li5mMzVhYjMzYjhmMWM4NDIzY2EyZTVlYTY2M2VhNDNjZWU5ZjViZjAwIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9tYWMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtMTM0OCwzICsxMzQ4LDYgQEAgd2Vi a2l0Lm9yZy9iLzE0OTkzMCBmYXN0L2NhbnZhcy93ZWJnbC9vZXMtdGV4dHVyZS1mbG9hdC1saW5l YXIuaHRtbCBbIFBhc3MgRmFpbHUKIAogIyBJbXBvcnRlZCBCbGluayB0ZXN0cyB3aGljaCBoYXZl IG5vdCBiZWVuIGludmVzdGlnYXRlZC4KIGltcG9ydGVkL2JsaW5rL2NvbXBvc2l0aW5nL3ZpZGVv L3ZpZGVvLWNvbnRyb2xzLWxheWVyLWNyZWF0aW9uLXNxdWFzaGluZy5odG1sIFsgUGFzcyBJbWFn ZU9ubHlGYWlsdXJlIF0KKworIyBVU0VfVFlQT19NRVRSSUNTIGlzIG5vdCBpbXBsZW1lbnRlZCBv biBtYWMuCit3ZWJraXQub3JnL2IvMTMxODM5IGZvbnRzL3VzZS10eXBvLW1ldHJpY3MtMS5odG1s IFsgRmFpbHVyZSBdCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vVGVzdEV4 cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9UZXN0RXhwZWN0YXRpb25zCmlu ZGV4IDRiM2I3NzU4NGJlMTU5NDNiM2ZmY2RjNTVjMTI3ZjI1Nzc2NTcyZGMuLjFjMzJkNjQ0ZTg2 YjEwYWIwNWQyMjRmZTdlYjY2MjkxNGQ2NTA1ODIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3Bs YXRmb3JtL3dpbi9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dp bi9UZXN0RXhwZWN0YXRpb25zCkBAIC0zMjYzLDQgKzMyNjMsNyBAQCB3ZWJraXQub3JnL2IvMTUw MDQwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvZG9tL3Jhbmdlcy9SYW5nZS1zdXJy b3VuZENvbgogd2Via2l0Lm9yZy9iLzE1MDA0MCBqcy9kb20vZGZnLWN1c3RvbS1nZXR0ZXIuaHRt bCBbIEZhaWx1cmUgXQogCiAjIFRoZSBmb2xsb3dpbmcgdGVzdHMgYXJlIG5vdCByZWxldmFudCBv biB0aGUgV2luZG93cyBwbGF0Zm9ybToKLWZhc3QvZm9ybXMvaGlkcGktdGV4dGZpZWxkLWJhY2tn cm91bmQtYmxlZWRpbmcuaHRtbCBbIFNraXAgXQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUK K2Zhc3QvZm9ybXMvaGlkcGktdGV4dGZpZWxkLWJhY2tncm91bmQtYmxlZWRpbmcuaHRtbCBbIFNr aXAgXQorCisjIFVTRV9UWVBPX01FVFJJQ1MgaXMgbm90IGltcGxlbWVudGVkIG9uIHRoZSBXaW5k b3dzIHBsYXRmb3JtCit3ZWJraXQub3JnL2IvMTMxODM5IGZvbnRzL3VzZS10eXBvLW1ldHJpY3Mt MS5odG1sIFsgRmFpbHVyZSBdCg== 263619 2015-10-20 14:42:25 -0700 2015-10-20 23:59:50 -0700 Patch final version freetype-use-typo.patch text/plain 8843 fred.wang ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjNTAxYTg1Li45YmQ5NWM5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTUtMTAt MTkgIEZyZWRlcmljIFdhbmcgIDxmcmVkLndhbmdAZnJlZS5mcj4KKworICAgICAgICBbRnJlZVR5 cGVdIEFkZCBzdXBwb3J0IGZvciB0aGUgVVNFX1RZUE9fTUVUUklDUyBmbGFnCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTAzNDAKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYSB0ZXN0IHRvIHZlcmlm eSB0aGF0IHRoZSBsaW5lIGhlaWdodCBvZiBhIGZvbnQgaXMgY2FsY3VsYXRlZCBmcm9tIHRoZSB0 eXBvIG1ldHJpY3Mgd2hlbiB0aGUgT1MvMiBVU0VfVFlQT19NRVRSSUNTIGZsYWcgaXMgc2V0LiBD dXJyZW50bHksIHRoZSB0ZXN0IG9ubHkgcGFzc2VzIHdpdGggdGhlIEZyZWVUeXBlIGJhY2tlbmQu CisKKyAgICAgICAgKiBmb250cy9saW5laGVpZ2h0NTAwMC10eXBvbGluZWhlaWdodDIzMDAud29m ZjogQWRkZWQuCisgICAgICAgICogZm9udHMvdXNlLXR5cG8tbWV0cmljcy0xLWV4cGVjdGVkLmh0 bWw6IEFkZGVkLgorICAgICAgICAqIGZvbnRzL3VzZS10eXBvLW1ldHJpY3MtMS5odG1sOiBBZGRl ZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvVGVzdEV4cGVjdGF0aW9uczogTWFyayBhcyBmYWls aW5nLgorICAgICAgICAqIHBsYXRmb3JtL3dpbi9UZXN0RXhwZWN0YXRpb25zOiBNYXJrIGFzIGZh aWxpbmcuCisKIDIwMTUtMTAtMTkgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm4uZmFibGV0QGNyZi5j YW5vbi5mcj4KIAogICAgICAgICBbU3RyZWFtcyBBUEldIEltcGxlbWVudCBSZWFkYWJsZVN0cmVh bSB0ZWUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ZvbnRzL2xpbmVoZWlnaHQ1MDAwLXR5cG9s aW5laGVpZ2h0MjMwMC53b2ZmIGIvTGF5b3V0VGVzdHMvZm9udHMvbGluZWhlaWdodDUwMDAtdHlw b2xpbmVoZWlnaHQyMzAwLndvZmYKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uN2UzMDA3ODIxMjU4YWVjOTVmNjAyNDUx YmE3MmI0MjI2NzFmYTY0MApHSVQgYmluYXJ5IHBhdGNoCmxpdGVyYWwgMTEwOAp6Y21YVC1jWFJV KDNHcnVPVTxxTzFWZ0xkVDBSfjE4alJ+Q0grIVRQS1V4NF5OMHxUUSo9U2MtS0hANlU5QW9+aFgK ek9jSUQ/JThtLVFgM0xKODBtVks1YDdTYDVwbTxlNkp2bGVBZlBzT0AxanUmPCU2VHpOVz9xPypu d1NDPHN7eDdgCnowST9aK1pecmZ2cGRlNmU0VWpKYiM0NWFOZERteTttUSg9NlA1fThKN2ptJipV fGA1aXROQHRAdlg+MnZuRkFRfAp6NV80MDVWdDBWJSQxKlQ1S1kzb2VgYXdae2FTNzBHSGI2Q0VL JjxlO2psc0JMUEk1e0BWcSF1e057SWpJXlYlMkIKem87PjR5KjVqPHRjQDBCVDFBX34/RHxKcXxi NFdAYE9CZmchODUkVjlgMT5JSmh2TH5FJlRUSy1idzJaUlBMcT42CnpfVV52bns7YXlaI0hvb0RD LWVePVAqNkRoITYlQHQoWjRPd3REe2tKaUZAekNfSnQ9Yl9iPUdRa3V0NXhaUFQpKgp6aUghP2FI c3ZSSXd5cDFQTi1pdntEQHNmOU9za1ZDKUtrMikqV3RqNGdhWmY4b0xJNEImR28oQytoNH5XK2du fHEKemNrfWR+QEhmK3NeaVRiLWFedUBTUDRUfUVlLSlwVzQ9PU9aY2kmSjRYIStHWXN9ckM5NHBx TFM4KWYoWmBMdylrCnpkMilJVGVMMmF8M18kLVNCcVhGVEc8bGNoPz5NKyteTXlER1VJek88KXtE UlowTGRsUjlrZ2d7b1o4czl2T0FOWAp6bmMxMVlDOVVRXyFpZl9zQkI9PmFReUxpRSpoKCVPU2E5 SU1gODZOekgtKXgqPTZFakhCOStGPENYbTl5VkQqPHYKejdoLS18THhMb204PUY3QDwwcHhPSERZ WU0zVE40dE5KYEYtNVJ2JXZ8M0NZdWdKMXIpfDJLRU8lRkwpTiZEXys/CnpFSEtIUCo9TEVTSlRO Tng4OTZQWFpiP1o8VjBnNChuel8pJktXNmNnSjcmZit4SnV8KmE9JiVHQEx6WEV5biF+dQp6UDhs OF9nK0s9NU1PPlhBZHM3a34qY19eQ1g+OXotJUZIfD9DQj1jJmhhdXQtYjFDeCtWMmxHWDFPeHkl QWlvfSsKeldiYiNfSztyMjklbDFPdDgjY3tzVHFXeERiamhocFllUVpJc0Foaig8dSV6T0cpNlY5 aHwjVUQkJTA5eSQrJjx3CnpQS0tHPXghdFJHPld9cDJkKjUlaW1wKShgcitDNFp6ZUFTMD1ma0Bq aHhiO0wrJkxVbldBIWZpTm9wVmFqPDVHKgp6X3pocCg0YmMxKkYwKiMrPmVQY1RyWTdfSXwwdWUx YyhhR2hjZnNvTktLMlJzeCpzYih4OEtsbU9wdGY2JGNZSnUKejlnPSF2KSFzTzN1eWxCRVp1PktO Ykg4UU9nMCN5YXFHa0lPclhMOEJwU3xpdGtARTR+b2pqb2VDc1ZSTnNaOHRNCnpiIX5UMkhrYT9z ZCNpWUJXTTFlQEd8S3htK2N4Umt3eDNWaHZAaWMoPCNjOFpTOVBxXnw5fmwoXlJ+QFlVT0ZYegp6 KjVaRyZ4emY5Szg4NUw/SmJmeTY/T1d8JSFPPSVGPytPKn5kdyE9JS0wO0RQPWk1dkYlN307UW9i bjJmKUg9TCEKelFnTE99TD1CI194Jj9vfUo8JSlpaylFWX1afHlyYiZ1cVJOI0ApS2ZsZno4JkN4 JlJ2RnpWUUkjJWUjS0s9dUFLCmJYI0F4eUgyKikjPEwxeWNrJiV+eUtfaXJMQ2okY2pMQ2RYMgoK bGl0ZXJhbCAwCkhjbVY/ZDAwMDAxCgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZm9udHMvdXNl LXR5cG8tbWV0cmljcy0xLWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mb250cy91c2UtdHlw by1tZXRyaWNzLTEtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwLi4zZjdmNzY0Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZm9udHMvdXNlLXR5 cG8tbWV0cmljcy0xLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwxOSBAQAorPCFET0NUWVBFIGh0 bWw+Cis8bWV0YSBjaGFyc2V0PSJ1dGYtOCIvPgorPHRpdGxlPk9wZW4gRm9udCBGb3JtYXQ6IFVT RV9UWVBPX01FVFJJQ1MgKHJlZmVyZW5jZSk8L3RpdGxlPgorPHN0eWxlPgorICAjZ3JlZW4gewor ICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAgIGJhY2tncm91bmQ6IGdyZWVuOworICAgICBs ZWZ0OiAxMHB4OworICAgICB3aWR0aDogMjMwcHg7CisgICAgIGhlaWdodDogMjMwcHg7CisgIH0K Kzwvc3R5bGU+Cis8Ym9keT4KKyAgPHA+VGVzdCBwYXNzZXMgaWYgdGhlcmUgaXMgYSBncmVlbiBz cXVhcmUgYW5kIG5vIHJlZC48L3A+CisKKyAgPGRpdj4KKyAgICA8ZGl2IGlkPSJncmVlbiI+PC9k aXY+CisgIDwvZGl2PgorPC9ib2R5PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZm9udHMvdXNl LXR5cG8tbWV0cmljcy0xLmh0bWwgYi9MYXlvdXRUZXN0cy9mb250cy91c2UtdHlwby1tZXRyaWNz LTEuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi42MjdkZmYyCi0tLSAv ZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZm9udHMvdXNlLXR5cG8tbWV0cmljcy0xLmh0bWwK QEAgLTAsMCArMSw1MCBAQAorPCFET0NUWVBFIGh0bWw+Cis8bWV0YSBjaGFyc2V0PSJ1dGYtOCIv PgorPHRpdGxlPk9wZW4gRm9udCBGb3JtYXQ6IFVTRV9UWVBPX01FVFJJQ1M8L3RpdGxlPgorPGxp bmsgcmVsPSJoZWxwIiBocmVmPSJodHRwOi8vd3d3Lm1hdGhtbC1hc3NvY2lhdGlvbi5vcmcvTWF0 aE1MaW5IVE1MNS9TMi5odG1sI1NTMi5TU1MxIi8+Cis8bGluayByZWw9Im1hdGNoIiBocmVmPSJ1 c2UtdHlwby1tZXRyaWNzLTEtcmVmLmh0bWwiLz4KKzxzdHlsZT4KKyAgQGZvbnQtZmFjZSB7Cisg ICAgZm9udC1mYW1pbHk6IFRlc3RGb250OworICAgIHNyYzogdXJsKCJsaW5laGVpZ2h0NTAwMC10 eXBvbGluZWhlaWdodDIzMDAud29mZiIpOworICB9CisgIC5ncmVlbiB7CisgICAgIHBvc2l0aW9u OiBhYnNvbHV0ZTsKKyAgICAgYmFja2dyb3VuZDogZ3JlZW47CisgICAgIHdpZHRoOiAxMTVweDsK KyAgfQorICAucmVkIHsKKyAgICAgcG9zaXRpb246IGFic29sdXRlOworICAgICBiYWNrZ3JvdW5k OiByZWQ7CisgICAgIHdpZHRoOiAxMTVweDsKKyAgfQorICAuZm9yY2VIZWlnaHQgeworICAgIGhl aWdodDogMjMwcHg7CisgIH0KKyAgLmxlZnRTaWRlIHsKKyAgICBsZWZ0OiAxMHB4OworICB9Cisg IC5yaWdodFNpZGUgeworICAgIGxlZnQ6IDEyNXB4OworICB9CisgIHNwYW4geworICAgIC8qIGVt PTEwMDAsIGxpbmVIZWlnaHQ9NTAwMCwgdHlwb0xpbmVIZWlnaHQ9MjMwMCBhbmQgZm9udC1zaXpl PTEwMHB4CisgICAgICAgaW1wbGllcyB0eXBvTGluZUhlaWdodFB4ID0gMjMwcHggPCA1MDBweCA9 IGxpbmVIZWlnaHRQeCAqLworICAgICBmb250LWZhbWlseTogVGVzdEZvbnQ7CisgICAgIGZvbnQt c2l6ZTogMTAwcHg7CisgICAgIGNvbG9yOiB0cmFuc3BhcmVudDsKKyAgfQorPC9zdHlsZT4KKzxi b2R5PgorICA8cD5UZXN0IHBhc3NlcyBpZiB0aGVyZSBpcyBhIGdyZWVuIHNxdWFyZSBhbmQgbm8g cmVkLjwvcD4KKworICA8ZGl2PgorICAgIDwhLS0gTGVmdCBzaWRlIHZlcmlmaWVzIHRoYXQgdHlw b0xpbmVIZWlnaHRQeCA8PSAyMzBweCAtLT4KKyAgICA8ZGl2IGNsYXNzPSJsZWZ0U2lkZSByZWQi PjxzcGFuPk88L3NwYW4+PC9kaXY+CisgICAgPGRpdiBjbGFzcz0ibGVmdFNpZGUgZ3JlZW4gZm9y Y2VIZWlnaHQiPjwvZGl2PgorCisgICAgPCEtLSBSaWdodCBzaWRlIHZlcmlmaWVzIHRoYXQgdHlw b0xpbmVIZWlnaHRQeCA9PiAyMzBweCAtLT4KKyAgICA8ZGl2IGNsYXNzPSJyaWdodFNpZGUgcmVk IGZvcmNlSGVpZ2h0Ij48L2Rpdj4KKyAgICA8ZGl2IGNsYXNzPSJyaWdodFNpZGUgZ3JlZW4iPjxz cGFuPk88L3NwYW4+PC9kaXY+CisgIDwvZGl2PgorPC9ib2R5PgpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9y bS9tYWMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCAxYzM4MzY4Li5mMzVhYjMzIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9tYWMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtMTM0OCwzICsxMzQ4LDYgQEAg d2Via2l0Lm9yZy9iLzE0OTkzMCBmYXN0L2NhbnZhcy93ZWJnbC9vZXMtdGV4dHVyZS1mbG9hdC1s aW5lYXIuaHRtbCBbIFBhc3MgRmFpbHUKIAogIyBJbXBvcnRlZCBCbGluayB0ZXN0cyB3aGljaCBo YXZlIG5vdCBiZWVuIGludmVzdGlnYXRlZC4KIGltcG9ydGVkL2JsaW5rL2NvbXBvc2l0aW5nL3Zp ZGVvL3ZpZGVvLWNvbnRyb2xzLWxheWVyLWNyZWF0aW9uLXNxdWFzaGluZy5odG1sIFsgUGFzcyBJ bWFnZU9ubHlGYWlsdXJlIF0KKworIyBVU0VfVFlQT19NRVRSSUNTIGlzIG5vdCBpbXBsZW1lbnRl ZCBvbiBtYWMuCit3ZWJraXQub3JnL2IvMTMxODM5IGZvbnRzL3VzZS10eXBvLW1ldHJpY3MtMS5o dG1sIFsgRmFpbHVyZSBdCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vVGVz dEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9UZXN0RXhwZWN0YXRpb25z CmluZGV4IDRiM2I3NzUuLjFjMzJkNjQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3Jt L3dpbi9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9UZXN0 RXhwZWN0YXRpb25zCkBAIC0zMjYzLDQgKzMyNjMsNyBAQCB3ZWJraXQub3JnL2IvMTUwMDQwIGlt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvZG9tL3Jhbmdlcy9SYW5nZS1zdXJyb3VuZENv bgogd2Via2l0Lm9yZy9iLzE1MDA0MCBqcy9kb20vZGZnLWN1c3RvbS1nZXR0ZXIuaHRtbCBbIEZh aWx1cmUgXQogCiAjIFRoZSBmb2xsb3dpbmcgdGVzdHMgYXJlIG5vdCByZWxldmFudCBvbiB0aGUg V2luZG93cyBwbGF0Zm9ybToKLWZhc3QvZm9ybXMvaGlkcGktdGV4dGZpZWxkLWJhY2tncm91bmQt YmxlZWRpbmcuaHRtbCBbIFNraXAgXQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKK2Zhc3Qv Zm9ybXMvaGlkcGktdGV4dGZpZWxkLWJhY2tncm91bmQtYmxlZWRpbmcuaHRtbCBbIFNraXAgXQor CisjIFVTRV9UWVBPX01FVFJJQ1MgaXMgbm90IGltcGxlbWVudGVkIG9uIHRoZSBXaW5kb3dzIHBs YXRmb3JtCit3ZWJraXQub3JnL2IvMTMxODM5IGZvbnRzL3VzZS10eXBvLW1ldHJpY3MtMS5odG1s IFsgRmFpbHVyZSBdCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWQ0ZWI5NC4uMGJkMzMyNiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE4IEBACisyMDE1LTEwLTE5ICBGcmVkZXJpYyBXYW5nICA8ZnJlZC53YW5nQGZy ZWUuZnI+CisKKyAgICAgICAgW0ZyZWVUeXBlXSBBZGQgc3VwcG9ydCBmb3IgdGhlIFVTRV9UWVBP X01FVFJJQ1MgZmxhZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTUwMzQwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVGVzdDogZm9udHMvdXNlLXR5cG8tbWV0cmljcy0xLmh0bWwKKworICAgICAgICBNYWtl IHRoZSBGcmVlVHlwZSBiYWNrZW5kIHVzZSB0aGUgdHlwbyBtZXRyaWNzIHdoZW4gdGhlIE9TLzIg VVNFX1RZUE9fTUVUUklDUyBmbGFnIGlzIHNldC4KKyAgICAgICAgU2ltaWxhciB3b3JrIHNob3Vs ZCBiZSBkb25lIGZvciBvdGhlciBiYWNrZW5kcywgc2VlIGJ1ZyAxMzE4MzkuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9TaW1wbGVGb250RGF0YUZyZWVUeXBlLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6OnBsYXRmb3JtSW5pdCk6IFZlcmlmeSB3aGV0aGVyIHRo ZSBPUy8yIFVTRV9UWVBPX01FVFJJQ1MgZmxhZyBpcyBzZXQgYW5kIHVzZSB0aGUgdHlwbyBtZXRy aWNzIGlmIHRoYXQncyB0aGUgY2FzZS4KKwogMjAxNS0xMC0xOSAgWW91ZW5uIEZhYmxldCAgPHlv dWVubi5mYWJsZXRAY3JmLmNhbm9uLmZyPgogCiAgICAgICAgIEJpbmRpbmcgZ2VuZXJhdG9yIHNo b3VsZCBnZW5lcmF0ZSBuYW1lcyBmb3IgSlNCdWlsdGlucyBwYXJ0aWFsIGludGVyZmFjZSBtZXRo b2RzIHVzaW5nIEltcGxlbWVudGVkQnkgdmFsdWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL1NpbXBsZUZvbnREYXRhRnJlZVR5cGUuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvU2ltcGxlRm9udERhdGFG cmVlVHlwZS5jcHAKaW5kZXggNTVlMzQ4OC4uNTVhMWQ3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvU2ltcGxlRm9udERhdGFGcmVlVHlwZS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvU2ltcGxl Rm9udERhdGFGcmVlVHlwZS5jcHAKQEAgLTY1LDYgKzY1LDIxIEBAIHZvaWQgRm9udDo6cGxhdGZv cm1Jbml0KCkKICAgICBmbG9hdCBjYXBIZWlnaHQgPSBuYXJyb3dQcmVjaXNpb25Ub0Zsb2F0KGZv bnRFeHRlbnRzLmhlaWdodCk7CiAgICAgZmxvYXQgbGluZUdhcCA9IG5hcnJvd1ByZWNpc2lvblRv RmxvYXQoZm9udEV4dGVudHMuaGVpZ2h0IC0gZm9udEV4dGVudHMuYXNjZW50IC0gZm9udEV4dGVu dHMuZGVzY2VudCk7CiAKKyAgICAvLyBJZiB0aGUgVVNFX1RZUE9fTUVUUklDUyBmbGFnIGlzIHNl dCBpbiB0aGUgT1MvMiB0YWJsZSB0aGVuIHdlIHVzZSB0eXBvIG1ldHJpY3MgaW5zdGVhZC4KKyAg ICBGVF9GYWNlIGZyZWVUeXBlRmFjZSA9IGNhaXJvX2Z0X3NjYWxlZF9mb250X2xvY2tfZmFjZSht X3BsYXRmb3JtRGF0YS5zY2FsZWRGb250KCkpOworICAgIGlmIChUVF9PUzIqIE9TMlRhYmxlID0g c3RhdGljX2Nhc3Q8VFRfT1MyKj4oRlRfR2V0X1NmbnRfVGFibGUoZnJlZVR5cGVGYWNlLCBmdF9z Zm50X29zMikpKSB7CisgICAgICAgIGNvbnN0IEZUX1Nob3J0IGtVc2VUeXBvTWV0cmljc01hc2sg PSAxIDw8IDc7CisgICAgICAgIGlmIChPUzJUYWJsZS0+ZnNTZWxlY3Rpb24gJiBrVXNlVHlwb01l dHJpY3NNYXNrKSB7CisgICAgICAgICAgICAvLyBGVF9TaXplX01ldHJpY3M6Onlfc2NhbGUgaXMg aW4gMTYuMTYgZml4ZWQgcG9pbnQgZm9ybWF0LgorICAgICAgICAgICAgLy8gSXRzIChmcmFjdGlv bmFsKSB2YWx1ZSBpcyBhIGZhY3RvciB0aGF0IGNvbnZlcnRzIHZlcnRpY2FsIG1ldHJpY3MgZnJv bSBkZXNpZ24gdW5pdHMgdG8gdW5pdHMgb2YgMS82NCBwaXhlbHMuCisgICAgICAgICAgICBkb3Vi bGUgeXNjYWxlID0gKGZyZWVUeXBlRmFjZS0+c2l6ZS0+bWV0cmljcy55X3NjYWxlIC8gNjU1MzYu MCkgLyA2NC4wOworICAgICAgICAgICAgYXNjZW50ID0gbmFycm93UHJlY2lzaW9uVG9GbG9hdCh5 c2NhbGUgKiBPUzJUYWJsZS0+c1R5cG9Bc2NlbmRlcik7CisgICAgICAgICAgICBkZXNjZW50ID0g LW5hcnJvd1ByZWNpc2lvblRvRmxvYXQoeXNjYWxlICogT1MyVGFibGUtPnNUeXBvRGVzY2VuZGVy KTsKKyAgICAgICAgICAgIGxpbmVHYXAgPSBuYXJyb3dQcmVjaXNpb25Ub0Zsb2F0KHlzY2FsZSAq IE9TMlRhYmxlLT5zVHlwb0xpbmVHYXApOworICAgICAgICB9CisgICAgfQorICAgIGNhaXJvX2Z0 X3NjYWxlZF9mb250X3VubG9ja19mYWNlKG1fcGxhdGZvcm1EYXRhLnNjYWxlZEZvbnQoKSk7CisK ICAgICBtX2ZvbnRNZXRyaWNzLnNldEFzY2VudChhc2NlbnQpOwogICAgIG1fZm9udE1ldHJpY3Mu c2V0RGVzY2VudChkZXNjZW50KTsKICAgICBtX2ZvbnRNZXRyaWNzLnNldENhcEhlaWdodChjYXBI ZWlnaHQpOwo= 263663 2015-10-20 23:59:50 -0700 2015-10-20 23:59:50 -0700 Patch final version freetype-use-typo.patch text/plain 8845 fred.wang ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjNTAxYTg1Li45YmQ5NWM5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTUtMTAt MTkgIEZyZWRlcmljIFdhbmcgIDxmcmVkLndhbmdAZnJlZS5mcj4KKworICAgICAgICBbRnJlZVR5 cGVdIEFkZCBzdXBwb3J0IGZvciB0aGUgVVNFX1RZUE9fTUVUUklDUyBmbGFnCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTAzNDAKKworICAgICAgICBS ZXZpZXdlZCBieSBNYXJ0aW4gUm9iaW5zb24uCisKKyAgICAgICAgQWRkIGEgdGVzdCB0byB2ZXJp ZnkgdGhhdCB0aGUgbGluZSBoZWlnaHQgb2YgYSBmb250IGlzIGNhbGN1bGF0ZWQgZnJvbSB0aGUg dHlwbyBtZXRyaWNzIHdoZW4gdGhlIE9TLzIgVVNFX1RZUE9fTUVUUklDUyBmbGFnIGlzIHNldC4g Q3VycmVudGx5LCB0aGUgdGVzdCBvbmx5IHBhc3NlcyB3aXRoIHRoZSBGcmVlVHlwZSBiYWNrZW5k LgorCisgICAgICAgICogZm9udHMvbGluZWhlaWdodDUwMDAtdHlwb2xpbmVoZWlnaHQyMzAwLndv ZmY6IEFkZGVkLgorICAgICAgICAqIGZvbnRzL3VzZS10eXBvLW1ldHJpY3MtMS1leHBlY3RlZC5o dG1sOiBBZGRlZC4KKyAgICAgICAgKiBmb250cy91c2UtdHlwby1tZXRyaWNzLTEuaHRtbDogQWRk ZWQuCisgICAgICAgICogcGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3RhdGlvbnM6IE1hcmsgYXMgZmFp bGluZy4KKyAgICAgICAgKiBwbGF0Zm9ybS93aW4vVGVzdEV4cGVjdGF0aW9uczogTWFyayBhcyBm YWlsaW5nLgorCiAyMDE1LTEwLTE5ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uLmZhYmxldEBjcmYu Y2Fub24uZnI+CiAKICAgICAgICAgW1N0cmVhbXMgQVBJXSBJbXBsZW1lbnQgUmVhZGFibGVTdHJl YW0gdGVlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mb250cy9saW5laGVpZ2h0NTAwMC10eXBv bGluZWhlaWdodDIzMDAud29mZiBiL0xheW91dFRlc3RzL2ZvbnRzL2xpbmVoZWlnaHQ1MDAwLXR5 cG9saW5laGVpZ2h0MjMwMC53b2ZmCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjdlMzAwNzgyMTI1OGFlYzk1ZjYwMjQ1 MWJhNzJiNDIyNjcxZmE2NDAKR0lUIGJpbmFyeSBwYXRjaApsaXRlcmFsIDExMDgKemNtWFQtY1hS VSgzR3J1T1U8cU8xVmdMZFQwUn4xOGpSfkNIKyFUUEtVeDReTjB8VFEqPVNjLUtIQDZVOUFvfmhY CnpPY0lEPyU4bS1RYDNMSjgwbVZLNWA3U2A1cG08ZTZKdmxlQWZQc09AMWp1JjwlNlR6Tlc/cT8q bndTQzxze3g3YAp6MEk/WitaXnJmdnBkZTZlNFVqSmIjNDVhTmREbXk7bVEoPTZQNX04SjdqbSYq VXxgNWl0TkB0QHZYPjJ2bkZBUXwKejVfNDA1VnQwViUkMSpUNUtZM29lYGF3WnthUzcwR0hiNkNF SyY8ZTtqbHNCTFBJNXtAVnEhdXtOe0lqSV5WJTJCCnpvOz40eSo1ajx0Y0AwQlQxQV9+P0R8SnF8 YjRXQGBPQmZnITg1JFY5YDE+SUpodkx+RSZUVEstYncyWlJQTHE+Ngp6X1Vedm57O2F5WiNIb29E Qy1lXj1QKjZEaCE2JUB0KFo0T3d0RHtrSmlGQHpDX0p0PWJfYj1HUWt1dDV4WlBUKSoKemlIIT9h SHN2Ukl3eXAxUE4taXZ7REBzZjlPc2tWQylLazIpKld0ajRnYVpmOG9MSTRCJkdvKEMraDR+Vytn bnxxCnpja31kfkBIZitzXmlUYi1hXnVAU1A0VH1FZS0pcFc0PT1PWmNpJko0WCErR1lzfXJDOTRw cUxTOClmKFpgTHcpawp6ZDIpSVRlTDJhfDNfJC1TQnFYRlRHPGxjaD8+TSsrXk15REdVSXpPPCl7 RFJaMExkbFI5a2dne29aOHM5dk9BTlgKem5jMTFZQzlVUV8haWZfc0JCPT5hUXlMaUUqaCglT1Nh OUlNYDg2TnpILSl4Kj02RWpIQjkrRjxDWG05eVZEKjx2Cno3aC0tfEx4TG9tOD1GN0A8MHB4T0hE WVlNM1RONHROSmBGLTVSdiV2fDNDWXVnSjFyKXwyS0VPJUZMKU4mRF8rPwp6RUhLSFAqPUxFU0pU Tk54ODk2UFhaYj9aPFYwZzQobnpfKSZLVzZjZ0o3JmYreEp1fCphPSYlR0BMelhFeW4hfnUKelA4 bDhfZytLPTVNTz5YQWRzN2t+KmNfXkNYPjl6LSVGSHw/Q0I9YyZoYXV0LWIxQ3grVjJsR1gxT3h5 JUFpb30rCnpXYmIjX0s7cjI5JWwxT3Q4I2N7c1RxV3hEYmpoaHBZZVFaSXNBaGooPHUlek9HKTZW OWh8I1VEJCUwOXkkKyY8dwp6UEtLRz14IXRSRz5XfXAyZCo1JWltcCkoYHIrQzRaemVBUzA9ZmtA amh4YjtMKyZMVW5XQSFmaU5vcFZhajw1RyoKel96aHAoNGJjMSpGMCojKz5lUGNUclk3X0l8MHVl MWMoYUdoY2Zzb05LSzJSc3gqc2IoeDhLbG1PcHRmNiRjWUp1Cno5Zz0hdikhc08zdXlsQkVadT5L TmJIOFFPZzAjeWFxR2tJT3JYTDhCcFN8aXRrQEU0fm9qam9lQ3NWUk5zWjh0TQp6YiF+VDJIa2E/ c2QjaVlCV00xZUBHfEt4bStjeFJrd3gzVmh2QGljKDwjYzhaUzlQcV58OX5sKF5SfkBZVU9GWHoK eio1WkcmeHpmOUs4ODVMP0piZnk2P09XfCUhTz0lRj8rTyp+ZHchPSUtMDtEUD1pNXZGJTd9O1Fv Ym4yZilIPUwhCnpRZ0xPfUw9QiNfeCY/b31KPCUpaWspRVl9Wnx5cmImdXFSTiNAKUtmbGZ6OCZD eCZSdkZ6VlFJIyVlI0tLPXVBSwpiWCNBeHlIMiopIzxMMXljayYlfnlLX2lyTENqJGNqTENkWDIK CmxpdGVyYWwgMApIY21WP2QwMDAwMQoKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ZvbnRzL3Vz ZS10eXBvLW1ldHJpY3MtMS1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZm9udHMvdXNlLXR5 cG8tbWV0cmljcy0xLWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMC4uM2Y3Zjc2NAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2ZvbnRzL3VzZS10 eXBvLW1ldHJpY3MtMS1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsMTkgQEAKKzwhRE9DVFlQRSBo dG1sPgorPG1ldGEgY2hhcnNldD0idXRmLTgiLz4KKzx0aXRsZT5PcGVuIEZvbnQgRm9ybWF0OiBV U0VfVFlQT19NRVRSSUNTIChyZWZlcmVuY2UpPC90aXRsZT4KKzxzdHlsZT4KKyAgI2dyZWVuIHsK KyAgICAgcG9zaXRpb246IGFic29sdXRlOworICAgICBiYWNrZ3JvdW5kOiBncmVlbjsKKyAgICAg bGVmdDogMTBweDsKKyAgICAgd2lkdGg6IDIzMHB4OworICAgICBoZWlnaHQ6IDIzMHB4OworICB9 Cis8L3N0eWxlPgorPGJvZHk+CisgIDxwPlRlc3QgcGFzc2VzIGlmIHRoZXJlIGlzIGEgZ3JlZW4g c3F1YXJlIGFuZCBubyByZWQuPC9wPgorCisgIDxkaXY+CisgICAgPGRpdiBpZD0iZ3JlZW4iPjwv ZGl2PgorICA8L2Rpdj4KKzwvYm9keT4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ZvbnRzL3Vz ZS10eXBvLW1ldHJpY3MtMS5odG1sIGIvTGF5b3V0VGVzdHMvZm9udHMvdXNlLXR5cG8tbWV0cmlj cy0xLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNjI3ZGZmMgotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2ZvbnRzL3VzZS10eXBvLW1ldHJpY3MtMS5odG1s CkBAIC0wLDAgKzEsNTAgQEAKKzwhRE9DVFlQRSBodG1sPgorPG1ldGEgY2hhcnNldD0idXRmLTgi Lz4KKzx0aXRsZT5PcGVuIEZvbnQgRm9ybWF0OiBVU0VfVFlQT19NRVRSSUNTPC90aXRsZT4KKzxs aW5rIHJlbD0iaGVscCIgaHJlZj0iaHR0cDovL3d3dy5tYXRobWwtYXNzb2NpYXRpb24ub3JnL01h dGhNTGluSFRNTDUvUzIuaHRtbCNTUzIuU1NTMSIvPgorPGxpbmsgcmVsPSJtYXRjaCIgaHJlZj0i dXNlLXR5cG8tbWV0cmljcy0xLXJlZi5odG1sIi8+Cis8c3R5bGU+CisgIEBmb250LWZhY2Ugewor ICAgIGZvbnQtZmFtaWx5OiBUZXN0Rm9udDsKKyAgICBzcmM6IHVybCgibGluZWhlaWdodDUwMDAt dHlwb2xpbmVoZWlnaHQyMzAwLndvZmYiKTsKKyAgfQorICAuZ3JlZW4geworICAgICBwb3NpdGlv bjogYWJzb2x1dGU7CisgICAgIGJhY2tncm91bmQ6IGdyZWVuOworICAgICB3aWR0aDogMTE1cHg7 CisgIH0KKyAgLnJlZCB7CisgICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICAgYmFja2dyb3Vu ZDogcmVkOworICAgICB3aWR0aDogMTE1cHg7CisgIH0KKyAgLmZvcmNlSGVpZ2h0IHsKKyAgICBo ZWlnaHQ6IDIzMHB4OworICB9CisgIC5sZWZ0U2lkZSB7CisgICAgbGVmdDogMTBweDsKKyAgfQor ICAucmlnaHRTaWRlIHsKKyAgICBsZWZ0OiAxMjVweDsKKyAgfQorICBzcGFuIHsKKyAgICAvKiBl bT0xMDAwLCBsaW5lSGVpZ2h0PTUwMDAsIHR5cG9MaW5lSGVpZ2h0PTIzMDAgYW5kIGZvbnQtc2l6 ZT0xMDBweAorICAgICAgIGltcGxpZXMgdHlwb0xpbmVIZWlnaHRQeCA9IDIzMHB4IDwgNTAwcHgg PSBsaW5lSGVpZ2h0UHggKi8KKyAgICAgZm9udC1mYW1pbHk6IFRlc3RGb250OworICAgICBmb250 LXNpemU6IDEwMHB4OworICAgICBjb2xvcjogdHJhbnNwYXJlbnQ7CisgIH0KKzwvc3R5bGU+Cis8 Ym9keT4KKyAgPHA+VGVzdCBwYXNzZXMgaWYgdGhlcmUgaXMgYSBncmVlbiBzcXVhcmUgYW5kIG5v IHJlZC48L3A+CisKKyAgPGRpdj4KKyAgICA8IS0tIExlZnQgc2lkZSB2ZXJpZmllcyB0aGF0IHR5 cG9MaW5lSGVpZ2h0UHggPD0gMjMwcHggLS0+CisgICAgPGRpdiBjbGFzcz0ibGVmdFNpZGUgcmVk Ij48c3Bhbj5PPC9zcGFuPjwvZGl2PgorICAgIDxkaXYgY2xhc3M9ImxlZnRTaWRlIGdyZWVuIGZv cmNlSGVpZ2h0Ij48L2Rpdj4KKworICAgIDwhLS0gUmlnaHQgc2lkZSB2ZXJpZmllcyB0aGF0IHR5 cG9MaW5lSGVpZ2h0UHggPT4gMjMwcHggLS0+CisgICAgPGRpdiBjbGFzcz0icmlnaHRTaWRlIHJl ZCBmb3JjZUhlaWdodCI+PC9kaXY+CisgICAgPGRpdiBjbGFzcz0icmlnaHRTaWRlIGdyZWVuIj48 c3Bhbj5PPC9zcGFuPjwvZGl2PgorICA8L2Rpdj4KKzwvYm9keT4KZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL3BsYXRmb3JtL21hYy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvcGxhdGZv cm0vbWFjL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggMWMzODM2OC4uZjM1YWIzMyAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTEzNDgsMyArMTM0OCw2IEBA IHdlYmtpdC5vcmcvYi8xNDk5MzAgZmFzdC9jYW52YXMvd2ViZ2wvb2VzLXRleHR1cmUtZmxvYXQt bGluZWFyLmh0bWwgWyBQYXNzIEZhaWx1CiAKICMgSW1wb3J0ZWQgQmxpbmsgdGVzdHMgd2hpY2gg aGF2ZSBub3QgYmVlbiBpbnZlc3RpZ2F0ZWQuCiBpbXBvcnRlZC9ibGluay9jb21wb3NpdGluZy92 aWRlby92aWRlby1jb250cm9scy1sYXllci1jcmVhdGlvbi1zcXVhc2hpbmcuaHRtbCBbIFBhc3Mg SW1hZ2VPbmx5RmFpbHVyZSBdCisKKyMgVVNFX1RZUE9fTUVUUklDUyBpcyBub3QgaW1wbGVtZW50 ZWQgb24gbWFjLgord2Via2l0Lm9yZy9iLzEzMTgzOSBmb250cy91c2UtdHlwby1tZXRyaWNzLTEu aHRtbCBbIEZhaWx1cmUgXQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luL1Rl c3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vVGVzdEV4cGVjdGF0aW9u cwppbmRleCA0YjNiNzc1Li4xYzMyZDY0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9y bS93aW4vVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vVGVz dEV4cGVjdGF0aW9ucwpAQCAtMzI2Myw0ICszMjYzLDcgQEAgd2Via2l0Lm9yZy9iLzE1MDA0MCBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2RvbS9yYW5nZXMvUmFuZ2Utc3Vycm91bmRD b24KIHdlYmtpdC5vcmcvYi8xNTAwNDAganMvZG9tL2RmZy1jdXN0b20tZ2V0dGVyLmh0bWwgWyBG YWlsdXJlIF0KIAogIyBUaGUgZm9sbG93aW5nIHRlc3RzIGFyZSBub3QgcmVsZXZhbnQgb24gdGhl IFdpbmRvd3MgcGxhdGZvcm06Ci1mYXN0L2Zvcm1zL2hpZHBpLXRleHRmaWVsZC1iYWNrZ3JvdW5k LWJsZWVkaW5nLmh0bWwgWyBTa2lwIF0KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCitmYXN0 L2Zvcm1zL2hpZHBpLXRleHRmaWVsZC1iYWNrZ3JvdW5kLWJsZWVkaW5nLmh0bWwgWyBTa2lwIF0K KworIyBVU0VfVFlQT19NRVRSSUNTIGlzIG5vdCBpbXBsZW1lbnRlZCBvbiB0aGUgV2luZG93cyBw bGF0Zm9ybQord2Via2l0Lm9yZy9iLzEzMTgzOSBmb250cy91c2UtdHlwby1tZXRyaWNzLTEuaHRt bCBbIEZhaWx1cmUgXQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDlkNGViOTQuLjBiZDMzMjYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxOCBAQAorMjAxNS0xMC0xOSAgRnJlZGVyaWMgV2FuZyAgPGZyZWQud2FuZ0Bm cmVlLmZyPgorCisgICAgICAgIFtGcmVlVHlwZV0gQWRkIHN1cHBvcnQgZm9yIHRoZSBVU0VfVFlQ T19NRVRSSUNTIGZsYWcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE1MDM0MAorCisgICAgICAgIFJldmlld2VkIGJ5IE1hcnRpbiBSb2JpbnNvbi4KKwor ICAgICAgICBUZXN0OiBmb250cy91c2UtdHlwby1tZXRyaWNzLTEuaHRtbAorCisgICAgICAgIE1h a2UgdGhlIEZyZWVUeXBlIGJhY2tlbmQgdXNlIHRoZSB0eXBvIG1ldHJpY3Mgd2hlbiB0aGUgT1Mv MiBVU0VfVFlQT19NRVRSSUNTIGZsYWcgaXMgc2V0LgorICAgICAgICBTaW1pbGFyIHdvcmsgc2hv dWxkIGJlIGRvbmUgZm9yIG90aGVyIGJhY2tlbmRzLCBzZWUgYnVnIDEzMTgzOS4KKworICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL1NpbXBsZUZvbnREYXRhRnJlZVR5cGUuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Rm9udDo6cGxhdGZvcm1Jbml0KTogVmVyaWZ5IHdoZXRoZXIg dGhlIE9TLzIgVVNFX1RZUE9fTUVUUklDUyBmbGFnIGlzIHNldCBhbmQgdXNlIHRoZSB0eXBvIG1l dHJpY3MgaWYgdGhhdCdzIHRoZSBjYXNlLgorCiAyMDE1LTEwLTE5ICBZb3Vlbm4gRmFibGV0ICA8 eW91ZW5uLmZhYmxldEBjcmYuY2Fub24uZnI+CiAKICAgICAgICAgQmluZGluZyBnZW5lcmF0b3Ig c2hvdWxkIGdlbmVyYXRlIG5hbWVzIGZvciBKU0J1aWx0aW5zIHBhcnRpYWwgaW50ZXJmYWNlIG1l dGhvZHMgdXNpbmcgSW1wbGVtZW50ZWRCeSB2YWx1ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvU2ltcGxlRm9udERhdGFGcmVlVHlwZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9TaW1wbGVGb250RGF0 YUZyZWVUeXBlLmNwcAppbmRleCA1NWUzNDg4Li41NWExZDcyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9TaW1wbGVGb250RGF0YUZyZWVUeXBl LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9TaW1w bGVGb250RGF0YUZyZWVUeXBlLmNwcApAQCAtNjUsNiArNjUsMjEgQEAgdm9pZCBGb250OjpwbGF0 Zm9ybUluaXQoKQogICAgIGZsb2F0IGNhcEhlaWdodCA9IG5hcnJvd1ByZWNpc2lvblRvRmxvYXQo Zm9udEV4dGVudHMuaGVpZ2h0KTsKICAgICBmbG9hdCBsaW5lR2FwID0gbmFycm93UHJlY2lzaW9u VG9GbG9hdChmb250RXh0ZW50cy5oZWlnaHQgLSBmb250RXh0ZW50cy5hc2NlbnQgLSBmb250RXh0 ZW50cy5kZXNjZW50KTsKIAorICAgIC8vIElmIHRoZSBVU0VfVFlQT19NRVRSSUNTIGZsYWcgaXMg c2V0IGluIHRoZSBPUy8yIHRhYmxlIHRoZW4gd2UgdXNlIHR5cG8gbWV0cmljcyBpbnN0ZWFkLgor ICAgIEZUX0ZhY2UgZnJlZVR5cGVGYWNlID0gY2Fpcm9fZnRfc2NhbGVkX2ZvbnRfbG9ja19mYWNl KG1fcGxhdGZvcm1EYXRhLnNjYWxlZEZvbnQoKSk7CisgICAgaWYgKFRUX09TMiogT1MyVGFibGUg PSBzdGF0aWNfY2FzdDxUVF9PUzIqPihGVF9HZXRfU2ZudF9UYWJsZShmcmVlVHlwZUZhY2UsIGZ0 X3NmbnRfb3MyKSkpIHsKKyAgICAgICAgY29uc3QgRlRfU2hvcnQga1VzZVR5cG9NZXRyaWNzTWFz ayA9IDEgPDwgNzsKKyAgICAgICAgaWYgKE9TMlRhYmxlLT5mc1NlbGVjdGlvbiAmIGtVc2VUeXBv TWV0cmljc01hc2spIHsKKyAgICAgICAgICAgIC8vIEZUX1NpemVfTWV0cmljczo6eV9zY2FsZSBp cyBpbiAxNi4xNiBmaXhlZCBwb2ludCBmb3JtYXQuCisgICAgICAgICAgICAvLyBJdHMgKGZyYWN0 aW9uYWwpIHZhbHVlIGlzIGEgZmFjdG9yIHRoYXQgY29udmVydHMgdmVydGljYWwgbWV0cmljcyBm cm9tIGRlc2lnbiB1bml0cyB0byB1bml0cyBvZiAxLzY0IHBpeGVscy4KKyAgICAgICAgICAgIGRv dWJsZSB5c2NhbGUgPSAoZnJlZVR5cGVGYWNlLT5zaXplLT5tZXRyaWNzLnlfc2NhbGUgLyA2NTUz Ni4wKSAvIDY0LjA7CisgICAgICAgICAgICBhc2NlbnQgPSBuYXJyb3dQcmVjaXNpb25Ub0Zsb2F0 KHlzY2FsZSAqIE9TMlRhYmxlLT5zVHlwb0FzY2VuZGVyKTsKKyAgICAgICAgICAgIGRlc2NlbnQg PSAtbmFycm93UHJlY2lzaW9uVG9GbG9hdCh5c2NhbGUgKiBPUzJUYWJsZS0+c1R5cG9EZXNjZW5k ZXIpOworICAgICAgICAgICAgbGluZUdhcCA9IG5hcnJvd1ByZWNpc2lvblRvRmxvYXQoeXNjYWxl ICogT1MyVGFibGUtPnNUeXBvTGluZUdhcCk7CisgICAgICAgIH0KKyAgICB9CisgICAgY2Fpcm9f ZnRfc2NhbGVkX2ZvbnRfdW5sb2NrX2ZhY2UobV9wbGF0Zm9ybURhdGEuc2NhbGVkRm9udCgpKTsK KwogICAgIG1fZm9udE1ldHJpY3Muc2V0QXNjZW50KGFzY2VudCk7CiAgICAgbV9mb250TWV0cmlj cy5zZXREZXNjZW50KGRlc2NlbnQpOwogICAgIG1fZm9udE1ldHJpY3Muc2V0Q2FwSGVpZ2h0KGNh cEhlaWdodCk7Cg==