Tweaks to new shist per bug 18804; r=travis@netscape.com

docshell/shistory/public/nsISHistory.idl

@@ -42,9 +42,9 @@ interface nsISHistory: nsISupports
    void  addEntry(in nsISHEntry aEntry);
 
   /**
-   * Get the length of the History list
+   * Get the size of the History list
    */
-   readonly attribute long length;
+   readonly attribute long count;
 
   /**
    * Get the index of the current document in the history list
@@ -67,13 +67,8 @@ interface nsISHistory: nsISupports
    nsISHEntry getEntryAtIndex(in long index, in boolean modifyIndex);
 
   /**
-   * Get the root entry
+   * Get the root transaction
    */
-   readonly attribute nsISHEntry rootEntry;
-
-   /** 
-    * Get the Transaction for an index
-    */
-    nsISHTransaction getTransactionAtIndex(in long aIndex);
+   readonly attribute nsISHTransaction rootTransaction;
 
 };

docshell/shistory/src/nsSHistory.cpp

@@ -90,9 +90,9 @@ nsSHistory::AddEntry(nsISHEntry * aSHEntry)
    return NS_OK;
 }
 
-/* Get length of the history list */
+/* Get size of the history list */
 NS_IMETHODIMP
-nsSHistory::GetLength(PRInt32 * aResult)
+nsSHistory::GetCount(PRInt32 * aResult)
 {
     NS_ENSURE_ARG_POINTER(aResult);
 	*aResult = mLength;
@@ -108,20 +108,6 @@ nsSHistory::GetIndex(PRInt32 * aResult)
 	return NS_OK;
 }
 
-/* Get the root (the very first) entry in the history list */
-NS_IMETHODIMP
-nsSHistory::GetRootEntry(nsISHEntry ** aResult)
-{
-    nsresult rv;
-
-      /* GetSHEntry ensures aResult is valid */
-      if (mListRoot) {
-        rv = mListRoot->GetSHEntry(aResult);
-        return rv;
-      }
-      return NS_ERROR_FAILURE;
-}
-
 /* Get the entry prior to the current index */
 NS_IMETHODIMP
 nsSHistory::GetPreviousEntry(PRBool aModifyIndex, nsISHEntry ** aResult)

docshell/shistory/src/nsSHistory.h

@@ -44,7 +44,7 @@ private:
     friend NS_IMETHODIMP
 		NS_NewSHistory(nsISupports * aOuter, REFNSIID aIID, void** aResult);
       NS_IMETHOD PrintHistory();
-      NS_IMETHOD GetRootTransaction(nsISHTransaction ** aResult);
+      NS_IMETHOD GetTransactionAtIndex(PRInt32 aIndex, nsISHTransaction ** aResult);
 	nsCOMPtr<nsISHTransaction> mListRoot;
 	PRInt32 mIndex;
 	PRInt32 mLength;