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

[mitz at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 3cabfed50fb8ab30ac2bfdca62bc707972f4cb57
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 6 05:11:23 2010 +0000

    Re-enable plug-in halting on Mac after r51953
    
    Reviewed by Mark Rowe.
    
    * WebCoreSupport/WebPluginHalterClient.mm:
    (WebPluginHalterClient::enabled): Test for the correct selector.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52848 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index d7ba342..b45c6a0 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-05  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Mark Rowe.
+
+        Re-enable plug-in halting on Mac after r51953
+
+        * WebCoreSupport/WebPluginHalterClient.mm:
+        (WebPluginHalterClient::enabled): Test for the correct selector.
+
 2010-01-04  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Ada Chan and Mark Rowe.
diff --git a/WebKit/mac/WebCoreSupport/WebPluginHalterClient.mm b/WebKit/mac/WebCoreSupport/WebPluginHalterClient.mm
index 0c87d19..b59c1f2 100644
--- a/WebKit/mac/WebCoreSupport/WebPluginHalterClient.mm
+++ b/WebKit/mac/WebCoreSupport/WebPluginHalterClient.mm
@@ -46,5 +46,5 @@ bool WebPluginHalterClient::shouldHaltPlugin(Node* pluginNode, bool isWindowed,
 
 bool WebPluginHalterClient::enabled() const
 {
-    return [[m_webView UIDelegate] respondsToSelector:@selector(webView:shouldHaltPlugin:)];
+    return [[m_webView UIDelegate] respondsToSelector:@selector(webView:shouldHaltPlugin:isWindowed:pluginName:)];
 }

-- 
WebKit Debian packaging