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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit a090b3ffa425ed123e2c592c8c33ef7a4bdac520
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 8 01:29:56 2002 +0000

    	- fixed 3095628 - REGRESSION: exception when clicking on link to load content into iframe
    
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _actionInformationForNavigationType:event:]): Get the
    	element info from the HTML view where the click originally
    	happened, not the current document view. Add some asserts to make
    	sure this is working.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2591 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 52fe651..a634db5 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2002-11-07  Maciej Stachowiak  <mjs at apple.com>
+
+	- fixed 3095628 - REGRESSION: exception when clicking on link to load content into iframe
+	
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _actionInformationForNavigationType:event:]): Get the
+	element info from the HTML view where the click originally
+	happened, not the current document view. Add some asserts to make
+	sure this is working.
+
 2002-11-07  Richard Williamson  <rjw at apple.com>
 
         * ChangeLog:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 52fe651..a634db5 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-11-07  Maciej Stachowiak  <mjs at apple.com>
+
+	- fixed 3095628 - REGRESSION: exception when clicking on link to load content into iframe
+	
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _actionInformationForNavigationType:event:]): Get the
+	element info from the HTML view where the click originally
+	happened, not the current document view. Add some asserts to make
+	sure this is working.
+
 2002-11-07  Richard Williamson  <rjw at apple.com>
 
         * ChangeLog:
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 7250c58..7a0f9ac 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -788,8 +788,15 @@ static const char * const stateNames[] = {
     case WebNavigationTypeLinkClicked:
     case WebNavigationTypeFormSubmitted:
 	;
-	NSPoint point = [[[self webView] documentView] convertPoint:[event locationInWindow] fromView:nil];
-	NSDictionary *elementInfo = [(WebHTMLView *)[[self webView] documentView] _elementAtPoint:point];
+
+	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,

-- 
WebKit Debian packaging