[webkit-changes] cvs commit: WebKit/History.subproj WebHistory.m

[John]

sullivan    05/11/01 16:27:36

  Modified:    .        ChangeLog
               History.subproj WebHistory.m
  Log:
          Reviewed by Darin Adler.
  
          fixed deployment build by hiding local variables used only in ASSERTs on builds for
          which ASSERT_DISABLED is true.
  
          * History.subproj/WebHistory.m:
          (-[WebHistoryPrivate removeItemForURLString:]):
          (-[WebHistoryPrivate setLastVisitedTimeInterval:forItem:]):
  
  Revision  Changes    Path
  1.3365    +11 -0     WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3364
  retrieving revision 1.3365
  diff -u -r1.3364 -r1.3365
  --- ChangeLog	1 Nov 2005 19:24:45 -0000	1.3364
  +++ ChangeLog	2 Nov 2005 00:27:28 -0000	1.3365
  @@ -1,5 +1,16 @@
   2005-11-01  John Sullivan  <sullivan at apple.com>
   
  +        Reviewed by Darin Adler.
  +        
  +        fixed deployment build by hiding local variables used only in ASSERTs on builds for
  +        which ASSERT_DISABLED is true.
  +
  +        * History.subproj/WebHistory.m:
  +        (-[WebHistoryPrivate removeItemForURLString:]):
  +        (-[WebHistoryPrivate setLastVisitedTimeInterval:forItem:]):
  +
  +2005-11-01  John Sullivan  <sullivan at apple.com>
  +
           Reviewed by Tim Omernick.
           
           - fixed <rdar://problem/4324104> Assertion failure (foundDate) in WebHistory
  
  
  
  1.41      +8 -0      WebKit/History.subproj/WebHistory.m
  
  Index: WebHistory.m
  ===================================================================
  RCS file: /cvs/root/WebKit/History.subproj/WebHistory.m,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- WebHistory.m	1 Nov 2005 19:24:49 -0000	1.40
  +++ WebHistory.m	2 Nov 2005 00:27:36 -0000	1.41
  @@ -167,8 +167,12 @@
   
       [_entriesByURL removeObjectForKey: URLString];
       
  +#if ASSERT_DISABLED
  +    [self _removeItemFromDateCaches:entry];
  +#else
       BOOL itemWasInDateCaches = [self _removeItemFromDateCaches:entry];
       ASSERT(itemWasInDateCaches);
  +#endif
   
       return YES;
   }
  @@ -208,8 +212,12 @@
   
   - (void)setLastVisitedTimeInterval:(NSTimeInterval)time forItem:(WebHistoryItem *)entry
   {
  +#if ASSERT_DISABLED
  +    [self _removeItemFromDateCaches:entry];
  +#else
       BOOL entryWasPresent = [self _removeItemFromDateCaches:entry];
       ASSERT(entryWasPresent);
  +#endif
       
       [entry _setLastVisitedTimeInterval:time];
       [self _addItemToDateCaches:entry];