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

mjs mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:28:47 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit f1ee767927574b11b828ff0420856d09cd684c0f
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 11 09:18:55 2003 +0000

            Reviewed by Dave.
    
    	- fixed 3194221 - REGRESSION: search results loaded in wrong frame at directory.apple.com
    
            * WebView.subproj/WebFramePrivate.m:
            (_postWithURL:referrer:target:data:contentType:triggeringEvent:form:formValues:):
    	Deliver targetted form posts correctly.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3794 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 122bc07..a62b3f4 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2003-03-10  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Dave.
+
+	- fixed 3194221 - REGRESSION: search results loaded in wrong frame at directory.apple.com
+
+        * WebView.subproj/WebFramePrivate.m:
+        (_postWithURL:referrer:target:data:contentType:triggeringEvent:form:formValues:):
+	Deliver targetted form posts correctly.
+	
 2003-03-10  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 0ba874a..1a54616 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -1655,19 +1655,21 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
     NSDictionary *action = [self _actionInformationForLoadType:WebFrameLoadTypeStandard isFormSubmission:YES event:event originalURL:URL];
     WebFormState *formState = [[WebFormState alloc] initWithForm:form values:values];
 
-    WebFrame *targetFrame = self;
-
     if (target != nil) {
 	WebFrame *targetFrame = [self findFrameNamed:target];
-	if (targetFrame == nil) {
-	    [self _checkNewWindowPolicyForRequest:request action:action frameName:target formState:formState andCall:self withSelector:@selector(_continueLoadRequestAfterNewWindowPolicy:frameName:formState:)];
-	    [request release];
-	    [formState release];
+
+	if (targetFrame != nil) {
+	    [targetFrame _postWithURL:URL referrer:referrer target:nil data:data contentType:contentType triggeringEvent:event form:form formValues:values];
 	    return;
 	}
+
+	[self _checkNewWindowPolicyForRequest:request action:action frameName:target formState:formState andCall:self withSelector:@selector(_continueLoadRequestAfterNewWindowPolicy:frameName:formState:)];
+	[request release];
+	[formState release];
+	return;
     }
 
-    [targetFrame _loadRequest:request triggeringAction:action loadType:WebFrameLoadTypeStandard formState:formState];
+    [self _loadRequest:request triggeringAction:action loadType:WebFrameLoadTypeStandard formState:formState];
 
     [request release];
     [formState release];

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list