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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 94b8745af211a1349131d40f7301497d5c73132f
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 11 03:32:54 2002 +0000

            Cleaned up stream deallocations.
    
            * Plugins.subproj/IFPluginStream.h:
            * Plugins.subproj/IFPluginStream.m: (-[IFPluginStream
            initWithURL:mimeType:notifyData:]), (-[IFPluginStream incrementOffset:]),
            (-[IFPluginStream dealloc]):
            * Plugins.subproj/IFPluginView.mm: (-[IFPluginView
            newStream:mimeType:notifyData:]), (-[IFPluginView
            IFURLHandleResourceDidCancelLoading:]), (-[IFPluginView
            IFURLHandle:resourceDidFailLoadingWithResult:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1001 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 65f050c..1505626 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2002-04-10  Chris Blumenberg  <set EMAIL_ADDRESS environment variable>
+
+	Cleaned up stream deallocations.
+
+	* Plugins.subproj/IFPluginStream.h:
+	* Plugins.subproj/IFPluginStream.m: (-[IFPluginStream
+	initWithURL:mimeType:notifyData:]), (-[IFPluginStream incrementOffset:]),
+	(-[IFPluginStream dealloc]):
+	* Plugins.subproj/IFPluginView.mm: (-[IFPluginView
+	newStream:mimeType:notifyData:]), (-[IFPluginView
+	IFURLHandleResourceDidCancelLoading:]), (-[IFPluginView
+	IFURLHandle:resourceDidFailLoadingWithResult:]):
+
 2002-04-10  John Sullivan  <sullivan at apple.com>
 
 	Fixed 2891396 -- window fills with garbage if you resize or hide/show toolbar
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 65f050c..1505626 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,16 @@
+2002-04-10  Chris Blumenberg  <set EMAIL_ADDRESS environment variable>
+
+	Cleaned up stream deallocations.
+
+	* Plugins.subproj/IFPluginStream.h:
+	* Plugins.subproj/IFPluginStream.m: (-[IFPluginStream
+	initWithURL:mimeType:notifyData:]), (-[IFPluginStream incrementOffset:]),
+	(-[IFPluginStream dealloc]):
+	* Plugins.subproj/IFPluginView.mm: (-[IFPluginView
+	newStream:mimeType:notifyData:]), (-[IFPluginView
+	IFURLHandleResourceDidCancelLoading:]), (-[IFPluginView
+	IFURLHandle:resourceDidFailLoadingWithResult:]):
+
 2002-04-10  John Sullivan  <sullivan at apple.com>
 
 	Fixed 2891396 -- window fills with garbage if you resize or hide/show toolbar
diff --git a/WebKit/Plugins.subproj/IFPluginStream.h b/WebKit/Plugins.subproj/IFPluginStream.h
index 8b1bbe9..32fa409 100644
--- a/WebKit/Plugins.subproj/IFPluginStream.h
+++ b/WebKit/Plugins.subproj/IFPluginStream.h
@@ -23,7 +23,6 @@
 - (NSMutableData *) data;
 
 - (void) setFilename:(NSString *)file;
-- (void) setData:(NSMutableData *)newData;
 - (void) setTransferMode:(uint16)tMode;
 - (void) incrementOffset:(int32)addition;
 
diff --git a/WebKit/Plugins.subproj/IFPluginStream.m b/WebKit/Plugins.subproj/IFPluginStream.m
index 835e2ea..d530933 100644
--- a/WebKit/Plugins.subproj/IFPluginStream.m
+++ b/WebKit/Plugins.subproj/IFPluginStream.m
@@ -26,6 +26,8 @@
     npStream->notifyData = notifyData;
     offset = 0;
     
+    data = [[NSMutableData dataWithCapacity:0] retain];
+    
     return self;
 }
 
@@ -76,13 +78,18 @@
     transferMode = tMode;
 }
 
-- (void) setData:(NSMutableData *)newData
+- (void) incrementOffset:(int32)addition
 {
-    data = [newData retain];
+    offset += addition;
 }
 
-- (void) incrementOffset:(int32)addition
+- (void) dealloc
 {
-    offset += addition;
+    free(npStream);
+    [mimeType release];
+    [data release];
+    if(filename)
+        [filename release];
 }
+
 @end
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index 5470226..9147f6f 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -179,7 +179,6 @@ extern "C" {
         if(transferMode == NP_ASFILE)
             WEBKITDEBUG("Stream type: NP_ASFILE\n");
         [stream setFilename:[[streamURL path] lastPathComponent]];
-        [stream setData:[NSMutableData dataWithCapacity:0]];
     }else if(transferMode == NP_SEEK){
         WEBKITDEBUG("Stream type: NP_SEEK not yet supported\n");
         return;
@@ -556,6 +555,10 @@ extern "C" {
 
 - (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
 {
+    IFPluginStream *stream;
+    
+    stream = [[sender attributes] objectForKey:IFURLHandleUserData];
+    [stream release];
     [self stop];
     
     IFLoadProgress *loadProgress = [[IFLoadProgress alloc] init];
@@ -569,6 +572,10 @@ extern "C" {
 
 - (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(int)result
 {
+    IFPluginStream *stream;
+    
+    stream = [[sender attributes] objectForKey:IFURLHandleUserData];
+    [stream release];
     [self stop];
     
     IFLoadProgress *loadProgress = [[IFLoadProgress alloc] init];
diff --git a/WebKit/Plugins.subproj/WebPluginStream.h b/WebKit/Plugins.subproj/WebPluginStream.h
index 8b1bbe9..32fa409 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.h
+++ b/WebKit/Plugins.subproj/WebPluginStream.h
@@ -23,7 +23,6 @@
 - (NSMutableData *) data;
 
 - (void) setFilename:(NSString *)file;
-- (void) setData:(NSMutableData *)newData;
 - (void) setTransferMode:(uint16)tMode;
 - (void) incrementOffset:(int32)addition;
 
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index 5470226..9147f6f 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -179,7 +179,6 @@ extern "C" {
         if(transferMode == NP_ASFILE)
             WEBKITDEBUG("Stream type: NP_ASFILE\n");
         [stream setFilename:[[streamURL path] lastPathComponent]];
-        [stream setData:[NSMutableData dataWithCapacity:0]];
     }else if(transferMode == NP_SEEK){
         WEBKITDEBUG("Stream type: NP_SEEK not yet supported\n");
         return;
@@ -556,6 +555,10 @@ extern "C" {
 
 - (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
 {
+    IFPluginStream *stream;
+    
+    stream = [[sender attributes] objectForKey:IFURLHandleUserData];
+    [stream release];
     [self stop];
     
     IFLoadProgress *loadProgress = [[IFLoadProgress alloc] init];
@@ -569,6 +572,10 @@ extern "C" {
 
 - (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(int)result
 {
+    IFPluginStream *stream;
+    
+    stream = [[sender attributes] objectForKey:IFURLHandleUserData];
+    [stream release];
     [self stop];
     
     IFLoadProgress *loadProgress = [[IFLoadProgress alloc] init];

-- 
WebKit Debian packaging