Merge "Selection API: type attribute should return 'Range' for range-selection in text controls." t…

third_party/WebKit/Source/core/editing/SelectionTemplate.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef SelectionTemplate_h
 #define SelectionTemplate_h
 
 #include <iosfwd>
 #include "base/macros.h"
 #include "core/CoreExport.h"
@@ skipping 70 matching lines @@
   SelectionTemplate& operator=(const SelectionTemplate&) = default;
 
   bool operator==(const SelectionTemplate&) const;
   bool operator!=(const SelectionTemplate&) const;
 
   const PositionTemplate<Strategy>& Base() const;
   const PositionTemplate<Strategy>& Extent() const;
   TextAffinity Affinity() const { return affinity_; }
   TextGranularity Granularity() const { return granularity_; }
   bool HasTrailingWhitespace() const { return has_trailing_whitespace_; }
-  bool IsCaret() const { return base_.IsNotNull() && base_ == extent_; }
+  bool IsCaret() const;
   bool IsDirectional() const { return is_directional_; }
   bool IsHandleVisible() const { return is_handle_visible_; }
   bool IsNone() const { return base_.IsNull(); }
-  bool IsRange() const { return base_ != extent_; }
+  bool IsRange() const;
 
   // Returns true if |this| selection holds valid values otherwise it causes
   // assertion failure.
   bool AssertValid() const;
   bool AssertValidFor(const Document&) const;
 
   const PositionTemplate<Strategy>& ComputeEndPosition() const;
   const PositionTemplate<Strategy>& ComputeStartPosition() const;
 
   // Returns |SelectionType| for |this| based on |m_base| and |m_extent|
@@ skipping 34 matching lines @@
 
 using SelectionInDOMTree = SelectionTemplate<EditingStrategy>;
 using SelectionInFlatTree = SelectionTemplate<EditingInFlatTreeStrategy>;
 
 CORE_EXPORT std::ostream& operator<<(std::ostream&, const SelectionInDOMTree&);
 CORE_EXPORT std::ostream& operator<<(std::ostream&, const SelectionInFlatTree&);
 
 }  // namespace blink
 
 #endif  // SelectionTemplate_h