[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit f4ac785ebd1fb970bffbd491a1a175c198ecd4fa
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 29 22:09:47 2010 +0000

    2010-07-29  Bernhard Bauer  <bauerb at chromium.org>
    
            Reviewed by Darin Fisher.
    
            Check if plugins are allowed before creating a Java applet.
            https://bugs.webkit.org/show_bug.cgi?id=43196
    
            * loader/SubframeLoader.cpp:
            (WebCore::SubframeLoader::createJavaAppletWidget):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64311 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1c10d2a..1854cd5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-29  Bernhard Bauer  <bauerb at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Check if plugins are allowed before creating a Java applet.
+        https://bugs.webkit.org/show_bug.cgi?id=43196
+
+        * loader/SubframeLoader.cpp:
+        (WebCore::SubframeLoader::createJavaAppletWidget):
+
 2010-07-29  James Robinson  <jamesr at chromium.org>
 
         Reviewed by Simon Fraser.
diff --git a/WebCore/loader/SubframeLoader.cpp b/WebCore/loader/SubframeLoader.cpp
index 2821a50..e7dafa1 100644
--- a/WebCore/loader/SubframeLoader.cpp
+++ b/WebCore/loader/SubframeLoader.cpp
@@ -226,7 +226,9 @@ PassRefPtr<Widget> SubframeLoader::createJavaAppletWidget(const IntSize& size, H
         baseURLString = m_frame->document()->baseURL().string();
     KURL baseURL = completeURL(baseURLString);
 
-    RefPtr<Widget> widget = m_frame->loader()->client()->createJavaAppletWidget(size, element, baseURL, paramNames, paramValues);
+    RefPtr<Widget> widget;
+    if (allowPlugins(AboutToInstantiatePlugin))
+        widget = m_frame->loader()->client()->createJavaAppletWidget(size, element, baseURL, paramNames, paramValues);
     if (!widget)
         return 0;
 

-- 
WebKit Debian packaging