[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 57dfc4da1386b814ce15be02252ecb4aee39c01a
Author: kdecker at apple.com <kdecker at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Oct 17 05:15:57 2009 +0000

            Reviewed by Jon Honeycutt.
    
            <rdar://problem/7304575>
    
            * Plugins/WebBaseNetscapePluginView.h: Added new boolean ivar and -hasBeenHalted instance method.
            * Plugins/WebBaseNetscapePluginView.mm:
            (-[WebBaseNetscapePluginView halt]):Update _hasBeenHalted.
            (-[WebBaseNetscapePluginView hasBeenHalted]): Added.
            * WebView/WebView.mm:
            (+[WebView _hasPluginForNodeBeenHalted:]): Checks to see if a plug-in node's been halted.
            * WebView/WebViewPrivate.h: Added -_hasPluginForNodeBeenHalted method.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49733 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 531b8dd..83f4ea3 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,5 +1,19 @@
 2009-10-16  Kevin Decker  <kdecker at apple.com>
 
+        Reviewed by Jon Honeycutt.
+
+        <rdar://problem/7304575>
+        
+        * Plugins/WebBaseNetscapePluginView.h: Added new boolean ivar and -hasBeenHalted instance method.
+        * Plugins/WebBaseNetscapePluginView.mm:
+        (-[WebBaseNetscapePluginView halt]):Update _hasBeenHalted.
+        (-[WebBaseNetscapePluginView hasBeenHalted]): Added.
+        * WebView/WebView.mm:
+        (+[WebView _hasPluginForNodeBeenHalted:]): Checks to see if a plug-in node's been halted.
+        * WebView/WebViewPrivate.h: Added -_hasPluginForNodeBeenHalted method.
+
+2009-10-16  Kevin Decker  <kdecker at apple.com>
+
         Reviewed by Anders Carlson.
 
         Small code cleanup
diff --git a/WebKit/mac/Plugins/WebBaseNetscapePluginView.h b/WebKit/mac/Plugins/WebBaseNetscapePluginView.h
index e37f3f0..246fcf1 100644
--- a/WebKit/mac/Plugins/WebBaseNetscapePluginView.h
+++ b/WebKit/mac/Plugins/WebBaseNetscapePluginView.h
@@ -64,6 +64,7 @@ class WebHaltablePlugin;
     BOOL _isCompletelyObscured;
     BOOL _isPrivateBrowsingEnabled;
     BOOL _isHalted;
+    BOOL _hasBeenHalted;
     
     RefPtr<WebCore::HTMLPlugInElement> _element;
     RetainPtr<NSString> _MIMEType;
@@ -114,6 +115,7 @@ class WebHaltablePlugin;
 - (void)halt;
 - (void)resumeFromHalt;
 - (BOOL)isHalted;
+- (BOOL)hasBeenHalted;
 
 - (void)addWindowObservers;
 - (void)removeWindowObservers;
diff --git a/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm b/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
index 00526db..18e2824 100644
--- a/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
+++ b/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
@@ -493,7 +493,8 @@ Node* WebHaltablePlugin::node() const
     ASSERT(element->renderer());
     toRenderWidget(element->renderer())->showSubstituteImage(nodeImage);
     [self stop];
-    _isHalted = YES;    
+    _isHalted = YES;  
+    _hasBeenHalted = YES;
 }
 
 - (void)resumeFromHalt
@@ -513,6 +514,11 @@ Node* WebHaltablePlugin::node() const
     return _isHalted;
 }
 
+- (BOOL)hasBeenHalted
+{
+    return _hasBeenHalted;
+}
+
 - (void)viewWillMoveToWindow:(NSWindow *)newWindow
 {
     // We must remove the tracking rect before we move to the new window.
diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm
index ac851d8..19b441c 100644
--- a/WebKit/mac/WebView/WebView.mm
+++ b/WebKit/mac/WebView/WebView.mm
@@ -2145,6 +2145,10 @@ static WebBaseNetscapePluginView *_pluginViewForNode(DOMNode *node)
     return [_pluginViewForNode(node) isHalted];
 }
 
++ (BOOL)_hasPluginForNodeBeenHalted:(DOMNode *)node
+{
+    return [_pluginViewForNode(node) hasBeenHalted];
+}
 + (void)_restartHaltedPluginForNode:(DOMNode *)node
 {
     if (!node)
diff --git a/WebKit/mac/WebView/WebViewPrivate.h b/WebKit/mac/WebView/WebViewPrivate.h
index 066c81b..99bd5fa 100644
--- a/WebKit/mac/WebView/WebViewPrivate.h
+++ b/WebKit/mac/WebView/WebViewPrivate.h
@@ -464,6 +464,7 @@ Could be worth adding to the API.
 
 // SPI for PluginHalter
 + (BOOL)_isNodeHaltedPlugin:(DOMNode *)node;
++ (BOOL)_hasPluginForNodeBeenHalted:(DOMNode *)node;
 + (void)_restartHaltedPluginForNode:(DOMNode *)node;
 
 // Which pasteboard text is coming from in editing delegate methods such as shouldInsertNode.

-- 
WebKit Debian packaging