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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit c2e91507fc1de615bb99e34e87dd6e1f5900749a
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 20 22:19:48 2003 +0000

    WebKit:
    
    	Added _web_superviewOfClass:stoppingAtClass:. Climbs up hierarchy and returns nil when stoppingAtClass is hit.
    
            Reviewed by darin.
    
            * Misc.subproj/WebNSViewExtras.h:
            * Misc.subproj/WebNSViewExtras.m:
            (-[NSView _web_superviewOfClass:stoppingAtClass:]):
            (-[NSView _web_superviewOfClass:]):
    
    WebBrowser:
    
    	Fixed: 3177369 - titles of inactive tabs should appear in the title bar when you roll over the tab
    
            Reviewed by darin.
    
            * BrowserDocument.h:
            * BrowserDocument.m:
            (-[BrowserDocument dealloc]): release _mouseOverWebController
            (-[BrowserDocument displayName]): use _mouseOverWebController if presnt
            (-[BrowserDocument setMouseOverWebController:]): new, sets _mouseOverWebController
            * BrowserWindowController.h:
            * BrowserWindowController.m:
            (-[BrowserWindowController tabBarView:mouseMovedOverButtonForTabViewItem:]): new, called when mouse is moved over/off a tab
            (-[BrowserWindowController synchronizeWindowTitleWithDocumentNameNow]): new, calls synchronizeWindowTitleWithDocumentName
            (-[BrowserWindowController synchronizeWindowTitleWithDocumentNameSoon]): new, calls synchronizeWindowTitleWithDocumentNameNow later
            * FavoriteButton.m:
            (-[FavoriteButton _setAttributes]): new, sets attributes
            (-[FavoriteButton initWithFrame:]): call _setAttributes
            (-[FavoriteButton awakeFromNib]): call _setAttributes
            * RolloverImageButton.m:
            (-[RolloverImageButton _setAttributes]): new, sets attributes
            (-[RolloverImageButton initWithFrame:]): call _setAttributes
            (-[RolloverImageButton awakeFromNib]): call _setAttributes
            * RolloverTrackingButton.h:
            * RolloverTrackingButton.m:
            (-[RolloverTrackingButton mouseEnteredOrExited:]): new, does nothing, overridden be subclasses
            (-[RolloverTrackingButton setRedrawOnMouseEnteredAndExited:]): new
            (-[RolloverTrackingButton redrawOnMouseEnteredAndExited]): new
            (-[RolloverTrackingButton updateMouseIsOver]): check the window and tracking rect
            (-[RolloverTrackingButton removeTrackingRect]): always call updateMouseIsOver
            (-[RolloverTrackingButton updateTrackingRect]): always call updateMouseIsOver
            * TabBarView.h:
            * TabBarView.m:
            (-[TabBarView _layOutButtons]): call updateMouseOverTabButton
            (-[TabBarView dealloc]): release _mouseOverTabButton
            (-[TabBarView _setMouseOverTabButton:]): set _mouseOverTabButton, call delegate
            (-[TabBarView updateMouseOverTabButton]): call updateMouseOverTabButton
            * TabButton.h:
            * TabButton.m: call updateMouseOverTabButton
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3681 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 3dd0fc9..acbbe94 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-02-20  Chris Blumenberg  <cblu at apple.com>
+
+	Added _web_superviewOfClass:stoppingAtClass:. Climbs up hierarchy and returns nil when stoppingAtClass is hit.
+
+        Reviewed by darin.
+
+        * Misc.subproj/WebNSViewExtras.h:
+        * Misc.subproj/WebNSViewExtras.m:
+        (-[NSView _web_superviewOfClass:stoppingAtClass:]):
+        (-[NSView _web_superviewOfClass:]):
+
 2003-02-20  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by David
diff --git a/WebKit/Misc.subproj/WebNSViewExtras.h b/WebKit/Misc.subproj/WebNSViewExtras.h
index 051ddcc..b602169 100644
--- a/WebKit/Misc.subproj/WebNSViewExtras.h
+++ b/WebKit/Misc.subproj/WebNSViewExtras.h
@@ -14,6 +14,10 @@
 // Returns the nearest enclosing view of the given class, or nil if none.
 - (NSView *)_web_superviewOfClass:(Class)class;
 
+// Returns the nearest enclosing view of the given class, or nil if none.
+// Stops searching and returns nil when limitClass is encountered
+- (NSView *)_web_superviewOfClass:(Class)class stoppingAtClass:(Class)limitClass;
+
 // 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 486cefc..365f111 100644
--- a/WebKit/Misc.subproj/WebNSViewExtras.m
+++ b/WebKit/Misc.subproj/WebNSViewExtras.m
@@ -30,20 +30,25 @@
 
 @implementation NSView (WebExtras)
 
-- (NSView *)_web_superviewOfClass:(Class)class
+- (NSView *)_web_superviewOfClass:(Class)class stoppingAtClass:(Class)limitClass
 {
-    NSView *view;
-
-    view = self;
+    NSView *view = self;
     while ((view = [view superview]) != nil) {
         if ([view isKindOfClass:class]) {
             return view;
+        } else if (limitClass && [view isKindOfClass:limitClass]) {
+            break;
         }
     }
 
     return nil;
 }
 
+- (NSView *)_web_superviewOfClass:(Class)class
+{
+    return [self _web_superviewOfClass:class stoppingAtClass:nil];
+}
+
 - (WebView *)_web_parentWebView
 {
     WebView *view = (WebView *)[[[self superview] superview] superview];

-- 
WebKit Debian packaging