Bug 1260651 part.15 Rename nsAutoEditInitRulesTrigger to mozilla::AutoEditInitRulesTrigger r=mccr8

MozReview-Commit-ID: Hp2BfbbGckt

editor/libeditor/TextEditUtils.cpp

@@ -23,6 +23,10 @@
 
 namespace mozilla {
 
+/******************************************************************************
+ * TextEditUtils
+ ******************************************************************************/
+
 /**
  * IsBody() returns true if aNode is an html body node.
  */
@@ -86,18 +90,26 @@ TextEditUtils::HasMozAttr(nsIDOMNode* aNode)
   return NS_SUCCEEDED(rv) && typeAttrVal.LowerCaseEqualsLiteral("_moz");
 }
 
+/******************************************************************************
+ * AutoEditInitRulesTrigger
+ ******************************************************************************/
+
+AutoEditInitRulesTrigger::AutoEditInitRulesTrigger(
+                            nsPlaintextEditor* aTextEditor,
+                            nsresult& aResult)
+  : mTextEditor(aTextEditor)
+  , mResult(aResult)
+{
+  if (mTextEditor) {
+    mTextEditor->BeginEditorInit();
+  }
+}
+
+AutoEditInitRulesTrigger::~AutoEditInitRulesTrigger()
+{
+  if (mTextEditor) {
+    mResult = mTextEditor->EndEditorInit();
+  }
+}
+
 } // namespace mozilla
-
-///////////////////////////////////////////////////////////////////////////
-// nsAutoEditInitRulesTrigger methods
-//
-nsAutoEditInitRulesTrigger::nsAutoEditInitRulesTrigger( nsPlaintextEditor *aEd, nsresult &aRes) : mEd(aEd), mRes(aRes)
-{
-    if (mEd) mEd->BeginEditorInit();
-}
-
-nsAutoEditInitRulesTrigger::~nsAutoEditInitRulesTrigger()
-{
-    if (mEd) mRes = mEd->EndEditorInit();
-}
-

editor/libeditor/TextEditUtils.h

@@ -26,20 +26,21 @@ public:
   static bool HasMozAttr(nsIDOMNode* aNode);
 };
 
-} // naemspace mozilla
-
 /***************************************************************************
  * stack based helper class for detecting end of editor initialization, in
  * order to trigger "end of init" initialization of the edit rules.
  */
-class nsAutoEditInitRulesTrigger
+class AutoEditInitRulesTrigger final
 {
 private:
-  nsPlaintextEditor* mEd;
-  nsresult& mRes;
+  nsPlaintextEditor* mTextEditor;
+  nsresult& mResult;
+
 public:
-  nsAutoEditInitRulesTrigger(nsPlaintextEditor* aEd, nsresult& aRes);
-  ~nsAutoEditInitRulesTrigger();
+  AutoEditInitRulesTrigger(nsPlaintextEditor* aTextEditor, nsresult& aResult);
+  ~AutoEditInitRulesTrigger();
 };
 
+} // naemspace mozilla
+
 #endif // #ifndef TextEditUtils_h

editor/libeditor/nsHTMLEditor.cpp

@@ -266,8 +266,8 @@ nsHTMLEditor::Init(nsIDOMDocument *aDoc,
 
   if (1)
   {
-    // block to scope nsAutoEditInitRulesTrigger
-    nsAutoEditInitRulesTrigger rulesTrigger(static_cast<nsPlaintextEditor*>(this), rulesRes);
+    // block to scope AutoEditInitRulesTrigger
+    AutoEditInitRulesTrigger rulesTrigger(this, rulesRes);
 
     // Init the plaintext editor
     result = nsPlaintextEditor::Init(aDoc, aRoot, nullptr, aFlags, aInitialValue);

editor/libeditor/nsPlaintextEditor.cpp

@@ -129,8 +129,8 @@ NS_IMETHODIMP nsPlaintextEditor::Init(nsIDOMDocument *aDoc,
   }
 
   {
-    // block to scope nsAutoEditInitRulesTrigger
-    nsAutoEditInitRulesTrigger rulesTrigger(this, rulesRes);
+    // block to scope AutoEditInitRulesTrigger
+    AutoEditInitRulesTrigger rulesTrigger(this, rulesRes);
 
     // Init the base editor
     res = nsEditor::Init(aDoc, aRoot, aSelCon, aFlags, aInitialValue);

editor/libeditor/nsPlaintextEditor.h

@@ -28,6 +28,7 @@ class nsISelectionController;
 class nsITransferable;
 
 namespace mozilla {
+class AutoEditInitRulesTrigger;
 namespace dom {
 class Selection;
 } // namespace dom
@@ -224,10 +225,9 @@ protected:
   int32_t mCaretStyle;
 
   // friends
+  friend class mozilla::AutoEditInitRulesTrigger;
   friend class nsHTMLEditRules;
   friend class nsTextEditRules;
-friend class nsAutoEditInitRulesTrigger;
-
 };
 
 #endif //nsPlaintextEditor_h__