LayoutTests:
authorjusting <justing@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 18 Apr 2006 18:14:47 +0000 (18:14 +0000)
committerjusting <justing@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 18 Apr 2006 18:14:47 +0000 (18:14 +0000)
commit7f164959fe233907c6f47ec02ec90744e5e5b543
treec5aabc2fe9658edc70f30552964747fa2e0e12f8
parentba18848a972ceb551f6d6a7d7c27aa63c90390de
LayoutTests:

        Reviewed by harrison

        * editing/pasteboard/merge-end-3-expected.checksum: Added.
        * editing/pasteboard/merge-end-3-expected.png: Added.
        * editing/pasteboard/merge-end-3-expected.txt: Added.
        * editing/pasteboard/merge-end-3.html: Added.

WebCore:

        Reviewed by harrison

        * editing/CompositeEditCommand.cpp:
        (WebCore::CompositeEditCommand::moveParagraph): The placeholder that's inserted
        to keep content from collapsing due to pruning was inserted at the position after
        the moved paragraph.  That's only appropriate when moving the paragraph backward
        into the previous paragraph.

        * editing/ReplaceSelectionCommand.cpp:
        (WebCore::ReplaceSelectionCommand::doApply): The last paragraph of the incoming
        fragment should be merged with the paragraph after the end of the selection being pasted
        into even if the incoming fragment has only one block.   This fixes a bug and gets
        rid of a use of the info gathered during the test insertion.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@13957 268f45cc-cd09-0410-ab3c-d52691b4dbfc
LayoutTests/ChangeLog
LayoutTests/editing/pasteboard/merge-end-3-expected.checksum [new file with mode: 0644]
LayoutTests/editing/pasteboard/merge-end-3-expected.png [new file with mode: 0644]
LayoutTests/editing/pasteboard/merge-end-3-expected.txt [new file with mode: 0644]
LayoutTests/editing/pasteboard/merge-end-3.html [new file with mode: 0644]
WebCore/ChangeLog
WebCore/editing/CompositeEditCommand.cpp
WebCore/editing/ReplaceSelectionCommand.cpp