Changeset 157944 in webkit

Timestamp:

Oct 24, 2013 12:18:30 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[contenteditable] Content after non-editable element disappears when merging lines using backspace
​https://bugs.webkit.org/show_bug.cgi?id=122748

Patch by Santosh Mahto <​santosh.ma@samsung.com> on 2013-10-24
Reviewed by Ryosuke Niwa.

Source/WebCore:

In case of paragraph merging after deletion if second paragraph
contains non-editable element, then content after the non-editable
element(including non-editable element) will be removed while the
content before the element will be merged with the first paragraph.
This happens becasue endOfParagraphToMove calculation in merging function
stop at editing boundary so endOfParagraphToMove becomes position just
before non-editable content.
With this patch now endOfParagraphToMove is calculated by skipping
over the non-editable element.

Test: editing/deleting/merge-paragraph-contatining-noneditable.html

• editing/DeleteSelectionCommand.cpp:

(WebCore::DeleteSelectionCommand::mergeParagraphs): use CanSkipOverEditingBoundary
condition while calculating endOfParagraphToMove.

LayoutTests:

Adding test to verify that on merging the paragraph containing
non-editable element does not cause loss of non-editable content after
merging.

• editing/deleting/merge-paragraph-contatining-noneditable-expected.txt: Added.
• editing/deleting/merge-paragraph-contatining-noneditable.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/deleting/merge-paragraph-contatining-noneditable-expected.txt (added)
• LayoutTests/editing/deleting/merge-paragraph-contatining-noneditable.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/DeleteSelectionCommand.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-10-24  Santosh Mahto  <santosh.ma@samsung.com>
+
+        [contenteditable] Content after non-editable element disappears when merging lines using backspace
+        https://bugs.webkit.org/show_bug.cgi?id=122748
+
+        Reviewed by Ryosuke Niwa.
+
+        Adding test to verify that on merging the paragraph containing
+        non-editable element does not cause loss of non-editable content after
+        merging.
+
+        * editing/deleting/merge-paragraph-contatining-noneditable-expected.txt: Added.
+        * editing/deleting/merge-paragraph-contatining-noneditable.html: Added.
+
 2013-10-24  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-24  Santosh Mahto  <santosh.ma@samsung.com>
+
+        [contenteditable] Content after non-editable element disappears when merging lines using backspace
+        https://bugs.webkit.org/show_bug.cgi?id=122748
+
+        Reviewed by Ryosuke Niwa.
+
+        In case of paragraph merging after deletion if second paragraph
+        contains non-editable element, then content after the non-editable
+        element(including non-editable element) will be removed while the
+        content before the element will be merged with the first paragraph.
+        This happens becasue endOfParagraphToMove calculation in merging function
+        stop at editing boundary so endOfParagraphToMove becomes position just
+        before non-editable content.
+        With this patch now endOfParagraphToMove is calculated by skipping
+        over the non-editable element.
+
+        Test: editing/deleting/merge-paragraph-contatining-noneditable.html
+
+        * editing/DeleteSelectionCommand.cpp:
+        (WebCore::DeleteSelectionCommand::mergeParagraphs): use CanSkipOverEditingBoundary
+        condition while calculating endOfParagraphToMove.
+
 2013-10-24  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebCore/editing/DeleteSelectionCommand.cpp

@@ -638 +638 @@
         return;
         
-    VisiblePosition endOfParagraphToMove = endOfParagraph(startOfParagraphToMove);
+    VisiblePosition endOfParagraphToMove = endOfParagraph(startOfParagraphToMove, CanSkipOverEditingBoundary);
     
     if (mergeDestination == endOfParagraphToMove)