LayoutTests:
authorjusting <justing@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 23 Jun 2006 22:36:12 +0000 (22:36 +0000)
committerjusting <justing@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 23 Jun 2006 22:36:12 +0000 (22:36 +0000)
commit90e3e0e8a0c1ccd82acc4da5459b2882138d05bb
tree4155b5dcb55ad8422d6198f8ec71bbc9e6226648
parenta3c01e725d44e0249d04f6a3f0af57c10c85cdbf
LayoutTests:

        Reviewed by levi

        * editing/deleting/merge-into-empty-block-1-expected.checksum: Added.
        * editing/deleting/merge-into-empty-block-1-expected.png: Added.
        * editing/deleting/merge-into-empty-block-1-expected.txt: Added.
        * editing/deleting/merge-into-empty-block-1.html: Added.
        * editing/deleting/merge-into-empty-block-2-expected.checksum: Added.
        * editing/deleting/merge-into-empty-block-2-expected.png: Added.
        * editing/deleting/merge-into-empty-block-2-expected.txt: Added.
        * editing/deleting/merge-into-empty-block-2.html: Added.

WebCore:

        Reviewed by levi

        * editing/DeleteSelectionCommand.cpp:
        (WebCore::DeleteSelectionCommand::mergeParagraphs):
        Add a rule for when to merge into empty blocks.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@14996 268f45cc-cd09-0410-ab3c-d52691b4dbfc
LayoutTests/ChangeLog
LayoutTests/editing/deleting/merge-into-empty-block-1-expected.checksum [new file with mode: 0644]
LayoutTests/editing/deleting/merge-into-empty-block-1-expected.png [new file with mode: 0644]
LayoutTests/editing/deleting/merge-into-empty-block-1-expected.txt [new file with mode: 0644]
LayoutTests/editing/deleting/merge-into-empty-block-1.html [new file with mode: 0644]
LayoutTests/editing/deleting/merge-into-empty-block-2-expected.checksum [new file with mode: 0644]
LayoutTests/editing/deleting/merge-into-empty-block-2-expected.png [new file with mode: 0644]
LayoutTests/editing/deleting/merge-into-empty-block-2-expected.txt [new file with mode: 0644]
LayoutTests/editing/deleting/merge-into-empty-block-2.html [new file with mode: 0644]
WebCore/ChangeLog
WebCore/editing/DeleteSelectionCommand.cpp