Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(754)

Unified Diff: Source/core/editing/FrameSelection.cpp

Issue 20572005: Allow selection to skip over contenteditable (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Add new test, address feedback Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/editing/FrameSelection.cpp
diff --git a/Source/core/editing/FrameSelection.cpp b/Source/core/editing/FrameSelection.cpp
index 01abde535b30039e12a22e6cbd991a5b7ae789fa..b0bcc8f56868b2b063c4d93be2fe00d6a9d0cd0d 100644
--- a/Source/core/editing/FrameSelection.cpp
+++ b/Source/core/editing/FrameSelection.cpp
@@ -576,9 +576,9 @@ VisiblePosition FrameSelection::modifyExtendingRight(TextGranularity granularity
switch (granularity) {
case CharacterGranularity:
if (directionOfEnclosingBlock() == LTR)
- pos = pos.next(CannotCrossEditingBoundary);
+ pos = pos.next(CanSkipOverEditingBoundary);
else
- pos = pos.previous(CannotCrossEditingBoundary);
+ pos = pos.previous(CanSkipOverEditingBoundary);
break;
case WordGranularity:
if (directionOfEnclosingBlock() == LTR)
@@ -611,7 +611,7 @@ VisiblePosition FrameSelection::modifyExtendingForward(TextGranularity granulari
VisiblePosition pos(m_selection.extent(), m_selection.affinity());
switch (granularity) {
case CharacterGranularity:
- pos = pos.next(CannotCrossEditingBoundary);
+ pos = pos.next(CanSkipOverEditingBoundary);
break;
case WordGranularity:
pos = nextWordPositionForPlatform(pos);
@@ -689,7 +689,7 @@ VisiblePosition FrameSelection::modifyMovingForward(TextGranularity granularity)
if (isRange())
pos = VisiblePosition(m_selection.end(), m_selection.affinity());
else
- pos = VisiblePosition(m_selection.extent(), m_selection.affinity()).next(CannotCrossEditingBoundary);
+ pos = VisiblePosition(m_selection.extent(), m_selection.affinity()).next(CanSkipOverEditingBoundary);
break;
case WordGranularity:
pos = nextWordPositionForPlatform(VisiblePosition(m_selection.extent(), m_selection.affinity()));
@@ -740,9 +740,9 @@ VisiblePosition FrameSelection::modifyExtendingLeft(TextGranularity granularity)
switch (granularity) {
case CharacterGranularity:
if (directionOfEnclosingBlock() == LTR)
- pos = pos.previous(CannotCrossEditingBoundary);
+ pos = pos.previous(CanSkipOverEditingBoundary);
else
- pos = pos.next(CannotCrossEditingBoundary);
+ pos = pos.next(CanSkipOverEditingBoundary);
break;
case WordGranularity:
if (directionOfEnclosingBlock() == LTR)
@@ -779,7 +779,7 @@ VisiblePosition FrameSelection::modifyExtendingBackward(TextGranularity granular
// over everything.
switch (granularity) {
case CharacterGranularity:
- pos = pos.previous(CannotCrossEditingBoundary);
+ pos = pos.previous(CanSkipOverEditingBoundary);
break;
case WordGranularity:
pos = previousWordPosition(pos);
@@ -856,7 +856,7 @@ VisiblePosition FrameSelection::modifyMovingBackward(TextGranularity granularity
if (isRange())
pos = VisiblePosition(m_selection.start(), m_selection.affinity());
else
- pos = VisiblePosition(m_selection.extent(), m_selection.affinity()).previous(CannotCrossEditingBoundary);
+ pos = VisiblePosition(m_selection.extent(), m_selection.affinity()).previous(CanSkipOverEditingBoundary);
break;
case WordGranularity:
pos = previousWordPosition(VisiblePosition(m_selection.extent(), m_selection.affinity()));

Powered by Google App Engine
This is Rietveld 408576698