[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 4dc4e198f892d94b49782541986f10f7b2b6c272
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 16 00:42:38 2002 +0000

            Reviewed by Dave.
    
    	- fixed 3128651 -- REGRESSION: Mouse wheeling is busted on frames pages
    
            * WebView.subproj/WebHTMLViewPrivate.m: (-[WebHTMLView hitTest:]):
    	Only do the hitTest magic for left mouse downs; the rest of the clicks end up going
    	to the correct view anyway, without our help. This makes this stop making trouble for
    	the scroll wheel events.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3065 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8b0bbd1..e126d8a 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2002-12-15  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+	- fixed 3128651 -- REGRESSION: Mouse wheeling is busted on frames pages
+
+        * WebView.subproj/WebHTMLViewPrivate.m: (-[WebHTMLView hitTest:]):
+	Only do the hitTest magic for left mouse downs; the rest of the clicks end up going
+	to the correct view anyway, without our help. This makes this stop making trouble for
+	the scroll wheel events.
+
 2002-12-14  Don Melton  <gramps at apple.com>
 
 	Fixed 3127173 -- REGRESSION: fboweb.com renders incorrectly
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index 5c9ea0d..e0cceeb 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -24,7 +24,7 @@
 #import <WebKit/WebViewPrivate.h>
 #import <WebKit/WebWindowOperationsDelegate.h>
 
-static BOOL doRealHitTest = NO;
+static BOOL forceRealHitTest = NO;
 
 @interface NSView (AppKitSecretsIKnowAbout)
 - (void)_recursiveDisplayRectIfNeededIgnoringOpacity:(NSRect)rect isVisibleRect:(BOOL)isVisibleRect rectIsVisibleRectForView:(NSView *)visibleView topView:(BOOL)topView;
@@ -271,21 +271,18 @@ static BOOL doRealHitTest = NO;
 
 - (NSView *)hitTest:(NSPoint)point
 {
-    // Keep real hitTest: available for use below.
-    if (doRealHitTest) {
-        return [super hitTest:point];
-    }
     // WebHTMLView objects handle all clicks for objects inside them.
-    return [[self superview] mouse:point inRect:[self frame]] ? self : nil;
+    BOOL realHitTest = forceRealHitTest || [[[self window] currentEvent] type] != NSLeftMouseDown;
+    return realHitTest ? [super hitTest:point] : [[self superview] mouse:point inRect:[self frame]] ? self : nil;
 }
 
 - (void)_updateMouseoverWithEvent:(NSEvent *)event
 {
     WebHTMLView *view = nil;
     if ([event window] == [self window]) {
-        doRealHitTest = YES;
+        forceRealHitTest = YES;
         NSView *hitView = [[[self window] contentView] hitTest:[event locationInWindow]];
-        doRealHitTest = NO;
+        forceRealHitTest = NO;
         while (hitView) {
             if ([hitView isKindOfClass:[WebHTMLView class]]) {
                 view = (WebHTMLView *)hitView;

-- 
WebKit Debian packaging