131967 2014-04-21 19:39:09 -0700 [OS X] Glyph spacing for system fonts may be incorrect 2014-04-22 14:07:28 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mmaxfield mmaxfield commit-queue dino jonlee simon.fraser thorton webkit-bug-importer oldest_to_newest 1002767 0 mmaxfield 2014-04-21 19:39:09 -0700 [OS X] Glyph spacing for system fonts may be incorrect 1002768 1 229852 mmaxfield 2014-04-21 19:41:04 -0700 Created attachment 229852 Patch 1002769 2 commit-queue 2014-04-21 19:42:24 -0700 Attachment 229852 did not pass style-queue: ERROR: Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm:376: Boolean expressions that span multiple lines should have their operators on the left side of the line instead of the right side. [whitespace/operators] [4] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1002770 3 mmaxfield 2014-04-21 19:43:27 -0700 <rdar://problem/16559521> 1002771 4 mmaxfield 2014-04-21 19:44:08 -0700 Style check is a false negative, though I don't think it's feasible to fix the checker scripts because there are preprocessor macros at play here. 1002984 5 229852 dino 2014-04-22 10:31:32 -0700 Comment on attachment 229852 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=229852&action=review > Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm:378 > + if ( > +#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 > + !CTFontDescriptorIsSystemUIFont(descriptor.get()) && > +#endif > + (horizontal || m_isBrokenIdeographFallback)) { I don't know the performance implications, but could you switch to have the ALWAYS test first? That will make the style bot happy. 1003031 6 229907 mmaxfield 2014-04-22 12:37:37 -0700 Created attachment 229907 Patch 1003032 7 229907 simon.fraser 2014-04-22 12:40:01 -0700 Comment on attachment 229907 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=229907&action=review > Source/WebCore/ChangeLog:11 > + (WebCore::SimpleFontData::platformWidthForGlyph): Update to use CTFontGetAdvancesForGlyphs() for system fonts You don't explain the horizontal ? kCTFontHorizontalOrientation : kCTFontVerticalOrientation change. > Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm:384 > + if ((horizontal || m_isBrokenIdeographFallback) && !hasCustomTracking(m_platformData.ctFont())) { So much better! 1003051 8 mmaxfield 2014-04-22 13:39:30 -0700 http://trac.webkit.org/changeset/167679 1003057 9 mmaxfield 2014-04-22 14:05:31 -0700 Reopening to attach new patch. 1003059 10 229912 mmaxfield 2014-04-22 14:05:35 -0700 Created attachment 229912 Patch 229852 2014-04-21 19:41:04 -0700 2014-04-22 12:37:34 -0700 Patch bug-131967-20140421194041.patch text/plain 4917 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3NTA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTc2ZDc2MjI0Y2NkOWE3 YjIwNjg3YWY5ZWU2YjZlODYyMWE2ZDNmNy4uYjQwMGY4MjAwYWU3YTg3NTU2NmEwNmYzNjcyYmQ0 MmUyYjI4ZDMyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE0LTA0LTIxICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW09TIFhdIEds eXBoIHNwYWNpbmcgZm9yIHN5c3RlbSBmb250cyBtYXkgYmUgaW5jb3JyZWN0CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzE5NjcKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5n IHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL1NpbXBsZUZvbnREYXRh TWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlRm9udERhdGE6OnBsYXRmb3JtV2lkdGhG b3JHbHlwaCk6IFVwZGF0ZSB0byB1c2UgQ1RGb250R2V0QWR2YW5jZXNGb3JHbHlwaHMoKSBmb3Ig c3lzdGVtIGZvbnRzCisKIDIwMTQtMDQtMTggIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBh cHBsZS5jb20+CiAKICAgICAgICAgW2lPUyBXSzJdIE1ha2Ugd2luZG93LnNjcm9sbCgpIGFuZCB3 aW5kb3cuc2Nyb2xsQnkoKSB3b3JrCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9tYWMvU2ltcGxlRm9udERhdGFNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9tYWMvU2ltcGxlRm9udERhdGFNYWMubW0KaW5kZXggMjY0MGNjNDc5NTg4 MjhhYjUyOGRjNDFhYTg1OTM0NjU5NDZiNWUyZS4uMDc0OGZhZjdlYzg5NzdlYjllMzYwMmMwOGU1 NDMwZjY1MDkxZWZkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvbWFjL1NpbXBsZUZvbnREYXRhTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL21hYy9TaW1wbGVGb250RGF0YU1hYy5tbQpAQCAtNDcsNiArNDcsMTIgQEAKICNp bXBvcnQgPHd0Zi9TdGRMaWJFeHRyYXMuaD4KICNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4KIAor I2lmIGRlZmluZWQoX19oYXNfaW5jbHVkZSkgJiYgX19oYXNfaW5jbHVkZSg8Q29yZVRleHQvQ1RG b250RGVzY3JpcHRvclByaXYuaD4pCisjaW1wb3J0IDxDb3JlVGV4dC9DVEZvbnREZXNjcmlwdG9y UHJpdi5oPgorI2VuZGlmCisKK2V4dGVybiAiQyIgYm9vbCBDVEZvbnREZXNjcmlwdG9ySXNTeXN0 ZW1VSUZvbnQoQ1RGb250RGVzY3JpcHRvclJlZik7CisKICNpZiAhUExBVEZPUk0oSU9TKQogQGlu dGVyZmFjZSBOU0ZvbnQgKFdlYkFwcEtpdFNlY3JldEFQSSkKIC0gKEJPT0wpX2lzRmFrZUZpeGVk UGl0Y2g7CkBAIC0zNjMsNyArMzY5LDEzIEBAIEZsb2F0UmVjdCBTaW1wbGVGb250RGF0YTo6cGxh dGZvcm1Cb3VuZHNGb3JHbHlwaChHbHlwaCBnbHlwaCkgY29uc3QKIGZsb2F0IFNpbXBsZUZvbnRE YXRhOjpwbGF0Zm9ybVdpZHRoRm9yR2x5cGgoR2x5cGggZ2x5cGgpIGNvbnN0CiB7CiAgICAgQ0dT aXplIGFkdmFuY2UgPSBDR1NpemVaZXJvOwotICAgIGlmIChwbGF0Zm9ybURhdGEoKS5vcmllbnRh dGlvbigpID09IEhvcml6b250YWwgfHwgbV9pc0Jyb2tlbklkZW9ncmFwaEZhbGxiYWNrKSB7Cisg ICAgUmV0YWluUHRyPENURm9udERlc2NyaXB0b3JSZWY+IGRlc2NyaXB0b3IgPSBDVEZvbnRDb3B5 Rm9udERlc2NyaXB0b3IobV9wbGF0Zm9ybURhdGEuY3RGb250KCkpOworICAgIGJvb2wgaG9yaXpv bnRhbCA9IHBsYXRmb3JtRGF0YSgpLm9yaWVudGF0aW9uKCkgPT0gSG9yaXpvbnRhbDsKKyAgICBp ZiAoCisjaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDkwCisgICAgICAg ICAgICAhQ1RGb250RGVzY3JpcHRvcklzU3lzdGVtVUlGb250KGRlc2NyaXB0b3IuZ2V0KCkpICYm CisjZW5kaWYKKyAgICAgICAgICAgIChob3Jpem9udGFsIHx8IG1faXNCcm9rZW5JZGVvZ3JhcGhG YWxsYmFjaykpIHsKICAgICAgICAgTlNGb250ICpmb250ID0gcGxhdGZvcm1EYXRhKCkuZm9udCgp OwogICAgICAgICBpZiAoZm9udCAmJiBwbGF0Zm9ybURhdGEoKS5pc0NvbG9yQml0bWFwRm9udCgp KQogICAgICAgICAgICAgYWR2YW5jZSA9IE5TU2l6ZVRvQ0dTaXplKFtmb250IGFkdmFuY2VtZW50 Rm9yR2x5cGg6Z2x5cGhdKTsKQEAgLTM3Niw3ICszODgsNyBAQCBmbG9hdCBTaW1wbGVGb250RGF0 YTo6cGxhdGZvcm1XaWR0aEZvckdseXBoKEdseXBoIGdseXBoKSBjb25zdAogICAgICAgICAgICAg fQogICAgICAgICB9CiAgICAgfSBlbHNlCi0gICAgICAgIENURm9udEdldEFkdmFuY2VzRm9yR2x5 cGhzKG1fcGxhdGZvcm1EYXRhLmN0Rm9udCgpLCBrQ1RGb250VmVydGljYWxPcmllbnRhdGlvbiwg JmdseXBoLCAmYWR2YW5jZSwgMSk7CisgICAgICAgIENURm9udEdldEFkdmFuY2VzRm9yR2x5cGhz KG1fcGxhdGZvcm1EYXRhLmN0Rm9udCgpLCBob3Jpem9udGFsID8ga0NURm9udEhvcml6b250YWxP cmllbnRhdGlvbiA6IGtDVEZvbnRWZXJ0aWNhbE9yaWVudGF0aW9uLCAmZ2x5cGgsICZhZHZhbmNl LCAxKTsKIAogICAgIHJldHVybiBhZHZhbmNlLndpZHRoICsgbV9zeW50aGV0aWNCb2xkT2Zmc2V0 OwogfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCmluZGV4IDU4N2Y0NjI4N2Y4OGJhODliNjA4Y2RjNDEzMzYxMzM5Zjc0OTUyNzkuLmRi ZDc4NjYwZjNmOGIwMjcwZWIxZjQ1MzViMDViY2VhMGNlMWI1ZTggMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NSBAQAorMjAxNC0wNC0yMSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29t PgorCisgICAgICAgIFtPUyBYXSBHbHlwaCBzcGFjaW5nIGZvciBzeXN0ZW0gZm9udHMgbWF5IGJl IGluY29ycmVjdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTMxOTY3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVXBkYXRpbmcgdGVzdCB0byBiZSBtb3JlIHJvYnVzdC4KKworICAgICAgICAqIGZhc3QvZm9y bXMvc2VhcmNoL2ludHJpbnNpYy1zZWFyY2gtd2lkdGgtd2l0aC1kZWNvcmF0aW9uLWJvcmRlci1w YWRkaW5nLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBmYXN0L2Zvcm1zL3NlYXJjaC9pbnRyaW5z aWMtc2VhcmNoLXdpZHRoLXdpdGgtZGVjb3JhdGlvbi1ib3JkZXItcGFkZGluZy5odG1sOgorCiAy MDE0LTA0LTE4ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAg IFtXSzFdIG1lZGlhL2V2ZW50LWF0dHJpYnV0ZXMuaHRtbCBpcyBmbGFreQpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9zZWFyY2gvaW50cmluc2ljLXNlYXJjaC13aWR0aC13aXRo LWRlY29yYXRpb24tYm9yZGVyLXBhZGRpbmctZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFz dC9mb3Jtcy9zZWFyY2gvaW50cmluc2ljLXNlYXJjaC13aWR0aC13aXRoLWRlY29yYXRpb24tYm9y ZGVyLXBhZGRpbmctZXhwZWN0ZWQudHh0CmluZGV4IDg1YmE3NGY5MDFjMmMyMDMyZTZkYzYzNWIy YmU0YjY2ZWU3NTlmMWQuLmE3Y2I0ZWFiOTJjMzUwODMzY2RlMTQyMWQ3YWU2ZjkyMTdhZGUxZDYg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvc2VhcmNoL2ludHJpbnNpYy1zZWFy Y2gtd2lkdGgtd2l0aC1kZWNvcmF0aW9uLWJvcmRlci1wYWRkaW5nLWV4cGVjdGVkLnR4dAorKysg Yi9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3NlYXJjaC9pbnRyaW5zaWMtc2VhcmNoLXdpZHRoLXdp dGgtZGVjb3JhdGlvbi1ib3JkZXItcGFkZGluZy1leHBlY3RlZC50eHQKQEAgLTMsMyArMyw0IEBA IFBBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKIAogVEVTVCBDT01QTEVURQogIAorCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3NlYXJjaC9pbnRyaW5zaWMtc2VhcmNo LXdpZHRoLXdpdGgtZGVjb3JhdGlvbi1ib3JkZXItcGFkZGluZy5odG1sIGIvTGF5b3V0VGVzdHMv ZmFzdC9mb3Jtcy9zZWFyY2gvaW50cmluc2ljLXNlYXJjaC13aWR0aC13aXRoLWRlY29yYXRpb24t Ym9yZGVyLXBhZGRpbmcuaHRtbAppbmRleCA0OTQ1ODBkZjVmYjA2YmJmNDYzZTI3YmUwYTg5MjU5 ZDQ0NDE5NzdiLi4wNTI0MmFjNDcyODY4OTJmYzZmZjhjMjIwNWQzZDQ2MmMxNDE2ODA3IDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3NlYXJjaC9pbnRyaW5zaWMtc2VhcmNoLXdp ZHRoLXdpdGgtZGVjb3JhdGlvbi1ib3JkZXItcGFkZGluZy5odG1sCisrKyBiL0xheW91dFRlc3Rz L2Zhc3QvZm9ybXMvc2VhcmNoL2ludHJpbnNpYy1zZWFyY2gtd2lkdGgtd2l0aC1kZWNvcmF0aW9u LWJvcmRlci1wYWRkaW5nLmh0bWwKQEAgLTEzLDYgKzEzLDcgQEAKIDxzY3JpcHQgc3JjPSIuLi8u Li8uLi9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgogCiA8aW5wdXQgdHlwZT0i c2VhcmNoIiBpZD0ic2VhcmNoMSI+Cis8YnIvPgogPGlucHV0IHR5cGU9InNlYXJjaCIgaWQ9InNl YXJjaDIiPgogPHNjcmlwdD4KIHNob3VsZEJlKCdkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgic2Vh cmNoMSIpLm9mZnNldFdpZHRoJywgJ2RvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzZWFyY2gyIiku b2Zmc2V0V2lkdGgnKTsK 229907 2014-04-22 12:37:37 -0700 2014-04-22 14:05:27 -0700 Patch bug-131967-20140422123716.patch text/plain 5082 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3NTA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTc2ZDc2MjI0Y2NkOWE3 YjIwNjg3YWY5ZWU2YjZlODYyMWE2ZDNmNy4uYjQwMGY4MjAwYWU3YTg3NTU2NmEwNmYzNjcyYmQ0 MmUyYjI4ZDMyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE0LTA0LTIxICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW09TIFhdIEds eXBoIHNwYWNpbmcgZm9yIHN5c3RlbSBmb250cyBtYXkgYmUgaW5jb3JyZWN0CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzE5NjcKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5n IHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL1NpbXBsZUZvbnREYXRh TWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlRm9udERhdGE6OnBsYXRmb3JtV2lkdGhG b3JHbHlwaCk6IFVwZGF0ZSB0byB1c2UgQ1RGb250R2V0QWR2YW5jZXNGb3JHbHlwaHMoKSBmb3Ig c3lzdGVtIGZvbnRzCisKIDIwMTQtMDQtMTggIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBh cHBsZS5jb20+CiAKICAgICAgICAgW2lPUyBXSzJdIE1ha2Ugd2luZG93LnNjcm9sbCgpIGFuZCB3 aW5kb3cuc2Nyb2xsQnkoKSB3b3JrCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9tYWMvU2ltcGxlRm9udERhdGFNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9tYWMvU2ltcGxlRm9udERhdGFNYWMubW0KaW5kZXggMjY0MGNjNDc5NTg4 MjhhYjUyOGRjNDFhYTg1OTM0NjU5NDZiNWUyZS4uZjQ1ZDkwM2I4NWZiOGE2NzYyZjJlNGEwMmU5 NWE5MDMzNzY0MTJmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvbWFjL1NpbXBsZUZvbnREYXRhTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL21hYy9TaW1wbGVGb250RGF0YU1hYy5tbQpAQCAtNDcsNiArNDcsMTIgQEAKICNp bXBvcnQgPHd0Zi9TdGRMaWJFeHRyYXMuaD4KICNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4KIAor I2lmIGRlZmluZWQoX19oYXNfaW5jbHVkZSkgJiYgX19oYXNfaW5jbHVkZSg8Q29yZVRleHQvQ1RG b250RGVzY3JpcHRvclByaXYuaD4pCisjaW1wb3J0IDxDb3JlVGV4dC9DVEZvbnREZXNjcmlwdG9y UHJpdi5oPgorI2VuZGlmCisKK2V4dGVybiAiQyIgYm9vbCBDVEZvbnREZXNjcmlwdG9ySXNTeXN0 ZW1VSUZvbnQoQ1RGb250RGVzY3JpcHRvclJlZik7CisKICNpZiAhUExBVEZPUk0oSU9TKQogQGlu dGVyZmFjZSBOU0ZvbnQgKFdlYkFwcEtpdFNlY3JldEFQSSkKIC0gKEJPT0wpX2lzRmFrZUZpeGVk UGl0Y2g7CkBAIC0zNTksMTEgKzM2NSwyMyBAQCBGbG9hdFJlY3QgU2ltcGxlRm9udERhdGE6OnBs YXRmb3JtQm91bmRzRm9yR2x5cGgoR2x5cGggZ2x5cGgpIGNvbnN0CiAgICAgcmV0dXJuIGJvdW5k aW5nQm94OwogfQogCitzdGF0aWMgYm9vbCBoYXNDdXN0b21UcmFja2luZyhDVEZvbnRSZWYgZm9u dCkKK3sKKyNpZiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEIDwgMTA5MAorICAgIFVO VVNFRF9QQVJBTShmb250KTsKKyAgICByZXR1cm4gZmFsc2U7CisjZWxzZQorICAgIFJldGFpblB0 cjxDVEZvbnREZXNjcmlwdG9yUmVmPiBkZXNjcmlwdG9yID0gQ1RGb250Q29weUZvbnREZXNjcmlw dG9yKGZvbnQpOworICAgIHJldHVybiBDVEZvbnREZXNjcmlwdG9ySXNTeXN0ZW1VSUZvbnQoZGVz Y3JpcHRvci5nZXQoKSkKKyNlbmRpZgorfQorCiAjaWYgIVBMQVRGT1JNKElPUykKIGZsb2F0IFNp bXBsZUZvbnREYXRhOjpwbGF0Zm9ybVdpZHRoRm9yR2x5cGgoR2x5cGggZ2x5cGgpIGNvbnN0CiB7 CiAgICAgQ0dTaXplIGFkdmFuY2UgPSBDR1NpemVaZXJvOwotICAgIGlmIChwbGF0Zm9ybURhdGEo KS5vcmllbnRhdGlvbigpID09IEhvcml6b250YWwgfHwgbV9pc0Jyb2tlbklkZW9ncmFwaEZhbGxi YWNrKSB7CisgICAgYm9vbCBob3Jpem9udGFsID0gcGxhdGZvcm1EYXRhKCkub3JpZW50YXRpb24o KSA9PSBIb3Jpem9udGFsOworICAgIGlmICgoaG9yaXpvbnRhbCB8fCBtX2lzQnJva2VuSWRlb2dy YXBoRmFsbGJhY2spICYmICFoYXNDdXN0b21UcmFja2luZyhtX3BsYXRmb3JtRGF0YS5jdEZvbnQo KSkpIHsKICAgICAgICAgTlNGb250ICpmb250ID0gcGxhdGZvcm1EYXRhKCkuZm9udCgpOwogICAg ICAgICBpZiAoZm9udCAmJiBwbGF0Zm9ybURhdGEoKS5pc0NvbG9yQml0bWFwRm9udCgpKQogICAg ICAgICAgICAgYWR2YW5jZSA9IE5TU2l6ZVRvQ0dTaXplKFtmb250IGFkdmFuY2VtZW50Rm9yR2x5 cGg6Z2x5cGhdKTsKQEAgLTM3Niw3ICszOTQsNyBAQCBmbG9hdCBTaW1wbGVGb250RGF0YTo6cGxh dGZvcm1XaWR0aEZvckdseXBoKEdseXBoIGdseXBoKSBjb25zdAogICAgICAgICAgICAgfQogICAg ICAgICB9CiAgICAgfSBlbHNlCi0gICAgICAgIENURm9udEdldEFkdmFuY2VzRm9yR2x5cGhzKG1f cGxhdGZvcm1EYXRhLmN0Rm9udCgpLCBrQ1RGb250VmVydGljYWxPcmllbnRhdGlvbiwgJmdseXBo LCAmYWR2YW5jZSwgMSk7CisgICAgICAgIENURm9udEdldEFkdmFuY2VzRm9yR2x5cGhzKG1fcGxh dGZvcm1EYXRhLmN0Rm9udCgpLCBob3Jpem9udGFsID8ga0NURm9udEhvcml6b250YWxPcmllbnRh dGlvbiA6IGtDVEZvbnRWZXJ0aWNhbE9yaWVudGF0aW9uLCAmZ2x5cGgsICZhZHZhbmNlLCAxKTsK IAogICAgIHJldHVybiBhZHZhbmNlLndpZHRoICsgbV9zeW50aGV0aWNCb2xkT2Zmc2V0OwogfQpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CmluZGV4IDU4N2Y0NjI4N2Y4OGJhODliNjA4Y2RjNDEzMzYxMzM5Zjc0OTUyNzkuLmRiZDc4NjYw ZjNmOGIwMjcwZWIxZjQ1MzViMDViY2VhMGNlMWI1ZTggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAor MjAxNC0wNC0yMSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgorCisg ICAgICAgIFtPUyBYXSBHbHlwaCBzcGFjaW5nIGZvciBzeXN0ZW0gZm9udHMgbWF5IGJlIGluY29y cmVjdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMx OTY3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBk YXRpbmcgdGVzdCB0byBiZSBtb3JlIHJvYnVzdC4KKworICAgICAgICAqIGZhc3QvZm9ybXMvc2Vh cmNoL2ludHJpbnNpYy1zZWFyY2gtd2lkdGgtd2l0aC1kZWNvcmF0aW9uLWJvcmRlci1wYWRkaW5n LWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBmYXN0L2Zvcm1zL3NlYXJjaC9pbnRyaW5zaWMtc2Vh cmNoLXdpZHRoLXdpdGgtZGVjb3JhdGlvbi1ib3JkZXItcGFkZGluZy5odG1sOgorCiAyMDE0LTA0 LTE4ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAgIFtXSzFd IG1lZGlhL2V2ZW50LWF0dHJpYnV0ZXMuaHRtbCBpcyBmbGFreQpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvZmFzdC9mb3Jtcy9zZWFyY2gvaW50cmluc2ljLXNlYXJjaC13aWR0aC13aXRoLWRlY29y YXRpb24tYm9yZGVyLXBhZGRpbmctZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9mb3Jt cy9zZWFyY2gvaW50cmluc2ljLXNlYXJjaC13aWR0aC13aXRoLWRlY29yYXRpb24tYm9yZGVyLXBh ZGRpbmctZXhwZWN0ZWQudHh0CmluZGV4IDg1YmE3NGY5MDFjMmMyMDMyZTZkYzYzNWIyYmU0YjY2 ZWU3NTlmMWQuLmE3Y2I0ZWFiOTJjMzUwODMzY2RlMTQyMWQ3YWU2ZjkyMTdhZGUxZDYgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvc2VhcmNoL2ludHJpbnNpYy1zZWFyY2gtd2lk dGgtd2l0aC1kZWNvcmF0aW9uLWJvcmRlci1wYWRkaW5nLWV4cGVjdGVkLnR4dAorKysgYi9MYXlv dXRUZXN0cy9mYXN0L2Zvcm1zL3NlYXJjaC9pbnRyaW5zaWMtc2VhcmNoLXdpZHRoLXdpdGgtZGVj b3JhdGlvbi1ib3JkZXItcGFkZGluZy1leHBlY3RlZC50eHQKQEAgLTMsMyArMyw0IEBAIFBBU1Mg c3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKIAogVEVTVCBDT01QTEVURQogIAorCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3NlYXJjaC9pbnRyaW5zaWMtc2VhcmNoLXdpZHRo LXdpdGgtZGVjb3JhdGlvbi1ib3JkZXItcGFkZGluZy5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9m b3Jtcy9zZWFyY2gvaW50cmluc2ljLXNlYXJjaC13aWR0aC13aXRoLWRlY29yYXRpb24tYm9yZGVy LXBhZGRpbmcuaHRtbAppbmRleCA0OTQ1ODBkZjVmYjA2YmJmNDYzZTI3YmUwYTg5MjU5ZDQ0NDE5 NzdiLi4wNTI0MmFjNDcyODY4OTJmYzZmZjhjMjIwNWQzZDQ2MmMxNDE2ODA3IDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3NlYXJjaC9pbnRyaW5zaWMtc2VhcmNoLXdpZHRoLXdp dGgtZGVjb3JhdGlvbi1ib3JkZXItcGFkZGluZy5odG1sCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qv Zm9ybXMvc2VhcmNoL2ludHJpbnNpYy1zZWFyY2gtd2lkdGgtd2l0aC1kZWNvcmF0aW9uLWJvcmRl ci1wYWRkaW5nLmh0bWwKQEAgLTEzLDYgKzEzLDcgQEAKIDxzY3JpcHQgc3JjPSIuLi8uLi8uLi9y ZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgogCiA8aW5wdXQgdHlwZT0ic2VhcmNo IiBpZD0ic2VhcmNoMSI+Cis8YnIvPgogPGlucHV0IHR5cGU9InNlYXJjaCIgaWQ9InNlYXJjaDIi PgogPHNjcmlwdD4KIHNob3VsZEJlKCdkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgic2VhcmNoMSIp Lm9mZnNldFdpZHRoJywgJ2RvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzZWFyY2gyIikub2Zmc2V0 V2lkdGgnKTsK 229912 2014-04-22 14:05:35 -0700 2014-04-22 14:06:03 -0700 Patch bug-131967-20140422140514.patch text/plain 1565 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3NjgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDA3NWVhMmY4ZTg2Nzc5 NjkyZGMzNDEwOGM1YmZjYzU4NzgyZmE5MS4uNTg2Y2VmNzc2NGI1YzhhNTVmODI4N2VhMGViODFh MzM0MWM0NGUwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMyw2ICszLDE1IEBACiAgICAgICAgIFtPUyBYXSBH bHlwaCBzcGFjaW5nIGZvciBzeXN0ZW0gZm9udHMgbWF5IGJlIGluY29ycmVjdAogICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMxOTY3CiAKKyAgICAgICAg VW5yZXZpZXdlZCBpT1MgYnVpbGQgZml4IGFmdGVyIHIxNjc2NzkuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9tYWMvU2ltcGxlRm9udERhdGFNYWMubW06CisKKzIwMTQtMDQtMjIgIE15 bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBbT1MgWF0g R2x5cGggc3BhY2luZyBmb3Igc3lzdGVtIGZvbnRzIG1heSBiZSBpbmNvcnJlY3QKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMTk2NworCiAgICAgICAg IFVucmV2aWV3ZWQgYnVpbGQgZml4IGFmdGVyIHIxNjc2NzkuCiAKICAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9tYWMvU2ltcGxlRm9udERhdGFNYWMubW06CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvU2ltcGxlRm9udERhdGFNYWMubW0gYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvU2ltcGxlRm9udERhdGFNYWMubW0KaW5k ZXggZTAzZDZiMTg5NzQxNjM1OGVhMmUwYzcxODNmODZjZDQ0MWUwZWNlMS4uYThkZDUwZWUzMzAx MzQxZWViMDU5NjFmZWIyNTNmZDBlYmExNzhhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvbWFjL1NpbXBsZUZvbnREYXRhTWFjLm1tCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9TaW1wbGVGb250RGF0YU1hYy5tbQpAQCAtMzY1 LDYgKzM2NSw3IEBAIEZsb2F0UmVjdCBTaW1wbGVGb250RGF0YTo6cGxhdGZvcm1Cb3VuZHNGb3JH bHlwaChHbHlwaCBnbHlwaCkgY29uc3QKICAgICByZXR1cm4gYm91bmRpbmdCb3g7CiB9CiAKKyNp ZiAhUExBVEZPUk0oSU9TKQogc3RhdGljIGJvb2wgaGFzQ3VzdG9tVHJhY2tpbmcoQ1RGb250UmVm IGZvbnQpCiB7CiAjaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA8IDEwOTAKQEAg LTM3Niw3ICszNzcsNiBAQCBzdGF0aWMgYm9vbCBoYXNDdXN0b21UcmFja2luZyhDVEZvbnRSZWYg Zm9udCkKICNlbmRpZgogfQogCi0jaWYgIVBMQVRGT1JNKElPUykKIGZsb2F0IFNpbXBsZUZvbnRE YXRhOjpwbGF0Zm9ybVdpZHRoRm9yR2x5cGgoR2x5cGggZ2x5cGgpIGNvbnN0CiB7CiAgICAgQ0dT aXplIGFkdmFuY2UgPSBDR1NpemVaZXJvOwo=