Merge WebKit r45890 to the 172 (2.0) branch....

third_party/WebKit/WebCore/history/HistoryItem.cpp

 /*
  * Copyright (C) 2005, 2006, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 436 matching lines @@
 }
 
 FormData* HistoryItem::formData()
 {
     return m_formData.get();
 }
 
 bool HistoryItem::isCurrentDocument(Document* doc) const
 {
     // FIXME: We should find a better way to check if this is the current document.
-    return urlString() == doc->url();
+    return equalIgnoringRef(url(), doc->url());
 }
 
 void HistoryItem::mergeAutoCompleteHints(HistoryItem* otherItem)
 {
     // FIXME: this is broken - we should be merging the daily counts
     // somehow.  but this is to support API that's not really used in
     // practice so leave it broken for now.
     ASSERT(otherItem);
     if (otherItem != this)
         m_visitCount += otherItem->m_visitCount;
@@ skipping 48 matching lines @@
 
 #ifndef NDEBUG
 
 int showTree(const WebCore::HistoryItem* item)
 {
     return item->showTree();
 }
 
 #endif