Allow selection to skip over contenteditable

Source/core/editing/VisiblePosition.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Portions Copyright (c) 2011 Motorola Mobility, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 51 matching lines @@
 
     m_deepPosition = canonicalPosition(position);
 
     // When not at a line wrap, make sure to end up with DOWNSTREAM affinity.
     if (m_affinity == UPSTREAM && (isNull() || inSameLine(VisiblePosition(position, DOWNSTREAM), *this)))
         m_affinity = DOWNSTREAM;
 }
 
 VisiblePosition VisiblePosition::next(EditingBoundaryCrossingRule rule) const
 {
-    // FIXME: Support CanSkipEditingBoundary
-    ASSERT(rule == CanCrossEditingBoundary || rule == CannotCrossEditingBoundary);
     VisiblePosition next(nextVisuallyDistinctCandidate(m_deepPosition), m_affinity);
 
-    if (rule == CanCrossEditingBoundary)
+    switch (rule) {
+    case CanCrossEditingBoundary:
         return next;
-
-    return honorEditingBoundaryAtOrAfter(next);
+    case CannotCrossEditingBoundary:
+        return honorEditingBoundaryAtOrAfter(next);
+    case CanSkipOverEditingBoundary:
+        return skipToEndOfEditingBoundary(next);
+    }
 }

[yosin_UTC9, 2013/09/06 01:31:15]

Please fix compilation error, visibleposition.cpp(82) : warning C4715:
'WebCore::VisiblePosition::next' : not all control paths return a value.

 
 VisiblePosition VisiblePosition::previous(EditingBoundaryCrossingRule rule) const
 {
-    // FIXME: Support CanSkipEditingBoundary
-    ASSERT(rule == CanCrossEditingBoundary || rule == CannotCrossEditingBoundary);
-    // find first previous DOM position that is visible
     Position pos = previousVisuallyDistinctCandidate(m_deepPosition);
 
     // return null visible position if there is no previous visible position
     if (pos.atStartOfTree())
         return VisiblePosition();
 
     VisiblePosition prev = VisiblePosition(pos, DOWNSTREAM);
     ASSERT(prev != *this);
 
 #ifndef NDEBUG
     // we should always be able to make the affinity DOWNSTREAM, because going previous from an
     // UPSTREAM position can never yield another UPSTREAM position (unless line wrap length is 0!).
     if (prev.isNotNull() && m_affinity == UPSTREAM) {
         VisiblePosition temp = prev;
         temp.setAffinity(UPSTREAM);
         ASSERT(inSameLine(temp, prev));
     }
 #endif
 
-    if (rule == CanCrossEditingBoundary)
+    switch (rule) {
+    case CanCrossEditingBoundary:
         return prev;
-
-    return honorEditingBoundaryAtOrBefore(prev);
+    case CannotCrossEditingBoundary:
+        return honorEditingBoundaryAtOrBefore(prev);
+    case CanSkipOverEditingBoundary:
+        return skipToStartOfEditingBoundary(prev);
+    }

[yosin_UTC9, 2013/09/06 01:31:15]

Please fix compilation error: visibleposition.cpp(113) : warning C4715:
'WebCore::VisiblePosition::previous' : not all control paths return a value

[dmazzoni, 2013/09/06 07:29:26]

Done, added assert_not_reached and same below.

 }
 
 Position VisiblePosition::leftVisuallyDistinctCandidate() const
 {
     Position p = m_deepPosition;
     if (p.isNull())
         return Position();
 
     Position downstreamStart = p.downstream();
     TextDirection primaryDirection = p.primaryDirection();
@@ skipping 367 matching lines @@
 
     // Return empty position if this position is non-editable, but pos is editable
     // FIXME: Move to the next non-editable region.
     if (!highestRoot)
         return VisiblePosition();
 
     // Return the next position after pos that is in the same editable region as this position
     return firstEditablePositionAfterPositionInRoot(pos.deepEquivalent(), highestRoot);
 }
 
+VisiblePosition VisiblePosition::skipToStartOfEditingBoundary(const VisiblePosition &pos) const
+{
+    if (pos.isNull())
+        return pos;
+
+    Node* highestRoot = highestEditableRoot(deepEquivalent());
+    Node* highestRootOfPos = highestEditableRoot(pos.deepEquivalent());
+
+    // Return pos itself if the two are from the very same editable region, or both are non-editable.
+    if (highestRootOfPos == highestRoot)
+        return pos;
+
+    // If |pos| has an editable root, skip to the start
+    if (highestRootOfPos)
+        return previousVisuallyDistinctCandidate(Position(highestRootOfPos, Position::PositionIsBeforeAnchor).parentAnchoredEquivalent());
+
+    // That must mean that |pos| is not editable. Return the last position before pos that is in the same editable region as this position
+    return lastEditablePositionBeforePositionInRoot(pos.deepEquivalent(), highestRoot);
+}
+
+VisiblePosition VisiblePosition::skipToEndOfEditingBoundary(const VisiblePosition &pos) const
+{
+    if (pos.isNull())
+        return pos;
+
+    Node* highestRoot = highestEditableRoot(deepEquivalent());
+    Node* highestRootOfPos = highestEditableRoot(pos.deepEquivalent());
+
+    // Return pos itself if the two are from the very same editable region, or both are non-editable.
+    if (highestRootOfPos == highestRoot)
+        return pos;
+
+    // If |pos| has an editable root, skip to the end
+    if (highestRootOfPos)
+        return Position(highestRootOfPos, Position::PositionIsAfterAnchor).parentAnchoredEquivalent();
+
+    // That must mean that |pos| is not editable. Return the next position after pos that is in the same editable region as this position
+    return firstEditablePositionAfterPositionInRoot(pos.deepEquivalent(), highestRoot);
+}
+
 static Position canonicalizeCandidate(const Position& candidate)
 {
     if (candidate.isNull())
         return Position();
     ASSERT(candidate.isCandidate());
     Position upstream = candidate.upstream();
     if (upstream.isCandidate())
         return upstream;
     return candidate;
 }
@@ skipping 247 matching lines @@
     if (vpos)
         vpos->showTreeForThis();
 }
 
 void showTree(const WebCore::VisiblePosition& vpos)
 {
     vpos.showTreeForThis();
 }
 
 #endif