Changeset 84678 in webkit

Timestamp:

Apr 22, 2011 2:05:15 PM (13 years ago)

Author:

leviw@chromium.org

Message:

2011-04-22 Levi Weintraub <​leviw@chromium.org>

Reviewed by Ryosuke Niwa.

End/Home keys do not work in a contentEditable element
​https://bugs.webkit.org/show_bug.cgi?id=50564

Fixing modifying selection by lineboundary (home/end) for editable contexts that are
inline and share a line with non-editable content.

• editing/selection/modify-by-lineboundary-in-inline-editable-contexts-expected.txt: Added.
• editing/selection/modify-by-lineboundary-in-inline-editable-contexts.html: Added.
• editing/selection/script-tests/modify-by-lineboundary-in-inline-editable-contexts.js: Added. (testModifyByLine):

2011-04-22 Levi Weintraub <​leviw@chromium.org>

Reviewed by Ryosuke Niwa.

End/Home keys do not work in a contentEditable element
​https://bugs.webkit.org/show_bug.cgi?id=50564

Changing logical[Start/End]OfLine to return a valid VisiblePosition for for editable contexts that are
inline and share a line with non-editable content.

Test: editing/selection/modify-by-lineboundary-in-inline-editable-contexts.html

• editing/visible_units.cpp: (WebCore::logicalStartOfLine): (WebCore::logicalEndOfLine):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/selection/modify-by-lineboundary-in-inline-editable-contexts-expected.txt (added)
• LayoutTests/editing/selection/modify-by-lineboundary-in-inline-editable-contexts.html (added)
• LayoutTests/editing/selection/script-tests/modify-by-lineboundary-in-inline-editable-contexts.js (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/visible_units.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-22  Levi Weintraub  <leviw@chromium.org>
+
+        Reviewed by Ryosuke Niwa.
+
+        End/Home keys do not work in a contentEditable element
+        https://bugs.webkit.org/show_bug.cgi?id=50564
+
+        Fixing modifying selection by lineboundary (home/end) for editable contexts that are
+        inline and share a line with non-editable content.
+
+        * editing/selection/modify-by-lineboundary-in-inline-editable-contexts-expected.txt: Added.
+        * editing/selection/modify-by-lineboundary-in-inline-editable-contexts.html: Added.
+        * editing/selection/script-tests/modify-by-lineboundary-in-inline-editable-contexts.js: Added.
+        (testModifyByLine):
+
 2011-04-22  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-22  Levi Weintraub  <leviw@chromium.org>
+
+        Reviewed by Ryosuke Niwa.
+
+        End/Home keys do not work in a contentEditable element
+        https://bugs.webkit.org/show_bug.cgi?id=50564
+
+        Changing logical[Start/End]OfLine to return a valid VisiblePosition for for editable contexts that are
+        inline and share a line with non-editable content.
+
+        Test: editing/selection/modify-by-lineboundary-in-inline-editable-contexts.html
+
+        * editing/visible_units.cpp:
+        (WebCore::logicalStartOfLine):
+        (WebCore::logicalEndOfLine):
+
 2011-04-22  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/Source/WebCore/editing/visible_units.cpp

@@ -1075 +1075 @@
     // Please refer to https://bugs.webkit.org/show_bug.cgi?id=49107 for detail.
     VisiblePosition visPos = logicalStartPositionForLine(c);
-    
+
+    if (Node* editableRoot = highestEditableRoot(c.deepEquivalent())) {
+        if (!editableRoot->contains(visPos.deepEquivalent().containerNode()))
+            return firstPositionInNode(editableRoot);
+    }
     return c.honorEditableBoundaryAtOrBefore(visPos);
 }
@@ -1134 +1138 @@
     if (!inSameLogicalLine(c, visPos))
         visPos = visPos.previous();
-    
+
+    if (Node* editableRoot = highestEditableRoot(c.deepEquivalent())) {
+        if (!editableRoot->contains(visPos.deepEquivalent().containerNode()))
+            return lastPositionInNode(editableRoot);
+    }
     return c.honorEditableBoundaryAtOrAfter(visPos);
 }