Bug 1054735 part 1 - Clean up nsAutoReplaceContainerSelNotify; r=ehsan

dothq · Aug 20, 2014 · 9dcb3c4 · 9dcb3c4
1 parent 4431461
commit 9dcb3c4
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 25 deletions.
diff --git a/editor/libeditor/nsEditor.cpp b/editor/libeditor/nsEditor.cpp
@@ -1555,8 +1555,8 @@ nsEditor::ReplaceContainer(Element* aOldContainer,
   // notify our internal selection state listener
   // (Note: A nsAutoSelectionReset object must be created
   //  before calling this to initialize mRangeUpdater)
-  nsAutoReplaceContainerSelNotify selStateNotify(mRangeUpdater,
-      aOldContainer->AsDOMNode(), ret->AsDOMNode());
+  AutoReplaceContainerSelNotify selStateNotify(mRangeUpdater, aOldContainer,
+                                               ret);
   {
     nsAutoTxnsConserveSelection conserveSelection(this);
     while (aOldContainer->HasChildren()) {

diff --git a/editor/libeditor/nsSelectionState.cpp b/editor/libeditor/nsSelectionState.cpp
@@ -539,7 +539,7 @@ nsRangeUpdater::WillReplaceContainer()
 
 
 nsresult
-nsRangeUpdater::DidReplaceContainer(nsINode* aOriginalNode, nsINode* aNewNode)
+nsRangeUpdater::DidReplaceContainer(Element* aOriginalNode, Element* aNewNode)
 {
   NS_ENSURE_TRUE(mLock, NS_ERROR_UNEXPECTED);
   mLock = false;
@@ -564,15 +564,6 @@ nsRangeUpdater::DidReplaceContainer(nsINode* aOriginalNode, nsINode* aNewNode)
   return NS_OK;
 }
 
-nsresult
-nsRangeUpdater::DidReplaceContainer(nsIDOMNode* aOriginalNode,
-                                    nsIDOMNode* aNewNode)
-{
-  nsCOMPtr<nsINode> originalNode = do_QueryInterface(aOriginalNode);
-  nsCOMPtr<nsINode> newNode = do_QueryInterface(aNewNode);
-  return DidReplaceContainer(originalNode, newNode);
-}
-
 
 nsresult
 nsRangeUpdater::WillRemoveContainer()

diff --git a/editor/libeditor/nsSelectionState.h b/editor/libeditor/nsSelectionState.h
@@ -117,8 +117,8 @@ class nsRangeUpdater
     // the following gravity routines need will/did sandwiches, because the other gravity
     // routines will be called inside of these sandwiches, but should be ignored.
     nsresult WillReplaceContainer();
-    nsresult DidReplaceContainer(nsINode* aOriginalNode, nsINode* aNewNode);
-    nsresult DidReplaceContainer(nsIDOMNode *aOriginalNode, nsIDOMNode *aNewNode);
+    nsresult DidReplaceContainer(mozilla::dom::Element* aOriginalNode,
+                                 mozilla::dom::Element* aNewNode);
     nsresult WillRemoveContainer();
     nsresult DidRemoveContainer(nsINode* aNode, nsINode* aParent,
                                 int32_t aOffset, uint32_t aNodeOrigLen);
@@ -193,32 +193,38 @@ class MOZ_STACK_CLASS nsAutoTrackDOMPoint
 
 
 
-/***************************************************************************
+/******************************************************************************
  * another helper class for nsSelectionState.  stack based class for doing
  * Will/DidReplaceContainer()
  */
 
-class MOZ_STACK_CLASS nsAutoReplaceContainerSelNotify
+namespace mozilla {
+namespace dom {
+class MOZ_STACK_CLASS AutoReplaceContainerSelNotify
 {
   private:
     nsRangeUpdater &mRU;
-    nsIDOMNode *mOriginalNode;
-    nsIDOMNode *mNewNode;
+    Element* mOriginalElement;
+    Element* mNewElement;
 
   public:
-    nsAutoReplaceContainerSelNotify(nsRangeUpdater &aRangeUpdater, nsIDOMNode *aOriginalNode, nsIDOMNode *aNewNode) :
-    mRU(aRangeUpdater)
-    ,mOriginalNode(aOriginalNode)
-    ,mNewNode(aNewNode)
+    AutoReplaceContainerSelNotify(nsRangeUpdater& aRangeUpdater,
+                                  Element* aOriginalElement,
+                                  Element* aNewElement)
+      : mRU(aRangeUpdater)
+      , mOriginalElement(aOriginalElement)
+      , mNewElement(aNewElement)
     {
       mRU.WillReplaceContainer();
     }
-    
-    ~nsAutoReplaceContainerSelNotify()
+
+    ~AutoReplaceContainerSelNotify()
     {
-      mRU.DidReplaceContainer(mOriginalNode, mNewNode);
+      mRU.DidReplaceContainer(mOriginalElement, mNewElement);
     }
 };
+}
+}
 
 
 /***************************************************************************