Get rid of VisibleSelectionTemplate::has_trailing_whitespace_

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

 /*
  * Copyright (C) 2004, 2005, 2006 Apple Computer, 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 28 matching lines @@
 #include "platform/wtf/text/StringBuilder.h"
 
 namespace blink {
 
 template <typename Strategy>
 VisibleSelectionTemplate<Strategy>::VisibleSelectionTemplate()
     : affinity_(TextAffinity::kDownstream),
       selection_type_(kNoSelection),
       base_is_first_(true),
       is_directional_(false),
-      granularity_(kCharacterGranularity),
-      has_trailing_whitespace_(false) {}
+      granularity_(kCharacterGranularity) {}
 
 template <typename Strategy>
 VisibleSelectionTemplate<Strategy>::VisibleSelectionTemplate(
     const SelectionTemplate<Strategy>& selection)
     : base_(selection.Base()),
       extent_(selection.Extent()),
       affinity_(selection.Affinity()),
       selection_type_(kNoSelection),
       is_directional_(selection.IsDirectional()),
-      granularity_(selection.Granularity()),
-      has_trailing_whitespace_(selection.HasTrailingWhitespace()) {
+      granularity_(selection.Granularity()) {
   Validate(granularity_);
 }
 
 template <typename Strategy>
 VisibleSelectionTemplate<Strategy> VisibleSelectionTemplate<Strategy>::Create(
     const SelectionTemplate<Strategy>& selection) {
   return VisibleSelectionTemplate(selection);
 }
 
 VisibleSelection CreateVisibleSelection(const SelectionInDOMTree& selection) {
@@ skipping 25 matching lines @@
 VisibleSelectionTemplate<Strategy>::VisibleSelectionTemplate(
     const VisibleSelectionTemplate<Strategy>& other)
     : base_(other.base_),
       extent_(other.extent_),
       start_(other.start_),
       end_(other.end_),
       affinity_(other.affinity_),
       selection_type_(other.selection_type_),
       base_is_first_(other.base_is_first_),
       is_directional_(other.is_directional_),
-      granularity_(other.granularity_),
-      has_trailing_whitespace_(other.has_trailing_whitespace_) {}
+      granularity_(other.granularity_) {}
 
 template <typename Strategy>
 VisibleSelectionTemplate<Strategy>& VisibleSelectionTemplate<Strategy>::
 operator=(const VisibleSelectionTemplate<Strategy>& other) {
   base_ = other.base_;
   extent_ = other.extent_;
   start_ = other.start_;
   end_ = other.end_;
   affinity_ = other.affinity_;
   selection_type_ = other.selection_type_;
   base_is_first_ = other.base_is_first_;
   is_directional_ = other.is_directional_;
   granularity_ = other.granularity_;
-  has_trailing_whitespace_ = other.has_trailing_whitespace_;
   return *this;
 }
 
 template <typename Strategy>
 SelectionTemplate<Strategy> VisibleSelectionTemplate<Strategy>::AsSelection()
     const {
   typename SelectionTemplate<Strategy>::Builder builder;
   if (base_.IsNotNull())
     builder.SetBaseAndExtent(base_, extent_);
   return builder.SetAffinity(affinity_)
       .SetGranularity(granularity_)
       .SetIsDirectional(is_directional_)
-      .SetHasTrailingWhitespace(has_trailing_whitespace_)
       .Build();
 }
 
 EphemeralRange FirstEphemeralRangeOf(const VisibleSelection& selection) {
   if (selection.IsNone())
     return EphemeralRange();
   Position start = selection.Start().ParentAnchoredEquivalent();
   Position end = selection.End().ParentAnchoredEquivalent();
   return EphemeralRange(start, end);
 }
@@ skipping 38 matching lines @@
 VisibleSelectionTemplate<Strategy>::AppendTrailingWhitespace() const {
   if (IsNone())
     return *this;
   DCHECK_EQ(granularity_, kWordGranularity);
   if (!IsRange())
     return *this;
   const PositionTemplate<Strategy>& new_end = SkipWhitespace(end_);
   if (end_ == new_end)
     return *this;
   VisibleSelectionTemplate<Strategy> result = *this;
-  result.has_trailing_whitespace_ = true;

[yoichio, 2017/07/05 01:42:19]

|has_trailing_whitespace_| would not be |true| unless calling
|AppendTrailingWhiteSpace| but it is only called when 
|has_trailing_whitespace_| is |true|.
lgtm

   result.end_ = new_end;
   return result;
 }
 
 template <typename Strategy>
 void VisibleSelectionTemplate<Strategy>::SetBaseAndExtentToDeepEquivalents() {
   // Move the selection to rendered positions, if possible.
   bool base_and_extent_equal = base_ == extent_;
   if (base_.IsNotNull()) {
     base_ = CreateVisiblePosition(base_, affinity_).DeepEquivalent();
@@ skipping 201 matching lines @@
   if (selection_type_ != kCaretSelection)
     affinity_ = TextAffinity::kDownstream;
 }
 
 template <typename Strategy>
 void VisibleSelectionTemplate<Strategy>::Validate(TextGranularity granularity) {
   DCHECK(!NeedsLayoutTreeUpdate(base_));
   DCHECK(!NeedsLayoutTreeUpdate(extent_));
   // TODO(xiaochengh): Add a DocumentLifecycle::DisallowTransitionScope here.
 
-  granularity_ = granularity;
-  if (granularity_ != kWordGranularity)
-    has_trailing_whitespace_ = false;
   SetBaseAndExtentToDeepEquivalents();
   if (base_.IsNull() || extent_.IsNull()) {
     base_ = extent_ = start_ = end_ = PositionTemplate<Strategy>();
     UpdateSelectionType();
     return;
   }
 
   const PositionTemplate<Strategy> start = base_is_first_ ? base_ : extent_;
   const PositionTemplate<Strategy> new_start =
       ComputeStartRespectingGranularity(
@@ skipping 17 matching lines @@
     // it is useful to make to make the selection "canonical" (if only for
     // purposes of comparing selections). This is an ideal point of the code
     // to do this operation, since all selection changes that result in a
     // RANGE come through here before anyone uses it.
     // TODO(yosin) Canonicalizing is good, but haven't we already done it
     // (when we set these two positions to |VisiblePosition|
     // |deepEquivalent()|s above)?
     start_ = MostForwardCaretPosition(start_);
     end_ = MostBackwardCaretPosition(end_);
   }
-  if (!has_trailing_whitespace_)
-    return;
-  *this = AppendTrailingWhitespace();
 }
 
 template <typename Strategy>
 bool VisibleSelectionTemplate<Strategy>::IsValidFor(
     const Document& document) const {
   if (IsNone())
     return true;
 
   return base_.GetDocument() == &document && !base_.IsOrphan() &&
          !extent_.IsOrphan() && !start_.IsOrphan() && !end_.IsOrphan();
@@ skipping 310 matching lines @@
 
 void showTree(const blink::VisibleSelectionInFlatTree& sel) {
   sel.ShowTreeForThis();
 }
 
 void showTree(const blink::VisibleSelectionInFlatTree* sel) {
   if (sel)
     sel->ShowTreeForThis();
 }
 #endif