Bug 1430619 part 1 - Make nsIContentViewerContainer::embed non-IDL. r=freesamael draft
authorJonathan Watt <jwatt@jwatt.org>
Wed, 17 Jan 2018 10:52:48 +0000
changeset 721532 83d8e1d978ee9755636557b457df2cde9a72f169
parent 721531 3b3d07447b8203e7370a51972d34064d701fb44e
child 721533 768cb7d0d87bae43d6f134e1d4d4273bb161f996
push id95856
push userjwatt@jwatt.org
push dateWed, 17 Jan 2018 10:55:16 +0000
reviewersfreesamael
bugs1430619
milestone59.0a1
Bug 1430619 part 1 - Make nsIContentViewerContainer::embed non-IDL. r=freesamael MozReview-Commit-ID: DHHYkESWBv5
docshell/base/nsDocShell.cpp
docshell/base/nsDocShell.h
docshell/base/nsIContentViewerContainer.idl
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -6851,21 +6851,17 @@ nsDocShell::RefreshURIFromQueue()
         }
       }
     }
   }
 
   return NS_OK;
 }
 
-//*****************************************************************************
-// nsDocShell::nsIContentViewerContainer
-//*****************************************************************************
-
-NS_IMETHODIMP
+nsresult
 nsDocShell::Embed(nsIContentViewer* aContentViewer,
                   const char* aCommand, nsISupports* aExtraInfo)
 {
   // Save the LayoutHistoryState of the previous document, before
   // setting up new document
   PersistLayoutHistoryState();
 
   nsresult rv = SetupNewViewer(aContentViewer);
--- a/docshell/base/nsDocShell.h
+++ b/docshell/base/nsDocShell.h
@@ -864,16 +864,18 @@ private: // member functions
   nsIDOMStorageManager* TopSessionStorageManager();
   nsIChannel* GetCurrentDocChannel();
   nsresult EnsureScriptEnvironment();
   nsresult EnsureEditorData();
   nsresult EnsureTransferableHookData();
   nsresult EnsureFind();
   nsresult EnsureCommandHandler();
   nsresult RefreshURIFromQueue();
+  nsresult Embed(nsIContentViewer* aContentViewer,
+                 const char* aCommand, nsISupports* aExtraInfo);
   nsresult GetEldestPresContext(nsPresContext** aPresContext);
   nsresult CheckLoadingPermissions();
   nsresult PersistLayoutHistoryState();
   nsresult LoadHistoryEntry(nsISHEntry* aEntry, uint32_t aLoadType);
   nsresult SetBaseUrlForWyciwyg(nsIContentViewer* aContentViewer);
   nsresult GetRootSessionHistory(nsISHistory** aReturn);
   nsresult GetHttpChannel(nsIChannel* aChannel, nsIHttpChannel** aReturn);
   nsresult ConfirmRepost(bool* aRepost);
--- a/docshell/base/nsIContentViewerContainer.idl
+++ b/docshell/base/nsIContentViewerContainer.idl
@@ -5,16 +5,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
 
 interface nsIContentViewer;
 
 [scriptable, uuid(ea2ce7a0-5c3d-11d4-90c2-0050041caf44)]
 interface nsIContentViewerContainer : nsISupports {
-	void embed(in nsIContentViewer aDocViewer, in string aCommand, in nsISupports aExtraInfo);
-
   /**
    * Allows nsPrintJob to make this call on an internal interface to the
    * DocShell.
    */
   void setIsPrinting(in boolean aIsPrinting);
 };