123928 2013-11-06 14:20:54 -0800 Cleanup FontMac.mm 2013-11-06 15:58:22 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dbates dbates aestes oldest_to_newest 947916 0 dbates 2013-11-06 14:20:54 -0800 We should remove the default case statement from the switch block in Font::drawGlyphs(), <http://trac.webkit.org/browser/trunk/Source/WebCore/platform/graphics/mac/FontMac.mm?rev=158581#L143>, so that the compiler enforces that the switch covers all cases. We should inline the definition of isVertical in showGlyphsWithAdvances() since its referenced exactly once and its value is sufficiently clear. Additionally, we should use the variable platformData throughout Font::drawGlyphs() instead of using the variable in some place and explicitly querying for the Font's platform data in others. 947917 1 216226 dbates 2013-11-06 14:22:00 -0800 Created attachment 216226 Patch 947962 2 dbates 2013-11-06 15:58:22 -0800 Committed r158800: <http://trac.webkit.org/changeset/158800> 216226 2013-11-06 14:22:00 -0800 2013-11-06 15:19:34 -0800 Patch bug-123928-20131106142159.patch text/plain 3953 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMTU4NzU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDI3MTFlNTMzNmI2Y2Yx Y2U5ZTlmZDhjYWFkNDc0OTEzMGFhNzI4Ni4uZDJjZjNmNGViODBmOTBlOTNjYjllYzk1MzBjMDc2 OWJhODYxZjY4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEzLTExLTA2ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBDbGVhbnVwIEZvbnRNYWMu bW0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMzky OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpzaG93R2x5 cGhzV2l0aEFkdmFuY2VzKTogSW5saW5lIHRoZSB2YWx1ZSBvZiB2YXJpYWJsZSBpc1ZlcnRpY2Fs IGFzIHdlCisgICAgICAgIHJlZmVyZW5jZSBpdCBleGFjdGx5IG9uY2UgYW5kIGl0cyB2YWx1ZSBp cyBzdWZmaWNpZW50bHkgY2xlYXIuCisgICAgICAgIChXZWJDb3JlOjpGb250OjpkcmF3R2x5cGhz KTogUmVtb3ZlIGRlZmF1bHQgY2FzZSBpbiBzd2l0Y2ggYmxvY2sgc28gdGhhdCB0aGUgY29tcGls ZXIKKyAgICAgICAgY2hlY2tzIHRoYXQgYWxsIGNhc2VzIGFyZSBjb3ZlcmVkLiBNb3ZlIGRlZmlu aXRpb24gb2YgcGxhdGZvcm1EYXRhIHRvIHRoZSB0b3Agb2YgdGhlCisgICAgICAgIGZ1bmN0aW9u IGFuZCB1c2UgaXQgd2hlbmV2ZXIgd2Ugd2FudCB0byBhY2Nlc3MgdGhlIHBsYXRmb3JtIGZvbnQg ZGF0YQorCiAyMDEzLTExLTA2ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAog ICAgICAgICBNb3ZlIGFycmF5IHBvc2l0aW9uIGNhY2hpbmcgb3V0IGZyb20gSFRNTENvbGxlY3Rp b24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250 TWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRNYWMubW0K aW5kZXggZmY4MGNmYmIzZjY5MzBiZjUwNzFmMTIxMWRlNzBkNTQ1MmQyNDY5ZC4uNWU0ZDlhYTE3 MWY4YmVjMTc4OGM2N2Q0YjY1ZjJlZmY5MzAwY2JlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRNYWMubW0KQEAgLTcxLDggKzcxLDcgQEAgc3RhdGlj IHZvaWQgc2hvd0dseXBoc1dpdGhBZHZhbmNlcyhjb25zdCBGbG9hdFBvaW50JiBwb2ludCwgY29u c3QgU2ltcGxlRm9udERhdGEKICAgICAgICAgICAgIHBvc2l0aW9uc1tpXS55ID0gcG9zaXRpb25z W2kgLSAxXS55ICsgYWR2YW5jZS5oZWlnaHQ7CiAgICAgICAgIH0KICAgICB9Ci0gICAgYm9vbCBp c1ZlcnRpY2FsID0gZm9udC0+cGxhdGZvcm1EYXRhKCkub3JpZW50YXRpb24oKSA9PSBWZXJ0aWNh bDsKLSAgICBpZiAoaXNWZXJ0aWNhbCkgeworICAgIGlmIChwbGF0Zm9ybURhdGEub3JpZW50YXRp b24oKSA9PSBWZXJ0aWNhbCkgewogICAgICAgICBDR0FmZmluZVRyYW5zZm9ybSBzYXZlZE1hdHJp eDsKICAgICAgICAgQ0dBZmZpbmVUcmFuc2Zvcm0gcm90YXRlTGVmdFRyYW5zZm9ybSA9IENHQWZm aW5lVHJhbnNmb3JtTWFrZSgwLCAtMSwgMSwgMCwgMCwgMCk7CiAgICAgICAgIHNhdmVkTWF0cml4 ID0gQ0dDb250ZXh0R2V0VGV4dE1hdHJpeChjb250ZXh0KTsKQEAgLTEwOSwxMyArMTA4LDE0IEBA IHN0YXRpYyB2b2lkIHNob3dHbHlwaHNXaXRoQWR2YW5jZXMoY29uc3QgRmxvYXRQb2ludCYgcG9p bnQsIGNvbnN0IFNpbXBsZUZvbnREYXRhCiAKIHZvaWQgRm9udDo6ZHJhd0dseXBocyhHcmFwaGlj c0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IFNpbXBsZUZvbnREYXRhKiBmb250LCBjb25zdCBHbHlw aEJ1ZmZlciYgZ2x5cGhCdWZmZXIsIGludCBmcm9tLCBpbnQgbnVtR2x5cGhzLCBjb25zdCBGbG9h dFBvaW50JiBwb2ludCkgY29uc3QKIHsKLSAgICBpZiAoIWZvbnQtPnBsYXRmb3JtRGF0YSgpLnNp emUoKSkKKyAgICBjb25zdCBGb250UGxhdGZvcm1EYXRhJiBwbGF0Zm9ybURhdGEgPSBmb250LT5w bGF0Zm9ybURhdGEoKTsKKyAgICBpZiAoIXBsYXRmb3JtRGF0YS5zaXplKCkpCiAgICAgICAgIHJl dHVybjsKIAogICAgIENHQ29udGV4dFJlZiBjZ0NvbnRleHQgPSBjb250ZXh0LT5wbGF0Zm9ybUNv bnRleHQoKTsKIAotICAgIGJvb2wgc2hvdWxkU21vb3RoRm9udHMgPSB0cnVlOwotICAgIGJvb2wg Y2hhbmdlRm9udFNtb290aGluZyA9IGZhbHNlOworICAgIGJvb2wgc2hvdWxkU21vb3RoRm9udHM7 CisgICAgYm9vbCBjaGFuZ2VGb250U21vb3RoaW5nOwogICAgIAogICAgIHN3aXRjaChmb250RGVz Y3JpcHRpb24oKS5mb250U21vb3RoaW5nKCkpIHsKICAgICBjYXNlIEFudGlhbGlhc2VkOiB7CkBA IC0xMzcsMTEgKzEzNywxMCBAQCB2b2lkIEZvbnQ6OmRyYXdHbHlwaHMoR3JhcGhpY3NDb250ZXh0 KiBjb250ZXh0LCBjb25zdCBTaW1wbGVGb250RGF0YSogZm9udCwgY29ucwogICAgICAgICBicmVh azsKICAgICB9CiAgICAgY2FzZSBBdXRvU21vb3RoaW5nOiB7Ci0gICAgICAgIC8vIEZvciB0aGUg QXV0b1Ntb290aCBjYXNlLCBkb24ndCBkbyBhbnl0aGluZyEgS2VlcCB0aGUgZGVmYXVsdCBzZXR0 aW5ncy4KLSAgICAgICAgYnJlYWs7IAorICAgICAgICBzaG91bGRTbW9vdGhGb250cyA9IHRydWU7 CisgICAgICAgIGNoYW5nZUZvbnRTbW9vdGhpbmcgPSBmYWxzZTsKKyAgICAgICAgYnJlYWs7CiAg ICAgfQotICAgIGRlZmF1bHQ6IAotICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICB9 CiAgICAgCiAgICAgaWYgKCFzaG91bGRVc2VTbW9vdGhpbmcoKSkgewpAQCAtMTU1LDcgKzE1NCw2 IEBAIHZvaWQgRm9udDo6ZHJhd0dseXBocyhHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0 IFNpbXBsZUZvbnREYXRhKiBmb250LCBjb25zCiAgICAgICAgIENHQ29udGV4dFNldFNob3VsZFNt b290aEZvbnRzKGNnQ29udGV4dCwgc2hvdWxkU21vb3RoRm9udHMpOwogICAgIH0KIAotICAgIGNv bnN0IEZvbnRQbGF0Zm9ybURhdGEmIHBsYXRmb3JtRGF0YSA9IGZvbnQtPnBsYXRmb3JtRGF0YSgp OwogICAgIE5TRm9udCogZHJhd0ZvbnQ7CiAgICAgaWYgKCFpc1ByaW50ZXJGb250KCkpIHsKICAg ICAgICAgZHJhd0ZvbnQgPSBbcGxhdGZvcm1EYXRhLmZvbnQoKSBzY3JlZW5Gb250XTsKQEAgLTE3 OSw3ICsxNzcsNyBAQCB2b2lkIEZvbnQ6OmRyYXdHbHlwaHMoR3JhcGhpY3NDb250ZXh0KiBjb250 ZXh0LCBjb25zdCBTaW1wbGVGb250RGF0YSogZm9udCwgY29ucwogICAgIG1hdHJpeC5kID0gLW1h dHJpeC5kOwogICAgIGlmIChwbGF0Zm9ybURhdGEubV9zeW50aGV0aWNPYmxpcXVlKSB7CiAgICAg ICAgIHN0YXRpYyBmbG9hdCBvYmxpcXVlU2tldyA9IHRhbmYoU1lOVEhFVElDX09CTElRVUVfQU5H TEUgKiBwaUZsb2F0IC8gMTgwKTsKLSAgICAgICAgaWYgKGZvbnQtPnBsYXRmb3JtRGF0YSgpLm9y aWVudGF0aW9uKCkgPT0gVmVydGljYWwpCisgICAgICAgIGlmIChwbGF0Zm9ybURhdGEub3JpZW50 YXRpb24oKSA9PSBWZXJ0aWNhbCkKICAgICAgICAgICAgIG1hdHJpeCA9IENHQWZmaW5lVHJhbnNm b3JtQ29uY2F0KG1hdHJpeCwgQ0dBZmZpbmVUcmFuc2Zvcm1NYWtlKDEsIG9ibGlxdWVTa2V3LCAw LCAxLCAwLCAwKSk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIG1hdHJpeCA9IENHQWZmaW5l VHJhbnNmb3JtQ29uY2F0KG1hdHJpeCwgQ0dBZmZpbmVUcmFuc2Zvcm1NYWtlKDEsIDAsIC1vYmxp cXVlU2tldywgMSwgMCwgMCkpOwo=