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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit fc2f734b3714b415b8818712ce5cd9e6fb724821
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jun 5 20:25:26 2002 +0000

        Cleaned up call to frameNamed:.  Now use frame relative naming.
        Fixed various frame related bugs (including www.heinz.com).
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1277 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 6cea47d..436a9bd 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-06-05  Richard Williamson  <rjw at apple.com>
+
+    Cleaned up call to frameNamed:.  Now use frame relative naming.
+    Fixed various frame related bugs.
+    
+	* kwq/KWQKHTMLPart.mm:
+	(KWQKHTMLPartImpl::urlSelected):
+	* kwq/external.h:
+
 2002-06-04  Richard Williamson  <rjw at apple.com>
 
 	* kwq/KWQKHTMLPart.mm:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 6cea47d..436a9bd 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2002-06-05  Richard Williamson  <rjw at apple.com>
+
+    Cleaned up call to frameNamed:.  Now use frame relative naming.
+    Fixed various frame related bugs.
+    
+	* kwq/KWQKHTMLPart.mm:
+	(KWQKHTMLPartImpl::urlSelected):
+	* kwq/external.h:
+
 2002-06-04  Richard Williamson  <rjw at apple.com>
 
 	* kwq/KWQKHTMLPart.mm:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6cea47d..436a9bd 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2002-06-05  Richard Williamson  <rjw at apple.com>
+
+    Cleaned up call to frameNamed:.  Now use frame relative naming.
+    Fixed various frame related bugs.
+    
+	* kwq/KWQKHTMLPart.mm:
+	(KWQKHTMLPartImpl::urlSelected):
+	* kwq/external.h:
+
 2002-06-04  Richard Williamson  <rjw at apple.com>
 
 	* kwq/KWQKHTMLPart.mm:
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index fe8772a..e116d79 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -400,7 +400,7 @@ void KWQKHTMLPartImpl::urlSelected( const QString &url, int button, int state, c
 {
     IFWebDataSource *oldDataSource, *newDataSource;
     KURL clickedURL(part->completeURL( url));
-    IFWebFrame *frame;
+    IFWebFrame *frame, *currentFrame;
     KURL refLess(clickedURL);
 	
     if ( url.find( QString::fromLatin1( "javascript:" ), 0, false ) == 0 )
@@ -423,18 +423,25 @@ void KWQKHTMLPartImpl::urlSelected( const QString &url, int button, int state, c
         return;
     }
     
+    oldDataSource = getDataSource();
+    currentFrame = [oldDataSource webFrame];
     if (_target.isEmpty()){
-        oldDataSource = getDataSource();
-        frame = [oldDataSource webFrame];
-        
         // If we're the only frame in a frameset then pop
         // the frame.
         if ([[[oldDataSource parent] children] count] == 1){
             frame = [[oldDataSource parent] webFrame];
         }
+        else
+            frame = currentFrame;
     }
     else {
-        frame = [[getDataSource() controller] frameNamed: QSTRING_TO_NSSTRING(_target)];
+        frame = [currentFrame frameNamed: QSTRING_TO_NSSTRING(_target)];
+        if (frame == nil){
+            // FIXME:  What is the correct behavior here?
+            NSLog (@"ERROR:  unable to find frame named %@\n",
+                        QSTRING_TO_NSSTRING(_target));
+            return;
+        }
         oldDataSource = [frame dataSource];
     }
     
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index fe8772a..e116d79 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -400,7 +400,7 @@ void KWQKHTMLPartImpl::urlSelected( const QString &url, int button, int state, c
 {
     IFWebDataSource *oldDataSource, *newDataSource;
     KURL clickedURL(part->completeURL( url));
-    IFWebFrame *frame;
+    IFWebFrame *frame, *currentFrame;
     KURL refLess(clickedURL);
 	
     if ( url.find( QString::fromLatin1( "javascript:" ), 0, false ) == 0 )
@@ -423,18 +423,25 @@ void KWQKHTMLPartImpl::urlSelected( const QString &url, int button, int state, c
         return;
     }
     
+    oldDataSource = getDataSource();
+    currentFrame = [oldDataSource webFrame];
     if (_target.isEmpty()){
-        oldDataSource = getDataSource();
-        frame = [oldDataSource webFrame];
-        
         // If we're the only frame in a frameset then pop
         // the frame.
         if ([[[oldDataSource parent] children] count] == 1){
             frame = [[oldDataSource parent] webFrame];
         }
+        else
+            frame = currentFrame;
     }
     else {
-        frame = [[getDataSource() controller] frameNamed: QSTRING_TO_NSSTRING(_target)];
+        frame = [currentFrame frameNamed: QSTRING_TO_NSSTRING(_target)];
+        if (frame == nil){
+            // FIXME:  What is the correct behavior here?
+            NSLog (@"ERROR:  unable to find frame named %@\n",
+                        QSTRING_TO_NSSTRING(_target));
+            return;
+        }
         oldDataSource = [frame dataSource];
     }
     
diff --git a/WebCore/kwq/external.h b/WebCore/kwq/external.h
index b5094bb..91f4072 100644
--- a/WebCore/kwq/external.h
+++ b/WebCore/kwq/external.h
@@ -98,6 +98,7 @@ namespace khtml {
 - (void)_setRenderFramePart: (void *)p;
 - (void *)_renderFramePart;
 - (void)startLoading;
+- (IFWebFrame *)frameNamed: (NSString *)name;
 @end
 
 typedef enum {

-- 
WebKit Debian packaging