[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 ffd46f80eab85316dab5efd3ac8f3a3614ea8c93
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jun 15 07:53:28 2004 +0000

            Reviewed by Maciej.
    
            - fixed some things for GC that Patrick missed, or that happened after the branch
    
            * Carbon.subproj/HIWebView.m:
            (HIWebViewConstructor): Use CFRetain instead of retain.
            (HIWebViewDestructor): Use CFRelease instead of release.
            * Misc.subproj/WebFileDatabase.m:
            (-[WebFileDatabase initWithPath:]): Use release instead of dealloc.
            * WebCoreSupport.subproj/WebImageRenderer.m:
            (-[WebImageContext finalize]): Had [super dealloc] here by mistake; change to [super finalize].
            * WebCoreSupport.subproj/WebTextRenderer.m:
            (-[WebTextRenderer finalize]): Added.
            * WebView.subproj/WebDebugDOMNode.m:
            (-[WebDebugDOMNode initWithWebFrameView:]): Use release instead of dealloc.
            * WebView.subproj/WebRenderNode.m:
            (-[WebRenderNode initWithWebFrameView:]): Use release instead of dealloc.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6848 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Carbon.subproj/HIWebView.m b/WebKit/Carbon.subproj/HIWebView.m
index 4219207..c04d8a2 100644
--- a/WebKit/Carbon.subproj/HIWebView.m
+++ b/WebKit/Carbon.subproj/HIWebView.m
@@ -269,7 +269,10 @@ HIWebViewConstructor( HIViewRef inView )
 	
 		view->fViewRef = inView;
 
-		view->fWebView = [[webViewClass alloc] initWithFrame: frame];
+                WebView *webView = [[webViewClass alloc] initWithFrame: frame];
+                CFRetain(webView);
+                [webView release];
+		view->fWebView = webView;
 		[HIViewAdapter bindHIViewToNSView:inView nsView:view->fWebView];
 		
 		view->fFirstResponder = NULL;
@@ -289,7 +292,7 @@ static void
 HIWebViewDestructor( HIWebView* inView )
 {
 	[HIViewAdapter unbindNSView:inView->fWebView];
-	[inView->fWebView release];
+	CFRelease(inView->fWebView);
 	
 	free( inView );
 }
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e318e55..43fdf09 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,23 @@
+2004-06-14  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+        - fixed some things for GC that Patrick missed, or that happened after the branch
+
+        * Carbon.subproj/HIWebView.m:
+        (HIWebViewConstructor): Use CFRetain instead of retain.
+        (HIWebViewDestructor): Use CFRelease instead of release.
+        * Misc.subproj/WebFileDatabase.m:
+        (-[WebFileDatabase initWithPath:]): Use release instead of dealloc.
+        * WebCoreSupport.subproj/WebImageRenderer.m:
+        (-[WebImageContext finalize]): Had [super dealloc] here by mistake; change to [super finalize].
+        * WebCoreSupport.subproj/WebTextRenderer.m:
+        (-[WebTextRenderer finalize]): Added.
+        * WebView.subproj/WebDebugDOMNode.m:
+        (-[WebDebugDOMNode initWithWebFrameView:]): Use release instead of dealloc.
+        * WebView.subproj/WebRenderNode.m:
+        (-[WebRenderNode initWithWebFrameView:]): Use release instead of dealloc.
+
 2004-06-15  Trey Matteson  <trey at apple.com>
 
 	Fix ASSERT/crash we get sometimes when dragging link images.  Turns
diff --git a/WebKit/Misc.subproj/WebFileDatabase.m b/WebKit/Misc.subproj/WebFileDatabase.m
index 0546d9f..a93ab19 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.m
+++ b/WebKit/Misc.subproj/WebFileDatabase.m
@@ -301,7 +301,7 @@ static void databaseInit()
     [super initWithPath:thePath];
     
     if (self == nil || thePath == nil) {
-        [self dealloc];
+        [self release];
         return nil;
     }
 
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
index f7223a4..2023283 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
@@ -87,7 +87,7 @@ extern NSString *NSImageLoopCount;
     if (_cgsContext) {
         CGContextRelease(_cgsContext);
     }
-    [super dealloc];
+    [super finalize];
 }
 
 - (void)saveGraphicsState
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index 69cbffa..264c911 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -16,6 +16,7 @@
 
 #import <WebKit/WebGlyphBuffer.h>
 #import <WebKit/WebKitLogging.h>
+#import <WebKit/WebNSObjectExtras.h>
 #import <WebKit/WebTextRendererFactory.h>
 #import <WebKit/WebUnicode.h>
 
@@ -407,6 +408,21 @@ static BOOL alwaysUseATSU = NO;
     [super dealloc];
 }
 
+- (void)finalize
+{
+    if (styleGroup)
+        ATSUDisposeStyleGroup(styleGroup);
+
+    freeWidthMap(glyphToWidthMap);
+    freeGlyphMap(characterToGlyphMap);
+    freeUnicodeGlyphMap(unicodeCharacterToGlyphMap);
+
+    if (ATSUStyleInitialized)
+        ATSUDisposeStyle(_ATSUSstyle);
+    
+    [super finalize];
+}
+
 - (int)ascent
 {
     // This simple return obviously can't throw an exception.
diff --git a/WebKit/WebView.subproj/WebDebugDOMNode.m b/WebKit/WebView.subproj/WebDebugDOMNode.m
index bc435b1..1ce0d28 100644
--- a/WebKit/WebView.subproj/WebDebugDOMNode.m
+++ b/WebKit/WebView.subproj/WebDebugDOMNode.m
@@ -30,7 +30,7 @@
 {
     WebKitDOMTreeCopier *copier;
     
-    [self dealloc];
+    [self release];
 
     if (![[view documentView] isMemberOfClass:[WebHTMLView class]]) {
         return nil;
diff --git a/WebKit/WebView.subproj/WebRenderNode.m b/WebKit/WebView.subproj/WebRenderNode.m
index 71ac7ef..220444a 100644
--- a/WebKit/WebView.subproj/WebRenderNode.m
+++ b/WebKit/WebView.subproj/WebRenderNode.m
@@ -50,7 +50,7 @@
 {
     WebKitRenderTreeCopier *copier;
     
-    [self dealloc];
+    [self release];
 
     if (![[view documentView] isMemberOfClass:[WebHTMLView class]]) {
         return nil;

-- 
WebKit Debian packaging