136215 2014-08-25 03:16:17 -0700 [GTK] Older versions of WebKit should use the plugins cache in read only mode 2014-08-25 05:49:59 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned gustavo pnormand svillar oldest_to_newest 1031086 0 cgarcia 2014-08-25 03:16:17 -0700 Now that WebKitGTK+ 2.4 and 2.5 are parallel installable, since they use different versions of the plugins cache, apps using 2.4 might override the plugins cache file. We should prevent this from happening by making older versions use the plugin cache, but not downgrade it. 1031087 1 237072 cgarcia 2014-08-25 03:21:01 -0700 Created attachment 237072 Patch 1031122 2 cgarcia 2014-08-25 05:49:59 -0700 Committed r172920: <http://trac.webkit.org/changeset/172920> 237072 2014-08-25 03:21:01 -0700 2014-08-25 03:24:41 -0700 Patch wk2-plugins-cache-old.diff text/plain 3762 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmOTExMGZlLi4zOGEwMjg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjMg QEAKIDIwMTQtMDgtMjUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtHVEtdIE9sZGVyIHZlcnNpb25zIG9mIFdlYktpdCBzaG91bGQgdXNlIHRo ZSBwbHVnaW5zIGNhY2hlIGluIHJlYWQgb25seSBtb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzYyMTUKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOb3cgdGhhdCBXZWJLaXRHVEsrIDIuNCBhbmQgMi41 IGFyZSBwYXJhbGxlbCBpbnN0YWxsYWJsZSwgc2luY2UKKyAgICAgICAgdGhleSB1c2UgZGlmZmVy ZW50IHZlcnNpb25zIG9mIHRoZSBwbHVnaW5zIGNhY2hlLCBhcHBzIHVzaW5nIDIuNAorICAgICAg ICBtaWdodCBvdmVycmlkZSB0aGUgcGx1Z2lucyBjYWNoZSBmaWxlLiBXZSBzaG91bGQgcHJldmVu dCB0aGlzIGZyb20KKyAgICAgICAgaGFwcGVuaW5nIGJ5IG1ha2luZyBvbGRlciB2ZXJzaW9ucyB1 c2UgdGhlIHBsdWdpbiBjYWNoZSwgYnV0IG5vdAorICAgICAgICBkb3duZ3JhZGUgaXQuCisKKyAg ICAgICAgKiBVSVByb2Nlc3MvUGx1Z2lucy9ndGsvUGx1Z2luSW5mb0NhY2hlLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6UGx1Z2luSW5mb0NhY2hlOjpQbHVnaW5JbmZvQ2FjaGUpOgorICAgICAgICAo V2ViS2l0OjpQbHVnaW5JbmZvQ2FjaGU6OnVwZGF0ZVBsdWdpbkluZm8pOgorICAgICAgICAqIFVJ UHJvY2Vzcy9QbHVnaW5zL2d0ay9QbHVnaW5JbmZvQ2FjaGUuaDoKKworMjAxNC0wOC0yNSAgQ2Fy bG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKICAgICAgICAgW0dUS10g U2hvdWxkIGNoZWNrIGlmIGEgcGx1Z2luIG1peGVzIEdUSysgc3ltYm9scyBlYXJsaWVyCiAgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzYyMTQKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvZ3RrL1BsdWdpbkluZm9D YWNoZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9ndGsvUGx1Z2luSW5m b0NhY2hlLmNwcAppbmRleCBjZDlkYzI3Li5jNmU0NjUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9ndGsvUGx1Z2luSW5mb0NhY2hlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9ndGsvUGx1Z2luSW5mb0NhY2hlLmNwcApAQCAt NDUsNiArNDUsNyBAQCBQbHVnaW5JbmZvQ2FjaGUmIFBsdWdpbkluZm9DYWNoZTo6c2hhcmVkKCkK IFBsdWdpbkluZm9DYWNoZTo6UGx1Z2luSW5mb0NhY2hlKCkKICAgICA6IG1fY2FjaGVGaWxlKGdf a2V5X2ZpbGVfbmV3KCkpCiAgICAgLCBtX3NhdmVUb0ZpbGVJZGxlSWQoMCkKKyAgICAsIG1fcmVh ZE9ubHlNb2RlKGZhbHNlKQogewogICAgIEdVbmlxdWVQdHI8Y2hhcj4gY2FjaGVEaXJlY3Rvcnko Z19idWlsZF9maWxlbmFtZShnX2dldF91c2VyX2NhY2hlX2RpcigpLCAid2Via2l0Z3RrIiwgbnVs bHB0cikpOwogICAgIGlmIChXZWJDb3JlOjptYWtlQWxsRGlyZWN0b3JpZXMoY2FjaGVEaXJlY3Rv cnkuZ2V0KCkpKSB7CkBAIC01NCwxMSArNTUsMTYgQEAgUGx1Z2luSW5mb0NhY2hlOjpQbHVnaW5J bmZvQ2FjaGUoKQogCiAgICAgaWYgKGdfa2V5X2ZpbGVfaGFzX2dyb3VwKG1fY2FjaGVGaWxlLmdl dCgpLCAic2NoZW1hIikpIHsKICAgICAgICAgdW5zaWduZWQgc2NoZW1hVmVyc2lvbiA9IHN0YXRp Y19jYXN0PHVuc2lnbmVkPihnX2tleV9maWxlX2dldF9pbnRlZ2VyKG1fY2FjaGVGaWxlLmdldCgp LCAic2NoZW1hIiwgInZlcnNpb24iLCBudWxscHRyKSk7Ci0gICAgICAgIGlmIChzY2hlbWFWZXJz aW9uID09IGdTY2hlbWFWZXJzaW9uKQorICAgICAgICBpZiAoc2NoZW1hVmVyc2lvbiA8IGdTY2hl bWFWZXJzaW9uKSB7CisgICAgICAgICAgICAvLyBDYWNoZSBmaWxlIHVzaW5nIGFuIG9sZCBzY2hl bWEsIGNyZWF0ZSBhIG5ldyBlbXB0eSBmaWxlLgorICAgICAgICAgICAgbV9jYWNoZUZpbGUucmVz ZXQoZ19rZXlfZmlsZV9uZXcoKSk7CisgICAgICAgIH0gZWxzZSBpZiAoc2NoZW1hVmVyc2lvbiA+ IGdTY2hlbWFWZXJzaW9uKSB7CisgICAgICAgICAgICAvLyBDYWNoZSBmaWxlIHVzaW5nIGEgbmV3 ZXIgc2NoZW1hLCB1c2UgdGhlIGNhY2hlIGluIHJlYWQgb25seSBtb2RlLgorICAgICAgICAgICAg bV9yZWFkT25seU1vZGUgPSB0cnVlOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgLy8g U2FtZSBzY2hlbWEgdmVyc2lvbiwgd2UgZG9uJ3QgbmVlZCB0byB1cGRhdGUgaXQuCiAgICAgICAg ICAgICByZXR1cm47Ci0KLSAgICAgICAgLy8gQ2FjaGUgZmlsZSB1c2luZyBhbiBvbGQgc2NoZW1h LCBjcmVhdGUgYSBuZXcgZW1wdHkgZmlsZS4KLSAgICAgICAgbV9jYWNoZUZpbGUucmVzZXQoZ19r ZXlfZmlsZV9uZXcoKSk7CisgICAgICAgIH0KICAgICB9CiAKICAgICBnX2tleV9maWxlX3NldF9p bnRlZ2VyKG1fY2FjaGVGaWxlLmdldCgpLCAic2NoZW1hIiwgInZlcnNpb24iLCBzdGF0aWNfY2Fz dDx1bnNpZ25lZD4oZ1NjaGVtYVZlcnNpb24pKTsKQEAgLTEzNyw3ICsxNDMsNyBAQCB2b2lkIFBs dWdpbkluZm9DYWNoZTo6dXBkYXRlUGx1Z2luSW5mbyhjb25zdCBTdHJpbmcmIHBsdWdpblBhdGgs IGNvbnN0IFBsdWdpbk1vZAogICAgIGdfa2V5X2ZpbGVfc2V0X3N0cmluZyhtX2NhY2hlRmlsZS5n ZXQoKSwgcGx1Z2luR3JvdXAuZGF0YSgpLCAibWltZS1kZXNjcmlwdGlvbiIsIG1pbWVEZXNjcmlw dGlvbi51dGY4KCkuZGF0YSgpKTsKICNlbmRpZgogCi0gICAgaWYgKG1fY2FjaGVQYXRoKSB7Cisg ICAgaWYgKG1fY2FjaGVQYXRoICYmICFtX3JlYWRPbmx5TW9kZSkgewogICAgICAgICAvLyBTYXZl IHRoZSBjYWNoZSBmaWxlIGluIGFuIGlkbGUgdG8gbWFrZSBzdXJlIGl0IGhhcHBlbnMgaW4gdGhl IG1haW4gdGhyZWFkIGFuZAogICAgICAgICAvLyBpdCdzIGRvbmUgb25seSBvbmNlIHdoZW4gdGhp cyBpcyBjYWxsZWQgbXVsdGlwbGUgdGltZXMgaW4gYSB2ZXJ5IHNob3J0IHRpbWUuCiAgICAgICAg IHN0ZDo6bG9ja19ndWFyZDxzdGQ6Om11dGV4PiBsb2NrKG1fbXV0ZXgpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvZ3RrL1BsdWdpbkluZm9DYWNoZS5oIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvZ3RrL1BsdWdpbkluZm9DYWNoZS5oCmlu ZGV4IDMyNzJkYzAuLjg3MmYxZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9QbHVnaW5zL2d0ay9QbHVnaW5JbmZvQ2FjaGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvUGx1Z2lucy9ndGsvUGx1Z2luSW5mb0NhY2hlLmgKQEAgLTU0LDYgKzU0LDcgQEAgcHJp dmF0ZToKICAgICBHVW5pcXVlUHRyPEdLZXlGaWxlPiBtX2NhY2hlRmlsZTsKICAgICBHVW5pcXVl UHRyPGNoYXI+IG1fY2FjaGVQYXRoOwogICAgIHVuc2lnbmVkIG1fc2F2ZVRvRmlsZUlkbGVJZDsK KyAgICBib29sIG1fcmVhZE9ubHlNb2RlOwogICAgIHN0ZDo6bXV0ZXggbV9tdXRleDsKIH07CiAK