Bug 1141797. r=smaug.

--HG--
extra : rebase_source : 9f8cae40311617b1e201650c79ec96e8826f4b43

docshell/shistory/public/nsISHistoryInternal.idl

@@ -14,8 +14,8 @@ interface nsIURI;
 
 %{C++
 #define NS_SHISTORY_INTERNAL_CID \
-{ 0x9c47c121, 0x1c6e, 0x4d8f, \
-  { 0xb9, 0x04, 0x3a, 0xc9, 0x68, 0x11, 0x6e, 0x88 } }
+{ 0x3dfb2f54, 0x378d, 0x4d3c, \
+  { 0xa9, 0xf9, 0x95, 0xdd, 0x26, 0x73, 0x24, 0x8c } }
 
 #define NS_SHISTORY_INTERNAL_CONTRACTID "@mozilla.org/browser/shistory-internal;1"
 
@@ -24,7 +24,7 @@ interface nsIURI;
 
 [ref] native nsDocshellIDArray(nsTArray<uint64_t>);
 
-[scriptable, uuid(f9348014-0239-11e2-b029-3d38e719eb2d)]
+[scriptable, uuid(3dfb2f54-378d-4d3c-a9f9-95dd2673248c)]
 interface nsISHistoryInternal: nsISupports
 {
   /**
@@ -42,9 +42,9 @@ interface nsISHistoryInternal: nsISupports
    readonly attribute nsISHTransaction rootTransaction;
 
   /**
-   * The toplevel docshell object to which this SHistory object belongs to.
+   * Sets the toplevel docshell object to which this SHistory object belongs to.
    */
-   attribute nsIDocShell rootDocShell;
+   void setRootDocShell(in nsIDocShell rootDocShell);
 
   /** 
    * Update the index maintained by sessionHistory

docshell/shistory/src/nsSHistory.cpp

@@ -1790,8 +1790,6 @@ nsSHistory::InitiateLoad(nsISHEntry * aFrameEntry, nsIDocShell * aFrameDS, long
 
 }
 
-
-
 NS_IMETHODIMP
 nsSHistory::SetRootDocShell(nsIDocShell * aDocShell)
 {
@@ -1799,18 +1797,6 @@ nsSHistory::SetRootDocShell(nsIDocShell * aDocShell)
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsSHistory::GetRootDocShell(nsIDocShell ** aDocShell)
-{
-  NS_ENSURE_ARG_POINTER(aDocShell);
-
-  *aDocShell = mRootDocShell;
-  //Not refcounted. May this method should not be available for public
-  // NS_IF_ADDREF(*aDocShell);
-  return NS_OK;
-}
-
-
 NS_IMETHODIMP
 nsSHistory::GetSHistoryEnumerator(nsISimpleEnumerator** aEnumerator)
 {