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

darin darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:59:04 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 43d4f9748f5f0c2a9b06d3903abaf974c6606ff6
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 26 23:06:24 2002 +0000

    	* src/kwq/KWQKjobclasses.mm: (TransferJobPrivate::TransferJobPrivate):
            Nil out the handle so we don't autorelease garbage.
    
    	* src/kwq/KWQKloader.mm:
            (-[URLLoadClient IFURLHandleResourceDidCancelLoading:]),
    	(-[URLLoadClient IFURLHandleResourceDidFinishLoading:data:]),
            (-[URLLoadClient IFURLHandle:resourceDidFailLoadingWithResult:]):
            Delete the job instead of just autoreleasing the sender. Fixes a leak.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@863 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 38caf8f..3fadefa 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-03-26  Darin Adler  <darin at apple.com>
+
+	* src/kwq/KWQKjobclasses.mm: (TransferJobPrivate::TransferJobPrivate):
+        Nil out the handle so we don't autorelease garbage.
+        
+	* src/kwq/KWQKloader.mm:
+        (-[URLLoadClient IFURLHandleResourceDidCancelLoading:]),
+	(-[URLLoadClient IFURLHandleResourceDidFinishLoading:data:]),
+        (-[URLLoadClient IFURLHandle:resourceDidFailLoadingWithResult:]):
+        Delete the job instead of just autoreleasing the sender. Fixes a leak.
+
 2002-03-26  Richard Williamson  <rjw at apple.com>
 
         Fixed leak of decoder.  This caused us to leak the entire
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 38caf8f..3fadefa 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2002-03-26  Darin Adler  <darin at apple.com>
+
+	* src/kwq/KWQKjobclasses.mm: (TransferJobPrivate::TransferJobPrivate):
+        Nil out the handle so we don't autorelease garbage.
+        
+	* src/kwq/KWQKloader.mm:
+        (-[URLLoadClient IFURLHandleResourceDidCancelLoading:]),
+	(-[URLLoadClient IFURLHandleResourceDidFinishLoading:data:]),
+        (-[URLLoadClient IFURLHandle:resourceDidFailLoadingWithResult:]):
+        Delete the job instead of just autoreleasing the sender. Fixes a leak.
+
 2002-03-26  Richard Williamson  <rjw at apple.com>
 
         Fixed leak of decoder.  This caused us to leak the entire
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 38caf8f..3fadefa 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2002-03-26  Darin Adler  <darin at apple.com>
+
+	* src/kwq/KWQKjobclasses.mm: (TransferJobPrivate::TransferJobPrivate):
+        Nil out the handle so we don't autorelease garbage.
+        
+	* src/kwq/KWQKloader.mm:
+        (-[URLLoadClient IFURLHandleResourceDidCancelLoading:]),
+	(-[URLLoadClient IFURLHandleResourceDidFinishLoading:data:]),
+        (-[URLLoadClient IFURLHandle:resourceDidFailLoadingWithResult:]):
+        Delete the job instead of just autoreleasing the sender. Fixes a leak.
+
 2002-03-26  Richard Williamson  <rjw at apple.com>
 
         Fixed leak of decoder.  This caused us to leak the entire
diff --git a/WebCore/kwq/KWQKJobClasses.mm b/WebCore/kwq/KWQKJobClasses.mm
index 09ba4ad..006fe75 100644
--- a/WebCore/kwq/KWQKJobClasses.mm
+++ b/WebCore/kwq/KWQKJobClasses.mm
@@ -103,6 +103,8 @@ public:
 	}
 
         url = [[NSURL URLWithString:string] retain];
