[webkit-changes] cvs commit: WebKit/WebView.subproj WebArchive.m WebResource.m

[Chris]

cpeterse    05/06/13 17:08:32

  Modified:    .        ChangeLog
               WebView.subproj WebArchive.m WebResource.m
  Log:
          Changes by Darin.
          Reviewed by me.
  
          - fixed problems building deployment due to recent init change
  
          * WebView.subproj/WebArchive.m: (-[WebArchive initWithCoder:]):
          Put the [super init] call and check for nil outside the exception handler.
          * WebView.subproj/WebResource.m: (-[WebResource initWithCoder:]): Ditto.
  
  Revision  Changes    Path
  1.3190    +11 -0     WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3189
  retrieving revision 1.3190
  diff -u -r1.3189 -r1.3190
  --- ChangeLog	13 Jun 2005 15:33:33 -0000	1.3189
  +++ ChangeLog	14 Jun 2005 00:08:23 -0000	1.3190
  @@ -1,3 +1,14 @@
  +2005-06-13  Chris Petersen  <cpetersen at apple.com>
  +
  +        Changes by Darin.
  +        Reviewed by me.
  +
  +        - fixed problems building deployment due to recent init change
  +
  +        * WebView.subproj/WebArchive.m: (-[WebArchive initWithCoder:]):
  +        Put the [super init] call and check for nil outside the exception handler.
  +        * WebView.subproj/WebResource.m: (-[WebResource initWithCoder:]): Ditto.
  +
   2005-06-12  Darin Adler  <darin at apple.com>
   
           Reviewed by Maciej.
  
  
  
  1.7       +4 -4      WebKit/WebView.subproj/WebArchive.m
  
  Index: WebArchive.m
  ===================================================================
  RCS file: /cvs/root/WebKit/WebView.subproj/WebArchive.m,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- WebArchive.m	13 Jun 2005 03:28:08 -0000	1.6
  +++ WebArchive.m	14 Jun 2005 00:08:31 -0000	1.7
  @@ -141,11 +141,11 @@
   
   - (id)initWithCoder:(NSCoder *)decoder
   {    
  -    NS_DURING
  -        self = [self init];
  -        if (!self)
  -            NS_VALUERETURN(nil, id);
  +    self = [self init];
  +    if (!self)
  +        return nil;
           
  +    NS_DURING
           _private->mainResource = [[decoder decodeObjectForKey:WebMainResourceKey] retain];
           _private->subresources = [[decoder decodeObjectForKey:WebSubresourcesKey] retain];
           _private->subframeArchives = [[decoder decodeObjectForKey:WebSubframeArchivesKey] retain];
  
  
  
  1.16      +5 -5      WebKit/WebView.subproj/WebResource.m
  
  Index: WebResource.m
  ===================================================================
  RCS file: /cvs/root/WebKit/WebView.subproj/WebResource.m,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- WebResource.m	13 Jun 2005 03:28:08 -0000	1.15
  +++ WebResource.m	14 Jun 2005 00:08:31 -0000	1.16
  @@ -84,12 +84,12 @@
   }
   
   - (id)initWithCoder:(NSCoder *)decoder
  -{    
  +{
  +    self = [self init];
  +    if (!self)
  +        return nil;
  +
       NS_DURING
  -        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];