[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[kdecker at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 165120a80ee92e758940a7a443237264d6e8fc8a
Author: kdecker at apple.com <kdecker at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 16 20:57:49 2009 +0000

            Reviewed by Anders Carlson.
    
            Last part of:
            <rdar://problem/7273354>
    
            * WebView/WebView.mm:
            (_pluginViewForNode): Added with code extracted from _isNodeHaltedPlugin
            (+[WebView _isNodeHaltedPlugin:]): Made this a class method.
            (+[WebView _restartHaltedPluginForNode:]): Added. Restarts a plug-in
            * WebView/WebViewPrivate.h: Added +_restartHaltedPluginForNode to header.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49696 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 326422e..4c0fdfe 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,5 +1,18 @@
 2009-10-16  Kevin Decker  <kdecker at apple.com>
 
+        Reviewed by Anders Carlson.
+
+        Last part of:
+        <rdar://problem/7273354>
+
+        * WebView/WebView.mm: 
+        (_pluginViewForNode): Added with code extracted from _isNodeHaltedPlugin
+        (+[WebView _isNodeHaltedPlugin:]): Made this a class method.
+        (+[WebView _restartHaltedPluginForNode:]): Added. Restarts a plug-in
+        * WebView/WebViewPrivate.h: Added +_restartHaltedPluginForNode to header.
+
+2009-10-16  Kevin Decker  <kdecker at apple.com>
+
         Reviewed by Anders.
 
         <rdar://problem/7273354> 
diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm
index d8c551c..b1955d9 100644
--- a/WebKit/mac/WebView/WebView.mm
+++ b/WebKit/mac/WebView/WebView.mm
@@ -2116,28 +2116,41 @@ static inline IMP getMethod(id o, SEL s)
 #endif
 }
 
-- (BOOL)_isNodeHaltedPlugin:(DOMNode *)node
+static WebBaseNetscapePluginView *_pluginViewForNode(DOMNode *node)
 {
     if (!node)
-        return NO;
-        
+        return nil;
+    
     Node* coreNode = core(node);
     if (!coreNode)
-        return NO;
+        return nil;
     
     RenderObject* renderer = coreNode->renderer();
     if (!renderer)
-        return NO;
+        return nil;
     
     Widget* widget = toRenderWidget(renderer)->widget();
     if (!widget || !widget->platformWidget())
-        return NO;
-
+        return nil;
+    
     NSView *view = widget->platformWidget();
     if (![view isKindOfClass:[WebBaseNetscapePluginView class]])
-        return NO;
+        return nil;
+    
+    return (WebBaseNetscapePluginView *)view;
+}
+
++ (BOOL)_isNodeHaltedPlugin:(DOMNode *)node
+{
+    return [_pluginViewForNode(node) isHalted];
+}
+
++ (void)_restartHaltedPluginForNode:(DOMNode *)node
+{
+    if (!node)
+        return;
     
-    return [(WebBaseNetscapePluginView *)view isHalted];
+    [_pluginViewForNode(node) resumeFromHalt];
 }
 
 - (NSPasteboard *)_insertionPasteboard
diff --git a/WebKit/mac/WebView/WebViewPrivate.h b/WebKit/mac/WebView/WebViewPrivate.h
index 2b32e6e..066c81b 100644
--- a/WebKit/mac/WebView/WebViewPrivate.h
+++ b/WebKit/mac/WebView/WebViewPrivate.h
@@ -463,7 +463,8 @@ Could be worth adding to the API.
 - (BOOL)_isUsingAcceleratedCompositing;
 
 // SPI for PluginHalter
-- (BOOL)_isNodeHaltedPlugin:(DOMNode *)node;
++ (BOOL)_isNodeHaltedPlugin:(DOMNode *)node;
++ (void)_restartHaltedPluginForNode:(DOMNode *)node;
 
 // Which pasteboard text is coming from in editing delegate methods such as shouldInsertNode.
 - (NSPasteboard *)_insertionPasteboard;

-- 
WebKit Debian packaging