[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:09:56 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 9fbe9689d2b0e435e09f4329e3bed9d4dc7719c3
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Apr 26 01:55:57 2002 +0000
* History.subproj/IFWebHistoryPrivate.m:
(-[IFWebHistoryPrivate _loadHistoryGuts:]): Use NSDictionary instead
of NSObject to avoid a cast.
* WebView.subproj/IFLocationChangeHandler.h: Add NSObject as a required
protocol so we can retain and release.
* WebView.subproj/IFWebController.h: Add NSObject as a required protocol
so we can retain and release.
* WebView.subproj/IFWebDataSourcePrivate.mm:
(-[IFWebDataSourcePrivate dealloc]):
(-[IFWebDataSource _setLoading:]):
(-[IFWebDataSource _setController:]):
(-[IFWebDataSource _setLocationChangeHandler:]):
* WebView.subproj/IFWebViewPrivate.mm:
(-[IFWebViewPrivate dealloc]):
Removed NSObject * casts that were used to work around the problem fixed above.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1080 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 07257ba..e8f7f8a 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,23 @@
+2002-04-25 Darin Adler <darin at apple.com>
+
+ * History.subproj/IFWebHistoryPrivate.m:
+ (-[IFWebHistoryPrivate _loadHistoryGuts:]): Use NSDictionary instead
+ of NSObject to avoid a cast.
+
+ * WebView.subproj/IFLocationChangeHandler.h: Add NSObject as a required
+ protocol so we can retain and release.
+ * WebView.subproj/IFWebController.h: Add NSObject as a required protocol
+ so we can retain and release.
+
+ * WebView.subproj/IFWebDataSourcePrivate.mm:
+ (-[IFWebDataSourcePrivate dealloc]):
+ (-[IFWebDataSource _setLoading:]):
+ (-[IFWebDataSource _setController:]):
+ (-[IFWebDataSource _setLocationChangeHandler:]):
+ * WebView.subproj/IFWebViewPrivate.mm:
+ (-[IFWebViewPrivate dealloc]):
+ Removed NSObject * casts that were used to work around the problem fixed above.
+
2002-04-25 Chris Blumenberg <set EMAIL_ADDRESS environment variable>
* MIME.subproj/IFDownloadHandler.h:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 07257ba..e8f7f8a 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,23 @@
+2002-04-25 Darin Adler <darin at apple.com>
+
+ * History.subproj/IFWebHistoryPrivate.m:
+ (-[IFWebHistoryPrivate _loadHistoryGuts:]): Use NSDictionary instead
+ of NSObject to avoid a cast.
+
+ * WebView.subproj/IFLocationChangeHandler.h: Add NSObject as a required
+ protocol so we can retain and release.
+ * WebView.subproj/IFWebController.h: Add NSObject as a required protocol
+ so we can retain and release.
+
+ * WebView.subproj/IFWebDataSourcePrivate.mm:
+ (-[IFWebDataSourcePrivate dealloc]):
+ (-[IFWebDataSource _setLoading:]):
+ (-[IFWebDataSource _setController:]):
+ (-[IFWebDataSource _setLocationChangeHandler:]):
+ * WebView.subproj/IFWebViewPrivate.mm:
+ (-[IFWebViewPrivate dealloc]):
+ Removed NSObject * casts that were used to work around the problem fixed above.
+
2002-04-25 Chris Blumenberg <set EMAIL_ADDRESS environment variable>
* MIME.subproj/IFDownloadHandler.h:
diff --git a/WebKit/History.subproj/IFWebHistoryPrivate.m b/WebKit/History.subproj/IFWebHistoryPrivate.m
index 17ff627..1cb1596 100644
--- a/WebKit/History.subproj/IFWebHistoryPrivate.m
+++ b/WebKit/History.subproj/IFWebHistoryPrivate.m
@@ -346,7 +346,7 @@
NSString *path;
NSArray *array;
NSEnumerator *enumerator;
- NSObject *object;
+ NSDictionary *dictionary;
int index;
int limit;
NSCalendarDate *ageLimitDate;
@@ -379,10 +379,10 @@
enumerator = [array reverseObjectEnumerator];
ageLimitPassed = NO;
- while ((object = [enumerator nextObject]) != nil) {
+ while ((dictionary = [enumerator nextObject]) != nil) {
IFURIEntry *entry;
- entry = [[IFURIEntry alloc] initFromDictionaryRepresentation: (NSDictionary *)object];
+ entry = [[IFURIEntry alloc] initFromDictionaryRepresentation: dictionary];
if ([entry url] == nil) {
// entry without url is useless; data on disk must have been bad; ignore this one
diff --git a/WebKit/History.subproj/WebHistoryPrivate.m b/WebKit/History.subproj/WebHistoryPrivate.m
index 17ff627..1cb1596 100644
--- a/WebKit/History.subproj/WebHistoryPrivate.m
+++ b/WebKit/History.subproj/WebHistoryPrivate.m
@@ -346,7 +346,7 @@
NSString *path;
NSArray *array;
NSEnumerator *enumerator;
- NSObject *object;
+ NSDictionary *dictionary;
int index;
int limit;
NSCalendarDate *ageLimitDate;
@@ -379,10 +379,10 @@
enumerator = [array reverseObjectEnumerator];
ageLimitPassed = NO;
- while ((object = [enumerator nextObject]) != nil) {
+ while ((dictionary = [enumerator nextObject]) != nil) {
IFURIEntry *entry;
- entry = [[IFURIEntry alloc] initFromDictionaryRepresentation: (NSDictionary *)object];
+ entry = [[IFURIEntry alloc] initFromDictionaryRepresentation: dictionary];
if ([entry url] == nil) {
// entry without url is useless; data on disk must have been bad; ignore this one
diff --git a/WebKit/WebView.subproj/IFLocationChangeHandler.h b/WebKit/WebView.subproj/IFLocationChangeHandler.h
index 6c1ff4c..f4ee53c 100644
--- a/WebKit/WebView.subproj/IFLocationChangeHandler.h
+++ b/WebKit/WebView.subproj/IFLocationChangeHandler.h
@@ -44,7 +44,7 @@ typedef enum {
} IFContentPolicy;
- at protocol IFLocationChangeHandler
+ at protocol IFLocationChangeHandler <NSObject>
- (void)locationChangeStarted;
@@ -65,5 +65,4 @@ typedef enum {
// file i/o failure, launch services failure, type mismatches, etc.
- (void)unableToImplementContentPolicy: (IFError *)error;
-
@end
diff --git a/WebKit/WebView.subproj/IFWebController.h b/WebKit/WebView.subproj/IFWebController.h
index 8ddbf13..98dcaf0 100644
--- a/WebKit/WebView.subproj/IFWebController.h
+++ b/WebKit/WebView.subproj/IFWebController.h
@@ -46,7 +46,7 @@
=============================================================================
*/
- at protocol IFResourceProgressHandler
+ at protocol IFResourceProgressHandler <NSObject>
/*
A new chunk of data has been received. This could be a partial load
@@ -68,7 +68,7 @@
=============================================================================
*/
- at protocol IFScriptContextHandler
+ at protocol IFScriptContextHandler <NSObject>
// setStatusText and statusText are used by Javascript's status bar text methods.
- (void)setStatusText: (NSString *)text forDataSource: (IFWebDataSource *)dataSource;
@@ -97,7 +97,7 @@ typedef enum {
IFURLPolicyIgnore
} IFURLPolicy;
- at protocol IFWebController <IFResourceProgressHandler, IFScriptContextHandler>
+ at protocol IFWebController <NSObject, IFResourceProgressHandler, IFScriptContextHandler>
// Called when a data source needs to create a frame. This method encapsulates the
// specifics of creating and initializaing a view of the appropriate class.
diff --git a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
index f7267cc..b50c865 100644
--- a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
@@ -15,6 +15,7 @@
#import <WebFoundation/IFError.h>
#import <WebKit/IFLocationChangeHandler.h>
#import <khtml_part.h>
+#import "IFWebController.h"
@implementation IFWebDataSourcePrivate
@@ -53,7 +54,7 @@
[mainHandle release];
[mainURLHandleClient release];
[pageTitle autorelease];
- [(NSObject *)locationChangeHandler release];
+ [locationChangeHandler release];
[errors release];
[mainDocumentError release];
@@ -77,9 +78,9 @@
if (loading) {
[self retain];
- [(NSObject *)_private->controller retain];
+ [_private->controller retain];
} else {
- [(NSObject *)_private->controller release];
+ [_private->controller release];
[self release];
}
}
@@ -94,8 +95,8 @@
WEBKIT_ASSERT(_private->part != nil);
if (_private->loading) {
- [(NSObject *)controller retain];
- [(NSObject *)_private->controller release];
+ [controller retain];
+ [_private->controller release];
}
_private->controller = controller;
_private->part->setDataSource(self);
@@ -265,8 +266,8 @@
- (void)_setLocationChangeHandler: (id <IFLocationChangeHandler>)l
{
- [(NSObject *)l retain];
- [(NSObject *)_private->locationChangeHandler release];
+ [l retain];
+ [_private->locationChangeHandler release];
_private->locationChangeHandler = l;
}
diff --git a/WebKit/WebView.subproj/IFWebViewPrivate.mm b/WebKit/WebView.subproj/IFWebViewPrivate.mm
index 04e1879..4019b70 100644
--- a/WebKit/WebView.subproj/IFWebViewPrivate.mm
+++ b/WebKit/WebView.subproj/IFWebViewPrivate.mm
@@ -13,12 +13,13 @@
// Includes from KDE
#import <khtmlview.h>
#import <html/html_documentimpl.h>
+#import "IFWebController.h"
@implementation IFWebViewPrivate
- (void)dealloc
{
- [(NSObject *)controller release];
+ [controller release];
[frameScrollView release];
//if (widget)
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index 8ddbf13..98dcaf0 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -46,7 +46,7 @@
=============================================================================
*/
- at protocol IFResourceProgressHandler
+ at protocol IFResourceProgressHandler <NSObject>
/*
A new chunk of data has been received. This could be a partial load
@@ -68,7 +68,7 @@
=============================================================================
*/
- at protocol IFScriptContextHandler
+ at protocol IFScriptContextHandler <NSObject>
// setStatusText and statusText are used by Javascript's status bar text methods.
- (void)setStatusText: (NSString *)text forDataSource: (IFWebDataSource *)dataSource;
@@ -97,7 +97,7 @@ typedef enum {
IFURLPolicyIgnore
} IFURLPolicy;
- at protocol IFWebController <IFResourceProgressHandler, IFScriptContextHandler>
+ at protocol IFWebController <NSObject, IFResourceProgressHandler, IFScriptContextHandler>
// Called when a data source needs to create a frame. This method encapsulates the
// specifics of creating and initializaing a view of the appropriate class.
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index f7267cc..b50c865 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -15,6 +15,7 @@
#import <WebFoundation/IFError.h>
#import <WebKit/IFLocationChangeHandler.h>
#import <khtml_part.h>
+#import "IFWebController.h"
@implementation IFWebDataSourcePrivate
@@ -53,7 +54,7 @@
[mainHandle release];
[mainURLHandleClient release];
[pageTitle autorelease];
- [(NSObject *)locationChangeHandler release];
+ [locationChangeHandler release];
[errors release];
[mainDocumentError release];
@@ -77,9 +78,9 @@
if (loading) {
[self retain];
- [(NSObject *)_private->controller retain];
+ [_private->controller retain];
} else {
- [(NSObject *)_private->controller release];
+ [_private->controller release];
[self release];
}
}
@@ -94,8 +95,8 @@
WEBKIT_ASSERT(_private->part != nil);
if (_private->loading) {
- [(NSObject *)controller retain];
- [(NSObject *)_private->controller release];
+ [controller retain];
+ [_private->controller release];
}
_private->controller = controller;
_private->part->setDataSource(self);
@@ -265,8 +266,8 @@
- (void)_setLocationChangeHandler: (id <IFLocationChangeHandler>)l
{
- [(NSObject *)l retain];
- [(NSObject *)_private->locationChangeHandler release];
+ [l retain];
+ [_private->locationChangeHandler release];
_private->locationChangeHandler = l;
}
diff --git a/WebKit/WebView.subproj/WebFrameLoadDelegate.h b/WebKit/WebView.subproj/WebFrameLoadDelegate.h
index 6c1ff4c..f4ee53c 100644
--- a/WebKit/WebView.subproj/WebFrameLoadDelegate.h
+++ b/WebKit/WebView.subproj/WebFrameLoadDelegate.h
@@ -44,7 +44,7 @@ typedef enum {
} IFContentPolicy;
- at protocol IFLocationChangeHandler
+ at protocol IFLocationChangeHandler <NSObject>
- (void)locationChangeStarted;
@@ -65,5 +65,4 @@ typedef enum {
// file i/o failure, launch services failure, type mismatches, etc.
- (void)unableToImplementContentPolicy: (IFError *)error;
-
@end
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.m b/WebKit/WebView.subproj/WebFrameViewPrivate.m
index 04e1879..4019b70 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.m
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.m
@@ -13,12 +13,13 @@
// Includes from KDE
#import <khtmlview.h>
#import <html/html_documentimpl.h>
+#import "IFWebController.h"
@implementation IFWebViewPrivate
- (void)dealloc
{
- [(NSObject *)controller release];
+ [controller release];
[frameScrollView release];
//if (widget)
diff --git a/WebKit/WebView.subproj/WebLocationChangeDelegate.h b/WebKit/WebView.subproj/WebLocationChangeDelegate.h
index 6c1ff4c..f4ee53c 100644
--- a/WebKit/WebView.subproj/WebLocationChangeDelegate.h
+++ b/WebKit/WebView.subproj/WebLocationChangeDelegate.h
@@ -44,7 +44,7 @@ typedef enum {
} IFContentPolicy;
- at protocol IFLocationChangeHandler
+ at protocol IFLocationChangeHandler <NSObject>
- (void)locationChangeStarted;
@@ -65,5 +65,4 @@ typedef enum {
// file i/o failure, launch services failure, type mismatches, etc.
- (void)unableToImplementContentPolicy: (IFError *)error;
-
@end
diff --git a/WebKit/WebView.subproj/WebLocationChangeHandler.h b/WebKit/WebView.subproj/WebLocationChangeHandler.h
index 6c1ff4c..f4ee53c 100644
--- a/WebKit/WebView.subproj/WebLocationChangeHandler.h
+++ b/WebKit/WebView.subproj/WebLocationChangeHandler.h
@@ -44,7 +44,7 @@ typedef enum {
} IFContentPolicy;
- at protocol IFLocationChangeHandler
+ at protocol IFLocationChangeHandler <NSObject>
- (void)locationChangeStarted;
@@ -65,5 +65,4 @@ typedef enum {
// file i/o failure, launch services failure, type mismatches, etc.
- (void)unableToImplementContentPolicy: (IFError *)error;
-
@end
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index 8ddbf13..98dcaf0 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -46,7 +46,7 @@
=============================================================================
*/
- at protocol IFResourceProgressHandler
+ at protocol IFResourceProgressHandler <NSObject>
/*
A new chunk of data has been received. This could be a partial load
@@ -68,7 +68,7 @@
=============================================================================
*/
- at protocol IFScriptContextHandler
+ at protocol IFScriptContextHandler <NSObject>
// setStatusText and statusText are used by Javascript's status bar text methods.
- (void)setStatusText: (NSString *)text forDataSource: (IFWebDataSource *)dataSource;
@@ -97,7 +97,7 @@ typedef enum {
IFURLPolicyIgnore
} IFURLPolicy;
- at protocol IFWebController <IFResourceProgressHandler, IFScriptContextHandler>
+ at protocol IFWebController <NSObject, IFResourceProgressHandler, IFScriptContextHandler>
// Called when a data source needs to create a frame. This method encapsulates the
// specifics of creating and initializaing a view of the appropriate class.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list