[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 b6e9d55ef070307a19215187ae880b1425ad088c
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 3 06:41:47 2003 +0000

            Reviewed by Trey.
    
    	- fixed 3213556 - VIP: parent.mainFrameWidth=undefined on page refresh results in missing content
    
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _loadItem:withLoadType:]): When reload or going back/forward,
    	make sure to load the original URL of the item, not it's most recent URL.
            (-[WebFrame _loadURL:intoChild:]): Likewise.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4011 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 33cf27a..ebaca91 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-04-02  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Trey.
+
+	- fixed 3213556 - VIP: parent.mainFrameWidth=undefined on page refresh results in missing content
+
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _loadItem:withLoadType:]): When reload or going back/forward,
+	make sure to load the original URL of the item, not it's most recent URL.
+        (-[WebFrame _loadURL:intoChild:]): Likewise.
+
 2003-04-02  Richard Williamson  <rjw at apple.com>
 
         Raise exceptions when these methods are called inappropriately.
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 9ea2caa..f7527ad 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -1055,6 +1055,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
 - (void)_loadItem:(WebHistoryItem *)item withLoadType:(WebFrameLoadType)loadType
 {
     NSURL *itemURL = [item URL];
+    NSURL *itemOriginalURL = [NSURL URLWithString:[item originalURLString]];
     NSURL *currentURL = [[[self dataSource] request] URL];
     NSData *formData = [item formData];
 
@@ -1094,7 +1095,10 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
             [self _loadDataSource:newDataSource withLoadType:loadType formState:nil];            
         }
         else {
-            NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:itemURL];
+	    // Use the original URL to ensure we get all the side-effects, such as
+	    // onLoad handlers, of any redirects that happened. An example of where
+	    // this is needed is Radar 3213556.
+            NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:itemOriginalURL];
             [self _addExtraFieldsToRequest:request alwaysFromRequest: (formData != nil)?YES:NO];
 
             // If this was a repost that failed the page cache, we might try to repost the form.
@@ -1144,7 +1148,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
                         ASSERT_NOT_REACHED();
                 }
 
-                action = [self _actionInformationForLoadType:loadType isFormSubmission:NO event:nil originalURL:itemURL];
+                action = [self _actionInformationForLoadType:loadType isFormSubmission:NO event:nil originalURL:itemOriginalURL];
             }
 
             [self _loadRequest:request triggeringAction:action loadType:loadType formState:nil];
@@ -1635,7 +1639,10 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
     {
         childItem = [parentItem childItemWithName:[childFrame name]];
         if (childItem) {
-            URL = [childItem URL];
+	    // Use the original URL to ensure we get all the side-effects, such as
+	    // onLoad handlers, of any redirects that happened. An example of where
+	    // this is needed is Radar 3213556.
+            URL = [NSURL URLWithString:[childItem originalURLString]];
             // These behaviors implied by these loadTypes should apply to the child frames
             childLoadType = loadType;
 

-- 
WebKit Debian packaging