Changeset 146867 in webkit

Timestamp:

Mar 26, 2013 4:37:33 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Unable to insert a paragraph in between some text whose previous sibling is a non-editable block.
​https://bugs.webkit.org/show_bug.cgi?id=113007

Patch by Arpita Bahuguna <​a.bah@samsung.com> on 2013-03-26
Reviewed by Ryosuke Niwa.

Source/WebCore:

Unable to insert a line break in between a text that follows a
non-editable block but is itself contained within an editable
block.

While comparing the positions from the start block till the
insertion position, we should ignore the nodes that do not
generate a visiblePosition for the position before the node.
This ultimately results in an assert within comparePositions().

For this case, the firstChild of the start block is a text
node with no renderer which would thus not generate a candidate
position for itself.
There is also no candidate previous to it, and since
the position after it lies within a different editable element (root),
no candidate after it as well.
Such a point will thus return a null visiblePosition.

Test: editing/inserting/insert-paragraph-between-text.html

• editing/InsertParagraphSeparatorCommand.cpp:

(WebCore::InsertParagraphSeparatorCommand::doApply):
Added a check to verify the generated visiblePosition (for the
position before the node) prior to carrying out a comparison with
the insertion point.

LayoutTests:

• editing/inserting/insert-paragraph-between-text-expected.txt: Added.
• editing/inserting/insert-paragraph-between-text.html: Added.

Added a layout test case for verifying the behavior when trying
to insert a line break between an editable text with a non-editable
block as it's previous sibling.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/inserting/insert-paragraph-between-text-expected.txt (added)
• LayoutTests/editing/inserting/insert-paragraph-between-text.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-03-26  Arpita Bahuguna  <a.bah@samsung.com>
+
+        Unable to insert a paragraph in between some text whose previous sibling is a non-editable block.
+        https://bugs.webkit.org/show_bug.cgi?id=113007
+
+        Reviewed by Ryosuke Niwa.
+
+        * editing/inserting/insert-paragraph-between-text-expected.txt: Added.
+        * editing/inserting/insert-paragraph-between-text.html: Added.
+        Added a layout test case for verifying the behavior when trying
+        to insert a line break between an editable text with a non-editable
+        block as it's previous sibling.
+
 2013-03-26  Rijubrata Bhaumik  <rijubrata.bhaumik@intel.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-26  Arpita Bahuguna  <a.bah@samsung.com>
+
+        Unable to insert a paragraph in between some text whose previous sibling is a non-editable block.
+        https://bugs.webkit.org/show_bug.cgi?id=113007
+
+        Reviewed by Ryosuke Niwa.
+
+        Unable to insert a line break in between a text that follows a
+        non-editable block but is itself contained within an editable
+        block.
+
+        While comparing the positions from the start block till the
+        insertion position, we should ignore the nodes that do not
+        generate a visiblePosition for the position before the node.
+        This ultimately results in an assert within comparePositions().
+
+        For this case, the firstChild of the start block is a text
+        node with no renderer which would thus not generate a candidate
+        position for itself.
+        There is also no candidate previous to it, and since
+        the position after it lies within a different editable element (root),
+        no candidate after it as well.
+        Such a point will thus return a null visiblePosition.
+
+        Test: editing/inserting/insert-paragraph-between-text.html
+
+        * editing/InsertParagraphSeparatorCommand.cpp:
+        (WebCore::InsertParagraphSeparatorCommand::doApply):
+        Added a check to verify the generated visiblePosition (for the
+        position before the node) prior to carrying out a comparison with
+        the insertion point.
+
 2013-03-26  Ilya Tikhonovsky  <loislo@chromium.org>
 

trunk/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp

@@ -373 +373 @@
 
             for (n = startBlock->firstChild(); n; n = n->nextSibling()) {
-                if (comparePositions(VisiblePosition(insertionPosition), positionBeforeNode(n)) <= 0)
+                VisiblePosition beforeNodePosition = positionBeforeNode(n);
+                if (!beforeNodePosition.isNull() && comparePositions(VisiblePosition(insertionPosition), beforeNodePosition) <= 0)
                     break;
             }