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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 746190123196ce471a60d76b6a3ad327afe0012d
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jun 4 18:02:54 2002 +0000

    	- fixed 2932862 -- exception -[NSCFArray getObjects:range:]: index (137)
    	beyond bounds (10)
    
    	* WebView.subproj/IFWebViewPrivate.mm:
    	(-[IFWebView _stopPlugins]):
    	(-[IFWebView _removeSubviews]):
    	Make a copy of the subviews list so that changes to the list don't screw
    	up the iterating logic.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1266 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 40c1205..66039a6 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-04  Darin Adler  <darin at apple.com>
+
+	* WebView.subproj/IFWebViewPrivate.mm:
+	(-[IFWebView _stopPlugins]):
+	(-[IFWebView _removeSubviews]):
+
 2002-06-04  John Sullivan  <sullivan at apple.com>
 
 	Made changes here while working on Undo for removing history entries.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 40c1205..66039a6 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-06-04  Darin Adler  <darin at apple.com>
+
+	* WebView.subproj/IFWebViewPrivate.mm:
+	(-[IFWebView _stopPlugins]):
+	(-[IFWebView _removeSubviews]):
+
 2002-06-04  John Sullivan  <sullivan at apple.com>
 
 	Made changes here while working on Undo for removing history entries.
diff --git a/WebKit/WebView.subproj/IFWebViewPrivate.mm b/WebKit/WebView.subproj/IFWebViewPrivate.mm
index 802e0ce..89f1728 100644
--- a/WebKit/WebView.subproj/IFWebViewPrivate.mm
+++ b/WebKit/WebView.subproj/IFWebViewPrivate.mm
@@ -33,7 +33,7 @@
 
 @end
 
- at implementation IFWebView  (IFPrivate)
+ at implementation IFWebView (IFPrivate)
 
 - (void)_resetWidget
 {
@@ -43,21 +43,24 @@
 
 - (void)_stopPlugins 
 {
-    NSArray *views = [self subviews];
-    int count = [views count];
+    NSArray *subviews = [[self subviews] copy];
+    int count = [subviews count];
     while (count--) {
-        id view = [views objectAtIndex: count];
-        if ([view isKindOfClass: NSClassFromString (@"IFPluginView")]) {
+        id view = [subviews objectAtIndex:count];
+        if ([view isKindOfClass:[IFPluginView class]]) {
             IFPluginView *pluginView = (IFPluginView *)view;
             [pluginView stop];
         }
     }
+    [subviews release];
 }
 
 - (void)_removeSubviews
 {
     // Remove all the views.  They will be be re-added if this is a re-layout. 
-    [[self subviews] makeObjectsPerformSelector:@selector(removeFromSuperviewWithoutNeedingDisplay)];
+    NSArray *subviews = [[self subviews] copy];
+    [subviews makeObjectsPerformSelector:@selector(removeFromSuperviewWithoutNeedingDisplay)];
+    [subviews release];
 }
 
 - (void)_setController: (id <IFWebController>)controller
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.m b/WebKit/WebView.subproj/WebFrameViewPrivate.m
index 802e0ce..89f1728 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.m
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.m
@@ -33,7 +33,7 @@
 
 @end
 
- at implementation IFWebView  (IFPrivate)
+ at implementation IFWebView (IFPrivate)
 
 - (void)_resetWidget
 {
@@ -43,21 +43,24 @@
 
 - (void)_stopPlugins 
 {
-    NSArray *views = [self subviews];
-    int count = [views count];
+    NSArray *subviews = [[self subviews] copy];
+    int count = [subviews count];
     while (count--) {
-        id view = [views objectAtIndex: count];
-        if ([view isKindOfClass: NSClassFromString (@"IFPluginView")]) {
+        id view = [subviews objectAtIndex:count];
+        if ([view isKindOfClass:[IFPluginView class]]) {
             IFPluginView *pluginView = (IFPluginView *)view;
             [pluginView stop];
         }
     }
+    [subviews release];
 }
 
 - (void)_removeSubviews
 {
     // Remove all the views.  They will be be re-added if this is a re-layout. 
-    [[self subviews] makeObjectsPerformSelector:@selector(removeFromSuperviewWithoutNeedingDisplay)];
+    NSArray *subviews = [[self subviews] copy];
+    [subviews makeObjectsPerformSelector:@selector(removeFromSuperviewWithoutNeedingDisplay)];
+    [subviews release];
 }
 
 - (void)_setController: (id <IFWebController>)controller

-- 
WebKit Debian packaging