1 files changed, 3 insertions, 37 deletions
diff --git a/WebKit/mac/History/WebHistory.mm b/WebKit/mac/History/WebHistory.mm
index 417aadb..313378b 100644
--- a/WebKit/mac/History/WebHistory.mm
+++ b/WebKit/mac/History/WebHistory.mm
@@ -60,7 +60,6 @@ NSString *DatesArrayKey = @"WebHistoryDates";
     NSMutableDictionary *_entriesByURL;
     DateToEntriesMap* _entriesByDate;
     NSMutableArray *_orderedLastVisitedDays;
-    WebHistoryItem *_lastVisitedEntry;
     BOOL itemLimitSet;
     int itemLimit;
     BOOL ageInDaysLimitSet;
@@ -94,9 +93,6 @@ NSString *DatesArrayKey = @"WebHistoryDates";
 
 - (void)addVisitedLinksToPageGroup:(PageGroup&)group;
 
-- (WebHistoryItem *)lastVisitedEntry;
-- (void)setLastVisitedEntry:(WebHistoryItem *)lastVisitedEntry;
-
 @end
 
 @implementation WebHistoryPrivate
@@ -127,7 +123,6 @@ NSString *DatesArrayKey = @"WebHistoryDates";
 {
     [_entriesByURL release];
     [_orderedLastVisitedDays release];
-    [_lastVisitedEntry release];
     delete _entriesByDate;
     [super dealloc];
 }
@@ -648,19 +643,6 @@ static WebHistoryDateKey timeIntervalForBeginningOfDay(NSTimeInterval interval)
     }
 }
 
-- (WebHistoryItem *)lastVisitedEntry
-{
-    return _lastVisitedEntry;
-}
-
-- (void)setLastVisitedEntry:(WebHistoryItem *)lastVisitedEntry
-{
-    if (_lastVisitedEntry == lastVisitedEntry)
-        return;
-    [_lastVisitedEntry release];
-    _lastVisitedEntry = [lastVisitedEntry retain];
-}
-
 @end
 
 @implementation WebHistory
@@ -821,39 +803,23 @@ static WebHistoryDateKey timeIntervalForBeginningOfDay(NSTimeInterval interval)
 
 @implementation WebHistory (WebInternal)
 
-- (void)_visitedURL:(NSURL *)url withTitle:(NSString *)title method:(NSString *)method wasFailure:(BOOL)wasFailure serverRedirectURL:(NSString *)serverRedirectURL isClientRedirect:(BOOL)isClientRedirect
+- (void)_visitedURL:(NSURL *)url withTitle:(NSString *)title method:(NSString *)method wasFailure:(BOOL)wasFailure
 {
-    if (isClientRedirect) {
-        ASSERT(!serverRedirectURL);
-        if (WebHistoryItem *lastVisitedEntry = [_historyPrivate lastVisitedEntry])
-            core(lastVisitedEntry)->addRedirectURL([url _web_originalDataAsString]);
-    }
-
     WebHistoryItem *entry = [_historyPrivate visitedURL:url withTitle:title];
-    [_historyPrivate setLastVisitedEntry:entry];
 
     HistoryItem* item = core(entry);
     item->setLastVisitWasFailure(wasFailure);
 
     if ([method length])
-        item->setLastVisitWasHTTPNonGet([method caseInsensitiveCompare:@"GET"]);
+        item->setLastVisitWasHTTPNonGet([method caseInsensitiveCompare:@"GET"] && (![[url scheme] caseInsensitiveCompare:@"http"] || ![[url scheme] caseInsensitiveCompare:@"https"]));
 
-    if (serverRedirectURL) {
-        ASSERT(!isClientRedirect);
-        item->addRedirectURL(serverRedirectURL);
-    }
+    item->setRedirectURLs(std::auto_ptr<Vector<String> >());
 
     NSArray *entries = [[NSArray alloc] initWithObjects:entry, nil];
     [self _sendNotification:WebHistoryItemsAddedNotification entries:entries];
     [entries release];
 }
 
-- (void)_visitedURLForRedirectWithoutHistoryItem:(NSURL *)url
-{
-    if (WebHistoryItem *lastVisitedEntry = [_historyPrivate lastVisitedEntry])
-        core(lastVisitedEntry)->addRedirectURL([url _web_originalDataAsString]);
-}
-
 - (void)_addVisitedLinksToPageGroup:(WebCore::PageGroup&)group
 {
     [_historyPrivate addVisitedLinksToPageGroup:group];