Changeset 22037 in webkit

Timestamp:

Jun 6, 2007, 8:11:34 PM (18 years ago)

Author:

justing

Message:

LayoutTests:

Reviewed by Harrison.

<rdar://problem/4889598> Problems with moveDown: and moveUp: in Notes with ToDos

• editing/selection/4889598-expected.checksum: Added.
• editing/selection/4889598-expected.png: Added.
• editing/selection/4889598-expected.txt: Added.
• editing/selection/4889598.html: Added.

WebCore:

Reviewed by Harrison.

<rdar://problem/4889598> Problems with moveDown: and moveUp: in Notes with ToDos

The caret would disappear when moving from content above or below
a ToDo if that ToDo doesn't have any content in it with the same
x position as the caret. That's because closestLeafChildForXPos
would return non-editable leaves, and which turn into non-editable
VisiblePositions, which are invisible.

• editing/visible_units.cpp: (WebCore::previousLinePosition): Ask closestLeafForXPos to only return editable leaves. (WebCore::nextLinePosition): Ditto.
• rendering/RootInlineBox.cpp: (WebCore::isEditableLeaf): Added. (WebCore::RootInlineBox::closestLeafChildForXPos): If requested, return the closest editable leaf. Removed an early return if the position is before the first leaf, it's not really much of an optimization.
• rendering/RootInlineBox.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/selection/4889598-expected.checksum (added)
• LayoutTests/editing/selection/4889598-expected.png (added)
• LayoutTests/editing/selection/4889598-expected.txt (added)
• LayoutTests/editing/selection/4889598.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/visible_units.cpp (modified) (2 diffs)
• WebCore/rendering/RootInlineBox.cpp (modified) (2 diffs)
• WebCore/rendering/RootInlineBox.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-06-06  Justin Garcia  <justin.garcia@apple.com>
+
+        Reviewed by Harrison.
+
+        <rdar://problem/4889598> Problems with moveDown: and moveUp: in Notes with ToDos
+
+        * editing/selection/4889598-expected.checksum: Added.
+        * editing/selection/4889598-expected.png: Added.
+        * editing/selection/4889598-expected.txt: Added.
+        * editing/selection/4889598.html: Added.
+
 2007-06-06  Sam Weinig  <sam@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-06-06  Justin Garcia  <justin.garcia@apple.com>
+
+        Reviewed by Harrison.
+
+        <rdar://problem/4889598> Problems with moveDown: and moveUp: in Notes with ToDos
+        
+        The caret would disappear when moving from content above or below
+        a ToDo if that ToDo doesn't have any content in it with the same
+        x position as the caret. That's because closestLeafChildForXPos
+        would return non-editable leaves, and which turn into non-editable
+        VisiblePositions, which are invisible.
+
+        * editing/visible_units.cpp:
+        (WebCore::previousLinePosition): Ask closestLeafForXPos to only
+        return editable leaves.
+        (WebCore::nextLinePosition): Ditto.
+        * rendering/RootInlineBox.cpp:
+        (WebCore::isEditableLeaf): Added.
+        (WebCore::RootInlineBox::closestLeafChildForXPos): If requested,
+        return the closest editable leaf. Removed an early return if the
+        position is before the first leaf, it's not really much of an
+        optimization.
+        * rendering/RootInlineBox.h:
+
 2007-06-06  Sam Weinig  <sam@webkit.org>
 

trunk/WebCore/editing/visible_units.cpp

@@ -433 +433 @@
         if (containingBlock->hasOverflowClip())
             containingBlock->layer()->subtractScrollOffset(absx, absy);
-        RenderObject *renderer = root->closestLeafChildForXPos(x - absx)->object();
+        RenderObject *renderer = root->closestLeafChildForXPos(x - absx, isEditablePosition(p))->object();
         Node* node = renderer->element();
         if (editingIgnoresContent(node))
@@ -503 +503 @@
         if (containingBlock->hasOverflowClip())
             containingBlock->layer()->subtractScrollOffset(absx, absy);
-        RenderObject *renderer = root->closestLeafChildForXPos(x - absx)->object();
+        RenderObject *renderer = root->closestLeafChildForXPos(x - absx, isEditablePosition(p))->object();
         Node* node = renderer->element();
         if (editingIgnoresContent(node))

trunk/WebCore/rendering/RootInlineBox.cpp

@@ -316 +316 @@
 }
 
-InlineBox* RootInlineBox::closestLeafChildForXPos(int x)
+bool isEditableLeaf(InlineBox* leaf)
+{
+    return leaf && leaf->object() && leaf->object()->element() && leaf->object()->element()->isContentEditable();
+}
+
+InlineBox* RootInlineBox::closestLeafChildForXPos(int x, bool onlyEditableLeaves)
 {
     InlineBox* firstLeaf = firstLeafChildAfterBox();
     InlineBox* lastLeaf = lastLeafChildBeforeBox();
-    if (firstLeaf == lastLeaf)
+    if (firstLeaf == lastLeaf && (!onlyEditableLeaves || isEditableLeaf(firstLeaf)))
         return firstLeaf;
 
     // Avoid returning a list marker when possible.
-    if (x <= firstLeaf->m_x && !firstLeaf->object()->isListMarker())
+    if (x <= firstLeaf->m_x && !firstLeaf->object()->isListMarker() && (!onlyEditableLeaves || isEditableLeaf(firstLeaf)))
         // The x coordinate is less or equal to left edge of the firstLeaf.
         // Return it.
         return firstLeaf;
 
-    if (x >= lastLeaf->m_x + lastLeaf->m_width && !lastLeaf->object()->isListMarker())
+    if (x >= lastLeaf->m_x + lastLeaf->m_width && !lastLeaf->object()->isListMarker() && (!onlyEditableLeaves || isEditableLeaf(lastLeaf)))
         // The x coordinate is greater or equal to right edge of the lastLeaf.
         // Return it.
         return lastLeaf;
 
+    InlineBox* closestLeaf = lastLeaf;
     for (InlineBox* leaf = firstLeaf; leaf && leaf != lastLeaf; leaf = leaf->nextLeafChild()) {
-        if (!leaf->object()->isListMarker()) {
+        if (!leaf->object()->isListMarker() && (!onlyEditableLeaves || isEditableLeaf(leaf))) {
             int leafX = leaf->m_x;
+            closestLeaf = leaf;
             if (x < leafX + leaf->m_width)
                 // The x coordinate is less than the right edge of the box.
@@ -344 +351 @@
     }
 
-    return lastLeaf;
+    return closestLeaf;
 }
 

trunk/WebCore/rendering/RootInlineBox.h

@@ -121 +121 @@
     int selectionHeight() { return max(0, selectionBottom() - selectionTop()); }
 
-    InlineBox* closestLeafChildForXPos(int x);
+    InlineBox* closestLeafChildForXPos(int x, bool onlyEditableLeaves = false);
 
 protected: