summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/core/editing/ephemeral_range.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2021-05-20 09:47:09 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2021-06-07 11:15:42 +0000
commit189d4fd8fad9e3c776873be51938cd31a42b6177 (patch)
tree6497caeff5e383937996768766ab3bb2081a40b2 /chromium/third_party/blink/renderer/core/editing/ephemeral_range.cc
parent8bc75099d364490b22f43a7ce366b366c08f4164 (diff)
downloadqtwebengine-chromium-189d4fd8fad9e3c776873be51938cd31a42b6177.tar.gz
BASELINE: Update Chromium to 90.0.4430.221
Change-Id: Iff4d9d18d2fcf1a576f3b1f453010f744a232920 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/core/editing/ephemeral_range.cc')
-rw-r--r--chromium/third_party/blink/renderer/core/editing/ephemeral_range.cc12
1 files changed, 1 insertions, 11 deletions
diff --git a/chromium/third_party/blink/renderer/core/editing/ephemeral_range.cc b/chromium/third_party/blink/renderer/core/editing/ephemeral_range.cc
index 1d193eb467a..d95b3918b26 100644
--- a/chromium/third_party/blink/renderer/core/editing/ephemeral_range.cc
+++ b/chromium/third_party/blink/renderer/core/editing/ephemeral_range.cc
@@ -27,7 +27,7 @@ EphemeralRangeTemplate<Strategy>::EphemeralRangeTemplate(
const PositionTemplate<Strategy>& start,
const PositionTemplate<Strategy>& end)
: start_position_(start),
- end_position_(end)
+ end_position_(start.IsEquivalent(end) ? start : end)
#if DCHECK_IS_ON()
,
dom_tree_version_(start.IsNull() ? 0
@@ -212,16 +212,6 @@ std::ostream& operator<<(std::ostream& ostream,
EphemeralRangeInFlatTree ToEphemeralRangeInFlatTree(
const EphemeralRange& range) {
- // We need to update the distribution before getting the position in the flat
- // tree, since that operation requires us to navigate the flat tree.
- if (range.StartPosition().AnchorNode()) {
- range.StartPosition()
- .AnchorNode()
- ->UpdateDistributionForFlatTreeTraversal();
- }
- if (range.EndPosition().AnchorNode()) {
- range.EndPosition().AnchorNode()->UpdateDistributionForFlatTreeTraversal();
- }
PositionInFlatTree start = ToPositionInFlatTree(range.StartPosition());
PositionInFlatTree end = ToPositionInFlatTree(range.EndPosition());
if (start.IsNull() || end.IsNull() ||