Bug 1395080 - Part 1. Replace nsIDOMRange::GetCollapsed with nsRange:…

…:Collapsed. r=masayuki MozReview-Commit-ID: LefqnYBJGec --HG-- extra : rebase_source : f85c786ee218cf6e8528be8d2d91aa9ac0e3ce97
dothq · Sep 1, 2017 · c171902 · c171902
1 parent 2f62ea3
commit c171902
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 26 deletions.
diff --git a/editor/composer/nsEditorSpellCheck.cpp b/editor/composer/nsEditorSpellCheck.cpp
@@ -364,11 +364,7 @@ nsEditorSpellCheck::InitSpellChecker(nsIEditor* aEditor, bool aEnableSelectionCh
       RefPtr<nsRange> range = selection->GetRangeAt(0);
       NS_ENSURE_STATE(range);
 
-      bool collapsed = false;
-      rv = range->GetCollapsed(&collapsed);
-      NS_ENSURE_SUCCESS(rv, rv);
-
-      if (!collapsed) {
+      if (!range->Collapsed()) {
         // We don't want to touch the range in the selection,
         // so create a new copy of it.
 

diff --git a/editor/libeditor/SelectionState.cpp b/editor/libeditor/SelectionState.cpp
@@ -94,9 +94,7 @@ SelectionState::IsCollapsed()
   }
   RefPtr<nsRange> range = mArray[0]->GetRange();
   NS_ENSURE_TRUE(range, false);
-  bool bIsCollapsed = false;
-  range->GetCollapsed(&bIsCollapsed);
-  return bIsCollapsed;
+  return range->Collapsed();
 }
 
 bool

diff --git a/editor/txtsvc/nsTextServicesDocument.cpp b/editor/txtsvc/nsTextServicesDocument.cpp
@@ -600,15 +600,7 @@ nsTextServicesDocument::LastSelectedBlock(TSDBlockSelectionStatus *aSelStatus,
         return rv;
       }
 
-      bool isCollapsed;
-      rv = range->GetCollapsed(&isCollapsed);
-
-      if (NS_FAILED(rv)) {
-        UNLOCK_DOC(this);
-        return rv;
-      }
-
-      if (isCollapsed) {
+      if (range->Collapsed()) {
         // If we get here, the range is collapsed because there is nothing after
         // the caret! Just return NS_OK;
 
@@ -804,15 +796,7 @@ nsTextServicesDocument::LastSelectedBlock(TSDBlockSelectionStatus *aSelStatus,
     return rv;
   }
 
-  bool isCollapsed;
-  rv = range->GetCollapsed(&isCollapsed);
-
-  if (NS_FAILED(rv)) {
-    UNLOCK_DOC(this);
-    return rv;
-  }
-
-  if (isCollapsed) {
+  if (range->Collapsed()) {
     // If we get here, the range is collapsed because there is nothing after
     // the current selection! Just return NS_OK;