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

[darin]

The following commit has been merged in the debian/unstable branch:
commit dfe0f89f3069c9aac9efa600a50d0e4289c395c7
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 11 08:13:49 2002 +0000

            Reviewed by Maciej.
    
    	- fixed 3124302 -- REGRESSION: Can't use directory.apple.com because
    	frame resize bar intercepts mouse clicks
    
            * WebView.subproj/WebHTMLView.m: (-[WebHTMLView hitTest:]):
    	Don't steal clicks for views that are inside nested WebViews.
            This isn't the real fix, but it's good enough for now. The real fix will be in WebCore.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2997 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index bace13f..c8f49c2 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,16 @@
 2002-12-10  Darin Adler  <darin at apple.com>
 
+        Reviewed by Maciej.
+
+	- fixed 3124302 -- REGRESSION: Can't use directory.apple.com because
+	frame resize bar intercepts mouse clicks
+
+        * WebView.subproj/WebHTMLView.m: (-[WebHTMLView hitTest:]):
+	Don't steal clicks for views that are inside nested WebViews.
+        This isn't the real fix, but it's good enough for now. The real fix will be in WebCore.
+
+2002-12-10  Darin Adler  <darin at apple.com>
+
 	- fixed fix for 3124081 -- REGRESSION: partial progress is left in address field after download
 
         Reviewed by Chris.
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index da3ab62..42b86df 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -926,8 +926,21 @@
 
 - (NSView *)hitTest:(NSPoint)point
 {
-    // We handle all clicks. They are passed along to subviews by WebCore.
-    return [super hitTest:point] ? self : nil;
+    // WebHTMLView objects handle all clicks for objects inside them.
+    // They are passed along to subviews by WebCore.
+    // But this doesn't apply to anything inside nested WebViews.
+    NSView *hitView = [super hitTest:point];
+    NSView *superview = hitView;
+    while (superview) {
+        if (superview == self) {
+            return self;
+        }
+        if ([superview isKindOfClass:[WebView class]]) {
+            return hitView;
+        }
+        superview = [superview superview];
+    }
+    return nil;
 }
 
 @end

-- 
WebKit Debian packaging