Do not count extra trailing space for the last word in a range

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

 /*
  * Copyright (C) 2012 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 75 matching lines @@
   // starts at the document's start and ends at the selection start and will
   // be updated.
   BackwardsCharacterIterator backwards_iterator(
       Position::FirstPositionInNode(document->documentElement())
           .ParentAnchoredEquivalent(),
       start_position,
       TextIteratorBehavior::Builder().SetStopsOnFormControls(true).Build());
   if (!backwards_iterator.AtEnd())
     backwards_iterator.Advance(half_max_length);
 
-  start_offset_in_content_ =
-      Range::Create(*document, backwards_iterator.EndPosition(), start_position)
-          ->GetText()
-          .length();
-  end_offset_in_content_ =
-      Range::Create(*document, backwards_iterator.EndPosition(), end_position)
-          ->GetText()
-          .length();
+  const TextIteratorBehavior behavior =
+      TextIteratorBehavior::NoTrailingSpaceRangeLengthBehavior();
+  start_offset_in_content_ = TextIterator::RangeLength(
+      backwards_iterator.EndPosition(), start_position, behavior);
+  end_offset_in_content_ = TextIterator::RangeLength(
+      backwards_iterator.EndPosition(), end_position, behavior);
   content_range_ = Range::Create(*document, backwards_iterator.EndPosition(),
                                  forward_range.StartPosition());
   DCHECK(content_range_);
 }
 
 String SurroundingText::Content() const {
   if (content_range_) {
     // SurroundingText is created with clean layout and must not be stored
     // through DOM or style changes, so layout must still be clean here.
     DCHECK(!content_range_->OwnerDocument().NeedsLayoutTreeUpdate());
     return content_range_->GetText();
   }
   return String();
 }
 
 unsigned SurroundingText::StartOffsetInContent() const {
   return start_offset_in_content_;
 }
 
 unsigned SurroundingText::EndOffsetInContent() const {
   return end_offset_in_content_;
 }
 
 }  // namespace blink