[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 4c8da1657c0fcc76a945561f6918138680d84097
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 3 01:31:23 2003 +0000

            Raise exceptions when these methods are called inappropriately.
    
            Reviewed by Trey.
    
            * History.subproj/WebBackForwardList.m:
            (-[WebBackForwardList goBack]):
            (-[WebBackForwardList goForward]):
            (-[WebBackForwardList goToItem:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4009 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 6668f0b..33cf27a 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,16 @@
 2003-04-02  Richard Williamson  <rjw at apple.com>
 
+        Raise exceptions when these methods are called inappropriately.
+        
+        Reviewed by Trey.
+
+        * History.subproj/WebBackForwardList.m:
+        (-[WebBackForwardList goBack]):
+        (-[WebBackForwardList goForward]):
+        (-[WebBackForwardList goToItem:]):
+
+2003-04-02  Richard Williamson  <rjw at apple.com>
+
         Added new API on WebFrame, loadData: and loadString:
         
         Reviewed by Maciej.
diff --git a/WebKit/History.subproj/WebBackForwardList.m b/WebKit/History.subproj/WebBackForwardList.m
index 2356761..03bf6dd 100644
--- a/WebKit/History.subproj/WebBackForwardList.m
+++ b/WebKit/History.subproj/WebBackForwardList.m
@@ -95,21 +95,27 @@
 
 - (void)goBack
 {
-    ASSERT(_private->current > 0);
-    _private->current--;
+    if(_private->current > 0)
+        _private->current--;
+    else
+        [NSException raise:NSInternalInconsistencyException format:@"%@: goBack called with empty back list", self];
 }
 
 - (void)goForward
 {
-    ASSERT(_private->current < (int)[_private->entries count]-1);
-    _private->current++;
+    if(_private->current < (int)[_private->entries count]-1)
+        _private->current++;
+    else
+        [NSException raise:NSInternalInconsistencyException format:@"%@: goForward called with empty forward list", self];
 }
 
-- (void)goToItem:(WebHistoryItem *)entry
+- (void)goToItem:(WebHistoryItem *)item
 {
-    int index = [_private->entries indexOfObjectIdenticalTo:entry];
-    ASSERT(index != NSNotFound);
-    _private->current = index;
+    int index = [_private->entries indexOfObjectIdenticalTo:item];
+    if (index != NSNotFound)
+        _private->current = index;
+    else
+        [NSException raise:NSInvalidArgumentException format:@"%@: %s:  invalid item", self, __FUNCTION__];
 }
 
 - (WebHistoryItem *)backItem

-- 
WebKit Debian packaging