[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 06:25:37 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 6b40865aecc6a7059c6e86a0eb51b18347496669
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Jul 20 00:00:08 2002 +0000
WebFoundation:
* CacheLoader.subproj/WebResourceClient.h: Renamed a couple of the client protocol
methods to remove a double mention of the word "resource".
* CacheLoader.subproj/WebResourceCallbackClient.m:
* CacheLoader.subproj/WebResourceHandle.m:
Updated for the above name change.
* WebFoundation.pbproj/project.pbxproj:
Moved the C APIs to their own group.
WebKit:
- fixed 3001951 -- Massive memory leak after running base or static PLT
* WebView.subproj/WebDataSourcePrivate.m: (-[WebDataSource _makeRepresentation]):
Add a missing release.
Reduced our use of autorelease. This allows the page load test to detect leaks of the
world much more easily. We may later find we need to use the "retain autorelease" idiom
in a few more places, but I did a lot of testing and that did not show up.
* Bookmarks.subproj/WebBookmarkGroup.m:
(-[WebBookmarkGroup _setTopBookmark:]): Use a plain release.
(-[WebBookmarkGroup _loadBookmarkGroupGuts]): Use a plain release.
* Bookmarks.subproj/WebBookmarkList.m:
(-[WebBookmarkList copyWithZone:]): Use a plain release.
* Misc.subproj/WebIconLoader.m:
(-[WebIconLoader WebResourceHandleDidFinishLoading:data:]): Use a plain release.
* Plugins.subproj/WebPluginView.m:
(-[WebPluginView loadURL:inTarget:withNotifyData:andHandleAttributes:]): Use a plain release.
* WebView.subproj/WebController.m:
(-[WebController createFrameNamed:for:inParent:allowsScrolling:]): Use a plain release.
(-[WebController setWindowContext:]): Use a plain release.
(-[WebController setResourceProgressHandler:]): Use a plain release.
(-[WebController setDownloadProgressHandler:]): Use a plain release.
(-[WebController setPolicyHandler:]): Use a plain release.
* WebView.subproj/WebControllerPrivate.m:
(-[WebControllerPrivate dealloc]): Use plain release.
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSourcePrivate dealloc]): Use plain release.
(-[WebDataSource _setPrimaryLoadComplete:]): Use plain release.
(-[WebDataSource _setTitle:]): Use plain release.
* WebView.subproj/WebFrame.m:
(-[WebFrame initWithName:webView:provisionalDataSource:controller:]): Use plain release.
(-[WebFrame reset]): Invalidate and release the timer.
* WebView.subproj/WebFramePrivate.h: Keep a reference to the timer.
* WebView.subproj/WebFramePrivate.m:
(-[WebFramePrivate dealloc]): Invalidate and release the timer. Use plain release.
(-[WebFramePrivate setName:]): Use plain release.
(-[WebFramePrivate setWebView:]): Use plain release.
(-[WebFramePrivate setDataSource:]): Use plain release.
(-[WebFramePrivate setProvisionalDataSource:]): Use plain release.
(-[WebFrame _scheduleLayout:]): Keep a reference to the timer.
(-[WebFrame _timedLayout:]): Release and nil the timer.
* WebView.subproj/WebRenderNode.m:
(-[WebRenderNode initWithName:rect:view:children:]): Use plain release.
* WebView.subproj/WebView.m:
(-[WebView concludeDragOperation:]): Use plain release.
* WebView.subproj/WebViewPrivate.m:
(-[WebView _makeDocumentViewForDataSource:]): Use plain release.
Other changes to make the new page load test feature work.
* Misc.subproj/WebKitStatistics.h:
* Misc.subproj/WebKitStatistics.m:
(+[WebKitStatistics HTMLRepresentationCount]):
Added a stat for WebHTMLRepresentation objects.
* WebView.subproj/WebHTMLRepresentation.m:
(-[WebHTMLRepresentation init]): Bump the count.
(-[WebHTMLRepresentation dealloc]): Decrement the count.
Renaming.
* Misc.subproj/WebCoreStatistics.h:
* Misc.subproj/WebKitStatisticsPrivate.h:
* Misc.subproj/WebCoreStatistics.m:
(+[WebCoreStatistics emptyCache]):
(+[WebCoreStatistics setCacheDisabled:]):
Renamed to include the word cache now that the class does not.
* Plugins.subproj/WebPluginStream.m:
* WebCoreSupport.subproj/WebSubresourceClient.m:
* WebView.subproj/WebMainResourceClient.m:
Updated for the WebFoundation renaming.
WebBrowser:
- fixed 3002602 -- make Page Load Test close windows, check for leaked JS interpreters before and after
* AppController.m:
* Debug/CacheController.m:
Update for WebCoreStatistics method name changes.
* BrowserWebController.m: Tweak.
* Test/PageLoadTest.nib: Add new button to control whether we do "leak the world" checking.
* Test/PageLoadTestController.h: New action and outlet for leak the world button.
* Test/PageLoadTestController.m:
(-[PageLoadTestController init]): New notification for leak the world message.
(-[PageLoadTestController windowDidLoad]): Add code for leak the world button and new default.
(-[PageLoadTestController toggleCheckForWorldLeaks:]): Added.
(-[PageLoadTestController detectedWorldLeak:]): Added. Puts up sheet.
(-[AppController pageLoadTestController]): Moved global in here so it can be more private.
* Test/PageLoadTestLogger.m:
Updated for url -> URL method name change.
* Test/PageLoadTestRunner.h: Add method to control leak the world checking. Also do url -> URL.
* Test/PageLoadTestRunner.m:
(-[NSWindow closeIfBrowserWindow]): Added. Used to close all browser windows for leak the world checking.
(-[PageLoadTestRunner init]): Default for checkForWorldLeaks is YES.
(-[PageLoadTestRunner clearCacheWithURL:]): Update for empty cache method name change.
(-[PageLoadTestRunner addLeakToArray:count:name:]): Added. Helper for constructing string.
(-[PageLoadTestRunner closeBrowserWindows]): Added.
(-[PageLoadTestRunner finishCheckingForWorldLeaks]): Added; done after a delay.
(-[PageLoadTestRunner checkForWorldLeaks]): Do the leak check.
(-[PageLoadTestRunner checkForWorldLeaksNow]): Do the leak check without delay.
(-[PageLoadTestRunner testDone]): Check for leaks when the test is done.
(-[PageLoadTestRunner start]): Check for world leak objects before the test starts.
(-[PageLoadTestRunner pageLoadStarted:]): Use our own autorelease pool to make objects less "lingery".
(-[PageLoadTestRunner pageLoadDone:]): Use our own autorelease pool to make objects less "lingery".
(-[PageLoadTestRunner setCheckForWorldLeaks:]): Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1604 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkGroup.m b/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
index b915485..165868f 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
@@ -82,11 +82,13 @@
WEBKIT_ASSERT_VALID_ARG (newTopBookmark, newTopBookmark == nil ||
[newTopBookmark bookmarkType] == WebBookmarkTypeList);
+ [newTopBookmark retain];
+
[_topBookmark _setGroup:nil];
- [_topBookmark autorelease];
+ [_topBookmark release];
if (newTopBookmark) {
- _topBookmark = [newTopBookmark retain];
+ _topBookmark = newTopBookmark;
} else {
_topBookmark = [[WebBookmarkList alloc] initWithTitle:nil image:nil group:self];
}
@@ -164,21 +166,21 @@
WEBKIT_ASSERT_VALID_ARG (newURLString, bookmarkType == WebBookmarkTypeLeaf || (newURLString == nil));
if (bookmarkType == WebBookmarkTypeLeaf) {
- bookmark = [[[WebBookmarkLeaf alloc] initWithURLString:newURLString
+ bookmark = [[WebBookmarkLeaf alloc] initWithURLString:newURLString
title:newTitle
image:newImage
- group:self] autorelease];
+ group:self];
} else if (bookmarkType == WebBookmarkTypeSeparator) {
- bookmark = [[[WebBookmarkSeparator alloc] initWithGroup:self] autorelease];
+ bookmark = [[WebBookmarkSeparator alloc] initWithGroup:self];
} else {
WEBKIT_ASSERT (bookmarkType == WebBookmarkTypeList);
- bookmark = [[[WebBookmarkList alloc] initWithTitle:newTitle
+ bookmark = [[WebBookmarkList alloc] initWithTitle:newTitle
image:newImage
- group:self] autorelease];
+ group:self];
}
[parent insertChild:bookmark atIndex:index];
- return bookmark;
+ return [bookmark autorelease];
}
- (NSString *)file
@@ -211,8 +213,9 @@
}
_loading = YES;
- newTopBookmark = [[[WebBookmarkList alloc] initFromDictionaryRepresentation:dictionary withGroup:self] autorelease];
+ newTopBookmark = [[WebBookmarkList alloc] initFromDictionaryRepresentation:dictionary withGroup:self];
[self _setTopBookmark:newTopBookmark];
+ [newTopBookmark release];
_loading = NO;
return YES;
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkList.m b/WebKit/Bookmarks.subproj/WebBookmarkList.m
index 0bc2c10..c4e8971 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkList.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkList.m
@@ -117,10 +117,9 @@
count = [self numberOfChildren];
for (index = 0; index < count; ++index) {
- WebBookmark *childCopy;
-
- childCopy = [[[_list objectAtIndex:index] copyWithZone:zone] autorelease];
+ WebBookmark *childCopy = [[_list objectAtIndex:index] copyWithZone:zone];
[copy insertChild:childCopy atIndex:index];
+ [childCopy release];
}
return copy;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e8018fe..7c316e2 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,78 @@
+2002-07-19 Darin Adler <darin at apple.com>
+
+ - fixed 3001951 -- Massive memory leak after running base or static PLT
+
+ * WebView.subproj/WebDataSourcePrivate.m: (-[WebDataSource _makeRepresentation]):
+ Add a missing release.
+
+ Reduced our use of autorelease. This allows the page load test to detect leaks of the
+ world much more easily. We may later find we need to use the "retain autorelease" idiom
+ in a few more places, but I did a lot of testing and that did not show up.
+
+ * Bookmarks.subproj/WebBookmarkGroup.m:
+ (-[WebBookmarkGroup _setTopBookmark:]): Use a plain release.
+ (-[WebBookmarkGroup _loadBookmarkGroupGuts]): Use a plain release.
+ * Bookmarks.subproj/WebBookmarkList.m:
+ (-[WebBookmarkList copyWithZone:]): Use a plain release.
+ * Misc.subproj/WebIconLoader.m:
+ (-[WebIconLoader WebResourceHandleDidFinishLoading:data:]): Use a plain release.
+ * Plugins.subproj/WebPluginView.m:
+ (-[WebPluginView loadURL:inTarget:withNotifyData:andHandleAttributes:]): Use a plain release.
+ * WebView.subproj/WebController.m:
+ (-[WebController createFrameNamed:for:inParent:allowsScrolling:]): Use a plain release.
+ (-[WebController setWindowContext:]): Use a plain release.
+ (-[WebController setResourceProgressHandler:]): Use a plain release.
+ (-[WebController setDownloadProgressHandler:]): Use a plain release.
+ (-[WebController setPolicyHandler:]): Use a plain release.
+ * WebView.subproj/WebControllerPrivate.m:
+ (-[WebControllerPrivate dealloc]): Use plain release.
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSourcePrivate dealloc]): Use plain release.
+ (-[WebDataSource _setPrimaryLoadComplete:]): Use plain release.
+ (-[WebDataSource _setTitle:]): Use plain release.
+ * WebView.subproj/WebFrame.m:
+ (-[WebFrame initWithName:webView:provisionalDataSource:controller:]): Use plain release.
+ (-[WebFrame reset]): Invalidate and release the timer.
+ * WebView.subproj/WebFramePrivate.h: Keep a reference to the timer.
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFramePrivate dealloc]): Invalidate and release the timer. Use plain release.
+ (-[WebFramePrivate setName:]): Use plain release.
+ (-[WebFramePrivate setWebView:]): Use plain release.
+ (-[WebFramePrivate setDataSource:]): Use plain release.
+ (-[WebFramePrivate setProvisionalDataSource:]): Use plain release.
+ (-[WebFrame _scheduleLayout:]): Keep a reference to the timer.
+ (-[WebFrame _timedLayout:]): Release and nil the timer.
+ * WebView.subproj/WebRenderNode.m:
+ (-[WebRenderNode initWithName:rect:view:children:]): Use plain release.
+ * WebView.subproj/WebView.m:
+ (-[WebView concludeDragOperation:]): Use plain release.
+ * WebView.subproj/WebViewPrivate.m:
+ (-[WebView _makeDocumentViewForDataSource:]): Use plain release.
+
+ Other changes to make the new page load test feature work.
+
+ * Misc.subproj/WebKitStatistics.h:
+ * Misc.subproj/WebKitStatistics.m:
+ (+[WebKitStatistics HTMLRepresentationCount]):
+ Added a stat for WebHTMLRepresentation objects.
+ * WebView.subproj/WebHTMLRepresentation.m:
+ (-[WebHTMLRepresentation init]): Bump the count.
+ (-[WebHTMLRepresentation dealloc]): Decrement the count.
+
+ Renaming.
+
+ * Misc.subproj/WebCoreStatistics.h:
+ * Misc.subproj/WebKitStatisticsPrivate.h:
+ * Misc.subproj/WebCoreStatistics.m:
+ (+[WebCoreStatistics emptyCache]):
+ (+[WebCoreStatistics setCacheDisabled:]):
+ Renamed to include the word cache now that the class does not.
+
+ * Plugins.subproj/WebPluginStream.m:
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ * WebView.subproj/WebMainResourceClient.m:
+ Updated for the WebFoundation renaming.
+
2002-07-19 Chris Blumenberg <cblu at apple.com>
* WebView.subproj/WebDataSourcePrivate.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index e8018fe..7c316e2 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,78 @@
+2002-07-19 Darin Adler <darin at apple.com>
+
+ - fixed 3001951 -- Massive memory leak after running base or static PLT
+
+ * WebView.subproj/WebDataSourcePrivate.m: (-[WebDataSource _makeRepresentation]):
+ Add a missing release.
+
+ Reduced our use of autorelease. This allows the page load test to detect leaks of the
+ world much more easily. We may later find we need to use the "retain autorelease" idiom
+ in a few more places, but I did a lot of testing and that did not show up.
+
+ * Bookmarks.subproj/WebBookmarkGroup.m:
+ (-[WebBookmarkGroup _setTopBookmark:]): Use a plain release.
+ (-[WebBookmarkGroup _loadBookmarkGroupGuts]): Use a plain release.
+ * Bookmarks.subproj/WebBookmarkList.m:
+ (-[WebBookmarkList copyWithZone:]): Use a plain release.
+ * Misc.subproj/WebIconLoader.m:
+ (-[WebIconLoader WebResourceHandleDidFinishLoading:data:]): Use a plain release.
+ * Plugins.subproj/WebPluginView.m:
+ (-[WebPluginView loadURL:inTarget:withNotifyData:andHandleAttributes:]): Use a plain release.
+ * WebView.subproj/WebController.m:
+ (-[WebController createFrameNamed:for:inParent:allowsScrolling:]): Use a plain release.
+ (-[WebController setWindowContext:]): Use a plain release.
+ (-[WebController setResourceProgressHandler:]): Use a plain release.
+ (-[WebController setDownloadProgressHandler:]): Use a plain release.
+ (-[WebController setPolicyHandler:]): Use a plain release.
+ * WebView.subproj/WebControllerPrivate.m:
+ (-[WebControllerPrivate dealloc]): Use plain release.
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSourcePrivate dealloc]): Use plain release.
+ (-[WebDataSource _setPrimaryLoadComplete:]): Use plain release.
+ (-[WebDataSource _setTitle:]): Use plain release.
+ * WebView.subproj/WebFrame.m:
+ (-[WebFrame initWithName:webView:provisionalDataSource:controller:]): Use plain release.
+ (-[WebFrame reset]): Invalidate and release the timer.
+ * WebView.subproj/WebFramePrivate.h: Keep a reference to the timer.
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFramePrivate dealloc]): Invalidate and release the timer. Use plain release.
+ (-[WebFramePrivate setName:]): Use plain release.
+ (-[WebFramePrivate setWebView:]): Use plain release.
+ (-[WebFramePrivate setDataSource:]): Use plain release.
+ (-[WebFramePrivate setProvisionalDataSource:]): Use plain release.
+ (-[WebFrame _scheduleLayout:]): Keep a reference to the timer.
+ (-[WebFrame _timedLayout:]): Release and nil the timer.
+ * WebView.subproj/WebRenderNode.m:
+ (-[WebRenderNode initWithName:rect:view:children:]): Use plain release.
+ * WebView.subproj/WebView.m:
+ (-[WebView concludeDragOperation:]): Use plain release.
+ * WebView.subproj/WebViewPrivate.m:
+ (-[WebView _makeDocumentViewForDataSource:]): Use plain release.
+
+ Other changes to make the new page load test feature work.
+
+ * Misc.subproj/WebKitStatistics.h:
+ * Misc.subproj/WebKitStatistics.m:
+ (+[WebKitStatistics HTMLRepresentationCount]):
+ Added a stat for WebHTMLRepresentation objects.
+ * WebView.subproj/WebHTMLRepresentation.m:
+ (-[WebHTMLRepresentation init]): Bump the count.
+ (-[WebHTMLRepresentation dealloc]): Decrement the count.
+
+ Renaming.
+
+ * Misc.subproj/WebCoreStatistics.h:
+ * Misc.subproj/WebKitStatisticsPrivate.h:
+ * Misc.subproj/WebCoreStatistics.m:
+ (+[WebCoreStatistics emptyCache]):
+ (+[WebCoreStatistics setCacheDisabled:]):
+ Renamed to include the word cache now that the class does not.
+
+ * Plugins.subproj/WebPluginStream.m:
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ * WebView.subproj/WebMainResourceClient.m:
+ Updated for the WebFoundation renaming.
+
2002-07-19 Chris Blumenberg <cblu at apple.com>
* WebView.subproj/WebDataSourcePrivate.m:
diff --git a/WebKit/Misc.subproj/WebCoreStatistics.h b/WebKit/Misc.subproj/WebCoreStatistics.h
index c3c2419..f80a17b 100644
--- a/WebKit/Misc.subproj/WebCoreStatistics.h
+++ b/WebKit/Misc.subproj/WebCoreStatistics.h
@@ -13,8 +13,8 @@
}
+ (NSArray *)statistics;
-+ (void)empty;
-+ (void)setDisabled:(BOOL)disabled;
++ (void)emptyCache;
++ (void)setCacheDisabled:(BOOL)disabled;
+ (int)javaScriptObjectsCount;
+ (int)javaScriptInterpretersCount;
diff --git a/WebKit/Misc.subproj/WebCoreStatistics.m b/WebKit/Misc.subproj/WebCoreStatistics.m
index 70024d6..4b48ba3 100644
--- a/WebKit/Misc.subproj/WebCoreStatistics.m
+++ b/WebKit/Misc.subproj/WebCoreStatistics.m
@@ -18,12 +18,12 @@
return [WebCoreCache statistics];
}
-+ (void)empty
++ (void)emptyCache
{
[WebCoreCache empty];
}
-+ (void)setDisabled:(BOOL)disabled
++ (void)setCacheDisabled:(BOOL)disabled
{
[WebCoreCache setDisabled:disabled];
}
diff --git a/WebKit/Misc.subproj/WebIconLoader.m b/WebKit/Misc.subproj/WebIconLoader.m
index 4f6986e..e31bfb9 100644
--- a/WebKit/Misc.subproj/WebIconLoader.m
+++ b/WebKit/Misc.subproj/WebIconLoader.m
@@ -107,18 +107,19 @@
- (void)WebResourceHandleDidFinishLoading:(WebResourceHandle *)sender data:(NSData *)data
{
NSImage *image = [[NSImage alloc] initWithData:data];
- if(image){
- [_private->delegate receivedPageIcon:[image autorelease]];
+ if (image) {
+ [_private->delegate receivedPageIcon:image];
+ [image release];
}
}
-- (void)WebResourceHandle:(WebResourceHandle *)sender resourceDataDidBecomeAvailable:(NSData *)data
+- (void)WebResourceHandle:(WebResourceHandle *)sender dataDidBecomeAvailable:(NSData *)data
{
}
-- (void)WebResourceHandle:(WebResourceHandle *)sender resourceDidFailLoadingWithResult:(WebError *)result
+- (void)WebResourceHandle:(WebResourceHandle *)sender didFailLoadingWithResult:(WebError *)result
{
}
diff --git a/WebKit/Misc.subproj/WebKitStatistics.h b/WebKit/Misc.subproj/WebKitStatistics.h
index e76e646..0515ab5 100644
--- a/WebKit/Misc.subproj/WebKitStatistics.h
+++ b/WebKit/Misc.subproj/WebKitStatistics.h
@@ -17,7 +17,7 @@
+ (int)frameCount;
+ (int)dataSourceCount;
+ (int)viewCount;
-
++ (int)HTMLRepresentationCount;
+ (int)bridgeCount;
@end
diff --git a/WebKit/Misc.subproj/WebKitStatistics.m b/WebKit/Misc.subproj/WebKitStatistics.m
index da2a5c1..94d4aa8 100644
--- a/WebKit/Misc.subproj/WebKitStatistics.m
+++ b/WebKit/Misc.subproj/WebKitStatistics.m
@@ -14,6 +14,7 @@ int WebBridgeCount;
int WebControllerCount;
int WebDataSourceCount;
int WebFrameCount;
+int WebHTMLRepresentationCount;
int WebViewCount;
@implementation WebKitStatistics
@@ -43,4 +44,9 @@ int WebViewCount;
return WebBridgeCount;
}
++ (int)HTMLRepresentationCount
+{
+ return WebHTMLRepresentationCount;
+}
+
@end
diff --git a/WebKit/Misc.subproj/WebKitStatisticsPrivate.h b/WebKit/Misc.subproj/WebKitStatisticsPrivate.h
index 14902d2..597359a 100644
--- a/WebKit/Misc.subproj/WebKitStatisticsPrivate.h
+++ b/WebKit/Misc.subproj/WebKitStatisticsPrivate.h
@@ -11,4 +11,5 @@ extern int WebBridgeCount;
extern int WebControllerCount;
extern int WebDataSourceCount;
extern int WebFrameCount;
+extern int WebHTMLRepresentationCount;
extern int WebViewCount;
diff --git a/WebKit/Plugins.subproj/WebPluginStream.m b/WebKit/Plugins.subproj/WebPluginStream.m
index c7b7ad5..1ae6ae8 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.m
+++ b/WebKit/Plugins.subproj/WebPluginStream.m
@@ -230,7 +230,7 @@ static NSString *getCarbonPath(NSString *posixPath);
[[view webController] _didStartLoading:URL];
}
-- (void)WebResourceHandle:(WebResourceHandle *)handle resourceDataDidBecomeAvailable:(NSData *)data
+- (void)WebResourceHandle:(WebResourceHandle *)handle dataDidBecomeAvailable:(NSData *)data
{
WebController *webController = [view webController];
@@ -277,7 +277,7 @@ static NSString *getCarbonPath(NSString *posixPath);
[webController _didStopLoading:URL];
}
-- (void)WebResourceHandle:(WebResourceHandle *)handle resourceDidFailLoadingWithResult:(WebError *)result
+- (void)WebResourceHandle:(WebResourceHandle *)handle didFailLoadingWithResult:(WebError *)result
{
WebController *webController = [view webController];
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index 7447b65..f8a5fef 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -735,9 +735,11 @@
// but IE allows an NPP_*URLNotify when the target is _self, _current, _parent or _top
// so we have to allow this as well. Needed for iTools.
}
- dataSource = [[[WebDataSource alloc] initWithURL:url attributes:attributes] autorelease];
- if([frame setProvisionalDataSource:dataSource])
+ dataSource = [[WebDataSource alloc] initWithURL:url attributes:attributes];
+ if ([frame setProvisionalDataSource:dataSource]) {
[frame startLoading];
+ }
+ [dataSource release];
}
}
return NPERR_NO_ERROR;
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index 38a96c6..aa3a5d4 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -103,7 +103,7 @@
[self receivedProgressWithHandle:handle complete: NO];
}
-- (void)WebResourceHandle:(WebResourceHandle *)handle resourceDataDidBecomeAvailable:(NSData *)data
+- (void)WebResourceHandle:(WebResourceHandle *)handle dataDidBecomeAvailable:(NSData *)data
{
WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
@@ -147,7 +147,7 @@
[self didStopLoading];
}
-- (void)WebResourceHandle:(WebResourceHandle *)handle resourceDidFailLoadingWithResult:(WebError *)error
+- (void)WebResourceHandle:(WebResourceHandle *)handle didFailLoadingWithResult:(WebError *)error
{
WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index 38a96c6..aa3a5d4 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -103,7 +103,7 @@
[self receivedProgressWithHandle:handle complete: NO];
}
-- (void)WebResourceHandle:(WebResourceHandle *)handle resourceDataDidBecomeAvailable:(NSData *)data
+- (void)WebResourceHandle:(WebResourceHandle *)handle dataDidBecomeAvailable:(NSData *)data
{
WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
@@ -147,7 +147,7 @@
[self didStopLoading];
}
-- (void)WebResourceHandle:(WebResourceHandle *)handle resourceDidFailLoadingWithResult:(WebError *)error
+- (void)WebResourceHandle:(WebResourceHandle *)handle didFailLoadingWithResult:(WebError *)error
{
WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
diff --git a/WebKit/WebView.subproj/WebController.m b/WebKit/WebView.subproj/WebController.m
index ec13c69..157946a 100644
--- a/WebKit/WebView.subproj/WebController.m
+++ b/WebKit/WebView.subproj/WebController.m
@@ -65,36 +65,42 @@
WebView *childView;
WebFrame *newFrame;
- childView = [[[WebView alloc] initWithFrame: NSMakeRect (0,0,0,0)] autorelease];
+ childView = [[WebView alloc] initWithFrame: NSMakeRect(0,0,0,0)];
- newFrame = [[[WebFrame alloc] initWithName: fname webView: childView provisionalDataSource: childDataSource controller: self] autorelease];
+ newFrame = [[WebFrame alloc] initWithName: fname webView: childView provisionalDataSource: childDataSource controller: self];
[parentDataSource addFrame: newFrame];
+
+ [newFrame release];
[childView _setController: self];
[childDataSource _setController: self];
[childView setAllowsScrolling: allowsScrolling];
+
+ [childView release];
return newFrame;
}
-- (void)setWindowContext: (id<WebWindowContext>)context
+- (void)setWindowContext:(id <WebWindowContext>)context
{
- [_private->windowContext autorelease];
- _private->windowContext = [context retain];
+ [context retain];
+ [_private->windowContext release];
+ _private->windowContext = context;
}
-- (id<WebWindowContext>)windowContext
+- (id <WebWindowContext>)windowContext
{
return _private->windowContext;
}
-- (void)setResourceProgressHandler: (id<WebResourceProgressHandler>)handler
+- (void)setResourceProgressHandler: (id <WebResourceProgressHandler>)handler
{
- [_private->resourceProgressHandler autorelease];
- _private->resourceProgressHandler = [handler retain];
+ [handler retain];
+ [_private->resourceProgressHandler release];
+ _private->resourceProgressHandler = handler;
}
@@ -106,8 +112,9 @@
- (void)setDownloadProgressHandler: (id<WebResourceProgressHandler>)handler
{
- [_private->downloadProgressHandler autorelease];
- _private->downloadProgressHandler = [handler retain];
+ [handler retain];
+ [_private->downloadProgressHandler release];
+ _private->downloadProgressHandler = handler;
}
@@ -117,10 +124,11 @@
}
-- (void)setPolicyHandler: (id<WebControllerPolicyHandler>)handler
+- (void)setPolicyHandler:(id <WebControllerPolicyHandler>)handler
{
- [_private->policyHandler autorelease];
- _private->policyHandler = [handler retain];
+ [handler retain];
+ [_private->policyHandler release];
+ _private->policyHandler = handler;
}
- (id<WebControllerPolicyHandler>)policyHandler
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.m b/WebKit/WebView.subproj/WebControllerPrivate.m
index 4eb81a4..5a79c04 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.m
+++ b/WebKit/WebView.subproj/WebControllerPrivate.m
@@ -50,10 +50,10 @@
[self _clearControllerReferences: mainFrame];
[mainFrame reset];
- [mainFrame autorelease];
- [windowContext autorelease];
- [resourceProgressHandler autorelease];
- [policyHandler autorelease];
+ [mainFrame release];
+ [windowContext release];
+ [resourceProgressHandler release];
+ [policyHandler release];
[super dealloc];
}
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index bbb0f9c..8484a7c 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -66,10 +66,10 @@
[mainHandle release];
[mainURLHandleClient release];
[urlHandles release];
- [pageTitle autorelease];
- [downloadPath autorelease];
- [encoding autorelease];
- [contentType autorelease];
+ [pageTitle release];
+ [downloadPath release];
+ [encoding release];
+ [contentType release];
[errors release];
[mainDocumentError release];
[locationChangeHandler release];
@@ -162,7 +162,7 @@
[self _loadPageIconIfNecessary];
[_private->mainURLHandleClient release];
_private->mainURLHandleClient = 0;
- [_private->mainHandle autorelease];
+ [_private->mainHandle release];
_private->mainHandle = 0;
[self _updateLoading];
}
@@ -283,7 +283,7 @@
return;
}
- [_private->pageTitle autorelease];
+ [_private->pageTitle release];
_private->pageTitle = [trimmed copy];
// The title doesn't get communicated to the controller until
@@ -462,7 +462,9 @@
// Check if the data source was already bound?
if (![[self representation] isKindOfClass:repClass]) {
- [self _setRepresentation:(id<WebDocumentRepresentation>)(repClass != nil ? [[repClass alloc] init] : nil)];
+ id newRep = repClass != nil ? [[repClass alloc] init] : nil;
+ [self _setRepresentation:(id <WebDocumentRepresentation>)newRep];
+ [newRep release];
}
[[[self webFrame] webView] _makeDocumentViewForDataSource:self];
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 2da615e..78658c3 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -62,7 +62,7 @@
[dummyDataSource release];
} else if ([self setProvisionalDataSource: d] == NO){
- [self autorelease];
+ [self release];
return nil;
}
@@ -212,6 +212,10 @@
[htmlView _reset];
}
[_private setWebView: nil];
+
+ [_private->scheduledLayoutTimer invalidate];
+ [_private->scheduledLayoutTimer release];
+ _private->scheduledLayoutTimer = nil;
}
+ _frameNamed:(NSString *)name fromFrame: (WebFrame *)aFrame
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index acb0910..72a0379 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -42,7 +42,7 @@ typedef enum {
WebDataSource *provisionalDataSource;
WebController *controller;
WebFrameState state;
- BOOL scheduledLayoutPending;
+ NSTimer *scheduledLayoutTimer;
WebFrameBridge *frameBridge;
}
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index d733fb8..a235859 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -37,33 +37,38 @@ static const char * const stateNames[6] = {
- (void)dealloc
{
+ [scheduledLayoutTimer invalidate];
+ [scheduledLayoutTimer release];
+
[webView _setController: nil];
[dataSource _setController: nil];
[dataSource _setLocationChangeHandler: nil];
[provisionalDataSource _setController: nil];
[provisionalDataSource _setLocationChangeHandler: nil];
- [name autorelease];
- [webView autorelease];
- [dataSource autorelease];
- [provisionalDataSource autorelease];
+ [name release];
+ [webView release];
+ [dataSource release];
+ [provisionalDataSource release];
[frameBridge release];
[super dealloc];
}
- (NSString *)name { return name; }
-- (void)setName: (NSString *)n
+- (void)setName:(NSString *)n
{
- [name autorelease];
- name = [n retain];
+ NSString *newName = [n copy];
+ [name release];
+ name = newName;
}
- (WebView *)webView { return webView; }
- (void)setWebView: (WebView *)v
{
- [webView autorelease];
- webView = [v retain];
+ [v retain];
+ [webView release];
+ webView = v;
}
- (WebDataSource *)dataSource { return dataSource; }
@@ -71,7 +76,7 @@ static const char * const stateNames[6] = {
{
if (dataSource != d) {
[dataSource _removeFromFrame];
- [dataSource autorelease];
+ [dataSource release];
dataSource = [d retain];
}
}
@@ -85,10 +90,9 @@ static const char * const stateNames[6] = {
- (WebDataSource *)provisionalDataSource { return provisionalDataSource; }
- (void)setProvisionalDataSource: (WebDataSource *)d
{
- if (provisionalDataSource != d) {
- [provisionalDataSource autorelease];
- provisionalDataSource = [d retain];
- }
+ [d retain];
+ [provisionalDataSource release];
+ provisionalDataSource = d;
}
@end
@@ -113,11 +117,11 @@ static const char * const stateNames[6] = {
[ds _setController: [self controller]];
}
-- (void)_scheduleLayout: (NSTimeInterval)inSeconds
+- (void)_scheduleLayout:(NSTimeInterval)inSeconds
{
- if (_private->scheduledLayoutPending == NO) {
- [NSTimer scheduledTimerWithTimeInterval:inSeconds target:self selector: @selector(_timedLayout:) userInfo: nil repeats:FALSE];
- _private->scheduledLayoutPending = YES;
+ // FIXME: Maybe this should have the code to move up the deadline if the new interval brings the time even closer.
+ if (_private->scheduledLayoutTimer == nil) {
+ _private->scheduledLayoutTimer = [[NSTimer scheduledTimerWithTimeInterval:inSeconds target:self selector:@selector(_timedLayout:) userInfo:nil repeats:FALSE] retain];
}
}
@@ -125,7 +129,9 @@ static const char * const stateNames[6] = {
{
WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: state = %s\n", [[self name] cString], stateNames[_private->state]);
- _private->scheduledLayoutPending = NO;
+ [_private->scheduledLayoutTimer release];
+ _private->scheduledLayoutTimer = nil;
+
if (_private->state == WebFrameStateLayoutAcceptable) {
NSView <WebDocumentView> *documentView = [[self webView] documentView];
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 6cbbfaf..c18f8c7 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -77,7 +77,6 @@ enum {
return self;
}
-
- (void)dealloc
{
--WebViewCount;
@@ -193,11 +192,12 @@ enum {
return;
}
- dataSource = [[[WebDataSource alloc] initWithURL:URL] autorelease];
+ dataSource = [[WebDataSource alloc] initWithURL:URL];
frame = [[self controller] mainFrame];
if ([frame setProvisionalDataSource:dataSource]) {
[frame startLoading];
}
+ [dataSource release];
}
+ (void) registerViewClass:(Class)viewClass forMIMEType:(NSString *)MIMEType
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.m b/WebKit/WebView.subproj/WebFrameViewPrivate.m
index 54a5b02..18b8f19 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.m
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.m
@@ -70,7 +70,9 @@
-(void)_makeDocumentViewForDataSource:(WebDataSource *)dataSource
{
Class viewClass = [[[self class] _viewTypes] _web_objectForMIMEType:[dataSource contentType]];
- [self _setDocumentView: (id<WebDocumentLoading>)(viewClass ? [[[viewClass alloc] init] autorelease] : nil)];
+ id documentView = viewClass ? [[viewClass alloc] init] : nil;
+ [self _setDocumentView:(id<WebDocumentLoading>)documentView];
+ [documentView release];
[[self documentView] provisionalDataSourceChanged:dataSource];
}
diff --git a/WebKit/WebView.subproj/WebHTMLRepresentation.m b/WebKit/WebView.subproj/WebHTMLRepresentation.m
index 8292aa0..492e518 100644
--- a/WebKit/WebView.subproj/WebHTMLRepresentation.m
+++ b/WebKit/WebView.subproj/WebHTMLRepresentation.m
@@ -4,8 +4,10 @@
*/
#import <WebKit/WebHTMLRepresentation.h>
+
#import <WebKit/WebDataSource.h>
#import <WebKit/WebBridge.h>
+#import <WebKit/WebKitStatisticsPrivate.h>
@interface WebHTMLRepresentationPrivate : NSObject
{
@@ -26,11 +28,15 @@
_private = [[WebHTMLRepresentationPrivate alloc] init];
_private->bridge = [[WebBridge alloc] init];
+ ++WebHTMLRepresentationCount;
+
return self;
}
- (void)dealloc
{
+ --WebHTMLRepresentationCount;
+
[_private->bridge release];
[_private release];
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 9a08009..3928399 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -157,7 +157,7 @@
[self didStopLoading];
}
-- (void)WebResourceHandle:(WebResourceHandle *)handle resourceDataDidBecomeAvailable:(NSData *)incomingData
+- (void)WebResourceHandle:(WebResourceHandle *)handle dataDidBecomeAvailable:(NSData *)incomingData
{
WebController *controller = [dataSource controller];
NSString *contentType = [handle contentType];
@@ -232,7 +232,7 @@
isFirstChunk = NO;
}
-- (void)WebResourceHandle:(WebResourceHandle *)handle resourceDidFailLoadingWithResult:(WebError *)result
+- (void)WebResourceHandle:(WebResourceHandle *)handle didFailLoadingWithResult:(WebError *)result
{
WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "url = %s, result = %s\n", DEBUG_OBJECT([handle url]), DEBUG_OBJECT([result errorDescription]));
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 9a08009..3928399 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -157,7 +157,7 @@
[self didStopLoading];
}
-- (void)WebResourceHandle:(WebResourceHandle *)handle resourceDataDidBecomeAvailable:(NSData *)incomingData
+- (void)WebResourceHandle:(WebResourceHandle *)handle dataDidBecomeAvailable:(NSData *)incomingData
{
WebController *controller = [dataSource controller];
NSString *contentType = [handle contentType];
@@ -232,7 +232,7 @@
isFirstChunk = NO;
}
-- (void)WebResourceHandle:(WebResourceHandle *)handle resourceDidFailLoadingWithResult:(WebError *)result
+- (void)WebResourceHandle:(WebResourceHandle *)handle didFailLoadingWithResult:(WebError *)result
{
WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "url = %s, result = %s\n", DEBUG_OBJECT([handle url]), DEBUG_OBJECT([result errorDescription]));
diff --git a/WebKit/WebView.subproj/WebRenderNode.m b/WebKit/WebView.subproj/WebRenderNode.m
index f235d44..124574a 100644
--- a/WebKit/WebView.subproj/WebRenderNode.m
+++ b/WebKit/WebView.subproj/WebRenderNode.m
@@ -34,7 +34,9 @@
}
if ([view isKindOfClass:[WebView class]]) {
WebView *webView = (WebView *)view;
- [collectChildren addObject:[[[WebRenderNode alloc] initWithWebView:webView] autorelease]];
+ WebRenderNode *node = [[WebRenderNode alloc] initWithWebView:webView];
+ [collectChildren addObject:node];
+ [node release];
}
children = [collectChildren copy];
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index ec13c69..157946a 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -65,36 +65,42 @@
WebView *childView;
WebFrame *newFrame;
- childView = [[[WebView alloc] initWithFrame: NSMakeRect (0,0,0,0)] autorelease];
+ childView = [[WebView alloc] initWithFrame: NSMakeRect(0,0,0,0)];
- newFrame = [[[WebFrame alloc] initWithName: fname webView: childView provisionalDataSource: childDataSource controller: self] autorelease];
+ newFrame = [[WebFrame alloc] initWithName: fname webView: childView provisionalDataSource: childDataSource controller: self];
[parentDataSource addFrame: newFrame];
+
+ [newFrame release];
[childView _setController: self];
[childDataSource _setController: self];
[childView setAllowsScrolling: allowsScrolling];
+
+ [childView release];
return newFrame;
}
-- (void)setWindowContext: (id<WebWindowContext>)context
+- (void)setWindowContext:(id <WebWindowContext>)context
{
- [_private->windowContext autorelease];
- _private->windowContext = [context retain];
+ [context retain];
+ [_private->windowContext release];
+ _private->windowContext = context;
}
-- (id<WebWindowContext>)windowContext
+- (id <WebWindowContext>)windowContext
{
return _private->windowContext;
}
-- (void)setResourceProgressHandler: (id<WebResourceProgressHandler>)handler
+- (void)setResourceProgressHandler: (id <WebResourceProgressHandler>)handler
{
- [_private->resourceProgressHandler autorelease];
- _private->resourceProgressHandler = [handler retain];
+ [handler retain];
+ [_private->resourceProgressHandler release];
+ _private->resourceProgressHandler = handler;
}
@@ -106,8 +112,9 @@
- (void)setDownloadProgressHandler: (id<WebResourceProgressHandler>)handler
{
- [_private->downloadProgressHandler autorelease];
- _private->downloadProgressHandler = [handler retain];
+ [handler retain];
+ [_private->downloadProgressHandler release];
+ _private->downloadProgressHandler = handler;
}
@@ -117,10 +124,11 @@
}
-- (void)setPolicyHandler: (id<WebControllerPolicyHandler>)handler
+- (void)setPolicyHandler:(id <WebControllerPolicyHandler>)handler
{
- [_private->policyHandler autorelease];
- _private->policyHandler = [handler retain];
+ [handler retain];
+ [_private->policyHandler release];
+ _private->policyHandler = handler;
}
- (id<WebControllerPolicyHandler>)policyHandler
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index 4eb81a4..5a79c04 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -50,10 +50,10 @@
[self _clearControllerReferences: mainFrame];
[mainFrame reset];
- [mainFrame autorelease];
- [windowContext autorelease];
- [resourceProgressHandler autorelease];
- [policyHandler autorelease];
+ [mainFrame release];
+ [windowContext release];
+ [resourceProgressHandler release];
+ [policyHandler release];
[super dealloc];
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list