ChangeLog

2011-03-08  Levi Weintraub  <leviw@chromium.org>

        Reviewed by NOBODY (OOPS!).

        InsertUnorderedList over a non-editable region and multiple lines enters an infinite loop

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

        Fixing broken handling of mixed-editability content for InsertListCommand.

        Test: editing/execCommand/insert-list-with-noneditable-content.html

        * editing/CompositeEditCommand.cpp:

        (WebCore::CompositeEditCommand::cleanupAfterDeletion): Changed signature to take the destination

        position for the active editing command. Without this, there are cases when the destination happens

        to be a placeholder, and we remove it.

        (WebCore::CompositeEditCommand::moveParagraphs):

        * editing/CompositeEditCommand.h:

        * editing/InsertListCommand.cpp:

        (WebCore::InsertListCommand::doApply): Added logic to the paragraph iteration loop to handle pockets of

        non-editable content in an editable context. Previously, this could cause an infinite loop.

        (WebCore::InsertListCommand::isStartOfInsignificantRegion): When iterating over paragraphs with mixed

        editability content for editing commands, there are special cases (e.g. the boundary between two non-

        editable spans) that shouldn't be treated as a paragraph.

        * editing/visible_units.cpp:

        (WebCore::startOfParagraph): Added a mode of operation where we'll jump across non-editable

        content in the same paragraph to reach the actual editable paragraph start.

        (WebCore::endOfParagraph): Ditto.

        (WebCore::startOfNextParagraph): Now uses the aforementioned non-editable content skipping mode of

        endOfParagraph.

2011-03-08  Brent Fulgham  <bfulgham@webkit.org>

        Reviewed by Adam Roben.

80603

Source/WebCore/editing/CompositeEditCommand.cpp

@@void CompositeEditCommand::cloneParagrap

// Deleting a paragraph will leave a placeholder. Remove it (and prune

// empty or unrendered parents).

833 void CompositeEditCommand::cleanupAfterDeletion()

833void CompositeEditCommand::cleanupAfterDeletion(VisiblePosition destination)

834834{

835835 VisiblePosition caretAfterDelete = endingSelection().visibleStart();

836 if (isStartOfParagraph(caretAfterDelete) && isEndOfParagraph(caretAfterDelete)) {

836 if (caretAfterDelete != destination && isStartOfParagraph(caretAfterDelete) && isEndOfParagraph(caretAfterDelete)) {

        // Note: We want the rightmost candidate.

        Position position = caretAfterDelete.deepEquivalent().downstream();

        Node* node = position.deprecatedNode();

@@void CompositeEditCommand::moveParagraph

        }

    }

950 VisiblePosition beforeParagraph = startOfParagraphToMove.previous();

951 VisiblePosition afterParagraph(endOfParagraphToMove.next());

    bool stayInEditableContent = true;

    VisiblePosition beforeParagraph = startOfParagraphToMove.previous(stayInEditableContent);

    VisiblePosition afterParagraph(endOfParagraphToMove.next(stayInEditableContent));

    // We upstream() the end and downstream() the start so that we don't include collapsed whitespace in the move.

    // When we paste a fragment, spaces after the end and before the start are treated as though they were rendered.

@@void CompositeEditCommand::moveParagraph

    deleteSelection(false, false, false, false);

    ASSERT(destination.deepEquivalent().anchorNode()->inDocument());

988

989 cleanupAfterDeletion();

989 cleanupAfterDeletion(destination);

    ASSERT(destination.deepEquivalent().anchorNode()->inDocument());

    // Add a br if pruning an empty block level element caused a collapse. For example:

80603

Source/WebCore/editing/CompositeEditCommand.h

@@protected:

    void moveParagraphs(const VisiblePosition&, const VisiblePosition&, const VisiblePosition&, bool preserveSelection = false, bool preserveStyle = true);

    void moveParagraphWithClones(const VisiblePosition& startOfParagraphToMove, const VisiblePosition& endOfParagraphToMove, Element* blockElement, Node* outerNode);

    void cloneParagraphUnderNewElement(Position& start, Position& end, Node* outerNode, Element* blockElement);

112 void cleanupAfterDeletion();

112 void cleanupAfterDeletion(VisiblePosition destination = VisiblePosition());

    
    bool breakOutOfEmptyListItem();

    bool breakOutOfEmptyMailBlockquotedParagraph();

80603

Source/WebCore/editing/InsertListCommand.cpp

@@HTMLElement* InsertListCommand::fixOrpha

    return listElement.get();

}

