[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 f66186e30809f5edf5c51840e42eba5cfc6fc3e3
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 30 07:55:45 2002 +0000

    	- fixed 3087548 - REGRESSION: two windows open for netflix confirmation
    
            * WebView.subproj/WebControllerPrivate.h:
            * WebView.subproj/WebControllerPrivate.m:
            (-[WebController _findFrameInThisWindowNamed:]): Added this function back,
    	and added check for top-level frame name.
            (-[WebController _findFrameNamed:]): Use
    	_findFrameInThisWindowNamed: to make sure top-level frame names
    	get checked.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2504 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index eae0351..6bfba74 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2002-10-29  Maciej Stachowiak  <mjs at apple.com>
+
+	- fixed 3087548 - REGRESSION: two windows open for netflix confirmation
+	
+        * WebView.subproj/WebControllerPrivate.h:
+        * WebView.subproj/WebControllerPrivate.m:
+        (-[WebController _findFrameInThisWindowNamed:]): Added this function back,
+	and added check for top-level frame name.
+        (-[WebController _findFrameNamed:]): Use
+	_findFrameInThisWindowNamed: to make sure top-level frame names
+	get checked.
+
 2002-10-29  Chris Blumenberg  <cblu at apple.com>
 
 	Created Downloads.subproj to hold the to-be-implemented download decoders.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index eae0351..6bfba74 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-10-29  Maciej Stachowiak  <mjs at apple.com>
+
+	- fixed 3087548 - REGRESSION: two windows open for netflix confirmation
+	
+        * WebView.subproj/WebControllerPrivate.h:
+        * WebView.subproj/WebControllerPrivate.m:
+        (-[WebController _findFrameInThisWindowNamed:]): Added this function back,
+	and added check for top-level frame name.
+        (-[WebController _findFrameNamed:]): Use
+	_findFrameInThisWindowNamed: to make sure top-level frame names
+	get checked.
+
 2002-10-29  Chris Blumenberg  <cblu at apple.com>
 
 	Created Downloads.subproj to hold the to-be-implemented download decoders.
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.h b/WebKit/WebView.subproj/WebControllerPrivate.h
index 433a84c..c666dbb 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.h
+++ b/WebKit/WebView.subproj/WebControllerPrivate.h
@@ -55,6 +55,7 @@
 - (void)_setDefersCallbacks:(BOOL)defers;
 
 - (void)_setTopLevelFrameName:(NSString *)name;
+- (WebFrame *)_findFrameInThisWindowNamed: (NSString *)name;
 - (WebFrame *)_findFrameNamed: (NSString *)name;
 
 - (WebController *)_openNewWindowWithURL:(NSURL *)URL referrer:(NSString *)referrer behind:(BOOL)behind;
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.m b/WebKit/WebView.subproj/WebControllerPrivate.m
index f2eb927..5bae102 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.m
+++ b/WebKit/WebView.subproj/WebControllerPrivate.m
@@ -222,10 +222,19 @@
     }
 }
 
+- (WebFrame *)_findFrameInThisWindowNamed: (NSString *)name
+{
+    if ([_private->topLevelFrameName isEqualToString:name]) {
+	return [self mainFrame];
+    } else {
+	return [[self mainFrame] _descendantFrameNamed:name];
+    }
+}
+
 - (WebFrame *)_findFrameNamed: (NSString *)name
 {
     // Try this controller first
-    WebFrame *frame = [[self mainFrame] _descendantFrameNamed:name];
+    WebFrame *frame = [self _findFrameInThisWindowNamed:name];
 
     if (frame != nil) {
         return frame;
@@ -236,7 +245,7 @@
         NSEnumerator *enumerator = [WebControllerSets controllersInSetNamed:_private->controllerSetName];
         WebController *controller;
         while ((controller = [enumerator nextObject]) != nil && frame == nil) {
-            frame = [[controller mainFrame] _descendantFrameNamed:name];
+	    frame = [controller _findFrameInThisWindowNamed:name];
         }
     }
 
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index 433a84c..c666dbb 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -55,6 +55,7 @@
 - (void)_setDefersCallbacks:(BOOL)defers;
 
 - (void)_setTopLevelFrameName:(NSString *)name;
+- (WebFrame *)_findFrameInThisWindowNamed: (NSString *)name;
 - (WebFrame *)_findFrameNamed: (NSString *)name;
 
 - (WebController *)_openNewWindowWithURL:(NSURL *)URL referrer:(NSString *)referrer behind:(BOOL)behind;
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index f2eb927..5bae102 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -222,10 +222,19 @@
     }
 }
 
+- (WebFrame *)_findFrameInThisWindowNamed: (NSString *)name
+{
+    if ([_private->topLevelFrameName isEqualToString:name]) {
+	return [self mainFrame];
+    } else {
+	return [[self mainFrame] _descendantFrameNamed:name];
+    }
+}
+
 - (WebFrame *)_findFrameNamed: (NSString *)name
 {
     // Try this controller first
-    WebFrame *frame = [[self mainFrame] _descendantFrameNamed:name];
+    WebFrame *frame = [self _findFrameInThisWindowNamed:name];
 
     if (frame != nil) {
         return frame;
@@ -236,7 +245,7 @@
         NSEnumerator *enumerator = [WebControllerSets controllersInSetNamed:_private->controllerSetName];
         WebController *controller;
         while ((controller = [enumerator nextObject]) != nil && frame == nil) {
-            frame = [[controller mainFrame] _descendantFrameNamed:name];
+	    frame = [controller _findFrameInThisWindowNamed:name];
         }
     }
 

-- 
WebKit Debian packaging