Reviewed by John
authorkocienda <kocienda@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Jan 2005 17:55:08 +0000 (17:55 +0000)
committerkocienda <kocienda@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Jan 2005 17:55:08 +0000 (17:55 +0000)
commit7b94e62a1e854c7a9f4e6ec0ab29660758fb4c08
tree7da4cd1294b7705bba6063a5c558088b69684a52
parente2705eb8293602da977791efb37069cdc1ebb7b6
    Reviewed by John

        Fix for this bug:

        <rdar://problem/3926142> REGRESSION (Mail): Deleting text decreases quote level

        * khtml/editing/htmlediting.cpp:
        (khtml::DeleteSelectionCommand::initializePositionData): Change test that will prevent block
        merging. End-of-line test was just wrong. Call new start-of and end-of paragraph functions
        added to visible_position files.
        (khtml::DeleteSelectionCommand::moveNodesAfterNode): Add tests for BR elements, which makes
        tests to determine when to stop moving nodes more complete and correct. Also improved comments.
        * khtml/editing/visible_position.cpp:
        (khtml::isFirstVisiblePositionInParagraph): New function.
        (khtml::isLastVisiblePositionInParagraph): New function.
        * khtml/editing/visible_position.h: Update header accordingly.
        * layout-tests/editing/deleting/delete-block-merge-contents-002-expected.txt: New results, slightly different from former
        results but still correct.
        * layout-tests/editing/deleting/delete-block-merge-contents-007-expected.txt: Ditto.
        * layout-tests/editing/deleting/delete-block-merge-contents-018-expected.txt: Added.
        * layout-tests/editing/deleting/delete-block-merge-contents-018.html: Added.
        * layout-tests/editing/deleting/delete-block-merge-contents-019-expected.txt: Added.
        * layout-tests/editing/deleting/delete-block-merge-contents-019.html: Added.
        * layout-tests/editing/deleting/delete-block-merge-contents-020-expected.txt: Added.
        * layout-tests/editing/deleting/delete-block-merge-contents-020.html: Added.
        * layout-tests/editing/deleting/delete-block-merge-contents-021-expected.txt: Added.
        * layout-tests/editing/deleting/delete-block-merge-contents-021.html: Added.
        * layout-tests/editing/deleting/delete-line-014-expected.txt: These new results are actually better, and fix a bug.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8341 268f45cc-cd09-0410-ab3c-d52691b4dbfc
15 files changed:
LayoutTests/editing/deleting/delete-block-merge-contents-002-expected.txt
LayoutTests/editing/deleting/delete-block-merge-contents-007-expected.txt
LayoutTests/editing/deleting/delete-block-merge-contents-018-expected.txt [new file with mode: 0644]
LayoutTests/editing/deleting/delete-block-merge-contents-018.html [new file with mode: 0644]
LayoutTests/editing/deleting/delete-block-merge-contents-019-expected.txt [new file with mode: 0644]
LayoutTests/editing/deleting/delete-block-merge-contents-019.html [new file with mode: 0644]
LayoutTests/editing/deleting/delete-block-merge-contents-020-expected.txt [new file with mode: 0644]
LayoutTests/editing/deleting/delete-block-merge-contents-020.html [new file with mode: 0644]
LayoutTests/editing/deleting/delete-block-merge-contents-021-expected.txt [new file with mode: 0644]
LayoutTests/editing/deleting/delete-block-merge-contents-021.html [new file with mode: 0644]
LayoutTests/editing/deleting/delete-line-014-expected.txt
WebCore/ChangeLog-2005-08-23
WebCore/khtml/editing/htmlediting.cpp
WebCore/khtml/editing/visible_position.cpp
WebCore/khtml/editing/visible_position.h