bool InsertListCommand::isStartOfInsignificantRegion(const VisiblePosition& start)

{

    ASSERT(start.isNotNull());

    VisiblePosition paragraphEnd = endOfParagraph(start);

    return start == paragraphEnd && (!start.deepEquivalent().upstream(CanCrossEditingBoundary).anchorNode()->isContentEditable()

            || endOfParagraph(paragraphEnd, CanCrossEditingBoundary) != startOfParagraph(start, CanCrossEditingBoundary));

}

PassRefPtr<HTMLElement> InsertListCommand::mergeWithNeighboringLists(PassRefPtr<HTMLElement> passedList)

{

    RefPtr<HTMLElement> list = passedList;

@@void InsertListCommand::doApply()

                if (startOfCurrentParagraph == startOfSelection)

                    startOfSelection = endingSelection().visibleStart();

175 startOfCurrentParagraph = startOfNextParagraph(endingSelection().visibleStart());

                VisiblePosition nextStart = startOfNextParagraph(endingSelection().visibleStart());

                while (nextStart.isNotNull() && nextStart != startOfLastParagraph && isStartOfInsignificantRegion(nextStart))

                    nextStart = startOfNextParagraph(nextStart);

                if (startOfCurrentParagraph == nextStart)

                    break;

                startOfCurrentParagraph = nextStart;

            }

            setEndingSelection(endOfSelection);

            doApplyForSingleParagraph(forceCreateList, listTag, currentSelection.get());

@@PassRefPtr<HTMLElement> InsertListComman

        // We inserted the list at the start of the content we're about to move

        // Update the start of content, so we don't try to move the list into itself.  bug 19066

378 if (insertionPos == start.deepEquivalent())

        // Layout is necessary since start's node's inline renderers may have been destroyed by

        // the insertion.

        if (insertionPos == start.deepEquivalent()) {

            listElement->document()->updateLayoutIgnorePendingStylesheets();

379396 start = startOfParagraph(originalStart);

397 }

    }

    moveParagraph(start, end, positionBeforeNode(placeholder.get()), true);

80603

Source/WebCore/editing/InsertListCommand.h

@@private:

    virtual EditAction editingAction() const { return EditActionInsertList; }

    HTMLElement* fixOrphanedListChild(Node*);

55

5556 bool selectionHasListOfType(const VisibleSelection& selection, const QualifiedName&);

57 bool isStartOfInsignificantRegion(const VisiblePosition&);

58

    PassRefPtr<HTMLElement> mergeWithNeighboringLists(PassRefPtr<HTMLElement>);

    void doApplyForSingleParagraph(bool forceCreateList, const QualifiedName&, Range* currentSelection);

    void unlistifyParagraph(const VisiblePosition& originalStart, HTMLElement* listNode, Node* listChildNode);

62

    PassRefPtr<HTMLElement> listifyParagraph(const VisiblePosition& originalStart, const QualifiedName& listTag);

    RefPtr<HTMLElement> m_listElement;

    Type m_type;

80603

Source/WebCore/editing/visible_units.cpp

