Reviewed by Darin Adler.
authorsullivan <sullivan@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 2 Nov 2005 00:27:36 +0000 (00:27 +0000)
committersullivan <sullivan@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 2 Nov 2005 00:27:36 +0000 (00:27 +0000)
        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:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@11023 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit/ChangeLog
WebKit/History.subproj/WebHistory.m

index a28711269f2387bad2bdf7036d488811a78b0595..b6ee615cede038b0186d982e7181365e7ad11b34 100644 (file)
@@ -1,3 +1,14 @@
+2005-11-01  John Sullivan  <sullivan@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@apple.com>
 
         Reviewed by Tim Omernick.
 2005-11-01  John Sullivan  <sullivan@apple.com>
 
         Reviewed by Tim Omernick.
index 59a5ff0093fb1d102e6232729d90b10df31dda1d..c19e8a039aec7459a99d37d88b40c9a2976a2dcb 100644 (file)
@@ -167,8 +167,12 @@ NSString *DatesArrayKey = @"WebHistoryDates";
 
     [_entriesByURL removeObjectForKey: URLString];
     
 
     [_entriesByURL removeObjectForKey: URLString];
     
+#if ASSERT_DISABLED
+    [self _removeItemFromDateCaches:entry];
+#else
     BOOL itemWasInDateCaches = [self _removeItemFromDateCaches:entry];
     ASSERT(itemWasInDateCaches);
     BOOL itemWasInDateCaches = [self _removeItemFromDateCaches:entry];
     ASSERT(itemWasInDateCaches);
+#endif
 
     return YES;
 }
 
     return YES;
 }
@@ -208,8 +212,12 @@ NSString *DatesArrayKey = @"WebHistoryDates";
 
 - (void)setLastVisitedTimeInterval:(NSTimeInterval)time forItem:(WebHistoryItem *)entry
 {
 
 - (void)setLastVisitedTimeInterval:(NSTimeInterval)time forItem:(WebHistoryItem *)entry
 {
+#if ASSERT_DISABLED
+    [self _removeItemFromDateCaches:entry];
+#else
     BOOL entryWasPresent = [self _removeItemFromDateCaches:entry];
     ASSERT(entryWasPresent);
     BOOL entryWasPresent = [self _removeItemFromDateCaches:entry];
     ASSERT(entryWasPresent);
+#endif
     
     [entry _setLastVisitedTimeInterval:time];
     [self _addItemToDateCaches:entry];
     
     [entry _setLastVisitedTimeInterval:time];
     [self _addItemToDateCaches:entry];