Commit 11d11592 authored by Ryan Landay's avatar Ryan Landay Committed by Commit Bot

Simplify some code using SelectionTemplate::ComputeRange()

I added a helper method, SelectionTemplate::ComputeRange() in this CL:
https://chromium-review.googlesource.com/c/chromium/src/+/806439

This CL migrates some callers over to using this new method.

Change-Id: I44557d6fb5b401d1e3ca066612b11ad57be27d82
Reviewed-on: https://chromium-review.googlesource.com/808753Reviewed-by: default avataryosin (OOO Dec 11 to Jan 8) <yosin@chromium.org>
Commit-Queue: Ryan Landay <rlanday@chromium.org>
Cr-Commit-Position: refs/heads/master@{#522009}
parent b6fe6f28
...@@ -288,9 +288,8 @@ class ShadowBoundaryAdjuster final { ...@@ -288,9 +288,8 @@ class ShadowBoundaryAdjuster final {
template <typename Strategy> template <typename Strategy>
static SelectionTemplate<Strategy> AdjustSelection( static SelectionTemplate<Strategy> AdjustSelection(
const SelectionTemplate<Strategy>& granularity_adjusted_selection) { const SelectionTemplate<Strategy>& granularity_adjusted_selection) {
const EphemeralRangeTemplate<Strategy> expanded_range( const EphemeralRangeTemplate<Strategy> expanded_range =
granularity_adjusted_selection.ComputeStartPosition(), granularity_adjusted_selection.ComputeRange();
granularity_adjusted_selection.ComputeEndPosition());
const EphemeralRangeTemplate<Strategy> shadow_adjusted_range = const EphemeralRangeTemplate<Strategy> shadow_adjusted_range =
granularity_adjusted_selection.IsBaseFirst() granularity_adjusted_selection.IsBaseFirst()
...@@ -503,9 +502,8 @@ class EditingBoundaryAdjuster final { ...@@ -503,9 +502,8 @@ class EditingBoundaryAdjuster final {
static SelectionTemplate<Strategy> AdjustSelection( static SelectionTemplate<Strategy> AdjustSelection(
const SelectionTemplate<Strategy>& shadow_adjusted_selection) { const SelectionTemplate<Strategy>& shadow_adjusted_selection) {
// TODO(editing-dev): Refactor w/o EphemeralRange. // TODO(editing-dev): Refactor w/o EphemeralRange.
const EphemeralRangeTemplate<Strategy> shadow_adjusted_range( const EphemeralRangeTemplate<Strategy> shadow_adjusted_range =
shadow_adjusted_selection.ComputeStartPosition(), shadow_adjusted_selection.ComputeRange();
shadow_adjusted_selection.ComputeEndPosition());
const EphemeralRangeTemplate<Strategy> editing_adjusted_range = const EphemeralRangeTemplate<Strategy> editing_adjusted_range =
AdjustSelectionToAvoidCrossingEditingBoundaries( AdjustSelectionToAvoidCrossingEditingBoundaries(
shadow_adjusted_range, shadow_adjusted_selection.Base()); shadow_adjusted_range, shadow_adjusted_selection.Base());
......
...@@ -27,10 +27,8 @@ class SimplifiedBackwardsTextIteratorTest : public EditingTestBase { ...@@ -27,10 +27,8 @@ class SimplifiedBackwardsTextIteratorTest : public EditingTestBase {
const SelectionInDOMTree selection = SetSelectionTextToBody(selection_text); const SelectionInDOMTree selection = SetSelectionTextToBody(selection_text);
StringBuilder builder; StringBuilder builder;
bool is_first = true; bool is_first = true;
for (SimplifiedBackwardsTextIterator iterator( for (SimplifiedBackwardsTextIterator iterator(selection.ComputeRange(),
EphemeralRange(selection.ComputeStartPosition(), behavior);
selection.ComputeEndPosition()),
behavior);
!iterator.AtEnd(); iterator.Advance()) { !iterator.AtEnd(); iterator.Advance()) {
BackwardsTextBuffer buffer; BackwardsTextBuffer buffer;
iterator.CopyTextTo(&buffer); iterator.CopyTextTo(&buffer);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment