Bug 1430619 part 1 - Make nsIContentViewerContainer::embed non-IDL. r=smaug
authorJonathan Watt <jwatt@jwatt.org>
Thu, 11 Jan 2018 11:42:15 +0000
changeset 438603 c01f4a01acdb32fc6a34e2ec35b1a2efb6297aa7
parent 438602 1932a56bc06093b32b8bbd0bf8e77d886d1a0023
child 438604 34fa3317f8d1869ce7afa94f58b88fbaaddb3dfd
push idunknown
push userunknown
push dateunknown
reviewerssmaug
bugs1430619
milestone59.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1430619 part 1 - Make nsIContentViewerContainer::embed non-IDL. r=smaug MozReview-Commit-ID: 5yw90tgFCGz
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);
 };