[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 8f95bacfc221414f14ec1e74810a49549a7ef6fd
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 12 21:43:04 2002 +0000

    	Keep the triggering event around on the data source, so it can be
    	used with redirects.
    
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _loadRequest:triggeringEvent:]):
            (-[WebFrame _loadURL:loadType:clientRedirect:triggeringEvent:]):
            (-[WebFrame _postWithURL:data:contentType:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2634 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ba463ef..50b0a49 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2002-11-12  Maciej Stachowiak  <mjs at apple.com>
+
+	Keep the triggering event around on the data source, so it can be
+	used with redirects.
+
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _loadRequest:triggeringEvent:]):
+        (-[WebFrame _loadURL:loadType:clientRedirect:triggeringEvent:]):
+        (-[WebFrame _postWithURL:data:contentType:]):
+
 2002-11-12  Darin Adler  <darin at apple.com>
 
 	- improved the code that manages observing the window and superview
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index ba463ef..50b0a49 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-11-12  Maciej Stachowiak  <mjs at apple.com>
+
+	Keep the triggering event around on the data source, so it can be
+	used with redirects.
+
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _loadRequest:triggeringEvent:]):
+        (-[WebFrame _loadURL:loadType:clientRedirect:triggeringEvent:]):
+        (-[WebFrame _postWithURL:data:contentType:]):
+
 2002-11-12  Darin Adler  <darin at apple.com>
 
 	- improved the code that manages observing the window and superview
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index cf58b2a..f2a40e3 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -957,9 +957,11 @@ static const char * const stateNames[] = {
     [self _recursiveGoToItem:item fromItem:currItem withLoadType:type];
 }
 
-- (void)_loadRequest:(WebResourceRequest *)request
+- (void)_loadRequest:(WebResourceRequest *)request triggeringEvent:(NSEvent *)event
 {
     WebDataSource *newDataSource = [[WebDataSource alloc] initWithRequest:request];
+    [newDataSource _setTriggeringEvent:event];
+
     if ([self setProvisionalDataSource:newDataSource]) {
         [self startLoading];
     }
@@ -1061,6 +1063,7 @@ static const char * const stateNames[] = {
         // that has subframes that are different than what we're displaying (in other words, a link
         // from within a frame is trying to reload the frameset into _top).
         WebDataSource *dataSrc = [self dataSource];
+	[dataSrc _setTriggeringEvent:event];
 
         // save scroll position before we open URL, which will jump to anchor
         [self _saveScrollPositionToItem:[_private currentItem]];
@@ -1082,7 +1085,7 @@ static const char * const stateNames[] = {
         WebFrameLoadType previousLoadType = [self _loadType];
         WebDataSource *oldDataSource = [[self dataSource] retain];
 
-        [self _loadRequest:request];
+        [self _loadRequest:request triggeringEvent:event];
         // NB: must be done after loadRequest:, which sets the provDataSource, which
         //     inits the load type to Standard
         [self _setLoadType:loadType];
@@ -1148,7 +1151,7 @@ static const char * const stateNames[] = {
     [request setData:data];
     [request setContentType:contentType];
     [request setReferrer:[_private->bridge referrer]];
-    [self _loadRequest:request];
+    [self _loadRequest:request triggeringEvent:nil];
     [request release];
 }
 

-- 
WebKit Debian packaging