144076 2015-04-22 16:04:40 -0700 [iOS] Caret does not line up with text when using the system font 2015-04-22 16:23:58 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mmaxfield mmaxfield enrica oldest_to_newest 1087623 0 mmaxfield 2015-04-22 16:04:40 -0700 [iOS] Caret does not line up with text when using the system font 1087629 1 251379 mmaxfield 2015-04-22 16:11:36 -0700 Created attachment 251379 Patch 1087631 2 251379 enrica 2015-04-22 16:15:33 -0700 Comment on attachment 251379 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=251379&action=review Looks good. > Source/WebCore/ChangeLog:10 > + the complext text codepath must know about custom tracking. typo complex > Source/WebCore/platform/graphics/mac/SimpleFontDataCoreText.cpp:55 > + CFDictionarySetValue(mutableAttributes, kCTFontAttributeName, platformData().ctFont()); I would change this code to CFDictionarySetValue(mutableAttributes, kCTFontAttributeName, hasCustomTracking() ? platformData().font() : platformData().ctFont()); 1087637 3 mmaxfield 2015-04-22 16:23:58 -0700 Committed r183153: <http://trac.webkit.org/changeset/183153> 251379 2015-04-22 16:11:36 -0700 2015-04-22 16:15:33 -0700 Patch bug-144076-20150422161032.patch text/plain 5883 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzMDY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWI4MjM3NmZiMDg1YzFm ZWYzMjZlNTMyZTZkOGEwOTAxZTdmMDAzYS4uOTk4MzAwZWU2ZjI4MDE2ZTdlOTNkYjkzYjMzODhl YmFhOTdhOTQzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE1LTA0LTIyICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gQ2Fy ZXQgZG9lcyBub3QgbGluZSB1cCB3aXRoIHRleHQgd2hlbiB1c2luZyB0aGUgc3lzdGVtIGZvbnQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NDA3Ngor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjA1NzgzMDE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRGV0ZXJtaW5pbmcgY2FyZXQgbG9jYXRpb25zIG9m dGVuIHVzZXMgdGhlIGNvbXBsZXggdGV4dCBjb2RlcGF0aCwgd2hpY2ggbWVhbnMKKyAgICAgICAg dGhlIGNvbXBsZXh0IHRleHQgY29kZXBhdGggbXVzdCBrbm93IGFib3V0IGN1c3RvbSB0cmFja2lu Zy4KKworICAgICAgICBUaGlzIHJlZ3Jlc3Npb24gaXMgZHVlIHRvIHIxODI1MTIuCisKKyAgICAg ICAgTm90ZSB0aGF0IHRoaXMgcGF0Y2ggaXMgYSBzaG9ydC10ZXJtIHNvbHV0aW9uIHVudGlsIEkg Y2FuIHNvbHZlIHRoZSBiaWdnZXIgaXNzdWUgb2YKKyAgICAgICAgaGF2aW5nIHR3byBDVEZvbnRS ZWZzIGFuZCB1c2luZyBlYWNoIGluIHRoZWlyIHByb3BlciBwbGFjZS4KKworICAgICAgICBObyBu ZXcgdGVzdHMgYmVjYXVzZSB0aGVyZSBpcyBubyB3YXkgdG8gcm9idXN0bHkgdGVzdCB0aGUgc3lz dGVtIGZvbnQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Gb250Lmg6CisgICAgICAg IChXZWJDb3JlOjpGb250OjpoYXNDdXN0b21UcmFja2luZyk6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY29jb2EvRm9udENvY29hLm1tOgorICAgICAgICAoV2ViQ29yZTo6Y2FuVXNlRmFz dEdseXBoQWR2YW5jZUdldHRlcik6CisgICAgICAgIChXZWJDb3JlOjpGb250OjpwbGF0Zm9ybVdp ZHRoRm9yR2x5cGgpOgorICAgICAgICAoV2ViQ29yZTo6aGFzQ3VzdG9tVHJhY2tpbmcpOiBEZWxl dGVkLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL21hYy9TaW1wbGVGb250RGF0YUNvcmVU ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6OmdldENGU3RyaW5nQXR0cmlidXRlcyk6 CisKIDIwMTUtMDQtMjEgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAg ICBNYWtlIFZlY3Rvcihjb25zdCBWZWN0b3I8VCwgb3RoZXJDYXBhY2l0eSwgb3RoZXJPdmVyZmxv d0JlaGF2aW91cj4mKSBjb25zdHJ1Y3RvciBleHBsaWNpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvRm9udC5oCmluZGV4IGY0ZjMxYjQzMjA0YjM5OWM3YzY1M2E4MDgxYmM5ZjljMGUy MmVjZWQuLjZiNjhiYWNiZWJiN2I1ZDc5ZjRmZWVjZGI3OTU4NDAxYjIxNjMyNjggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmgKQEAgLTE5NSw2ICsxOTUsNyBAQCBwdWJs aWM6CiAjZW5kaWYKICNpZiBQTEFURk9STShDT0NPQSkKICAgICBDRkRpY3Rpb25hcnlSZWYgZ2V0 Q0ZTdHJpbmdBdHRyaWJ1dGVzKFR5cGVzZXR0aW5nRmVhdHVyZXMsIEZvbnRPcmllbnRhdGlvbikg Y29uc3Q7CisgICAgYm9vbCBoYXNDdXN0b21UcmFja2luZygpIGNvbnN0IHsgcmV0dXJuIGlzU3lz dGVtRm9udCgpOyB9CiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKENPQ09BKSB8fCBVU0UoSEFSRkJV WlopCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9G b250Q29jb2EubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250 Q29jb2EubW0KaW5kZXggMmMyNjZkMDgwNTllYjJhZTYwMTVmMzIxMjljMjBjMGMyMTc1ZDU2OS4u NGU1OWU3YjU2YWU3NTYyNzYyNzlmYzVjY2VjNDI4YjQ3MDcyYzE5OSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENvY29hLm1tCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDb2NvYS5tbQpAQCAtNDU1 LDExICs0NTUsNiBAQCBzdGF0aWMgaW5saW5lIGJvb2wgYWR2YW5jZUZvckNvbG9yQml0bWFwRm9u dChjb25zdCBGb250UGxhdGZvcm1EYXRhJiBwbGF0Zm9ybURhdAogI2VuZGlmCiB9CiAKLXN0YXRp YyBpbmxpbmUgYm9vbCBoYXNDdXN0b21UcmFja2luZyhjb25zdCBGb250JiBmb250KQotewotICAg IHJldHVybiBmb250LmlzU3lzdGVtRm9udCgpOwotfQotCiBzdGF0aWMgaW5saW5lIGJvb2wgaXNF bW9qaShjb25zdCBGb250UGxhdGZvcm1EYXRhJiBwbGF0Zm9ybURhdGEpCiB7CiAjaWYgUExBVEZP Uk0oSU9TKQpAQCAtNDc0LDcgKzQ2OSw3IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBjYW5Vc2VGYXN0 R2x5cGhBZHZhbmNlR2V0dGVyKGNvbnN0IEZvbnQmIGZvbnQsIEdseXBoIGdseXBoLCBDCiB7CiAg ICAgY29uc3QgRm9udFBsYXRmb3JtRGF0YSYgcGxhdGZvcm1EYXRhID0gZm9udC5wbGF0Zm9ybURh dGEoKTsKICAgICAvLyBGYXN0IGdldHRlciBkb2Vzbid0IHRha2UgY3VzdG9tIHRyYWNraW5nIGlu dG8gYWNjb3VudAotICAgIGlmIChoYXNDdXN0b21UcmFja2luZyhmb250KSkKKyAgICBpZiAoZm9u dC5oYXNDdXN0b21UcmFja2luZygpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgLy8gRmFz dCBnZXR0ZXIgZG9lc24ndCB3b3JrIGZvciBlbW9qaQogICAgIGlmIChpc0Vtb2ppKHBsYXRmb3Jt RGF0YSkpCkBAIC01MDEsMTAgKzQ5NiwxMCBAQCBmbG9hdCBGb250OjpwbGF0Zm9ybVdpZHRoRm9y R2x5cGgoR2x5cGggZ2x5cGgpIGNvbnN0CiAgICAgICAgICAgICBhZHZhbmNlLndpZHRoID0gMDsK ICAgICAgICAgfQogICAgIH0gZWxzZSBpZiAoIXBvcHVsYXRlZEFkdmFuY2UpIHsKLSAgICAgICAg Ly8gbV9wbGF0Zm9ybURhdGEuZm9udCgpIHJldHVybnMgdGhlIG9yaWdpbmFsIGZvbnQgdGhhdCB3 YXMgcGFzc2VkIGludG8gdGhlIEZvbnRQbGF0Zm9ybURhdGEgY29uc3RydWN0b3IuECBJbiB0aGUg Y2FzZSBvZiBmb250cyB0aGF0IGhhdmUgY3VzdG9tIHRyYWNraW5nLAorICAgICAgICAvLyBtX3Bs YXRmb3JtRGF0YS5mb250KCkgcmV0dXJucyB0aGUgb3JpZ2luYWwgZm9udCB0aGF0IHdhcyBwYXNz ZWQgaW50byB0aGUgRm9udFBsYXRmb3JtRGF0YSBjb25zdHJ1Y3Rvci4gSW4gdGhlIGNhc2Ugb2Yg Zm9udHMgdGhhdCBoYXZlIGN1c3RvbSB0cmFja2luZywKICAgICAgICAgLy8gdGhlIGN1c3RvbSB0 cmFja2luZyBkb2VzIG5vdCBzdXJ2aXZlIHRoZSB0cmFuc2Zvcm1hdGlvbiB0byBlaXRoZXIgbV9w bGF0Zm9ybURhdGEuY2dGb250KCkgbm9yIG1fcGxhdGZvcm1EYXRhLmN0Rm9udCgpLCBzbyB3ZSBt dXN0IHVzZSB0aGUgb3JpZ2luYWwKICAgICAgICAgLy8gZm9udCgpIHRoYXQgd2FzIHBhc3NlZCBp bi4gSG93ZXZlciwgZm9yIHdlYiBmb250cywgbV9wbGF0Zm9ybURhdGEuZm9udCgpIGlzIG51bGws IHNvIHdlIG11c3QgdXNlIG1fcGxhdGZvcm1EYXRhLmN0Rm9udCgpIGZvciB0aG9zZSBjYXNlcy4K LSAgICAgICAgaWYgKGhhc0N1c3RvbVRyYWNraW5nKCp0aGlzKSkKKyAgICAgICAgaWYgKGhhc0N1 c3RvbVRyYWNraW5nKCkpCiAgICAgICAgICAgICBDVEZvbnRHZXRBZHZhbmNlc0ZvckdseXBocyht X3BsYXRmb3JtRGF0YS5mb250KCksIGhvcml6b250YWwgPyBrQ1RGb250T3JpZW50YXRpb25Ib3Jp em9udGFsIDoga0NURm9udE9yaWVudGF0aW9uVmVydGljYWwsICZnbHlwaCwgJmFkdmFuY2UsIDEp OwogICAgICAgICBlbHNlCiAgICAgICAgICAgICBDVEZvbnRHZXRBZHZhbmNlc0ZvckdseXBocyht X3BsYXRmb3JtRGF0YS5jdEZvbnQoKSwgaG9yaXpvbnRhbCA/IGtDVEZvbnRPcmllbnRhdGlvbkhv cml6b250YWwgOiBrQ1RGb250T3JpZW50YXRpb25WZXJ0aWNhbCwgJmdseXBoLCAmYWR2YW5jZSwg MSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvU2lt cGxlRm9udERhdGFDb3JlVGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9tYWMvU2ltcGxlRm9udERhdGFDb3JlVGV4dC5jcHAKaW5kZXggMGY4MzAxNzIwNWUyZTFjZDJj M2YxOTkzZGZkZWNhMTZiM2E5NzY4Yy4uZmE3ZTY2NTZhZGJlNGY5NGE0Y2IzYjU2ZGYzZjcwZTM1 ZDRlOWYxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFj L1NpbXBsZUZvbnREYXRhQ29yZVRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL21hYy9TaW1wbGVGb250RGF0YUNvcmVUZXh0LmNwcApAQCAtNDYsNyArNDYsMTMg QEAgQ0ZEaWN0aW9uYXJ5UmVmIEZvbnQ6OmdldENGU3RyaW5nQXR0cmlidXRlcyhUeXBlc2V0dGlu Z0ZlYXR1cmVzIHR5cGVzZXR0aW5nRmVhdHUKICAgICBhdHRyaWJ1dGVzRGljdGlvbmFyeSA9IGFk b3B0Q0YoQ0ZEaWN0aW9uYXJ5Q3JlYXRlTXV0YWJsZShrQ0ZBbGxvY2F0b3JEZWZhdWx0LCA0LCAm a0NGQ29weVN0cmluZ0RpY3Rpb25hcnlLZXlDYWxsQmFja3MsICZrQ0ZUeXBlRGljdGlvbmFyeVZh bHVlQ2FsbEJhY2tzKSk7CiAgICAgQ0ZNdXRhYmxlRGljdGlvbmFyeVJlZiBtdXRhYmxlQXR0cmli dXRlcyA9IChDRk11dGFibGVEaWN0aW9uYXJ5UmVmKWF0dHJpYnV0ZXNEaWN0aW9uYXJ5LmdldCgp OwogCi0gICAgQ0ZEaWN0aW9uYXJ5U2V0VmFsdWUobXV0YWJsZUF0dHJpYnV0ZXMsIGtDVEZvbnRB dHRyaWJ1dGVOYW1lLCBwbGF0Zm9ybURhdGEoKS5jdEZvbnQoKSk7CisgICAgLy8gbV9wbGF0Zm9y bURhdGEuZm9udCgpIHJldHVybnMgdGhlIG9yaWdpbmFsIGZvbnQgdGhhdCB3YXMgcGFzc2VkIGlu dG8gdGhlIEZvbnRQbGF0Zm9ybURhdGEgY29uc3RydWN0b3IuIEluIHRoZSBjYXNlIG9mIGZvbnRz IHRoYXQgaGF2ZSBjdXN0b20gdHJhY2tpbmcsCisgICAgLy8gdGhlIGN1c3RvbSB0cmFja2luZyBk b2VzIG5vdCBzdXJ2aXZlIHRoZSB0cmFuc2Zvcm1hdGlvbiB0byBlaXRoZXIgbV9wbGF0Zm9ybURh dGEuY2dGb250KCkgbm9yIG1fcGxhdGZvcm1EYXRhLmN0Rm9udCgpLCBzbyB3ZSBtdXN0IHVzZSB0 aGUgb3JpZ2luYWwKKyAgICAvLyBmb250KCkgdGhhdCB3YXMgcGFzc2VkIGluLiBIb3dldmVyLCBm b3Igd2ViIGZvbnRzLCBtX3BsYXRmb3JtRGF0YS5mb250KCkgaXMgbnVsbCwgc28gd2UgbXVzdCB1 c2UgbV9wbGF0Zm9ybURhdGEuY3RGb250KCkgZm9yIHRob3NlIGNhc2VzLgorICAgIGlmIChoYXND dXN0b21UcmFja2luZygpKQorICAgICAgICBDRkRpY3Rpb25hcnlTZXRWYWx1ZShtdXRhYmxlQXR0 cmlidXRlcywga0NURm9udEF0dHJpYnV0ZU5hbWUsIHBsYXRmb3JtRGF0YSgpLmZvbnQoKSk7Cisg ICAgZWxzZQorICAgICAgICBDRkRpY3Rpb25hcnlTZXRWYWx1ZShtdXRhYmxlQXR0cmlidXRlcywg a0NURm9udEF0dHJpYnV0ZU5hbWUsIHBsYXRmb3JtRGF0YSgpLmN0Rm9udCgpKTsKIAogICAgIGlm ICghKHR5cGVzZXR0aW5nRmVhdHVyZXMgJiBLZXJuaW5nKSkgewogICAgICAgICBjb25zdCBmbG9h dCB6ZXJvID0gMDsK