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

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: Work around minor platform differences in test 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
« no previous file with comments | « Source/core/dom/Position.cpp ('k') | Source/core/editing/VisiblePosition.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/editing/FrameSelection.cpp
diff --git a/Source/core/editing/FrameSelection.cpp b/Source/core/editing/FrameSelection.cpp
index ae20085bceb72ef1661800c4a2c4442cbe046b27..8f3cbe5137b8cd5c8a8bc29e3bd6a16fb64ce898 100644
--- a/Source/core/editing/FrameSelection.cpp
+++ b/Source/core/editing/FrameSelection.cpp
@@ -603,9 +603,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)
@@ -638,7 +638,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);
@@ -716,7 +716,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()));
@@ -767,9 +767,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)
@@ -806,7 +806,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);
@@ -883,7 +883,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()));
« no previous file with comments | « Source/core/dom/Position.cpp ('k') | Source/core/editing/VisiblePosition.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698