[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[abarth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 24770d9b8abd088f716f3d22582637f5def9d9b2
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 16 16:09:31 2010 +0000

    2010-03-16  Adam Barth  <abarth at webkit.org>
    
            Unreviewed.
    
            noscript tag should render when @sandbox disables JavaScript
            https://bugs.webkit.org/show_bug.cgi?id=36092
    
            Add missing "!" in plugin code.  Should fix plugins/embed-inside-object
            on Gtk and Qt.
    
            * plugins/PluginView.cpp:
            (WebCore::PluginView::load):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@56064 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 856d597..cbc7f3c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-03-16  Adam Barth  <abarth at webkit.org>
+
+        Unreviewed.
+
+        noscript tag should render when @sandbox disables JavaScript
+        https://bugs.webkit.org/show_bug.cgi?id=36092
+
+        Add missing "!" in plugin code.  Should fix plugins/embed-inside-object
+        on Gtk and Qt.
+
+        * plugins/PluginView.cpp:
+        (WebCore::PluginView::load):
+
 2010-03-16  Nate Chapin  <japhet at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp
index 2713352..51a43ac 100644
--- a/WebCore/plugins/PluginView.cpp
+++ b/WebCore/plugins/PluginView.cpp
@@ -534,7 +534,7 @@ NPError PluginView::load(const FrameLoadRequest& frameLoadRequest, bool sendNoti
 
     if (!jsString.isNull()) {
         // Return NPERR_GENERIC_ERROR if JS is disabled. This is what Mozilla does.
-        if (m_parentFrame->script()->canExecuteScripts(NotAboutToExecuteScript))
+        if (!m_parentFrame->script()->canExecuteScripts(NotAboutToExecuteScript))
             return NPERR_GENERIC_ERROR;
 
         // For security reasons, only allow JS requests to be made on the frame that contains the plug-in.

-- 
WebKit Debian packaging