Bug 1377980 part 2. Remove most C++ use of nsIDOMRange. r=mccr8

accessible/generic/HyperTextAccessible.cpp

@@ -20,7 +20,6 @@
 #include "nsCaret.h"
 #include "nsContentUtils.h"
 #include "nsFocusManager.h"
-#include "nsIDOMRange.h"
 #include "nsIEditingSession.h"
 #include "nsContainerFrame.h"
 #include "nsFrameSelection.h"
@@ -31,6 +30,7 @@
 #include "nsIServiceManager.h"
 #include "nsITextControlElement.h"
 #include "nsIMathMLFrame.h"
+#include "nsRange.h"
 #include "nsTextFragment.h"
 #include "mozilla/BinarySearch.h"
 #include "mozilla/dom/Element.h"

accessible/html/HTMLTableAccessible.cpp

@@ -18,7 +18,6 @@
 #include "TreeWalker.h"
 
 #include "mozilla/dom/HTMLTableElement.h"
-#include "nsIDOMRange.h"
 #include "nsIHTMLCollection.h"
 #include "nsIDocument.h"
 #include "nsIMutableArray.h"

dom/base/Selection.cpp

@@ -392,7 +392,7 @@ void printRange(nsRange *aDomRange)
 {
   if (!aDomRange)
   {
-    printf("NULL nsIDOMRange\n");
+    printf("NULL Range\n");
   }
   nsINode* startNode = aDomRange->GetStartContainer();
   nsINode* endNode = aDomRange->GetEndContainer();
@@ -1926,7 +1926,7 @@ Selection::SetAncestorLimiter(nsIContent* aLimiter)
 }
 
 RangeData*
-Selection::FindRangeData(nsIDOMRange* aRange)
+Selection::FindRangeData(nsRange* aRange)
 {
   NS_ENSURE_TRUE(aRange, nullptr);
   for (uint32_t i = 0; i < mRanges.Length(); i++) {

dom/base/Selection.h

@@ -595,7 +595,7 @@ private:
                                  nsINode* aEndNode, int32_t aEndOffset,
                                  bool aAllowAdjacent,
                                  int32_t* aStartIndex, int32_t* aEndIndex);
-  RangeData* FindRangeData(nsIDOMRange* aRange);
+  RangeData* FindRangeData(nsRange* aRange);
 
   void UserSelectRangesToAdd(nsRange* aItem, nsTArray<RefPtr<nsRange> >& rangesToAdd);
 

dom/base/nsContentAreaDragDrop.cpp

@@ -17,7 +17,6 @@
 #include "nsISelectionController.h"
 #include "nsIDOMNode.h"
 #include "nsPIDOMWindow.h"
-#include "nsIDOMRange.h"
 #include "nsIFormControl.h"
 #include "nsITransferable.h"
 #include "nsComponentManagerUtils.h"

dom/base/nsContentIterator.cpp

@@ -93,7 +93,7 @@ public:
 
   virtual nsresult Init(nsINode* aRoot) override;
 
-  virtual nsresult Init(nsIDOMRange* aRange) override;
+  virtual nsresult Init(nsRange* aRange) override;
 
   virtual nsresult Init(nsINode* aStartContainer, uint32_t aStartOffset,
                         nsINode* aEndContainer, uint32_t aEndOffset) override;
@@ -259,20 +259,19 @@ nsContentIterator::Init(nsINode* aRoot)
 }
 
 nsresult
