96933 2012-09-17 10:44:18 -0700 Don't load a blocked plug-in if a non-blocked version of the same plug-in exists 2012-09-17 10:53:16 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 722041 0 andersca 2012-09-17 10:44:18 -0700 Don't load a blocked plug-in if a non-blocked version of the same plug-in exists 722043 1 164416 andersca 2012-09-17 10:45:39 -0700 Created attachment 164416 Patch 722053 2 andersca 2012-09-17 10:53:16 -0700 Committed r128774: <http://trac.webkit.org/changeset/128774> 164416 2012-09-17 10:45:39 -0700 2012-09-17 10:49:14 -0700 Patch bug-96933-20120917104509.patch text/plain 2076 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4NzcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggY2YxY2RlNTI4MWY0ZmM3 MmJkYzJmZDU1MmQ2NGM2MTAwOTlkOWJjZi4uZmUxNzE4NzJlZGVkNGM1OGJmNjJjYWNmNTJiNWJm YzYzYTJkYmMzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA5LTE3ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgRG9uJ3QgbG9hZCBh IGJsb2NrZWQgcGx1Zy1pbiBpZiBhIG5vbi1ibG9ja2VkIHZlcnNpb24gb2YgdGhlIHNhbWUgcGx1 Zy1pbiBleGlzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTk2OTMzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMjIwNjcyMD4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJZiBhIHBsdWctaW4gd2l0aCB0 aGUgc2FtZSBidW5kbGUgaWRlbnRpZmllciBhbHJlYWR5IGV4aXN0cyBhbmQgaXQncyBibG9ja2Vk LCByZW1vdmUgaXQgYW5kIHJlcGxhY2UgaXQKKyAgICAgICAgd2l0aCB0aGUgb3RoZXIgdmVyc2lv bi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9QbHVnaW5zL21hYy9QbHVnaW5JbmZvU3RvcmVNYWMu bW06CisgICAgICAgIChXZWJLaXQ6OlBsdWdpbkluZm9TdG9yZTo6c2hvdWxkVXNlUGx1Z2luKToK KwogMjAxMi0wOS0xNyAgVG9yIEFybmUgVmVzdGLDuCAgPHRvci5hcm5lLnZlc3Rib0Bub2tpYS5j b20+CiAKICAgICAgICAgW1F0XSBSZW1vdmUgJ3VzaW5nIG5hbWVzcGFjZSBXZWJDb3JlJyBmcm9t IGhlYWRlciBmaWxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lu cy9tYWMvUGx1Z2luSW5mb1N0b3JlTWFjLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Bs dWdpbnMvbWFjL1BsdWdpbkluZm9TdG9yZU1hYy5tbQppbmRleCA5Yjg2YWFlZDNiOWViNDVjMDBm MTQ2MWQ3N2M1MmFjZDc2NTlkZGU1Li4yOWM3NDRmZmRhMmEzZTA2MjgyODNkOTM5YmRmNTJhYjcx MWI2NjRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9tYWMv UGx1Z2luSW5mb1N0b3JlTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVn aW5zL21hYy9QbHVnaW5JbmZvU3RvcmVNYWMubW0KQEAgLTExNSw4ICsxMTUsMTQgQEAgYm9vbCBQ bHVnaW5JbmZvU3RvcmU6OnNob3VsZFVzZVBsdWdpbihWZWN0b3I8UGx1Z2luTW9kdWxlSW5mbz4m IGFscmVhZHlMb2FkZWRQbHUKICAgICAgICAgY29uc3QgUGx1Z2luTW9kdWxlSW5mbyYgbG9hZGVk UGx1Z2luID0gYWxyZWFkeUxvYWRlZFBsdWdpbnNbaV07CiAKICAgICAgICAgLy8gSWYgYSBwbHVn LWluIHdpdGggdGhlIHNhbWUgYnVuZGxlIGlkZW50aWZpZXIgYWxyZWFkeSBleGlzdHMsIHdlIGRv bid0IHdhbnQgdG8gbG9hZCBpdC4KLSAgICAgICAgaWYgKGxvYWRlZFBsdWdpbi5idW5kbGVJZGVu dGlmaWVyID09IHBsdWdpbi5idW5kbGVJZGVudGlmaWVyKQotICAgICAgICAgICAgcmV0dXJuIGZh bHNlOworICAgICAgICAvLyBIb3dldmVyLCBpZiB0aGUgYWxyZWFkeSBleGlzdGluZyBwbHVnLWlu IGlzIGJsb2NrZWQgd2Ugd2FudCB0byByZXBsYWNlIGl0IHdpdGggdGhlIG5ldyBwbHVnLWluLgor ICAgICAgICBpZiAobG9hZGVkUGx1Z2luLmJ1bmRsZUlkZW50aWZpZXIgPT0gcGx1Z2luLmJ1bmRs ZUlkZW50aWZpZXIpIHsKKyAgICAgICAgICAgIGlmICghc2hvdWxkQmxvY2tQbHVnaW4obG9hZGVk UGx1Z2luKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAgICAgICAgIGFs cmVhZHlMb2FkZWRQbHVnaW5zLnJlbW92ZShpKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAg ICB9CiAgICAgfQogCiAgICAgLy8gUHJlZmVyIHRoZSBPcmFjbGUgSmF2YSBwbHVnLWluIG92ZXIg dGhlIEFwcGxlIGphdmEgcGx1Zy1pbi4K