@@VisiblePosition startOfParagraph(const V

    Node* startBlock = enclosingBlock(startNode);

750 Node *node = startNode;

750 Node* node = startNode;

751 Node* highestRoot = highestEditableRoot(p);

    int offset = p.deprecatedEditingOffset();

    Position::AnchorType type = p.anchorType();

754 Node *n = startNode;

755 Node* n = startNode;

    while (n) {

        if (boundaryCrossingRule == CannotCrossEditingBoundary && n->isContentEditable() != startNode->isContentEditable())

            break;

        if (boundaryCrossingRule == CanSkipOverEditingBoundary) {

            while (n && n->isContentEditable() != startNode->isContentEditable())

                n = n->traversePreviousNodePostOrder(startBlock);

            if (!n || !n->isDescendantOf(highestRoot))

                break;

        }

        RenderObject *r = n->renderer();

        if (!r) {

            n = n->traversePreviousNodePostOrder(startBlock);

@@VisiblePosition endOfParagraph(const Vis

    Node *stayInsideBlock = startBlock;

    Node *node = startNode;

823 Node* highestRoot = highestEditableRoot(p);

    int offset = p.deprecatedEditingOffset();

    Position::AnchorType type = p.anchorType();

@@VisiblePosition endOfParagraph(const Vis

    while (n) {

        if (boundaryCrossingRule == CannotCrossEditingBoundary && n->isContentEditable() != startNode->isContentEditable())

            break;

        if (boundaryCrossingRule == CanSkipOverEditingBoundary) {

            while (n && n->isContentEditable() != startNode->isContentEditable())

                n = n->traverseNextNode(stayInsideBlock);

            if (!n || !n->isDescendantOf(highestRoot))

                break;

        }

        RenderObject *r = n->renderer();

        if (!r) {

            n = n->traverseNextNode(stayInsideBlock);

@@VisiblePosition endOfParagraph(const Vis

    return VisiblePosition(Position(node, type), DOWNSTREAM);

}

880// FIXME: isStartOfParagraph(startOfNextParagraph(pos)) is not always true

865881VisiblePosition startOfNextParagraph(const VisiblePosition& visiblePosition)

866882{

867 VisiblePosition paragraphEnd(endOfParagraph(visiblePosition));

883 VisiblePosition paragraphEnd(endOfParagraph(visiblePosition, CanSkipOverEditingBoundary));

    VisiblePosition afterParagraphEnd(paragraphEnd.next(true));

    // The position after the last position in the last cell of a table

    // is not the start of the next paragraph.

80603

LayoutTests/ChangeLog

2011-03-08  Levi Weintraub  <leviw@chromium.org>

        Reviewed by NOBODY (OOPS!).

        InsertUnorderedList over a non-editable region and multiple lines enters an infinite loop

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

        Avoiding crashes and infinite loops when listifying content with mixed-editability

        * editing/execCommand/insert-list-with-noneditable-content-expected.txt: Added.

        * editing/execCommand/insert-list-with-noneditable-content.html: Added.

2011-03-08  Martin Robinson  <mrobinson@igalia.com>

        Rebaseline a GTK+ result after r80582.

80603

LayoutTests/editing/execCommand/insert-list-with-noneditable-content-expected.txt

This tests list creation in an editable context but across non-editable content. Editable content should be pulled into list items while non-editable nodes should be left alone, ending up after the created list.

Editable paragraph containing a 

 span in the middle.

   Another editable paragraph.

non-editable

Insert List

0

LayoutTests/editing/execCommand/insert-list-with-noneditable-content.html

<!DOCTYPE html>

<div id="description">This tests list creation in an editable context but across non-editable content. Editable content should be pulled into list items while non-editable nodes should be left alone, ending up after the created list.</div>

<div contenteditable="true" id="test" style="padding: 1em;">

  Editable paragraph containing a <span contenteditable="false" style="background-color: LightGray;">non-editable</span> span in the middle.<br>

  Another editable paragraph.

</div>

<button onclick="insertList();">Insert List</button>

<script>

function insertList() {

  document.execCommand('insertunorderedlist', false, '');

}

var s = window.getSelection();

var div = document.getElementById("test");

s.setPosition(div.childNodes[0], 10);

s.modify("extend", "forward", "line");

if (window.layoutTestController) {

  insertList();

  window.layoutTestController.dumpAsText();

}

</script>

0