[webkit-changes] cvs commit: WebKit/WebView.subproj WebArchive.m
WebClipView.m WebDebugDOMNode.m WebFrame.m WebFrameView.m
WebHTMLRepresentation.m WebHTMLView.m WebImageView.m
WebPreferences.m WebRenderNode.m WebResource.m WebView.m
Darin
darin at opensource.apple.com
Sun Jun 12 20:28:11 PDT 2005
darin 05/06/12 20:28:11
Modified: . ChangeLog
WebView.subproj WebArchive.m WebClipView.m WebDebugDOMNode.m
WebFrame.m WebFrameView.m WebHTMLRepresentation.m
WebHTMLView.m WebImageView.m WebPreferences.m
WebRenderNode.m WebResource.m WebView.m
Log:
Changes by Nick Zitzmann.
Reviewed by me.
- fixed init methods that don't handle return values from the init methods they call
* WebView.subproj/WebArchive.m:
(-[WebArchive init]): Use value returned by init, check it for nil too.
(-[WebArchive initWithMainResource:subresources:subframeArchives:]): Ditto.
(-[WebArchive _initWithPropertyList:]): Ditto.
(-[WebArchive initWithCoder:]): Ditto.
* WebView.subproj/WebClipView.m:
(-[WebClipView initWithFrame:]): Ditto.
* WebView.subproj/WebDebugDOMNode.m:
(-[WebDebugDOMNode initWithName:value:source:children:]): Ditto.
* WebView.subproj/WebFrame.m:
(-[WebFormState initWithForm:values:sourceFrame:]): Ditto.
(-[WebFrame initWithName:webFrameView:webView:]): Ditto.
* WebView.subproj/WebFrameView.m:
(-[WebFrameView initWithFrame:]): Ditto.
* WebView.subproj/WebHTMLRepresentation.m:
(-[WebHTMLRepresentation init]): Ditto.
* WebView.subproj/WebHTMLView.m:
(-[WebHTMLView initWithFrame:]): Ditto.
(-[WebTextCompleteController initWithHTMLView:]): Ditto.
* WebView.subproj/WebImageView.m:
(-[WebImageView initWithFrame:]): Ditto.
* WebView.subproj/WebPreferences.m:
(-[WebPreferences initWithIdentifier:]): Ditto.
* WebView.subproj/WebRenderNode.m:
(-[WebRenderNode initWithName:position:rect:view:children:]): Ditto.
* WebView.subproj/WebResource.m:
(-[WebResource init]): Ditto.
(-[WebResource initWithCoder:]): Ditto.
* WebView.subproj/WebView.m:
(-[WebViewPrivate init]): Call super init.
(-[_WebSafeForwarder initWithTarget:defaultTarget:templateClass:]): Use value returned by init, check it for nil too.
(-[WebView initWithFrame:]): Ditto.
Revision Changes Path
1.3188 +40 -0 WebKit/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebKit/ChangeLog,v
retrieving revision 1.3187
retrieving revision 1.3188
diff -u -r1.3187 -r1.3188
--- ChangeLog 12 Jun 2005 20:27:24 -0000 1.3187
+++ ChangeLog 13 Jun 2005 03:28:06 -0000 1.3188
@@ -1,3 +1,43 @@
+2005-06-12 Darin Adler <darin at apple.com>
+
+ Changes by Nick Zitzmann.
+ Reviewed by me.
+
+ - fixed init methods that don't handle return values from the init methods they call
+
+ * WebView.subproj/WebArchive.m:
+ (-[WebArchive init]): Use value returned by init, check it for nil too.
+ (-[WebArchive initWithMainResource:subresources:subframeArchives:]): Ditto.
+ (-[WebArchive _initWithPropertyList:]): Ditto.
+ (-[WebArchive initWithCoder:]): Ditto.
+ * WebView.subproj/WebClipView.m:
+ (-[WebClipView initWithFrame:]): Ditto.
+ * WebView.subproj/WebDebugDOMNode.m:
+ (-[WebDebugDOMNode initWithName:value:source:children:]): Ditto.
+ * WebView.subproj/WebFrame.m:
+ (-[WebFormState initWithForm:values:sourceFrame:]): Ditto.
+ (-[WebFrame initWithName:webFrameView:webView:]): Ditto.
+ * WebView.subproj/WebFrameView.m:
+ (-[WebFrameView initWithFrame:]): Ditto.
+ * WebView.subproj/WebHTMLRepresentation.m:
+ (-[WebHTMLRepresentation init]): Ditto.
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView initWithFrame:]): Ditto.
+ (-[WebTextCompleteController initWithHTMLView:]): Ditto.
+ * WebView.subproj/WebImageView.m:
+ (-[WebImageView initWithFrame:]): Ditto.
+ * WebView.subproj/WebPreferences.m:
+ (-[WebPreferences initWithIdentifier:]): Ditto.
+ * WebView.subproj/WebRenderNode.m:
+ (-[WebRenderNode initWithName:position:rect:view:children:]): Ditto.
+ * WebView.subproj/WebResource.m:
+ (-[WebResource init]): Ditto.
+ (-[WebResource initWithCoder:]): Ditto.
+ * WebView.subproj/WebView.m:
+ (-[WebViewPrivate init]): Call super init.
+ (-[_WebSafeForwarder initWithTarget:defaultTarget:templateClass:]): Use value returned by init, check it for nil too.
+ (-[WebView initWithFrame:]): Ditto.
+
2005-06-12 Maciej Stachowiak <mjs at apple.com>
Reviewed by Chris Blumenberg.
1.6 +13 -4 WebKit/WebView.subproj/WebArchive.m
Index: WebArchive.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebArchive.m,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WebArchive.m 5 Jun 2005 17:54:45 -0000 1.5
+++ WebArchive.m 13 Jun 2005 03:28:08 -0000 1.6
@@ -63,14 +63,18 @@
- (id)init
{
- [super init];
+ self = [super init];
+ if (!self)
+ return nil;
_private = [[WebArchivePrivate alloc] init];
return self;
}
- (id)initWithMainResource:(WebResource *)mainResource subresources:(NSArray *)subresources subframeArchives:(NSArray *)subframeArchives
{
- [self init];
+ self = [self init];
+ if (!self)
+ return nil;
_private->mainResource = [mainResource retain];
_private->subresources = [subresources retain];
@@ -86,7 +90,9 @@
- (id)_initWithPropertyList:(id)propertyList
{
- [self init];
+ self = [self init];
+ if (!self)
+ return nil;
if (![propertyList isKindOfClass:[NSDictionary class]]) {
[self release];
@@ -136,7 +142,10 @@
- (id)initWithCoder:(NSCoder *)decoder
{
NS_DURING
- [self init];
+ self = [self init];
+ if (!self)
+ NS_VALUERETURN(nil, id);
+
_private->mainResource = [[decoder decodeObjectForKey:WebMainResourceKey] retain];
_private->subresources = [[decoder decodeObjectForKey:WebSubresourcesKey] retain];
_private->subframeArchives = [[decoder decodeObjectForKey:WebSubframeArchivesKey] retain];
1.9 +3 -1 WebKit/WebView.subproj/WebClipView.m
Index: WebClipView.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebClipView.m,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- WebClipView.m 5 Jun 2005 17:54:45 -0000 1.8
+++ WebClipView.m 13 Jun 2005 03:28:08 -0000 1.9
@@ -45,7 +45,9 @@
- (id)initWithFrame:(NSRect)frame
{
- [super initWithFrame:frame];
+ self = [super initWithFrame:frame];
+ if (!self)
+ return nil;
// In WebHTMLView, we set a clip. This is not typical to do in an
// NSView, and while correct for any one invocation of drawRect:,
1.15 +3 -1 WebKit/WebView.subproj/WebDebugDOMNode.m
Index: WebDebugDOMNode.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebDebugDOMNode.m,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- WebDebugDOMNode.m 5 Jun 2005 17:54:46 -0000 1.14
+++ WebDebugDOMNode.m 13 Jun 2005 03:28:08 -0000 1.15
@@ -40,7 +40,9 @@
- initWithName:(NSString *)n value:(NSString *)v source:(NSString *)s children:(NSArray *)c
{
- [super init];
+ self = [super init];
+ if (!self)
+ return nil;
children = [c copy];
name = [n copy];
1.232 +7 -2 WebKit/WebView.subproj/WebFrame.m
Index: WebFrame.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebFrame.m,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -r1.231 -r1.232
--- WebFrame.m 12 Jun 2005 20:27:26 -0000 1.231
+++ WebFrame.m 13 Jun 2005 03:28:08 -0000 1.232
@@ -2676,7 +2676,10 @@
- (id)initWithForm:(DOMElement *)form values:(NSDictionary *)values sourceFrame:(WebFrame *)sourceFrame
{
- [super init];
+ self = [super init];
+ if (!self)
+ return nil;
+
_form = [form retain];
_values = [values copy];
_sourceFrame = [sourceFrame retain];
@@ -2717,7 +2720,9 @@
- initWithName:(NSString *)n webFrameView:(WebFrameView *)fv webView:(WebView *)v
{
- [super init];
+ self = [super init];
+ if (!self)
+ return nil;
_private = [[WebFramePrivate alloc] init];
1.184 +3 -1 WebKit/WebView.subproj/WebFrameView.m
Index: WebFrameView.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebFrameView.m,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- WebFrameView.m 5 Jun 2005 17:54:47 -0000 1.183
+++ WebFrameView.m 13 Jun 2005 03:28:08 -0000 1.184
@@ -312,7 +312,9 @@
- initWithFrame: (NSRect) frame
{
- [super initWithFrame: frame];
+ self = [super initWithFrame: frame];
+ if (!self)
+ return nil;
[WebViewFactory createSharedFactory];
[WebTextRendererFactory createSharedFactory];
1.54 +3 -1 WebKit/WebView.subproj/WebHTMLRepresentation.m
Index: WebHTMLRepresentation.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebHTMLRepresentation.m,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- WebHTMLRepresentation.m 5 Jun 2005 17:54:47 -0000 1.53
+++ WebHTMLRepresentation.m 13 Jun 2005 03:28:08 -0000 1.54
@@ -66,7 +66,9 @@
- init
{
- [super init];
+ self = [super init];
+ if (!self)
+ return nil;
_private = [[WebHTMLRepresentationPrivate alloc] init];
1.449 +6 -2 WebKit/WebView.subproj/WebHTMLView.m
Index: WebHTMLView.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebHTMLView.m,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -r1.448 -r1.449
--- WebHTMLView.m 6 Jun 2005 12:16:15 -0000 1.448
+++ WebHTMLView.m 13 Jun 2005 03:28:08 -0000 1.449
@@ -1739,7 +1739,9 @@
- (id)initWithFrame:(NSRect)frame
{
- [super initWithFrame:frame];
+ self = [super initWithFrame:frame];
+ if (!self)
+ return nil;
// Make all drawing go through us instead of subviews.
if (NSAppKitVersionNumber >= 711) {
@@ -5184,7 +5186,9 @@
- (id)initWithHTMLView:(WebHTMLView *)view
{
- [super init];
+ self = [super init];
+ if (!self)
+ return nil;
_view = view;
return self;
}
1.71 +2 -0 WebKit/WebView.subproj/WebImageView.m
Index: WebImageView.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebImageView.m,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- WebImageView.m 5 Jun 2005 17:54:47 -0000 1.70
+++ WebImageView.m 13 Jun 2005 03:28:08 -0000 1.71
@@ -65,6 +65,8 @@
- (id)initWithFrame:(NSRect)frame
{
self = [super initWithFrame:frame];
+ if (!self)
+ return nil;
[self setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
return self;
}
1.95 +3 -1 WebKit/WebView.subproj/WebPreferences.m
Index: WebPreferences.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebPreferences.m,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- WebPreferences.m 6 Jun 2005 02:21:19 -0000 1.94
+++ WebPreferences.m 13 Jun 2005 03:28:08 -0000 1.95
@@ -96,7 +96,9 @@
- (id)initWithIdentifier:(NSString *)anIdentifier
{
- [super init];
+ self = [super init];
+ if (!self)
+ return nil;
_private = [[WebPreferencesPrivate alloc] init];
_private->IBCreatorID = [[WebPreferences _IBCreatorID] retain];
1.17 +3 -1 WebKit/WebView.subproj/WebRenderNode.m
Index: WebRenderNode.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebRenderNode.m,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- WebRenderNode.m 5 Jun 2005 17:54:48 -0000 1.16
+++ WebRenderNode.m 13 Jun 2005 03:28:08 -0000 1.17
@@ -42,7 +42,9 @@
{
NSMutableArray *collectChildren;
- [super init];
+ self = [super init];
+ if (!self)
+ return nil;
collectChildren = [c mutableCopy];
1.15 +7 -2 WebKit/WebView.subproj/WebResource.m
Index: WebResource.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebResource.m,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- WebResource.m 5 Jun 2005 17:54:48 -0000 1.14
+++ WebResource.m 13 Jun 2005 03:28:08 -0000 1.15
@@ -71,7 +71,9 @@
- (id)init
{
- [super init];
+ self = [super init];
+ if (!self)
+ return nil;
_private = [[WebResourcePrivate alloc] init];
return self;
}
@@ -84,7 +86,10 @@
- (id)initWithCoder:(NSCoder *)decoder
{
NS_DURING
- [self init];
+ self = [self init];
+ if (!self)
+ NS_VALUERETURN(nil, id);
+
_private->data = [[decoder decodeObjectForKey:WebResourceDataKey] retain];
_private->URL = [[decoder decodeObjectForKey:WebResourceURLKey] retain];
_private->MIMEType = [[decoder decodeObjectForKey:WebResourceMIMETypeKey] retain];
1.287 +13 -4 WebKit/WebView.subproj/WebView.m
Index: WebView.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebView.m,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -r1.286 -r1.287
--- WebView.m 6 Jun 2005 11:43:50 -0000 1.286
+++ WebView.m 13 Jun 2005 03:28:08 -0000 1.287
@@ -254,6 +254,10 @@
- init
{
+ self = [super init];
+ if (!self)
+ return nil;
+
backForwardList = [[WebBackForwardList alloc] init];
textSizeMultiplier = 1;
progressNotificationInterval = 0.02;
@@ -1385,7 +1389,10 @@
- initWithTarget: t defaultTarget: dt templateClass: (Class)aClass
{
- [super init];
+ self = [super init];
+ if (!self)
+ return nil;
+
target = t; // Non retained.
defaultTarget = dt;
templateClass = aClass;
@@ -1555,13 +1562,15 @@
- initWithFrame: (NSRect)f
{
- [self initWithFrame: f frameName:nil groupName:nil];
- return self;
+ return [self initWithFrame: f frameName:nil groupName:nil];
}
- initWithFrame: (NSRect)f frameName: (NSString *)frameName groupName: (NSString *)groupName;
{
- [super initWithFrame: f];
+ self = [super initWithFrame:f];
+ if (!self)
+ return nil;
+
_private = [[WebViewPrivate alloc] init];
[self _commonInitializationWithFrameName:frameName groupName:groupName];
[self setMaintainsBackForwardList: YES];
More information about the webkit-changes
mailing list