Force expandEnd/RangeToSentenceBoundary to return a valid EphemeralRange

third_party/WebKit/Source/core/editing/spellcheck/SpellChecker.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 81 matching lines @@
     }
     return false;
 }
 
 static EphemeralRange expandEndToSentenceBoundary(const EphemeralRange& range)
 {
     DCHECK(range.isNotNull());
     const VisiblePosition& visibleEnd = createVisiblePosition(range.endPosition());
     DCHECK(visibleEnd.isNotNull());
     const Position& sentenceEnd = endOfSentence(visibleEnd).deepEquivalent();
-    // TODO(xiaochengh): |sentenceEnd < range.startPosition()| seems possible,
-    // which would trigger a DCHECK in EphemeralRange's constructor. Need more
-    // investigation, and if that is really the case, fix it.
-    return EphemeralRange(range.startPosition(), sentenceEnd.isNotNull() ? sentenceEnd : range.endPosition());
+    // TODO(xiaochengh): |sentenceEnd < range.endPosition()| is possible,
+    // which would trigger a DCHECK in EphemeralRange's constructor if we return
+    // it directly. However, this shouldn't happen and needs to be fixed.
+    return EphemeralRange(range.startPosition(), sentenceEnd.isNotNull() && sentenceEnd > range.endPosition() ? sentenceEnd : range.endPosition());
 }
 
 static EphemeralRange expandRangeToSentenceBoundary(const EphemeralRange& range)
 {
     DCHECK(range.isNotNull());
     const VisiblePosition& visibleStart = createVisiblePosition(range.startPosition());
     DCHECK(visibleStart.isNotNull());
     const Position& sentenceStart = startOfSentence(visibleStart).deepEquivalent();
-    const VisiblePosition& visibleEnd = createVisiblePosition(range.endPosition());
-    DCHECK(visibleStart.isNotNull());
-    const Position& sentenceEnd = endOfSentence(visibleEnd).deepEquivalent();
-    return EphemeralRange(sentenceStart.isNull() ? range.startPosition() : sentenceStart, sentenceEnd.isNull() ? range.endPosition() : sentenceEnd);
+    // TODO(xiaochengh): |sentenceStart > range.startPosition()| is possible,
+    // which would trigger a DCHECK in EphemeralRange's constructor if we return
+    // it directly. However, this shouldn't happen and needs to be fixed.
+    return expandEndToSentenceBoundary(EphemeralRange(sentenceStart.isNotNull() && sentenceStart < range.startPosition() ? sentenceStart : range.startPosition(), range.endPosition()));
 }
 
 } // namespace
 
 SpellChecker* SpellChecker::create(LocalFrame& frame)
 {
     return new SpellChecker(frame);
 }
 
 static SpellCheckerClient& emptySpellCheckerClient()
@@ skipping 812 matching lines @@
         VisiblePosition newParagraphStart = startOfNextParagraph(createVisiblePosition(paragraphEnd));
         paragraphStart = newParagraphStart.toParentAnchoredPosition();
         paragraphEnd = endOfParagraph(newParagraphStart).toParentAnchoredPosition();
         firstIteration = false;
         totalLengthProcessed += currentLength;
     }
     return std::make_pair(firstFoundItem, firstFoundOffset);
 }
 
 } // namespace blink