Reviewed by Hyatt
authorkocienda <kocienda@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 15 Sep 2004 20:58:30 +0000 (20:58 +0000)
committerkocienda <kocienda@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 15 Sep 2004 20:58:30 +0000 (20:58 +0000)
commit82b9b2311f14ded101e9bdce13daa53fecb1eeb9
treef6092e8f74949b8c46af0ccc896f0110c3e39242
parent6eeb133efcd5734cfc9e5c36d5e89f87efa0fdca
    Reviewed by Hyatt

        * khtml/editing/htmlediting_impl.cpp:
        (khtml::DeleteSelectionCommandImpl::doApply): The whitespace fixup code
        that makes sure proper whitespace renders after deletion was getting confused
        in cases where the deletion merged blocks. Basically, I needed to move some
        whitespace fixup code so it runs before deleting in the case where blocks
        need to be merged. It used to run after, and was getting confused by
        whitespace left over at the ends of the block after the deletion.
        * layout-tests/editing/deleting/delete-block-merge-contents-012-expected.txt: Added.
        * layout-tests/editing/deleting/delete-block-merge-contents-012.html: Added.
        * layout-tests/editing/deleting/delete-block-merge-contents-013-expected.txt: Added.
        * layout-tests/editing/deleting/delete-block-merge-contents-013.html: Added.
        * layout-tests/editing/deleting/delete-block-merge-contents-014-expected.txt: Added.
        * layout-tests/editing/deleting/delete-block-merge-contents-014.html: Added.
        * layout-tests/editing/deleting/delete-block-merge-contents-015-expected.txt: Added.
        * layout-tests/editing/deleting/delete-block-merge-contents-015.html: Added.
        * layout-tests/editing/deleting/delete-block-merge-contents-016-expected.txt: Added.
        * layout-tests/editing/deleting/delete-block-merge-contents-016.html: Added.
        * layout-tests/editing/deleting/delete-block-merge-contents-017-expected.txt: Added.
        * layout-tests/editing/deleting/delete-block-merge-contents-017.html: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@7573 268f45cc-cd09-0410-ab3c-d52691b4dbfc
14 files changed:
LayoutTests/editing/deleting/delete-block-merge-contents-012-expected.txt [new file with mode: 0644]
LayoutTests/editing/deleting/delete-block-merge-contents-012.html [new file with mode: 0644]
LayoutTests/editing/deleting/delete-block-merge-contents-013-expected.txt [new file with mode: 0644]
LayoutTests/editing/deleting/delete-block-merge-contents-013.html [new file with mode: 0644]
LayoutTests/editing/deleting/delete-block-merge-contents-014-expected.txt [new file with mode: 0644]
LayoutTests/editing/deleting/delete-block-merge-contents-014.html [new file with mode: 0644]
LayoutTests/editing/deleting/delete-block-merge-contents-015-expected.txt [new file with mode: 0644]
LayoutTests/editing/deleting/delete-block-merge-contents-015.html [new file with mode: 0644]
LayoutTests/editing/deleting/delete-block-merge-contents-016-expected.txt [new file with mode: 0644]
LayoutTests/editing/deleting/delete-block-merge-contents-016.html [new file with mode: 0644]
LayoutTests/editing/deleting/delete-block-merge-contents-017-expected.txt [new file with mode: 0644]
LayoutTests/editing/deleting/delete-block-merge-contents-017.html [new file with mode: 0644]
WebCore/ChangeLog-2005-08-23
WebCore/khtml/editing/htmlediting_impl.cpp