42033 2010-07-10 15:21:30 -0700 Don't initialize plug-ins until allowed by the page 2010-07-13 22:41: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 249565 0 andersca 2010-07-10 15:21:30 -0700 Don't initialize plug-ins until allowed by the page 249567 1 61163 andersca 2010-07-10 15:24:31 -0700 Created attachment 61163 Patch 250976 2 andersca 2010-07-13 22:39:44 -0700 *** Bug 42031 has been marked as a duplicate of this bug. *** 250979 3 andersca 2010-07-13 22:41:43 -0700 Committed r63053: <http://trac.webkit.org/changeset/63053> 61163 2010-07-10 15:24:31 -0700 2010-07-10 15:26:44 -0700 Patch bug-42033-20100710152429.patch text/plain 7449 andersca ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZDliZDBiYWI1N2ViMmZiMjM2NWY2YmVmYjlmNjdlOTI0ZmIwYzY5Yy4uNWExMjM4ZTQ4NjZiZWE3 MGM0NjU0NWVjMDE5NDRkNGNiZTI1MzFjYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMC0wNy0xMCAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERvbid0IGluaXRpYWxpemUgcGx1Zy1pbnMgdW50 aWwgYWxsb3dlZCBieSB0aGUgcGFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NDIwMzMKKworICAgICAgICAqIFdlYkNvcmUuZXhwLmluOgorICAgICAg ICBFeHBvcnQgRG9jdW1lbnQ6OmFkZE1lZGlhQ2FuU3RhcnRMaXN0ZW5lciBhbmQgRG9jdW1lbnQ6 OnJlbW92ZU1lZGlhQ2FuU3RhcnRMaXN0ZW5lci4KKwogMjAxMC0wNy0xMCAgU2FtIFdlaW5pZyAg PHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFuZGVycyBDYXJsc3Nvbi4K ZGlmZiAtLWdpdCBhL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4gYi9XZWJDb3JlL1dlYkNvcmUuZXhw LmluCmluZGV4IDJiMGE1MWNiZmQ5YzI0ZmJkY2IxMTJlNzAzOGFjOTIwODUyMWUxM2YuLjBmMTFj YTZkNmViODk1YTE4MjI3ODY3Yzc4ZDBlZjIyNTJhODQ3MDEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv V2ViQ29yZS5leHAuaW4KKysrIGIvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgpAQCAtNjA4LDggKzYw OCwxMCBAQCBfX1pON1dlYkNvcmU4RG9jdW1lbnQxN2dldEZvY3VzYWJsZU5vZGVzRVJOM1dURjZW ZWN0b3JJTlMxXzZSZWZQdHJJTlNfNE5vZGVFRUVMbQogX19aTjdXZWJDb3JlOERvY3VtZW50MTlh Y2Nlc3NTVkdFeHRlbnNpb25zRXYKIF9fWk43V2ViQ29yZThEb2N1bWVudDIyY3JlYXRlRG9jdW1l bnRGcmFnbWVudEV2CiBfX1pON1dlYkNvcmU4RG9jdW1lbnQyM3JlbmRlcmVkUmVjdHNGb3JNYXJr ZXJzRU5TXzE0RG9jdW1lbnRNYXJrZXIxME1hcmtlclR5cGVFCitfX1pON1dlYkNvcmU4RG9jdW1l bnQyNGFkZE1lZGlhQ2FuU3RhcnRMaXN0ZW5lckVQTlNfMjFNZWRpYUNhblN0YXJ0TGlzdGVuZXJF CiBfX1pON1dlYkNvcmU4RG9jdW1lbnQyNHNldFNob3VsZENyZWF0ZVJlbmRlcmVyc0ViCiBfX1pO N1dlYkNvcmU4RG9jdW1lbnQyNnBhZ2VTaXplQW5kTWFyZ2luc0luUGl4ZWxzRWlSTlNfN0ludFNp emVFUmlTM19TM19TM18KK19fWk43V2ViQ29yZThEb2N1bWVudDI3cmVtb3ZlTWVkaWFDYW5TdGFy dExpc3RlbmVyRVBOU18yMU1lZGlhQ2FuU3RhcnRMaXN0ZW5lckUKIF9fWk43V2ViQ29yZThEb2N1 bWVudDM2dXBkYXRlTGF5b3V0SWdub3JlUGVuZGluZ1N0eWxlc2hlZXRzRXYKIF9fWk43V2ViQ29y ZThEb2N1bWVudDRoZWFkRXYKIF9fWk43V2ViQ29yZThGb3JtRGF0YUQxRXYKZGlmZiAtLWdpdCBh L1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNjY3MGUzZDQ3MzY4 N2IxMWE2YWRiNmQyNmM4N2EzZWVkMWQ0NWMxNi4uNjRkNzA3MThiODM1YjIyYWQ3YWIzMjVjMWU3 MDlhYjFmNDA3YzY0MSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0 Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzOCBAQAogMjAxMC0wNy0xMCAgQW5kZXJzIENhcmxzc29u ICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIERvbid0IGluaXRpYWxpemUgcGx1Zy1pbnMgdW50aWwgYWxsb3dlZCBi eSB0aGUgcGFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NDIwMzMKKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2Fw ZVBsdWdpbi5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luOjpwYWludCk6Cisg ICAgICAgIChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luOjpnZW9tZXRyeURpZENoYW5nZSk6CisgICAg ICAgIEFzc2VydCB0aGF0IHRoZSBwbHVnLWluIGlzIHN0YXJ0ZWQuCisKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBsdWdpblZp ZXc6OlBsdWdpblZpZXcpOgorICAgICAgICBJbml0aWFsaXplIG1faXNXYWl0aW5nVW50aWxNZWRp YUNhblN0YXJ0LgorICAgICAgICAKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luVmlldzo6flBsdWdp blZpZXcpOgorICAgICAgICBJZiBuZWNlc3NhcnksIHJlbW92ZSB0aGUgcGx1Zy1pbiB2aWV3IGFz IGEgTWVkaWFDYW5TdGFydExpc3RlbmVyLgorCisgICAgICAgIChXZWJLaXQ6OlBsdWdpblZpZXc6 OmluaXRpYWxpemVQbHVnaW4pOgorICAgICAgICBJZiB3ZSdyZSBub3QgYWxsb3dlZCB0byBpbml0 aWFsaXplIHRoZSBwbHVnLWluLCBhZGQgdGhlIHBsdWctaW4gdmlldyBhcyBhIE1lZGlhQ2FuU3Rh cnRMaXN0ZW5lci4KKworICAgICAgICAoV2ViS2l0OjpQbHVnaW5WaWV3OjpwYWludCk6CisgICAg ICAgIENoZWNrIHRoYXQgdGhlIHBsdWctaW4gaXMgaW5pdGlhbGl6ZWQuCisKKyAgICAgICAgKFdl YktpdDo6UGx1Z2luVmlldzo6dmlld0dlb21ldHJ5RGlkQ2hhbmdlKToKKyAgICAgICAgRGl0dG8u CisKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luVmlldzo6bWVkaWFDYW5TdGFydCk6CisgICAgICAg IEluaXRpYWxpemUgdGhlIHBsdWctaW4uCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMv UGx1Z2luVmlldy5oOgorCisyMDEwLTA3LTEwICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBh cHBsZS5jb20+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4KIAogICAgICAg ICBIYXZlIHRoZSBwbHVnLWluIHZpZXcgaW5pdGlhbGl6ZSB0aGUgcGx1Zy1pbgpkaWZmIC0tZ2l0 IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uY3Bw IGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uY3Bw CmluZGV4IDkyZTU1NDkxNTAzY2QxZmQ5M2VhYjAzNjhiMzViYmY3ZjExNDczN2UuLjNiYmY1ZTlh ZDI5ZTk3MTYyOTRlZGQ3MGY2OWY1ZDE5NjhiZjdlNWQgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2Vi UHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmNwcAorKysgYi9XZWJLaXQy L1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5jcHAKQEAgLTE0MCwx MSArMTQwLDE1IEBAIHZvaWQgTmV0c2NhcGVQbHVnaW46OmRlc3Ryb3koKQogICAgIAogdm9pZCBO ZXRzY2FwZVBsdWdpbjo6cGFpbnQoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRS ZWN0JiBkaXJ0eVJlY3QpCiB7CisgICAgQVNTRVJUKG1faXNTdGFydGVkKTsKKyAgICAKICAgICBw bGF0Zm9ybVBhaW50KGNvbnRleHQsIGRpcnR5UmVjdCk7CiB9CiAKIHZvaWQgTmV0c2NhcGVQbHVn aW46Omdlb21ldHJ5RGlkQ2hhbmdlKGNvbnN0IEludFJlY3QmIGZyYW1lUmVjdCwgY29uc3QgSW50 UmVjdCYgY2xpcFJlY3QpCiB7CisgICAgQVNTRVJUKG1faXNTdGFydGVkKTsKKwogICAgIGlmICht X2ZyYW1lUmVjdCA9PSBmcmFtZVJlY3QgJiYgbV9jbGlwUmVjdCA9PSBjbGlwUmVjdCkgewogICAg ICAgICAvLyBOb3RoaW5nIHRvIGRvLgogICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9XZWJL aXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcCBiL1dlYktpdDIvV2ViUHJvY2Vz cy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwCmluZGV4IDZkOTUzNDZmYWJjYWUzZmY5Y2ZlZmRmMmEz ZjcwMjRjNmZlYTllYzkuLmVjYTA4MDk1ZWE5NTkxMmQxY2MyYzc1OWQ4NzgwNzg3OWU0OWM2NDYg MTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwCisr KyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwCkBAIC00MSwxMSAr NDEsMTUgQEAgUGx1Z2luVmlldzo6UGx1Z2luVmlldyhXZWJDb3JlOjpIVE1MUGx1Z0luRWxlbWVu dCogcGx1Z2luRWxlbWVudCwgUGFzc1JlZlB0cjxQbHUKICAgICAsIG1fcGx1Z2luKHBsdWdpbikK ICAgICAsIG1fcGFyYW1ldGVycyhwYXJhbWV0ZXJzKQogICAgICwgbV9pc0luaXRpYWxpemVkKGZh bHNlKQorICAgICwgbV9pc1dhaXRpbmdVbnRpbE1lZGlhQ2FuU3RhcnQoZmFsc2UpCiB7CiB9CiAK IFBsdWdpblZpZXc6On5QbHVnaW5WaWV3KCkKIHsKKyAgICBpZiAobV9pc1dhaXRpbmdVbnRpbE1l ZGlhQ2FuU3RhcnQpCisgICAgICAgIG1fcGx1Z2luRWxlbWVudC0+ZG9jdW1lbnQoKS0+cmVtb3Zl TWVkaWFDYW5TdGFydExpc3RlbmVyKHRoaXMpOworCiAgICAgaWYgKG1fcGx1Z2luICYmIG1faXNJ bml0aWFsaXplZCkKICAgICAgICAgbV9wbHVnaW4tPmRlc3Ryb3koKTsKIH0KQEAgLTYwLDYgKzY0 LDIxIEBAIHZvaWQgUGx1Z2luVmlldzo6aW5pdGlhbGl6ZVBsdWdpbigpCiAgICAgICAgIHJldHVy bjsKICAgICB9CiAKKyAgICBpZiAoRnJhbWUqIGZyYW1lID0gbV9wbHVnaW5FbGVtZW50LT5kb2N1 bWVudCgpLT5mcmFtZSgpKSB7CisgICAgICAgIGlmIChQYWdlKiBwYWdlID0gZnJhbWUtPnBhZ2Uo KSkgeworICAgICAgICAgICAgCisgICAgICAgICAgICAvLyBXZSBzaG91bGRuJ3QgaW5pdGlhbGl6 ZSB0aGUgcGx1Zy1pbiByaWdodCBub3csIGFkZCBhIGxpc3RlbmVyLgorICAgICAgICAgICAgaWYg KCFwYWdlLT5jYW5TdGFydE1lZGlhKCkpIHsKKyAgICAgICAgICAgICAgICBpZiAobV9pc1dhaXRp bmdVbnRpbE1lZGlhQ2FuU3RhcnQpCisgICAgICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgICAgICAgICAKKyAgICAgICAgICAgICAgICBtX2lzV2FpdGluZ1VudGlsTWVkaWFDYW5TdGFy dCA9IHRydWU7CisgICAgICAgICAgICAgICAgbV9wbHVnaW5FbGVtZW50LT5kb2N1bWVudCgpLT5h ZGRNZWRpYUNhblN0YXJ0TGlzdGVuZXIodGhpcyk7CisgICAgICAgICAgICAgICAgcmV0dXJuOwor ICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfQorICAgIAogICAgIGlmICghbV9wbHVnaW4t PmluaXRpYWxpemUobV9wYXJhbWV0ZXJzKSkgewogICAgICAgICAvLyBXZSBmYWlsZWQgdG8gaW5p dGlhbGl6ZSB0aGUgcGx1Zy1pbi4KICAgICAgICAgbV9wbHVnaW4gPSAwOwpAQCAtNzgsNyArOTcs NyBAQCB2b2lkIFBsdWdpblZpZXc6OnNldEZyYW1lUmVjdChjb25zdCBXZWJDb3JlOjpJbnRSZWN0 JiByZWN0KQogCiB2b2lkIFBsdWdpblZpZXc6OnBhaW50KEdyYXBoaWNzQ29udGV4dCogY29udGV4 dCwgY29uc3QgSW50UmVjdCYgZGlydHlSZWN0KQogewotICAgIGlmIChjb250ZXh0LT5wYWludGlu Z0Rpc2FibGVkKCkgfHwgIW1fcGx1Z2luKQorICAgIGlmIChjb250ZXh0LT5wYWludGluZ0Rpc2Fi bGVkKCkgfHwgIW1fcGx1Z2luIHx8ICFtX2lzSW5pdGlhbGl6ZWQpCiAgICAgICAgIHJldHVybjsK ICAgICAKICAgICBJbnRSZWN0IGRpcnR5UmVjdEluV2luZG93Q29vcmRpbmF0ZXMgPSBwYXJlbnQo KS0+Y29udGVudHNUb1dpbmRvdyhkaXJ0eVJlY3QpOwpAQCAtMTE0LDcgKzEzMyw3IEBAIHZvaWQg UGx1Z2luVmlldzo6c2V0UGFyZW50KFNjcm9sbFZpZXcqIHNjcm9sbFZpZXcpCiAKIHZvaWQgUGx1 Z2luVmlldzo6dmlld0dlb21ldHJ5RGlkQ2hhbmdlKCkKIHsKLSAgICBpZiAoIXBhcmVudCgpIHx8 ICFtX3BsdWdpbikKKyAgICBpZiAoIXBhcmVudCgpIHx8ICFtX3BsdWdpbiB8fCAhbV9pc0luaXRp YWxpemVkKQogICAgICAgICByZXR1cm47CiAKICAgICAvLyBHZXQgdGhlIGZyYW1lIHJlY3QgaW4g d2luZG93IGNvb3JkaW5hdGVzLgpAQCAtMTQzLDQgKzE2MiwxMiBAQCB2b2lkIFBsdWdpblZpZXc6 OmludmFsaWRhdGVSZWN0KGNvbnN0IEludFJlY3QmKQogewogfQogCit2b2lkIFBsdWdpblZpZXc6 Om1lZGlhQ2FuU3RhcnQoKQoreworICAgIEFTU0VSVChtX2lzV2FpdGluZ1VudGlsTWVkaWFDYW5T dGFydCk7CisgICAgbV9pc1dhaXRpbmdVbnRpbE1lZGlhQ2FuU3RhcnQgPSBmYWxzZTsKKyAgICAK KyAgICBpbml0aWFsaXplUGx1Z2luKCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZm IC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5oIGIvV2ViS2l0 Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5oCmluZGV4IDg4NTg1MGJiNDA4MjJlMzFh ZDRlMjViNGViZmMzZTc3NmUxM2NlNmEuLjU1NWYyMTRmZDc2ZmFhNzBlYWZjMzc0ODFjOGMwZjAw ODkzYjgwMWUgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZp ZXcuaAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmgKQEAgLTI3 LDYgKzI3LDcgQEAKICNkZWZpbmUgUGx1Z2luVmlld19oCiAKICNpbmNsdWRlICJQbHVnaW4uaCIK KyNpbmNsdWRlIDxXZWJDb3JlL01lZGlhQ2FuU3RhcnRMaXN0ZW5lci5oPgogI2luY2x1ZGUgPFdl YkNvcmUvV2lkZ2V0Lmg+CiAKIC8vIEZJWE1FOiBFdmVudHVhbGx5IHRoaXMgc2hvdWxkIG1vdmUg dG8gV2ViQ29yZS4KQEAgLTM3LDcgKzM4LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBuYW1l c3BhY2UgV2ViS2l0IHsKIAotY2xhc3MgUGx1Z2luVmlldyA6IHB1YmxpYyBXZWJDb3JlOjpXaWRn ZXQgeworY2xhc3MgUGx1Z2luVmlldyA6IHB1YmxpYyBXZWJDb3JlOjpXaWRnZXQsIFdlYkNvcmU6 Ok1lZGlhQ2FuU3RhcnRMaXN0ZW5lciB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8 UGx1Z2luVmlldz4gY3JlYXRlKFdlYkNvcmU6OkhUTUxQbHVnSW5FbGVtZW50KiBwbHVnaW5FbGVt ZW50LCBQYXNzUmVmUHRyPFBsdWdpbj4gcGx1Z2luLCBjb25zdCBQbHVnaW46OlBhcmFtZXRlcnMm IHBhcmFtZXRlcnMpCiAgICAgewpAQCAtNjEsMTEgKzYyLDE1IEBAIHByaXZhdGU6CiAgICAgdmly dHVhbCB2b2lkIGZyYW1lUmVjdHNDaGFuZ2VkKCk7CiAgICAgdmlydHVhbCB2b2lkIHNldFBhcmVu dChXZWJDb3JlOjpTY3JvbGxWaWV3Kik7CiAKKyAgICAvLyBXZWJDb3JlOjpNZWRpYUNhblN0YXJ0 TGlzdGVuZXIKKyAgICB2aXJ0dWFsIHZvaWQgbWVkaWFDYW5TdGFydCgpOworCiAgICAgV2ViQ29y ZTo6SFRNTFBsdWdJbkVsZW1lbnQqIG1fcGx1Z2luRWxlbWVudDsKICAgICBSZWZQdHI8UGx1Z2lu PiBtX3BsdWdpbjsKICAgICBQbHVnaW46OlBhcmFtZXRlcnMgbV9wYXJhbWV0ZXJzOwogICAgIAog ICAgIGJvb2wgbV9pc0luaXRpYWxpemVkOworICAgIGJvb2wgbV9pc1dhaXRpbmdVbnRpbE1lZGlh Q2FuU3RhcnQ7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK