[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 945c396489b35a507f1738475a03e8f1eb28103c
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jun 5 23:49:39 2002 +0000

        Fixed snafu in recursion over frame tree.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1281 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d9d1322..e10d296 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,13 @@
 2002-06-05  Richard Williamson  <rjw at apple.com>
 
+    Fixed snafu in recursion over frame tree.
+    
+	* WebView.subproj/IFWebFrame.mm:
+	(+[IFWebFrame _frameNamed:fromFrame:]):
+	(-[IFWebFrame frameNamed:]):
+
+2002-06-05  Richard Williamson  <rjw at apple.com>
+
     Normalized frame naming.  (We still don't support cross
     window name lookups.)
     
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index d9d1322..e10d296 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
 2002-06-05  Richard Williamson  <rjw at apple.com>
 
+    Fixed snafu in recursion over frame tree.
+    
+	* WebView.subproj/IFWebFrame.mm:
+	(+[IFWebFrame _frameNamed:fromFrame:]):
+	(-[IFWebFrame frameNamed:]):
+
+2002-06-05  Richard Williamson  <rjw at apple.com>
+
     Normalized frame naming.  (We still don't support cross
     window name lookups.)
     
diff --git a/WebKit/WebView.subproj/IFWebFrame.mm b/WebKit/WebView.subproj/IFWebFrame.mm
index b6be99a..91eecd4 100644
--- a/WebKit/WebView.subproj/IFWebFrame.mm
+++ b/WebKit/WebView.subproj/IFWebFrame.mm
@@ -208,6 +208,31 @@
     [_private setView: nil];
 }
 
++ _frameNamed:(NSString *)name fromFrame: (IFWebFrame *)aFrame
+{
+    int i, count;
+    IFWebFrame *foundFrame;
+    NSArray *children;
+
+    if ([[aFrame name] isEqualToString: name])
+        return aFrame;
+
+    children = [[aFrame dataSource] children];
+    count = [children count];
+    for (i = 0; i < count; i++){
+        aFrame = [children objectAtIndex: i];
+        foundFrame = [IFWebFrame _frameNamed: name fromFrame: aFrame];
+        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;
+}
+
 - (IFWebFrame *)frameNamed:(NSString *)name
 {
     // First, deal with 'special' names.
@@ -235,28 +260,7 @@
     }
     
     // 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;
+    return [IFWebFrame _frameNamed: name fromFrame: [[self controller] mainFrame]];
 }
 
 @end
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index b6be99a..91eecd4 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -208,6 +208,31 @@
     [_private setView: nil];
 }
 
++ _frameNamed:(NSString *)name fromFrame: (IFWebFrame *)aFrame
+{
+    int i, count;
+    IFWebFrame *foundFrame;
+    NSArray *children;
+
+    if ([[aFrame name] isEqualToString: name])
+        return aFrame;
+
+    children = [[aFrame dataSource] children];
+    count = [children count];
+    for (i = 0; i < count; i++){
+        aFrame = [children objectAtIndex: i];
+        foundFrame = [IFWebFrame _frameNamed: name fromFrame: aFrame];
+        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;
+}
+
 - (IFWebFrame *)frameNamed:(NSString *)name
 {
     // First, deal with 'special' names.
@@ -235,28 +260,7 @@
     }
     
     // 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;
+    return [IFWebFrame _frameNamed: name fromFrame: [[self controller] mainFrame]];
 }
 
 @end

-- 
WebKit Debian packaging