LayoutTests/ChangeLog

2011-06-07  Annie Sullivan  <sullivan@chromium.org>

        Reviewed by NOBODY (OOPS!).

        REGRESSION: Hitting enter in the middle of this span causes the cursor to go to the end of the span

        https://bugs.webkit.org/show_bug.cgi?id=61594

        Added new layout tests for this problem, one in the middle of a text node, and one at the end.

        * editing/inserting/return-key-before-br-in-span-expected.txt: Added.

        * editing/inserting/return-key-before-br-in-span.html: Added.

        * editing/inserting/return-key-middle-of-span-expected.txt: Added.

        * editing/inserting/return-key-middle-of-span.html: Added.

2011-06-07  Young Han Lee  <joybro@company100.net>

        Reviewed by Kenneth Rohde Christiansen.

LayoutTests/editing/inserting/return-key-before-br-in-span-expected.txt

This sets the selection to the end of the first line, and hits the enter key.

Expected behavior: a div is created around the second line, and the cursor is placed at the start of the second line. See bug 61594.

| <span>

|   id="wrapper"

|   "First line"

| <div>

|   <span>

|     <#selection-caret>

|     <br>

|     "Second line"

LayoutTests/editing/inserting/return-key-before-br-in-span.html

<!DOCTYPE html>

<html>

<body>

<div contenteditable id="root"><span id="wrapper">First line<br>Second line</span></div>

<script src="../../resources/dump-as-markup.js"></script>

<script>

Markup.description("This sets the selection to the end of the first line, and hits the enter key.\n"

    + "Expected behavior: a div is created around the second line, and the cursor is placed at the "

    + "start of the second line. See bug 61594.");

var sel = window.getSelection();

sel.setPosition(document.getElementById("wrapper"), 1);

eventSender.keyDown('\n');

Markup.dump(root);

</script>

</html>

LayoutTests/editing/inserting/return-key-middle-of-span-expected.txt

This sets the selection to the middle of the first line, and hits the enter key.

Expected behavior: the text node is split at the cursor. The span is cloned, and everything that was split out is placed inside the clone in a new div which is a child of the root. See bug 61594.

| <span>

|   id="wrapper"

|   "First"

| <div>

|   <span>

|     "<#selection-caret> line"

|     <br>

|     "Second line"

LayoutTests/editing/inserting/return-key-middle-of-span.html

<!DOCTYPE html>

<html>

<body>

<div contenteditable id="root"><span id="wrapper">First line<br>Second line</span></div>

<script src="../../resources/dump-as-markup.js"></script>

<script>

Markup.description("This sets the selection to the middle of the first line, and hits the enter key.\n"

    + "Expected behavior: the text node is split at the cursor. The span is cloned, and everything "

    + "that was split out is placed inside the clone in a new div which is a child of the root. See bug 61594.");

var sel = window.getSelection();

sel.setPosition(document.getElementById("wrapper").firstChild, 5);

eventSender.keyDown('\n');

Markup.dump(root);

</script>

</html>

Source/WebCore/ChangeLog

2011-06-07  Annie Sullivan  <sullivan@chromium.org>

        Reviewed by NOBODY (OOPS!).

        REGRESSION: Hitting enter in the middle of this span causes the cursor to go to the end of the span

        https://bugs.webkit.org/show_bug.cgi?id=61594

        Changed splitTreeToNode to a method splitTree() which takes a Position, and updated callers. 

        Tests: editing/inserting/return-key-before-br-in-span.html

               editing/inserting/return-key-middle-of-span.html

        * editing/CompositeEditCommand.cpp:

        (WebCore::CompositeEditCommand::splitTree):

        * editing/CompositeEditCommand.h:

        * editing/FormatBlockCommand.cpp:

        (WebCore::FormatBlockCommand::formatRange):

        * editing/IndentOutdentCommand.cpp:

        (WebCore::IndentOutdentCommand::indentIntoBlockquote):

        (WebCore::IndentOutdentCommand::outdentParagraph):

        * editing/InsertListCommand.cpp:

        (WebCore::InsertListCommand::unlistifyParagraph):

        * editing/InsertParagraphSeparatorCommand.cpp:

        (WebCore::InsertParagraphSeparatorCommand::doApply):

        * editing/ReplaceSelectionCommand.cpp:

        (WebCore::ReplaceSelectionCommand::doApply):

        (WebCore::ReplaceSelectionCommand::insertAsListItems):

        * editing/htmlediting.cpp:

2011-06-07  Young Han Lee  <joybro@company100.net>

        Reviewed by Kenneth Rohde Christiansen.

Source/WebCore/editing/CompositeEditCommand.cpp

