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

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

Index: third_party/WebKit/Source/core/editing/SelectionTemplate.cpp
diff --git a/third_party/WebKit/Source/core/editing/SelectionTemplate.cpp b/third_party/WebKit/Source/core/editing/SelectionTemplate.cpp
index 231e94cf12f5cb2cd05315e4b0e661067bce0ae5..1f5ae27d5945102822f0fa2f596fcfd75d53c40e 100644
--- a/third_party/WebKit/Source/core/editing/SelectionTemplate.cpp
+++ b/third_party/WebKit/Source/core/editing/SelectionTemplate.cpp
@@ -82,6 +82,18 @@ const PositionTemplate<Strategy>& SelectionTemplate<Strategy>::Extent() const {
 }
 
 template <typename Strategy>
+bool SelectionTemplate<Strategy>::IsCaret() const {
+  return base_.IsNotNull() && base_ == extent_ &&
+         granularity_ == kCharacterGranularity;
+}
+
+template <typename Strategy>
+bool SelectionTemplate<Strategy>::IsRange() const {
+  return base_ != extent_ ||
+         (base_.IsNotNull() && granularity_ != kCharacterGranularity);
+}
+
+template <typename Strategy>
 bool SelectionTemplate<Strategy>::AssertValidFor(
     const Document& document) const {
   if (!AssertValid())