Changeset 98408 in webkit

Timestamp:

Oct 25, 2011, 4:17:59 PM (15 years ago)

Author:

rniwa@webkit.org

Message:

Moving to the start of line should not place the caret outside of the table
​https://bugs.webkit.org/show_bug.cgi?id=70757

Reviewed by Chang Shu.

Source/WebCore:

The bug was caused by positionAvoidingFirstPositionInTable. Get rid of the function.

Test: editing/selection/table-lineboundary.html

• editing/visible_units.cpp:

(WebCore::startPositionForLine):

LayoutTests:

Added a test to move the caret to lineboundaries in the first and the last table cell.
The caret should remain inside a table cell.

• editing/selection/table-lineboundary-expected.txt: Added.
• editing/selection/table-lineboundary.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/selection/table-lineboundary-expected.txt (added)
• LayoutTests/editing/selection/table-lineboundary.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/visible_units.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-10-25  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Moving to the start of line should not place the caret outside of the table
+        https://bugs.webkit.org/show_bug.cgi?id=70757
+
+        Reviewed by Chang Shu.
+
+        Added a test to move the caret to lineboundaries in the first and the last table cell.
+        The caret should remain inside a table cell.
+
+        * editing/selection/table-lineboundary-expected.txt: Added.
+        * editing/selection/table-lineboundary.html: Added.
+
 2011-10-25  Erik Arvidsson  <arv@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-25  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Moving to the start of line should not place the caret outside of the table
+        https://bugs.webkit.org/show_bug.cgi?id=70757
+
+        Reviewed by Chang Shu.
+
+        The bug was caused by positionAvoidingFirstPositionInTable. Get rid of the function.
+
+        Test: editing/selection/table-lineboundary.html
+
+        * editing/visible_units.cpp:
+        (WebCore::startPositionForLine):
+
 2011-10-25  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebCore/editing/visible_units.cpp

@@ -319 +319 @@
 // ---------
 
-static VisiblePosition positionAvoidingFirstPositionInTable(const VisiblePosition& c)
-{
-    // return table offset 0 instead of the first VisiblePosition inside the table
-    VisiblePosition previous = c.previous();
-    if (isLastPositionBeforeTable(previous) && isEditablePosition(previous.deepEquivalent()))
-        return previous;
-
-    return c;
-}
-    
-
 enum LineEndpointComputationMode { UseLogicalOrdering, UseInlineBoxOrdering };
 static VisiblePosition startPositionForLine(const VisiblePosition& c, LineEndpointComputationMode mode)
@@ -342 +331 @@
         Position p = c.deepEquivalent();
         if (p.deprecatedNode()->renderer() && p.deprecatedNode()->renderer()->isRenderBlock() && !p.deprecatedEditingOffset())
-            return positionAvoidingFirstPositionInTable(c);
-        
+            return c;
+
         return VisiblePosition();
     }
@@ -373 +362 @@
     }
 
-    if (startNode->isTextNode())
-        return positionAvoidingFirstPositionInTable(Position(static_cast<Text*>(startNode), toInlineTextBox(startBox)->start()));
-    return positionAvoidingFirstPositionInTable(positionBeforeNode(startNode));
+    return startNode->isTextNode() ? Position(static_cast<Text*>(startNode), toInlineTextBox(startBox)->start())
+        : positionBeforeNode(startNode);
 }