111003 2013-02-27 12:19:48 -0800 REGRESSION (48533): Full-frame plugins stopped working (download instead of loading the plugin) 2013-02-27 12:46:40 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jer.noble jer.noble oldest_to_newest 843370 0 jer.noble 2013-02-27 12:19:48 -0800 REGRESSION (48533): Full-frame plugins stopped working (download instead of loading the plugin) 843372 1 190575 jer.noble 2013-02-27 12:21:31 -0800 Created attachment 190575 Patch 843381 2 190575 andersca 2013-02-27 12:33:38 -0800 Comment on attachment 190575 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=190575&action=review > Source/WebKit2/WebProcess/WebPage/WebPage.cpp:3794 > + if (PluginData* pluginData = m_page->pluginData()) { > + if (pluginData->supportsMimeType(MIMEType) && m_page->settings()->arePluginsEnabled()) > + return true; > + } I think you want to check if plug-ins are enabled before calling pluginData, since that can be a sync call out to the web process. 843384 3 jer.noble 2013-02-27 12:36:34 -0800 (In reply to comment #2) > (From update of attachment 190575 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=190575&action=review > > > Source/WebKit2/WebProcess/WebPage/WebPage.cpp:3794 > > + if (PluginData* pluginData = m_page->pluginData()) { > > + if (pluginData->supportsMimeType(MIMEType) && m_page->settings()->arePluginsEnabled()) > > + return true; > > + } > > I think you want to check if plug-ins are enabled before calling pluginData, since that can be a sync call out to the web process. This should be covered by the line: if (!mainFrame()->loader()->subframeLoader()->allowPlugins(NotAboutToInstantiatePlugin)) In Page::pluginData(), which calls settings->arePluginsEnabled(), but allows the client to override the setting. Thanks! 843397 4 jer.noble 2013-02-27 12:46:40 -0800 Committed r144228: <http://trac.webkit.org/changeset/144228> 190575 2013-02-27 12:21:31 -0800 2013-02-27 12:33:38 -0800 Patch bug-111003-20130227121744.patch text/plain 3918 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0MDkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNWFiZGYzNjUzYzFiOTQ5 N2UzYzNhNWVkMjAwYzIyODljNzVlYzA0YS4uZTIxOTZhYzA4NTE3NjgxYzQ2ODE4Yjc1ZWYzNGQ4 ODkzMmQyOWQxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEzLTAyLTI3ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04gKDQ4NTMz KTogRnVsbC1mcmFtZSBwbHVnaW5zIHN0b3BwZWQgd29ya2luZyAoZG93bmxvYWQgaW5zdGVhZCBv ZiBsb2FkaW5nIHRoZSBwbHVnaW4pCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMTEwMDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBBbHNvIHF1ZXJ5IHRoZSBQYWdlJ3MgcGx1Z2luRGF0YSB3aGVuIGRldGVy bWluaW5nIHdoZXRoZXIgYSBnaXZlbiBNSU1FIHR5cGUgY2FuIGJlIHNob3duLgorCisgICAgICAg ICogV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2UuY3BwOgorICAg ICAgICAoV0tCdW5kbGVQYWdlQ2FuU2hvd01JTUVUeXBlKToKKyAgICAgICAgKiBXZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmNhblNob3dN SU1FVHlwZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoKKwogMjAx My0wMi0yNiAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJl dmlld2VkIGJ1aWxkIGZpeDsgdXNlIGNvcnJlY3QgbWFjcm8gZm9yIHBsYXRmb3JtIG5hbWUgaW4g RmVhdHVyZURlZmluZXMueGNjb25maWcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZS5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZS5jcHAKaW5k ZXggMmE1NTM4ZTQ1YzIwYmZmMzRjNzZkMzE4ZDE5NWEwODljYjQ5ODdlNi4uZjNjOGE4MDIwN2Mw NWRiY2I2ZTllMmU2ZDk3YzY3NzkyNzZlOWRhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2UuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdl LmNwcApAQCAtNTAsNyArNTAsNiBAQAogI2luY2x1ZGUgPFdlYkNvcmUvQWNjZXNzaWJpbGl0eU9i amVjdC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvRnJhbWUuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0tV UkwuaD4KLSNpbmNsdWRlIDxXZWJDb3JlL01JTUVUeXBlUmVnaXN0cnkuaD4KICNpbmNsdWRlIDxX ZWJDb3JlL1BhZ2UuaD4KICNpbmNsdWRlIDx3dGYvVW51c2VkUGFyYW0uaD4KIApAQCAtNDQ2LDEx ICs0NDUsOSBAQCB2b2lkIFdLQnVuZGxlUGFnZUNvbmZpcm1Db21wb3NpdGlvbldpdGhUZXh0KFdL QnVuZGxlUGFnZVJlZiBwYWdlUmVmLCBXS1N0cmluZ1JlZgogICAgIHRvSW1wbChwYWdlUmVmKS0+ Y29uZmlybUNvbXBvc2l0aW9uRm9yVGVzdGluZyh0b1dURlN0cmluZyh0ZXh0KSk7CiB9CiAKLWJv b2wgV0tCdW5kbGVQYWdlQ2FuU2hvd01JTUVUeXBlKFdLQnVuZGxlUGFnZVJlZiwgV0tTdHJpbmdS ZWYgbWltZVR5cGVSZWYpCitib29sIFdLQnVuZGxlUGFnZUNhblNob3dNSU1FVHlwZShXS0J1bmRs ZVBhZ2VSZWYgcGFnZVJlZiwgV0tTdHJpbmdSZWYgbWltZVR5cGVSZWYpCiB7Ci0gICAgY29uc3Qg U3RyaW5nIG1pbWVUeXBlID0gdG9XVEZTdHJpbmcobWltZVR5cGVSZWYpOwotCi0gICAgcmV0dXJu IFdlYkNvcmU6Ok1JTUVUeXBlUmVnaXN0cnk6OmNhblNob3dNSU1FVHlwZShtaW1lVHlwZSk7Cisg ICAgcmV0dXJuIHRvSW1wbChwYWdlUmVmKS0+Y2FuU2hvd01JTUVUeXBlKHRvV1RGU3RyaW5nKG1p bWVUeXBlUmVmKSk7CiB9CiAKIHZvaWQgV0tCdW5kbGVQYWdlU2V0Vmlld01vZGUoV0tCdW5kbGVQ YWdlUmVmIHBhZ2VSZWYsIFdLU3RyaW5nUmVmIG1vZGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggYTVhNzE5NDU1YTI3NTQwYTAwY2JhMmRk M2UxMGZlMDNmMDBhYWM5Mi4uM2FlMGE2ZTZkMzBlYjc4MjIxM2FiMGEwMjlhOGRiZjg2YzM2YjIy NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApA QCAtMTAzLDYgKzEwMyw3IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9IVE1MUGx1Z0luRWxlbWVudC5o PgogI2luY2x1ZGUgPFdlYkNvcmUvSGlzdG9yeUl0ZW0uaD4KICNpbmNsdWRlIDxXZWJDb3JlL0tl eWJvYXJkRXZlbnQuaD4KKyNpbmNsdWRlIDxXZWJDb3JlL01JTUVUeXBlUmVnaXN0cnkuaD4KICNp bmNsdWRlIDxXZWJDb3JlL01vdXNlRXZlbnQuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1BhZ2UuaD4K ICNpbmNsdWRlIDxXZWJDb3JlL1BsYXRmb3JtS2V5Ym9hcmRFdmVudC5oPgpAQCAtMzc4Miw0ICsz NzgzLDE3IEBAIHZvaWQgV2ViUGFnZTo6c2V0TWluaW11bUxheW91dFdpZHRoKGRvdWJsZSBtaW5p bXVtTGF5b3V0V2lkdGgpCiAgICAgICAgIGNvcmVQYWdlKCktPm1haW5GcmFtZSgpLT52aWV3KCkt PmVuYWJsZUF1dG9TaXplTW9kZShmYWxzZSwgSW50U2l6ZSgpLCBJbnRTaXplKCkpOwogfQogCiti b29sIFdlYlBhZ2U6OmNhblNob3dNSU1FVHlwZShjb25zdCBTdHJpbmcmIE1JTUVUeXBlKSBjb25z dAoreworICAgIGlmIChNSU1FVHlwZVJlZ2lzdHJ5OjpjYW5TaG93TUlNRVR5cGUoTUlNRVR5cGUp KQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIGlmIChQbHVnaW5EYXRhKiBwbHVnaW5EYXRh ID0gbV9wYWdlLT5wbHVnaW5EYXRhKCkpIHsKKyAgICAgICAgaWYgKHBsdWdpbkRhdGEtPnN1cHBv cnRzTWltZVR5cGUoTUlNRVR5cGUpICYmIG1fcGFnZS0+c2V0dGluZ3MoKS0+YXJlUGx1Z2luc0Vu YWJsZWQoKSkKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKworICAgIHJldHVybiBm YWxzZTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRleCA5N2Y0NmRiNjA3OWUyMzgxN2YzYzI0OTllNzBk OWMzYWE4MTQzMmRhLi42YWVkZTUzNWE0MTAxMjQ5YjQxNWJjNmE4YjkxMTM2MTk0YWZhZjAxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCisr KyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKQEAgLTYwNSw2 ICs2MDUsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRNaW5pbXVtTGF5b3V0V2lkdGgoZG91Ymxl KTsKICAgICBkb3VibGUgbWluaW11bUxheW91dFdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV9taW5p bXVtTGF5b3V0V2lkdGg7IH0KIAorICAgIGJvb2wgY2FuU2hvd01JTUVUeXBlKGNvbnN0IFN0cmlu ZyYgTUlNRVR5cGUpIGNvbnN0OworCiBwcml2YXRlOgogICAgIFdlYlBhZ2UodWludDY0X3QgcGFn ZUlELCBjb25zdCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzJik7CiAK