[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[darin at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 53af91e55922817f202463dc95a5448b5bbf7cb8
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 12 21:02:02 2010 +0000

    Removed unneeded custom implementation of isDescendantOf.
    
    Reviewed by Sam Weinig.
    
    * Plugins/WebBaseNetscapePluginView.mm:
    (-[WebBaseNetscapePluginView shouldClipOutPlugin]): Use the
    -[NSView isDescendantOf:] method instead of our own method
    named superviewsHaveSuperviews.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54733 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index b545a40..84b153e 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-12  Darin Adler  <darin at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Removed unneeded custom implementation of isDescendantOf.
+
+        * Plugins/WebBaseNetscapePluginView.mm:
+        (-[WebBaseNetscapePluginView shouldClipOutPlugin]): Use the
+        -[NSView isDescendantOf:] method instead of our own method
+        named superviewsHaveSuperviews.
+
 2010-02-12  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm b/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
index e93509a..30404b8 100644
--- a/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
+++ b/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
@@ -545,20 +545,10 @@ String WebHaltablePlugin::pluginName() const
     return _isHalted;
 }
 
-- (BOOL)superviewsHaveSuperviews
-{
-    NSView *contentView = [[self window] contentView];
-    for (NSView *view = self; view; view = [view superview]) { 
-        if (view == contentView) 
-            return YES;
-    }
-    return NO;
-}
-
 - (BOOL)shouldClipOutPlugin
 {
     NSWindow *window = [self window];
-    return !window || [window isMiniaturized] || [NSApp isHidden] || ![self superviewsHaveSuperviews] || [self isHiddenOrHasHiddenAncestor];
+    return !window || [window isMiniaturized] || [NSApp isHidden] || ![self isDescendantOf:[[self window] contentView]] || [self isHiddenOrHasHiddenAncestor];
 }
     
 - (BOOL)hasBeenHalted

-- 
WebKit Debian packaging