LayoutTests:
authorjusting <justing@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Dec 2006 01:01:13 +0000 (01:01 +0000)
committerjusting <justing@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Dec 2006 01:01:13 +0000 (01:01 +0000)
commitb135cae8a9c8183d5e8fd181799d6fac387f1da2
tree4b438a278250c32a36e73a460c4c7462adda7652
parent4b13abcbd03a2f6418851e3b291863348944ed94
LayoutTests:

        Reviewed by john

        <rdar://problem/4854869>
        Inserting a new line in a contenteditable=true SPAN whose parent is a DIV asserts

        * editing/deleting/delete-mixed-editable-content-001-expected.txt:
        * editing/inserting/editable-inline-element-expected.checksum: Added.
        * editing/inserting/editable-inline-element-expected.txt: Added.
        * editing/inserting/editable-inline-element-expected.png: Added.
        * editing/inserting/editable-inline-element.html: Added.

WebCore:

        Reviewed by john

        <rdar://problem/4854869>
        Inserting a new line in a contenteditable=true SPAN whose parent is a DIV asserts

        * editing/htmlediting.cpp:
        (WebCore::enclosingBlock): Use enclosingNodeWithType to prevent escape
        from editable content.
        * editing/markup.cpp:
        (WebCore::createMarkup): A null commonAncestorBlock will happen
        if commonAncestor is inside an inline editable root that doesn't
        contain any blocks.  Removed an early return for this case: the
        code below the early return can and must handle it.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@18050 268f45cc-cd09-0410-ab3c-d52691b4dbfc
LayoutTests/ChangeLog
LayoutTests/editing/deleting/delete-mixed-editable-content-001-expected.txt
LayoutTests/editing/inserting/editable-inline-element-expected.checksum [new file with mode: 0644]
LayoutTests/editing/inserting/editable-inline-element-expected.png [new file with mode: 0644]
LayoutTests/editing/inserting/editable-inline-element-expected.txt [new file with mode: 0644]
LayoutTests/editing/inserting/editable-inline-element.html [new file with mode: 0644]
WebCore/ChangeLog
WebCore/editing/htmlediting.cpp
WebCore/editing/markup.cpp
WebCore/editing/visible_units.cpp