Move "sentence" granularity related functions to VisibleUnitSentence.cpp

third_party/WebKit/Source/core/editing/VisibleUnits.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights
  * reserved.
  *
  * 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 45 matching lines @@
 #include "core/layout/LayoutTextFragment.h"
 #include "core/layout/LayoutView.h"
 #include "core/layout/api/LayoutItem.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/layout/api/LineLayoutAPIShim.h"
 #include "core/layout/api/LineLayoutItem.h"
 #include "core/layout/line/InlineIterator.h"
 #include "core/layout/line/InlineTextBox.h"
 #include "platform/heap/Handle.h"
 #include "platform/text/TextBoundaries.h"
-#include "platform/text/TextBreakIterator.h"
 
 namespace blink {
 
 template <typename PositionType>
 static PositionType CanonicalizeCandidate(const PositionType& candidate) {
   if (candidate.IsNull())
     return PositionType();
   DCHECK(IsVisuallyEquivalentCandidate(candidate));
   PositionType upstream = MostBackwardCaretPosition(candidate);
   if (IsVisuallyEquivalentCandidate(upstream))
@@ skipping 457 matching lines @@
 }
 
 PositionInFlatTree PreviousBoundary(
     const VisiblePositionInFlatTree& visible_position,
     BoundarySearchFunction search_function) {
   return PreviousBoundaryAlgorithm(visible_position, search_function);
 }
 
 // ---------
 
-static unsigned StartSentenceBoundary(const UChar* characters,
-                                      unsigned length,
-                                      unsigned,
-                                      BoundarySearchContextAvailability,
-                                      bool&) {
-  TextBreakIterator* iterator = SentenceBreakIterator(characters, length);
-  // FIXME: The following function can return -1; we don't handle that.
-  return iterator->preceding(length);
-}
-
-template <typename Strategy>
-static VisiblePositionTemplate<Strategy> StartOfSentenceAlgorithm(
-    const VisiblePositionTemplate<Strategy>& c) {
-  DCHECK(c.IsValid()) << c;
-  return CreateVisiblePosition(PreviousBoundary(c, StartSentenceBoundary));
-}
-
-VisiblePosition StartOfSentence(const VisiblePosition& c) {
-  return StartOfSentenceAlgorithm<EditingStrategy>(c);
-}
-
-VisiblePositionInFlatTree StartOfSentence(const VisiblePositionInFlatTree& c) {
-  return StartOfSentenceAlgorithm<EditingInFlatTreeStrategy>(c);
-}
-
-static unsigned EndSentenceBoundary(const UChar* characters,
-                                    unsigned length,
-                                    unsigned,
-                                    BoundarySearchContextAvailability,
-                                    bool&) {
-  TextBreakIterator* iterator = SentenceBreakIterator(characters, length);
-  return iterator->next();
-}
-
-// TODO(yosin) This includes the space after the punctuation that marks the end
-// of the sentence.
-template <typename Strategy>
-static VisiblePositionTemplate<Strategy> EndOfSentenceAlgorithm(
-    const VisiblePositionTemplate<Strategy>& c) {
-  DCHECK(c.IsValid()) << c;
-  return CreateVisiblePosition(NextBoundary(c, EndSentenceBoundary),
-                               VP_UPSTREAM_IF_POSSIBLE);
-}
-
-VisiblePosition EndOfSentence(const VisiblePosition& c) {
-  return EndOfSentenceAlgorithm<EditingStrategy>(c);
-}
-
-VisiblePositionInFlatTree EndOfSentence(const VisiblePositionInFlatTree& c) {
-  return EndOfSentenceAlgorithm<EditingInFlatTreeStrategy>(c);
-}
-
-static unsigned PreviousSentencePositionBoundary(
-    const UChar* characters,
-    unsigned length,
-    unsigned,
-    BoundarySearchContextAvailability,
-    bool&) {
-  // FIXME: This is identical to startSentenceBoundary. I'm pretty sure that's
-  // not right.
-  TextBreakIterator* iterator = SentenceBreakIterator(characters, length);
-  // FIXME: The following function can return -1; we don't handle that.
-  return iterator->preceding(length);
-}
-
-VisiblePosition PreviousSentencePosition(const VisiblePosition& c) {
-  DCHECK(c.IsValid()) << c;
-  VisiblePosition prev = CreateVisiblePosition(
-      PreviousBoundary(c, PreviousSentencePositionBoundary));
-  return HonorEditingBoundaryAtOrBefore(prev, c.DeepEquivalent());
-}
-
-static unsigned NextSentencePositionBoundary(const UChar* characters,
-                                             unsigned length,
-                                             unsigned,
-                                             BoundarySearchContextAvailability,
-                                             bool&) {
-  // FIXME: This is identical to endSentenceBoundary. This isn't right, it needs
-  // to move to the equivlant position in the following sentence.
-  TextBreakIterator* iterator = SentenceBreakIterator(characters, length);
-  return iterator->following(0);
-}
-
-VisiblePosition NextSentencePosition(const VisiblePosition& c) {
-  DCHECK(c.IsValid()) << c;
-  VisiblePosition next = CreateVisiblePosition(
-      NextBoundary(c, NextSentencePositionBoundary), VP_UPSTREAM_IF_POSSIBLE);
-  return HonorEditingBoundaryAtOrAfter(next, c.DeepEquivalent());
-}
-
-EphemeralRange ExpandEndToSentenceBoundary(const EphemeralRange& range) {
-  DCHECK(range.IsNotNull());
-  const VisiblePosition& visible_end =
-      CreateVisiblePosition(range.EndPosition());
-  DCHECK(visible_end.IsNotNull());
-  const Position& sentence_end = EndOfSentence(visible_end).DeepEquivalent();
-  // 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(),
-      sentence_end.IsNotNull() && sentence_end > range.EndPosition()
-          ? sentence_end
-          : range.EndPosition());
-}
-
-EphemeralRange ExpandRangeToSentenceBoundary(const EphemeralRange& range) {
-  DCHECK(range.IsNotNull());
-  const VisiblePosition& visible_start =
-      CreateVisiblePosition(range.StartPosition());
-  DCHECK(visible_start.IsNotNull());
-  const Position& sentence_start =
-      StartOfSentence(visible_start).DeepEquivalent();
-  // 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(
-      sentence_start.IsNotNull() && sentence_start < range.StartPosition()
-          ? sentence_start
-          : range.StartPosition(),
-      range.EndPosition()));
-}
-
-// ---------
-
 VisiblePosition StartOfBlock(const VisiblePosition& visible_position,
                              EditingBoundaryCrossingRule rule) {
   DCHECK(visible_position.IsValid()) << visible_position;
   Position position = visible_position.DeepEquivalent();
   Element* start_block =
       position.ComputeContainerNode()
           ? EnclosingBlock(position.ComputeContainerNode(), rule)
           : 0;
   return start_block ? VisiblePosition::FirstPositionInNode(start_block)
                      : VisiblePosition();
@@ skipping 1941 matching lines @@
 
 IntRect ComputeTextRect(const EphemeralRangeInFlatTree& range) {
   return EnclosingIntRect(ComputeTextRectTemplate(range));
 }
 
 FloatRect ComputeTextFloatRect(const EphemeralRange& range) {
   return ComputeTextRectTemplate(range);
 }
 
 }  // namespace blink