LayoutTests:
authorjusting <justing@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Jun 2006 22:26:52 +0000 (22:26 +0000)
committerjusting <justing@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Jun 2006 22:26:52 +0000 (22:26 +0000)
commitaa9b0830833a5132b752b8c763c14dde865f62d5
treecab3c2598b2bd19db32144f8fab5238f856d1846
parentd99ca36b7da577ce651fa5e5207c39e71d3193f2
LayoutTests:

        Reviewed by harrison

        * editing/deleting/pruning-after-merge-2-expected.checksum: Added.
        * editing/deleting/pruning-after-merge-2-expected.png: Added.
        * editing/deleting/pruning-after-merge-2-expected.txt: Added.
        * editing/deleting/pruning-after-merge-2.html: Added.

WebCore:

        Reviewed by harrison

        * editing/CompositeEditCommand.cpp:
        (WebCore::hasARenderedDescendant):
        (WebCore::CompositeEditCommand::prune): Ascend using the DOM
        (WebCore::CompositeEditCommand::moveParagraphs): Placeholder insertion
        during deletion is fixed, removing the fall back.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@14880 268f45cc-cd09-0410-ab3c-d52691b4dbfc
LayoutTests/ChangeLog
LayoutTests/editing/deleting/pruning-after-merge-2-expected.checksum [new file with mode: 0644]
LayoutTests/editing/deleting/pruning-after-merge-2-expected.png [new file with mode: 0644]
LayoutTests/editing/deleting/pruning-after-merge-2-expected.txt [new file with mode: 0644]
LayoutTests/editing/deleting/pruning-after-merge-2.html [new file with mode: 0644]
WebCore/ChangeLog
WebCore/editing/CompositeEditCommand.cpp