[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 bda76953ce342cd5158baec451edc62541f4f76e
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 5 06:29:02 2002 +0000

            Reviewed by Maciej.
    
    	- fixed assert when you choose an item from a menu, for example, and that navigates
    
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _actionInformationForNavigationType:event:originalURL:]):
    	If the event is over some other element, just don't include the element info.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2941 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index b851baf..2a7c5fc 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2002-12-04  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+	- fixed assert when you choose an item from a menu, for example, and that navigates
+
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _actionInformationForNavigationType:event:originalURL:]):
+	If the event is over some other element, just don't include the element info.
+
 2002-12-04  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: 3116294 - Need "Reload" feature in Downloads window
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index c794668..acd1662 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -1016,22 +1016,22 @@ static const char * const loadTypeNames[] = {
         {
             NSView *topViewInEventWindow = [[event window] contentView];
             NSView *viewContainingPoint = [topViewInEventWindow hitTest:[topViewInEventWindow convertPoint:[event locationInWindow] fromView:nil]];
-    
-            ASSERT(viewContainingPoint != nil);
-            ASSERT([viewContainingPoint isKindOfClass:[WebHTMLView class]]);
-    
-            NSPoint point = [viewContainingPoint convertPoint:[event locationInWindow] fromView:nil];
-            NSDictionary *elementInfo = [(WebHTMLView *)viewContainingPoint _elementAtPoint:point];
-    
-            return [NSDictionary dictionaryWithObjectsAndKeys:
-                [NSNumber numberWithInt:navigationType], WebActionNavigationTypeKey,
-                elementInfo, WebActionElementKey,
-                [NSNumber numberWithInt:[event buttonNumber]], WebActionButtonKey,
-                [NSNumber numberWithInt:[event modifierFlags]], WebActionModifierFlagsKey,
-                URL, WebActionOriginalURLKey,
-                nil];
+            if ([viewContainingPoint isKindOfClass:[WebHTMLView class]]) {
+                NSPoint point = [viewContainingPoint convertPoint:[event locationInWindow] fromView:nil];
+                NSDictionary *elementInfo = [(WebHTMLView *)viewContainingPoint _elementAtPoint:point];
+        
+                return [NSDictionary dictionaryWithObjectsAndKeys:
+                    [NSNumber numberWithInt:navigationType], WebActionNavigationTypeKey,
+                    elementInfo, WebActionElementKey,
+                    [NSNumber numberWithInt:[event buttonNumber]], WebActionButtonKey,
+                    [NSNumber numberWithInt:[event modifierFlags]], WebActionModifierFlagsKey,
+                    URL, WebActionOriginalURLKey,
+                    nil];
+            }
         }
         
+        // fall through
+        
         default:
             return [NSDictionary dictionaryWithObjectsAndKeys:
                 [NSNumber numberWithInt:navigationType], WebActionNavigationTypeKey,

-- 
WebKit Debian packaging