[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 a149cb3e3d3165131c0d609884592d3ba1df48be
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 5 23:19:58 2003 +0000

            Reviewed by Darin.
    
    	- fixed crash when going back due to frame name of nil since we
    	don't force the name "_top" any more.
    
            * WebView.subproj/WebController.m:
            (-[WebController _goToItem:withLoadType:]): Handle nil target
    	properly.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3754 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 74d5510..fe1a368 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-03-05  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
+	- fixed crash when going back due to frame name of nil since we
+	don't force the name "_top" any more.
+	
+        * WebView.subproj/WebController.m:
+        (-[WebController _goToItem:withLoadType:]): Handle nil target
+	properly.
+
 2003-03-05  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebKit/WebView.subproj/WebController.m b/WebKit/WebView.subproj/WebController.m
index 06994ce..ef1f705 100644
--- a/WebKit/WebView.subproj/WebController.m
+++ b/WebKit/WebView.subproj/WebController.m
@@ -287,14 +287,12 @@ NSString *WebElementLinkTitleKey = 		@"WebElementLinkTitle";
 
 - (void)_goToItem: (WebHistoryItem *)item withLoadType: (WebFrameLoadType)type
 {
-    WebFrame *targetFrame;
+    // We never go back/forward on a per-frame basis, so the target must be the main frame
+    ASSERT([item target] == nil || [self _findFrameNamed:[item target]] == [self mainFrame]);
 
     // abort any current load if we're going back/forward
     [[self mainFrame] stopLoading];
-    targetFrame = [self _findFrameNamed: [item target]];
-    // We never go back/forward on a per-frame basis, so the target must be the main frame
-    ASSERT(targetFrame != nil && targetFrame == [self mainFrame]);
-    [targetFrame _goToItem: item withLoadType: type];
+    [[self mainFrame] _goToItem: item withLoadType: type];
 }
 
 - (BOOL)goBack
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 06994ce..ef1f705 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -287,14 +287,12 @@ NSString *WebElementLinkTitleKey = 		@"WebElementLinkTitle";
 
 - (void)_goToItem: (WebHistoryItem *)item withLoadType: (WebFrameLoadType)type
 {
-    WebFrame *targetFrame;
+    // We never go back/forward on a per-frame basis, so the target must be the main frame
+    ASSERT([item target] == nil || [self _findFrameNamed:[item target]] == [self mainFrame]);
 
     // abort any current load if we're going back/forward
     [[self mainFrame] stopLoading];
-    targetFrame = [self _findFrameNamed: [item target]];
-    // We never go back/forward on a per-frame basis, so the target must be the main frame
-    ASSERT(targetFrame != nil && targetFrame == [self mainFrame]);
-    [targetFrame _goToItem: item withLoadType: type];
+    [[self mainFrame] _goToItem: item withLoadType: type];
 }
 
 - (BOOL)goBack

-- 
WebKit Debian packaging