40582 2010-06-14 12:02:04 -0700 Stop using MimeClassInfo::pluginIndex 2010-06-14 14:13:43 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 237967 0 andersca 2010-06-14 12:02:04 -0700 Stop using MimeClassInfo::pluginIndex 237970 1 58681 andersca 2010-06-14 12:06:10 -0700 Created attachment 58681 Patch 238040 2 andersca 2010-06-14 14:13:43 -0700 Committed r61147: <http://trac.webkit.org/changeset/61147> 58681 2010-06-14 12:06:10 -0700 2010-06-14 12:31:52 -0700 Patch bug-40582-20100614120609.patch text/plain 4454 andersca SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MTEzMykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzQgQEAKKzIwMTAtMDYtMTQgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBTdG9wIHVzaW5nIE1pbWVDbGFzc0luZm86OnBsdWdpbkluZGV4CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MDU4MgorCisgICAgICAgIEFkZCBhIHBs dWdpbkluZGljaWVzIHZlY3RvciB0byBQbHVnaW5EYXRhIGFuZCB1c2UgaXQgaW5zdGVhZCBvZiBN aW1lQ2xhc3NJbmZvOjpwbHVnaW5JbmRleC4KKworICAgICAgICAqIHBsdWdpbnMvTWltZVR5cGUu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6TWltZVR5cGU6OmVuYWJsZWRQbHVnaW4pOgorICAgICAg ICBHZXQgdGhlIHBsdWctaW4gaW5kZXggZnJvbSB0aGUgbWltZVBsdWdpbkluZGljZXMgdmVjdG9y LgorICAgICAgICAKKyAgICAgICAgKiBwbHVnaW5zL1BsdWdpbi5jcHA6CisgICAgICAgIChXZWJD b3JlOjpQbHVnaW46Oml0ZW0pOgorICAgICAgICBDb21wYXJlIHRoZSBtaW1lIHBsdWdpbiBpbmRl eCBhcyB3ZWxsLgorICAgICAgICAKKyAgICAgICAgKiBwbHVnaW5zL1BsdWdpbkRhdGEuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UGx1Z2luRGF0YTo6UGx1Z2luRGF0YSk6CisgICAgICAgIFBvcHVs YXRlIHRoZSBtX21pbWVQbHVnaW5JbmRpY2VzIHZlY3Rvci4KKworICAgICAgICAoV2ViQ29yZTo6 UGx1Z2luRGF0YTo6cGx1Z2luTmFtZUZvck1pbWVUeXBlKToKKyAgICAgICAgR2V0IHRoZSBwbHVn LWluIGluZGV4IGZyb20gdGhlIG1fbWltZVBsdWdpbkluZGljZXMgdmVjdG9yLgorCisgICAgICAg ICogcGx1Z2lucy9QbHVnaW5EYXRhLmg6CisgICAgICAgIChXZWJDb3JlOjpvcGVyYXRvcj09KToK KyAgICAgICAgRG9uJ3QgY2hlY2sgZm9yIHBsdWdpbkluZGV4LgorCisgICAgICAgIChXZWJDb3Jl OjpQbHVnaW5EYXRhOjptaW1lUGx1Z2luSW5kaWNlcyk6CisgICAgICAgIEFkZCBnZXR0ZXIgZm9y IG1fbWltZVBsdWdpbkluZGljZXMuCisKIDIwMTAtMDYtMTQgIEppYW4gTGkgIDxqaWFubGlAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIEZpeCBidWlsZCBicmVhayBpbiBHVEsu CkluZGV4OiBXZWJDb3JlL3BsdWdpbnMvTWltZVR5cGUuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvcGx1Z2lucy9NaW1lVHlwZS5jcHAJKHJldmlzaW9uIDYxMTI5KQorKysgV2ViQ29yZS9wbHVn aW5zL01pbWVUeXBlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTksNyArNTksNyBAQCBQYXNzUmVm UHRyPFBsdWdpbj4gTWltZVR5cGU6OmVuYWJsZWRQbHVnCiAgICAgaWYgKCFwIHx8ICFwLT5tYWlu RnJhbWUoKS0+bG9hZGVyKCktPmFsbG93UGx1Z2lucyhOb3RBYm91dFRvSW5zdGFudGlhdGVQbHVn aW4pKQogICAgICAgICByZXR1cm4gMDsKIAotICAgIHJldHVybiBQbHVnaW46OmNyZWF0ZShtX3Bs dWdpbkRhdGEuZ2V0KCksIG1pbWVDbGFzc0luZm8oKS5wbHVnaW5JbmRleCk7CisgICAgcmV0dXJu IFBsdWdpbjo6Y3JlYXRlKG1fcGx1Z2luRGF0YS5nZXQoKSwgbV9wbHVnaW5EYXRhLT5taW1lUGx1 Z2luSW5kaWNlcygpW21faW5kZXhdKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRl eDogV2ViQ29yZS9wbHVnaW5zL1BsdWdpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbHVn aW5zL1BsdWdpbi5jcHAJKHJldmlzaW9uIDYxMTI5KQorKysgV2ViQ29yZS9wbHVnaW5zL1BsdWdp bi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY0LDcgKzY0LDcgQEAgUGFzc1JlZlB0cjxNaW1lVHlw ZT4gUGx1Z2luOjppdGVtKHVuc2lnbgogCiAgICAgY29uc3QgVmVjdG9yPE1pbWVDbGFzc0luZm8+ JiBtaW1lcyA9IG1fcGx1Z2luRGF0YS0+bWltZXMoKTsKICAgICBmb3IgKHVuc2lnbmVkIGkgPSAw OyBpIDwgbWltZXMuc2l6ZSgpOyArK2kpIHsKLSAgICAgICAgaWYgKG1pbWVzW2ldID09IG1pbWUp CisgICAgICAgIGlmIChtaW1lc1tpXSA9PSBtaW1lICYmIG1fcGx1Z2luRGF0YS0+bWltZVBsdWdp bkluZGljZXMoKVtpXSA9PSBtX2luZGV4KQogICAgICAgICAgICAgcmV0dXJuIE1pbWVUeXBlOjpj cmVhdGUobV9wbHVnaW5EYXRhLmdldCgpLCBpKS5nZXQoKTsKICAgICB9CiAgICAgcmV0dXJuIDA7 CkluZGV4OiBXZWJDb3JlL3BsdWdpbnMvUGx1Z2luRGF0YS5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9wbHVnaW5zL1BsdWdpbkRhdGEuY3BwCShyZXZpc2lvbiA2MTEyOSkKKysrIFdlYkNvcmUv cGx1Z2lucy9QbHVnaW5EYXRhLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzMsOCArMzMsMTAgQEAg UGx1Z2luRGF0YTo6UGx1Z2luRGF0YShjb25zdCBQYWdlKiBwYWdlKQogCiAgICAgZm9yICh1bnNp Z25lZCBpID0gMDsgaSA8IG1fcGx1Z2lucy5zaXplKCk7ICsraSkgewogICAgICAgICBjb25zdCBQ bHVnaW5JbmZvJiBwbHVnaW4gPSBtX3BsdWdpbnNbaV07Ci0gICAgICAgIGZvciAodW5zaWduZWQg aiA9IDA7IGogPCBwbHVnaW4ubWltZXMuc2l6ZSgpOyArK2opCisgICAgICAgIGZvciAodW5zaWdu ZWQgaiA9IDA7IGogPCBwbHVnaW4ubWltZXMuc2l6ZSgpOyArK2opIHsKICAgICAgICAgICAgIG1f bWltZXMuYXBwZW5kKHBsdWdpbi5taW1lc1tqXSk7CisgICAgICAgICAgICBtX21pbWVQbHVnaW5J bmRpY2VzLmFwcGVuZChpKTsKKyAgICAgICAgfQogICAgIH0KIH0KIApAQCAtNTIsNyArNTQsNyBA QCBTdHJpbmcgUGx1Z2luRGF0YTo6cGx1Z2luTmFtZUZvck1pbWVUeXBlCiAgICAgICAgIGNvbnN0 IE1pbWVDbGFzc0luZm8mIGluZm8gPSBtX21pbWVzW2ldOwogICAgIAogICAgICAgICBpZiAoaW5m by50eXBlID09IG1pbWVUeXBlKQotICAgICAgICAgICAgcmV0dXJuIG1fcGx1Z2luc1tpbmZvLnBs dWdpbkluZGV4XS5uYW1lOworICAgICAgICAgICAgcmV0dXJuIG1fcGx1Z2luc1ttX21pbWVQbHVn aW5JbmRpY2VzW2ldXS5uYW1lOwogICAgIH0KIAogICAgIHJldHVybiBTdHJpbmcoKTsKSW5kZXg6 IFdlYkNvcmUvcGx1Z2lucy9QbHVnaW5EYXRhLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbHVn aW5zL1BsdWdpbkRhdGEuaAkocmV2aXNpb24gNjExMjkpCisrKyBXZWJDb3JlL3BsdWdpbnMvUGx1 Z2luRGF0YS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zOCw3ICszOCw3IEBAIHN0cnVjdCBNaW1lQ2xh c3NJbmZvIHsKIAogaW5saW5lIGJvb2wgb3BlcmF0b3I9PShjb25zdCBNaW1lQ2xhc3NJbmZvJiBh LCBjb25zdCBNaW1lQ2xhc3NJbmZvJiBiKQogewotICAgIHJldHVybiBhLnR5cGUgPT0gYi50eXBl ICYmIGEuZGVzYyA9PSBiLmRlc2MgJiYgYS5zdWZmaXhlcyA9PSBiLnN1ZmZpeGVzICYmIGEucGx1 Z2luSW5kZXggPT0gYi5wbHVnaW5JbmRleDsKKyAgICByZXR1cm4gYS50eXBlID09IGIudHlwZSAm JiBhLmRlc2MgPT0gYi5kZXNjICYmIGEuc3VmZml4ZXMgPT0gYi5zdWZmaXhlczsKIH0KIAogc3Ry dWN0IFBsdWdpbkluZm8gewpAQCAtNTgsNyArNTgsOCBAQCBwdWJsaWM6CiAKICAgICBjb25zdCBW ZWN0b3I8UGx1Z2luSW5mbz4mIHBsdWdpbnMoKSBjb25zdCB7IHJldHVybiBtX3BsdWdpbnM7IH0K ICAgICBjb25zdCBWZWN0b3I8TWltZUNsYXNzSW5mbz4mIG1pbWVzKCkgY29uc3QgeyByZXR1cm4g bV9taW1lczsgfQotCisgICAgY29uc3QgVmVjdG9yPHNpemVfdD4mIG1pbWVQbHVnaW5JbmRpY2Vz KCkgY29uc3QgeyByZXR1cm4gbV9taW1lUGx1Z2luSW5kaWNlczsgfQorICAgIAogICAgIGJvb2wg c3VwcG9ydHNNaW1lVHlwZShjb25zdCBTdHJpbmcmIG1pbWVUeXBlKSBjb25zdDsKICAgICBTdHJp bmcgcGx1Z2luTmFtZUZvck1pbWVUeXBlKGNvbnN0IFN0cmluZyYgbWltZVR5cGUpIGNvbnN0Owog CkBAIC03MCw2ICs3MSw4IEBAIHByaXZhdGU6CiAKICAgICBWZWN0b3I8UGx1Z2luSW5mbz4gbV9w bHVnaW5zOwogICAgIFZlY3RvcjxNaW1lQ2xhc3NJbmZvPiBtX21pbWVzOworICAgIFZlY3Rvcjxz aXplX3Q+IG1fbWltZVBsdWdpbkluZGljZXM7CisgICAgCiAgICAgY29uc3QgUGFnZSogbV9wYWdl OwogfTsKIAo=