[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit 790cff9d8ccf3ca8d37cdd9e7bf1bbe05dd53095
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 7 17:43:40 2002 +0000

    WebKit:
    
            * Misc.subproj/WebNSViewExtras.h:
            * Misc.subproj/WebNSViewExtras.m:
            (-[NSView _web_superviewOfClass:]): Changed name from
    	_web_superviewWithName: and made it take a Class object
    	instead of a string.
    
            * Plugins.subproj/WebNullPluginView.m:
            (-[WebNullPluginView drawRect:]):
            * Plugins.subproj/WebPluginView.m:
            (-[WebPluginView start]):
            (-[WebPluginView layout]):
    	Updated callers of _web_superviewWithName:
    
            * WebKit.pbproj/project.pbxproj: Changed WebNSViewExtras.h from
    	Public to Private
    
    WebBrowser:
    
            * BrowserNSViewExtras.h,
            * BrowserNSViewExtras.m: Remove superviewOfClass now that it's
    	in WebKit
    
            * ActivityViewer.m:
            (-[ActivityViewer bestSizeForWindowContent]):
    	Use _web_superviewOfClass:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1766 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 77a1743..88fa5c3 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,21 @@
+2002-08-07  John Sullivan  <sullivan at apple.com>
+
+        * Misc.subproj/WebNSViewExtras.h:
+        * Misc.subproj/WebNSViewExtras.m:
+        (-[NSView _web_superviewOfClass:]): Changed name from
+	_web_superviewWithName: and made it take a Class object
+	instead of a string.
+
+        * Plugins.subproj/WebNullPluginView.m:
+        (-[WebNullPluginView drawRect:]):
+        * Plugins.subproj/WebPluginView.m:
+        (-[WebPluginView start]):
+        (-[WebPluginView layout]):
+	Updated callers of _web_superviewWithName:
+
+        * WebKit.pbproj/project.pbxproj: Changed WebNSViewExtras.h from
+	Public to Private
+
 2002-08-06  Darin Adler  <darin at apple.com>
 
 	Fix assert I saw while fixing bug 2965321.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 77a1743..88fa5c3 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,21 @@
+2002-08-07  John Sullivan  <sullivan at apple.com>
+
+        * Misc.subproj/WebNSViewExtras.h:
+        * Misc.subproj/WebNSViewExtras.m:
+        (-[NSView _web_superviewOfClass:]): Changed name from
+	_web_superviewWithName: and made it take a Class object
+	instead of a string.
+
+        * Plugins.subproj/WebNullPluginView.m:
+        (-[WebNullPluginView drawRect:]):
+        * Plugins.subproj/WebPluginView.m:
+        (-[WebPluginView start]):
+        (-[WebPluginView layout]):
+	Updated callers of _web_superviewWithName:
+
+        * WebKit.pbproj/project.pbxproj: Changed WebNSViewExtras.h from
+	Public to Private
+
 2002-08-06  Darin Adler  <darin at apple.com>
 
 	Fix assert I saw while fixing bug 2965321.
diff --git a/WebKit/Misc.subproj/WebNSViewExtras.h b/WebKit/Misc.subproj/WebNSViewExtras.h
index 0ffbcc6..2adf955 100644
--- a/WebKit/Misc.subproj/WebNSViewExtras.h
+++ b/WebKit/Misc.subproj/WebNSViewExtras.h
@@ -9,8 +9,8 @@
 
 @interface NSView (WebExtras)
 
-// Finds the first superview with the provided name. Returns nil if none is found.
-- (NSView *) _web_superviewWithName:(NSString *)viewName;
+// Returns the nearest enclosing view of the given class, or nil if none.
+- (NSView *)_web_superviewOfClass:(Class)class;
 
 // Returns the first WebView superview. Only works if self is the WebView's document view.
 - (WebView *)_web_parentWebView;
diff --git a/WebKit/Misc.subproj/WebNSViewExtras.m b/WebKit/Misc.subproj/WebNSViewExtras.m
index 86aff21..393e47b 100644
--- a/WebKit/Misc.subproj/WebNSViewExtras.m
+++ b/WebKit/Misc.subproj/WebNSViewExtras.m
@@ -22,17 +22,17 @@
 
 @implementation NSView (WebExtras)
 
-- (NSView *) _web_superviewWithName:(NSString *)viewName
+- (NSView *)_web_superviewOfClass:(Class)class
 {
     NSView *view;
-    
+
     view = self;
-    while(view){
-        view = [view superview];
-        if([[view className] isEqualToString:viewName]){
+    while ((view = [view superview]) != nil) {
+        if ([view isKindOfClass:class]) {
             return view;
         }
     }
+
     return nil;
 }
 
diff --git a/WebKit/Plugins.subproj/WebNullPluginView.m b/WebKit/Plugins.subproj/WebNullPluginView.m
index f17eac2..edcb599 100644
--- a/WebKit/Plugins.subproj/WebNullPluginView.m
+++ b/WebKit/Plugins.subproj/WebNullPluginView.m
@@ -50,11 +50,11 @@ static NSImage *image = nil;
 - (void)drawRect:(NSRect)rect {
     WebView *webView;
     WebController *webController;
-    
+
     [super drawRect:rect];
     if(!errorSent){
         errorSent = YES;
-        webView = (WebView *)[self _web_superviewWithName:@"WebView"];
+        webView = (WebView *)[self _web_superviewOfClass:[WebView class]];
         webController = [webView controller];
         [[webController policyHandler] pluginNotFoundForMIMEType:mimeType pluginPageURL:pluginPage];
     }
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index 0796135..3fbd060 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -539,8 +539,8 @@
     
     if ([theWindow isKeyWindow])
         [self sendActivateEvent:YES];
-    
-    WebView *webView = (WebView *)[self _web_superviewWithName:@"WebView"];
+
+    WebView *webView = (WebView *)[self _web_superviewOfClass:[WebView class]];
     webController = [[webView controller] retain];
     webFrame = 	    [[webController frameForView:webView] retain];
     webDataSource = [[webFrame dataSource] retain];
@@ -659,7 +659,7 @@
  
 - (void)layout
 {
-    NSRect superFrame = [[self _web_superviewWithName:@"WebView"] frame];
+    NSRect superFrame = [[self _web_superviewOfClass:[WebView class]] frame];
     
     [self setFrame:NSMakeRect(0, 0, superFrame.size.width, superFrame.size.height)];
     [self setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index c4d08da..d3a0730 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -1390,7 +1390,7 @@
 			isa = PBXBuildFile;
 			settings = {
 				ATTRIBUTES = (
-					Public,
+					Private,
 				);
 			};
 		};

-- 
WebKit Debian packaging