[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 07:31:41 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit f6ad99d962801a70ae7ed81b0d68713f71afbd57
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Mar 26 19:29:37 2003 +0000
Reviewed by Trey.
- fixed 3209091 -- REGRESSION: WebFrameView leak (world leak)
* WebView.subproj/WebView.m:
(-[WebView _commonInitialization:frameName:groupName:]): Use copy, not retain,
on an incoming NSString parameter.
(-[WebView initWithFrame:frameName:groupName:]): Release the WebFrameView after
setting it up.
- other changes
* WebCoreSupport.subproj/WebImageRenderer.m:
(-[WebImageRenderer incrementalLoadWithBytes:length:complete:]):
Put the bug workaround here inside an ifdef so we don't compile it in on Panther.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3925 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 0d4f00c..09b691e 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,21 @@
+2003-03-26 Darin Adler <darin at apple.com>
+
+ Reviewed by Trey.
+
+ - fixed 3209091 -- REGRESSION: WebFrameView leak (world leak)
+
+ * WebView.subproj/WebView.m:
+ (-[WebView _commonInitialization:frameName:groupName:]): Use copy, not retain,
+ on an incoming NSString parameter.
+ (-[WebView initWithFrame:frameName:groupName:]): Release the WebFrameView after
+ setting it up.
+
+ - other changes
+
+ * WebCoreSupport.subproj/WebImageRenderer.m:
+ (-[WebImageRenderer incrementalLoadWithBytes:length:complete:]):
+ Put the bug workaround here inside an ifdef so we don't compile it in on Panther.
+
2003-03-26 Chris Blumenberg <cblu at apple.com>
Use the private _cfBundle method on NSBundle so we only create 1 bundle per plug-in package class.
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
index 93cb971..b60b5d0 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
@@ -29,6 +29,8 @@ static NSMutableArray *activeImageRenderers;
}
}
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
+
// Part of the workaround for bug 3090341.
- (BOOL)blockHasGIFExtensionSignature:(const char *)block length:(int)length
{
@@ -94,6 +96,8 @@ static NSMutableArray *activeImageRenderers;
return [super initWithData:data];
}
+#endif
+
- copyWithZone:(NSZone *)zone
{
WebImageRenderer *copy = [super copyWithZone:zone];
@@ -113,8 +117,10 @@ static NSMutableArray *activeImageRenderers;
NSData *data = [[NSData alloc] initWithBytes:bytes length:length];
NSSize size;
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
// Part of the workaround for bug 3090341.
[self checkDataForGIFExtensionSignature:data];
+#endif
loadStatus = [imageRep incrementalLoadFromData:data complete:isComplete];
[data release];
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 42b3306..ab9ea01 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -84,7 +84,7 @@ NSString *WebElementLinkTitleKey = @"WebElementLinkTitle";
{
_private = [[WebViewPrivate alloc] init];
_private->mainFrame = [[WebFrame alloc] initWithName: frameName webFrameView: wv webView: self];
- _private->controllerSetName = [groupName retain];
+ _private->controllerSetName = [groupName copy];
if (_private->controllerSetName != nil) {
[WebControllerSets addController:self toSetNamed:_private->controllerSetName];
}
@@ -117,6 +117,7 @@ NSString *WebElementLinkTitleKey = @"WebElementLinkTitle";
[wv setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
[self addSubview: wv];
[self _commonInitialization: wv frameName:frameName groupName:groupName];
+ [wv release];
return self;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list