37599 2010-04-14 13:00:00 -0700 Don't cache SimpleFontData* in getLastResortFallbackFont. The cached entry may be invalidated. 2010-04-14 15:16:42 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 sfalken webkit-unassigned oldest_to_newest 212510 0 sfalken 2010-04-14 13:00:00 -0700 Don't cache SimpleFontData* in getLastResortFallbackFont. The cached entry may be invalidated. 212518 1 53357 sfalken 2010-04-14 13:09:15 -0700 Created attachment 53357 Patch 212608 2 sfalken 2010-04-14 15:16:42 -0700 Committed r57613: <http://trac.webkit.org/changeset/57613> 53357 2010-04-14 13:09:15 -0700 2010-04-14 14:39:33 -0700 Patch bug-37599-20100414130913.patch text/plain 5110 sfalken SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NzU5NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTAtMDQtMTQgIFN0ZXZlIEZhbGtlbmJ1cmcgIDxzZmFsa2VuQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBEb24ndCBjYWNoZSBTaW1wbGVGb250RGF0YSogaW4gZ2V0TGFzdFJlc29ydEZhbGxiYWNrRm9u dC4gVGhlIGNhY2hlZCBlbnRyeSBtYXkgYmUgaW52YWxpZGF0ZWQuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzU5OQorCisgICAgICAgIE5vIG5ldyB0 ZXN0cy4gKE9PUFMhKQorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRDYWNo ZVdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpmb250RGF0YUZyb21EZXNjcmlwdGlvbkFuZExv Z0ZvbnQpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpnZXRMYXN0UmVzb3J0RmFsbGJh Y2tGb250KToKKwogMjAxMC0wNC0xNCAgRHVtaXRydSBEYW5pbGl1YyAgPGR1bWlAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEppYW4gTGkuCkluZGV4OiBXZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3dpbi9Gb250Q2FjaGVXaW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRDYWNoZVdpbi5jcHAJKHJldmlzaW9uIDU3NTcwKQor KysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vRm9udENhY2hlV2luLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMzAxLDE3ICszMDEsMjAgQEAgU2ltcGxlRm9udERhdGEqIEZvbnRDYWNoZTo6 Z2V0U2ltaWxhckZvbgogICAgIHJldHVybiAwOwogfQogCi1zdGF0aWMgU2ltcGxlRm9udERhdGEq IGZvbnREYXRhRnJvbURlc2NyaXB0aW9uQW5kTG9nRm9udChGb250Q2FjaGUqIGZvbnRDYWNoZSwg Y29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVzY3JpcHRpb24sIGNvbnN0IExPR0ZPTlQmIGZv bnQpCitzdGF0aWMgU2ltcGxlRm9udERhdGEqIGZvbnREYXRhRnJvbURlc2NyaXB0aW9uQW5kTG9n Rm9udChGb250Q2FjaGUqIGZvbnRDYWNoZSwgY29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVz Y3JpcHRpb24sIGNvbnN0IExPR0ZPTlQmIGZvbnQsIEF0b21pY1N0cmluZyYgb3V0Rm9udEZhbWls eU5hbWUpCiB7Ci0gICAgU3RyaW5nIGZvbnRGYW1pbHkgPSBTdHJpbmcoZm9udC5sZkZhY2VOYW1l LCB3Y3NubGVuKGZvbnQubGZGYWNlTmFtZSwgTEZfRkFDRVNJWkUpKTsKLSAgICByZXR1cm4gZm9u dENhY2hlLT5nZXRDYWNoZWRGb250RGF0YShmb250RGVzY3JpcHRpb24sIGZvbnRGYW1pbHkpOwor ICAgIEF0b21pY1N0cmluZyBmYW1pbHlOYW1lID0gU3RyaW5nKGZvbnQubGZGYWNlTmFtZSwgd2Nz bmxlbihmb250LmxmRmFjZU5hbWUsIExGX0ZBQ0VTSVpFKSk7CisgICAgU2ltcGxlRm9udERhdGEq IGZvbnREYXRhID0gZm9udENhY2hlLT5nZXRDYWNoZWRGb250RGF0YShmb250RGVzY3JpcHRpb24s IGZhbWlseU5hbWUpOworICAgIGlmIChmb250RGF0YSkKKyAgICAgICAgb3V0Rm9udEZhbWlseU5h bWUgPSBmYW1pbHlOYW1lOworICAgIHJldHVybiBmb250RGF0YTsKIH0KIAogU2ltcGxlRm9udERh dGEqIEZvbnRDYWNoZTo6Z2V0TGFzdFJlc29ydEZhbGxiYWNrRm9udChjb25zdCBGb250RGVzY3Jp cHRpb24mIGZvbnREZXNjcmlwdGlvbikKIHsKLSAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFNpbXBs ZUZvbnREYXRhKiwgc2ltcGxlRm9udCwgKCkpOwotICAgIGlmIChzaW1wbGVGb250KQotICAgICAg ICByZXR1cm4gc2ltcGxlRm9udDsKKyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKEF0b21pY1N0cmlu ZywgZmFsbGJhY2tGb250TmFtZSwgKCkpOworICAgIGlmICghZmFsbGJhY2tGb250TmFtZS5pc0Vt cHR5KCkpCisgICAgICAgIHJldHVybiBnZXRDYWNoZWRGb250RGF0YShmb250RGVzY3JpcHRpb24s IGZhbGxiYWNrRm9udE5hbWUpOwogCiAgICAgLy8gRklYTUU6IFdvdWxkIGJlIGV2ZW4gYmV0dGVy IHRvIHNvbWVob3cgZ2V0IHRoZSB1c2VyJ3MgZGVmYXVsdCBmb250IGhlcmUuICBGb3Igbm93IHdl J2xsIHBpY2sKICAgICAvLyB0aGUgZGVmYXVsdCB0aGF0IHRoZSB1c2VyIHdvdWxkIGdldCB3aXRo b3V0IGNoYW5naW5nIGFueSBwcmVmcy4KQEAgLTMyNiwxNiArMzI5LDE5IEBAIFNpbXBsZUZvbnRE YXRhKiBGb250Q2FjaGU6OmdldExhc3RSZXNvcnQKICAgICAgICAgQXRvbWljU3RyaW5nKCJMdWNp ZGEgU2FucyBVbmljb2RlIiksCiAgICAgICAgIEF0b21pY1N0cmluZygiQXJpYWwiKQogICAgIH07 CisgICAgU2ltcGxlRm9udERhdGEqIHNpbXBsZUZvbnQ7CiAgICAgZm9yIChpbnQgaSA9IDA7IGkg PCBBUlJBWVNJWkUoZmFsbGJhY2tGb250cyk7ICsraSkgewotICAgICAgICBpZiAoc2ltcGxlRm9u dCA9IGdldENhY2hlZEZvbnREYXRhKGZvbnREZXNjcmlwdGlvbiwgZmFsbGJhY2tGb250c1tpXSkp CisgICAgICAgIGlmIChzaW1wbGVGb250ID0gZ2V0Q2FjaGVkRm9udERhdGEoZm9udERlc2NyaXB0 aW9uLCBmYWxsYmFja0ZvbnRzW2ldKSkgeworICAgICAgICAgICAgZmFsbGJhY2tGb250TmFtZSA9 IGZhbGxiYWNrRm9udHNbaV07CiAgICAgICAgICAgICByZXR1cm4gc2ltcGxlRm9udDsKKyAgICAg ICAgfQogICAgIH0KIAogICAgIC8vIEZhbGwgYmFjayB0byB0aGUgREVGQVVMVF9HVUlfRk9OVCBp ZiBubyBrbm93biBVbmljb2RlIGZvbnRzIGFyZSBhdmFpbGFibGUuCiAgICAgaWYgKEhGT05UIGRl ZmF1bHRHVUlGb250ID0gc3RhdGljX2Nhc3Q8SEZPTlQ+KEdldFN0b2NrT2JqZWN0KERFRkFVTFRf R1VJX0ZPTlQpKSkgewogICAgICAgICBMT0dGT05UIGRlZmF1bHRHVUlMb2dGb250OwogICAgICAg ICBHZXRPYmplY3QoZGVmYXVsdEdVSUZvbnQsIHNpemVvZihkZWZhdWx0R1VJTG9nRm9udCksICZk ZWZhdWx0R1VJTG9nRm9udCk7Ci0gICAgICAgIGlmIChzaW1wbGVGb250ID0gZm9udERhdGFGcm9t RGVzY3JpcHRpb25BbmRMb2dGb250KHRoaXMsIGZvbnREZXNjcmlwdGlvbiwgZGVmYXVsdEdVSUxv Z0ZvbnQpKQorICAgICAgICBpZiAoc2ltcGxlRm9udCA9IGZvbnREYXRhRnJvbURlc2NyaXB0aW9u QW5kTG9nRm9udCh0aGlzLCBmb250RGVzY3JpcHRpb24sIGRlZmF1bHRHVUlMb2dGb250LCBmYWxs YmFja0ZvbnROYW1lKSkKICAgICAgICAgICAgIHJldHVybiBzaW1wbGVGb250OwogICAgIH0KIApA QCAtMzQzLDE1ICszNDksMTUgQEAgU2ltcGxlRm9udERhdGEqIEZvbnRDYWNoZTo6Z2V0TGFzdFJl c29ydAogICAgIE5PTkNMSUVOVE1FVFJJQ1Mgbm9uQ2xpZW50TWV0cmljcyA9IHswfTsKICAgICBu b25DbGllbnRNZXRyaWNzLmNiU2l6ZSA9IHNpemVvZihub25DbGllbnRNZXRyaWNzKTsKICAgICBp ZiAoU3lzdGVtUGFyYW1ldGVyc0luZm8oU1BJX0dFVE5PTkNMSUVOVE1FVFJJQ1MsIHNpemVvZihu b25DbGllbnRNZXRyaWNzKSwgJm5vbkNsaWVudE1ldHJpY3MsIDApKSB7Ci0gICAgICAgIGlmIChz aW1wbGVGb250ID0gZm9udERhdGFGcm9tRGVzY3JpcHRpb25BbmRMb2dGb250KHRoaXMsIGZvbnRE ZXNjcmlwdGlvbiwgbm9uQ2xpZW50TWV0cmljcy5sZk1lc3NhZ2VGb250KSkKKyAgICAgICAgaWYg KHNpbXBsZUZvbnQgPSBmb250RGF0YUZyb21EZXNjcmlwdGlvbkFuZExvZ0ZvbnQodGhpcywgZm9u dERlc2NyaXB0aW9uLCBub25DbGllbnRNZXRyaWNzLmxmTWVzc2FnZUZvbnQsIGZhbGxiYWNrRm9u dE5hbWUpKQogICAgICAgICAgICAgcmV0dXJuIHNpbXBsZUZvbnQ7Ci0gICAgICAgIGlmIChzaW1w bGVGb250ID0gZm9udERhdGFGcm9tRGVzY3JpcHRpb25BbmRMb2dGb250KHRoaXMsIGZvbnREZXNj cmlwdGlvbiwgbm9uQ2xpZW50TWV0cmljcy5sZk1lbnVGb250KSkKKyAgICAgICAgaWYgKHNpbXBs ZUZvbnQgPSBmb250RGF0YUZyb21EZXNjcmlwdGlvbkFuZExvZ0ZvbnQodGhpcywgZm9udERlc2Ny aXB0aW9uLCBub25DbGllbnRNZXRyaWNzLmxmTWVudUZvbnQsIGZhbGxiYWNrRm9udE5hbWUpKQog ICAgICAgICAgICAgcmV0dXJuIHNpbXBsZUZvbnQ7Ci0gICAgICAgIGlmIChzaW1wbGVGb250ID0g Zm9udERhdGFGcm9tRGVzY3JpcHRpb25BbmRMb2dGb250KHRoaXMsIGZvbnREZXNjcmlwdGlvbiwg bm9uQ2xpZW50TWV0cmljcy5sZlN0YXR1c0ZvbnQpKQorICAgICAgICBpZiAoc2ltcGxlRm9udCA9 IGZvbnREYXRhRnJvbURlc2NyaXB0aW9uQW5kTG9nRm9udCh0aGlzLCBmb250RGVzY3JpcHRpb24s IG5vbkNsaWVudE1ldHJpY3MubGZTdGF0dXNGb250LCBmYWxsYmFja0ZvbnROYW1lKSkKICAgICAg ICAgICAgIHJldHVybiBzaW1wbGVGb250OwotICAgICAgICBpZiAoc2ltcGxlRm9udCA9IGZvbnRE YXRhRnJvbURlc2NyaXB0aW9uQW5kTG9nRm9udCh0aGlzLCBmb250RGVzY3JpcHRpb24sIG5vbkNs aWVudE1ldHJpY3MubGZDYXB0aW9uRm9udCkpCisgICAgICAgIGlmIChzaW1wbGVGb250ID0gZm9u dERhdGFGcm9tRGVzY3JpcHRpb25BbmRMb2dGb250KHRoaXMsIGZvbnREZXNjcmlwdGlvbiwgbm9u Q2xpZW50TWV0cmljcy5sZkNhcHRpb25Gb250LCBmYWxsYmFja0ZvbnROYW1lKSkKICAgICAgICAg ICAgIHJldHVybiBzaW1wbGVGb250OwotICAgICAgICBpZiAoc2ltcGxlRm9udCA9IGZvbnREYXRh RnJvbURlc2NyaXB0aW9uQW5kTG9nRm9udCh0aGlzLCBmb250RGVzY3JpcHRpb24sIG5vbkNsaWVu dE1ldHJpY3MubGZTbUNhcHRpb25Gb250KSkKKyAgICAgICAgaWYgKHNpbXBsZUZvbnQgPSBmb250 RGF0YUZyb21EZXNjcmlwdGlvbkFuZExvZ0ZvbnQodGhpcywgZm9udERlc2NyaXB0aW9uLCBub25D bGllbnRNZXRyaWNzLmxmU21DYXB0aW9uRm9udCwgZmFsbGJhY2tGb250TmFtZSkpCiAgICAgICAg ICAgICByZXR1cm4gc2ltcGxlRm9udDsKICAgICB9CiAgICAgCg==