diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-02 18:04:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-02 18:04:58 (GMT) |
| commit | 8f9d65125dc29b83d133fb879bf934bee74720fa (patch) | |
| tree | b8ee81cfc343cdb0971dde87a29fddec87547d4c /src/3rdparty/webkit/WebCore/loader/FrameLoader.cpp | |
| parent | f101d46ccd4795fc672b5b6c9e24151df319d725 (diff) | |
| parent | 133c95d4e422300305620b5d6bebad65b31f8278 (diff) | |
| download | Qt-8f9d65125dc29b83d133fb879bf934bee74720fa.zip Qt-8f9d65125dc29b83d133fb879bf934bee74720fa.tar.gz Qt-8f9d65125dc29b83d133fb879bf934bee74720fa.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
Updated WebKit to 540ae4ccd25609e1bfe1673195ce126255e36774
Updated WebKit to 2c346f58ae70470d88dcd856bfe59b04a144b65a
Updated WebKit to 1a40220a82197023c1b1ac6eff027be6dd3168d3
Updated WebKit to 2992802f35fd47e32bb94a4b1f48cce7ec7fda9d
Updated WebKit to 862268aeb7150d3795d05bfc05f661bb5c598a27
Diffstat (limited to 'src/3rdparty/webkit/WebCore/loader/FrameLoader.cpp')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/loader/FrameLoader.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/loader/FrameLoader.cpp b/src/3rdparty/webkit/WebCore/loader/FrameLoader.cpp index 0323e97..316caab 100644 --- a/src/3rdparty/webkit/WebCore/loader/FrameLoader.cpp +++ b/src/3rdparty/webkit/WebCore/loader/FrameLoader.cpp @@ -1274,7 +1274,11 @@ bool FrameLoader::requestObject(RenderEmbeddedObject* renderer, const String& ur bool useFallback; if (shouldUsePlugin(completedURL, mimeType, renderer->hasFallbackContent(), useFallback)) { Settings* settings = m_frame->settings(); - if (!allowPlugins(AboutToInstantiatePlugin) + if ((!allowPlugins(AboutToInstantiatePlugin) + // Application plugins are plugins implemented by the user agent, for example Qt plugins, + // as opposed to third-party code such as flash. The user agent decides whether or not they are + // permitted, rather than WebKit. + && !MIMETypeRegistry::isApplicationPluginMIMEType(mimeType)) || (!settings->isJavaEnabled() && MIMETypeRegistry::isJavaAppletMIMEType(mimeType))) return false; if (isDocumentSandboxed(SandboxPlugins)) |