Changeset 32443 in webkit

Timestamp:

Apr 23, 2008, 11:25:10 AM (17 years ago)

Author:

justin.garcia@apple.com

Message:

WebCore:

2008-04-23 Justin Garcia <​justin.garcia@apple.com>

Reviewed by Darin Adler.

<rdar://problem/5825350> OWA: Caret disappears when navigating with arrows keys in contenteditable div

• editing/htmlediting.cpp: (WebCore::firstEditablePositionAfterPositionInRoot): Return a null VisiblePosition if this function moves out of highestRoot. Re-wrote so as to not duplicate code inside and outside of the while loop. (WebCore::lastEditablePositionBeforePositionInRoot): Ditto.

LayoutTests:

2008-04-23 Justin Garcia <​justin.garcia@apple.com>

Reviewed by Darin Adler.

<rdar://problem/5825350> OWA: Caret disappears when navigating with arrows keys in contenteditable div

• editing/selection/5825350-1-expected.txt: Added.
• editing/selection/5825350-1.html: Added.
• editing/selection/5825350-2-expected.txt: Added.
• editing/selection/5825350-2.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/selection/5825350-1-expected.txt (added)
• LayoutTests/editing/selection/5825350-1.html (added)
• LayoutTests/editing/selection/5825350-2-expected.txt (added)
• LayoutTests/editing/selection/5825350-2.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/htmlediting.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-04-23  Justin Garcia  <justin.garcia@apple.com>
+
+        Reviewed by Darin Adler.
+
+        <rdar://problem/5825350> OWA: Caret disappears when navigating with arrows keys in contenteditable div
+
+        * editing/selection/5825350-1-expected.txt: Added.
+        * editing/selection/5825350-1.html: Added.
+        * editing/selection/5825350-2-expected.txt: Added.
+        * editing/selection/5825350-2.html: Added.
+
 2008-04-23  Darin Adler  <darin@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-04-23  Justin Garcia  <justin.garcia@apple.com>
+
+        Reviewed by Darin Adler.
+
+        <rdar://problem/5825350> OWA: Caret disappears when navigating with arrows keys in contenteditable div
+
+        * editing/htmlediting.cpp:
+        (WebCore::firstEditablePositionAfterPositionInRoot): Return a null VisiblePosition if
+        this function moves out of highestRoot.  Re-wrote so as to not duplicate code inside
+        and outside of the while loop.
+        (WebCore::lastEditablePositionBeforePositionInRoot): Ditto.
+
 2008-04-23  Daniel Zucker  <zucker@wake3.com>
 

trunk/WebCore/editing/htmlediting.cpp

@@ -243 +243 @@
 VisiblePosition firstEditablePositionAfterPositionInRoot(const Position& position, Node* highestRoot)
 {
+    // position falls before highestRoot.
     if (comparePositions(position, Position(highestRoot, 0)) == -1 && highestRoot->isContentEditable())
         return VisiblePosition(Position(highestRoot, 0));
-    
-    Position p = nextVisuallyDistinctCandidate(position);
-    Node* root = editableRootForPosition(position);
-    Node* shadowAncestor = root ? root->shadowAncestorNode() : 0;
-    if (p.isNull() && root && (shadowAncestor != root))
-        p = Position(shadowAncestor, maxDeepOffset(shadowAncestor));
-    while (p.isNotNull() && !isEditablePosition(p) && p.node()->isDescendantOf(highestRoot)) {
+        
+    Position p = position;
+    
+    if (Node* shadowAncestor = p.node()->shadowAncestorNode())
+        if (shadowAncestor != p.node())
+            p = Position(shadowAncestor, maxDeepOffset(shadowAncestor));
+    
+    while (p.node() && !isEditablePosition(p) && p.node()->isDescendantOf(highestRoot))
         p = isAtomicNode(p.node()) ? positionAfterNode(p.node()) : nextVisuallyDistinctCandidate(p);
-        
-        root = editableRootForPosition(position);
-        shadowAncestor = root ? root->shadowAncestorNode() : 0;
-        if (p.isNull() && root && (shadowAncestor != root))
-            p = Position(shadowAncestor, maxDeepOffset(shadowAncestor));
-    }
-
+    
+    if (p.node() && !p.node()->isDescendantOf(highestRoot))
+        return VisiblePosition();
+    
     return VisiblePosition(p);
 }
@@ -265 +264 @@
 VisiblePosition lastEditablePositionBeforePositionInRoot(const Position& position, Node* highestRoot)
 {
+    // When position falls after highestRoot, the result is easy to compute.
     if (comparePositions(position, Position(highestRoot, maxDeepOffset(highestRoot))) == 1)
         return VisiblePosition(Position(highestRoot, maxDeepOffset(highestRoot)));
-    
-    Position p = previousVisuallyDistinctCandidate(position);
-    Node* root = editableRootForPosition(position);
-    Node* shadowAncestor = root ? root->shadowAncestorNode() : 0;
-    if (p.isNull() && root && (shadowAncestor != root))
-        p = Position(shadowAncestor, 0);
-    while (p.isNotNull() && !isEditablePosition(p) && p.node()->isDescendantOf(highestRoot)) {
+        
+    Position p = position;
+    
+    if (Node* shadowAncestor = p.node()->shadowAncestorNode())
+        if (shadowAncestor != p.node())
+            p = Position(shadowAncestor, 0);
+    
+    while (p.node() && !isEditablePosition(p) && p.node()->isDescendantOf(highestRoot))
         p = isAtomicNode(p.node()) ? positionBeforeNode(p.node()) : previousVisuallyDistinctCandidate(p);
-        
-        root = editableRootForPosition(position);
-        shadowAncestor = root ? root->shadowAncestorNode() : 0;
-        if (p.isNull() && root && (shadowAncestor != root))
-            p = Position(shadowAncestor, 0);
-    }
-
+    
+    if (p.node() && !p.node()->isDescendantOf(highestRoot))
+        return VisiblePosition();
+    
     return VisiblePosition(p);
 }