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

[andersca at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 097cb68888c9492d40917b26b18e13600af90879
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 29 23:22:26 2009 +0000

    https://bugs.webkit.org/show_bug.cgi?id=30932
    <rdar://problem/7350269>
    
    Reviewed by Sam Weinig.
    
    REGRESSION: Crash when turning on Private Browsing on site with flash.
    
    Null check setValue.
    
    * Plugins/WebNetscapePluginView.mm:
    (-[WebNetscapePluginView privateBrowsingModeDidChange]):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50308 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 1951d71..bbd0eb5 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,17 @@
+2009-10-29  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30932
+        <rdar://problem/7350269>
+        
+        REGRESSION: Crash when turning on Private Browsing on site with flash.
+        
+        Null check setValue.
+        
+        * Plugins/WebNetscapePluginView.mm:
+        (-[WebNetscapePluginView privateBrowsingModeDidChange]):
+
 2009-10-29  Eric Carlson  <eric.carlson at apple.com>
 
         Reviewed by Kevin Decker.
diff --git a/WebKit/mac/Plugins/WebNetscapePluginView.mm b/WebKit/mac/Plugins/WebNetscapePluginView.mm
index 135d45a..3ce5e39 100644
--- a/WebKit/mac/Plugins/WebNetscapePluginView.mm
+++ b/WebKit/mac/Plugins/WebNetscapePluginView.mm
@@ -849,7 +849,8 @@ static inline void getNPRect(const NSRect& nr, NPRect& npr)
     [self willCallPlugInFunction];
     {
         JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
-        [_pluginPackage.get() pluginFuncs]->setvalue(plugin, NPNVprivateModeBool, &value);
+        if ([_pluginPackage.get() pluginFuncs]->setvalue)
+            [_pluginPackage.get() pluginFuncs]->setvalue(plugin, NPNVprivateModeBool, &value);
     }
     [self didCallPlugInFunction];
 }

-- 
WebKit Debian packaging