43509 2010-08-04 14:18:47 -0700 WebKit2 should refuse to load the same plugins that old-WebKit refuses to load 2010-11-05 11:16:26 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Windows XP RESOLVED FIXED InRadar, PlatformOnly P2 Normal --- 49076 1 aroben webkit-unassigned andersca jhoneycutt oldest_to_newest 260208 0 aroben 2010-08-04 14:18:47 -0700 Old WebKit (WebCore, really) has logic to refuse to load certain plugins. WebKit2 should refuse to load those same plugins. 260227 1 andersca 2010-08-04 14:55:30 -0700 This should be done by implementing PluginInfoStore::shouldUsePlugin on Windows. 260230 2 aroben 2010-08-04 15:02:52 -0700 <rdar://problem/8273822> 304328 3 aroben 2010-11-03 15:39:19 -0700 I think the only logic WebCore has that WebKit2 doesn't is that WebCore prefers the newer WMP plugin to the older one. 305394 4 73086 aroben 2010-11-05 11:09:31 -0700 Created attachment 73086 Implement PluginInfoStore::shouldUsePlugin on Windows 305399 5 aroben 2010-11-05 11:16:26 -0700 Committed r71436: <http://trac.webkit.org/changeset/71436> 73086 2010-11-05 11:09:31 -0700 2010-11-05 11:10:50 -0700 Implement PluginInfoStore::shouldUsePlugin on Windows bug-43509-20101105140950.patch text/plain 5880 aroben ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg YTJiYWM4ZTVlY2E0OGIyZDI5NDIzYmZkZDRjYjlhYmI0ZWVlODY2Ni4uMDZjNzVmMGExNTJlNjJi NzRkNzNiNzE1OTkwMzBlZDNmMGNhYThlYSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzMCBAQAogMjAxMC0xMS0wNSAgQWRh bSBSb2JlbiAgPGFyb2JlbkBhcHBsZS5jb20+CiAKKyAgICAgICAgSW1wbGVtZW50IFBsdWdpbklu Zm9TdG9yZTo6c2hvdWxkVXNlUGx1Z2luIG9uIFdpbmRvd3MKKworICAgICAgICBGaXhlcyA8aHR0 cDovL3dlYmtpdC5vcmcvYi80MzUwOT4gPHJkYXI6Ly9wcm9ibGVtLzgyNzM4MjI+IFdlYktpdDIK KyAgICAgICAgc2hvdWxkIHJlZnVzZSB0byBsb2FkIHRoZSBzYW1lIHBsdWdpbnMgdGhhdCBvbGQt V2ViS2l0IHJlZnVzZXMgdG8gbG9hZAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL1BsdWdpbnMvd2luL1BsdWdpbkluZm9TdG9yZVdp bi5jcHA6CisgICAgICAgIChXZWJLaXQ6OmZpbGVWZXJzaW9uKTogSGVscGVyIGZ1bmN0aW9uIHRv IGNvbnN0cnVjdCBhIDY0LWJpdCBmaWxlCisgICAgICAgIHZlcnNpb24gZnJvbSB0d28gMzItYml0 IG51bWJlcnMuCisgICAgICAgIChXZWJLaXQ6OlBsdWdpbkluZm9TdG9yZTo6Z2V0UGx1Z2luSW5m byk6IFBvcnRlZCBjb2RlIGZyb20KKyAgICAgICAgV2ViQ29yZTo6UGx1Z2luUGFja2FnZTo6ZmV0 Y2hJbmZvIHRvIGdldCB0aGUgcGx1Z2luJ3MgdmVyc2lvbi4gV2Ugbm93CisgICAgICAgIHN0b3Jl IGl0IGluIFBsdWdpbjo6ZmlsZVZlcnNpb24uCisKKyAgICAgICAgKFdlYktpdDo6aXNPbGRXaW5k b3dzTWVkaWFQbGF5ZXJQbHVnaW4pOgorICAgICAgICAoV2ViS2l0Ojppc05ld1dpbmRvd3NNZWRp YVBsYXllclBsdWdpbik6CisgICAgICAgIEFkZGVkIHRoZXNlIGhlbHBlcnMuIFRoZSBjb2RlIGNh bWUgZnJvbQorICAgICAgICBXZWJDb3JlOjpQbHVnaW5EYXRhYmFzZTo6Z2V0UGx1Z2luUGF0aHNJ bkRpcmVjdG9yaWVzLgorCisgICAgICAgIChXZWJLaXQ6OlBsdWdpbkluZm9TdG9yZTo6c2hvdWxk VXNlUGx1Z2luKTogSW1wbGVtZW50ZWQuIFRoZSBjb2RlIHdhcworICAgICAgICBwb3J0ZWQgZnJv bSBXZWJDb3JlOjpQbHVnaW5EYXRhYmFzZTo6Z2V0UGx1Z2luUGF0aHNJbkRpcmVjdG9yaWVzIGFu ZAorICAgICAgICBXZWJDb3JlOjpQbHVnaW5QYWNrYWdlOjppc1BsdWdpbkJsYWNrbGlzdGVkLgor CisyMDEwLTExLTA1ICBBZGFtIFJvYmVuICA8YXJvYmVuQGFwcGxlLmNvbT4KKwogICAgICAgICBP cGVyYXRlIG9uIG1fcGx1Z2lucyBkaXJlY3RseSBpbiBQbHVnaW5JbmZvU3RvcmU6OnNob3VsZFVz ZVBsdWdpbgogCiAgICAgICAgIFdlJ2xsIG5lZWQgdG8gb3BlcmF0ZSBvbiBtX3BsdWdpbnMgaWYg d2UgZXZlciB3YW50IHRvIHVubG9hZCBhbgpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9VSVByb2Nlc3Mv UGx1Z2lucy93aW4vUGx1Z2luSW5mb1N0b3JlV2luLmNwcCBiL1dlYktpdDIvVUlQcm9jZXNzL1Bs dWdpbnMvd2luL1BsdWdpbkluZm9TdG9yZVdpbi5jcHAKaW5kZXggOGViODYwZWJjY2E5NGVhNmM0 NmY1ZWQ4M2Q2NzE4MzdlMDFhOTAxNS4uZmU3ZDg5NjY4YjIxMzNjNWUwYWZlMjcxZTEyMmUwNzAx ZDM0NTIyNSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy93aW4vUGx1Z2lu SW5mb1N0b3JlV2luLmNwcAorKysgYi9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL3dpbi9QbHVn aW5JbmZvU3RvcmVXaW4uY3BwCkBAIC0zNTIsNiArMzUyLDE0IEBAIHN0YXRpYyBTdHJpbmcgZ2V0 VmVyc2lvbkluZm8oY29uc3QgTFBWT0lEIHZlcnNpb25JbmZvRGF0YSwgY29uc3QgU3RyaW5nJiBp bmZvKQogICAgIHJldHVybiBTdHJpbmcocmVpbnRlcnByZXRfY2FzdDxVQ2hhcio+KGJ1ZmZlciks IGJ1ZmZlckxlbmd0aCAtIDEpOwogfQogCitzdGF0aWMgdWludDY0X3QgZmlsZVZlcnNpb24oRFdP UkQgbGVhc3RTaWduaWZpY2FudCwgRFdPUkQgbW9zdFNpZ25pZmljYW50KQoreworICAgIFVMQVJH RV9JTlRFR0VSIHZlcnNpb247CisgICAgdmVyc2lvbi5Mb3dQYXJ0ID0gbGVhc3RTaWduaWZpY2Fu dDsKKyAgICB2ZXJzaW9uLkhpZ2hQYXJ0ID0gbW9zdFNpZ25pZmljYW50OworICAgIHJldHVybiB2 ZXJzaW9uLlF1YWRQYXJ0OworfQorCiBib29sIFBsdWdpbkluZm9TdG9yZTo6Z2V0UGx1Z2luSW5m byhjb25zdCBTdHJpbmcmIHBsdWdpblBhdGgsIFBsdWdpbiYgcGx1Z2luKQogewogICAgIFN0cmlu ZyBwYXRoQ29weSA9IHBsdWdpblBhdGg7CkBAIC0zNjgsNiArMzc2LDExIEBAIGJvb2wgUGx1Z2lu SW5mb1N0b3JlOjpnZXRQbHVnaW5JbmZvKGNvbnN0IFN0cmluZyYgcGx1Z2luUGF0aCwgUGx1Z2lu JiBwbHVnaW4pCiAgICAgaWYgKG5hbWUuaXNOdWxsKCkgfHwgZGVzY3JpcHRpb24uaXNOdWxsKCkp CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAorICAgIFZTX0ZJWEVERklMRUlORk8qIGluZm87Cisg ICAgVUlOVCBpbmZvU2l6ZTsKKyAgICBpZiAoITo6VmVyUXVlcnlWYWx1ZVcodmVyc2lvbkluZm9E YXRhLmdldCgpLCBMIlxcIiwgcmVpbnRlcnByZXRfY2FzdDx2b2lkKio+KCZpbmZvKSwgJmluZm9T aXplKSB8fCBpbmZvU2l6ZSA8IHNpemVvZihWU19GSVhFREZJTEVJTkZPKSkKKyAgICAgICAgcmV0 dXJuIGZhbHNlOworCiAgICAgVmVjdG9yPFN0cmluZz4gdHlwZXM7CiAgICAgZ2V0VmVyc2lvbklu Zm8odmVyc2lvbkluZm9EYXRhLmdldCgpLCAiTUlNRVR5cGUiKS5zcGxpdCgnfCcsIHR5cGVzKTsK ICAgICBWZWN0b3I8U3RyaW5nPiBleHRlbnNpb25MaXN0czsKQEAgLTQwMywxNCArNDE2LDcyIEBA IGJvb2wgUGx1Z2luSW5mb1N0b3JlOjpnZXRQbHVnaW5JbmZvKGNvbnN0IFN0cmluZyYgcGx1Z2lu UGF0aCwgUGx1Z2luJiBwbHVnaW4pCiAgICAgcGx1Z2luLmluZm8ubmFtZSA9IG5hbWU7CiAgICAg cGx1Z2luLmluZm8uZmlsZSA9IHBhdGhHZXRGaWxlTmFtZShwbHVnaW5QYXRoKTsKICAgICBwbHVn aW4uaW5mby5taW1lcy5zd2FwKG1pbWVzKTsKKyAgICBwbHVnaW4uZmlsZVZlcnNpb24gPSBmaWxl VmVyc2lvbihpbmZvLT5kd0ZpbGVWZXJzaW9uTFMsIGluZm8tPmR3RmlsZVZlcnNpb25NUyk7CisK ICAgICByZXR1cm4gdHJ1ZTsKIH0KIAorc3RhdGljIGJvb2wgaXNPbGRXaW5kb3dzTWVkaWFQbGF5 ZXJQbHVnaW4oY29uc3QgUGx1Z2luSW5mb1N0b3JlOjpQbHVnaW4mIHBsdWdpbikKK3sKKyAgICBy ZXR1cm4gZXF1YWxJZ25vcmluZ0Nhc2UocGx1Z2luLmluZm8uZmlsZSwgIm5wZHNwbGF5LmRsbCIp OworfQorCitzdGF0aWMgYm9vbCBpc05ld1dpbmRvd3NNZWRpYVBsYXllclBsdWdpbihjb25zdCBQ bHVnaW5JbmZvU3RvcmU6OlBsdWdpbiYgcGx1Z2luKQoreworICAgIHJldHVybiBlcXVhbElnbm9y aW5nQ2FzZShwbHVnaW4uaW5mby5maWxlLCAibnAtbXN3bXAuZGxsIik7Cit9CisKIGJvb2wgUGx1 Z2luSW5mb1N0b3JlOjpzaG91bGRVc2VQbHVnaW4oY29uc3QgUGx1Z2luJiBwbHVnaW4pCiB7Ci0g ICAgLy8gRklYTUU6IDxodHRwOi8vd2Via2l0Lm9yZy9iLzQzNTA5PiBNaWdyYXRlIGxvZ2ljIGhl cmUgZnJvbQotICAgIC8vIFBsdWdpbkRhdGFiYXNlOjpnZXRQbHVnaW5QYXRoc0luRGlyZWN0b3Jp ZXMgYW5kIFBsdWdpblBhY2thZ2U6OmlzUGx1Z2luQmxhY2tsaXN0ZWQuCi0gICAgbm90SW1wbGVt ZW50ZWQoKTsKKyAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIHByZWZlciBhIG5ld2VyIHZlcnNpb24g b2YgYSBwbHVnaW4gdG8gYW4gb2xkZXIgdmVyc2lvbiwgcmF0aGVyIHRoYW4gbG9hZGluZworICAg IC8vIGJvdGguIDxodHRwOi8vd2Via2l0Lm9yZy9iLzQ5MDc1PgorCisgICAgaWYgKHBsdWdpbi5p bmZvLm5hbWUgPT0gIkNpdHJpeCBJQ0EgQ2xpZW50IikgeworICAgICAgICAvLyBUaGUgQ2l0cml4 IElDQSBDbGllbnQgcGx1Zy1pbiByZXF1aXJlcyBhIE1vemlsbGEtYmFzZWQgYnJvd3Nlcjsgc2Vl IDxyZGFyOi8vNjQxODY4MT4uCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKKyAgICBp ZiAocGx1Z2luLmluZm8ubmFtZSA9PSAiU2lsdmVybGlnaHQgUGx1Zy1JbiIpIHsKKyAgICAgICAg Ly8gd29ya2Fyb3VuZCBmb3IgPHJkYXI6Ly81NTU3Mzc5PiBDcmFzaCBpbiBTaWx2ZXJsaWdodCB3 aGVuIG9wZW5pbmcgbWljcm9zb2Z0LmNvbS4KKyAgICAgICAgLy8gdGhlIGxhdGVzdCAxLjAgdmVy c2lvbiBvZiBTaWx2ZXJsaWdodCBkb2VzIG5vdCByZXByb2R1Y2UgdGhpcyBjcmFzaCwgc28gYWxs b3cgaXQKKyAgICAgICAgLy8gYW5kIGFueSBuZXdlciB2ZXJzaW9ucworICAgICAgICBzdGF0aWMg Y29uc3QgdWludDY0X3QgbWluaW11bVJlcXVpcmVkVmVyc2lvbiA9IGZpbGVWZXJzaW9uKDB4NTFC RTAwMDAsIDB4MDAwMTAwMDApOworICAgICAgICByZXR1cm4gcGx1Z2luLmZpbGVWZXJzaW9uID49 IG1pbmltdW1SZXF1aXJlZFZlcnNpb247CisgICAgfQorCisgICAgaWYgKGVxdWFsSWdub3JpbmdD YXNlKHBsdWdpbi5pbmZvLmZpbGUsICJucG1vemF4LmRsbCIpKSB7CisgICAgICAgIC8vIEJ1ZyAx NTIxNzogTW96aWxsYSBBY3RpdmVYIGNvbnRyb2wgY29tcGxhaW5zIGFib3V0IG1pc3NpbmcgeHBj b21fY29yZS5kbGwKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKworICAgIGlmIChwbHVn aW4uaW5mby5uYW1lID09ICJZYWhvbyBBcHBsaWNhdGlvbiBTdGF0ZSBQbHVnaW4iKSB7CisgICAg ICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjg2MAorICAg ICAgICAvLyBCdWcgaW4gWWFob28gQXBwbGljYXRpb24gU3RhdGUgcGx1Zy1pbiBlYXJsaWVyIHRo YW4gMS4wLjAuNiBsZWFkcyB0byBoZWFwIGNvcnJ1cHRpb24uCisgICAgICAgIHN0YXRpYyBjb25z dCB1aW50NjRfdCBtaW5pbXVtUmVxdWlyZWRWZXJzaW9uID0gZmlsZVZlcnNpb24oMHgwMDAwMDAw NiwgMHgwMDAxMDAwMCk7CisgICAgICAgIHJldHVybiBwbHVnaW4uZmlsZVZlcnNpb24gPj0gbWlu aW11bVJlcXVpcmVkVmVyc2lvbjsKKyAgICB9CisKKyAgICBpZiAoaXNPbGRXaW5kb3dzTWVkaWFQ bGF5ZXJQbHVnaW4ocGx1Z2luKSkgeworICAgICAgICAvLyBEb24ndCBsb2FkIHRoZSBvbGQgV2lu ZG93cyBNZWRpYSBQbGF5ZXIgcGx1Z2luIGlmIHdlJ3ZlIGFscmVhZHkgbG9hZGVkIHRoZSBuZXcg V2luZG93cworICAgICAgICAvLyBNZWRpYSBQbGF5ZXIgcGx1Z2luLgorICAgICAgICBmb3IgKHNp emVfdCBpID0gMDsgaSA8IG1fcGx1Z2lucy5zaXplKCk7ICsraSkgeworICAgICAgICAgICAgaWYg KCFpc05ld1dpbmRvd3NNZWRpYVBsYXllclBsdWdpbihtX3BsdWdpbnNbaV0pKQorICAgICAgICAg ICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICB9Cisg ICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKworICAgIGlmIChpc05ld1dpbmRvd3NNZWRpYVBs YXllclBsdWdpbihwbHVnaW4pKSB7CisgICAgICAgIC8vIFVubG9hZCB0aGUgb2xkIFdpbmRvd3Mg TWVkaWEgUGxheWVyIHBsdWdpbiBpZiB3ZSd2ZSBhbHJlYWR5IGxvYWRlZCBpdC4KKyAgICAgICAg Zm9yIChzaXplX3QgaSA9IDA7IGkgPCBtX3BsdWdpbnMuc2l6ZSgpOyArK2kpIHsKKyAgICAgICAg ICAgIGlmICghaXNPbGRXaW5kb3dzTWVkaWFQbGF5ZXJQbHVnaW4obV9wbHVnaW5zW2ldKSkKKyAg ICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIG1fcGx1Z2lucy5yZW1vdmUoaSk7 CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorCiAgICAgcmV0dXJuIHRy dWU7CiB9CiAK