[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 f419cf8629e95a8381a713e3d32bc4788b483f43
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jun 5 20:24:51 2002 +0000

    i    Normalized frame naming.  (We still don't support cross
        window name lookups.)
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1276 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e170fa5..d9d1322 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2002-06-05  Richard Williamson  <rjw at apple.com>
+
+    Normalized frame naming.  (We still don't support cross
+    window name lookups.)
+    
+	* WebView.subproj/IFBaseWebController.mm:
+	(-[IFBaseWebController frameNamed:]):
+	* WebView.subproj/IFWebFrame.mm:
+	(-[IFWebFrame frameNamed:]):
+
 2002-06-04  Chris Blumenberg  <cblu at apple.com>
 
 	* MIME.subproj/IFDownloadHandler.mm: Use public methods
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index e170fa5..d9d1322 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-06-05  Richard Williamson  <rjw at apple.com>
+
+    Normalized frame naming.  (We still don't support cross
+    window name lookups.)
+    
+	* WebView.subproj/IFBaseWebController.mm:
+	(-[IFBaseWebController frameNamed:]):
+	* WebView.subproj/IFWebFrame.mm:
+	(-[IFWebFrame frameNamed:]):
+
 2002-06-04  Chris Blumenberg  <cblu at apple.com>
 
 	* MIME.subproj/IFDownloadHandler.mm: Use public methods
diff --git a/WebKit/WebView.subproj/IFBaseWebController.mm b/WebKit/WebView.subproj/IFBaseWebController.mm
index 0124ff5..0fb3d0d 100644
--- a/WebKit/WebView.subproj/IFBaseWebController.mm
+++ b/WebKit/WebView.subproj/IFBaseWebController.mm
@@ -212,26 +212,9 @@
 }
 
 
-- (IFWebFrame *)_frameNamed: (NSString *)name fromFrame: (IFWebFrame *)frame
-{
-    if ([[frame name] isEqualToString: name])
-        return frame;
-
-    int i, count;
-    IFWebFrame *aFrame;
-    NSArray *children = [[frame dataSource] children];
-    count = [children count];
-    for (i = 0; i < count; i++){
-        aFrame = [children objectAtIndex: i];
-        if ([self _frameNamed: name fromFrame: aFrame])
-            return aFrame;
-    }
-    return nil;
-}
-
 - (IFWebFrame *)frameNamed: (NSString *)name
 {
-    return [self _frameNamed: name fromFrame: [self mainFrame]];
+    return [[self mainFrame] frameNamed: name];
 }
 
 - (IFWebFrame *)mainFrame
diff --git a/WebKit/WebView.subproj/IFWebFrame.mm b/WebKit/WebView.subproj/IFWebFrame.mm
index d27eb33..b6be99a 100644
--- a/WebKit/WebView.subproj/IFWebFrame.mm
+++ b/WebKit/WebView.subproj/IFWebFrame.mm
@@ -210,21 +210,53 @@
 
 - (IFWebFrame *)frameNamed:(NSString *)name
 {
-    if([name isEqualToString:@"_self"] || [name isEqualToString:@"_current"])
+    // First, deal with 'special' names.
+    if([name isEqualToString:@"_self"] || [name isEqualToString:@"_current"]){
         return self;
+    }
     
-    else if([name isEqualToString:@"_top"])
+    else if([name isEqualToString:@"_top"]) {
         return [[self controller] mainFrame];
-        
+    }
+    
     else if([name isEqualToString:@"_parent"]){
-        if([[self dataSource] parent]){
-            return [[[self dataSource] parent] webFrame];
-        }else{
+        IFWebDataSource *parent = [[self dataSource] parent];
+        if(parent){
+            return [parent webFrame];
+        }
+        else{
             return self;
         }
-    }else{
-        return [[self controller] frameNamed:name];
     }
+    
+    else if ([name isEqualToString:@"_blank"]){
+        id<IFWebController> newController = [[self controller] openNewWindowWithURL: nil];
+        return [newController mainFrame];
+    }
+    
+    // Now search the namespace associated with this frame's controller.
+    int i, count;
+    IFWebFrame *aFrame, *foundFrame;
+    NSArray *children;
+
+    aFrame = [[self controller] mainFrame];
+    if ([[aFrame name] isEqualToString: name])
+        return self;
+
+    children = [[aFrame dataSource] children];
+    count = [children count];
+    for (i = 0; i < count; i++){
+        aFrame = [children objectAtIndex: i];
+        foundFrame = [aFrame frameNamed: name];
+        if (foundFrame)
+            return foundFrame;
+    }
+    
+    // FIXME:  Need to look in other controller's frame namespaces.
+
+    // FIXME:  What do we do if a frame name isn't found?  create a new window
+    
+    return nil;
 }
 
 @end
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index d27eb33..b6be99a 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -210,21 +210,53 @@
 
 - (IFWebFrame *)frameNamed:(NSString *)name
 {
-    if([name isEqualToString:@"_self"] || [name isEqualToString:@"_current"])
+    // First, deal with 'special' names.
+    if([name isEqualToString:@"_self"] || [name isEqualToString:@"_current"]){
         return self;
+    }
     
-    else if([name isEqualToString:@"_top"])
+    else if([name isEqualToString:@"_top"]) {
         return [[self controller] mainFrame];
-        
+    }
+    
     else if([name isEqualToString:@"_parent"]){
-        if([[self dataSource] parent]){
-            return [[[self dataSource] parent] webFrame];
-        }else{
+        IFWebDataSource *parent = [[self dataSource] parent];
+        if(parent){
+            return [parent webFrame];
+        }
+        else{
             return self;
         }
-    }else{
-        return [[self controller] frameNamed:name];
     }
+    
+    else if ([name isEqualToString:@"_blank"]){
+        id<IFWebController> newController = [[self controller] openNewWindowWithURL: nil];
+        return [newController mainFrame];
+    }
+    
+    // Now search the namespace associated with this frame's controller.
+    int i, count;
+    IFWebFrame *aFrame, *foundFrame;
+    NSArray *children;
+
+    aFrame = [[self controller] mainFrame];
+    if ([[aFrame name] isEqualToString: name])
+        return self;
+
+    children = [[aFrame dataSource] children];
+    count = [children count];
+    for (i = 0; i < count; i++){
+        aFrame = [children objectAtIndex: i];
+        foundFrame = [aFrame frameNamed: name];
+        if (foundFrame)
+            return foundFrame;
+    }
+    
+    // FIXME:  Need to look in other controller's frame namespaces.
+
+    // FIXME:  What do we do if a frame name isn't found?  create a new window
+    
+    return nil;
 }
 
 @end

-- 
WebKit Debian packaging