WebCore:
authordarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 10 Mar 2009 19:31:22 +0000 (19:31 +0000)
committerdarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 10 Mar 2009 19:31:22 +0000 (19:31 +0000)
commit8f7b66c8b93871e0267fac33b3418164d331dfa1
treeff8c01da4fffa49a0cf5aea823034007315d4c16
parentd6b574ab761b74c2df1b7e46c094a002ecdc7428
WebCore:

2009-03-10  Darin Adler  <darin@apple.com>

        Reviewed by Alexey Proskuryakov.

        Bug 24494: crash when deleting at end of document and merging paragraphs
        https://bugs.webkit.org/show_bug.cgi?id=24494
        rdar://problem/6571537

        Test: editing/deleting/merge-at-end-of-document.html

        * dom/Range.cpp:
        (WebCore::Range::compareBoundaryPoints): Split out assertion. It's better not to
        use && in assertions since we'd like to know which condition is failing.

        * editing/ApplyStyleCommand.cpp:
        (WebCore::ApplyStyleCommand::applyInlineStyleToRange): Added a null check before
        calling compareBoundaryPoints, since a 0 for the node is ambiguous and so the
        function doesn't know which value to return.

LayoutTests:

2009-03-10  Darin Adler  <darin@apple.com>

        Reviewed by Alexey Proskuryakov.

        Bug 24494: crash when deleting at end of document and merging paragraphs
        https://bugs.webkit.org/show_bug.cgi?id=24494
        rdar://problem/6571537

        * editing/deleting/merge-at-end-of-document-expected.txt: Added.
        * editing/deleting/merge-at-end-of-document.html: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@41562 268f45cc-cd09-0410-ab3c-d52691b4dbfc
LayoutTests/ChangeLog
LayoutTests/editing/deleting/merge-at-end-of-document-expected.txt [new file with mode: 0644]
LayoutTests/editing/deleting/merge-at-end-of-document.html [new file with mode: 0644]
WebCore/ChangeLog
WebCore/dom/Range.cpp
WebCore/editing/ApplyStyleCommand.cpp