-nsContentIterator::Init(nsIDOMRange* aDOMRange)
+nsContentIterator::Init(nsRange* aRange)
 {
   mIsDone = false;
 
-  if (NS_WARN_IF(!aDOMRange)) {
+  if (NS_WARN_IF(!aRange)) {
     return NS_ERROR_INVALID_ARG;
   }
 
-  nsRange* range = static_cast<nsRange*>(aDOMRange);
-  if (NS_WARN_IF(!range->IsPositioned())) {
+  if (NS_WARN_IF(!aRange->IsPositioned())) {
     return NS_ERROR_INVALID_ARG;
   }
 
-  return InitInternal(range->StartRef().AsRaw(), range->EndRef().AsRaw());
+  return InitInternal(aRange->StartRef().AsRaw(), aRange->EndRef().AsRaw());
 }
 
 nsresult
@@ -852,7 +851,7 @@ public:
 
   virtual nsresult Init(nsINode* aRoot) override;
 
-  virtual nsresult Init(nsIDOMRange* aRange) override;
+  virtual nsresult Init(nsRange* aRange) override;
 
   virtual nsresult Init(nsINode* aStartContainer, uint32_t aStartOffset,
                         nsINode* aEndContainer, uint32_t aEndOffset) override;
@@ -942,18 +941,17 @@ nsContentSubtreeIterator::Init(nsINode* aRoot)
 
 
 nsresult
-nsContentSubtreeIterator::Init(nsIDOMRange* aRange)
+nsContentSubtreeIterator::Init(nsRange* aRange)
 {
   MOZ_ASSERT(aRange);
 
   mIsDone = false;
 
-  nsRange* range = static_cast<nsRange*>(aRange);
-  if (NS_WARN_IF(!range->IsPositioned())) {
+  if (NS_WARN_IF(!aRange->IsPositioned())) {
     return NS_ERROR_INVALID_ARG;
   }
 
-  mRange = range;
+  mRange = aRange;
 
   return InitWithRange();
 }

dom/base/nsCopySupport.cpp

@@ -15,7 +15,6 @@
 #include "nsWidgetsCID.h"
 #include "nsXPCOM.h"
 #include "nsISupportsPrimitives.h"
-#include "nsIDOMRange.h"
 #include "nsRange.h"
 #include "imgIContainer.h"
 #include "imgIRequest.h"

dom/base/nsFocusManager.cpp

@@ -18,7 +18,6 @@
 #include "nsIContentParent.h"
 #include "nsPIDOMWindow.h"
 #include "nsIDOMChromeWindow.h"
-#include "nsIDOMRange.h"
 #include "nsIHTMLDocument.h"
 #include "nsIDocShell.h"
 #include "nsIDocShellTreeOwner.h"

dom/base/nsIContentIterator.h

@@ -12,7 +12,7 @@
 #include "mozilla/RangeBoundary.h"
 
 class nsINode;
-class nsIDOMRange;
+class nsRange;
 
 #define NS_ICONTENTITERATOR_IID \
 { 0x2550078e, 0xae87, 0x4914, \
@@ -30,7 +30,7 @@ public:
   /* Initializes an iterator for the subtree defined by the range aRange
      Subclasses should make sure they implement both of these!
    */
-  virtual nsresult Init(nsIDOMRange* aRange) = 0;
+  virtual nsresult Init(nsRange* aRange) = 0;
 
   /* Initializes an iterator for the subtree between
      aStartContainer/aStartOffset and aEndContainer/aEndOffset

dom/events/IMEContentObserver.cpp

@@ -22,7 +22,6 @@
 #include "nsAtom.h"
 #include "nsIContent.h"
 #include "nsIDocument.h"
-#include "nsIDOMRange.h"
 #include "nsIFrame.h"
 #include "nsINode.h"
 #include "nsIPresShell.h"
@@ -30,6 +29,7 @@
 #include "nsISupports.h"
 #include "nsIWidget.h"
 #include "nsPresContext.h"
+#include "nsRange.h"
 #include "nsRefreshDriver.h"
 #include "nsWeakReference.h"
 #include "WritingModes.h"

editor/libeditor/HTMLEditor.h

@@ -40,7 +40,6 @@ class nsITransferable;
 class nsIClipboard;
 class nsILinkHandler;
 class nsTableWrapperFrame;
-class nsIDOMRange;
 class nsRange;
 
 namespace mozilla {

editor/spellchecker/nsFilteredContentIterator.cpp

@@ -76,18 +76,17 @@ nsFilteredContentIterator::Init(nsINode* aRoot)
 
 //------------------------------------------------------------
 nsresult
-nsFilteredContentIterator::Init(nsIDOMRange* aRange)
+nsFilteredContentIterator::Init(nsRange* aRange)
 {
   if (NS_WARN_IF(!aRange)) {
     return NS_ERROR_INVALID_ARG;
   }
 
-  nsRange* range = static_cast<nsRange*>(aRange);
-  if (NS_WARN_IF(!range->IsPositioned())) {
+  if (NS_WARN_IF(!aRange->IsPositioned())) {
     return NS_ERROR_INVALID_ARG;
   }
 
-  mRange = range->CloneRange();
+  mRange = aRange->CloneRange();
 
   return InitWithRange();
 }

editor/spellchecker/nsFilteredContentIterator.h

@@ -14,7 +14,6 @@
 
 class nsAtom;
 class nsIDOMNode;
-class nsIDOMRange;
 class nsINode;
 class nsITextServicesFilter;
 class nsRange;
@@ -31,7 +30,7 @@ public:
 
   /* nsIContentIterator */
   virtual nsresult Init(nsINode* aRoot) override;
-  virtual nsresult Init(nsIDOMRange* aRange) override;
+  virtual nsresult Init(nsRange* aRange) override;
   virtual nsresult Init(nsINode* aStartContainer, uint32_t aStartOffset,
                         nsINode* aEndContainer, uint32_t aEndOffset) override;
   virtual nsresult Init(const mozilla::RawRangeBoundary& aStart,

toolkit/components/find/nsFind.cpp

@@ -93,7 +93,7 @@ public:
     NS_NOTREACHED("internal error");
     return NS_ERROR_NOT_IMPLEMENTED;
   }
-  virtual nsresult Init(nsIDOMRange* aRange) override
+  virtual nsresult Init(nsRange* aRange) override
   {
     NS_NOTREACHED("internal error");
     return NS_ERROR_NOT_IMPLEMENTED;

toolkit/components/find/nsFind.h

@@ -38,7 +38,6 @@ protected:
   virtual ~nsFind();
 
   // Parameters set from the interface:
-  //nsCOMPtr<nsIDOMRange> mRange;   // search only in this range
   bool mFindBackward;
   bool mCaseSensitive;
 

toolkit/components/find/nsWebBrowserFind.cpp

@@ -7,7 +7,7 @@
 #include "nsWebBrowserFind.h"
 
 // Only need this for NS_FIND_CONTRACTID,
-// else we could use nsIDOMRange.h and nsIFind.h.
+// else we could use nsRange.h and nsIFind.h.
 #include "nsFind.h"
 
 #include "nsIComponentManager.h"

toolkit/components/typeaheadfind/nsTypeAheadFind.h

@@ -13,7 +13,6 @@
 #include "nsIFind.h"
 #include "nsIWebBrowserFind.h"
 #include "nsWeakReference.h"
-#include "nsIDOMRange.h"
 #include "nsIDocShellTreeItem.h"
 #include "nsITypeAheadFind.h"
 #include "nsISound.h"