Bug 1540107 - Use nsEditingSession directly in nsDocShellEditorData. r=masayuki

`nsIEditingSession.SetupEditorOnWindow` is used in `nsDocShellEditorData`.
To get rid of it, I would like to use `nsEditSession` directly instead of
`nsIEditingSession`.

Differential Revision: https://phabricator.services.mozilla.com/D25537

--HG--
extra : moz-landing-system : lando

docshell/base/nsDocShell.cpp

@@ -179,6 +179,7 @@
 #include "nsDOMCID.h"
 #include "nsDOMNavigationTiming.h"
 #include "nsDSURIContentListener.h"
+#include "nsEditingSession.h"
 #include "nsError.h"
 #include "nsEscape.h"
 #include "nsFocusManager.h"
@@ -11795,9 +11796,7 @@ nsDocShell::GetHasEditingSession(bool* aHasEditingSession) {
   NS_ENSURE_ARG_POINTER(aHasEditingSession);
 
   if (mEditorData) {
-    nsCOMPtr<nsIEditingSession> editingSession;
-    mEditorData->GetEditingSession(getter_AddRefs(editingSession));
-    *aHasEditingSession = (editingSession.get() != nullptr);
+    *aHasEditingSession = !!mEditorData->GetEditingSession();
   } else {
     *aHasEditingSession = false;
   }
@@ -13275,7 +13274,7 @@ nsDocShell::GetEditingSession(nsIEditingSession** aEditSession) {
     return NS_ERROR_FAILURE;
   }
 
-  mEditorData->GetEditingSession(aEditSession);
+  *aEditSession = do_AddRef(mEditorData->GetEditingSession()).take();
   return *aEditSession ? NS_OK : NS_ERROR_FAILURE;
 }
 

docshell/base/nsDocShellEditorData.cpp

@@ -58,12 +58,10 @@ bool nsDocShellEditorData::GetEditable() {
   return mMakeEditable || (mHTMLEditor != nullptr);
 }
 
-nsresult nsDocShellEditorData::GetEditingSession(nsIEditingSession** aResult) {
+nsEditingSession* nsDocShellEditorData::GetEditingSession() {
   EnsureEditingSession();
 
-  NS_ADDREF(*aResult = mEditingSession);
-
-  return NS_OK;
+  return mEditingSession.get();
 }
 
 nsresult nsDocShellEditorData::SetHTMLEditor(HTMLEditor* aHTMLEditor) {

docshell/base/nsDocShellEditorData.h

@@ -15,7 +15,7 @@
 #include "nsIHTMLDocument.h"
 
 class nsIDocShell;
-class nsIEditingSession;
+class nsEditingSession;
 
 class nsDocShellEditorData {
  public:
@@ -24,7 +24,7 @@ class nsDocShellEditorData {
 
   nsresult MakeEditable(bool aWaitForUriLoad);
   bool GetEditable();
-  nsresult GetEditingSession(nsIEditingSession** aResult);
+  nsEditingSession* GetEditingSession();
   mozilla::HTMLEditor* GetHTMLEditor() const { return mHTMLEditor; }
   nsresult SetHTMLEditor(mozilla::HTMLEditor* aHTMLEditor);
   void TearDownEditor();
@@ -39,7 +39,7 @@ class nsDocShellEditorData {
   nsIDocShell* mDocShell;
 
   // Only present for the content root docShell. Session is owned here.
-  nsCOMPtr<nsIEditingSession> mEditingSession;
+  RefPtr<nsEditingSession> mEditingSession;
 
   // If this frame is editable, store HTML editor here. It's owned here.
   RefPtr<mozilla::HTMLEditor> mHTMLEditor;