#include "InsertParagraphSeparatorCommand.h"

#include "InsertTextCommand.h"

#include "MergeIdenticalElementsCommand.h"

47#include "NodeList.h"

#include "Range.h"

#include "RemoveCSSPropertyCommand.h"

#include "RemoveNodeCommand.h"

@@Position CompositeEditCommand::positionAvoidingSpecialElementBoundary(const Posi

    return result;

}

// Splits the tree parent by parent until we reach the specified ancestor. We use VisiblePositions

// to determine if the split is necessary. Returns the last split node.

PassRefPtr<Node> CompositeEditCommand::splitTreeToNode(Node* start, Node* end, bool shouldSplitAncestor)

1232PassRefPtr<Node> CompositeEditCommand::splitTree(const Position& start, Node* end, AncestorSplitPolicy splitPolicy)

12341233{

1235 ASSERT(start);

12361234 ASSERT(end);

1237 ASSERT(start != end);

1235 ASSERT(start.containerNode() != end);

12381236

1239 RefPtr<Node> node;

1240 if (shouldSplitAncestor && end->parentNode())

1237 if (splitPolicy == Split && end->parentNode())

12411238 end = end->parentNode();

1242

12431239 RefPtr<Node> endNode = end;

1244 for (node = start; node && node->parentNode() != endNode; node = node->parentNode()) {

    Node* startNode = start.containerNode();

    // For text nodes, handle the case where the offset is in the middle of the node or at the end,

    // moving the start node to the beginning of the position, splitting the node if necessary.

    if (startNode->isTextNode()) {

        // FIXME: startNode can be null if traverseNextNode returns null. What should it be set to in that case?

        if (start.offsetInContainerNode() == caretMaxOffset(start.containerNode()))

            startNode = startNode->traverseNextNode(end);

        else if (start.offsetInContainerNode() > caretMinOffset(start.containerNode()))

            splitTextNode(static_cast<Text*>(start.containerNode()), start.offsetInContainerNode());

    }

    RefPtr<Node> node;

    for (node = startNode; node && node->parentNode() != endNode; node = node->parentNode()) {

        if (!node->parentNode()->isElementNode())

            break;

        // Do not split a node when doing so introduces an empty node.

Source/WebCore/editing/CompositeEditCommand.h

@@class HTMLElement;

class StyledElement;

class Text;

40enum AncestorSplitPolicy { DoNotSplit, Split };

41

class CompositeEditCommand : public EditCommand {

public:

    virtual ~CompositeEditCommand();

@@protected:

    bool breakOutOfEmptyMailBlockquotedParagraph();

    Position positionAvoidingSpecialElementBoundary(const Position&);

118

119 PassRefPtr<Node> splitTreeToN~~ode(N~~ode*, Node*, ~~bool split~~Ancestor = fa~~lse~~);

120

121 PassRefPtr<Node> splitTree(const Position&, Node*, AncestorSplitPolicy splitPolicy = DoNotSplit);

    Vector<RefPtr<EditCommand> > m_commands;

Source/WebCore/editing/FormatBlockCommand.cpp

@@void FormatBlockCommand::formatSelection(const VisiblePosition& startOfSelection

void FormatBlockCommand::formatRange(const Position& start, const Position& end, const Position& endOfSelection, RefPtr<Element>& blockNode)

{

    Node* nodeToSplitTo = enclosingBlockToSplitTreeTo(start.deprecatedNode());

64 RefPtr<Node> outerBlock = (start.deprecatedNode() == nodeToSplitTo) ? start.deprecatedNode() : splitTreeToNode(start.deprecatedNode(), nodeToSplitTo);

64 RefPtr<Node> outerBlock = (start.deprecatedNode() == nodeToSplitTo) ? start.deprecatedNode() : splitTree(firstPositionInNode(start.deprecatedNode()), nodeToSplitTo);

    RefPtr<Node> nodeAfterInsertionPosition = outerBlock;

    RefPtr<Range> range = Range::create(document(), start, endOfSelection);

Source/WebCore/editing/IndentOutdentCommand.cpp

@@void IndentOutdentCommand::indentIntoBlockquote(const Position& start, const Pos

    if (!nodeToSplitTo)

        return;

106 RefPtr<Node> outerBlock = (start.deprecatedNode() == nodeToSplitTo) ? start.deprecatedNode() : splitTreeToNode(start.deprecatedNode(), nodeToSplitTo);

106 RefPtr<Node> outerBlock = (start.deprecatedNode() == nodeToSplitTo) ? start.deprecatedNode() : splitTree(firstPositionInNode(start.deprecatedNode()), nodeToSplitTo);

    if (!targetBlockquote) {

        // Create a new blockquote and insert it as a child of the root editable element. We accomplish

@@void IndentOutdentCommand::outdentParagraph()

    Node* enclosingBlockFlow = enclosingBlock(visibleStartOfParagraph.deepEquivalent().deprecatedNode());

    RefPtr<Node> splitBlockquoteNode = enclosingNode;

    if (enclosingBlockFlow != enclosingNode)

173 splitBlockquoteNode = splitTreeToNode(enclosingBlockFlow, enclosingNode, ~~true~~);

173 splitBlockquoteNode = splitTree(firstPositionInNode(enclosingBlockFlow), enclosingNode, Split);

    else {

        // We split the blockquote at where we start outdenting.

        splitElement(static_cast<Element*>(enclosingNode), visibleStartOfParagraph.deepEquivalent().deprecatedNode());

Source/WebCore/editing/InsertListCommand.cpp

@@void InsertListCommand::unlistifyParagraph(const VisiblePosition& originalStart,

        // FIXME: We appear to split at nextListChild as opposed to listChildNode so that when we remove

        // listChildNode below in moveParagraphs, previousListChild will be removed along with it if it is 

        // unrendered. But we ought to remove nextListChild too, if it is unrendered.

292 splitElement(listNode, splitTreeToNode(nextListChild, listNode));

292 splitElement(listNode, splitTree(firstPositionInNode(nextListChild), listNode));

        insertNodeBefore(nodeToInsert, listNode);

    } else if (nextListChild || listChildNode->parentNode() != listNode) {

        // Just because listChildNode has no previousListChild doesn't mean there isn't any content

@@void InsertListCommand::unlistifyParagraph(const VisiblePosition& originalStart,

        // between it and listNode. So, we split up to listNode before inserting the placeholder

        // where we're about to move listChildNode to.

        if (listChildNode->parentNode() != listNode)

300 splitElement(listNode, splitTreeToNode(listChildNode, listNode).get());

300 splitElement(listNode, splitTree(firstPositionInNode(listChildNode), listNode).get());

        insertNodeBefore(nodeToInsert, listNode);

    } else

        insertNodeAfter(nodeToInsert, listNode);

Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp

@@void InsertParagraphSeparatorCommand::doApply()

        if (insertionPosition.containerNode() == startBlock)

            n = insertionPosition.computeNodeAfterPosition();

        else {

350 splitTree~~ToNode~~(insertionPosition~~.containerNode()~~, startBlock);

350 splitTree(insertionPosition, startBlock);

            for (n = startBlock->firstChild(); n; n = n->nextSibling()) {

                if (comparePositions(VisiblePosition(insertionPosition), positionBeforeNode(n)) <= 0)

Source/WebCore/editing/ReplaceSelectionCommand.cpp

@@void ReplaceSelectionCommand::doApply()

        // FIXME: isInlineNodeWithStyle does not check editability.

        if (RefPtr<Node> nodeToSplitTo = highestEnclosingNodeOfType(insertionPos, isInlineNodeWithStyle)) {

            if (insertionPos.containerNode() != nodeToSplitTo) {

949 nodeToSplitTo = splitTree~~ToNode~~(insertionPos~~.anchorNode()~~, nodeToSplitTo.get(), ~~true~~).get();

949 nodeToSplitTo = splitTree(insertionPos, nodeToSplitTo.get(), Split).get();

                insertionPos = positionInParentBeforeNode(nodeToSplitTo.get());

            }

        }

@@Node* ReplaceSelectionCommand::insertAsListItems(PassRefPtr<Node> listElement, N

    // If we're in the middle of a list item, we should split it into two separate

    // list items and insert these nodes between them.

    if (isMiddle) {

        int textNodeOffset = insertPos.offsetInContainerNode();

        if (insertPos.deprecatedNode()->isTextNode() && textNodeOffset > 0)

            splitTextNode(static_cast<Text*>(insertPos.deprecatedNode()), textNodeOffset);

        splitTreeToNode(insertPos.deprecatedNode(), lastNode, true);

1251 splitTree(insertPos, lastNode, Split);

    }

    while (RefPtr<Node> listItem = listElement->firstChild()) {

Source/WebCore/editing/htmlediting.cpp

@@Element* editableRootForPosition(const Position& p)

// Finds the enclosing element until which the tree can be split.

// When a user hits ENTER, he/she won't expect this element to be split into two.

190 // You may pass it as the second argument of splitTree~~ToNode~~.

190// You may pass it as the second argument of splitTree.

Element* unsplittableElementForPosition(const Position& p)

{

    // Since enclosingNodeOfType won't search beyond the highest root editable node,