143592 2015-04-09 18:14:06 -0700 Pull emoji-position adjustment code into its own function 2019-01-29 01:15:51 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser commit-queue fred.wang mmaxfield simon.fraser oldest_to_newest 1084160 0 simon.fraser 2015-04-09 18:14:06 -0700 Pull emoji-position adjustment code into its own function 1084161 1 250493 simon.fraser 2015-04-09 18:14:53 -0700 Created attachment 250493 Patch 1084163 2 250493 mmaxfield 2015-04-09 18:18:40 -0700 Comment on attachment 250493 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=250493&action=review > Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm:210 > + if (platformData.m_isEmoji) { Early return > Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm:228 > + y -= .35f * fontSize - 10; Magic numbers :( 1085997 3 simon.fraser 2015-04-16 11:49:28 -0700 https://trac.webkit.org/r182898 250493 2015-04-09 18:14:53 -0700 2019-01-29 01:15:51 -0800 Patch bug-143592-20150409181402.patch text/plain 4716 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyNjA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmQyZjlhNDk0ZDI3MWI4 MzdhYjUwOWEwYmFhMmJlYzM4NWUyZTE2Zi4uNTM0M2M1M2NjMmRiMTUyNjI3ZTExMGM5NDExNGM2 NjlmZWQ0NmJhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5IEBACiAyMDE1LTA0LTA5ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIFB1bGwgZW1vamkt cG9zaXRpb24gYWRqdXN0bWVudCBjb2RlIGludG8gaXRzIG93biBmdW5jdGlvbgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzNTkyCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRmlyc3Qgc3RlcCB0byBjbGVh bmluZyB1cCBGb250Q2FzY2FkZTo6ZHJhd0dseXBocygpLiBQdWxsIGlPUy1vbmx5IGNvZGUgcmVs YXRlZCB0bworICAgICAgICBlbW9qaSBwb3NpdGlvbmluZyBpbnRvIGl0cyBvd24gZnVuY3Rpb24u CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2FzY2FkZUNvY29hLm1t OgorICAgICAgICAoV2ViQ29yZTo6cG9pbnRBZGp1c3RlZEZvckVtb2ppKToKKyAgICAgICAgKFdl YkNvcmU6OkZvbnRDYXNjYWRlOjpkcmF3R2x5cGhzKToKKworMjAxNS0wNC0wOSAgU2ltb24gRnJh c2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKwogICAgICAgICBSZXZlcnQgcGFydCBvZiAx ODI1MTY6IGl0IGJyb2tlIHRlc3RzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNDM1NjgKICAgICAgICAgcmRhcjovL3Byb2JsZW0vMjA0ODQ1NzgKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYXNj YWRlQ29jb2EubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250 Q2FzY2FkZUNvY29hLm1tCmluZGV4IGVkZDNlNDNkNzhlZjc0ZGI0ZDQyYmU5NzA2NWZmM2VhZmQw NWM5ZDAuLmY1ZWU4YWI0YjllNDM5Mjc5MGUzYzU5YTA5YTE5ODhlMTIyYjMyZjEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYXNjYWRlQ29j b2EubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENh c2NhZGVDb2NvYS5tbQpAQCAtMjAzLDYgKzIwMyw0MSBAQCBzdGF0aWMgdm9pZCBzZXRDR0ZvbnRS ZW5kZXJpbmdNb2RlKENHQ29udGV4dFJlZiBjZ0NvbnRleHQsIE5TRm9udFJlbmRlcmluZ01vZGUg cgogfQogI2VuZGlmCiAKK3N0YXRpYyBGbG9hdFBvaW50IHBvaW50QWRqdXN0ZWRGb3JFbW9qaShj b25zdCBGb250UGxhdGZvcm1EYXRhJiBwbGF0Zm9ybURhdGEsIEZsb2F0UG9pbnQgcG9pbnQpCit7 CisjaWYgUExBVEZPUk0oSU9TKQorICAgIGZsb2F0IGZvbnRTaXplID0gcGxhdGZvcm1EYXRhLnNp emUoKTsKKyAgICBpZiAocGxhdGZvcm1EYXRhLm1faXNFbW9qaSkgeworICAgICAgICAvLyBNaW1p YyB0aGUgcG9zaXRpb2luaW5nIG9mIG5vbi1iaXRtYXAgZ2x5cGhzLCB3aGljaCBhcmUgbm90IHN1 YnBpeGVsLXBvc2l0aW9uZWQuCisgICAgICAgIHBvaW50LnNldFkoY2VpbGYocG9pbnQueSgpKSk7 CisKKyAgICAgICAgLy8gRW1vamkgZ2x5cGhzIHNuYXAgdG8gdGhlIENTUyBwaXhlbCBncmlkLgor ICAgICAgICBwb2ludC5zZXRYKGZsb29yZihwb2ludC54KCkpKTsKKworICAgICAgICAvLyBFbW9q aSBnbHlwaHMgYXJlIG9mZnNldCBvbmUgQ1NTIHBpeGVsIHRvIHRoZSByaWdodC4KKyAgICAgICAg cG9pbnQubW92ZSgxLCAwKTsKKworICAgICAgICAvLyBFbW9qaSBnbHlwaHMgYXJlIG9mZnNldCB2 ZXJ0aWNhbGx5IGJhc2VkIG9uIGZvbnQgc2l6ZS4KKyAgICAgICAgZmxvYXQgeSA9IHBvaW50Lnko KTsKKyAgICAgICAgaWYgKGZvbnRTaXplIDw9IDE1KSB7CisgICAgICAgICAgICAvLyBVbmRvIENv cmUgVGV4dCdzIHkgYWRqdXN0bWVudC4KKyAgICAgICAgICAgIHN0YXRpYyBmbG9hdCB5QWRqdXN0 bWVudEZhY3RvciA9IGlvc0V4ZWN1dGFibGVXYXNMaW5rZWRPbk9yQWZ0ZXJWZXJzaW9uKHdrSU9T U3lzdGVtVmVyc2lvbl82XzApID8gLjE5IDogLjE7CisgICAgICAgICAgICBwb2ludC5zZXRZKGZs b29yZih5IC0geUFkanVzdG1lbnRGYWN0b3IgKiAoZm9udFNpemUgKyAyKSArIDIpKTsKKyAgICAg ICAgfSBlbHNlIHsKKyAgICAgICAgICAgIGlmIChmb250U2l6ZSA8IDI2KQorICAgICAgICAgICAg ICAgIHkgLT0gLjM1ZiAqIGZvbnRTaXplIC0gMTA7CisKKyAgICAgICAgICAgIC8vIFVuZG8gQ29y ZSBUZXh0J3MgeSBhZGp1c3RtZW50LgorICAgICAgICAgICAgc3RhdGljIGZsb2F0IHlBZGp1c3Rt ZW50ID0gaW9zRXhlY3V0YWJsZVdhc0xpbmtlZE9uT3JBZnRlclZlcnNpb24od2tJT1NTeXN0ZW1W ZXJzaW9uXzZfMCkgPyAzLjggOiAyOworICAgICAgICAgICAgcG9pbnQuc2V0WShmbG9vcmYoeSAt IHlBZGp1c3RtZW50KSk7CisgICAgICAgIH0KKyAgICB9CisjZWxzZQorICAgIFVOVVNFRF9QQVJB TShwbGF0Zm9ybURhdGEpOworI2VuZGlmCisgICAgcmV0dXJuIHBvaW50OworfQorCiB2b2lkIEZv bnRDYXNjYWRlOjpkcmF3R2x5cGhzKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgRm9u dCogZm9udCwgY29uc3QgR2x5cGhCdWZmZXImIGdseXBoQnVmZmVyLCBpbnQgZnJvbSwgaW50IG51 bUdseXBocywgY29uc3QgRmxvYXRQb2ludCYgYW5jaG9yUG9pbnQpIGNvbnN0CiB7CiAgICAgY29u c3QgRm9udFBsYXRmb3JtRGF0YSYgcGxhdGZvcm1EYXRhID0gZm9udC0+cGxhdGZvcm1EYXRhKCk7 CkBAIC0yNjYsMzUgKzMwMSwxMSBAQCB2b2lkIEZvbnRDYXNjYWRlOjpkcmF3R2x5cGhzKEdyYXBo aWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgRm9udCogZm9udCwgY29uc3QgRwogICAgIENHQ29u dGV4dFNldEZvbnQoY2dDb250ZXh0LCBwbGF0Zm9ybURhdGEuY2dGb250KCkpOwogCiAgICAgYm9v bCB1c2VMZXR0ZXJwcmVzc0VmZmVjdCA9IHNob3VsZFVzZUxldHRlcnByZXNzRWZmZWN0KCpjb250 ZXh0KTsKLSAgICBGbG9hdFBvaW50IHBvaW50ID0gYW5jaG9yUG9pbnQ7CisgICAgRmxvYXRQb2lu dCBwb2ludCA9IHBvaW50QWRqdXN0ZWRGb3JFbW9qaShwbGF0Zm9ybURhdGEsIGFuY2hvclBvaW50 KTsKKwogI2lmIFBMQVRGT1JNKElPUykKICAgICBmbG9hdCBmb250U2l6ZSA9IHBsYXRmb3JtRGF0 YS5zaXplKCk7CiAgICAgQ0dBZmZpbmVUcmFuc2Zvcm0gbWF0cml4ID0gdXNlTGV0dGVycHJlc3NF ZmZlY3QgfHwgcGxhdGZvcm1EYXRhLmlzQ29sb3JCaXRtYXBGb250KCkgPyBDR0FmZmluZVRyYW5z Zm9ybUlkZW50aXR5IDogQ0dBZmZpbmVUcmFuc2Zvcm1NYWtlU2NhbGUoZm9udFNpemUsIGZvbnRT aXplKTsKLSAgICBpZiAocGxhdGZvcm1EYXRhLm1faXNFbW9qaSkgewotICAgICAgICAvLyBNaW1p YyB0aGUgcG9zaXRpb2luaW5nIG9mIG5vbi1iaXRtYXAgZ2x5cGhzLCB3aGljaCBhcmUgbm90IHN1 YnBpeGVsLXBvc2l0aW9uZWQuCi0gICAgICAgIHBvaW50LnNldFkoY2VpbGYocG9pbnQueSgpKSk7 Ci0KLSAgICAgICAgLy8gRW1vamkgZ2x5cGhzIHNuYXAgdG8gdGhlIENTUyBwaXhlbCBncmlkLgot ICAgICAgICBwb2ludC5zZXRYKGZsb29yZihwb2ludC54KCkpKTsKLQotICAgICAgICAvLyBFbW9q aSBnbHlwaHMgYXJlIG9mZnNldCBvbmUgQ1NTIHBpeGVsIHRvIHRoZSByaWdodC4KLSAgICAgICAg cG9pbnQubW92ZSgxLCAwKTsKLQotICAgICAgICAvLyBFbW9qaSBnbHlwaHMgYXJlIG9mZnNldCB2 ZXJ0aWNhbGx5IGJhc2VkIG9uIGZvbnQgc2l6ZS4KLSAgICAgICAgZmxvYXQgeSA9IHBvaW50Lnko KTsKLSAgICAgICAgaWYgKGZvbnRTaXplIDw9IDE1KSB7Ci0gICAgICAgICAgICAvLyBVbmRvIENv cmUgVGV4dCdzIHkgYWRqdXN0bWVudC4KLSAgICAgICAgICAgIHN0YXRpYyBmbG9hdCB5QWRqdXN0 bWVudEZhY3RvciA9IGlvc0V4ZWN1dGFibGVXYXNMaW5rZWRPbk9yQWZ0ZXJWZXJzaW9uKHdrSU9T U3lzdGVtVmVyc2lvbl82XzApID8gLjE5IDogLjE7Ci0gICAgICAgICAgICBwb2ludC5zZXRZKGZs b29yZih5IC0geUFkanVzdG1lbnRGYWN0b3IgKiAoZm9udFNpemUgKyAyKSArIDIpKTsKLSAgICAg ICAgfSBlbHNlIHsKLSAgICAgICAgICAgIGlmIChmb250U2l6ZSA8IDI2KQotICAgICAgICAgICAg ICAgIHkgLT0gLjM1ZiAqIGZvbnRTaXplIC0gMTA7Ci0KLSAgICAgICAgICAgIC8vIFVuZG8gQ29y ZSBUZXh0J3MgeSBhZGp1c3RtZW50LgotICAgICAgICAgICAgc3RhdGljIGZsb2F0IHlBZGp1c3Rt ZW50ID0gaW9zRXhlY3V0YWJsZVdhc0xpbmtlZE9uT3JBZnRlclZlcnNpb24od2tJT1NTeXN0ZW1W ZXJzaW9uXzZfMCkgPyAzLjggOiAyOwotICAgICAgICAgICAgcG9pbnQuc2V0WShmbG9vcmYoeSAt IHlBZGp1c3RtZW50KSk7Ci0gICAgICAgIH0KLSAgICB9CiAjZWxzZQogICAgIENHQWZmaW5lVHJh bnNmb3JtIG1hdHJpeCA9IENHQWZmaW5lVHJhbnNmb3JtSWRlbnRpdHk7CiAgICAgaWYgKGRyYXdG b250ICYmICFwbGF0Zm9ybURhdGEuaXNDb2xvckJpdG1hcEZvbnQoKSkK