Changeset 19167

Timestamp:

01/26/07 16:52:16 (2 years ago)

Author:

kdecker

Message:

Reviewed by andersca.

Fixed: < rdar://problem/4946922> WebBaseNetscapePluginView leaks memory
 http://bugs.webkit.org/show_bug.cgi?id=11523

• Plugins/WebBaseNetscapePluginStream.m:

(-[WebBaseNetscapePluginStream setPlugin:]): Calls -[WebBaseNetscapePluginView disconnectStream:]

• Plugins/WebBaseNetscapePluginView.h: Added disconnectStream: to header.
• Plugins/WebBaseNetscapePluginView.mm: (-[WebBaseNetscapePluginView stop]): Make a copy of the streams collection prior to calling stop all streams. This is necessary because calling stop has the side effect of removing the stream from this same collection. (-[WebBaseNetscapePluginView disconnectStream:]): Added. Removes the stream from the streams collection.

Location:

trunk/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Plugins/WebBaseNetscapePluginStream.m (modified) (2 diffs)
• Plugins/WebBaseNetscapePluginView.h (modified) (1 diff)
• Plugins/WebBaseNetscapePluginView.mm (modified) (2 diffs)

trunk/WebKit/ChangeLog

@@ +1 @@
+2007-01-26  Kevin Decker <kdecker@apple.com>
+
+        Reviewed by andersca.
+
+        Fixed: <rdar://problem/4946922> WebBaseNetscapePluginView leaks memory
+        http://bugs.webkit.org/show_bug.cgi?id=11523
+
+        * Plugins/WebBaseNetscapePluginStream.m:
+       (-[WebBaseNetscapePluginStream setPlugin:]): Calls -[WebBaseNetscapePluginView disconnectStream:]
+        * Plugins/WebBaseNetscapePluginView.h: Added disconnectStream: to header.
+        * Plugins/WebBaseNetscapePluginView.mm:
+        (-[WebBaseNetscapePluginView stop]): Make a copy of the streams collection prior to calling stop all streams.
+        This is necessary because calling stop has the side effect of removing the stream from this same collection.
+        (-[WebBaseNetscapePluginView disconnectStream:]): Added. Removes the stream from the streams collection.
+
 2007-01-25  Kevin Decker <kdecker@apple.com>
 

trunk/WebKit/Plugins/WebBaseNetscapePluginStream.m

@@ -175 +175 @@
         NPP_URLNotify = [pluginPackage NPP_URLNotify];
     } else {
+        WebBaseNetscapePluginView *view = pluginView;
+
         plugin = NULL;
-        [pluginView release];
-        pluginView = nil;
         NPP_NewStream = NULL;
         NPP_WriteReady = NULL;
@@ -184 +184 @@
         NPP_DestroyStream = NULL;
         NPP_URLNotify = NULL;
+        pluginView = nil;
+
+        [view disconnectStream:self];
+        [view release];
     }
 }

trunk/WebKit/Plugins/WebBaseNetscapePluginView.h

@@ -152 +152 @@
 - (void)viewWillMoveToHostWindow:(NSWindow *)hostWindow;
 - (void)viewDidMoveToHostWindow;
+- (void)disconnectStream:(WebBaseNetscapePluginStream*)stream;
 
 // Returns the NPObject that represents the plugin interface.

trunk/WebKit/Plugins/WebBaseNetscapePluginView.mm

@@ -1291 +1291 @@
     
     isStarted = NO;
-    
-    // Stop any active streams
-    [streams makeObjectsPerformSelector:@selector(stop)];
-    
+    // To stop active streams it's necessary to invoke makeObjectsPerformSelector on a copy 
+    // of streams. This is because calling -[WebNetscapePluginStream stop] also has the side effect
+    // of removing a stream from this collection.
+    NSArray *streamsCopy = [streams copy];
+    [streamsCopy makeObjectsPerformSelector:@selector(stop)];
+    [streamsCopy release];
+   
     // Stop the null events
     [self stopNullEvents];
@@ -1495 +1498 @@
     free(cAttributes);
     free(cValues);
+}
+
+- (void)disconnectStream:(WebBaseNetscapePluginStream*)stream
+{
+    [streams removeObjectIdenticalTo:stream];    
 }