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

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: Rebase Created 7 years, 5 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 bd8ed462a8624d76bc6aa5a4b40fc00177d0adab..fa35a34c99396a45670fc6364c621be366eefa8c 100644
--- a/Source/core/editing/FrameSelection.cpp
+++ b/Source/core/editing/FrameSelection.cpp
@@ -624,9 +624,9 @@ VisiblePosition FrameSelection::modifyExtendingRight(TextGranularity granularity
switch (granularity) {
case CharacterGranularity:
if (directionOfEnclosingBlock() == LTR)
- pos = pos.next(CannotCrossEditingBoundary);
+ pos = pos.next(CanSkipOverEditingBoundary);
yosin_UTC9 2013/08/31 01:00:47 Should we pass CanSkipOverEditingBoundary for othe
dmazzoni 2013/09/05 07:57:29 Not needed. I updated the test to show that word a
yosin_UTC9 2013/09/05 08:42:48 Will be them in patch #3? I'm not sure why Line an
else
- pos = pos.previous(CannotCrossEditingBoundary);
+ pos = pos.previous(CanSkipOverEditingBoundary);
yosin_UTC9 2013/08/31 01:00:47 What happen if caret is at the end of text field?
dmazzoni 2013/09/05 07:57:29 Yes.
yosin_UTC9 2013/09/05 08:42:48 We want to have internals.getSelection() which ret
dmazzoni 2013/09/05 17:17:21 I think I figured out a solution using internals.y
break;
case WordGranularity:
if (directionOfEnclosingBlock() == LTR)
@@ -661,7 +661,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);
@@ -741,7 +741,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()));
@@ -792,9 +792,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)
@@ -833,7 +833,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);
@@ -912,7 +912,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