101258 2012-11-05 14:19:28 -0800 Cleaned up the Font class in preparation for optimizing kerning and ligatures 2012-11-05 15:19:05 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ggaren ggaren adele bdakin hyatt mitz simon.fraser oldest_to_newest 758895 0 ggaren 2012-11-05 14:19:28 -0800 Cleaned up the Font class in preparation for optimizing kerning and ligatures 758904 1 172409 ggaren 2012-11-05 14:31:30 -0800 Created attachment 172409 Patch 758950 2 ggaren 2012-11-05 15:19:05 -0800 Committed r133534: <http://trac.webkit.org/changeset/133534> 172409 2012-11-05 14:31:30 -0800 2012-11-05 14:37:15 -0800 Patch bug-101258-20121105142944.patch text/plain 7267 ggaren SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzMzUyNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDEyLTExLTA1ICBHZW9mZnJl eSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYW5lZCB1cCB0aGUgRm9u dCBjbGFzcyBpbiBwcmVwYXJhdGlvbiBmb3Igb3B0aW1pemluZyBrZXJuaW5nIGFuZCBsaWdhdHVy ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTI1 OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvRm9udC5oOgorICAgICAgICAoV2ViQ29yZTo6Rm9udDo6dHlwZXNldHRp bmdGZWF0dXJlcyk6CisgICAgICAgIChXZWJDb3JlOjpGb250Ojpjb21wdXRlVHlwZXNldHRpbmdG ZWF0dXJlcyk6IENvbXB1dGUgYW5kIGNhY2hlIG91cgorICAgICAgICB0eXBlc2V0dGluZyBmZWF0 dXJlcyBpbnN0ZWFkIG9mIHJlY29tcHV0aW5nIGVhY2ggdGltZSBhIGNsaWVudCBhc2tzCisgICAg ICAgIGZvciB0aGVtLiBUaGlzIG1ha2VzIHRoZSBjbGFzcyBpbnRlcmZhY2UgZWFzaWVyIHRvIHVz ZSBiZWNhdXNlCisgICAgICAgICJ0eXBlc2V0dGluZ0ZlYXR1cmVzKCkiIGNhbiBhcHBlYXIgaW4g bW9yZSB0aGFuIG9uZSBleHByZXNzaW9uIHdpdGhvdXQKKyAgICAgICAgdW5kdWUgcGVyZm9ybWFu Y2UgY29zdC4gVGhpcyBtYXkgYWxzbyBiZSBhIHNtYWxsIHNwZWVkdXAgdG8gY29kZSB0aGF0Cisg ICAgICAgIGNhbGxzIHR5cGVzZXR0aW5nRmVhdHVyZXMoKSBvZnRlbiBmb3Igb3RoZXIgcmVhc29u cy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Rm9udDo6Rm9udCk6CisgICAgICAgIChXZWJDb3JlOjpGb250OjpvcGVyYXRvcj0pOgor ICAgICAgICAoV2ViQ29yZTo6Rm9udDo6dXBkYXRlKTogRGl0dG8uCisKKyAgICAgICAgKFdlYkNv cmU6OkZvbnQ6OndpZHRoKTogVW5mb3JrZWQgdGhlIHdpZHRoKCkgZnVuY3Rpb24gc28gYWxsIHdp ZHRoLXJlbGF0ZWQKKyAgICAgICAgaW50ZXJmYWNlcyBjYW4gYmVuZWZpdCBmcm9tIG9wdGltaXph dGlvbiB3aXRob3V0IGR1cGxpY2F0ZSBjb2RlLgorCiAyMDEyLTExLTA1ICBBZGFtIEJhcnRoICA8 YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW1Y4XSBJbnRydXNpdmVET01XcmFwcGVyTWFw IHNob3VsZCBiZSB1c2FibGUgZm9yIG1vcmUgdGhhbiBqdXN0IE5vZGVzCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmNwcAkocmV2aXNpb24gMTMzNTI2KQorKysg U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTc1LDYgKzc1LDcgQEAgRm9udDo6Rm9udCgpCiAgICAgLCBtX3dvcmRTcGFjaW5nKDApCiAg ICAgLCBtX2lzUGxhdGZvcm1Gb250KGZhbHNlKQogICAgICwgbV9uZWVkc1RyYW5zY29kaW5nKGZh bHNlKQorICAgICwgbV90eXBlc2V0dGluZ0ZlYXR1cmVzKDApCiB7CiB9CiAKQEAgLTg0LDYgKzg1 LDcgQEAgRm9udDo6Rm9udChjb25zdCBGb250RGVzY3JpcHRpb24mIGZkLCBzaAogICAgICwgbV93 b3JkU3BhY2luZyh3b3JkU3BhY2luZykKICAgICAsIG1faXNQbGF0Zm9ybUZvbnQoZmFsc2UpCiAg ICAgLCBtX25lZWRzVHJhbnNjb2RpbmcoZm9udFRyYW5zY29kZXIoKS5uZWVkc1RyYW5zY29kaW5n KGZkKSkKKyAgICAsIG1fdHlwZXNldHRpbmdGZWF0dXJlcyhjb21wdXRlVHlwZXNldHRpbmdGZWF0 dXJlcygpKQogewogfQogCkBAIC05Miw2ICs5NCw3IEBAIEZvbnQ6OkZvbnQoY29uc3QgRm9udFBs YXRmb3JtRGF0YSYgZm9udEQKICAgICAsIG1fbGV0dGVyU3BhY2luZygwKQogICAgICwgbV93b3Jk U3BhY2luZygwKQogICAgICwgbV9pc1BsYXRmb3JtRm9udCh0cnVlKQorICAgICwgbV90eXBlc2V0 dGluZ0ZlYXR1cmVzKGNvbXB1dGVUeXBlc2V0dGluZ0ZlYXR1cmVzKCkpCiB7CiAgICAgbV9mb250 RGVzY3JpcHRpb24uc2V0VXNlUHJpbnRlckZvbnQoaXNQcmludGVyRm9udCk7CiAgICAgbV9mb250 RGVzY3JpcHRpb24uc2V0Rm9udFNtb290aGluZyhmb250U21vb3RoaW5nTW9kZSk7CkBAIC0xMDYs NiArMTA5LDcgQEAgRm9udDo6Rm9udChjb25zdCBGb250JiBvdGhlcikKICAgICAsIG1fd29yZFNw YWNpbmcob3RoZXIubV93b3JkU3BhY2luZykKICAgICAsIG1faXNQbGF0Zm9ybUZvbnQob3RoZXIu bV9pc1BsYXRmb3JtRm9udCkKICAgICAsIG1fbmVlZHNUcmFuc2NvZGluZyhvdGhlci5tX25lZWRz VHJhbnNjb2RpbmcpCisgICAgLCBtX3R5cGVzZXR0aW5nRmVhdHVyZXMoY29tcHV0ZVR5cGVzZXR0 aW5nRmVhdHVyZXMoKSkKIHsKIH0KIApAQCAtMTE3LDYgKzEyMSw3IEBAIEZvbnQmIEZvbnQ6Om9w ZXJhdG9yPShjb25zdCBGb250JiBvdGhlcikKICAgICBtX3dvcmRTcGFjaW5nID0gb3RoZXIubV93 b3JkU3BhY2luZzsKICAgICBtX2lzUGxhdGZvcm1Gb250ID0gb3RoZXIubV9pc1BsYXRmb3JtRm9u dDsKICAgICBtX25lZWRzVHJhbnNjb2RpbmcgPSBvdGhlci5tX25lZWRzVHJhbnNjb2Rpbmc7Cisg ICAgbV90eXBlc2V0dGluZ0ZlYXR1cmVzID0gb3RoZXIubV90eXBlc2V0dGluZ0ZlYXR1cmVzOwog ICAgIHJldHVybiAqdGhpczsKIH0KIApAQCAtMTQ4LDYgKzE1Myw3IEBAIHZvaWQgRm9udDo6dXBk YXRlKFBhc3NSZWZQdHI8Rm9udFNlbGVjdG8KICAgICBpZiAoIW1fZm9udEZhbGxiYWNrTGlzdCkK ICAgICAgICAgbV9mb250RmFsbGJhY2tMaXN0ID0gRm9udEZhbGxiYWNrTGlzdDo6Y3JlYXRlKCk7 CiAgICAgbV9mb250RmFsbGJhY2tMaXN0LT5pbnZhbGlkYXRlKGZvbnRTZWxlY3Rvcik7CisgICAg bV90eXBlc2V0dGluZ0ZlYXR1cmVzID0gY29tcHV0ZVR5cGVzZXR0aW5nRmVhdHVyZXMoKTsKIH0K IAogdm9pZCBGb250OjpkcmF3VGV4dChHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IFRl eHRSdW4mIHJ1biwgY29uc3QgRmxvYXRQb2ludCYgcG9pbnQsIGludCBmcm9tLCBpbnQgdG8pIGNv bnN0CkBAIC0yMTAsMTEgKzIxNiw3IEBAIGZsb2F0IEZvbnQ6OndpZHRoKGNvbnN0IFRleHRSdW4m IHJ1biwgaW4KIAogICAgIGNoYXJzQ29uc3VtZWQgPSBydW4ubGVuZ3RoKCk7CiAgICAgZ2x5cGhO YW1lID0gIiI7Ci0KLSAgICBpZiAoY29kZVBhdGgocnVuKSAhPSBDb21wbGV4KQotICAgICAgICBy ZXR1cm4gZmxvYXRXaWR0aEZvclNpbXBsZVRleHQocnVuKTsKLQotICAgIHJldHVybiBmbG9hdFdp ZHRoRm9yQ29tcGxleFRleHQocnVuKTsKKyAgICByZXR1cm4gd2lkdGgocnVuKTsKIH0KIAogI2lm ICEoUExBVEZPUk0oTUFDKSB8fCAoUExBVEZPUk0oQ0hST01JVU0pICYmIE9TKERBUldJTikpKQpJ bmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuaAkocmV2aXNpb24gMTMz NTI2KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5oCSh3b3JraW5n IGNvcHkpCkBAIC0xMjEsNDcgKzEyMSw3IEBAIHB1YmxpYzoKICAgICAKICAgICBGb250UmVuZGVy aW5nTW9kZSByZW5kZXJpbmdNb2RlKCkgY29uc3QgeyByZXR1cm4gbV9mb250RGVzY3JpcHRpb24u cmVuZGVyaW5nTW9kZSgpOyB9CiAKLSAgICBUeXBlc2V0dGluZ0ZlYXR1cmVzIHR5cGVzZXR0aW5n RmVhdHVyZXMoKSBjb25zdAotICAgIHsKLSAgICAgICAgVGV4dFJlbmRlcmluZ01vZGUgdGV4dFJl bmRlcmluZ01vZGUgPSBtX2ZvbnREZXNjcmlwdGlvbi50ZXh0UmVuZGVyaW5nTW9kZSgpOwotICAg ICAgICBUeXBlc2V0dGluZ0ZlYXR1cmVzIGZlYXR1cmVzID0gc19kZWZhdWx0VHlwZXNldHRpbmdG ZWF0dXJlczsKLQotICAgICAgICBzd2l0Y2godGV4dFJlbmRlcmluZ01vZGUpIHsKLSAgICAgICAg Y2FzZSBBdXRvVGV4dFJlbmRlcmluZzoKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNl IE9wdGltaXplU3BlZWQ6Ci0gICAgICAgICAgICBmZWF0dXJlcyAmPSB+KEtlcm5pbmcgfCBMaWdh dHVyZXMpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgR2VvbWV0cmljUHJlY2lz aW9uOgotICAgICAgICBjYXNlIE9wdGltaXplTGVnaWJpbGl0eToKLSAgICAgICAgICAgIGZlYXR1 cmVzIHw9IEtlcm5pbmcgfCBMaWdhdHVyZXM7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAg fQotCi0gICAgICAgIHN3aXRjaCAobV9mb250RGVzY3JpcHRpb24ua2VybmluZygpKSB7Ci0gICAg ICAgIGNhc2UgRm9udERlc2NyaXB0aW9uOjpOb25lS2VybmluZzoKLSAgICAgICAgICAgIGZlYXR1 cmVzICY9IH5LZXJuaW5nOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgRm9udERl c2NyaXB0aW9uOjpOb3JtYWxLZXJuaW5nOgotICAgICAgICAgICAgZmVhdHVyZXMgfD0gS2Vybmlu ZzsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIEZvbnREZXNjcmlwdGlvbjo6QXV0 b0tlcm5pbmc6Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgfQotCi0gICAgICAgIHN3aXRj aCAobV9mb250RGVzY3JpcHRpb24uY29tbW9uTGlnYXR1cmVzU3RhdGUoKSkgewotICAgICAgICBj YXNlIEZvbnREZXNjcmlwdGlvbjo6RGlzYWJsZWRMaWdhdHVyZXNTdGF0ZToKLSAgICAgICAgICAg IGZlYXR1cmVzICY9IH5MaWdhdHVyZXM7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgY2Fz ZSBGb250RGVzY3JpcHRpb246OkVuYWJsZWRMaWdhdHVyZXNTdGF0ZToKLSAgICAgICAgICAgIGZl YXR1cmVzIHw9IExpZ2F0dXJlczsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIEZv bnREZXNjcmlwdGlvbjo6Tm9ybWFsTGlnYXR1cmVzU3RhdGU6Ci0gICAgICAgICAgICBicmVhazsK LSAgICAgICAgfQotCi0gICAgICAgIHJldHVybiBmZWF0dXJlczsKLSAgICB9CisgICAgVHlwZXNl dHRpbmdGZWF0dXJlcyB0eXBlc2V0dGluZ0ZlYXR1cmVzKCkgY29uc3QgeyByZXR1cm4gbV90eXBl c2V0dGluZ0ZlYXR1cmVzOyB9CiAKICAgICBGb250RmFtaWx5JiBmaXJzdEZhbWlseSgpIHsgcmV0 dXJuIG1fZm9udERlc2NyaXB0aW9uLmZpcnN0RmFtaWx5KCk7IH0KICAgICBjb25zdCBGb250RmFt aWx5JiBmYW1pbHkoKSBjb25zdCB7IHJldHVybiBtX2ZvbnREZXNjcmlwdGlvbi5mYW1pbHkoKTsg fQpAQCAtMjg3LDYgKzI0Nyw0OCBAQCBwcml2YXRlOgogICAgICAgICByZXR1cm4gbV9mb250RmFs bGJhY2tMaXN0ICYmIG1fZm9udEZhbGxiYWNrTGlzdC0+bG9hZGluZ0N1c3RvbUZvbnRzKCk7CiAg ICAgfQogCisgICAgVHlwZXNldHRpbmdGZWF0dXJlcyBjb21wdXRlVHlwZXNldHRpbmdGZWF0dXJl cygpIGNvbnN0CisgICAgeworICAgICAgICBUZXh0UmVuZGVyaW5nTW9kZSB0ZXh0UmVuZGVyaW5n TW9kZSA9IG1fZm9udERlc2NyaXB0aW9uLnRleHRSZW5kZXJpbmdNb2RlKCk7CisgICAgICAgIFR5 cGVzZXR0aW5nRmVhdHVyZXMgZmVhdHVyZXMgPSBzX2RlZmF1bHRUeXBlc2V0dGluZ0ZlYXR1cmVz OworCisgICAgICAgIHN3aXRjaCAodGV4dFJlbmRlcmluZ01vZGUpIHsKKyAgICAgICAgY2FzZSBB dXRvVGV4dFJlbmRlcmluZzoKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIE9wdGlt aXplU3BlZWQ6CisgICAgICAgICAgICBmZWF0dXJlcyAmPSB+KEtlcm5pbmcgfCBMaWdhdHVyZXMp OworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgR2VvbWV0cmljUHJlY2lzaW9uOgor ICAgICAgICBjYXNlIE9wdGltaXplTGVnaWJpbGl0eToKKyAgICAgICAgICAgIGZlYXR1cmVzIHw9 IEtlcm5pbmcgfCBMaWdhdHVyZXM7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorCisg ICAgICAgIHN3aXRjaCAobV9mb250RGVzY3JpcHRpb24ua2VybmluZygpKSB7CisgICAgICAgIGNh c2UgRm9udERlc2NyaXB0aW9uOjpOb25lS2VybmluZzoKKyAgICAgICAgICAgIGZlYXR1cmVzICY9 IH5LZXJuaW5nOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgRm9udERlc2NyaXB0 aW9uOjpOb3JtYWxLZXJuaW5nOgorICAgICAgICAgICAgZmVhdHVyZXMgfD0gS2VybmluZzsKKyAg ICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIEZvbnREZXNjcmlwdGlvbjo6QXV0b0tlcm5p bmc6CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorCisgICAgICAgIHN3aXRjaCAobV9m b250RGVzY3JpcHRpb24uY29tbW9uTGlnYXR1cmVzU3RhdGUoKSkgeworICAgICAgICBjYXNlIEZv bnREZXNjcmlwdGlvbjo6RGlzYWJsZWRMaWdhdHVyZXNTdGF0ZToKKyAgICAgICAgICAgIGZlYXR1 cmVzICY9IH5MaWdhdHVyZXM7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBGb250 RGVzY3JpcHRpb246OkVuYWJsZWRMaWdhdHVyZXNTdGF0ZToKKyAgICAgICAgICAgIGZlYXR1cmVz IHw9IExpZ2F0dXJlczsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIEZvbnREZXNj cmlwdGlvbjo6Tm9ybWFsTGlnYXR1cmVzU3RhdGU6CisgICAgICAgICAgICBicmVhazsKKyAgICAg ICAgfQorCisgICAgICAgIHJldHVybiBmZWF0dXJlczsKKyAgICB9CisKICNpZiBQTEFURk9STShR VCkKICAgICB2b2lkIGluaXRGb3JtYXRGb3JUZXh0TGF5b3V0KFFUZXh0TGF5b3V0KikgY29uc3Q7 CiAjZW5kaWYKQEAgLTI5OSw2ICszMDEsNyBAQCBwcml2YXRlOgogICAgIHNob3J0IG1fd29yZFNw YWNpbmc7CiAgICAgYm9vbCBtX2lzUGxhdGZvcm1Gb250OwogICAgIGJvb2wgbV9uZWVkc1RyYW5z Y29kaW5nOworICAgIG11dGFibGUgVHlwZXNldHRpbmdGZWF0dXJlcyBtX3R5cGVzZXR0aW5nRmVh dHVyZXM7IC8vIENhY2hlcyB2YWx1ZXMgY29tcHV0ZWQgZnJvbSBtX2ZvbnREZXNjcmlwdGlvbi4K IH07CiAKIGlubGluZSBGb250Ojp+Rm9udCgpCg==