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

[Maciej]

mjs         05/08/17 17:25:05

  Modified:    .        ChangeLog
               WebView.subproj WebMainResourceLoader.m
  Log:
          Reviewed by Darin.
  
  	- fix mysterious CGImageSource error message and possibly crash on layout tests.
  
          * WebView.subproj/WebMainResourceLoader.m:
          (-[WebMainResourceLoader receivedError:]): Retain the data source since it may
  	prematurely self-destruct otherwise.
          (-[WebMainResourceLoader cancelWithError:]): ditto
  
  Revision  Changes    Path
  1.3297    +11 -0     WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3296
  retrieving revision 1.3297
  diff -u -r1.3296 -r1.3297
  --- ChangeLog	17 Aug 2005 20:10:56 -0000	1.3296
  +++ ChangeLog	18 Aug 2005 00:25:01 -0000	1.3297
  @@ -1,3 +1,14 @@
  +2005-08-17  Maciej Stachowiak  <mjs at apple.com>
  +
  +        Reviewed by Darin.
  +
  +	- fix mysterious CGImageSource error message and possibly crash on layout tests.
  +
  +        * WebView.subproj/WebMainResourceLoader.m:
  +        (-[WebMainResourceLoader receivedError:]): Retain the data source since it may
  +	prematurely self-destruct otherwise.
  +        (-[WebMainResourceLoader cancelWithError:]): ditto
  +
   2005-08-17  Justin Garcia  <justin.garcia at apple.com>
   
           Reviewed by rjw
  
  
  
  1.272     +6 -0      WebKit/WebView.subproj/WebMainResourceLoader.m
  
  Index: WebMainResourceLoader.m
  ===================================================================
  RCS file: /cvs/root/WebKit/WebView.subproj/WebMainResourceLoader.m,v
  retrieving revision 1.271
  retrieving revision 1.272
  diff -u -r1.271 -r1.272
  --- WebMainResourceLoader.m	1 Jul 2005 05:20:49 -0000	1.271
  +++ WebMainResourceLoader.m	18 Aug 2005 00:25:04 -0000	1.272
  @@ -88,8 +88,10 @@
   {
       // Calling _receivedMainResourceError will likely result in a call to release, so we must retain.
       [self retain];
  +    WebDataSource *ds = [dataSource retain];
       [dataSource _receivedMainResourceError:error complete:YES];
       [super didFailWithError:error];
  +    [ds release];
       [self release];
   }
   
  @@ -106,9 +108,13 @@
   {
       // Calling _receivedMainResourceError will likely result in a call to release, so we must retain.
       [self retain];
  +
       [self cancelContentPolicy];
  +    [dataSource retain];
       [dataSource _receivedMainResourceError:error complete:YES];
  +    [dataSource release];
       [super cancelWithError:error];
  +
       [self release];
   }