+
+        handle = nil;
     }
 
     ~TransferJobPrivate() {
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index b2cf3c9..c3774c5 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -1042,7 +1042,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
     controller = [m_dataSource controller];
     [controller _receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
 
-    [sender autorelease];
+    delete job;
 }
 
 - (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)sender data: (NSData *)data
@@ -1068,7 +1068,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
     controller = [m_dataSource controller];
     [controller _receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
 
-    [sender autorelease];
+    delete job;
 }
 
 - (void)IFURLHandle:(IFURLHandle *)sender resourceDataDidBecomeAvailable:(NSData *)data
@@ -1116,7 +1116,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
 
     [controller _receivedError: error forResource: QSTRING_TO_NSSTRING(job->url().url()) partialProgress: loadProgress fromDataSource: m_dataSource];
 
-    [sender autorelease];
+    delete job;
 }
 
 - (void)IFURLHandle:(IFURLHandle *)sender didRedirectToURL:(NSURL *)url
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index b2cf3c9..c3774c5 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -1042,7 +1042,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
     controller = [m_dataSource controller];
     [controller _receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
 
-    [sender autorelease];
+    delete job;
 }
 
 - (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)sender data: (NSData *)data
@@ -1068,7 +1068,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
     controller = [m_dataSource controller];
     [controller _receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
 
-    [sender autorelease];
+    delete job;
 }
 
 - (void)IFURLHandle:(IFURLHandle *)sender resourceDataDidBecomeAvailable:(NSData *)data
@@ -1116,7 +1116,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
 
     [controller _receivedError: error forResource: QSTRING_TO_NSSTRING(job->url().url()) partialProgress: loadProgress fromDataSource: m_dataSource];
 
-    [sender autorelease];
+    delete job;
 }
 
 - (void)IFURLHandle:(IFURLHandle *)sender didRedirectToURL:(NSURL *)url
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index b2cf3c9..c3774c5 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -1042,7 +1042,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
     controller = [m_dataSource controller];
     [controller _receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
 
-    [sender autorelease];
+    delete job;
 }
 
 - (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)sender data: (NSData *)data
@@ -1068,7 +1068,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
     controller = [m_dataSource controller];
     [controller _receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
 
-    [sender autorelease];
+    delete job;
 }
 
 - (void)IFURLHandle:(IFURLHandle *)sender resourceDataDidBecomeAvailable:(NSData *)data
@@ -1116,7 +1116,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
 
     [controller _receivedError: error forResource: QSTRING_TO_NSSTRING(job->url().url()) partialProgress: loadProgress fromDataSource: m_dataSource];
 
-    [sender autorelease];
+    delete job;
 }
 
 - (void)IFURLHandle:(IFURLHandle *)sender didRedirectToURL:(NSURL *)url
diff --git a/WebCore/src/kwq/KWQKjobclasses.mm b/WebCore/src/kwq/KWQKjobclasses.mm
index 09ba4ad..006fe75 100644
--- a/WebCore/src/kwq/KWQKjobclasses.mm
+++ b/WebCore/src/kwq/KWQKjobclasses.mm
@@ -103,6 +103,8 @@ public:
 	}
 
         url = [[NSURL URLWithString:string] retain];
+
+        handle = nil;
     }
 
     ~TransferJobPrivate() {
diff --git a/WebCore/src/kwq/KWQKloader.mm b/WebCore/src/kwq/KWQKloader.mm
index b2cf3c9..c3774c5 100644
--- a/WebCore/src/kwq/KWQKloader.mm
+++ b/WebCore/src/kwq/KWQKloader.mm
@@ -1042,7 +1042,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
     controller = [m_dataSource controller];
     [controller _receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
 
-    [sender autorelease];
+    delete job;
 }
 
 - (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)sender data: (NSData *)data
@@ -1068,7 +1068,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
     controller = [m_dataSource controller];
     [controller _receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
 
-    [sender autorelease];
+    delete job;
 }
 
 - (void)IFURLHandle:(IFURLHandle *)sender resourceDataDidBecomeAvailable:(NSData *)data
@@ -1116,7 +1116,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
 
     [controller _receivedError: error forResource: QSTRING_TO_NSSTRING(job->url().url()) partialProgress: loadProgress fromDataSource: m_dataSource];
 
-    [sender autorelease];
+    delete job;
 }
 
 - (void)IFURLHandle:(IFURLHandle *)sender didRedirectToURL:(NSURL *)url

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list