| Index: third_party/WebKit/Source/core/editing/VisibleSelection.cpp
|
| diff --git a/third_party/WebKit/Source/core/editing/VisibleSelection.cpp b/third_party/WebKit/Source/core/editing/VisibleSelection.cpp
|
| index 10de17809978323ad42f64045dfc08a34b7fedb9..9714d1a59c76f4cf000be645a5fd137d87efd2a5 100644
|
| --- a/third_party/WebKit/Source/core/editing/VisibleSelection.cpp
|
| +++ b/third_party/WebKit/Source/core/editing/VisibleSelection.cpp
|
| @@ -217,7 +217,7 @@ void VisibleSelectionTemplate<Strategy>::SetBaseAndExtentToDeepEquivalents() {
|
| }
|
|
|
| template <typename Strategy>
|
| -static PositionTemplate<Strategy> ComputeStartRespectingGranularity(
|
| +static PositionTemplate<Strategy> ComputeStartRespectingGranularityAlgorithm(
|
| const PositionWithAffinityTemplate<Strategy>& passed_start,
|
| TextGranularity granularity) {
|
| DCHECK(passed_start.IsNotNull());
|
| @@ -276,8 +276,20 @@ static PositionTemplate<Strategy> ComputeStartRespectingGranularity(
|
| return passed_start.GetPosition();
|
| }
|
|
|
| +static Position ComputeStartRespectingGranularity(
|
| + const PositionWithAffinity& start,
|
| + TextGranularity granularity) {
|
| + return ComputeStartRespectingGranularityAlgorithm(start, granularity);
|
| +}
|
| +
|
| +PositionInFlatTree ComputeStartRespectingGranularity(
|
| + const PositionInFlatTreeWithAffinity& start,
|
| + TextGranularity granularity) {
|
| + return ComputeStartRespectingGranularityAlgorithm(start, granularity);
|
| +}
|
| +
|
| template <typename Strategy>
|
| -static PositionTemplate<Strategy> ComputeEndRespectingGranularity(
|
| +static PositionTemplate<Strategy> ComputeEndRespectingGranularityAlgorithm(
|
| const PositionTemplate<Strategy>& start,
|
| const PositionWithAffinityTemplate<Strategy>& passed_end,
|
| TextGranularity granularity) {
|
| @@ -392,6 +404,19 @@ static PositionTemplate<Strategy> ComputeEndRespectingGranularity(
|
| return passed_end.GetPosition();
|
| }
|
|
|
| +static Position ComputeEndRespectingGranularity(const Position& start,
|
| + const PositionWithAffinity& end,
|
| + TextGranularity granularity) {
|
| + return ComputeEndRespectingGranularityAlgorithm(start, end, granularity);
|
| +}
|
| +
|
| +PositionInFlatTree ComputeEndRespectingGranularity(
|
| + const PositionInFlatTree& start,
|
| + const PositionInFlatTreeWithAffinity& end,
|
| + TextGranularity granularity) {
|
| + return ComputeEndRespectingGranularityAlgorithm(start, end, granularity);
|
| +}
|
| +
|
| template <typename Strategy>
|
| void VisibleSelectionTemplate<Strategy>::UpdateSelectionType() {
|
| selection_type_ = ComputeSelectionType(start_, end_);
|
|
|