diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
| commit | 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (patch) | |
| tree | 988e8c5b116dd0466244ae2fe5af8ee9be926d76 /Source/WebCore/html/HTMLAppletElement.cpp | |
| parent | dd91e772430dc294e3bf478c119ef8d43c0a3358 (diff) | |
| download | qtwebkit-2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47.tar.gz | |
Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)
Diffstat (limited to 'Source/WebCore/html/HTMLAppletElement.cpp')
| -rw-r--r-- | Source/WebCore/html/HTMLAppletElement.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Source/WebCore/html/HTMLAppletElement.cpp b/Source/WebCore/html/HTMLAppletElement.cpp index af63d2677..2274d8dda 100644 --- a/Source/WebCore/html/HTMLAppletElement.cpp +++ b/Source/WebCore/html/HTMLAppletElement.cpp @@ -128,7 +128,16 @@ bool HTMLAppletElement::canEmbedJava() const return false; Settings* settings = document()->settings(); - return settings && settings->isJavaEnabled(); + if (!settings) + return false; + + if (!settings->isJavaEnabled()) + return false; + + if (document()->securityOrigin()->isLocal() && !settings->isJavaEnabledForLocalFiles()) + return false; + + return true; } void HTMLAppletElement::finishParsingChildren() |