147392 2015-07-28 17:27:19 -0700 Minor cleanups in FontCacheFreeType.cpp 2015-07-28 17:58:27 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Minor --- 1 mcatanzaro mcatanzaro mcatanzaro mrobinson oldest_to_newest 1112964 0 mcatanzaro 2015-07-28 17:27:19 -0700 Mark several functions as static (file-scope), use more nullptr, and use more smart pointers. 1112975 1 257714 mcatanzaro 2015-07-28 17:46:41 -0700 Created attachment 257714 Patch 1112980 2 mcatanzaro 2015-07-28 17:58:27 -0700 Committed r187532: <http://trac.webkit.org/changeset/187532> 257714 2015-07-28 17:46:41 -0700 2015-07-28 17:49:00 -0700 Patch bug-147392-20150728194519.patch text/plain 7558 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3NTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzk3N2EyNWE0OWRhZGQx YmI3ODBkNjBmZWM2NTY3YTM4YzMyMGEwYi4uN2JlMGI4ZWU4YzdlMWUyYmRlMjE3YjU4MzFkNDY3 NDliNGIwZWJjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACisyMDE1LTA3LTI4ICBNaWNo YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KKworICAgICAgICBNaW5vciBj bGVhbnVwcyBpbiBGb250Q2FjaGVGcmVlVHlwZS5jcHAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NzM5MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIE1hcmsgc2V2ZXJhbCBmdW5jdGlvbnMgYXMgc3RhdGlj IChmaWxlLXNjb3BlKSwgdXNlIG1vcmUgbnVsbHB0ciwgYW5kIHVzZSBtb3JlIHNtYXJ0CisgICAg ICAgIHBvaW50ZXJzLiBObyBiZWhhdmlvciBjaGFuZ2VzLgorCisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvZnJlZXR5cGUvRmNVbmlxdWVQdHIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkZjUHRy RGVsZXRlcjxGY0NoYXJTZXQ+OjpvcGVyYXRvcigpKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9mcmVldHlwZS9Gb250Q2FjaGVGcmVlVHlwZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpj cmVhdGVGb250Q29uZmlnUGF0dGVybkZvckNoYXJhY3RlcnMpOgorICAgICAgICAoV2ViQ29yZTo6 ZmluZEJlc3RGb250R2l2ZW5GYWxsYmFja3MpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hl OjpzeXN0ZW1GYWxsYmFja0ZvckNoYXJhY3RlcnMpOgorICAgICAgICAoV2ViQ29yZTo6Zm9udFdl aWdodFRvRm9udGNvbmZpZ1dlaWdodCk6CisgICAgICAgIChXZWJDb3JlOjpGb250Q2FjaGU6OmNy ZWF0ZUZvbnRQbGF0Zm9ybURhdGEpOgorCiAyMDE1LTA3LTI4ICBNaWNoYWVsIENhdGFuemFybyAg PG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KIAogICAgICAgICBbRnJlZXR5cGVdIEFsd2F5cyBhbGxv dyBmb250IG1hdGNoaW5nIGZvciBzdHJvbmcgYWxpYXNlcwogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3MDU3CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0ZjVW5pcXVlUHRyLmggYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9GY1VuaXF1ZVB0ci5oCmluZGV4IDcy ZjljM2U4ZGE3MGVlYThjMDNkNjVkNDMwYWMwYzA4ZWZmM2UyNzEuLjE0NTBmYmRhOWZmNWNjZDBl YzY3YTdmNGRmNzkzMjIyNzdkZWJiZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0ZjVW5pcXVlUHRyLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvRmNVbmlxdWVQdHIuaApAQCAtNDEsNiArNDEsMTMg QEAgc3RydWN0IEZjUHRyRGVsZXRlciB7CiB0ZW1wbGF0ZTx0eXBlbmFtZSBUPgogdXNpbmcgRmNV bmlxdWVQdHIgPSBzdGQ6OnVuaXF1ZV9wdHI8VCwgRmNQdHJEZWxldGVyPFQ+PjsKIAordGVtcGxh dGU8PiBzdHJ1Y3QgRmNQdHJEZWxldGVyPEZjQ2hhclNldD4geworICAgIHZvaWQgb3BlcmF0b3Io KShGY0NoYXJTZXQqIHB0cikgY29uc3QKKyAgICB7CisgICAgICAgIEZjQ2hhclNldERlc3Ryb3ko cHRyKTsKKyAgICB9Cit9OworCiB0ZW1wbGF0ZTw+IHN0cnVjdCBGY1B0ckRlbGV0ZXI8RmNGb250 U2V0PiB7CiAgICAgdm9pZCBvcGVyYXRvcigpKEZjRm9udFNldCogcHRyKSBjb25zdAogICAgIHsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0Zv bnRDYWNoZUZyZWVUeXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Zy ZWV0eXBlL0ZvbnRDYWNoZUZyZWVUeXBlLmNwcAppbmRleCBjNWNlMGY0MDYzNDYyNzBhMTY3NmE5 ZWFmYmExNWFmZTE4MDBlNTg5Li43NmI2M2RiNWNmNmFmNjRkYTM5ODg5ZjdmOGJmZjczODVhZDFh MzdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlw ZS9Gb250Q2FjaGVGcmVlVHlwZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZnJlZXR5cGUvRm9udENhY2hlRnJlZVR5cGUuY3BwCkBAIC00MSw2MCArNDEsNTkgQEAg dm9pZCBGb250Q2FjaGU6OnBsYXRmb3JtSW5pdCgpCiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hF RCgpOwogfQogCi1GY1BhdHRlcm4qIGNyZWF0ZUZvbnRDb25maWdQYXR0ZXJuRm9yQ2hhcmFjdGVy cyhjb25zdCBVQ2hhciogY2hhcmFjdGVycywgaW50IGJ1ZmZlckxlbmd0aCkKK3N0YXRpYyBSZWZQ dHI8RmNQYXR0ZXJuPiBjcmVhdGVGb250Q29uZmlnUGF0dGVybkZvckNoYXJhY3RlcnMoY29uc3Qg VUNoYXIqIGNoYXJhY3RlcnMsIGludCBidWZmZXJMZW5ndGgpCiB7Ci0gICAgRmNQYXR0ZXJuKiBw YXR0ZXJuID0gRmNQYXR0ZXJuQ3JlYXRlKCk7Ci0gICAgRmNDaGFyU2V0KiBmb250Q29uZmlnQ2hh clNldCA9IEZjQ2hhclNldENyZWF0ZSgpOworICAgIFJlZlB0cjxGY1BhdHRlcm4+IHBhdHRlcm4g PSBhZG9wdFJlZihGY1BhdHRlcm5DcmVhdGUoKSk7CisgICAgRmNVbmlxdWVQdHI8RmNDaGFyU2V0 PiBmb250Q29uZmlnQ2hhclNldChGY0NoYXJTZXRDcmVhdGUoKSk7CiAKICAgICBVVEYxNlVDaGFy MzJJdGVyYXRvciBpdGVyYXRvcihjaGFyYWN0ZXJzLCBidWZmZXJMZW5ndGgpOwogICAgIFVDaGFy MzIgY2hhcmFjdGVyID0gaXRlcmF0b3IubmV4dCgpOwogICAgIHdoaWxlIChjaGFyYWN0ZXIgIT0g aXRlcmF0b3IuZW5kKCkpIHsKLSAgICAgICAgRmNDaGFyU2V0QWRkQ2hhcihmb250Q29uZmlnQ2hh clNldCwgY2hhcmFjdGVyKTsKKyAgICAgICAgRmNDaGFyU2V0QWRkQ2hhcihmb250Q29uZmlnQ2hh clNldC5nZXQoKSwgY2hhcmFjdGVyKTsKICAgICAgICAgY2hhcmFjdGVyID0gaXRlcmF0b3IubmV4 dCgpOwogICAgIH0KIAotICAgIEZjUGF0dGVybkFkZENoYXJTZXQocGF0dGVybiwgRkNfQ0hBUlNF VCwgZm9udENvbmZpZ0NoYXJTZXQpOwotICAgIEZjQ2hhclNldERlc3Ryb3koZm9udENvbmZpZ0No YXJTZXQpOworICAgIEZjUGF0dGVybkFkZENoYXJTZXQocGF0dGVybi5nZXQoKSwgRkNfQ0hBUlNF VCwgZm9udENvbmZpZ0NoYXJTZXQuZ2V0KCkpOwogCi0gICAgRmNQYXR0ZXJuQWRkQm9vbChwYXR0 ZXJuLCBGQ19TQ0FMQUJMRSwgRmNUcnVlKTsKLSAgICBGY0NvbmZpZ1N1YnN0aXR1dGUoMCwgcGF0 dGVybiwgRmNNYXRjaFBhdHRlcm4pOwotICAgIEZjRGVmYXVsdFN1YnN0aXR1dGUocGF0dGVybik7 CisgICAgRmNQYXR0ZXJuQWRkQm9vbChwYXR0ZXJuLmdldCgpLCBGQ19TQ0FMQUJMRSwgRmNUcnVl KTsKKyAgICBGY0NvbmZpZ1N1YnN0aXR1dGUobnVsbHB0ciwgcGF0dGVybi5nZXQoKSwgRmNNYXRj aFBhdHRlcm4pOworICAgIEZjRGVmYXVsdFN1YnN0aXR1dGUocGF0dGVybi5nZXQoKSk7CiAgICAg cmV0dXJuIHBhdHRlcm47CiB9CiAKLUZjUGF0dGVybiogZmluZEJlc3RGb250R2l2ZW5GYWxsYmFj a3MoY29uc3QgRm9udFBsYXRmb3JtRGF0YSYgZm9udERhdGEsIEZjUGF0dGVybiogcGF0dGVybikK K3N0YXRpYyBSZWZQdHI8RmNQYXR0ZXJuPiBmaW5kQmVzdEZvbnRHaXZlbkZhbGxiYWNrcyhjb25z dCBGb250UGxhdGZvcm1EYXRhJiBmb250RGF0YSwgRmNQYXR0ZXJuKiBwYXR0ZXJuKQogewogICAg IGlmICghZm9udERhdGEubV9wYXR0ZXJuKQotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0 dXJuIG51bGxwdHI7CiAKICAgICBpZiAoIWZvbnREYXRhLm1fZmFsbGJhY2tzKSB7CiAgICAgICAg IEZjUmVzdWx0IGZvbnRDb25maWdSZXN1bHQ7Ci0gICAgICAgIGZvbnREYXRhLm1fZmFsbGJhY2tz ID0gRmNGb250U29ydCgwLCBmb250RGF0YS5tX3BhdHRlcm4uZ2V0KCksIEZjVHJ1ZSwgMCwgJmZv bnRDb25maWdSZXN1bHQpOworICAgICAgICBmb250RGF0YS5tX2ZhbGxiYWNrcyA9IEZjRm9udFNv cnQobnVsbHB0ciwgZm9udERhdGEubV9wYXR0ZXJuLmdldCgpLCBGY1RydWUsIG51bGxwdHIsICZm b250Q29uZmlnUmVzdWx0KTsKICAgICB9CiAKICAgICBpZiAoIWZvbnREYXRhLm1fZmFsbGJhY2tz KQotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKICAgICBGY0Zv bnRTZXQqIHNldHNbXSA9IHsgZm9udERhdGEubV9mYWxsYmFja3MgfTsKICAgICBGY1Jlc3VsdCBm b250Q29uZmlnUmVzdWx0OwotICAgIHJldHVybiBGY0ZvbnRTZXRNYXRjaCgwLCBzZXRzLCAxLCBw YXR0ZXJuLCAmZm9udENvbmZpZ1Jlc3VsdCk7CisgICAgcmV0dXJuIEZjRm9udFNldE1hdGNoKG51 bGxwdHIsIHNldHMsIDEsIHBhdHRlcm4sICZmb250Q29uZmlnUmVzdWx0KTsKIH0KIAogUmVmUHRy PEZvbnQ+IEZvbnRDYWNoZTo6c3lzdGVtRmFsbGJhY2tGb3JDaGFyYWN0ZXJzKGNvbnN0IEZvbnRE ZXNjcmlwdGlvbiYgZGVzY3JpcHRpb24sIGNvbnN0IEZvbnQqIG9yaWdpbmFsRm9udERhdGEsIGJv b2wsIGNvbnN0IFVDaGFyKiBjaGFyYWN0ZXJzLCB1bnNpZ25lZCBsZW5ndGgpCiB7Ci0gICAgUmVm UHRyPEZjUGF0dGVybj4gcGF0dGVybiA9IGFkb3B0UmVmKGNyZWF0ZUZvbnRDb25maWdQYXR0ZXJu Rm9yQ2hhcmFjdGVycyhjaGFyYWN0ZXJzLCBsZW5ndGgpKTsKKyAgICBSZWZQdHI8RmNQYXR0ZXJu PiBwYXR0ZXJuID0gY3JlYXRlRm9udENvbmZpZ1BhdHRlcm5Gb3JDaGFyYWN0ZXJzKGNoYXJhY3Rl cnMsIGxlbmd0aCk7CiAgICAgY29uc3QgRm9udFBsYXRmb3JtRGF0YSYgZm9udERhdGEgPSBvcmln aW5hbEZvbnREYXRhLT5wbGF0Zm9ybURhdGEoKTsKIAotICAgIFJlZlB0cjxGY1BhdHRlcm4+IGZh bGxiYWNrUGF0dGVybiA9IGFkb3B0UmVmKGZpbmRCZXN0Rm9udEdpdmVuRmFsbGJhY2tzKGZvbnRE YXRhLCBwYXR0ZXJuLmdldCgpKSk7CisgICAgUmVmUHRyPEZjUGF0dGVybj4gZmFsbGJhY2tQYXR0 ZXJuID0gZmluZEJlc3RGb250R2l2ZW5GYWxsYmFja3MoZm9udERhdGEsIHBhdHRlcm4uZ2V0KCkp OwogICAgIGlmIChmYWxsYmFja1BhdHRlcm4pIHsKICAgICAgICAgRm9udFBsYXRmb3JtRGF0YSBh bHRlcm5hdGVGb250RGF0YShmYWxsYmFja1BhdHRlcm4uZ2V0KCksIGRlc2NyaXB0aW9uKTsKICAg ICAgICAgcmV0dXJuIGZvbnRGb3JQbGF0Zm9ybURhdGEoYWx0ZXJuYXRlRm9udERhdGEpOwogICAg IH0KIAogICAgIEZjUmVzdWx0IGZvbnRDb25maWdSZXN1bHQ7Ci0gICAgUmVmUHRyPEZjUGF0dGVy bj4gcmVzdWx0UGF0dGVybiA9IGFkb3B0UmVmKEZjRm9udE1hdGNoKDAsIHBhdHRlcm4uZ2V0KCks ICZmb250Q29uZmlnUmVzdWx0KSk7CisgICAgUmVmUHRyPEZjUGF0dGVybj4gcmVzdWx0UGF0dGVy biA9IGFkb3B0UmVmKEZjRm9udE1hdGNoKG51bGxwdHIsIHBhdHRlcm4uZ2V0KCksICZmb250Q29u ZmlnUmVzdWx0KSk7CiAgICAgaWYgKCFyZXN1bHRQYXR0ZXJuKQotICAgICAgICByZXR1cm4gMDsK KyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgRm9udFBsYXRmb3JtRGF0YSBhbHRlcm5hdGVG b250RGF0YShyZXN1bHRQYXR0ZXJuLmdldCgpLCBkZXNjcmlwdGlvbik7CiAgICAgcmV0dXJuIGZv bnRGb3JQbGF0Zm9ybURhdGEoYWx0ZXJuYXRlRm9udERhdGEpOwogfQpAQCAtMTM4LDcgKzEzNyw3 IEBAIHN0YXRpYyBTdHJpbmcgZ2V0RmFtaWx5TmFtZVN0cmluZ0Zyb21GYW1pbHkoY29uc3QgQXRv bWljU3RyaW5nJiBmYW1pbHkpCiAgICAgcmV0dXJuICIiOwogfQogCi1pbnQgZm9udFdlaWdodFRv Rm9udGNvbmZpZ1dlaWdodChGb250V2VpZ2h0IHdlaWdodCkKK3N0YXRpYyBpbnQgZm9udFdlaWdo dFRvRm9udGNvbmZpZ1dlaWdodChGb250V2VpZ2h0IHdlaWdodCkKIHsKICAgICBzd2l0Y2ggKHdl aWdodCkgewogICAgIGNhc2UgRm9udFdlaWdodDEwMDoKQEAgLTI5OSw3ICsyOTgsNiBAQCBzdGF0 aWMgYm9vbCBhcmVTdHJvbmdseUFsaWFzZWQoY29uc3QgU3RyaW5nJiBmYW1pbHlBLCBjb25zdCBT dHJpbmcmIGZhbWlseUIpCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi0KIHN0ZDo6dW5pcXVlX3B0 cjxGb250UGxhdGZvcm1EYXRhPiBGb250Q2FjaGU6OmNyZWF0ZUZvbnRQbGF0Zm9ybURhdGEoY29u c3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVzY3JpcHRpb24sIGNvbnN0IEF0b21pY1N0cmluZyYg ZmFtaWx5KQogewogICAgIC8vIFRoZSBDU1MgZm9udCBtYXRjaGluZyBhbGdvcml0aG0gKGh0dHA6 Ly93d3cudzMub3JnL1RSL2NzczMtZm9udHMvI2ZvbnQtbWF0Y2hpbmctYWxnb3JpdGhtKQpAQCAt MzMyLDcgKzMzMCw3IEBAIHN0ZDo6dW5pcXVlX3B0cjxGb250UGxhdGZvcm1EYXRhPiBGb250Q2Fj aGU6OmNyZWF0ZUZvbnRQbGF0Zm9ybURhdGEoY29uc3QgRm9udERlCiAgICAgLy8gRm9udGNvbmZp ZyBpcyB1c2VkIGluIHR3byBzdGFnZXM6ICgxKSBjb25maWd1cmF0aW9uIGFuZCAoMikgbWF0Y2hp bmcuIER1cmluZyB0aGUKICAgICAvLyBjb25maWd1cmF0aW9uIHN0ZXAsIGJlZm9yZSBhbnkgbWF0 Y2hpbmcgb2NjdXJzLCB3ZSBhbGxvdyBhcmJpdHJhcnkgZmFtaWx5IHN1YnN0aXR1dGlvbnMsCiAg ICAgLy8gc2luY2UgdGhpcyBpcyBhbiBleGFjdCBtYXR0ZXIgb2YgcmVzcGVjdGluZyB0aGUgdXNl cidzIGZvbnQgY29uZmlndXJhdGlvbi4KLSAgICBGY0NvbmZpZ1N1YnN0aXR1dGUoMCwgcGF0dGVy bi5nZXQoKSwgRmNNYXRjaFBhdHRlcm4pOworICAgIEZjQ29uZmlnU3Vic3RpdHV0ZShudWxscHRy LCBwYXR0ZXJuLmdldCgpLCBGY01hdGNoUGF0dGVybik7CiAgICAgRmNEZWZhdWx0U3Vic3RpdHV0 ZShwYXR0ZXJuLmdldCgpKTsKIAogICAgIEZjQ2hhcjgqIGZvbnRDb25maWdGYW1pbHlOYW1lQWZ0 ZXJDb25maWd1cmF0aW9uOwpAQCAtMzQwLDcgKzMzOCw3IEBAIHN0ZDo6dW5pcXVlX3B0cjxGb250 UGxhdGZvcm1EYXRhPiBGb250Q2FjaGU6OmNyZWF0ZUZvbnRQbGF0Zm9ybURhdGEoY29uc3QgRm9u dERlCiAgICAgU3RyaW5nIGZhbWlseU5hbWVBZnRlckNvbmZpZ3VyYXRpb24gPSBTdHJpbmc6OmZy b21VVEY4KHJlaW50ZXJwcmV0X2Nhc3Q8Y2hhcio+KGZvbnRDb25maWdGYW1pbHlOYW1lQWZ0ZXJD b25maWd1cmF0aW9uKSk7CiAKICAgICBGY1Jlc3VsdCBmb250Q29uZmlnUmVzdWx0OwotICAgIFJl ZlB0cjxGY1BhdHRlcm4+IHJlc3VsdFBhdHRlcm4gPSBhZG9wdFJlZihGY0ZvbnRNYXRjaCgwLCBw YXR0ZXJuLmdldCgpLCAmZm9udENvbmZpZ1Jlc3VsdCkpOworICAgIFJlZlB0cjxGY1BhdHRlcm4+ IHJlc3VsdFBhdHRlcm4gPSBhZG9wdFJlZihGY0ZvbnRNYXRjaChudWxscHRyLCBwYXR0ZXJuLmdl dCgpLCAmZm9udENvbmZpZ1Jlc3VsdCkpOwogICAgIGlmICghcmVzdWx0UGF0dGVybikgLy8gTm8g bWF0Y2guCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCg==